From 3ff4daeaa22fad2b2ac072b3fb1402deccb53b89 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 28 Mar 2018 21:22:24 +0100 Subject: [PATCH 0001/3477] Merge buyUpgrades & Manual Coords Merge FinishDailyZone Add things to on/off toggle --- AutoTrimps2.js | 2 +- SettingsGUI.js | 32 +++++++++++++++++++++----------- modules/portal.js | 4 ++-- modules/upgrades.js | 2 +- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index b9706d344..057add7d5 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -192,7 +192,7 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) - if (getPageSetting('BuyUpgrades')) buyUpgrades(); //"Buy Upgrades" (upgrades.js) + if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); if (agu && agu!='Off') autoGoldenUpgradesAT(agu); //"Golden Upgrades" (other.js) if (getPageSetting('BuyBuildingsNew')===0); //"Buy Neither" (Buildings.js) diff --git a/SettingsGUI.js b/SettingsGUI.js index dc358f2e1..d5504b4a7 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -238,27 +238,28 @@ function initializeAllSettings() { //CORE: //Line1: createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Auto Gather/Build #2', 'Science Research OFF'], 'Controls what YOU do. Manual does nothing
The Decision between AutoGather 1 or 2 is up to you, and they should be similar. Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); - createSetting('BuyUpgrades', 'Buy Upgrades', 'Autobuys non-equipment upgrades (those are controlled separately in the Gear tab).', 'boolean', true, null, "Core"); + createSettings('BuyUpgradesNew'), ['Manual Upgrades', 'Buy All upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); //createSetting('ManageBreedtimerNew', ['Manual Breed Timer', 'Auto Breed Timer', 'Auto No Patience'], 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges, and accounts for the patience mastery.
[ON](Yellow): The same as above, but ignores patience and will not set a breed timer longer than 30s.
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'multitoggle', 1, null, "Core"); //This replaces the two settings below, but do we really need an option to ignore patience?? createSetting('ManageBreedtimer', 'Auto Breed Timer', 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges (0, 3.5s, 10s, 30s).
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'boolean', true, null, "Core"); createSetting('GeneticistTimer', 'Geneticist Timer', 'Manages the breed timer by hiring/firing Geneticists for the purpose of setting the ideal anticpation stacks. Disable with -1 to disable the Hiring/Firing of geneticists.
Info: Potency and Nursery buying behavior is adjusted dynamically (and disabling no longer disables potency). The Automatic Genetecist Hiring Process can best be summarized by: Buy/Wait/Die,Repeat. (if you do not die, no action is taken). Also self-kills (trimpicide) aka force abandon when your anti-stacks aren\'t maxed out (conservatively).

Controlled automatically (locked) when Auto Breed Timer is on.', 'value', '30', null, "Core"); createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Core'); createSetting('BreedFire', 'Breed Fire', 'OPTIONAL. Fire Lumberjacks and Miners to speed up breeding when needed. Basically trades wood/metal to cut the wait between deaths down. Disclaimer: May heavily negatively impact wood-gathering. ', 'boolean', false, null, 'Core'); - createSetting('ManualCoords', 'Don\'t buy Coords', 'OPTIONAL. Enable this ONLY if you know what you\'re doing, disable it if you don\'t know what you\'re doing. For when manually handling coords means a lot on challenges like Trapper.', 'boolean', false, null, 'Core'); + createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); + document.getElementById('TrapTrimps').parentNode.insertAdjacentHTML('afterend','
'); //Line2 createSetting('AutoAllocatePerks', 'Auto Allocate Perks', 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. ', 'boolean', false, null, 'Core'); createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); - //createSetting('AutoFinishDailyZoneNew', 'Finish Daily Zone Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option!', 'valueNegative', 0, null, 'Core'); //This should make sense to replace the two below. - createSetting('AutoFinishDaily', 'Auto Finish Daily', 'With this on, the He/Hr Portal and Custom Auto Portal options will auto-finish the daily whenever they trigger and THEN portal you.', 'boolean', true, null, 'Core'); - createSetting('AutoFinishDailyZone', 'Finish Daily Zone Mod', 'Finish Daily by this # of zones earlier/later than your regular Custom AutoPortal zone or your Helium Dont Portal Before zone. When Auto Finish Daily is on. Tip: Tune your value of He/HrDontPortalBefore to suit the daily, and then tune this. Can accept negative numbers for earlier, ie: -7 means portal 7 zones earlier than normal. Can also use positive numbers to DELAY portaling for later. When used with He/Hr AutoPortal, the number of zones early does not FORCE end the daily at that zone, only ALLOW it to end that early: it will Always end when your HE/hr drops enough to trigger the portal. Use 0 to disable.', 'valueNegative', 0, null, 'Core'); + createSetting('AutoFinishDailyNew', 'Finish Daily Zone Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); //This should make sense to replace the two below. + //OLD createSetting('AutoFinishDaily', 'Auto Finish Daily', 'With this on, the He/Hr Portal and Custom Auto Portal options will auto-finish the daily whenever they trigger and THEN portal you.', 'boolean', true, null, 'Core'); + //OLD createSetting('AutoFinishDailyZone', 'Finish Daily Zone Mod', 'Finish Daily by this # of zones earlier/later than your regular Custom AutoPortal zone or your Helium Dont Portal Before zone. When Auto Finish Daily is on. Tip: Tune your value of He/HrDontPortalBefore to suit the daily, and then tune this. Can accept negative numbers for earlier, ie: -7 means portal 7 zones earlier than normal. Can also use positive numbers to DELAY portaling for later. When used with He/Hr AutoPortal, the number of zones early does not FORCE end the daily at that zone, only ALLOW it to end that early: it will Always end when your HE/hr drops enough to trigger the portal. Use 0 to disable.', 'valueNegative', 0, null, 'Core'); createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); if (game.worldUnlocks.easterEgg) createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core'); //could really be removed?? createSetting('UsePatience', 'Enable Patience', 'Sets the default breed timer to 45 seconds if you have the Patience mastery.', 'boolean', true, null, 'Core'); - createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); + document.getElementById('UsePatience').parentNode.insertAdjacentHTML('afterend','
'); + //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. - document.getElementById('TrapTrimps').parentNode.insertAdjacentHTML('afterend','
'); createSetting('AutoPortal', 'Auto Portal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); //document.getElementById("AutoPortal").style="font-size: 1.0vw;"; //fit it on 1 line. createSetting('HeliumHourChallenge', 'Portal Challenge:', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); @@ -349,6 +350,9 @@ function initializeAllSettings() { createSetting('MaxMapBonusAfterZone', 'Max MapBonus After', 'Always gets Max Map Bonus from this zone on. (inclusive and after).
NOTE: Set -1 to disable entirely (default). Set 0 to use it always.
Advanced:User can set a lower number than the default 10 maps with the AT hidden console command: MODULES[\\"maps\\"].maxMapBonusAfterZ = 9;', 'value', '-1', null, 'Maps'); createSetting('DisableFarm', 'Disable Farming', 'Disables the extended farming algorithm of the AutoMaps part of the script. Always returns to the world after reaching 10 map stacks. Use at your own risk. (No need to refresh anymore)', 'boolean', false, null, 'Maps'); createSetting('LowerFarmingZone', 'Lower Farming Zone', 'Lowers the zone used during Farming mode. Uses the dynamic siphonology code, to Find the minimum map level you can successfully one-shot, and uses this level for any maps done after the first 10 map stacks. The difference being it goes LOWER than what Siphonology gives you map-bonus for, but after 10 stacks you dont need bonus, you just want to do maps that you can one-shot. Goes as low as 10 below current zone if your damage is that bad, but this is extreme and indicates you should probably portal.', 'boolean', true, null, 'Maps'); + createSetting('FarmWhenNomStacks7', 'Farm on >7 NOMstacks', 'Optional. If Improbability already has 5 NOMstacks, stack 30 Anticipation. If the Improbability has >7 NOMstacks on it, get +200% dmg from MapBonus. If we still cant kill it, enter Farming mode at 30 stacks, Even with DisableFarming On! (exits when we get under 10x). Farms if we hit 100 stacks in the world. If we ever hit (100) nomstacks in a map (likely a voidmap), farm, (exit the voidmap) and (prevent void from running, until situation is clear). Restarts any voidmaps if we hit 100 stacks. ', 'boolean', false, null, 'Maps'); + + //Line2 createSetting('MaxStacksForSpire', 'Max Map Bonus for Spire', 'Get max map bonus before running the Spire.', 'boolean', false, null, 'Maps'); //Does farm before spire not cover this fairly well anyway? grabbing +1 equips would make way more difference anyway createSetting('MinutestoFarmBeforeSpire', 'Farm Before Spire', 'Farm level 200/199(or BW) maps for X minutes before continuing onto attempting Spire.
NOTE: Set 0 to disable entirely (default).
Setting to -1/Infinite does not work here, set a very high number instead.', 'value', '0', null, 'Maps'); @@ -356,7 +360,8 @@ function initializeAllSettings() { createSetting('RunBionicBeforeSpire', 'Run Bionic Before Spire', 'CAUTION: Runs Bionic Wonderlands and repeatedly farms Bionic VI @ level 200 before attempting Spire, for the purpose of resource farming. Then it attempts the spire. The Minutes-Before-Spire timer runs concurrently to this, and needs to be set. If not set, it will exit without doing any Bionics... You can un-toggle it on the fly.
NOTE: Turning this on also mandates that Run Unique Maps be on.
WARNING: These 100 square maps take ~3x longer than normal maps.
WARNING: If you dont have Bionic Magnet mastery, this will run the 5 pre-requisites and take longer.
NOTE: In fact, it may not be what you want at all.', 'boolean', false, null, 'Maps'); //OUTDATED! createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Maps'); createSetting('CorruptionCalc', 'Corruption Farm Mode', 'Recommended. Enabling this will cause the Automaps routine to take amount of corruption in a zone into account, to decide whether it should do maps first for map bonus. ONLY in Zone 181+ (or Headstart 1,2,3 zone: 176,166,151) ', 'boolean', true, null, 'Maps'); - createSetting('FarmWhenNomStacks7', 'Farm on >7 NOMstacks', 'Optional. If Improbability already has 5 NOMstacks, stack 30 Anticipation. If the Improbability has >7 NOMstacks on it, get +200% dmg from MapBonus. If we still cant kill it, enter Farming mode at 30 stacks, Even with DisableFarming On! (exits when we get under 10x). Farms if we hit 100 stacks in the world. If we ever hit (100) nomstacks in a map (likely a voidmap), farm, (exit the voidmap) and (prevent void from running, until situation is clear). Restarts any voidmaps if we hit 100 stacks. ', 'boolean', false, null, 'Maps'); + createSetting('MaxTox', 'Max Toxicity Stacks', 'Get maximum toxicity stacks before killing the improbability in each zone 60 and above. Generally only recommended for 1 run to maximize bone portal value. This setting will revert to disabled after a successful Max-Tox run + Toxicity Autoportal.', 'boolean', false, null, 'Maps'); + //Line3 createSetting('VoidMaps', 'Void Maps', 'The zone at which you want all your void maps to be cleared (Cell 96). 0 is off', 'value', '0', null, "Maps"); //createSetting('RunNewVoidsUntilNew', 'Run New Voids Until', '-1 to disable. This allows you to run new Void Maps obtained after the set void map zone. Runs them at Cell 95 by default, unless you set a decimal value indicating the cell (example: 187.75). The number that you put in here will cap what zone new Void Maps will run at, inclusive of the zone you type. CAUTION: May severely slow you down by trying to do too-high level void maps. ', 'value', '-1', null, 'Maps'); //Should replace the two below @@ -364,7 +369,6 @@ function initializeAllSettings() { createSetting('RunNewVoidsUntil', 'New Voids Until', 'Run New Voids Until: Put a cap on what zone new voids will run at, until this zone, inclusive. ', 'value', '-1', null, 'Maps'); //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); - createSetting('MaxTox', 'Max Toxicity Stacks', 'Get maximum toxicity stacks before killing the improbability in each zone 60 and above. Generally only recommended for 1 run to maximize bone portal value. This setting will revert to disabled after a successful Max-Tox run + Toxicity Autoportal.', 'boolean', false, null, 'Maps'); createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. createSetting('AdvMapSpecialModifier', 'Map Special Modifier', 'EXPERIMENTAL. Attempt to select the BEST map special attacks mod. With this on, this will replace the normal behavior. If bugs, please report as this will become more default soon.', 'boolean', false, null, 'Maps'); @@ -812,7 +816,6 @@ function updateCustomButtons() { var doDaily = game.challenges.Daily.filter(); (doDaily) ? turnOn("AutoStartDaily") : turnOff("AutoStartDaily"); (doDaily) ? turnOn("AutoFinishDaily") : turnOff("AutoFinishDaily"); - (doDaily && getPageSetting('AutoFinishDaily')) ? turnOn("AutoFinishDailyZone") : turnOff("AutoFinishDailyZone"); //if custom auto portal is not selected, remove the custom value settingsbox (autoTrimpSettings.AutoPortal.selected == "Custom") ? turnOn("CustomAutoPortal") : turnOff("CustomAutoPortal"); //if HeHr is not selected, remove HeliumHourChallenge settingsbox @@ -828,7 +831,14 @@ function updateCustomButtons() { getPageSetting('AutoStance')==3 ? turnOn("WindStacking") : turnOff("WindStacking"); getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); //Show and Hide useless settings to reduce UI clutter - var turnonofflist = ["ManualGather2","BuyUpgrades","ManualCoords","UsePatience","TrapTrimps","GymWall","WarpstationWall3","TrainerCaptoTributes"]; + var turnonofflist = [ + "ManualGather2","BuyUpgradesNew","TrapTrimps","UsePatience", + "BuyBuildingsNew","WarpstationCap","WarpstationCoordBuy","MaxHut","MaxHouse","MaxMansion","MaxHotel","MaxResort","MaxGateway","MaxWormhole","MaxCollector","MaxGym","MaxTribute","GymWall","WarpstationWall3", + "Jobs", + "CapEquip2","ForcePresZ","DelayArmorWhenNeeded","BuyShieldblock", + "DynamicSiphonology","PreferMetal","LowerFarmingZone","FarmWhenNomStacks7","RunBionicBeforeSpire","CorruptionCalc","MaxTox","VoidCheck","TrimpleZ", + "DynamicGyms", + "SupplyWall","BuyOneTimeOC","MagmiteExplain"]; if (game.worldUnlocks.easterEgg) turnonofflist.push("AutoEggs"); for (var i in turnonofflist) diff --git a/modules/portal.js b/modules/portal.js index 446e7cf2e..49b44f56a 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -12,8 +12,8 @@ var zonePostpone = 0; //additional postponement of the zone above. //Decide When to Portal function autoPortal() { if(!game.global.portalActive) return; - var autoFinishDaily = (game.global.challengeActive == "Daily" && getPageSetting('AutoFinishDaily')); - var autoFinishDailyZone = getPageSetting('AutoFinishDailyZone'); + var autoFinishDaily = (game.global.challengeActive == "Daily" && getPageSetting('AutoFinishDailyNew') != 999); + var autoFinishDailyZone = getPageSetting('AutoFinishDailyNew'); if (!autoFinishDaily) autoFinishDailyZone = 0; //dont use stale disabled values switch (autoTrimpSettings.AutoPortal.selected) { diff --git a/modules/upgrades.js b/modules/upgrades.js index 6bc63509b..edd4a2238 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -7,7 +7,7 @@ function buyUpgrades() { upgrade = upgradeList[upgrade]; var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); - if (upgrade == 'Coordination' && (getPageSetting('ManualCoords') || !canAffordCoordinationTrimps())) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 1 || !canAffordCoordinationTrimps())) continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; //skip bloodlust during scientist challenges and while we have autofight enabled. From 85281cf15218fa68f453c66049404ce676a5d40e Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 28 Mar 2018 21:26:31 +0100 Subject: [PATCH 0002/3477] typo --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index d5504b4a7..79067a23b 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -238,7 +238,7 @@ function initializeAllSettings() { //CORE: //Line1: createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Auto Gather/Build #2', 'Science Research OFF'], 'Controls what YOU do. Manual does nothing
The Decision between AutoGather 1 or 2 is up to you, and they should be similar. Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); - createSettings('BuyUpgradesNew'), ['Manual Upgrades', 'Buy All upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); + createSetting('BuyUpgradesNew'), ['Manual Upgrades', 'Buy All upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); //createSetting('ManageBreedtimerNew', ['Manual Breed Timer', 'Auto Breed Timer', 'Auto No Patience'], 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges, and accounts for the patience mastery.
[ON](Yellow): The same as above, but ignores patience and will not set a breed timer longer than 30s.
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'multitoggle', 1, null, "Core"); //This replaces the two settings below, but do we really need an option to ignore patience?? createSetting('ManageBreedtimer', 'Auto Breed Timer', 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges (0, 3.5s, 10s, 30s).
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'boolean', true, null, "Core"); createSetting('GeneticistTimer', 'Geneticist Timer', 'Manages the breed timer by hiring/firing Geneticists for the purpose of setting the ideal anticpation stacks. Disable with -1 to disable the Hiring/Firing of geneticists.
Info: Potency and Nursery buying behavior is adjusted dynamically (and disabling no longer disables potency). The Automatic Genetecist Hiring Process can best be summarized by: Buy/Wait/Die,Repeat. (if you do not die, no action is taken). Also self-kills (trimpicide) aka force abandon when your anti-stacks aren\'t maxed out (conservatively).

Controlled automatically (locked) when Auto Breed Timer is on.', 'value', '30', null, "Core"); From 5cfe39d8920e04155c8223e2a99ff3ef754f3c65 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 28 Mar 2018 21:29:31 +0100 Subject: [PATCH 0003/3477] typo #2 --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 79067a23b..02d898220 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -238,7 +238,7 @@ function initializeAllSettings() { //CORE: //Line1: createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Auto Gather/Build #2', 'Science Research OFF'], 'Controls what YOU do. Manual does nothing
The Decision between AutoGather 1 or 2 is up to you, and they should be similar. Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); - createSetting('BuyUpgradesNew'), ['Manual Upgrades', 'Buy All upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); + createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); //createSetting('ManageBreedtimerNew', ['Manual Breed Timer', 'Auto Breed Timer', 'Auto No Patience'], 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges, and accounts for the patience mastery.
[ON](Yellow): The same as above, but ignores patience and will not set a breed timer longer than 30s.
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'multitoggle', 1, null, "Core"); //This replaces the two settings below, but do we really need an option to ignore patience?? createSetting('ManageBreedtimer', 'Auto Breed Timer', 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges (0, 3.5s, 10s, 30s).
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'boolean', true, null, "Core"); createSetting('GeneticistTimer', 'Geneticist Timer', 'Manages the breed timer by hiring/firing Geneticists for the purpose of setting the ideal anticpation stacks. Disable with -1 to disable the Hiring/Firing of geneticists.
Info: Potency and Nursery buying behavior is adjusted dynamically (and disabling no longer disables potency). The Automatic Genetecist Hiring Process can best be summarized by: Buy/Wait/Die,Repeat. (if you do not die, no action is taken). Also self-kills (trimpicide) aka force abandon when your anti-stacks aren\'t maxed out (conservatively).

Controlled automatically (locked) when Auto Breed Timer is on.', 'value', '30', null, "Core"); From c2a7fcc57de9227abd8f90fc91e0bb872445739d Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 28 Mar 2018 21:31:34 +0100 Subject: [PATCH 0004/3477] Too ambitious last time.... --- SettingsGUI.js | 1 - 1 file changed, 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 02d898220..27d89e270 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -834,7 +834,6 @@ function updateCustomButtons() { var turnonofflist = [ "ManualGather2","BuyUpgradesNew","TrapTrimps","UsePatience", "BuyBuildingsNew","WarpstationCap","WarpstationCoordBuy","MaxHut","MaxHouse","MaxMansion","MaxHotel","MaxResort","MaxGateway","MaxWormhole","MaxCollector","MaxGym","MaxTribute","GymWall","WarpstationWall3", - "Jobs", "CapEquip2","ForcePresZ","DelayArmorWhenNeeded","BuyShieldblock", "DynamicSiphonology","PreferMetal","LowerFarmingZone","FarmWhenNomStacks7","RunBionicBeforeSpire","CorruptionCalc","MaxTox","VoidCheck","TrimpleZ", "DynamicGyms", From 396e7dc50ebd9c25cee58188d6bd3154d41c27df Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 28 Mar 2018 21:58:08 +0100 Subject: [PATCH 0005/3477] layout changes mostly --- SettingsGUI.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 27d89e270..ce2f4d5fb 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -245,10 +245,8 @@ function initializeAllSettings() { createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Core'); createSetting('BreedFire', 'Breed Fire', 'OPTIONAL. Fire Lumberjacks and Miners to speed up breeding when needed. Basically trades wood/metal to cut the wait between deaths down. Disclaimer: May heavily negatively impact wood-gathering. ', 'boolean', false, null, 'Core'); createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); - document.getElementById('TrapTrimps').parentNode.insertAdjacentHTML('afterend','
'); //Line2 - createSetting('AutoAllocatePerks', 'Auto Allocate Perks', 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. ', 'boolean', false, null, 'Core'); createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); createSetting('AutoFinishDailyNew', 'Finish Daily Zone Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); //This should make sense to replace the two below. //OLD createSetting('AutoFinishDaily', 'Auto Finish Daily', 'With this on, the He/Hr Portal and Custom Auto Portal options will auto-finish the daily whenever they trigger and THEN portal you.', 'boolean', true, null, 'Core'); @@ -267,6 +265,7 @@ function initializeAllSettings() { createSetting('CustomAutoPortal', 'Custom Portal', 'Automatically portal AFTER clearing this level.(ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "Core"); createSetting('HeHrDontPortalBefore', 'Don\'t Portal Before', 'Do NOT allow Helium per Hour AutoPortal setting to portal BEFORE this level is reached. It is an additional check that prevents drops in helium/hr from triggering autoportal. Set to 0 or -1 to completely disable this check. (only shows up with Helium per Hour set)', 'value', '999', null, "Core"); createSetting('HeliumHrBuffer', 'He/Hr Portal Buffer %', 'IMPORTANT SETTING. When using the He/Hr Autoportal, it will portal if your He/Hr drops by this amount of % lower than your best for current run, default is 0% (ie: set to 5 to portal at 95% of your best). Now with stuck protection - Allows portaling midzone if we exceed set buffer amount by 5x. (ie a normal 2% buffer setting would now portal mid-zone you fall below 10% buffer).', 'value', '0', null, 'Core'); + createSetting('AutoAllocatePerks', 'Auto Allocate Perks', 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. ', 'boolean', false, null, 'Core'); createSetting('PauseScript', 'Pause AutoTrimps', 'Pause AutoTrimps Script (not including the graphs module)', 'boolean', null, null, 'Core'); //code to locate the pause button at lower right var $pauseScript = document.getElementById('PauseScript'); @@ -352,7 +351,6 @@ function initializeAllSettings() { createSetting('LowerFarmingZone', 'Lower Farming Zone', 'Lowers the zone used during Farming mode. Uses the dynamic siphonology code, to Find the minimum map level you can successfully one-shot, and uses this level for any maps done after the first 10 map stacks. The difference being it goes LOWER than what Siphonology gives you map-bonus for, but after 10 stacks you dont need bonus, you just want to do maps that you can one-shot. Goes as low as 10 below current zone if your damage is that bad, but this is extreme and indicates you should probably portal.', 'boolean', true, null, 'Maps'); createSetting('FarmWhenNomStacks7', 'Farm on >7 NOMstacks', 'Optional. If Improbability already has 5 NOMstacks, stack 30 Anticipation. If the Improbability has >7 NOMstacks on it, get +200% dmg from MapBonus. If we still cant kill it, enter Farming mode at 30 stacks, Even with DisableFarming On! (exits when we get under 10x). Farms if we hit 100 stacks in the world. If we ever hit (100) nomstacks in a map (likely a voidmap), farm, (exit the voidmap) and (prevent void from running, until situation is clear). Restarts any voidmaps if we hit 100 stacks. ', 'boolean', false, null, 'Maps'); - //Line2 createSetting('MaxStacksForSpire', 'Max Map Bonus for Spire', 'Get max map bonus before running the Spire.', 'boolean', false, null, 'Maps'); //Does farm before spire not cover this fairly well anyway? grabbing +1 equips would make way more difference anyway createSetting('MinutestoFarmBeforeSpire', 'Farm Before Spire', 'Farm level 200/199(or BW) maps for X minutes before continuing onto attempting Spire.
NOTE: Set 0 to disable entirely (default).
Setting to -1/Infinite does not work here, set a very high number instead.', 'value', '0', null, 'Maps'); @@ -453,7 +451,7 @@ function initializeAllSettings() { document.getElementById('battleSideTitle').setAttribute('onclick','MODULES["performance"].EnableAFKMode()'); document.getElementById('battleSideTitle').setAttribute('onmouseover', "getZoneStats(event);this.style.cursor='pointer'"); createSetting('ChangeLog', 'Show Changelog', '(Action Button). Shows the changelog popup message that AT loads on startup again, in case you missed it. The blue color means this is not a settable setting, just a button.', 'action', 'printChangelog()', null, 'Display'); - createSetting('ShowSettings', 'Show Extra Settings', 'Show/Hide settings that are rarely useful', 'boolean', true, null, 'Display') + createSetting('ShowSettings', 'Show Extra Settings', 'Show/Hide settings that in my personal opinion, are rarely useful (HZE 470)', 'boolean', true, null, 'Display') document.getElementById('Display').lastChild.insertAdjacentHTML('afterend','
'); //SPAM settings: @@ -833,11 +831,13 @@ function updateCustomButtons() { //Show and Hide useless settings to reduce UI clutter var turnonofflist = [ "ManualGather2","BuyUpgradesNew","TrapTrimps","UsePatience", - "BuyBuildingsNew","WarpstationCap","WarpstationCoordBuy","MaxHut","MaxHouse","MaxMansion","MaxHotel","MaxResort","MaxGateway","MaxWormhole","MaxCollector","MaxGym","MaxTribute","GymWall","WarpstationWall3", - "CapEquip2","ForcePresZ","DelayArmorWhenNeeded","BuyShieldblock", + "BuyBuildingsNew","WarpstationCap","WarpstationCoordBuy","MaxHut","MaxHouse","MaxMansion","MaxHotel","MaxResort","MaxGateway","MaxWormhole","MaxCollector","MaxGym","MaxTribute","GymWall","FirstGigastation","DeltaGigastation""WarpstationWall3", + "CapEquip2","DelayArmorWhenNeeded","BuyShieldblock", "DynamicSiphonology","PreferMetal","LowerFarmingZone","FarmWhenNomStacks7","RunBionicBeforeSpire","CorruptionCalc","MaxTox","VoidCheck","TrimpleZ", "DynamicGyms", - "SupplyWall","BuyOneTimeOC","MagmiteExplain"]; + "SupplyWall","BuyOneTimeOC","MagmiteExplain", + "SpamGeneral","SpamUpgrades","SpamEquipment","SpamMaps","SpamOther","SpamBuilding","SpamJobs","SpamGraphs","SpamMagmite","SpamPerks", + ]; if (game.worldUnlocks.easterEgg) turnonofflist.push("AutoEggs"); for (var i in turnonofflist) From d3306280cf0e802e0ceca6d4c92ade09fb591e2d Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 28 Mar 2018 22:00:15 +0100 Subject: [PATCH 0006/3477] typo again --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index ce2f4d5fb..26390fce4 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -831,7 +831,7 @@ function updateCustomButtons() { //Show and Hide useless settings to reduce UI clutter var turnonofflist = [ "ManualGather2","BuyUpgradesNew","TrapTrimps","UsePatience", - "BuyBuildingsNew","WarpstationCap","WarpstationCoordBuy","MaxHut","MaxHouse","MaxMansion","MaxHotel","MaxResort","MaxGateway","MaxWormhole","MaxCollector","MaxGym","MaxTribute","GymWall","FirstGigastation","DeltaGigastation""WarpstationWall3", + "BuyBuildingsNew","WarpstationCap","WarpstationCoordBuy","MaxHut","MaxHouse","MaxMansion","MaxHotel","MaxResort","MaxGateway","MaxWormhole","MaxCollector","MaxGym","MaxTribute","GymWall","FirstGigastation","DeltaGigastation","WarpstationWall3", "CapEquip2","DelayArmorWhenNeeded","BuyShieldblock", "DynamicSiphonology","PreferMetal","LowerFarmingZone","FarmWhenNomStacks7","RunBionicBeforeSpire","CorruptionCalc","MaxTox","VoidCheck","TrimpleZ", "DynamicGyms", From e536392ccace9b255bb75d8ec4afdafb3553963c Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 28 Mar 2018 22:30:21 +0100 Subject: [PATCH 0007/3477] little bugfix and layout fix --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 26390fce4..774bd7ca7 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -248,7 +248,7 @@ function initializeAllSettings() { //Line2 createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); - createSetting('AutoFinishDailyNew', 'Finish Daily Zone Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); //This should make sense to replace the two below. + createSetting('AutoFinishDailyNew', 'Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); //This should make sense to replace the two below. //OLD createSetting('AutoFinishDaily', 'Auto Finish Daily', 'With this on, the He/Hr Portal and Custom Auto Portal options will auto-finish the daily whenever they trigger and THEN portal you.', 'boolean', true, null, 'Core'); //OLD createSetting('AutoFinishDailyZone', 'Finish Daily Zone Mod', 'Finish Daily by this # of zones earlier/later than your regular Custom AutoPortal zone or your Helium Dont Portal Before zone. When Auto Finish Daily is on. Tip: Tune your value of He/HrDontPortalBefore to suit the daily, and then tune this. Can accept negative numbers for earlier, ie: -7 means portal 7 zones earlier than normal. Can also use positive numbers to DELAY portaling for later. When used with He/Hr AutoPortal, the number of zones early does not FORCE end the daily at that zone, only ALLOW it to end that early: it will Always end when your HE/hr drops enough to trigger the portal. Use 0 to disable.', 'valueNegative', 0, null, 'Core'); createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); @@ -259,7 +259,7 @@ function initializeAllSettings() { //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. createSetting('AutoPortal', 'Auto Portal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); - //document.getElementById("AutoPortal").style="font-size: 1.0vw;"; //fit it on 1 line. + document.getElementById("AutoPortal").style="font-size: 1.0vw;"; //fit it on 1 line. createSetting('HeliumHourChallenge', 'Portal Challenge:', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); document.getElementById("HeliumHourChallengeLabel").innerHTML = "Portal Challenge:"; //fit it on 1 line. createSetting('CustomAutoPortal', 'Custom Portal', 'Automatically portal AFTER clearing this level.(ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "Core"); From 923f94be3bd2f885d564b6c58ae813923f376e9a Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 28 Mar 2018 22:49:12 +0100 Subject: [PATCH 0008/3477] fix buy upgrades --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 774bd7ca7..a560c31b9 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -248,7 +248,7 @@ function initializeAllSettings() { //Line2 createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); - createSetting('AutoFinishDailyNew', 'Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); //This should make sense to replace the two below. + createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); //This should make sense to replace the two below. //OLD createSetting('AutoFinishDaily', 'Auto Finish Daily', 'With this on, the He/Hr Portal and Custom Auto Portal options will auto-finish the daily whenever they trigger and THEN portal you.', 'boolean', true, null, 'Core'); //OLD createSetting('AutoFinishDailyZone', 'Finish Daily Zone Mod', 'Finish Daily by this # of zones earlier/later than your regular Custom AutoPortal zone or your Helium Dont Portal Before zone. When Auto Finish Daily is on. Tip: Tune your value of He/HrDontPortalBefore to suit the daily, and then tune this. Can accept negative numbers for earlier, ie: -7 means portal 7 zones earlier than normal. Can also use positive numbers to DELAY portaling for later. When used with He/Hr AutoPortal, the number of zones early does not FORCE end the daily at that zone, only ALLOW it to end that early: it will Always end when your HE/hr drops enough to trigger the portal. Use 0 to disable.', 'valueNegative', 0, null, 'Core'); createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); From 922d5553e95df9f2eafebcfcd3fd3cb836f4fe49 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 28 Mar 2018 22:55:31 +0100 Subject: [PATCH 0009/3477] bugfix --- modules/breedtimer.js | 2 +- modules/upgrades.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/breedtimer.js b/modules/breedtimer.js index 25ebb0dc8..40de941fa 100644 --- a/modules/breedtimer.js +++ b/modules/breedtimer.js @@ -125,7 +125,7 @@ function autoBreedTimer() { var fireobj = fire1 ? time : timeLeft; //if we need to speed up our breeding //if we have potency upgrades available, buy them. If geneticists are unlocked, or we aren't managing the breed timer, just buy them - if ((targetBreed < time || !game.jobs.Geneticist.locked || !getPageSetting('ManageBreedtimer') || game.global.challengeActive == 'Watch') && game.upgrades.Potency.allowed > game.upgrades.Potency.done && canAffordTwoLevel('Potency') && getPageSetting('BuyUpgrades')) { + if ((targetBreed < time || !game.jobs.Geneticist.locked || !getPageSetting('ManageBreedtimer') || game.global.challengeActive == 'Watch') && game.upgrades.Potency.allowed > game.upgrades.Potency.done && canAffordTwoLevel('Potency') && getPageSetting('BuyUpgradesNew')) { buyUpgrade('Potency'); } //otherwise, if we have too many geneticists, (total time) - start firing them #1 diff --git a/modules/upgrades.js b/modules/upgrades.js index edd4a2238..84c5baae1 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -7,7 +7,7 @@ function buyUpgrades() { upgrade = upgradeList[upgrade]; var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); - if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 1 || !canAffordCoordinationTrimps())) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') != 1 || !canAffordCoordinationTrimps())) continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; //skip bloodlust during scientist challenges and while we have autofight enabled. From e4b1ee9e1b23c41695512111198a61b575cb9a79 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 28 Mar 2018 23:26:22 +0100 Subject: [PATCH 0010/3477] potential merge for NewVoids --- SettingsGUI.js | 12 ++++++------ modules/maps.js | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index a560c31b9..177dc814b 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -258,9 +258,9 @@ function initializeAllSettings() { document.getElementById('UsePatience').parentNode.insertAdjacentHTML('afterend','
'); //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. - createSetting('AutoPortal', 'Auto Portal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); - document.getElementById("AutoPortal").style="font-size: 1.0vw;"; //fit it on 1 line. - createSetting('HeliumHourChallenge', 'Portal Challenge:', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); + createSetting('AutoPortal', 'Auto Portal Settings:', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); + //document.getElementById("AutoPortal").style="font-size: 1.0vw;"; //fit it on 1 line. + createSetting('HeliumHourChallenge', 'Challenge on Portal:', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); document.getElementById("HeliumHourChallengeLabel").innerHTML = "Portal Challenge:"; //fit it on 1 line. createSetting('CustomAutoPortal', 'Custom Portal', 'Automatically portal AFTER clearing this level.(ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "Core"); createSetting('HeHrDontPortalBefore', 'Don\'t Portal Before', 'Do NOT allow Helium per Hour AutoPortal setting to portal BEFORE this level is reached. It is an additional check that prevents drops in helium/hr from triggering autoportal. Set to 0 or -1 to completely disable this check. (only shows up with Helium per Hour set)', 'value', '999', null, "Core"); @@ -362,9 +362,9 @@ function initializeAllSettings() { //Line3 createSetting('VoidMaps', 'Void Maps', 'The zone at which you want all your void maps to be cleared (Cell 96). 0 is off', 'value', '0', null, "Maps"); - //createSetting('RunNewVoidsUntilNew', 'Run New Voids Until', '-1 to disable. This allows you to run new Void Maps obtained after the set void map zone. Runs them at Cell 95 by default, unless you set a decimal value indicating the cell (example: 187.75). The number that you put in here will cap what zone new Void Maps will run at, inclusive of the zone you type. CAUTION: May severely slow you down by trying to do too-high level void maps. ', 'value', '-1', null, 'Maps'); //Should replace the two below - createSetting('RunNewVoids', 'Run New Voids', 'Run new void maps acquired after the set void map zone. Runs them at Cell 95 by default, unless you set a decimal value indicating the cell, like: 187.75 CAUTION: May severely slow you down by trying to do too-high level voidmaps. Use the adjacent RunNewVoidsUntil setting to limit this.', 'boolean', false, null, 'Maps'); - createSetting('RunNewVoidsUntil', 'New Voids Until', 'Run New Voids Until: Put a cap on what zone new voids will run at, until this zone, inclusive. ', 'value', '-1', null, 'Maps'); + createSetting('RunNewVoidsUntilNew', 'Run New Voids Until', '0 to disable. -1 for no cap. This allows you to run new Void Maps obtained after the set void map zone. Runs them at Cell 95 by default, unless you set a decimal value indicating the cell (example: 187.75). The number that you put in here will cap what zone new Void Maps will run at, inclusive of the zone you type. CAUTION: May severely slow you down by trying to do too-high level void maps. ', 'value', '-1', null, 'Maps'); //Should replace the two below + //createSetting('RunNewVoids', 'Run New Voids', 'Run new void maps acquired after the set void map zone. Runs them at Cell 95 by default, unless you set a decimal value indicating the cell, like: 187.75 CAUTION: May severely slow you down by trying to do too-high level voidmaps. Use the adjacent RunNewVoidsUntil setting to limit this.', 'boolean', false, null, 'Maps'); + //createSetting('RunNewVoidsUntil', 'New Voids Until', 'Run New Voids Until: Put a cap on what zone new voids will run at, until this zone, inclusive. ', 'value', '-1', null, 'Maps'); //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. diff --git a/modules/maps.js b/modules/maps.js index 387fec346..66c06add1 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -82,10 +82,10 @@ function autoMap() { if (voidMapLevelSettingMap === undefined || game.global.challengeActive == 'Lead') voidMapLevelSettingMap = 93; if (voidMapLevelSettingMap.length == 1) voidMapLevelSettingMap += "0"; //entering 187.70 becomes 187.7, this will bring it back to 187.70 - var voidsuntil = getPageSetting('RunNewVoidsUntil'); + var voidsuntil = getPageSetting('RunNewVoidsUntilNew'); needToVoid = voidMapLevelSetting > 0 && game.global.totalVoidMaps > 0 && game.global.lastClearedCell + 1 >= voidMapLevelSettingMap && (game.global.world == voidMapLevelSettingZone || - (game.global.world >= voidMapLevelSettingZone && getPageSetting('RunNewVoids') && (voidsuntil == -1 || game.global.world <= voidsuntil))); + (game.global.world >= voidMapLevelSettingZone && getPageSetting('RunNewVoidsUntilNew') != 0 && (voidsuntil == -1 || game.global.world <= voidsuntil))); if(game.global.totalVoidMaps == 0 || !needToVoid) doVoids = false; // if force prestige, check if we are behind any first From a2b7972d4641e19982a8db6f9b4985eca6519669 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 00:00:01 +0100 Subject: [PATCH 0011/3477] Merge the two new void map buttons. Change it to a mod rather than an absolute zone. As such the relevant change is: game.global.world <= (voidsuntil + voidMapLevelSettingZone) Also clarify that the cell selection for void map running is in first option not second. --- modules/maps.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maps.js b/modules/maps.js index 66c06add1..103773575 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -85,7 +85,7 @@ function autoMap() { var voidsuntil = getPageSetting('RunNewVoidsUntilNew'); needToVoid = voidMapLevelSetting > 0 && game.global.totalVoidMaps > 0 && game.global.lastClearedCell + 1 >= voidMapLevelSettingMap && (game.global.world == voidMapLevelSettingZone || - (game.global.world >= voidMapLevelSettingZone && getPageSetting('RunNewVoidsUntilNew') != 0 && (voidsuntil == -1 || game.global.world <= voidsuntil))); + (game.global.world >= voidMapLevelSettingZone && getPageSetting('RunNewVoidsUntilNew') != 0 && (voidsuntil == -1 || game.global.world <= (voidsuntil + voidMapLevelSettingZone))); if(game.global.totalVoidMaps == 0 || !needToVoid) doVoids = false; // if force prestige, check if we are behind any first From 5483ad6c2d3f5190519c3aa8a436fcf2118a61c3 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 00:02:49 +0100 Subject: [PATCH 0012/3477] whoops ) --- modules/maps.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maps.js b/modules/maps.js index 103773575..facee6f64 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -85,7 +85,7 @@ function autoMap() { var voidsuntil = getPageSetting('RunNewVoidsUntilNew'); needToVoid = voidMapLevelSetting > 0 && game.global.totalVoidMaps > 0 && game.global.lastClearedCell + 1 >= voidMapLevelSettingMap && (game.global.world == voidMapLevelSettingZone || - (game.global.world >= voidMapLevelSettingZone && getPageSetting('RunNewVoidsUntilNew') != 0 && (voidsuntil == -1 || game.global.world <= (voidsuntil + voidMapLevelSettingZone))); + (game.global.world >= voidMapLevelSettingZone && getPageSetting('RunNewVoidsUntilNew') != 0 && (voidsuntil == -1 || game.global.world <= (voidsuntil + voidMapLevelSettingZone)))); if(game.global.totalVoidMaps == 0 || !needToVoid) doVoids = false; // if force prestige, check if we are behind any first From ee1238f804e40af1b549107e2be8aaaecc9bcf46 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 00:07:10 +0100 Subject: [PATCH 0013/3477] tooltip update --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 177dc814b..e817fc391 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -361,8 +361,8 @@ function initializeAllSettings() { createSetting('MaxTox', 'Max Toxicity Stacks', 'Get maximum toxicity stacks before killing the improbability in each zone 60 and above. Generally only recommended for 1 run to maximize bone portal value. This setting will revert to disabled after a successful Max-Tox run + Toxicity Autoportal.', 'boolean', false, null, 'Maps'); //Line3 - createSetting('VoidMaps', 'Void Maps', 'The zone at which you want all your void maps to be cleared (Cell 96). 0 is off', 'value', '0', null, "Maps"); - createSetting('RunNewVoidsUntilNew', 'Run New Voids Until', '0 to disable. -1 for no cap. This allows you to run new Void Maps obtained after the set void map zone. Runs them at Cell 95 by default, unless you set a decimal value indicating the cell (example: 187.75). The number that you put in here will cap what zone new Void Maps will run at, inclusive of the zone you type. CAUTION: May severely slow you down by trying to do too-high level void maps. ', 'value', '-1', null, 'Maps'); //Should replace the two below + createSetting('VoidMaps', 'Void Maps', '0 to disable The zone at which you want all your void maps to be cleared inclusive of the zone you type. Runs them at Cell 93 by default, unless you set a decimal value indicating the cell (example: 187.75).', 'value', '0', null, "Maps"); + createSetting('RunNewVoidsUntilNew', 'New Voids Mod', '0 to disable. Positive numbers are added to your Void Map zone. -1 for no cap. This allows you to run new Void Maps obtained after your Void Map zone. The number you put in here will cap what zone new Void Maps will run at, inclusive of the zone you type. The number that you put in here will cap what zone new Void Maps will run at, inclusive of the zone you type. CAUTION: May severely slow you down by trying to do too-high level void maps. Default 0.', 'value', '0', null, 'Maps'); //Should replace the two below //createSetting('RunNewVoids', 'Run New Voids', 'Run new void maps acquired after the set void map zone. Runs them at Cell 95 by default, unless you set a decimal value indicating the cell, like: 187.75 CAUTION: May severely slow you down by trying to do too-high level voidmaps. Use the adjacent RunNewVoidsUntil setting to limit this.', 'boolean', false, null, 'Maps'); //createSetting('RunNewVoidsUntil', 'New Voids Until', 'Run New Voids Until: Put a cap on what zone new voids will run at, until this zone, inclusive. ', 'value', '-1', null, 'Maps'); //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); From 1c8504fec3455ff06b7a31a3a54932c0863355d1 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 00:14:06 +0100 Subject: [PATCH 0014/3477] Edit default VM zone. Edit tooltip for clarity --- SettingsGUI.js | 4 +--- modules/maps.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index e817fc391..4aca96db6 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -362,9 +362,7 @@ function initializeAllSettings() { //Line3 createSetting('VoidMaps', 'Void Maps', '0 to disable The zone at which you want all your void maps to be cleared inclusive of the zone you type. Runs them at Cell 93 by default, unless you set a decimal value indicating the cell (example: 187.75).', 'value', '0', null, "Maps"); - createSetting('RunNewVoidsUntilNew', 'New Voids Mod', '0 to disable. Positive numbers are added to your Void Map zone. -1 for no cap. This allows you to run new Void Maps obtained after your Void Map zone. The number you put in here will cap what zone new Void Maps will run at, inclusive of the zone you type. The number that you put in here will cap what zone new Void Maps will run at, inclusive of the zone you type. CAUTION: May severely slow you down by trying to do too-high level void maps. Default 0.', 'value', '0', null, 'Maps'); //Should replace the two below - //createSetting('RunNewVoids', 'Run New Voids', 'Run new void maps acquired after the set void map zone. Runs them at Cell 95 by default, unless you set a decimal value indicating the cell, like: 187.75 CAUTION: May severely slow you down by trying to do too-high level voidmaps. Use the adjacent RunNewVoidsUntil setting to limit this.', 'boolean', false, null, 'Maps'); - //createSetting('RunNewVoidsUntil', 'New Voids Until', 'Run New Voids Until: Put a cap on what zone new voids will run at, until this zone, inclusive. ', 'value', '-1', null, 'Maps'); + createSetting('RunNewVoidsUntilNew', 'New Voids Mod', '0 to disable. Positive numbers are added to your Void Map zone. -1 for no cap. This allows you to run new Void Maps obtained after your Void Map zone by adding this number to your Void Map zone.
Example Void map zone=185.75 and This setting=10. New Voids run until 197.75).
This means that any new void maps gained until Z197, cell 75 will be run. CAUTION: May severely slow you down by trying to do too-high level void maps. Default 0 (OFF).', 'value', '0', null, 'Maps'); //Should replace the two below //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. diff --git a/modules/maps.js b/modules/maps.js index facee6f64..4967c3b8d 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -80,7 +80,7 @@ function autoMap() { var voidMapLevelSettingZone = (voidMapLevelSetting+"").split(".")[0]; var voidMapLevelSettingMap = (voidMapLevelSetting+"").split(".")[1]; if (voidMapLevelSettingMap === undefined || game.global.challengeActive == 'Lead') - voidMapLevelSettingMap = 93; + voidMapLevelSettingMap = 90; if (voidMapLevelSettingMap.length == 1) voidMapLevelSettingMap += "0"; //entering 187.70 becomes 187.7, this will bring it back to 187.70 var voidsuntil = getPageSetting('RunNewVoidsUntilNew'); needToVoid = voidMapLevelSetting > 0 && game.global.totalVoidMaps > 0 && game.global.lastClearedCell + 1 >= voidMapLevelSettingMap && From ca7d6cbbc9b6fa718e320e64d803714330cc1864 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 00:15:41 +0100 Subject: [PATCH 0015/3477] edit tooltip --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 4aca96db6..6a9dd7f0f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -361,7 +361,7 @@ function initializeAllSettings() { createSetting('MaxTox', 'Max Toxicity Stacks', 'Get maximum toxicity stacks before killing the improbability in each zone 60 and above. Generally only recommended for 1 run to maximize bone portal value. This setting will revert to disabled after a successful Max-Tox run + Toxicity Autoportal.', 'boolean', false, null, 'Maps'); //Line3 - createSetting('VoidMaps', 'Void Maps', '0 to disable The zone at which you want all your void maps to be cleared inclusive of the zone you type. Runs them at Cell 93 by default, unless you set a decimal value indicating the cell (example: 187.75).', 'value', '0', null, "Maps"); + createSetting('VoidMaps', 'Void Maps', '0 to disable The zone at which you want all your void maps to be cleared inclusive of the zone you type. Runs them at Cell 93 by default, unless you set a decimal value indicating the cell (example: 187.75). Use odd zones on Lead.', 'value', '0', null, "Maps"); createSetting('RunNewVoidsUntilNew', 'New Voids Mod', '0 to disable. Positive numbers are added to your Void Map zone. -1 for no cap. This allows you to run new Void Maps obtained after your Void Map zone by adding this number to your Void Map zone.
Example Void map zone=185.75 and This setting=10. New Voids run until 197.75).
This means that any new void maps gained until Z197, cell 75 will be run. CAUTION: May severely slow you down by trying to do too-high level void maps. Default 0 (OFF).', 'value', '0', null, 'Maps'); //Should replace the two below //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); From 9c6e4490356d3c442a35978700647c30216a9c4f Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 00:33:12 +0100 Subject: [PATCH 0016/3477] Updates to windstacking (Add zone input) Extra comment on trimplez setting. --- SettingsGUI.js | 4 ++-- modules/stance.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 6a9dd7f0f..2c26e3b9d 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -365,7 +365,7 @@ function initializeAllSettings() { createSetting('RunNewVoidsUntilNew', 'New Voids Mod', '0 to disable. Positive numbers are added to your Void Map zone. -1 for no cap. This allows you to run new Void Maps obtained after your Void Map zone by adding this number to your Void Map zone.
Example Void map zone=185.75 and This setting=10. New Voids run until 197.75).
This means that any new void maps gained until Z197, cell 75 will be run. CAUTION: May severely slow you down by trying to do too-high level void maps. Default 0 (OFF).', 'value', '0', null, 'Maps'); //Should replace the two below //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); - createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. + createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. And I cba cause its a meh setting anyway. Advancing 2 zones more than doubles your income. Only useful for spire I, and IMO you may aswell actually play the game manually at SOME point. createSetting('AdvMapSpecialModifier', 'Map Special Modifier', 'EXPERIMENTAL. Attempt to select the BEST map special attacks mod. With this on, this will replace the normal behavior. If bugs, please report as this will become more default soon.', 'boolean', false, null, 'Maps'); @@ -375,7 +375,7 @@ function initializeAllSettings() { //Subsection1Line1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2',], '3-Way Button, Recommended. Will automatically handle fighting. The decision between BetterAutoFight 1 or 2 is up to your own discretion. The new BAF#2 does: A)Click fight anyway if we are dead and stuck in a loop due to Dimensional Generator and we can get away with adding time to it.(RemainingTime + ArmyAdd.Time < GeneTimer) and B) Clicks fight anyway if we are dead and have >=31 NextGroupTimer and deal with the consequences by firing genetecists afterwards. WARNING: If you autoportal with BetterAutoFight disabled, the game sits there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 1, null, "Combat"); createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. Better Autofight 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); - createSetting('WindStacking', 'Stack Wind Zones', 'For use with AutoStance 3, enables windstacking (Get 200 windstacks then change to D, kill bad guy, then repeat)', 'boolean', false, null, 'Combat'); + createSetting('WindStacking', 'Windstack Min Zone', '-1 = off, 0 = Always On
For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get 200 windstacks then change to D, kill bad guy, then repeat)', 'value', '0', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['Don\'t care', 'Power Saving', 'Only Rush Voids'], 'Avoid killing your army impatiently. Don\'t force abandon trimps when prestiging. Will still Die To Use Z and aggressively autostance to aid progression and anything else. Made for Empower daily, you might find it helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens. Only Rush Voids will allow considering abandoning, not force one. Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks arent maxed, force abandon and grab a new group. Located in the geneticist management script.', 'boolean', true, null, 'Combat'); diff --git a/modules/stance.js b/modules/stance.js index b157ad7e8..69a2e98a1 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -567,7 +567,7 @@ function autoStance3() { if( getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200) { setFormation(2); } - else if (getPageSetting('WindStacking')) { + else if (getPageSetting('WindStacking') != -1 || getPageSetting('WindStacking') ==0 || (game.global.world >= getPageSetting('Windstacking'))) { setFormation(4); } } From 9430404036bb399815213a4f737edec46cbeaf01 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 03:16:38 +0100 Subject: [PATCH 0017/3477] BIG changes to scryer Summarised as: Force is now actually an option on all scryer settings and overrides OverKill Never actually means what it says. it is a definite NO. Maybe allows normal use through MIN/MAX input, and also overriding of that through use of Overkill. Tooltips have been updated to be accurate and actually make sense. --- SettingsGUI.js | 32 ++++++++++-------- modules/scryer.js | 83 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 83 insertions(+), 32 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 2c26e3b9d..7ca00222f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -375,7 +375,7 @@ function initializeAllSettings() { //Subsection1Line1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2',], '3-Way Button, Recommended. Will automatically handle fighting. The decision between BetterAutoFight 1 or 2 is up to your own discretion. The new BAF#2 does: A)Click fight anyway if we are dead and stuck in a loop due to Dimensional Generator and we can get away with adding time to it.(RemainingTime + ArmyAdd.Time < GeneTimer) and B) Clicks fight anyway if we are dead and have >=31 NextGroupTimer and deal with the consequences by firing genetecists afterwards. WARNING: If you autoportal with BetterAutoFight disabled, the game sits there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 1, null, "Combat"); createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. Better Autofight 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); - createSetting('WindStacking', 'Windstack Min Zone', '-1 = off, 0 = Always On
For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get 200 windstacks then change to D, kill bad guy, then repeat)', 'value', '0', null, 'Combat'); + createSetting('WindStacking', 'Windstack Min Zone', '-1 = off, 0 = Always On
For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get 200 windstacks then change to D, kill bad guy, then repeat)', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['Don\'t care', 'Power Saving', 'Only Rush Voids'], 'Avoid killing your army impatiently. Don\'t force abandon trimps when prestiging. Will still Die To Use Z and aggressively autostance to aid progression and anything else. Made for Empower daily, you might find it helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens. Only Rush Voids will allow considering abandoning, not force one. Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks arent maxed, force abandon and grab a new group. Located in the geneticist management script.', 'boolean', true, null, 'Combat'); @@ -386,19 +386,20 @@ function initializeAllSettings() { //Scryer - createSetting('UseScryerStance', 'Use Scryer Stance', 'MASTER BUTTON Stay in Scryer stance in z181 and above (Overrides Autostance). Falls back to regular Autostance when not in use (so leave that on). Get 2x resources or Dark Essence. All other buttons have no effect if this one is off (INCLUDING OVERKILL).', 'boolean', true, null, 'Scryer'); - createSetting('ScryerUseWhenOverkill', 'Use When Overkill', 'Use when we can Overkill in S stance, for double loot with no speed penalty. Recommend this be on. NOTE: This being on, and being able to overkill in S will override ALL other settings (Except never use in spire). This is a boolean logic shortcut that disregards all the other settings including Min and Max Zone. If you ONLY want to use S during Overkill, as a workaround: turn this on and Min zone: to 9999 and everything else off(red). ', 'boolean', true, null, 'Scryer'); - createSetting('ScryerMinZone', 'Min Zone', 'Minimum zone to start using scryer in.(inclusive) Recommend:(60 or 181). This needs to be On & Valid for options other than Overkill to work. Tip: Use 9999 to disable all other Non-Overkill scryer usage.', 'value', '181', null, 'Scryer'); - createSetting('ScryerMaxZone', 'Max Zone', 'Zone to STOP using scryer at.(not inclusive) Recommend: Leave off (0 or -1 to disable: doesnt prevent options other than Overkill from working.) Positive numbers DO disable it past that zone. ', 'value', '230', null, 'Scryer'); - createSetting('ScryerUseinMaps2', ['Maybe Use in Maps', 'Force Use in Maps'], 'Maybe/Force Use in Maps. Overkill overrides this setting. Does not have to be on for Overkill Button to use S in maps. (Obeys zone settings)', 'multitoggle', 0, null, 'Scryer'); - createSetting('ScryerUseinVoidMaps2', ['Maybe Use in VoidMaps', 'Force Use in VoidMaps', 'Never Use in VoidMaps'], 'Maybe/Force/Never Use in Void Maps. Never WILL override the Overkill setting, and never use S in Void Maps. Maybe means default - treat Void Maps like any other cell (something else has to be ON to trigger Scryer). Force = Always use S.', 'multitoggle', 0, null, 'Scryer'); - createSetting('ScryerUseinSpire2', ['Maybe Use in Spire', 'Force Use in Spire', 'Never Use in Spire'], 'Maybe/Force/Never Use in Spire. Never WILL override the Overkill setting, and never use S in Spire. Maybe means default - treat Spire like any other cell (something else has to be ON to trigger Scryer). Force = Always use S.', 'multitoggle', 0, null, 'Scryer'); + createSetting('UseScryerStance', 'Use Scryer Stance', 'MASTER BUTTON Activates all other scrying settings, and overrides AutoStance when scryer conditions are met. Leave regular Autostance on while this is active. Scryer gives 2x Resources (Non-Helium/Nullifium) and a chance for Dark Essence. Once this is on, priority for Scryer decisions goes as such:
NEVER USE, FORCE USE, OVERKILL, MIN/MAX ZONE
NO OTHER BUTTONS WILL DO ANYTHING IF THIS IS OFF.', 'boolean', true, null, 'Scryer'); + createSetting('ScryerUseWhenOverkill', 'Use When Overkill', 'Overrides the Min/Max zones. Does not override any NEVER settings. Toggles stance when we can Overkill in S, giving us double loot with no speed penalty! NOTE: This being on, and being able to overkill in S will override ALL other settings (Except never use in spire). This is a boolean logic shortcut that disregards all the other settings including Min and Max Zone. If you ONLY want to use S during Overkill, as a workaround: turn this on and Min zone: to 9999 and everything else off(red).

This has not been optimised for double overkill, and does not always produce the intended results, if you have problems, it may be worth turning off until it can be adjusted.', 'boolean', true, null, 'Scryer'); + createSetting('ScryerMinZone', 'Min Zone', 'Minimum zone to start using scryer in.(inclusive) Recommend:(60 or 181). Overkill ignores this. This needs to be On & Valid for the MAYBE option on all other Scryer settings to do anything if Overkill is off. Tip: Use 9999 to disable all Non-Overkill, Non-Force, scryer usage.', 'value', '181', null, 'Scryer'); + createSetting('ScryerMaxZone', 'Max Zone', '0 or -1 to disable (Recommended)
Overkill ignores this. Zone to STOP using scryer at (not inclusive). Turning this ON with a positive number stops MAYBE use of all other Scryer settings.', 'value', '230', null, 'Scryer'); + createSetting('ScryerUseinMaps2', ['Maps: NEVER','Maps: FORCE', 'Maps: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in Void Maps
MAYBE means that Overkill and Min/Max use are allowed.

Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); + createSetting('ScryerUseinVoidMaps2', ['VoidMaps: NEVER','VoidMaps: FORCE', 'VoidMaps: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in Void Maps
MAYBE means that Overkill and Min/Max use are allowed.

Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); + createSetting('ScryerUseinSpire2', ['Spire: NEVER','Spire: FORCE','Spire: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in the Spire
MAYBE means that Overkill and Min/Max use are allowed.

Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); //Line2 - createSetting('ScryerSkipBoss2', ['Default on Cell 100', 'Never Use on Cell 100 above VoidLevel', 'Never Use on Cell 100 (ALL Levels)'], 'On cell 100: Default/Never Use(above VoidLevel)/Never Use(ALL Levels). Overkill overrides this setting. Doesnt use Scrying stance for world Improbabilities/Bosses (cell 100) if you are past the level you have your VoidMaps set to run at. (or all levels, if set.) Default treats cell 100 like any other cell.', 'multitoggle', 0, null, 'Scryer'); - createSetting('ScryerSkipCorrupteds2', ['Maybe Use S on Corrupteds', 'Dont Use S on Corrupteds'], 'Overkill overrides this setting, even on Dont Use. Turning this Green doesnt use S stance for corrupted cells UNLESS you can overkill them. Red/Maybe just means default (corrupteds are treated like normal cells), so something else has to be ON to trigger Scryer to be used. Magma maps and Corrupted Voidmaps are classified under this box as corrupted and Green-DontUse here will override the ForceMaps/ForceVoidmaps (for now)', 'multitoggle', 0, null, 'Scryer'); - createSetting('ScryerDieZ', 'Die To Use S','-1 to disable. Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. This feature was added for 1 person, use at your own risk.
Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); - //createSetting('ScryUseinPoison', ' Scry in Poison', ['Never Use in Poison', 'Force Use in Poison', 'Maybe Use in Poison']'Maybe/Force/Never Use in Poison. Never WILL override the Overkill setting Maybe means default - treat Poison like any other cell (something else has to be ON to trigger Scryer). Force = Always use S.', 'multitoggle', 1, null, 'Scryer'); //should it override Overkill??? Copy this for Wind/Ice - + createSetting('ScryerSkipBoss2', ['Boss: NEVER (All Levels)','Boss: NEVER (Above VoidLevel)','Boss: MAYBE'], 'NEVER (All Levels) will NEVER use S in cell 100 of the world!!!
NEVER (Above VoidLevel) will NEVER use S in cell 100 of the world ABOVE the zone that your void maps are set to run at (Maps).
MAYBE treats the cell no differently to any other, Overkill and Min/Max Scryer is allowed.

Recommend NEVER (There is little benefit to double NON-HELIUM resources and a small chance of DE).', 'multitoggle', 0, null, 'Scryer'); + createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate against Corrupted enemies
MAYBE means that Overkill and Min/Max use are allowed.
Magma maps and Corrupted Voidmaps are currently classified as corrupted and Green-DontUse here will override the Force Maps/Force Voidmaps use of Scryer

Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); + createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. This feature was added for 1 person, use at your own risk.
Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); + createSetting('ScryUseinPoison', 'Scry in Poison','-1 to disable
, any other number sets a minimum zone to use S in Poison', 'value', -1, null, 'Scryer'); //should it override Overkill??? Copy this for Wind/Ice + createSetting('ScryUseinWind', 'Scry in Wind','-1 to disable
, any other number sets a minimum zone to use S in Wind', 'value', -1, null, 'Scryer'); + createSetting('ScryUseinIce', 'Scry in Ice','-1 to disable
, any other number sets a minimum zone to use S in Ice', 'value', -1, null, 'Scryer'); @@ -824,7 +825,10 @@ function updateCustomButtons() { //if ShieldBlock is for sure, remove ShieldBlock from settingsbox (achievement=12 means z100). //(game.achievements.zones.finished < 12) ? turnOn("BuyShieldblock") : function(){turnOff("BuyShieldblock");setPageSetting("BuyShieldblock",false);}(); //if AS3 is not selected, remove Windstack settingsbox - getPageSetting('AutoStance')==3 ? turnOn("WindStacking") : turnOff("WindStacking"); + getPageSetting('AutoStance')==3 ? turnOn("WindStacking"): turnOff("WindStacking"); + getPageSetting('AutoStance')==3 ? turnOn("ScryUseinPoison"): turnOff("ScryUseinPoison"); + getPageSetting('AutoStance')==3 ? turnOn("ScryUseinWind"): turnOff("ScryUseinWind"); + getPageSetting('AutoStance')==3 ? turnOn("ScryUseinIce"): turnOff("ScryUseinIce"); getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); //Show and Hide useless settings to reduce UI clutter var turnonofflist = [ diff --git a/modules/scryer.js b/modules/scryer.js index b999492ad..b5b09fe13 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -3,46 +3,93 @@ var wantToScry = false; //use S stance function useScryerStance() { - var AutoStance = getPageSetting('AutoStance'); + var AutoStance = getPageSetting('AutoStance'); function autostancefunction() { if (AutoStance<=1) autoStance(); //"Auto Stance" - else if (AutoStance==2) autoStance2(); //"Auto Stance #2" + else if (AutoStance==2) autoStance2(); + else if (AutoStance==3) autoStance3(); //"Auto Stance #3" }; - //check preconditions (exit quick, if impossible to use) + + //check NEVER & Prerequisites (This overrides overkill settings) var use_auto = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; + //check scryer is unlocked use_auto = use_auto || game.global.world <= 60; - use_auto = use_auto || game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 2; - if (use_auto) { + //check map NEVER + use_auto = use_auto || game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0; + //check void map NEVER + use_auto = use_auto || game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0; + //check spire NEVER + use_auto = use_auto || !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0; + //check Boss NEVERs + use_auto = use_auto || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world > getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 2 && game.global.lastClearedCell == 98); + //Check Nature Min Zone + use_auto = use_auto || ((getEmpowerment() == "Poison" && (game.global.world < getPageSetting('ScryUseinPoison'))) + || (getEmpowerment() == "Wind" && (game.global.world < getPageSetting('ScryUseinWind'))) + || (getEmpowerment() == "Ice" &&(game.global.world < getPageSetting('ScryUseinIce')))); + //check Corrupted Never + var iscorrupt = getCurrentEnemy(1).mutation == "Corruption"; + iscorrupt = iscorrupt || (mutations.Magma.active() && game.global.mapsActive); + iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); + if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_auto))) { autostancefunction(); wantToScry = false; return; } + //check Force (This overrides overkill settings) + //check map Force + var use_scryer = use_scryer || game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1; + //check void map Force + use_scryer = use_scryer || game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 1; + //check spire Force + use_scryer = use_scryer || !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1; + //Check Nature Min Zone + use_scryer = use_scryer || ((getEmpowerment() == "Poison" && (game.global.world >= getPageSetting('ScryUseinPoison'))) + || (getEmpowerment() == "Wind" && (game.global.world >= getPageSetting('ScryUseinWind'))) + || (getEmpowerment() == "Ice" &&(game.global.world >= getPageSetting('ScryUseinIce')))); + //check Corrupted Force + if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 1 || (use_scryer))) { + setFormation(4); + wantToScry = true; + return; + } + + +//If neither NEVER or FORCE, move on to assessing whether to MAYBE +//First, calculate damage if (AutoStance<=1) calcBaseDamageinX(); //calculate internal script variables normally processed by autostance. - else if (AutoStance==2) + else if (AutoStance>=2) calcBaseDamageinX2(); //calculate method #2 +//Decide whether it is oktoswitch (Suicide) var missingHealth = game.global.soldierHealthMax - game.global.soldierHealth; var newSquadRdy = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; var form = game.global.formation; var oktoswitch = true; - //var die = getPageSetting('ScryerDieToUseS'); - var die = true; + var die = (getPageSetting('ScryerDieZ') != -1 && getPageSetting('ScryerDieZ') <= game.global.world) ; const willSuicide = getPageSetting('ScryerDieZ'); - if (die && willSuicide > -1) { + if (die && willSuicide >= 0) { var [dieZ, dieC] = willSuicide.toString().split("."); if (dieC && dieC.length == 1) dieC = dieC + "0"; die = game.global.world >= dieZ && (!dieC || (game.global.lastClearedCell + 1 >= dieC)); } if (form == 0 || form == 1) - oktoswitch = die || newSquadRdy || (missingHealth < (baseHealth / 2)); + oktoswitch = die || newSquadRdy || (missingHealth < (baseHealth / 2)); //switch if DieToUse / a new squad is ready / or trimp\'s missing health is less than half of base health +//Decide whether Overkill is possible var useoverkill = getPageSetting('ScryerUseWhenOverkill'); + //If Overkill isn't unlocked, toggle overkill use off! if (useoverkill && game.portal.Overkill.level == 0) setPageSetting('ScryerUseWhenOverkill', false); - if (useoverkill && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')==2) - useoverkill = false; - //Overkill button being on and being able to overkill in S will override any other setting, regardless. + //If Spire is set to never and is active, don't use overkill setting. //redundant now?? + if (useoverkill && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')==0) + useoverkill = false; + //If lower than nature zone, do not use overkill //redundant now?? + if (useoverkill && ((getEmpowerment() != "Poison" && (game.global.world <= getPageSetting('ScryUseinPoison'))) + || (getEmpowerment() != "Wind" && (game.global.world <= getPageSetting('ScryUseinWind'))) + || (getEmpowerment() != "Ice" &&(game.global.world <= getPageSetting('ScryUseinIce'))))) + useoverkill = false; + //Overkill button being on and being able to overkill in S will override any setting other than never spire & nature zone, regardless. if (useoverkill && game.portal.Overkill.level > 0) { var avgDamage = (baseDamage * (1-getPlayerCritChance()) + (baseDamage * getPlayerCritChance() * getPlayerCritDamageMult())); var Sstance = 0.5; @@ -55,9 +102,9 @@ function useScryerStance() { return; } } - -//Any of these being true will indicate scryer should not be used, and cause the function to dump back to regular autoStance(): - //check for spire +/* +//If you cannot overkill, these situations will cause a return to autostance. + //check for spire not being Forced use_auto = use_auto || !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')!=1; //check for voids use_auto = use_auto || game.global.mapsActive && getCurrentMapObject().location == "Void" && !getPageSetting('ScryerUseinVoidMaps2'); @@ -82,8 +129,8 @@ function useScryerStance() { wantToScry = false; return; } - - //Default. +*/ + //Default. (All Never and Always are accounted for, Overkill has decided whether to run, leaving solely what zones you want to run S in even when you can't overkill) var min_zone = getPageSetting('ScryerMinZone'); var max_zone = getPageSetting('ScryerMaxZone'); var valid_min = game.global.world >= min_zone; From a12436d30c182e283941a152c41b986f3a6c8668 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 03:21:42 +0100 Subject: [PATCH 0018/3477] rename use S stance --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 7ca00222f..396d4bcd3 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -386,7 +386,7 @@ function initializeAllSettings() { //Scryer - createSetting('UseScryerStance', 'Use Scryer Stance', 'MASTER BUTTON Activates all other scrying settings, and overrides AutoStance when scryer conditions are met. Leave regular Autostance on while this is active. Scryer gives 2x Resources (Non-Helium/Nullifium) and a chance for Dark Essence. Once this is on, priority for Scryer decisions goes as such:
NEVER USE, FORCE USE, OVERKILL, MIN/MAX ZONE
NO OTHER BUTTONS WILL DO ANYTHING IF THIS IS OFF.', 'boolean', true, null, 'Scryer'); + createSetting('UseScryerStance', 'Enable Scryer Stance', 'MASTER BUTTON Activates all other scrying settings, and overrides AutoStance when scryer conditions are met. Leave regular Autostance on while this is active. Scryer gives 2x Resources (Non-Helium/Nullifium) and a chance for Dark Essence. Once this is on, priority for Scryer decisions goes as such:
NEVER USE, FORCE USE, OVERKILL, MIN/MAX ZONE
NO OTHER BUTTONS WILL DO ANYTHING IF THIS IS OFF.', 'boolean', true, null, 'Scryer'); createSetting('ScryerUseWhenOverkill', 'Use When Overkill', 'Overrides the Min/Max zones. Does not override any NEVER settings. Toggles stance when we can Overkill in S, giving us double loot with no speed penalty! NOTE: This being on, and being able to overkill in S will override ALL other settings (Except never use in spire). This is a boolean logic shortcut that disregards all the other settings including Min and Max Zone. If you ONLY want to use S during Overkill, as a workaround: turn this on and Min zone: to 9999 and everything else off(red).

This has not been optimised for double overkill, and does not always produce the intended results, if you have problems, it may be worth turning off until it can be adjusted.', 'boolean', true, null, 'Scryer'); createSetting('ScryerMinZone', 'Min Zone', 'Minimum zone to start using scryer in.(inclusive) Recommend:(60 or 181). Overkill ignores this. This needs to be On & Valid for the MAYBE option on all other Scryer settings to do anything if Overkill is off. Tip: Use 9999 to disable all Non-Overkill, Non-Force, scryer usage.', 'value', '181', null, 'Scryer'); createSetting('ScryerMaxZone', 'Max Zone', '0 or -1 to disable (Recommended)
Overkill ignores this. Zone to STOP using scryer at (not inclusive). Turning this ON with a positive number stops MAYBE use of all other Scryer settings.', 'value', '230', null, 'Scryer'); From 3fd0b5bd56c27f2a2a5d2b38a9cb589203ce7390 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 03:27:28 +0100 Subject: [PATCH 0019/3477] add check for use in nature being -1 --- modules/scryer.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index b5b09fe13..1d6e6b2ea 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -44,9 +44,9 @@ function useScryerStance() { //check spire Force use_scryer = use_scryer || !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1; //Check Nature Min Zone - use_scryer = use_scryer || ((getEmpowerment() == "Poison" && (game.global.world >= getPageSetting('ScryUseinPoison'))) - || (getEmpowerment() == "Wind" && (game.global.world >= getPageSetting('ScryUseinWind'))) - || (getEmpowerment() == "Ice" &&(game.global.world >= getPageSetting('ScryUseinIce')))); + use_scryer = use_scryer || ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') <= (game.global.world >= getPageSetting('ScryUseinPoison'))) + || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world >= getPageSetting('ScryUseinWind'))) + || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce')))); //check Corrupted Force if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 1 || (use_scryer))) { setFormation(4); @@ -85,9 +85,9 @@ function useScryerStance() { if (useoverkill && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')==0) useoverkill = false; //If lower than nature zone, do not use overkill //redundant now?? - if (useoverkill && ((getEmpowerment() != "Poison" && (game.global.world <= getPageSetting('ScryUseinPoison'))) - || (getEmpowerment() != "Wind" && (game.global.world <= getPageSetting('ScryUseinWind'))) - || (getEmpowerment() != "Ice" &&(game.global.world <= getPageSetting('ScryUseinIce'))))) + if (useoverkill && ((getEmpowerment() = "Poison" && (game.global.world <= getPageSetting('ScryUseinPoison'))) + || (getEmpowerment() = "Wind" && (game.global.world <= getPageSetting('ScryUseinWind'))) + || (getEmpowerment() = "Ice" &&(game.global.world <= getPageSetting('ScryUseinIce'))))) useoverkill = false; //Overkill button being on and being able to overkill in S will override any setting other than never spire & nature zone, regardless. if (useoverkill && game.portal.Overkill.level > 0) { From fcf372ee254d4bdf6484524623344ff22809b29b Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 03:29:32 +0100 Subject: [PATCH 0020/3477] OR should have been AND --- modules/stance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index 69a2e98a1..b0089f51a 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -567,7 +567,7 @@ function autoStance3() { if( getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200) { setFormation(2); } - else if (getPageSetting('WindStacking') != -1 || getPageSetting('WindStacking') ==0 || (game.global.world >= getPageSetting('Windstacking'))) { + else if (getPageSetting('WindStacking') != -1 && (getPageSetting('WindStacking') ==0 || (game.global.world >= getPageSetting('Windstacking'))) { setFormation(4); } } From ce2116cef3f3e60c73d4dbf4acad6fea499ac037 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 03:33:12 +0100 Subject: [PATCH 0021/3477] fix missing ) --- modules/stance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index b0089f51a..39778885e 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -567,7 +567,7 @@ function autoStance3() { if( getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200) { setFormation(2); } - else if (getPageSetting('WindStacking') != -1 && (getPageSetting('WindStacking') ==0 || (game.global.world >= getPageSetting('Windstacking'))) { + else if (getPageSetting('WindStacking') != -1 && (getPageSetting('WindStacking') ==0 || (game.global.world >= getPageSetting('Windstacking')))) { setFormation(4); } } From ad914c8196c13a07138ac690efc69481137d491b Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 03:43:23 +0100 Subject: [PATCH 0022/3477] fixes --- modules/scryer.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 1d6e6b2ea..d2dc33fdc 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -38,17 +38,17 @@ function useScryerStance() { //check Force (This overrides overkill settings) //check map Force - var use_scryer = use_scryer || game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1; + var use_scryer = use_scryer || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1); //check void map Force - use_scryer = use_scryer || game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 1; + use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 1); //check spire Force - use_scryer = use_scryer || !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1; + use_scryer = use_scryer || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); //Check Nature Min Zone - use_scryer = use_scryer || ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') <= (game.global.world >= getPageSetting('ScryUseinPoison'))) + use_scryer = use_scryer || ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world >= getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world >= getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce')))); //check Corrupted Force - if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 1 || (use_scryer))) { + if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 1) || (use_scryer)) { setFormation(4); wantToScry = true; return; From 80c26917aa3fc1f01510788c4c2876c19e983832 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 03:48:46 +0100 Subject: [PATCH 0023/3477] add check for -1 --- modules/scryer.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index d2dc33fdc..4df015e64 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -23,9 +23,9 @@ function useScryerStance() { //check Boss NEVERs use_auto = use_auto || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world > getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 2 && game.global.lastClearedCell == 98); //Check Nature Min Zone - use_auto = use_auto || ((getEmpowerment() == "Poison" && (game.global.world < getPageSetting('ScryUseinPoison'))) - || (getEmpowerment() == "Wind" && (game.global.world < getPageSetting('ScryUseinWind'))) - || (getEmpowerment() == "Ice" &&(game.global.world < getPageSetting('ScryUseinIce')))); + use_auto = use_auto || ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) + || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) + || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never var iscorrupt = getCurrentEnemy(1).mutation == "Corruption"; iscorrupt = iscorrupt || (mutations.Magma.active() && game.global.mapsActive); From 68ef26fe178abe517097d60176b6ad5c71fc11db Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 03:55:59 +0100 Subject: [PATCH 0024/3477] Final edit for the night. In summary: huge changes to scryer module Changes to scryer in SettingsGUI Edit to windstacking in stance Addition of nature-specific scryer settings. --- SettingsGUI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 396d4bcd3..a7f7f5b22 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -397,9 +397,9 @@ function initializeAllSettings() { createSetting('ScryerSkipBoss2', ['Boss: NEVER (All Levels)','Boss: NEVER (Above VoidLevel)','Boss: MAYBE'], 'NEVER (All Levels) will NEVER use S in cell 100 of the world!!!
NEVER (Above VoidLevel) will NEVER use S in cell 100 of the world ABOVE the zone that your void maps are set to run at (Maps).
MAYBE treats the cell no differently to any other, Overkill and Min/Max Scryer is allowed.

Recommend NEVER (There is little benefit to double NON-HELIUM resources and a small chance of DE).', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate against Corrupted enemies
MAYBE means that Overkill and Min/Max use are allowed.
Magma maps and Corrupted Voidmaps are currently classified as corrupted and Green-DontUse here will override the Force Maps/Force Voidmaps use of Scryer

Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. This feature was added for 1 person, use at your own risk.
Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); - createSetting('ScryUseinPoison', 'Scry in Poison','-1 to disable
, any other number sets a minimum zone to use S in Poison', 'value', -1, null, 'Scryer'); //should it override Overkill??? Copy this for Wind/Ice - createSetting('ScryUseinWind', 'Scry in Wind','-1 to disable
, any other number sets a minimum zone to use S in Wind', 'value', -1, null, 'Scryer'); - createSetting('ScryUseinIce', 'Scry in Ice','-1 to disable
, any other number sets a minimum zone to use S in Ice', 'value', -1, null, 'Scryer'); + createSetting('ScryUseinPoison', 'Scry in Poison','-1 to disable, any other number sets a minimum zone to use S in Poison', 'value', -1, null, 'Scryer'); //should it override Overkill??? Copy this for Wind/Ice + createSetting('ScryUseinWind', 'Scry in Wind','-1 to disable, any other number sets a minimum zone to use S in Wind', 'value', -1, null, 'Scryer'); + createSetting('ScryUseinIce', 'Scry in Ice','-1 to disable, any other number sets a minimum zone to use S in Ice', 'value', -1, null, 'Scryer'); From 9a2c069d4ac999ba2ff3bb14af8ec445bfb247af Mon Sep 17 00:00:00 2001 From: gen BTC Date: Thu, 29 Mar 2018 01:32:03 -0400 Subject: [PATCH 0025/3477] Settings fork commited --- AutoTrimps2.js | 22 +++++--- SettingsGUI.js | 130 +++++++++++++++++++++++-------------------- modules/equipment.js | 19 ++++--- modules/gather.js | 14 ++--- modules/magmite.js | 6 +- modules/maps.js | 4 +- modules/portal.js | 5 +- modules/scryer.js | 5 +- 8 files changed, 116 insertions(+), 89 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 0a7e231cb..47a8d6af4 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -206,15 +206,22 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) - if (getPageSetting('WorkerRatios')) workerRatios(); //"Auto Worker Ratios" (jobs.js) if (getPageSetting('BuyUpgrades')) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); if (agu && agu!='Off') autoGoldenUpgradesAT(agu); //"Golden Upgrades" (other.js) - 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" (") + if (getPageSetting('BuyBuildingsNew')===0); //"Buy Neither" (Buildings.js) + else if (getPageSetting('BuyBuildingsNew')==1) { buyBuildings(); buyStorage(); } //"Buy Buildings & Storage" (") + else if (getPageSetting('BuyBuildingsNew')==2) buyBuildings(); //"Buy Buildings" (") + else if (getPageSetting('BuyBuildingsNew')==3) buyStorage(); //"Buy Storage" (") + //if (getPageSetting('BuyStorage')) buyStorage(); //"Buy Storage" (buildings.js) (Can be removed now) + //if (getPageSetting('BuyBuildings')) buyBuildings(); //"Buy Buildings" (buildings.js) (Can be removed now) + if (getPageSetting('BuyJobsNew')===0); //"Don't Buy Jobs" (Jobs.js) + else if (getPageSetting('BuyJobsNew')==1) { workerRatios(); buyJobs(); } //"Auto Worker Ratios" (") + else if (getPageSetting('BuyJobsNew')==2) buyJobs(); //"Manual Worker Ratios" (") + //if (getPageSetting('BuyJobs')) buyJobs(); //"Buy Jobs" (jobs.js) (Can be removed now) + //if (getPageSetting('WorkerRatios')) workerRatios(); //"Auto Worker Ratios" (jobs.js) (Can be removed now) + if (getPageSetting('ManualGather2')<=1) manualLabor(); //"Auto Gather/Build" (gather.js) + else if (getPageSetting('ManualGather2')==2) manualLabor2(); //"Auto Gather/Build #2" (") 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) @@ -223,8 +230,9 @@ function mainLoop() { 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('UseScryerStance')) useScryerStance(); //"Use Scryer Stance" (scryer.js) - else if (getPageSetting('AutoStance')<=1) autoStance(); //"Auto Stance" (autostance.js) + else if (getPageSetting('AutoStance')<=1) autoStance(); //"Auto Stance" (stance.js) else if (getPageSetting('AutoStance')==2) autoStance2(); //"Auto Stance #2" (") + else if (getPageSetting('AutoStance')==3) autoStance3(); //"Auto Stance #3" (") if (getPageSetting('UseAutoGen')) autoGenerator(); //"Auto Generator ON" (magmite.js) ATselectAutoFight(); // pick the right version of Fight/AutoFight/BetterAutoFight/BAF2 (fight.js) var forcePrecZ = (getPageSetting('ForcePresZ')<0) || (game.global.worldThe Decision between AutoGather 1 or 2 is up to you, and they should be similar. Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); + createSetting('BuyUpgrades', 'Buy Upgrades', 'Autobuys non-equipment upgrades (those are controlled separately in the Gear tab).', 'boolean', true, null, "Core"); + //createSetting('ManageBreedtimerNew', ['Manual Breed Timer', 'Auto Breed Timer', 'Auto No Patience'], 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges, and accounts for the patience mastery.
[ON](Yellow): The same as above, but ignores patience and will not set a breed timer longer than 30s.
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'multitoggle', 1, null, "Core"); //This replaces the two settings below, but do we really need an option to ignore patience?? createSetting('ManageBreedtimer', 'Auto Breed Timer', 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges (0, 3.5s, 10s, 30s).
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'boolean', true, null, "Core"); - createSetting('UsePatience', 'Enable Patience', 'Sets the default breed timer to 45 seconds if you have the Patience mastery.', 'boolean', true, null, 'Core'); - createSetting('GeneticistTimer', 'Geneticist Timer', 'Manages the breed timer by hiring/firing Geneticists for the purpose of setting the ideal anticpation stacks. Disable with -1 to disable the Hiring/Firing of geneticists.
Info: Potency and Nursery buying behavior is adjusted dynamically (and disabling no longer disables potency). The Automatic Genetecist Hiring Process can best be summarized by: Buy/Wait/Die,Repeat. (if you do not die, no action is taken). Also self-kills (trimpicide) aka force abandon when your anti-stacks arent maxed out (conservatively).

Controlled automatically (locked) when Auto Breed Timer is on.', 'value', '30', null, "Core"); - createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Set a different breed timer target for the Spire. Use -1 to disable this special setting.', 'value', -1, null, 'Core'); + createSetting('GeneticistTimer', 'Geneticist Timer', 'Manages the breed timer by hiring/firing Geneticists for the purpose of setting the ideal anticpation stacks. Disable with -1 to disable the Hiring/Firing of geneticists.
Info: Potency and Nursery buying behavior is adjusted dynamically (and disabling no longer disables potency). The Automatic Genetecist Hiring Process can best be summarized by: Buy/Wait/Die,Repeat. (if you do not die, no action is taken). Also self-kills (trimpicide) aka force abandon when your anti-stacks aren\'t maxed out (conservatively).

Controlled automatically (locked) when Auto Breed Timer is on.', 'value', '30', null, "Core"); + createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Core'); + createSetting('BreedFire', 'Breed Fire', 'OPTIONAL. Fire Lumberjacks and Miners to speed up breeding when needed. Basically trades wood/metal to cut the wait between deaths down. Disclaimer: May heavily negatively impact wood-gathering. ', 'boolean', false, null, 'Core'); + createSetting('ManualCoords', 'Don\'t buy Coords', 'OPTIONAL. Enable this ONLY if you know what you\'re doing, disable it if you don\'t know what you\'re doing. For when manually handling coords means a lot on challenges like Trapper.', 'boolean', false, null, 'Core'); + //Line2 createSetting('AutoAllocatePerks', 'Auto Allocate Perks', 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. ', 'boolean', false, null, 'Core'); - createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Does Yesterday first, followed by Today. Falls back to selected challenge when both are complete.', 'boolean', false, null, 'Core'); + createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); + //createSetting('AutoFinishDailyZoneNew', 'Finish Daily Zone Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option!', 'valueNegative', 0, null, 'Core'); //This should make sense to replace the two below. createSetting('AutoFinishDaily', 'Auto Finish Daily', 'With this on, the He/Hr Portal and Custom Auto Portal options will auto-finish the daily whenever they trigger and THEN portal you.', 'boolean', true, null, 'Core'); createSetting('AutoFinishDailyZone', 'Finish Daily Zone Mod', 'Finish Daily by this # of zones earlier/later than your regular Custom AutoPortal zone or your Helium Dont Portal Before zone. When Auto Finish Daily is on. Tip: Tune your value of He/HrDontPortalBefore to suit the daily, and then tune this. Can accept negative numbers for earlier, ie: -7 means portal 7 zones earlier than normal. Can also use positive numbers to DELAY portaling for later. When used with He/Hr AutoPortal, the number of zones early does not FORCE end the daily at that zone, only ALLOW it to end that early: it will Always end when your HE/hr drops enough to trigger the portal. Use 0 to disable.', 'valueNegative', 0, null, 'Core'); - createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most challenges. Disable with -1.', 'value', -1, null, 'Core'); + createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); if (game.worldUnlocks.easterEgg) - createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core'); - createSetting('ManualCoords', 'Don\'t buy Coords', 'Enable it if you know what you\'re doing, disable it if you don\'t know what you\'re doing. For when manually handling coords means a lot on challenges like Trapper.', 'boolean', false, null, 'Core'); - //NewLine3 - document.getElementById('ManualCoords').parentNode.insertAdjacentHTML('afterend','
'); + createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core'); //could really be removed?? + createSetting('UsePatience', 'Enable Patience', 'Sets the default breed timer to 45 seconds if you have the Patience mastery.', 'boolean', true, null, 'Core'); + createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); + //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. + document.getElementById('TrapTrimps').parentNode.insertAdjacentHTML('afterend','
'); createSetting('AutoPortal', 'Auto Portal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); //document.getElementById("AutoPortal").style="font-size: 1.0vw;"; //fit it on 1 line. createSetting('HeliumHourChallenge', 'Portal Challenge:', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); @@ -274,10 +278,9 @@ function initializeAllSettings() { //Buildings - createSetting('BuyStorage', 'Buy Storage', 'Will buy storage when resource is almost full. (like AutoStorage, even anticipates Jestimp)', 'boolean', true, null, "Buildings"); - createSetting('BuyBuildings', 'Buy Buildings', 'Will buy non storage buildings as soon as they are available', 'boolean', true, null, "Buildings"); + createSetting('BuyBuildingsNew', ['Buy Neither','Buy Buildings & Storage', 'Buy Buildings', 'Buy Storage'], 'AutoBuys Storage when it is almost full (it even anticipates Jestimp) and Non-Storage Buildings (As soon as they are available). Takes cost efficiency into account before buying Non-Storage Buildings.', 'multitoggle', 1, null, "Buildings"); //This should replace the two below createSetting('WarpstationCap', 'Warpstation Cap', 'Do not level Warpstations past Basewarp+DeltaGiga **. Without this, if a Giga wasnt available, it would level infinitely (wastes metal better spent on prestiges instead.) **The script bypasses this cap each time a new giga is bought, when it insta-buys as many as it can afford (since AT keeps available metal/gems to a low, overbuying beyond the cap to what is affordable at that first moment is not a bad thing). ', 'boolean', true, null, 'Buildings'); - createSetting('WarpstationCoordBuy', 'Buy Warp to Hit Coord', 'If we are very close to hitting the next coordination, and we can afford the warpstations it takes to do it, Do it! (even if we are over the Cap/Wall). Recommended with WarpCap/WarpWall. (has no point otherwise) ', 'boolean', true, null, 'Buildings'); + createSetting('WarpstationCoordBuy', 'Buy Warp to Hit Coord', 'If we are very close to hitting the next coordination, and we can afford the warpstations it takes to do it, Do it! (even if we are over the Cap/Wall). Recommended with WarpCap/WarpWall. (has no point otherwise) ', 'boolean', true, null, 'Buildings'); //Can this just be removed? if it happens, its a good thing. createSetting('MaxHut', 'Max Huts', 'Huts', 'value', '100', null, "Buildings"); createSetting('MaxHouse', 'Max Houses', 'Houses', 'value', '100', null, "Buildings"); createSetting('MaxMansion', 'Max Mansions', 'Mansions', 'value', '100', null, "Buildings"); @@ -287,9 +290,9 @@ function initializeAllSettings() { createSetting('MaxGateway', 'Max Gateways', 'WARNING: Not recommended to raise above 25', 'value', '25', null, "Buildings"); createSetting('MaxWormhole', 'Max Wormholes', 'WARNING: Wormholes cost helium! Values below 0 do nothing.', 'value', '0', null, "Buildings"); createSetting('MaxCollector', 'Max Collectors', 'recommend: -1', 'value', '-1', null, "Buildings"); - createSetting('MaxGym', 'Max Gyms', 'Advanced. recommend: -1', 'value', '-1', null, "Buildings"); - createSetting('MaxTribute', 'Max Tributes', 'Advanced. recommend: -1 ', 'value', '-1', null, "Buildings"); - createSetting('GymWall', 'Gym Wall', 'Conserves Wood. Only buys 1 Gym when you can afford X gyms wood cost (at the first one\'s price, simple math). -1 or 0 to disable. In other words, only allows gyms that cost less than 1/nth your currently owned wood. (to save wood for nurseries for new z230+ Magma nursery strategy). Takes decimal numbers. (Identical to the Warpstation wall setting which is why its called that). Setting to 1 does nothing besides stopping gyms from being bought 2 at a time due to the mastery.', 'value', -1, null, 'Buildings'); + createSetting('MaxGym', 'Max Gyms', 'Advanced. recommend: -1', 'value', '-1', null, "Buildings"); //Remove? + createSetting('MaxTribute', 'Max Tributes', 'Advanced. recommend: -1 ', 'value', '-1', null, "Buildings"); //Remove? (More gems is never a bad thing...) + createSetting('GymWall', 'Gym Wall', 'Conserves Wood. Only buys 1 Gym when you can afford X gyms wood cost (at the first one\'s price, simple math). -1 or 0 to disable. In other words, only allows gyms that cost less than 1/nth your currently owned wood. (to save wood for nurseries for new z230+ Magma nursery strategy). Takes decimal numbers. (Identical to the Warpstation wall setting which is why its called that). Setting to 1 does nothing besides stopping gyms from being bought 2 at a time due to the mastery.', 'value', -1, null, 'Buildings'); //remove? //Line3 createSetting('FirstGigastation', 'First Gigastation', 'How many warpstations to buy before your first gigastation', 'value', '20', null, "Buildings"); createSetting('DeltaGigastation', 'Delta Gigastation', 'How many extra warpstations to buy for each gigastation. Supports decimal values. For example 2.5 will buy +2/+3/+2/+3...', 'value', '2', null, "Buildings"); @@ -302,27 +305,24 @@ function initializeAllSettings() { //Jobs - createSetting('BuyJobs', 'Buy Jobs', 'Buys jobs based on ratios configured below. CAUTION: you cannot manually assign jobs with this. Toggle if you need to.', 'boolean', true, null, "Jobs"); - createSetting('WorkerRatios', 'Auto Worker Ratios', 'Automatically changes worker ratios based on current progress. WARNING: overrides worker ratio settings. Settings: 1/1/1 up to 300k trimps, 3/3/5 up to 3mil trimps, then 3/1/4 above 3 mil trimps, then 1/1/10 above 1000 tributes, then 1/2/22 above 1500 tributes, then 1/12/12 above 3000 tributes.', 'boolean', true, null, "Jobs"); + createSetting('BuyJobsNew', ['Don\'t Buy Jobs','Auto Worker Ratios', 'Manual Worker Ratios'], 'Manual Worker Ratios buys jobs for your trimps according to the ratios below. Auto Worker ratios automatically changes these ratios based on current progress, overriding your ratio settings.
AutoRatios: 1/1/1 up to 300k trimps, 3/3/5 up to 3mil trimps, then 3/1/4 above 3 mil trimps, then 1/1/10 above 1000 tributes, then 1/2/22 above 1500 tributes, then 1/12/12 above 3000 tributes.
CAUTION: You cannot manually assign jobs with this, turn it off if you have to', 'multitoggle', 1, null, "Jobs"); createSetting('AutoMagmamancers', 'Auto Magmamancers', 'Auto Magmamancer Management. Hires Magmamancers when the Current Zone time goes over 10 minutes. Does a one-time spend of at most 10% of your gem resources. Every increment of 10 minutes after that repeats the 10% hiring process. Magmamancery mastery is accounted for, with that it hires them at 5 minutes instead of 10. Disclaimer: May negatively impact Gem count.', 'boolean', true, null, 'Jobs'); - createSetting('FarmerRatio', 'Farmer Ratio', '', 'value', '1', null, "Jobs"); + createSetting('FarmerRatio', 'Farmer Ratio', '', 'value', '1', null, "Jobs"); //realistically gems are not that useful by the time you have magmamancers... maybe just set it to only spend 50% of your gems at a time and leave it at that? 10% is kinda low anyway createSetting('LumberjackRatio', 'Lumberjack Ratio', '', 'value', '1', null, "Jobs"); createSetting('MinerRatio', 'Miner Ratio', '', 'value', '1', null, "Jobs"); - createSetting('MaxScientists', 'Max Scientists', 'Enable or disable hiring of scientists or Cap your scientists. (This is NOT a ratio, it is an absolute number). Recommend: -1 (infinite cap, hiring controls itself). 0 means Dont Hire Scientists at all. Any other number sets the population cap, not the ratio. Scientist ratio can be controlled by internal variable: MODULES[\\"jobs\\"].scientistRatio = 25; Example Math Behind It: ScientistRatio=(FarmerRatio+LumberjackRatio+MinerRatio)/25.', 'value', '-1', null, "Jobs"); + //createSetting('ScientistRatio', 'Scientist Ratio', 'Advanced. This will allow you to cap your scientist to worker ratio, as well as disable the hiring of scientists.
-1 Allows the ratio to be set automatically (Recommended)
0 Turns off Scientist hiring
\>0 Set a custom ratio.', 'value', '-1', null, "Jobs"); + createSetting('MaxScientists', 'Max Scientists', 'Advanced. Cap your scientists (This is a ratio not an absolute number). recommend: -1 (infinite still controls itself)', 'value', '-1', null, "Jobs"); //Line2 - createSetting('MaxExplorers', 'Max Explorers', 'Advanced. Cap your explorers. recommend: -1', 'value', '-1', null, "Jobs"); - createSetting('MaxTrainers', 'Max Trainers', 'Advanced. Cap your trainers. recommend: -1', 'value', '-1', null, "Jobs"); - createSetting('TrainerCaptoTributes', 'Cap Trainers %', 'Only Buy a Trainer when its cost is LESS than X% of cost of a tribute. This setting can work in combination with the other one, or set the other one to -1 and this will take full control. Default: -1 (Disabled). 50% is close to the point where the cap does nothing. You can go as low as you want but recommended is 10% to 1%. (example: Trainer cost of 5001, Tribute cost of 100000, @ 5%, it would NOT buy the trainer.)', 'value', '-1', null, 'Jobs'); - createSetting('BreedFire', 'Breed Fire', 'OPTIONAL. Fire Lumberjacks and Miners to speed up breeding when needed. Basically trades wood/metal to cut the wait between deaths down. Disclaimer: May heavily negatively impact wood-gathering. ', 'boolean', false, null, 'Jobs'); + createSetting('MaxExplorers', 'Max Explorers', 'Advanced. Cap your explorers (This is a ratio not an absolute number). recommend: -1', 'value', '-1', null, "Jobs"); //Explorers are important now! outdated setting tbh + createSetting('MaxTrainers', 'Max Trainers', 'Advanced. Cap your trainers (This is a ratio not an absolute number). recommend: -1', 'value', '-1', null, "Jobs"); //by the time that you stop needing block, food is abundant + createSetting('TrainerCaptoTributes', 'Cap Trainers %', 'Only Buy a Trainer when its cost is LESS than X% of cost of a tribute. This setting can work in combination with the other one, or set the other one to -1 and this will take full control. Default: -1 (Disabled). 50% is close to the point where the cap does nothing. You can go as low as you want but recommended is 10% to 1%. (example: Trainer cost of 5001, Tribute cost of 100000, @ 5%, it would NOT buy the trainer.)', 'value', '-1', null, 'Jobs'); //this is a bit unnecessary, resource management by the script is already sufficient. //GEAR: - createSetting('BuyArmor', 'Buy Armor Levels', 'Auto-Buy/Level-Up the most cost efficient armor available. ', 'boolean', true, null, "Gear"); - createSetting('BuyArmorUpgrades', 'Buy Armor Prestiges', '(Prestiges) & Gymystic. Will buy the most efficient armor upgrade available. ', 'boolean', true, null, "Gear"); - createSetting('BuyWeapons', 'Buy Weapon Levels', 'Auto-Buy/Level-Up the most cost efficient weapon available. ', 'boolean', true, null, "Gear"); - createSetting('BuyWeaponUpgrades', 'Buy Weapon Prestiges', '(Prestiges) Will buy the most efficient weapon upgrade available. ', 'boolean', true, null, "Gear"); + createSetting('BuyArmorNew', ['Armor: Buy Neither','Armor: Buy Both', 'Armor: Prestiges', 'Armor: Levels'], 'AutoBuys Prestiges and Levels up the most cost efficient Armor available. Gymystic buying is controlled under this setting\'s prestige option', 'multitoggle', 1, null, "Gear"); //This should replace the two below + createSetting('BuyWeaponsNew', ['Weapons: Buy Neither','Weapons: Buy Both', 'Weapons: Prestiges', 'Weapons: Levels'], 'AutoBuys Prestiges and Levels up the most cost efficient Weapon available.', 'multitoggle', 1, null, "Gear"); //This should replace the two below createSetting('CapEquip2', 'Cap Equip to', 'Do not level equipment past this number. Helps stop wasting metal when the script levels-up equip High, only to prestige right after. Recommended value: earlygame 10, lategame: 100. Disable with -1 or 0. NEW: Also sub-caps to 10% of your number during liquified or overkilled(under 25sec) zones. This does not mean the script always hits the cap. Your Equip will now always be leveled to at least 2 since its the most effective level. It will only be leveled however if you dont have enoughHealth or enoughDamage. But During Spire, everything will be leveled up to the cap.
Hidden var: MODULES[\\"equipment\\"].capDivisor = 10; //number to divide your normal cap by.', 'value', 10, null, 'Gear'); createSetting('DynamicPrestige2', 'Dynamic Prestige z', 'Dynamic Prestige: Set Target Zone number: Z #. (disable with 0 or -1)
Skip getting prestiges at first, and Gradually work up to the desired Prestige setting you have set (set the Prestige dropdown to the highest weapon you want to end up on at the target zone you set here). Runs with Dagger to save a significant amount of time until we need better gear, then starts increasing the prestige setting near the end of the run. Examines which prestiges you have, how many missing ones youd need to achieve the desired target and starts running maps every zone (more maps for higher settings), Until the target prestige is reached. ', 'value', -1, null, 'Gear'); createSetting('Prestige', 'Prestige', 'Acquire prestiges through the selected item (inclusive) as soon as they are available in maps. Forces equip first mode. Automap must be enabled. THIS IS AN IMPORTANT SETTING related to speed climbing and should probably always be on something. If you find the script getting stuck somewhere, particularly where you should easily be able to kill stuff, setting this to an option lower down in the list will help ensure you are more powerful at all times, but will spend more time acquiring the prestiges in maps.', 'dropdown', 'Polierarm', ['Off', 'Supershield', 'Dagadder', 'Bootboost', 'Megamace', 'Hellishmet', 'Polierarm', 'Pantastic', 'Axeidic', 'Smoldershoulder', 'Greatersword', 'Bestplate', 'Harmbalest', 'GambesOP'], "Gear"); @@ -335,8 +335,7 @@ function initializeAllSettings() { }; //Line2: createSetting('ForcePresZ', 'Force Prestige Z', 'On and after this zone is reached, always try to prestige for everything immediately, ignoring Dynamic Prestige settings and overriding that of Linear Prestige. Prestige Skip mode will exit this. Disable with -1.', 'value', -1, null, 'Gear'); - createSetting('PrestigeSkipMode', 'Prestige Skip Mode', 'If there are more than 2 Unbought Prestiges (besides Shield), ie: sitting in your upgrades window but you cant afford them, AutoMaps will not enter Prestige Mode, and/or will exit from it. The amount of unboughts can be configured with this variable MODULES[\\"maps\\"].SkipNumUnboughtPrestiges = 2;', 'boolean', false, null, "Gear"); - createSetting('PrestigeSkip2', 'Prestige Skip 2', 'If there are 2 or fewer Unobtained Weapon Prestiges in maps, ie: there are less than 2 types to run for, AutoMaps will not enter Prestige Mode, and/or will exit from it. For users who tends to not need the last few prestiges due to resource gain not keeping up. The amount of unboughts can be configured with MODULES.maps.UnearnedPrestigesRequired. If PrestigeSkipMode is enabled, both conditions need to be reached before exiting.', 'boolean', false, null, 'Gear'); + createSetting('PrestigeSkip1_2', ['Prestige Skip Off','Prestige Skip 1 & 2', 'Prestige Skip 1', 'Prestige Skip 2'], 'Prestige Skip 1: If there are more than 2 Unbought Prestiges (besides Shield), ie: sitting in your upgrades window but you cant afford them, AutoMaps will not enter Prestige Mode, and/or will exit from it. The amount of unboughts can be configured with this variable MODULES[\\"maps\\"].SkipNumUnboughtPrestiges = 2;
Prestige Skip 2: If there are 2 or fewer Unobtained Weapon Prestiges in maps, ie: there are less than 2 types to run for, AutoMaps will not enter Prestige Mode, and/or will exit from it. For users who tends to not need the last few prestiges due to resource gain not keeping up. The amount of unboughts can be configured with MODULES.maps.UnearnedPrestigesRequired. If PrestigeSkipMode is enabled, both conditions need to be reached before exiting.', 'multitoggle', 0, null, "Gear"); createSetting('DelayArmorWhenNeeded', 'Delay Armor Prestige', 'Delays buying armor prestige-upgrades during Want More Damage or Farming automap-modes, Although if you need health AND damage, it WILL buy armor prestiges tho. NOTE: Applies to Prestiges only', 'boolean', false, null, 'Gear'); createSetting('BuyShieldblock', 'Buy Shield Block', 'Will buy the shield block upgrade. CAUTION: If you are progressing past zone 60, you probably don\'t want this :)', 'boolean', false, null, "Gear"); @@ -346,27 +345,28 @@ function initializeAllSettings() { //AutoMaps + VoidMaps settings: //Could combine automaps and run unique maps into one 3 way toggle: Automaps on, Non-unique maps only, Automaps off. createSetting('AutoMaps', ["Auto Maps Off","Auto Maps","Auto Maps No Unique"], 'Recommended. Automatically run maps to progress. Very Important. Has multiple modes: Prestige, Voids, Want more Damage, Want more Health, Want Health & Damage, and Farming.Prestige takes precedence and does equal level maps until it gets what is needed as per Autotrimps Prestige dropdown setting. Voids is self explanatory: use the Void Difficulty Check setting to control the amount of farming. If \'want more damage\', it will only do 10 maps for 200% mapbonus damage bonus. If \'Farming\', it does maps beyond 10 if the displayed number is over >16x. \'Want more health[or and damage]\' is basically just a status message telling you need more health, theres not much that can be done besides tell AutoLevelEquipment to keep buying stuff. If you \'want health\' but your damage is OK to continue, invest in more HP perks.

Unique Maps are run automatically unless disabled.
Uniques Required to auto-run The Wall and Dimension of Anger. Also Required for challenges: Electricity, Mapocalypse, Meditate, and Crushed (etc) to complete their AutoPortal.

Maps/Levels:
The Block - 12
The Wall - 16
Dimension of Anger - 21
Trimple Of Doom - 34
The Prison - 82
Bionic Wonderland (only during Crushed) @ 127
NOTE: This should generally be on.
NOTE: Run Bionic Before Spire prevents the setting of Unique.
NOTICE: This does NOT auto-run all your Bionics according to your lack of Robotrimp status or whether you pass a certain level (yet).', 'multitoggle', 1, null, "Maps"); - createSetting('DynamicSiphonology', 'Dynamic Siphonology', 'Recommended Always ON. Use the right level of siphonology based on your damage output. IE: Only uses siphonology if you are weak. With this OFF it means it ALWAYS uses the lowest siphonology map you can create. Siphonology is a perk you get at level 115-125ish, and means you receive map bonus stacks for running maps below your current zone - Up to 3 zones below (1 per perk level).', 'boolean', true, null, 'Maps'); - createSetting('PreferMetal', 'Prefer Metal Maps', 'ADVANCED: Always prefer metal maps, intended for manual use, such as pre-spire farming. Remember to turn it back off after you\'re done farming! Usually helps for pre-spire. Use on x90-x99 zones.', 'boolean', false, null, 'Maps'); + createSetting('DynamicSiphonology', 'Dynamic Siphonology', 'Recommended Always ON. Use the right level of siphonology based on your damage output. IE: Only uses siphonology if you are weak. With this OFF it means it ALWAYS uses the lowest siphonology map you can create. Siphonology is a perk you get at level 115-125ish, and means you receive map bonus stacks for running maps below your current zone - Up to 3 zones below (1 per perk level).', 'boolean', true, null, 'Maps'); //Should always be on? + createSetting('PreferMetal', 'Prefer Metal Maps', 'Always prefer metal maps, intended for manual use, such as pre-spire farming. Remember to turn it back off after you\'re done farming!', 'boolean', false, null, 'Maps'); //rarely better tbh createSetting('MaxMapBonusAfterZone', 'Max MapBonus After', 'Always gets Max Map Bonus from this zone on. (inclusive and after).
NOTE: Set -1 to disable entirely (default). Set 0 to use it always.
Advanced:User can set a lower number than the default 10 maps with the AT hidden console command: MODULES[\\"maps\\"].maxMapBonusAfterZ = 9;', 'value', '-1', null, 'Maps'); createSetting('DisableFarm', 'Disable Farming', 'Disables the extended farming algorithm of the AutoMaps part of the script. Always returns to the world after reaching 10 map stacks. Use at your own risk. (No need to refresh anymore)', 'boolean', false, null, 'Maps'); createSetting('LowerFarmingZone', 'Lower Farming Zone', 'Lowers the zone used during Farming mode. Uses the dynamic siphonology code, to Find the minimum map level you can successfully one-shot, and uses this level for any maps done after the first 10 map stacks. The difference being it goes LOWER than what Siphonology gives you map-bonus for, but after 10 stacks you dont need bonus, you just want to do maps that you can one-shot. Goes as low as 10 below current zone if your damage is that bad, but this is extreme and indicates you should probably portal.', 'boolean', true, null, 'Maps'); //Line2 - createSetting('MaxStacksForSpire', 'Max Map Bonus for Spire', 'Get max map bonus before running the Spire.', 'boolean', false, null, 'Maps'); + createSetting('MaxStacksForSpire', 'Max Map Bonus for Spire', 'Get max map bonus before running the Spire.', 'boolean', false, null, 'Maps'); //Does farm before spire not cover this fairly well anyway? grabbing +1 equips would make way more difference anyway createSetting('MinutestoFarmBeforeSpire', 'Farm Before Spire', 'Farm level 200/199(or BW) maps for X minutes before continuing onto attempting Spire.
NOTE: Set 0 to disable entirely (default).
Setting to -1/Infinite does not work here, set a very high number instead.', 'value', '0', null, 'Maps'); createSetting('IgnoreSpiresUntil', 'Ignore Spires Until', 'Spire specific settings like end-at-cell are ignored until at least this zone is reached (0 to disable).
Does not work with Run Bionic Before Spire.', 'value', '200', null, 'Maps'); - createSetting('RunBionicBeforeSpire', 'Run Bionic Before Spire', 'CAUTION: Runs Bionic Wonderlands and repeatedly farms Bionic VI @ level 200 before attempting Spire, for the purpose of resource farming. Then it attempts the spire. The Minutes-Before-Spire timer runs concurrently to this, and needs to be set. If not set, it will exit without doing any Bionics... You can un-toggle it on the fly.
NOTE: Turning this on also mandates that AutoMaps + Unique Maps be on.
WARNING: These 100 square maps take ~3x longer than normal maps.
WARNING: If you dont have Bionic Magnet mastery, this will run the 5 pre-requisites and take longer.
NOTE: In fact, it may not be what you want at all.', 'boolean', false, null, 'Maps'); + createSetting('RunBionicBeforeSpire', 'Run Bionic Before Spire', 'CAUTION: Runs Bionic Wonderlands and repeatedly farms Bionic VI @ level 200 before attempting Spire, for the purpose of resource farming. Then it attempts the spire. The Minutes-Before-Spire timer runs concurrently to this, and needs to be set. If not set, it will exit without doing any Bionics... You can un-toggle it on the fly.
NOTE: Turning this on also mandates that Run Unique Maps be on.
WARNING: These 100 square maps take ~3x longer than normal maps.
WARNING: If you dont have Bionic Magnet mastery, this will run the 5 pre-requisites and take longer.
NOTE: In fact, it may not be what you want at all.', 'boolean', false, null, 'Maps'); //OUTDATED! createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Maps'); createSetting('CorruptionCalc', 'Corruption Farm Mode', 'Recommended. Enabling this will cause the Automaps routine to take amount of corruption in a zone into account, to decide whether it should do maps first for map bonus. ONLY in Zone 181+ (or Headstart 1,2,3 zone: 176,166,151) ', 'boolean', true, null, 'Maps'); createSetting('FarmWhenNomStacks7', 'Farm on >7 NOMstacks', 'Optional. If Improbability already has 5 NOMstacks, stack 30 Anticipation. If the Improbability has >7 NOMstacks on it, get +200% dmg from MapBonus. If we still cant kill it, enter Farming mode at 30 stacks, Even with DisableFarming On! (exits when we get under 10x). Farms if we hit 100 stacks in the world. If we ever hit (100) nomstacks in a map (likely a voidmap), farm, (exit the voidmap) and (prevent void from running, until situation is clear). Restarts any voidmaps if we hit 100 stacks. ', 'boolean', false, null, 'Maps'); //Line3 createSetting('VoidMaps', 'Void Maps', 'The zone at which you want all your void maps to be cleared (Cell 96). 0 is off', 'value', '0', null, "Maps"); + //createSetting('RunNewVoidsUntilNew', 'Run New Voids Until', '-1 to disable. This allows you to run new Void Maps obtained after the set void map zone. Runs them at Cell 95 by default, unless you set a decimal value indicating the cell (example: 187.75). The number that you put in here will cap what zone new Void Maps will run at, inclusive of the zone you type. CAUTION: May severely slow you down by trying to do too-high level void maps. ', 'value', '-1', null, 'Maps'); //Should replace the two below createSetting('RunNewVoids', 'Run New Voids', 'Run new void maps acquired after the set void map zone. Runs them at Cell 95 by default, unless you set a decimal value indicating the cell, like: 187.75 CAUTION: May severely slow you down by trying to do too-high level voidmaps. Use the adjacent RunNewVoidsUntil setting to limit this.', 'boolean', false, null, 'Maps'); createSetting('RunNewVoidsUntil', 'New Voids Until', 'Run New Voids Until: Put a cap on what zone new voids will run at, until this zone, inclusive. ', 'value', '-1', null, 'Maps'); //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); createSetting('MaxTox', 'Max Toxicity Stacks', 'Get maximum toxicity stacks before killing the improbability in each zone 60 and above. Generally only recommended for 1 run to maximize bone portal value. This setting will revert to disabled after a successful Max-Tox run + Toxicity Autoportal.', 'boolean', false, null, 'Maps'); - createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); + createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. createSetting('AdvMapSpecialModifier', 'Map Special Modifier', 'EXPERIMENTAL. Attempt to select the BEST map special attacks mod. With this on, this will replace the normal behavior. If bugs, please report as this will become more default soon.', 'boolean', false, null, 'Maps'); @@ -374,19 +374,20 @@ function initializeAllSettings() { //Combat //Subsection1Line1 - createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2'], '3-Way Button, Recommended. Will automatically handle fighting. The decision between BetterAutoFight 1 or 2 is up to your own discretion. The new BAF#2 does: A)Click fight anyway if we are dead and stuck in a loop due to Dimensional Generator and we can get away with adding time to it.(RemainingTime + ArmyAdd.Time < GeneTimer) and B) Clicks fight anyway if we are dead and have >=31 NextGroupTimer and deal with the consequences by firing genetecists afterwards. WARNING: If you autoportal with BetterAutoFight disabled, the game sits there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 1, null, "Combat"); - createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. ', 'multitoggle', 1, null, "Combat"); + createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2',], '3-Way Button, Recommended. Will automatically handle fighting. The decision between BetterAutoFight 1 or 2 is up to your own discretion. The new BAF#2 does: A)Click fight anyway if we are dead and stuck in a loop due to Dimensional Generator and we can get away with adding time to it.(RemainingTime + ArmyAdd.Time < GeneTimer) and B) Clicks fight anyway if we are dead and have >=31 NextGroupTimer and deal with the consequences by firing genetecists afterwards. WARNING: If you autoportal with BetterAutoFight disabled, the game sits there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 1, null, "Combat"); + createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. Better Autofight 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); + createSetting('WindStacking', 'Stack Wind Zones', 'For use with AutoStance 3, enables windstacking (Get 200 windstacks then change to D, kill bad guy, then repeat)', 'boolean', false, null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['Don\'t care', 'Power Saving', 'Only Rush Voids'], 'Avoid killing your army impatiently. Don\'t force abandon trimps when prestiging. Will still Die To Use Z and aggressively autostance to aid progression and anything else. Made for Empower daily, you might find it helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens. Only Rush Voids will allow considering abandoning, not force one. Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks arent maxed, force abandon and grab a new group. Located in the geneticist management script.', 'boolean', true, null, 'Combat'); - createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); + createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); //Scryer - createSetting('UseScryerStance', 'Use Scryer Stance', 'MASTER BUTTON Stay in Scryer stance in z181 and above (Overrides Autostance). Falls back to regular Autostance when not in use (so leave that on). Get 2x resources or Dark Essence. All other buttons have no effect if this one is off.', 'boolean', true, null, 'Scryer'); + createSetting('UseScryerStance', 'Use Scryer Stance', 'MASTER BUTTON Stay in Scryer stance in z181 and above (Overrides Autostance). Falls back to regular Autostance when not in use (so leave that on). Get 2x resources or Dark Essence. All other buttons have no effect if this one is off (INCLUDING OVERKILL).', 'boolean', true, null, 'Scryer'); createSetting('ScryerUseWhenOverkill', 'Use When Overkill', 'Use when we can Overkill in S stance, for double loot with no speed penalty. Recommend this be on. NOTE: This being on, and being able to overkill in S will override ALL other settings (Except never use in spire). This is a boolean logic shortcut that disregards all the other settings including Min and Max Zone. If you ONLY want to use S during Overkill, as a workaround: turn this on and Min zone: to 9999 and everything else off(red). ', 'boolean', true, null, 'Scryer'); createSetting('ScryerMinZone', 'Min Zone', 'Minimum zone to start using scryer in.(inclusive) Recommend:(60 or 181). This needs to be On & Valid for options other than Overkill to work. Tip: Use 9999 to disable all other Non-Overkill scryer usage.', 'value', '181', null, 'Scryer'); createSetting('ScryerMaxZone', 'Max Zone', 'Zone to STOP using scryer at.(not inclusive) Recommend: Leave off (0 or -1 to disable: doesnt prevent options other than Overkill from working.) Positive numbers DO disable it past that zone. ', 'value', '230', null, 'Scryer'); @@ -396,9 +397,8 @@ function initializeAllSettings() { //Line2 createSetting('ScryerSkipBoss2', ['Default on Cell 100', 'Never Use on Cell 100 above VoidLevel', 'Never Use on Cell 100 (ALL Levels)'], 'On cell 100: Default/Never Use(above VoidLevel)/Never Use(ALL Levels). Overkill overrides this setting. Doesnt use Scrying stance for world Improbabilities/Bosses (cell 100) if you are past the level you have your VoidMaps set to run at. (or all levels, if set.) Default treats cell 100 like any other cell.', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerSkipCorrupteds2', ['Maybe Use S on Corrupteds', 'Dont Use S on Corrupteds'], 'Overkill overrides this setting, even on Dont Use. Turning this Green doesnt use S stance for corrupted cells UNLESS you can overkill them. Red/Maybe just means default (corrupteds are treated like normal cells), so something else has to be ON to trigger Scryer to be used. Magma maps and Corrupted Voidmaps are classified under this box as corrupted and Green-DontUse here will override the ForceMaps/ForceVoidmaps (for now)', 'multitoggle', 0, null, 'Scryer'); - createSetting('ScryerDieToUseS', 'Die To Use S', 'Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So youd rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. This feature was added for 1 person, use at your own risk.', 'boolean', false, null, 'Scryer'); - createSetting('ScryerDieZ', 'Scryer Suicide Z', 'You know, Die To Use S is helpful and all, but sometimes it doesn\'t matter in early zones. Don\'t you think so? That was a rhetorical question, don\'t answer it. Like Void Maps config, you can put a decimal value for cell, like 230.60 for after zone 230 for >= 60th cell.', 'value', 230.60, null, 'Scryer'); - //createSetting('ScryUseinPoison', ' Scry in Poison', ['Maybe Use in Poison', 'Force Use in Poison', 'Never Use in Poison'] + createSetting('ScryerDieZ', 'Die To Use S','-1 to disable. Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. This feature was added for 1 person, use at your own risk.
Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); + //createSetting('ScryUseinPoison', ' Scry in Poison', ['Never Use in Poison', 'Force Use in Poison', 'Maybe Use in Poison']'Maybe/Force/Never Use in Poison. Never WILL override the Overkill setting Maybe means default - treat Poison like any other cell (something else has to be ON to trigger Scryer). Force = Always use S.', 'multitoggle', 1, null, 'Scryer'); //should it override Overkill??? Copy this for Wind/Ice @@ -414,16 +414,14 @@ function initializeAllSettings() { createSetting('AutoGen2Override', ['Override Final Only', 'Strong Override'], 'Overrides apply to the final mode (always use early mode), or also to early mode (will stop microtick etc). Normal will not change anything.', 'multitoggle', 1, null, 'Magma'); createSetting('AutoMagmiteSpender2', ['Spend Magmite OFF', 'Spend Magmite (Portal)', 'Spend Magmite Always'], 'Auto Spends any unspent Magmite immediately before portaling. (Or Always, if toggled). Part 1 buys any permanent one-and-done upgrades in order from most expensive to least. Part 2 then analyzes Efficiency vs Capacity for cost/benefit, and buys Efficiency if its BETTER than Capacity. If not, if the PRICE of Capacity is less than the price of Supply, it buys Capacity. If not, it buys Supply. And then it repeats itself until you run out of Magmite and cant buy anymore. For Magma z230+ purposes.', 'multitoggle', 1, null, 'Magma'); createSetting('SupplyWall', 'Throttle Supply (or Capacity)', 'Positive number NOT 1 e.g. 2.5: Consider Supply when its cost * 2.5 is < Capacity, instead of immediately when < Cap. Effectively throttles supply for when you don\'t need too many.

Negative number (-1 is ok) e.g. -2.5: Consider Supply if it costs < Capacity * 2.5, buy more supplys! Effectively throttling capacity instead.

Set to 1: DISABLE SUPPLY only spend magmite on Efficiency, Capacity and Overclocker. (For some end game players, supply is worth probably figuratively nothing.)
Set to 0: IGNORE SETTING and use old behaviour (will still try to buy overclocker)', 'valueNegative', 2, null, 'Magma'); - createSetting('OneTimeOnly', 'One Time / Overclock Only', 'Makes the magmite spending sequence only buy one time upgrades and overclock, ignoring Efficiency, Capacity and Supply. Intended for manual use. Does not disable itself.', 'boolean', false, null, 'Magma'); - createSetting('BuyOvclock', 'Buy Overclock', 'Turn this off to not buy anymore overclocks. Will still buy the first level if you don\'t already own it.', 'boolean', true, null, 'Magma'); + createSetting('BuyOneTimeOC', ['Buy OneTime Only (No OC)', 'Maybe Buy OneTime & OC', 'Maybe Buy OneTime (No OC)', 'Buy OneTime & OC Only'], 'Buy OneTime Only (No OC) = ONLY BUYS ONE TIME UPGRADES, NOTHING ELSE.
Maybe Buy OneTime & OC = Normal spending, will consider Overclocker and One Time Upgrades
Maybe Buy OneTime (No OC) = Normal Spending, but will NOT Buy Overclocker (Will still buy the first level if you don\'t have it).
Buy OneTime & OC Only = Will Force spend magmite on these two only, ignoring Efficiency, Capacity and Supply.
Recommend Default (Maybe Buy OneTime & OC)', 'multitoggle', 1, null, 'Magma'); createSetting('MagmiteExplain', 'Magmite spending behaviour', '1. Buy one-and-done upgrades, expensive first, then consider 1st level of Overclocker;
2. Buy Overclocker IF AND ONLY IF we can afford it;
2.5. Exit if OneTimeOnly
3. Buy Efficiency if it is better than capacity;
4. Buy Capacity or Supply depending on which is cheaper, or based on SupplyWall', 'infoclick', 'MagmiteExplain', null, 'Magma'); //Heirloom Settings - createSetting('AutoHeirlooms', 'Auto Heirlooms', 'Automatically evaluate and carry the best heirlooms, and recommend upgrades for equipped items. AutoHeirlooms will only change carried items when the heirlooms window is not open. Carried items will be compared and swapped with the types that are already carried. If a carry spot is empty, it will be filled with the best shield (if available). Evaluation is based ONLY on the following mods (listed in order of priority, high to low): Void Map Drop Chance/Trimp Attack, Crit Chance/Crit Damage, Miner Efficiency/Metal Drop, Gem Drop/Dragimp Efficiency, Farmer/Lumberjack Efficiency. For the purposes of carrying, rarity trumps all of the stat evaluations. Empty mod slots are valued at the average value of the best missing mod.', 'boolean', false, null, "Heirlooms"); - createSetting('AutoHeirlooms2', 'Auto Heirlooms2', 'IMPORTANT SETTING. New algorithm for Heirlooms. While enabled, the old AutoHeirlooms algorithm will be disabled (the button will stay lit or you can turn that one off). CAUTION: Turning this on will immediately re-sort your heirlooms according to the new algorithm, and turning it off again DOES revert to the original algorithm even though it may NOT have a visible result on your heirlooms. (fyi: This lack of action highlights one of the problems with the old one.) ', 'boolean', false, null, 'Heirlooms'); + createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'AutoHeirlooms 1 = Automatically evaluate and carry the best heirlooms, and recommend upgrades for equipped items. AutoHeirlooms will only change carried items when the heirlooms window is not open. Carried items will be compared and swapped with the types that are already carried. If a carry spot is empty, it will be filled with the best shield (if available). Evaluation is based ONLY on the following mods (listed in order of priority, high to low): Void Map Drop Chance/Trimp Attack, Crit Chance/Crit Damage, Miner Efficiency/Metal Drop, Gem Drop/Dragimp Efficiency, Farmer/Lumberjack Efficiency. For the purposes of carrying, rarity trumps all of the stat evaluations. Empty mod slots are valued at the average value of the best missing mod.
AutoHeirlooms 2 = New algorithm for Heirlooms. CAUTION: Turning this on will immediately re-sort your heirlooms according to the new algorithm, and turning it off again DOES revert to the original algorithm even though it may NOT have a visible result on your heirlooms. (fyi: This lack of action highlights one of the problems with the old one.', 'multitoggle', 0, null, 'Heirlooms'); createSetting('AutoUpgradeHeirlooms', 'Auto Upgrade Heirlooms', 'Automatically buys the upgrades the script advises for the Equipped shield and staff, until we are out of nullifium.', 'boolean', false, null, 'Heirlooms'); @@ -433,7 +431,7 @@ function initializeAllSettings() { createSetting('goldStrat', 'Auto Golden Strategy', 'VOID ONLY: After max Void golden upgrades, alternate between buying helium and battle upgrades. Or Choose a Zone to switch over completely at (zones lower than X will buy only battle, and zones higher than X only helium). Battle can be disabled completely with the goldNoBattle button. MAX THEN HELIUM setting so you can get the perfect 60% Voids then Helium', 'dropdown', 'Max then Helium', ["Off", "Alternating", "Zone", "Max then Helium"], 'Golden'); createSetting('goldAlternating', 'GU VOID: Alternating', 'Buy a helium upgrade after X-1 battle upgrades have been purchased', 'value', '2', null, 'Golden'); createSetting('goldZone', 'GU VOID: Zone', 'Buy a helium upgrade until zone X, then buy battle upgrades.', 'value', '200', null, 'Golden'); - createSetting('goldNoBattle', 'GU VOID: No Battle', 'Dont ever buy battle upgrades.', 'boolean', true, null, 'Golden'); + createSetting('goldNoBattle', 'GU VOID: No Battle', 'Green = Do NOT buy Battle Upgrades
Red = Buy Battle Upgrades.', 'boolean', true, null, 'Golden'); @@ -452,9 +450,10 @@ function initializeAllSettings() { document.getElementById('battleSideTitle').setAttribute('onclick','MODULES["performance"].EnableAFKMode()'); document.getElementById('battleSideTitle').setAttribute('onmouseover', "getZoneStats(event);this.style.cursor='pointer'"); createSetting('ChangeLog', 'Show Changelog', '(Action Button). Shows the changelog popup message that AT loads on startup again, in case you missed it. The blue color means this is not a settable setting, just a button.', 'action', 'printChangelog()', null, 'Display'); + createSetting('ShowSettings', 'Show Extra Settings', 'Show/Hide settings that are rarely useful', 'boolean', true, null, 'Display') document.getElementById('Display').lastChild.insertAdjacentHTML('afterend','
'); -//SPAM settings: +//SPAM settings: //Subsection2Line1 createSetting('SpamGeneral', 'General Spam', 'General Spam = Notification Messages, Auto He/Hr', 'boolean', true, null, 'Display'); createSetting('SpamUpgrades', 'Upgrades Spam', 'Upgrades Spam', 'boolean', true, null, 'Display'); @@ -469,7 +468,7 @@ function initializeAllSettings() { createSetting('SpamPerks', 'AutoPerks Spam', 'Everything in related to AutoPerks', 'boolean', true, null, 'Display'); - + // Export/Import/Default settings createSetting('ImportAutoTrimps', 'Import AutoTrimps', 'Import your AutoTrimps Settings. Asks you to name it as a profile afterwards.', 'infoclick', 'ImportAutoTrimps', null, 'Import Export'); createSetting('ExportAutoTrimps', 'Export AutoTrimps', 'Export your AutoTrimps Settings as a output string text formatted in JSON.', 'infoclick', 'ExportAutoTrimps', null, 'Import Export'); @@ -786,15 +785,19 @@ function autoPlusSettingsMenu() { function updateCustomButtons() { //console.log("GUI: CustomButtons Updated"); - //Check for Theme Changed, and swap theme: + if (lastTheme && game.options.menu.darkTheme.enabled != lastTheme) { if (typeof MODULES["graphs"] !== 'undefined') MODULES["graphs"].themeChanged(); + debug("Theme change - AutoTrimps styles updated."); + } + lastTheme = game.options.menu.darkTheme.enabled; function toggleElem(elem, showHide) { + var $item = document.getElementById(elem); + if ($item == null) return; var state = showHide ? '' : 'none'; var stateParent = showHide ? 'inline-block' : 'none'; - var item = document.getElementById(elem); - item.style.display = state; - item.parentNode.style.display = stateParent; + $item.style.display = state; + $item.parentNode.style.display = stateParent; } function turnOff(elem) { toggleElem(elem, false); @@ -821,7 +824,16 @@ function updateCustomButtons() { //if HeHr is not selected, remove HeHr buffer settingsbox (heHr) ? turnOn("HeliumHrBuffer") : turnOff("HeliumHrBuffer"); //if ShieldBlock is for sure, remove ShieldBlock from settingsbox (achievement=12 means z100). - (game.achievements.zones.finished < 12) ? turnOn("BuyShieldblock") : function(){turnOff("BuyShieldblock");setPageSetting("BuyShieldblock",false);}(); + //(game.achievements.zones.finished < 12) ? turnOn("BuyShieldblock") : function(){turnOff("BuyShieldblock");setPageSetting("BuyShieldblock",false);}(); + //if AS3 is not selected, remove Windstack settingsbox + getPageSetting('AutoStance')==3 ? turnOn("WindStacking") : turnOff("WindStacking"); + getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); + //Show and Hide useless settings to reduce UI clutter + var turnonofflist = ["ManualGather2","BuyUpgrades","ManualCoords","UsePatience","TrapTrimps","GymWall","WarpstationWall3","TrainerCaptoTributes"]; + if (game.worldUnlocks.easterEgg) + turnonofflist.push("AutoEggs"); + for (var i in turnonofflist) + getPageSetting('ShowSettings') ? turnOn(turnonofflist[i]) : turnOff(turnonofflist[i]); //DROPDOWNS: updates dropdown selections. (ALL DROPDOWNS REQUIRE THIS BIT TO BE UPDATEY) //todo check why this isnt possible to set automatically in the dropdown code. @@ -910,10 +922,10 @@ function getDailyHeHrStats() { function settingsProfileMakeGUI(){}; //blank on purpose, will be overwritten if necessary. //controls the button skips 2 of the tri-state automaps button -function toggleAutoMaps(){ +function toggleAutoMaps(){ if (getPageSetting('AutoMaps')) setPageSetting('AutoMaps',0); else setPageSetting('AutoMaps',1); document.getElementById("autoMapBtn").setAttribute("class", "noselect settingsBtn settingBtn" + autoTrimpSettings.AutoMaps.value); -} \ No newline at end of file +} diff --git a/modules/equipment.js b/modules/equipment.js index 8c54bb83d..12c50e4fa 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -145,6 +145,8 @@ function evaluateEquipmentEfficiency(equipName) { var StatusBorder = 'white'; var Wall = false; + var BuyWeaponUpgrades = ((getPageSetting('BuyWeaponsNew')==1) || (getPageSetting('BuyWeaponsNew')==2)); + var BuyArmorUpgrades = ((getPageSetting('BuyArmorNew')==1) || (getPageSetting('BuyArmorNew')==2)); if (!game.upgrades[equip.Upgrade].locked) { //Evaluating upgrade! var CanAfford = canAffordTwoLevel(game.upgrades[equip.Upgrade]); @@ -152,7 +154,7 @@ function evaluateEquipmentEfficiency(equipName) { var NextEffect = PrestigeValue(equip.Upgrade); //Scientist 3 and 4 challenge: set metalcost to Infinity so it can buy equipment levels without waiting for prestige. (fake the impossible science cost) //also Fake set the next cost to infinity so it doesn't wait for prestiges if you have both options disabled. - if ((game.global.challengeActive == "Scientist" && getScientistLevel() > 2) || ((!getPageSetting('BuyArmorUpgrades') && !getPageSetting('BuyWeaponUpgrades')))) + if ((game.global.challengeActive == "Scientist" && getScientistLevel() > 2) || (!BuyWeaponUpgrades && !BuyArmorUpgrades)) var NextCost = Infinity; else var NextCost = Math.ceil(getNextPrestigeCost(equip.Upgrade) * Math.pow(1 - game.portal.Artisanistry.modifier, game.portal.Artisanistry.level)); @@ -348,8 +350,8 @@ function autoLevelEquipment() { //Code is Spaced This Way So You Can Read It: if (evaluation.StatusBorder == 'red' && !(game.global.world < 60 && game.global.world >= 58 && MODULES["equipment"].waitTill60)) { - var BuyWeaponUpgrades = getPageSetting('BuyWeaponUpgrades'); - var BuyArmorUpgrades = getPageSetting('BuyArmorUpgrades'); + var BuyWeaponUpgrades = ((getPageSetting('BuyWeaponsNew')==1) || (getPageSetting('BuyWeaponsNew')==2)); + var BuyArmorUpgrades = ((getPageSetting('BuyArmorNew')==1) || (getPageSetting('BuyArmorNew')==2)); var DelayArmorWhenNeeded = getPageSetting('DelayArmorWhenNeeded'); if ( @@ -391,6 +393,8 @@ function autoLevelEquipment() { //LEVELING EQUIPMENT SECTION: preBuy(); game.global.buyAmt = 1; //needed for buyEquipment() + var BuyWeaponLevels = ((getPageSetting('BuyWeaponsNew')==1) || (getPageSetting('BuyWeaponsNew')==3)); + var BuyArmorLevels = ((getPageSetting('BuyArmorNew')==1) || (getPageSetting('BuyArmorNew')==3)); for (var stat in Best) { var eqName = Best[stat].Name; var $eqName = document.getElementById(eqName); @@ -407,21 +411,22 @@ function autoLevelEquipment() { //If we are doing the MaxMapBonusAfterZone stuff, equipment should be upgraded to its cap. var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; //If we're considering an attack item, we want to buy weapons if we don't have enough damage, or if we don't need health (so we default to buying some damage) - if (getPageSetting('BuyWeapons') && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { + if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); buyEquipment(eqName, null, true); } } //If we're considering a health item, buy it if we don't have enough health, otherwise we default to buying damage - if (getPageSetting('BuyArmor') && (DaThing.Stat == 'health' || DaThing.Stat == 'block') && (!enoughHealthE || maxmap || spirecheck)) { + if (BuyArmorLevels && (DaThing.Stat == 'health' || DaThing.Stat == 'block') && (!enoughHealthE || maxmap || spirecheck)) { if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); buyEquipment(eqName, null, true); } } - var aalvl2 = MODULES["equipment"].alwaysLvl2; //getPageSetting('AlwaysArmorLvl2'); - if (getPageSetting('BuyArmor') && (DaThing.Stat == 'health') && aalvl2 && game.equipment[eqName].level < 2){ + //Always LVL 2: + var aalvl2 = MODULES["equipment"].alwaysLvl2; //was getPageSetting('AlwaysArmorLvl2'); + if (BuyArmorLevels && (DaThing.Stat == 'health') && aalvl2 && game.equipment[eqName].level < 2){ if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName + " (AlwaysLvl2)", "equips", '*upload3'); buyEquipment(eqName, null, true); diff --git a/modules/gather.js b/modules/gather.js index 54299d885..850c00553 100644 --- a/modules/gather.js +++ b/modules/gather.js @@ -37,7 +37,7 @@ function manualLabor() { if (trapperTrapUntilFull && (game.global.buildingsQueue.length == 0 || game.buildings.Trap.owned == 1) && !game.global.trapBuildAllowed && canAffordBuilding('Trap')) safeBuyBuilding('Trap'); //get ahead on trap building since it is always needed for Trapper } - else if (getPageSetting('ManualGather2') != 2 && game.resources.science.owned < MODULES["gather"].minScienceAmount && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') + else if (getPageSetting('ManualGather2') != 3 && game.resources.science.owned < MODULES["gather"].minScienceAmount && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') setGather('science'); //if we have more than 2 buildings in queue, or (our modifier is real fast and trapstorm is off), build else if (!game.talents.foreman.purchased && (game.global.buildingsQueue.length ? (game.global.buildingsQueue.length > 1 || game.global.autoCraftModifier == 0 || (getPlayerModifier() > 1000 && game.global.buildingsQueue[0] != 'Trap.1')) : false)) { @@ -50,11 +50,11 @@ function manualLabor() { //if we have some upgrades sitting around which we don't have enough science for, gather science else if (game.resources.science.owned < scienceNeeded && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') { // debug('Science needed ' + scienceNeeded); - if ((getPlayerModifier() < getPerSecBeforeManual('Scientist') && hasTurkimp)||getPageSetting('ManualGather2') == 2){ + if ((getPlayerModifier() < getPerSecBeforeManual('Scientist') && hasTurkimp)||getPageSetting('ManualGather2') == 3){ //if manual is less than science production, switch on turkimp setGather('metal'); } - else if (getPageSetting('ManualGather2') != 2){ + else if (getPageSetting('ManualGather2') != 3){ setGather('science'); } } @@ -106,7 +106,7 @@ function manualLabor() { else setGather(lowestResource);//gather the lowest resource //This stuff seems to be repeated from above. Should be refactored and fixed so this is not confusing. - } else if (getPageSetting('ManualGather2') != 2 && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') { + } else if (getPageSetting('ManualGather2') != 3 && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') { if (game.resources.science.owned < getPsString('science', true) * MODULES["gather"].minScienceSeconds && game.global.turkimpTimer < 1 && haveWorkers) setGather('science'); else if (hasTurkimp) @@ -183,15 +183,15 @@ function manualLabor2() { //if we have less than (100) science or less than a minute of science if (game.resources.science.owned < MODULES["gather"].minScienceAmount || (game.resources.science.owned < getPsString('science', true) * MODULES["gather"].minScienceSeconds && game.global.turkimpTimer < 1)) - if (getPageSetting('ManualGather2') != 2) { + if (getPageSetting('ManualGather2') != 3) { setGather('science'); return; } if (game.resources.science.owned < scienceNeeded) { //if manual is less than science production and turkimp, metal. (or science is set as disallowed) - if ((getPlayerModifier() < getPerSecBeforeManual('Scientist') && hasTurkimp) || getPageSetting('ManualGather2') == 2) + if ((getPlayerModifier() < getPerSecBeforeManual('Scientist') && hasTurkimp) || getPageSetting('ManualGather2') == 3) setGather('metal'); - else if (getPageSetting('ManualGather2') != 2) { + else if (getPageSetting('ManualGather2') != 3) { setGather('science'); return; } diff --git a/modules/magmite.js b/modules/magmite.js index 5ac9684ca..179f3c896 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -29,13 +29,13 @@ function autoMagmiteSpender() { // then consider overclocker if we can afford it var hasOv = game.permanentGeneratorUpgrades.Hybridization.owned && game.permanentGeneratorUpgrades.Storage.owned; var ovclock = game.generatorUpgrades.Overclocker; - if (hasOv && (getPageSetting('BuyOvclock') || !ovclock.upgrades) && (game.global.magmite >= ovclock.cost())) { + if (hasOv && ((getPageSetting('BuyOneTimeOC')==1 || getPageSetting('BuyOneTimeOC')==3) || !ovclock.upgrades) && (game.global.magmite >= ovclock.cost())) { debug("Auto Spending " + ovclock.cost() + " Magmite on: Overclocker" + (ovclock.upgrades ? " #" + (ovclock.upgrades + 1) : ""), "magmite"); buyGeneratorUpgrade('Overclocker'); } - + //Part #2 - var repeat = !getPageSetting('OneTimeOnly'); + var repeat = (getPageSetting('BuyOneTimeOC')==1 || getPageSetting('BuyOneTimeOC')==2); while (repeat) { if (MODULES["magmite"].algorithm == 2) { //Method 2: diff --git a/modules/maps.js b/modules/maps.js index ece2439a8..daa504e55 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -97,7 +97,7 @@ function autoMap() { needPrestige = prestige != "Off" && game.mapUnlocks[prestige] && game.mapUnlocks[prestige].last <= (game.global.world+extraMapLevels) - 5 && game.global.challengeActive != "Frugal"; //dont need prestige if we are caught up, and have (2) unbought prestiges: skippedPrestige = false; - if (needPrestige && getPageSetting('PrestigeSkipMode')) { + if (needPrestige && (getPageSetting('PrestigeSkip1_2')==1 || getPageSetting('PrestigeSkip1_2')==2)) { var prestigeList = ['Dagadder','Megamace','Polierarm','Axeidic','Greatersword','Harmbalest','Bootboost','Hellishmet','Pantastic','Smoldershoulder','Bestplate','GambesOP']; var numUnbought = 0; for (var i in prestigeList) { @@ -111,7 +111,7 @@ function autoMap() { } } // Don't need prestige if there aren't many weapon prestiges left - if ((needPrestige || skippedPrestige) && getPageSetting('PrestigeSkip2')) { + if ((needPrestige || skippedPrestige) && (getPageSetting('PrestigeSkip1_2')==1 || getPageSetting('PrestigeSkip1_2')==3)) { const prestigeList = ['Dagadder','Megamace','Polierarm','Axeidic','Greatersword','Harmbalest']; const numLeft = prestigeList.filter(pres => game.mapUnlocks[pres].last <= (game.global.world+extraMapLevels) - 5); const shouldSkip = numLeft <= customVars.UnearnedPrestigesRequired; diff --git a/modules/portal.js b/modules/portal.js index dfa883f8d..446e7cf2e 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -106,8 +106,9 @@ function doPortal(challenge) { if(!game.global.portalActive) return; if (getPageSetting('AutoMagmiteSpender2')==1) autoMagmiteSpender(); // From mainLoop - if (getPageSetting('AutoHeirlooms2')) autoHeirlooms2(); //"Auto Heirlooms 2" (heirlooms.js) - else if (getPageSetting('AutoHeirlooms')) autoHeirlooms();//"Auto Heirlooms" (") + if (getPageSetting('AutoHeirloomsNew')==0); //"AutoHeirlooms OFF" (Heirlooms.js) + else if (getPageSetting('AutoHeirloomsNew')==1) autoHeirlooms(); //"AH1" (") + else if (getPageSetting('AutoHeirloomsNew')==2) autoHeirlooms2(); //"AH2" (") if (getPageSetting('AutoUpgradeHeirlooms') && !heirloomsShown) autoNull(); //"Auto Upgrade Heirlooms" (heirlooms.js) //Go into portal screen portalClicked(); diff --git a/modules/scryer.js b/modules/scryer.js index c7a71e5db..b999492ad 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -26,9 +26,10 @@ function useScryerStance() { var newSquadRdy = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; var form = game.global.formation; var oktoswitch = true; - var die = getPageSetting('ScryerDieToUseS'); + //var die = getPageSetting('ScryerDieToUseS'); + var die = true; const willSuicide = getPageSetting('ScryerDieZ'); - if (die && willSuicide >= 0) { + if (die && willSuicide > -1) { var [dieZ, dieC] = willSuicide.toString().split("."); if (dieC && dieC.length == 1) dieC = dieC + "0"; die = game.global.world >= dieZ && (!dieC || (game.global.lastClearedCell + 1 >= dieC)); From 54d63d69cd0e7496262706e4e523e2fb6b769d0f Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 13:56:19 +0100 Subject: [PATCH 0026/3477] scryer issue is with Autostance3 not with Scryer settings --- modules/stance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 39778885e..b95d728e9 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -567,8 +567,8 @@ function autoStance3() { if( getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200) { setFormation(2); } - else if (getPageSetting('WindStacking') != -1 && (getPageSetting('WindStacking') ==0 || (game.global.world >= getPageSetting('Windstacking')))) { + else if ((getPageSetting('WindStacking') != -1) && (game.global.world >= getPageSetting('Windstacking'))) { setFormation(4); - } + return;} } } From 504048329608c65d30c39d16e627d51659ccfa8e Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 14:10:13 +0100 Subject: [PATCH 0027/3477] Trying to find error --- SettingsGUI.js | 4 ++-- modules/stance.js | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index a7f7f5b22..d6e8f0edf 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -375,7 +375,7 @@ function initializeAllSettings() { //Subsection1Line1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2',], '3-Way Button, Recommended. Will automatically handle fighting. The decision between BetterAutoFight 1 or 2 is up to your own discretion. The new BAF#2 does: A)Click fight anyway if we are dead and stuck in a loop due to Dimensional Generator and we can get away with adding time to it.(RemainingTime + ArmyAdd.Time < GeneTimer) and B) Clicks fight anyway if we are dead and have >=31 NextGroupTimer and deal with the consequences by firing genetecists afterwards. WARNING: If you autoportal with BetterAutoFight disabled, the game sits there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 1, null, "Combat"); createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. Better Autofight 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); - createSetting('WindStacking', 'Windstack Min Zone', '-1 = off, 0 = Always On
For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get 200 windstacks then change to D, kill bad guy, then repeat)', 'value', '-1', null, 'Combat'); + createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = off, 0 = Always On
For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get 200 windstacks then change to D, kill bad guy, then repeat)', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['Don\'t care', 'Power Saving', 'Only Rush Voids'], 'Avoid killing your army impatiently. Don\'t force abandon trimps when prestiging. Will still Die To Use Z and aggressively autostance to aid progression and anything else. Made for Empower daily, you might find it helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens. Only Rush Voids will allow considering abandoning, not force one. Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks arent maxed, force abandon and grab a new group. Located in the geneticist management script.', 'boolean', true, null, 'Combat'); @@ -825,7 +825,7 @@ function updateCustomButtons() { //if ShieldBlock is for sure, remove ShieldBlock from settingsbox (achievement=12 means z100). //(game.achievements.zones.finished < 12) ? turnOn("BuyShieldblock") : function(){turnOff("BuyShieldblock");setPageSetting("BuyShieldblock",false);}(); //if AS3 is not selected, remove Windstack settingsbox - getPageSetting('AutoStance')==3 ? turnOn("WindStacking"): turnOff("WindStacking"); + getPageSetting('AutoStance')==3 ? turnOn("WindStackingMin"): turnOff("WindStackingMin"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinPoison"): turnOff("ScryUseinPoison"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinWind"): turnOff("ScryUseinWind"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinIce"): turnOff("ScryUseinIce"); diff --git a/modules/stance.js b/modules/stance.js index b95d728e9..55488b3a1 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -560,15 +560,17 @@ function autoStance3() { //no need to continue if (game.global.gridArray.length === 0) return; if (game.global.soldierHealth <= 0) return; //dont calculate stances when dead, cause the "current" numbers are not updated when dead. - if (!getPageSetting('AutoStance')) return; + if (getPageSetting('AutoStance') == 0) return; if (!game.upgrades.Formations.done) return; if(game.global.world>=80) { - if( getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200) { - setFormation(2); - } - else if ((getPageSetting('WindStacking') != -1) && (game.global.world >= getPageSetting('Windstacking'))) { - setFormation(4); - return;} + if( getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200) { + setFormation(2); + return; + } + else if ((getPageSetting('WindStackingMin') != -1) && (game.global.world >= getPageSetting('WindstackingMin'))) { + setFormation(4); + return; + } } } From 16a8a4e6511d32414359a046a50bb30c279c15c7 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 14:17:51 +0100 Subject: [PATCH 0028/3477] attempt to fix AS3 #2 --- modules/stance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 55488b3a1..e0767a9cf 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -564,11 +564,11 @@ function autoStance3() { if (!game.upgrades.Formations.done) return; if(game.global.world>=80) { - if( getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200) { + if( getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200 || (getPageSetting('WindStackingMin') < 0)) { setFormation(2); return; } - else if ((getPageSetting('WindStackingMin') != -1) && (game.global.world >= getPageSetting('WindstackingMin'))) { + else if (game.global.world >= getPageSetting('WindstackingMin')) { setFormation(4); return; } From def63b9bc1ddd57c39261b0f7c8c13239c0a937c Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 14:30:55 +0100 Subject: [PATCH 0029/3477] attempt #3 --- modules/stance.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index e0767a9cf..d2883ff2e 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -563,12 +563,18 @@ function autoStance3() { if (getPageSetting('AutoStance') == 0) return; if (!game.upgrades.Formations.done) return; + var windstackzone = getPageSetting('WindStackingMin') + if(game.global.world>=80) { - if( getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200 || (getPageSetting('WindStackingMin') < 0)) { + if( getEmpowerment() != "Wind" + || game.global.mapsActive + || game.empowerments.Wind.currentDebuffPower==200 + || (windstackzone < 0) + || (windstackzone >= game.global.world)) { setFormation(2); return; } - else if (game.global.world >= getPageSetting('WindstackingMin')) { + else if (game.global.world >= windstackzone) { setFormation(4); return; } From b394c0829ce69b2a2afa781b6275c89c2197eee8 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 16:52:13 +0100 Subject: [PATCH 0030/3477] Edits to user friendliness of Scryer settings --- SettingsGUI.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index d6e8f0edf..c04b121c8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -830,6 +830,9 @@ function updateCustomButtons() { getPageSetting('AutoStance')==3 ? turnOn("ScryUseinWind"): turnOff("ScryUseinWind"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinIce"): turnOff("ScryUseinIce"); getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); + //Make Scryer settings a little more user friendly + if (getPageSetting('ScryerUseinVoidMaps2') !=1) { setPageSetting("ScryerUseinMaps2", "2"); } + if (getPageSetting('ScryerUseinSpire2') !=1 && isActiveSpireAT()) { setPageSetting("ScryerSkipCorrupteds2", "2"); } //Show and Hide useless settings to reduce UI clutter var turnonofflist = [ "ManualGather2","BuyUpgradesNew","TrapTrimps","UsePatience", From b0e7f06848736d0b11015a874906d2430b9520ee Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 16:59:09 +0100 Subject: [PATCH 0031/3477] comment that shit out, it didn't work. --- SettingsGUI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index c04b121c8..9252683fd 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -830,9 +830,9 @@ function updateCustomButtons() { getPageSetting('AutoStance')==3 ? turnOn("ScryUseinWind"): turnOff("ScryUseinWind"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinIce"): turnOff("ScryUseinIce"); getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); - //Make Scryer settings a little more user friendly - if (getPageSetting('ScryerUseinVoidMaps2') !=1) { setPageSetting("ScryerUseinMaps2", "2"); } - if (getPageSetting('ScryerUseinSpire2') !=1 && isActiveSpireAT()) { setPageSetting("ScryerSkipCorrupteds2", "2"); } + /*//Make Scryer settings a little more user friendly + if (getPageSetting('ScryerUseinVoidMaps2') !=0) { setPageSetting("ScryerUseinMaps2", "2"); } + if (getPageSetting('ScryerUseinSpire2') !=1 && isActiveSpireAT()) { setPageSetting("ScryerSkipCorrupteds2", "2"); } */ //Show and Hide useless settings to reduce UI clutter var turnonofflist = [ "ManualGather2","BuyUpgradesNew","TrapTrimps","UsePatience", From bfe5a1064c5bfbed0520dababad63ae374bb84fd Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 17:07:16 +0100 Subject: [PATCH 0032/3477] Tooltips --- SettingsGUI.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 9252683fd..cc34ff92b 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -375,7 +375,7 @@ function initializeAllSettings() { //Subsection1Line1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2',], '3-Way Button, Recommended. Will automatically handle fighting. The decision between BetterAutoFight 1 or 2 is up to your own discretion. The new BAF#2 does: A)Click fight anyway if we are dead and stuck in a loop due to Dimensional Generator and we can get away with adding time to it.(RemainingTime + ArmyAdd.Time < GeneTimer) and B) Clicks fight anyway if we are dead and have >=31 NextGroupTimer and deal with the consequences by firing genetecists afterwards. WARNING: If you autoportal with BetterAutoFight disabled, the game sits there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 1, null, "Combat"); createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. Better Autofight 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); - createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = off, 0 = Always On
For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get 200 windstacks then change to D, kill bad guy, then repeat)', 'value', '-1', null, 'Combat'); + createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
0 = Always On
For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get 200 windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have 200 stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['Don\'t care', 'Power Saving', 'Only Rush Voids'], 'Avoid killing your army impatiently. Don\'t force abandon trimps when prestiging. Will still Die To Use Z and aggressively autostance to aid progression and anything else. Made for Empower daily, you might find it helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens. Only Rush Voids will allow considering abandoning, not force one. Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks arent maxed, force abandon and grab a new group. Located in the geneticist management script.', 'boolean', true, null, 'Combat'); @@ -390,16 +390,16 @@ function initializeAllSettings() { createSetting('ScryerUseWhenOverkill', 'Use When Overkill', 'Overrides the Min/Max zones. Does not override any NEVER settings. Toggles stance when we can Overkill in S, giving us double loot with no speed penalty! NOTE: This being on, and being able to overkill in S will override ALL other settings (Except never use in spire). This is a boolean logic shortcut that disregards all the other settings including Min and Max Zone. If you ONLY want to use S during Overkill, as a workaround: turn this on and Min zone: to 9999 and everything else off(red).

This has not been optimised for double overkill, and does not always produce the intended results, if you have problems, it may be worth turning off until it can be adjusted.', 'boolean', true, null, 'Scryer'); createSetting('ScryerMinZone', 'Min Zone', 'Minimum zone to start using scryer in.(inclusive) Recommend:(60 or 181). Overkill ignores this. This needs to be On & Valid for the MAYBE option on all other Scryer settings to do anything if Overkill is off. Tip: Use 9999 to disable all Non-Overkill, Non-Force, scryer usage.', 'value', '181', null, 'Scryer'); createSetting('ScryerMaxZone', 'Max Zone', '0 or -1 to disable (Recommended)
Overkill ignores this. Zone to STOP using scryer at (not inclusive). Turning this ON with a positive number stops MAYBE use of all other Scryer settings.', 'value', '230', null, 'Scryer'); - createSetting('ScryerUseinMaps2', ['Maps: NEVER','Maps: FORCE', 'Maps: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in Void Maps
MAYBE means that Overkill and Min/Max use are allowed.

Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); - createSetting('ScryerUseinVoidMaps2', ['VoidMaps: NEVER','VoidMaps: FORCE', 'VoidMaps: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in Void Maps
MAYBE means that Overkill and Min/Max use are allowed.

Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); - createSetting('ScryerUseinSpire2', ['Spire: NEVER','Spire: FORCE','Spire: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in the Spire
MAYBE means that Overkill and Min/Max use are allowed.

Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); + createSetting('ScryerUseinMaps2', ['Maps: NEVER','Maps: FORCE', 'Maps: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in Void Maps
MAYBE means that Overkill and Min/Max use are allowed.This setting requires use on Corrupteds to be on after corruption/magma.

Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); + createSetting('ScryerUseinVoidMaps2', ['VoidMaps: NEVER','VoidMaps: FORCE', 'VoidMaps: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in Void Maps
MAYBE means that Overkill and Min/Max use are allowed.
This setting requires use in Maps to be on, as well as use on Corrupteds (if above corruption/magma) to activate.

Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); + createSetting('ScryerUseinSpire2', ['Spire: NEVER','Spire: FORCE','Spire: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in the Spire
MAYBE means that Overkill and Min/Max use are allowed.
This requires use on Corrupteds to be on for corrupted enemies.

Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); //Line2 createSetting('ScryerSkipBoss2', ['Boss: NEVER (All Levels)','Boss: NEVER (Above VoidLevel)','Boss: MAYBE'], 'NEVER (All Levels) will NEVER use S in cell 100 of the world!!!
NEVER (Above VoidLevel) will NEVER use S in cell 100 of the world ABOVE the zone that your void maps are set to run at (Maps).
MAYBE treats the cell no differently to any other, Overkill and Min/Max Scryer is allowed.

Recommend NEVER (There is little benefit to double NON-HELIUM resources and a small chance of DE).', 'multitoggle', 0, null, 'Scryer'); - createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate against Corrupted enemies
MAYBE means that Overkill and Min/Max use are allowed.
Magma maps and Corrupted Voidmaps are currently classified as corrupted and Green-DontUse here will override the Force Maps/Force Voidmaps use of Scryer

Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); + createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate against Corrupted enemies
MAYBE means that Overkill and Min/Max use are allowed.
Magma maps and Corrupted Voidmaps are currently classified as corrupted and NEVER here will override Maps and Voidmaps use of Scryer

Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. This feature was added for 1 person, use at your own risk.
Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); - createSetting('ScryUseinPoison', 'Scry in Poison','-1 to disable, any other number sets a minimum zone to use S in Poison', 'value', -1, null, 'Scryer'); //should it override Overkill??? Copy this for Wind/Ice - createSetting('ScryUseinWind', 'Scry in Wind','-1 to disable, any other number sets a minimum zone to use S in Wind', 'value', -1, null, 'Scryer'); - createSetting('ScryUseinIce', 'Scry in Ice','-1 to disable, any other number sets a minimum zone to use S in Ice', 'value', -1, null, 'Scryer'); + createSetting('ScryUseinPoison', 'Scry in Poison','-1 to disable, any other number (including 0) sets a minimum zone to use S in Poison', 'value', -1, null, 'Scryer'); + createSetting('ScryUseinWind', 'Scry in Wind','-1 to disable, any other number (including 0) sets a minimum zone to use S in Wind', 'value', -1, null, 'Scryer'); + createSetting('ScryUseinIce', 'Scry in Ice','-1 to disable, any other number (including 0) sets a minimum zone to use S in Ice', 'value', -1, null, 'Scryer'); From e4b7bd6cce89e7fe1289ebbd3d6afb19a0d3d051 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 17:10:43 +0100 Subject: [PATCH 0033/3477] more tooltips --- SettingsGUI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index cc34ff92b..6af07cdc2 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -386,13 +386,13 @@ function initializeAllSettings() { //Scryer - createSetting('UseScryerStance', 'Enable Scryer Stance', 'MASTER BUTTON Activates all other scrying settings, and overrides AutoStance when scryer conditions are met. Leave regular Autostance on while this is active. Scryer gives 2x Resources (Non-Helium/Nullifium) and a chance for Dark Essence. Once this is on, priority for Scryer decisions goes as such:
NEVER USE, FORCE USE, OVERKILL, MIN/MAX ZONE
NO OTHER BUTTONS WILL DO ANYTHING IF THIS IS OFF.', 'boolean', true, null, 'Scryer'); + createSetting('UseScryerStance', 'Enable Scryer Stance', 'MASTER BUTTON Activates all other scrying settings, and overrides AutoStance when scryer conditions are met. Leave regular Autostance on while this is active. Scryer gives 2x Resources (Non-Helium/Nullifium) and a chance for Dark Essence. Once this is on, priority for Scryer decisions goes as such:
NEVER USE, FORCE USE, OVERKILL, MIN/MAX ZONE

NO OTHER BUTTONS WILL DO ANYTHING IF THIS IS OFF.', 'boolean', true, null, 'Scryer'); createSetting('ScryerUseWhenOverkill', 'Use When Overkill', 'Overrides the Min/Max zones. Does not override any NEVER settings. Toggles stance when we can Overkill in S, giving us double loot with no speed penalty! NOTE: This being on, and being able to overkill in S will override ALL other settings (Except never use in spire). This is a boolean logic shortcut that disregards all the other settings including Min and Max Zone. If you ONLY want to use S during Overkill, as a workaround: turn this on and Min zone: to 9999 and everything else off(red).

This has not been optimised for double overkill, and does not always produce the intended results, if you have problems, it may be worth turning off until it can be adjusted.', 'boolean', true, null, 'Scryer'); createSetting('ScryerMinZone', 'Min Zone', 'Minimum zone to start using scryer in.(inclusive) Recommend:(60 or 181). Overkill ignores this. This needs to be On & Valid for the MAYBE option on all other Scryer settings to do anything if Overkill is off. Tip: Use 9999 to disable all Non-Overkill, Non-Force, scryer usage.', 'value', '181', null, 'Scryer'); createSetting('ScryerMaxZone', 'Max Zone', '0 or -1 to disable (Recommended)
Overkill ignores this. Zone to STOP using scryer at (not inclusive). Turning this ON with a positive number stops MAYBE use of all other Scryer settings.', 'value', '230', null, 'Scryer'); - createSetting('ScryerUseinMaps2', ['Maps: NEVER','Maps: FORCE', 'Maps: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in Void Maps
MAYBE means that Overkill and Min/Max use are allowed.This setting requires use on Corrupteds to be on after corruption/magma.

Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); + createSetting('ScryerUseinMaps2', ['Maps: NEVER','Maps: FORCE', 'Maps: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in Void Maps
MAYBE means that Overkill and Min/Max use are allowed.
This setting requires use on Corrupteds to be on after corruption/magma.

Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerUseinVoidMaps2', ['VoidMaps: NEVER','VoidMaps: FORCE', 'VoidMaps: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in Void Maps
MAYBE means that Overkill and Min/Max use are allowed.
This setting requires use in Maps to be on, as well as use on Corrupteds (if above corruption/magma) to activate.

Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); - createSetting('ScryerUseinSpire2', ['Spire: NEVER','Spire: FORCE','Spire: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in the Spire
MAYBE means that Overkill and Min/Max use are allowed.
This requires use on Corrupteds to be on for corrupted enemies.

Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); + createSetting('ScryerUseinSpire2', ['Spire: NEVER','Spire: FORCE','Spire: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate in the Spire
MAYBE means that Overkill and Min/Max use are allowed.
This setting requires use on Corrupteds to be on for corrupted enemies.

Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); //Line2 createSetting('ScryerSkipBoss2', ['Boss: NEVER (All Levels)','Boss: NEVER (Above VoidLevel)','Boss: MAYBE'], 'NEVER (All Levels) will NEVER use S in cell 100 of the world!!!
NEVER (Above VoidLevel) will NEVER use S in cell 100 of the world ABOVE the zone that your void maps are set to run at (Maps).
MAYBE treats the cell no differently to any other, Overkill and Min/Max Scryer is allowed.

Recommend NEVER (There is little benefit to double NON-HELIUM resources and a small chance of DE).', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate against Corrupted enemies
MAYBE means that Overkill and Min/Max use are allowed.
Magma maps and Corrupted Voidmaps are currently classified as corrupted and NEVER here will override Maps and Voidmaps use of Scryer

Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); From 0e824e6604d8e757e995b539e0edfcc335bccc01 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 29 Mar 2018 23:24:56 +0100 Subject: [PATCH 0034/3477] Change textShadow for overlay to make it more prominent --- modules/fight-info.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 8923b769b..45d71dd15 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -101,7 +101,7 @@ $cell.title = cell.name; //$cell.style.color = M["fightinfo"].colors.bone; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) - $cell.style.textShadow = '0px 0px 10px #ffffff'; + $cell.style.textShadow = '0px 0px 15px #ffffff'; } else if(M["fightinfo"].exotics.indexOf(cell.name) > -1) // Exotic cell @@ -111,7 +111,7 @@ $cell.title = cell.name; //$cell.style.color = M["fightinfo"].colors.exotic; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) - $cell.style.textShadow = '0px 0px 10px #fb753f'; + $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(M["fightinfo"].powerful.indexOf(cell.name) > -1) // Powerful imp @@ -121,7 +121,7 @@ $cell.title = cell.name; //$cell.style.color = M["fightinfo"].colors.powerful; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) - $cell.style.textShadow = '0px 0px 10px #8c0000'; + $cell.style.textShadow = '0px 0px 15px #8c0000'; } //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) From 001dfe49e1940f5904871d6720b1ed190cbdafe0 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Fri, 30 Mar 2018 15:04:56 +0100 Subject: [PATCH 0035/3477] fix scryer crash on healthy enemy --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 4df015e64..183632935 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -27,7 +27,7 @@ function useScryerStance() { || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never - var iscorrupt = getCurrentEnemy(1).mutation == "Corruption"; + var iscorrupt = getCurrentEnemy(1).mutation == ("Corruption" || "Healthy"); iscorrupt = iscorrupt || (mutations.Magma.active() && game.global.mapsActive); iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_auto))) { From 866ca9fe37b69c64069fd500d16fec5270a6d8f9 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Tue, 3 Apr 2018 00:09:16 +0100 Subject: [PATCH 0036/3477] tooltip --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 6af07cdc2..634c8e27f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -377,8 +377,8 @@ function initializeAllSettings() { createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. Better Autofight 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
0 = Always On
For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get 200 windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have 200 stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); - createSetting('PowerSaving', ['Don\'t care', 'Power Saving', 'Only Rush Voids'], 'Avoid killing your army impatiently. Don\'t force abandon trimps when prestiging. Will still Die To Use Z and aggressively autostance to aid progression and anything else. Made for Empower daily, you might find it helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens. Only Rush Voids will allow considering abandoning, not force one. Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); - createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks arent maxed, force abandon and grab a new group. Located in the geneticist management script.', 'boolean', true, null, 'Combat'); + createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); + createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks aren\'t maxed, force abandon and grab a new group. Located in the geneticist management script.', 'boolean', true, null, 'Combat'); createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); From 771c74afb949dbbf96ba566c048288edb601e1f1 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Mon, 2 Apr 2018 19:23:09 -0400 Subject: [PATCH 0037/3477] Fix left hand assignment error. --- modules/scryer.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 183632935..1406e6584 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -85,9 +85,9 @@ function useScryerStance() { if (useoverkill && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')==0) useoverkill = false; //If lower than nature zone, do not use overkill //redundant now?? - if (useoverkill && ((getEmpowerment() = "Poison" && (game.global.world <= getPageSetting('ScryUseinPoison'))) - || (getEmpowerment() = "Wind" && (game.global.world <= getPageSetting('ScryUseinWind'))) - || (getEmpowerment() = "Ice" &&(game.global.world <= getPageSetting('ScryUseinIce'))))) + if (useoverkill && ((getEmpowerment() == "Poison" && (game.global.world <= getPageSetting('ScryUseinPoison'))) + || (getEmpowerment() == "Wind" && (game.global.world <= getPageSetting('ScryUseinWind'))) + || (getEmpowerment() == "Ice" &&(game.global.world <= getPageSetting('ScryUseinIce'))))) useoverkill = false; //Overkill button being on and being able to overkill in S will override any setting other than never spire & nature zone, regardless. if (useoverkill && game.portal.Overkill.level > 0) { From 6d0ac5dd06dfcef86ab4833544449fae0fe21d14 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Mon, 2 Apr 2018 19:39:00 -0400 Subject: [PATCH 0038/3477] fix upgrades manual coords. --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 84c5baae1..7207ac9df 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -7,7 +7,7 @@ function buyUpgrades() { upgrade = upgradeList[upgrade]; var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); - if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') != 1 || !canAffordCoordinationTrimps())) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps())) continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; //skip bloodlust during scientist challenges and while we have autofight enabled. From 7520bdcebc054ddfb979f205fe9e7646b79daebd Mon Sep 17 00:00:00 2001 From: gen BTC Date: Mon, 2 Apr 2018 19:42:51 -0400 Subject: [PATCH 0039/3477] make tooltip show up again for AutoGoldenUpgrades --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 6af07cdc2..fb9e3dac8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -427,7 +427,7 @@ function initializeAllSettings() { //Golden Upgrade Strategies: - createSetting('AutoGoldenUpgrades', 'Auto Golden Upgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \"Max then Helium\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections.', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void"], 'Golden'); + createSetting('AutoGoldenUpgrades', 'Auto Golden Upgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections.', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void"], 'Golden'); createSetting('goldStrat', 'Auto Golden Strategy', 'VOID ONLY: After max Void golden upgrades, alternate between buying helium and battle upgrades. Or Choose a Zone to switch over completely at (zones lower than X will buy only battle, and zones higher than X only helium). Battle can be disabled completely with the goldNoBattle button. MAX THEN HELIUM setting so you can get the perfect 60% Voids then Helium', 'dropdown', 'Max then Helium', ["Off", "Alternating", "Zone", "Max then Helium"], 'Golden'); createSetting('goldAlternating', 'GU VOID: Alternating', 'Buy a helium upgrade after X-1 battle upgrades have been purchased', 'value', '2', null, 'Golden'); createSetting('goldZone', 'GU VOID: Zone', 'Buy a helium upgrade until zone X, then buy battle upgrades.', 'value', '200', null, 'Golden'); From 21e99a57d42ecdb2c6b1389b51c3111709e31338 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Mon, 2 Apr 2018 19:51:36 -0400 Subject: [PATCH 0040/3477] fixups. --- AutoTrimps2.js | 12 ++++-------- SettingsGUI.js | 14 +++++--------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index e04132e13..770cdfddd 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -213,15 +213,11 @@ function mainLoop() { else if (getPageSetting('BuyBuildingsNew')==1) { buyBuildings(); buyStorage(); } //"Buy Buildings & Storage" (") else if (getPageSetting('BuyBuildingsNew')==2) buyBuildings(); //"Buy Buildings" (") else if (getPageSetting('BuyBuildingsNew')==3) buyStorage(); //"Buy Storage" (") - //if (getPageSetting('BuyStorage')) buyStorage(); //"Buy Storage" (buildings.js) (Can be removed now) - //if (getPageSetting('BuyBuildings')) buyBuildings(); //"Buy Buildings" (buildings.js) (Can be removed now) - if (getPageSetting('BuyJobsNew')===0); //"Don't Buy Jobs" (Jobs.js) - else if (getPageSetting('BuyJobsNew')==1) { workerRatios(); buyJobs(); } //"Auto Worker Ratios" (") - else if (getPageSetting('BuyJobsNew')==2) buyJobs(); //"Manual Worker Ratios" (") - //if (getPageSetting('BuyJobs')) buyJobs(); //"Buy Jobs" (jobs.js) (Can be removed now) - //if (getPageSetting('WorkerRatios')) workerRatios(); //"Auto Worker Ratios" (jobs.js) (Can be removed now) + if (getPageSetting('BuyJobsNew')===0); //"Don't Buy Jobs" (Jobs.js) + else if (getPageSetting('BuyJobsNew')==1) { workerRatios(); buyJobs(); } //"Auto Worker Ratios" (") + else if (getPageSetting('BuyJobsNew')==2) buyJobs(); //"Manual Worker Ratios" (") if (getPageSetting('ManualGather2')<=1) manualLabor(); //"Auto Gather/Build" (gather.js) - else if (getPageSetting('ManualGather2')==2) manualLabor2(); //"Auto Gather/Build #2" (") + else if (getPageSetting('ManualGather2')==2) manualLabor2(); //"Auto Gather/Build #2" (") 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) diff --git a/SettingsGUI.js b/SettingsGUI.js index fb9e3dac8..4c07cfb8e 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -238,7 +238,7 @@ function initializeAllSettings() { //CORE: //Line1: createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Auto Gather/Build #2', 'Science Research OFF'], 'Controls what YOU do. Manual does nothing
The Decision between AutoGather 1 or 2 is up to you, and they should be similar. Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); - createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); + createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All Upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); //createSetting('ManageBreedtimerNew', ['Manual Breed Timer', 'Auto Breed Timer', 'Auto No Patience'], 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges, and accounts for the patience mastery.
[ON](Yellow): The same as above, but ignores patience and will not set a breed timer longer than 30s.
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'multitoggle', 1, null, "Core"); //This replaces the two settings below, but do we really need an option to ignore patience?? createSetting('ManageBreedtimer', 'Auto Breed Timer', 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges (0, 3.5s, 10s, 30s).
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'boolean', true, null, "Core"); createSetting('GeneticistTimer', 'Geneticist Timer', 'Manages the breed timer by hiring/firing Geneticists for the purpose of setting the ideal anticpation stacks. Disable with -1 to disable the Hiring/Firing of geneticists.
Info: Potency and Nursery buying behavior is adjusted dynamically (and disabling no longer disables potency). The Automatic Genetecist Hiring Process can best be summarized by: Buy/Wait/Die,Repeat. (if you do not die, no action is taken). Also self-kills (trimpicide) aka force abandon when your anti-stacks aren\'t maxed out (conservatively).

Controlled automatically (locked) when Auto Breed Timer is on.', 'value', '30', null, "Core"); @@ -248,24 +248,20 @@ function initializeAllSettings() { //Line2 createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); - createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); //This should make sense to replace the two below. - //OLD createSetting('AutoFinishDaily', 'Auto Finish Daily', 'With this on, the He/Hr Portal and Custom Auto Portal options will auto-finish the daily whenever they trigger and THEN portal you.', 'boolean', true, null, 'Core'); - //OLD createSetting('AutoFinishDailyZone', 'Finish Daily Zone Mod', 'Finish Daily by this # of zones earlier/later than your regular Custom AutoPortal zone or your Helium Dont Portal Before zone. When Auto Finish Daily is on. Tip: Tune your value of He/HrDontPortalBefore to suit the daily, and then tune this. Can accept negative numbers for earlier, ie: -7 means portal 7 zones earlier than normal. Can also use positive numbers to DELAY portaling for later. When used with He/Hr AutoPortal, the number of zones early does not FORCE end the daily at that zone, only ALLOW it to end that early: it will Always end when your HE/hr drops enough to trigger the portal. Use 0 to disable.', 'valueNegative', 0, null, 'Core'); + createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); if (game.worldUnlocks.easterEgg) createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core'); //could really be removed?? createSetting('UsePatience', 'Enable Patience', 'Sets the default breed timer to 45 seconds if you have the Patience mastery.', 'boolean', true, null, 'Core'); - document.getElementById('UsePatience').parentNode.insertAdjacentHTML('afterend','
'); + createSetting('AutoAllocatePerks', 'Auto Allocate Perks', 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. ', 'boolean', false, null, 'Core'); + document.getElementById('AutoAllocatePerks').parentNode.insertAdjacentHTML('afterend','
'); //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. createSetting('AutoPortal', 'Auto Portal Settings:', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); - //document.getElementById("AutoPortal").style="font-size: 1.0vw;"; //fit it on 1 line. - createSetting('HeliumHourChallenge', 'Challenge on Portal:', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); - document.getElementById("HeliumHourChallengeLabel").innerHTML = "Portal Challenge:"; //fit it on 1 line. + createSetting('HeliumHourChallenge', 'Portal Challenge:', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); createSetting('CustomAutoPortal', 'Custom Portal', 'Automatically portal AFTER clearing this level.(ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "Core"); createSetting('HeHrDontPortalBefore', 'Don\'t Portal Before', 'Do NOT allow Helium per Hour AutoPortal setting to portal BEFORE this level is reached. It is an additional check that prevents drops in helium/hr from triggering autoportal. Set to 0 or -1 to completely disable this check. (only shows up with Helium per Hour set)', 'value', '999', null, "Core"); createSetting('HeliumHrBuffer', 'He/Hr Portal Buffer %', 'IMPORTANT SETTING. When using the He/Hr Autoportal, it will portal if your He/Hr drops by this amount of % lower than your best for current run, default is 0% (ie: set to 5 to portal at 95% of your best). Now with stuck protection - Allows portaling midzone if we exceed set buffer amount by 5x. (ie a normal 2% buffer setting would now portal mid-zone you fall below 10% buffer).', 'value', '0', null, 'Core'); - createSetting('AutoAllocatePerks', 'Auto Allocate Perks', 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. ', 'boolean', false, null, 'Core'); createSetting('PauseScript', 'Pause AutoTrimps', 'Pause AutoTrimps Script (not including the graphs module)', 'boolean', null, null, 'Core'); //code to locate the pause button at lower right var $pauseScript = document.getElementById('PauseScript'); From 6da93d47cabefe8ff9b85aa1fe535ccba9a985b4 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Mon, 2 Apr 2018 20:06:08 -0400 Subject: [PATCH 0041/3477] woops --- SettingsGUI.js | 1 + 1 file changed, 1 insertion(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 4c07cfb8e..c4cf8dcaa 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -259,6 +259,7 @@ function initializeAllSettings() { //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. createSetting('AutoPortal', 'Auto Portal Settings:', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); createSetting('HeliumHourChallenge', 'Portal Challenge:', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); + document.getElementById("HeliumHourChallengeLabel").innerHTML = "Portal Challenge:"; //fit it on 1 line. createSetting('CustomAutoPortal', 'Custom Portal', 'Automatically portal AFTER clearing this level.(ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "Core"); createSetting('HeHrDontPortalBefore', 'Don\'t Portal Before', 'Do NOT allow Helium per Hour AutoPortal setting to portal BEFORE this level is reached. It is an additional check that prevents drops in helium/hr from triggering autoportal. Set to 0 or -1 to completely disable this check. (only shows up with Helium per Hour set)', 'value', '999', null, "Core"); createSetting('HeliumHrBuffer', 'He/Hr Portal Buffer %', 'IMPORTANT SETTING. When using the He/Hr Autoportal, it will portal if your He/Hr drops by this amount of % lower than your best for current run, default is 0% (ie: set to 5 to portal at 95% of your best). Now with stuck protection - Allows portaling midzone if we exceed set buffer amount by 5x. (ie a normal 2% buffer setting would now portal mid-zone you fall below 10% buffer).', 'value', '0', null, 'Core'); From 7dc76047317a6ad90f5eea4da689e217e4a29a49 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Tue, 3 Apr 2018 02:00:25 -0400 Subject: [PATCH 0042/3477] scryer fixups and settings fixups --- SettingsGUI.js | 9 ++++----- modules/scryer.js | 31 ++----------------------------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index c4cf8dcaa..ee237487b 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -307,10 +307,10 @@ function initializeAllSettings() { createSetting('LumberjackRatio', 'Lumberjack Ratio', '', 'value', '1', null, "Jobs"); createSetting('MinerRatio', 'Miner Ratio', '', 'value', '1', null, "Jobs"); //createSetting('ScientistRatio', 'Scientist Ratio', 'Advanced. This will allow you to cap your scientist to worker ratio, as well as disable the hiring of scientists.
-1 Allows the ratio to be set automatically (Recommended)
0 Turns off Scientist hiring
\>0 Set a custom ratio.', 'value', '-1', null, "Jobs"); - createSetting('MaxScientists', 'Max Scientists', 'Advanced. Cap your scientists (This is a ratio not an absolute number). recommend: -1 (infinite still controls itself)', 'value', '-1', null, "Jobs"); + createSetting('MaxScientists', 'Max Scientists', 'Advanced. Cap your scientists (This is an absolute number not a ratio). recommend: -1 (infinite still controls itself)', 'value', '-1', null, "Jobs"); //Line2 - createSetting('MaxExplorers', 'Max Explorers', 'Advanced. Cap your explorers (This is a ratio not an absolute number). recommend: -1', 'value', '-1', null, "Jobs"); //Explorers are important now! outdated setting tbh - createSetting('MaxTrainers', 'Max Trainers', 'Advanced. Cap your trainers (This is a ratio not an absolute number). recommend: -1', 'value', '-1', null, "Jobs"); //by the time that you stop needing block, food is abundant + createSetting('MaxExplorers', 'Max Explorers', 'Advanced. Cap your explorers (This is an absolute number not a ratio). recommend: -1', 'value', '-1', null, "Jobs"); //Explorers are important now! outdated setting tbh + createSetting('MaxTrainers', 'Max Trainers', 'Advanced. Cap your trainers (This is an absolute number not a ratio). recommend: -1', 'value', '-1', null, "Jobs"); //by the time that you stop needing block, food is abundant createSetting('TrainerCaptoTributes', 'Cap Trainers %', 'Only Buy a Trainer when its cost is LESS than X% of cost of a tribute. This setting can work in combination with the other one, or set the other one to -1 and this will take full control. Default: -1 (Disabled). 50% is close to the point where the cap does nothing. You can go as low as you want but recommended is 10% to 1%. (example: Trainer cost of 5001, Tribute cost of 100000, @ 5%, it would NOT buy the trainer.)', 'value', '-1', null, 'Jobs'); //this is a bit unnecessary, resource management by the script is already sufficient. @@ -339,8 +339,7 @@ function initializeAllSettings() { //AutoMaps + VoidMaps settings: -//Could combine automaps and run unique maps into one 3 way toggle: Automaps on, Non-unique maps only, Automaps off. - createSetting('AutoMaps', ["Auto Maps Off","Auto Maps","Auto Maps No Unique"], 'Recommended. Automatically run maps to progress. Very Important. Has multiple modes: Prestige, Voids, Want more Damage, Want more Health, Want Health & Damage, and Farming.Prestige takes precedence and does equal level maps until it gets what is needed as per Autotrimps Prestige dropdown setting. Voids is self explanatory: use the Void Difficulty Check setting to control the amount of farming. If \'want more damage\', it will only do 10 maps for 200% mapbonus damage bonus. If \'Farming\', it does maps beyond 10 if the displayed number is over >16x. \'Want more health[or and damage]\' is basically just a status message telling you need more health, theres not much that can be done besides tell AutoLevelEquipment to keep buying stuff. If you \'want health\' but your damage is OK to continue, invest in more HP perks.

Unique Maps are run automatically unless disabled.
Uniques Required to auto-run The Wall and Dimension of Anger. Also Required for challenges: Electricity, Mapocalypse, Meditate, and Crushed (etc) to complete their AutoPortal.

Maps/Levels:
The Block - 12
The Wall - 16
Dimension of Anger - 21
Trimple Of Doom - 34
The Prison - 82
Bionic Wonderland (only during Crushed) @ 127
NOTE: This should generally be on.
NOTE: Run Bionic Before Spire prevents the setting of Unique.
NOTICE: This does NOT auto-run all your Bionics according to your lack of Robotrimp status or whether you pass a certain level (yet).', 'multitoggle', 1, null, "Maps"); + createSetting('AutoMaps', ["Auto Maps Off","Auto Maps On","Auto Maps No Unique"], 'Recommended. Automatically run maps to progress. Very Important. Has multiple modes: Prestige, Voids, Want more Damage, Want more Health, Want Health & Damage, and Farming.Prestige takes precedence and does equal level maps until it gets what is needed as per Autotrimps Prestige dropdown setting. Voids is self explanatory: use the Void Difficulty Check setting to control the amount of farming. If \'want more damage\', it will only do 10 maps for 200% mapbonus damage bonus. If \'Farming\', it does maps beyond 10 if the displayed number is over >16x. \'Want more health[or and damage]\' is basically just a status message telling you need more health, theres not much that can be done besides tell AutoLevelEquipment to keep buying stuff. If you \'want health\' but your damage is OK to continue, invest in more HP perks.

Unique Maps are run automatically unless disabled.
Uniques Required to auto-run The Wall and Dimension of Anger. Also Required for challenges: Electricity, Mapocalypse, Meditate, and Crushed (etc) to complete their AutoPortal.

Maps/Levels:
The Block - 12
The Wall - 16
Dimension of Anger - 21
Trimple Of Doom - 34
The Prison - 82
Bionic Wonderland (only during Crushed) @ 127
NOTE: This should generally be on.
NOTE: Run Bionic Before Spire prevents the setting of Unique.
NOTICE: This does NOT auto-run all your Bionics according to your lack of Robotrimp status or whether you pass a certain level (yet).', 'multitoggle', 1, null, "Maps"); createSetting('DynamicSiphonology', 'Dynamic Siphonology', 'Recommended Always ON. Use the right level of siphonology based on your damage output. IE: Only uses siphonology if you are weak. With this OFF it means it ALWAYS uses the lowest siphonology map you can create. Siphonology is a perk you get at level 115-125ish, and means you receive map bonus stacks for running maps below your current zone - Up to 3 zones below (1 per perk level).', 'boolean', true, null, 'Maps'); //Should always be on? createSetting('PreferMetal', 'Prefer Metal Maps', 'Always prefer metal maps, intended for manual use, such as pre-spire farming. Remember to turn it back off after you\'re done farming!', 'boolean', false, null, 'Maps'); //rarely better tbh createSetting('MaxMapBonusAfterZone', 'Max MapBonus After', 'Always gets Max Map Bonus from this zone on. (inclusive and after).
NOTE: Set -1 to disable entirely (default). Set 0 to use it always.
Advanced:User can set a lower number than the default 10 maps with the AT hidden console command: MODULES[\\"maps\\"].maxMapBonusAfterZ = 9;', 'value', '-1', null, 'Maps'); diff --git a/modules/scryer.js b/modules/scryer.js index 1406e6584..d6331b6c8 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -27,7 +27,7 @@ function useScryerStance() { || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never - var iscorrupt = getCurrentEnemy(1).mutation == ("Corruption" || "Healthy"); + var iscorrupt = getCurrentEnemy(1).mutation == "Corruption" || getCurrentEnemy(1).mutation == "Healthy"; iscorrupt = iscorrupt || (mutations.Magma.active() && game.global.mapsActive); iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_auto))) { @@ -102,35 +102,8 @@ function useScryerStance() { return; } } -/* -//If you cannot overkill, these situations will cause a return to autostance. - //check for spire not being Forced - use_auto = use_auto || !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')!=1; - //check for voids - use_auto = use_auto || game.global.mapsActive && getCurrentMapObject().location == "Void" && !getPageSetting('ScryerUseinVoidMaps2'); - //check for maps - use_auto = use_auto || game.global.mapsActive && !getPageSetting('ScryerUseinMaps2'); - //check for bosses above voidlevel - use_auto = use_auto || getPageSetting('ScryerSkipBoss2') == 1 && game.global.world > getPageSetting('VoidMaps') && game.global.lastClearedCell == 98; - //check for bosses (all levels) - use_auto = use_auto || getPageSetting('ScryerSkipBoss2') == 2 && game.global.lastClearedCell == 98; - if (use_auto) { - autostancefunction(); //falls back to autostance when not using S. - wantToScry = false; - return; - } - //check for corrupted cells (and exit) - var iscorrupt = getCurrentEnemy(1).mutation == "Corruption"; - iscorrupt = iscorrupt || (mutations.Magma.active() && game.global.mapsActive); - iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); - if (iscorrupt && getPageSetting('ScryerSkipCorrupteds2')) { - autostancefunction(); - wantToScry = false; - return; - } -*/ - //Default. (All Never and Always are accounted for, Overkill has decided whether to run, leaving solely what zones you want to run S in even when you can't overkill) +//Default. (All Never and Always are accounted for, Overkill has decided whether to run, leaving solely what zones you want to run S in even when you can't overkill) var min_zone = getPageSetting('ScryerMinZone'); var max_zone = getPageSetting('ScryerMaxZone'); var valid_min = game.global.world >= min_zone; From 2a38836f6177473a8253d90ce11931d682f53823 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Tue, 3 Apr 2018 02:09:03 -0400 Subject: [PATCH 0043/3477] prevent scryer.js:30 Uncaught TypeError: Cannot read property 'mutation' of undefined at useScryerStance (scryer.js:30) --- modules/scryer.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index d6331b6c8..f15b12fc0 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -27,8 +27,9 @@ function useScryerStance() { || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never - var iscorrupt = getCurrentEnemy(1).mutation == "Corruption" || getCurrentEnemy(1).mutation == "Healthy"; - iscorrupt = iscorrupt || (mutations.Magma.active() && game.global.mapsActive); + var curEnemy = getCurrentEnemy(1); + var iscorrupt = curEnemy && (curEnemy.mutation == "Corruption" || curEnemy.mutation == "Healthy"); + iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Magma.active()); iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_auto))) { autostancefunction(); From b77901cf577174313c116d615ad1271b8d234253 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Tue, 3 Apr 2018 02:44:56 -0400 Subject: [PATCH 0044/3477] import export changes. store MODULES better. --- AutoTrimps2.js | 3 ++- SettingsGUI.js | 2 +- modules/import-export.js | 33 ++++++++++++++------------------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 770cdfddd..dec1ab0a1 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -116,6 +116,7 @@ function delayStartAgain(){ game.global.addonUser = true; game.global.autotrimps = true; //Actually Start mainLoop and guiLoop + MODULESdefault = JSON.parse(JSON.stringify(MODULES)); setInterval(mainLoop, runInterval); setInterval(guiLoop, runInterval*10); if (autoTrimpSettings.PrestigeBackup !== undefined && autoTrimpSettings.PrestigeBackup.selected != "") @@ -247,7 +248,7 @@ function mainLoop() { //GUI Updates happen on this thread, every 1000ms function guiLoop() { updateCustomButtons(); - MODULESdefault = JSON.parse(JSON.stringify(MODULES)); + //MODULESdefault = JSON.parse(JSON.stringify(MODULES)); //Store the diff of our custom MODULES vars in the localStorage bin. safeSetItems('storedMODULES', JSON.stringify(compareModuleVars())); //Swiffy UI/Display tab diff --git a/SettingsGUI.js b/SettingsGUI.js index ee237487b..df07ea3cf 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -468,7 +468,7 @@ function initializeAllSettings() { // Export/Import/Default settings createSetting('ImportAutoTrimps', 'Import AutoTrimps', 'Import your AutoTrimps Settings. Asks you to name it as a profile afterwards.', 'infoclick', 'ImportAutoTrimps', null, 'Import Export'); createSetting('ExportAutoTrimps', 'Export AutoTrimps', 'Export your AutoTrimps Settings as a output string text formatted in JSON.', 'infoclick', 'ExportAutoTrimps', null, 'Import Export'); - createSetting('DefaultAutoTrimps', 'Reset to Default', 'Reset everything to the way it was when you first installed the script. (Also ', 'infoclick', 'DefaultAutoTrimps', null, 'Import Export'); + createSetting('DefaultAutoTrimps', 'Reset to Default', 'Reset everything to the way it was when you first installed the script. ', 'infoclick', 'ResetDefaultSettingsProfiles', null, 'Import Export'); settingsProfileMakeGUI(); //Settings Profile dropdown and Delete button. createSetting('CleanupAutoTrimps', 'Cleanup Saved Settings ', 'Deletes old values from previous versions of the script from your AutoTrimps Settings file.', 'infoclick', 'CleanupAutoTrimps', null, 'Import Export'); createSetting('allowSettingsUpload', 'Allow Analytics Upload', 'Uploads your AUTOTRIMPS saved settings files (the same as Export AutoTrimps on this tab) anonymously - to https://autotrimps.site = the official Autotrimps development server. It will remain private for now, and aggregated for analytics to improve the script in the future and see which features are being used. Please Opt in. The upload will be approximately a small 5-10KB uncompressed text file every time the script is LOADED (for the time being until it is refined), and there is no concern for any personal data leak or privacy concern. This is all in good faith, and you are welcome to check the open source file modules/client-server.js. In the future, I will have to make a more fine-grained data-usage privacy-policy. Possible other data collected in the near-future may include certain game stats such as your highest zone, helium amount, bones, resource/magma/DE amounts, perk ratio selections. ', 'boolean', true, null, 'Import Export'); diff --git a/modules/import-export.js b/modules/import-export.js index 2859f7433..c1de6b658 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -7,13 +7,13 @@ function settingsProfileMakeGUI() { var $settingsProfilesLabel = document.createElement("Label"); $settingsProfilesLabel.id = 'settingsProfiles Label'; $settingsProfilesLabel.innerHTML = "Settings Profile: "; - if (game.options.menu.darkTheme.enabled == 2) $settingsProfilesLabel.setAttribute("style", "margin-left: 1.2vw; margin-right: 0.8vw; color: #C8C8C8; font-size: 0.8vw;"); - else $settingsProfilesLabel.setAttribute("style", "margin-left: 1.2vw; margin-right: 0.8vw; color:white; font-size: 0.8vw;"); + if (game.options.menu.darkTheme.enabled == 2) $settingsProfilesLabel.setAttribute("style", "margin-left: 1.2vw; margin-right: 0.8vw; font-size: 0.8vw;"); + else $settingsProfilesLabel.setAttribute("style", "margin-left: 1.2vw; margin-right: 0.8vw; font-size: 0.8vw;"); $settingsProfiles = document.createElement("select"); $settingsProfiles.id = 'settingsProfiles'; $settingsProfiles.setAttribute('class', 'noselect'); $settingsProfiles.setAttribute('onchange', 'settingsProfileDropdownHandler()'); - var oldstyle = 'text-align: center; width: 160px; font-size: 1.1vw;'; + var oldstyle = 'text-align: center; width: 160px; font-size: 1.0vw;'; if(game.options.menu.darkTheme.enabled != 2) $settingsProfiles.setAttribute("style", oldstyle + " color: black;"); else $settingsProfiles.setAttribute('style', oldstyle); //Create settings profile selection dropdown @@ -155,8 +155,6 @@ function initializeSettingsProfiles() { }); $settingsProfiles.selectedIndex = 0; } -initializeSettingsProfiles(); - //Handler for the popup/tooltip window for Import/Export/Default function ImportExportTooltip(what, event) { @@ -197,11 +195,6 @@ function ImportExportTooltip(what, event) { ondisplay = function() { document.getElementById('importBox').focus(); }; - } else if (what == "DefaultAutoTrimps") { - resetAutoTrimps(); - tooltipText = "Autotrimps has been successfully reset to its defaults! "; - costText = "

OK
"; - debug(tooltipText, "profile"); } else if (what == "CleanupAutoTrimps") { cleanupAutoTrimps(); tooltipText = "Autotrimps saved-settings have been attempted to be cleaned up. If anything broke, refreshing will fix it, but check that your settings are correct! (prestige in particular)"; @@ -349,19 +342,20 @@ function exportModuleVars() { function compareModuleVars() { var diffs = {}; var mods = Object.keys(MODULES); - for (var i=0,leni=mods.length;i Date: Tue, 3 Apr 2018 03:27:36 -0400 Subject: [PATCH 0045/3477] import export changes. make multiToggles respond to setPageSetting --- SettingsGUI.js | 17 ++++++++----- modules/import-export.js | 55 ++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index df07ea3cf..acd84a84f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -469,9 +469,9 @@ function initializeAllSettings() { createSetting('ImportAutoTrimps', 'Import AutoTrimps', 'Import your AutoTrimps Settings. Asks you to name it as a profile afterwards.', 'infoclick', 'ImportAutoTrimps', null, 'Import Export'); createSetting('ExportAutoTrimps', 'Export AutoTrimps', 'Export your AutoTrimps Settings as a output string text formatted in JSON.', 'infoclick', 'ExportAutoTrimps', null, 'Import Export'); createSetting('DefaultAutoTrimps', 'Reset to Default', 'Reset everything to the way it was when you first installed the script. ', 'infoclick', 'ResetDefaultSettingsProfiles', null, 'Import Export'); - settingsProfileMakeGUI(); //Settings Profile dropdown and Delete button. createSetting('CleanupAutoTrimps', 'Cleanup Saved Settings ', 'Deletes old values from previous versions of the script from your AutoTrimps Settings file.', 'infoclick', 'CleanupAutoTrimps', null, 'Import Export'); createSetting('allowSettingsUpload', 'Allow Analytics Upload', 'Uploads your AUTOTRIMPS saved settings files (the same as Export AutoTrimps on this tab) anonymously - to https://autotrimps.site = the official Autotrimps development server. It will remain private for now, and aggregated for analytics to improve the script in the future and see which features are being used. Please Opt in. The upload will be approximately a small 5-10KB uncompressed text file every time the script is LOADED (for the time being until it is refined), and there is no concern for any personal data leak or privacy concern. This is all in good faith, and you are welcome to check the open source file modules/client-server.js. In the future, I will have to make a more fine-grained data-usage privacy-policy. Possible other data collected in the near-future may include certain game stats such as your highest zone, helium amount, bones, resource/magma/DE amounts, perk ratio selections. ', 'boolean', true, null, 'Import Export'); + settingsProfileMakeGUI(); //Settings Profile dropdown and Delete button. (this always shows up first - can be here last) //createSetting('ExportModuleVars', 'Export Custom Variables', 'Export your custom MODULES variables.', 'infoclick', 'ExportModuleVars', null, 'Import Export'); //createSetting('ImportModuleVars', 'Import Custom Variables', 'Import your custom MODULES variables (and save).', 'infoclick', 'ImportModuleVars', null, 'Import Export'); //createSetting('ResetModuleVars', 'Reset Custom Variables', 'Reset(Delete) your custom MODULES variables, and return the script to normal. ', 'infoclick', 'ResetModuleVars', null, 'Import Export'); @@ -887,15 +887,18 @@ function updateCustomButtons() { debug("RunBionicBeforeSpire incompatible with AutoMaps No Unique Maps, changing..."); setPageSetting("AutoMaps",1); } - //make sure value buttons are set accurately. + //since this is a loop, make sure the Text contents of our buttons are set accurately. (after any setPageSetting) for (var setting in autoTrimpSettings) { - if (autoTrimpSettings[setting].type == 'value' || autoTrimpSettings[setting].type == 'valueNegative') { - var elem = document.getElementById(autoTrimpSettings[setting].id); + var item = autoTrimpSettings[setting]; + if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle') { + var elem = document.getElementById(item.id); if (elem != null) { - if (autoTrimpSettings[setting].value > -1 || autoTrimpSettings[setting].type == 'valueNegative') - elem.textContent = autoTrimpSettings[setting].name + ': ' + prettify(autoTrimpSettings[setting].value); + if (item.type == 'multitoggle') + elem.textContent = item.name[item.value]; + else if (item.value > -1 || item.type == 'valueNegative') + elem.textContent = item.name + ': ' + prettify(item.value); else - elem.innerHTML = autoTrimpSettings[setting].name + ': ' + ""; + elem.innerHTML = item.name + ': ' + ""; } } } diff --git a/modules/import-export.js b/modules/import-export.js index c1de6b658..3b8dc5d0c 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -23,12 +23,6 @@ function settingsProfileMakeGUI() { $settingsProfilesButton.innerHTML = "<Delete Profile"; $settingsProfilesButton.setAttribute('style', 'margin-left: 0.5vw; margin-right: 0.5vw; font-size: 0.8vw;'); $settingsProfilesButton.setAttribute('onclick','onDeleteProfileHandler()'); - //Add the $settingsProfiles dropdown to UI - var $ietab = document.getElementById('Import Export'); - //Any ERRORs here are caused by incorrect order loading of script and you should reload until its gone.(for now) - $ietab.insertBefore($settingsProfilesLabel, $ietab.childNodes[1]); - $ietab.insertBefore($settingsProfiles, $ietab.childNodes[2]); - $ietab.insertBefore($settingsProfilesButton, $ietab.childNodes[3]); //populate with a Default (read default settings): var innerhtml = ""; //populate with a Default (read default settings): @@ -36,9 +30,30 @@ function settingsProfileMakeGUI() { //Append a 2nd default item named "Save New..." and have it tied to a write function(); innerhtml += ""; //dont forget to populate the rest of it with stored items: - $settingsProfiles.innerHTML = innerhtml; + $settingsProfiles.innerHTML = innerhtml; + //Add the $settingsProfiles dropdown to UI + var $ietab = document.getElementById('Import Export'); + if ($ietab == null) return; + //Any ERRORs here are caused by incorrect order loading of script and you should reload until its gone.(for now) + $ietab.insertBefore($settingsProfilesLabel, $ietab.childNodes[1]); + $ietab.insertBefore($settingsProfiles, $ietab.childNodes[2]); + $ietab.insertBefore($settingsProfilesButton, $ietab.childNodes[3]); +} //self-executes at the bottom of the file. + +//Populate dropdown menu with list of AT SettingsProfiles +function initializeSettingsProfiles() { + if ($settingsProfiles == null) return; + //load the old data in: + var loadLastProfiles = localStorage.getItem('ATSelectedSettingsProfile'); + var oldpresets = loadLastProfiles ? JSON.parse(loadLastProfiles) : new Array(); //load the import. + oldpresets.forEach(function(elem){ + //Populate dropdown menu to reflect new name: + let optionElementReference = new Option(elem.name); + optionElementReference.id = 'customProfileRead'; + $settingsProfiles.add(optionElementReference); + }); + $settingsProfiles.selectedIndex = 0; } -//settingsProfileMakeGUI(); //runs at the bottom now: //This switches into the new profile when the dropdown is selected. //it is the "onchange" handler of the settingsProfiles dropdown @@ -141,20 +156,6 @@ function onDeleteProfile() { debug("Successfully deleted profile #: " + target, "profile"); } -//Populate dropdown menu with list of AT SettingsProfiles -function initializeSettingsProfiles() { - if ($settingsProfiles == null) return; - //load the old data in: - var loadLastProfiles = localStorage.getItem('ATSelectedSettingsProfile'); - var oldpresets = loadLastProfiles ? JSON.parse(loadLastProfiles) : new Array(); //load the import. - oldpresets.forEach(function(elem){ - //Populate dropdown menu to reflect new name: - let optionElementReference = new Option(elem.name); - optionElementReference.id = 'customProfileRead'; - $settingsProfiles.add(optionElementReference); - }); - $settingsProfiles.selectedIndex = 0; -} //Handler for the popup/tooltip window for Import/Export/Default function ImportExportTooltip(what, event) { @@ -350,7 +351,7 @@ function compareModuleVars() { var a = MODULES[mod][vj]; var b = MODULESdefault[mod][vj]; if (JSON.stringify(a)!=JSON.stringify(b)) { - if (diffs[mod] === undefined) + if (typeof diffs[mod] === 'undefined') diffs[mod] = {}; diffs[mod][vj] = a; } @@ -377,18 +378,18 @@ function importModuleVars() { debug("Error importing MODULE vars, the string is bad." + err.message, "profile"); return; } - localStorage.removeItem('ATMODULES'); - safeSetItems('ATMODULES', JSON.stringify(tmpset)); + localStorage.removeItem('storedMODULES'); + safeSetItems('storedMODULES', JSON.stringify(tmpset)); } //reset MODULE variables to default, (and/or then import) function resetModuleVars(imported) { ATrunning = false; //stop AT, wait, remove function waitRemoveLoad(imported) { - localStorage.removeItem('ATMODULES'); + localStorage.removeItem('storedMODULES'); MODULES = JSON.parse(JSON.stringify(MODULESdefault)); //load everything again, anew - safeSetItems('ATMODULES', JSON.stringify(ATMODULES)); + safeSetItems('storedMODULES', JSON.stringify(storedMODULES)); ATrunning = true; //restart AT. } setTimeout(waitRemoveLoad(imported),101); From e291c63c97eac0135ba2909680037a08d53102d4 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Tue, 3 Apr 2018 04:06:06 -0400 Subject: [PATCH 0046/3477] set dropdown labels to be the name, not the ID. fixes a bunch of double-line-wraps. --- SettingsGUI.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index acd84a84f..40a2ba788 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -257,9 +257,9 @@ function initializeAllSettings() { document.getElementById('AutoAllocatePerks').parentNode.insertAdjacentHTML('afterend','
'); //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. - createSetting('AutoPortal', 'Auto Portal Settings:', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); - createSetting('HeliumHourChallenge', 'Portal Challenge:', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); - document.getElementById("HeliumHourChallengeLabel").innerHTML = "Portal Challenge:"; //fit it on 1 line. + createSetting('AutoPortal', 'AutoPortal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); + createSetting('HeliumHourChallenge', 'Portal Challenge', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); + //document.getElementById("HeliumHourChallengeLabel").innerHTML = "Portal Challenge:"; //fit it on 1 line. createSetting('CustomAutoPortal', 'Custom Portal', 'Automatically portal AFTER clearing this level.(ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "Core"); createSetting('HeHrDontPortalBefore', 'Don\'t Portal Before', 'Do NOT allow Helium per Hour AutoPortal setting to portal BEFORE this level is reached. It is an additional check that prevents drops in helium/hr from triggering autoportal. Set to 0 or -1 to completely disable this check. (only shows up with Helium per Hour set)', 'value', '999', null, "Core"); createSetting('HeliumHrBuffer', 'He/Hr Portal Buffer %', 'IMPORTANT SETTING. When using the He/Hr Autoportal, it will portal if your He/Hr drops by this amount of % lower than your best for current run, default is 0% (ie: set to 5 to portal at 95% of your best). Now with stuck protection - Allows portaling midzone if we exceed set buffer amount by 5x. (ie a normal 2% buffer setting would now portal mid-zone you fall below 10% buffer).', 'value', '0', null, 'Core'); @@ -423,8 +423,8 @@ function initializeAllSettings() { //Golden Upgrade Strategies: - createSetting('AutoGoldenUpgrades', 'Auto Golden Upgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections.', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void"], 'Golden'); - createSetting('goldStrat', 'Auto Golden Strategy', 'VOID ONLY: After max Void golden upgrades, alternate between buying helium and battle upgrades. Or Choose a Zone to switch over completely at (zones lower than X will buy only battle, and zones higher than X only helium). Battle can be disabled completely with the goldNoBattle button. MAX THEN HELIUM setting so you can get the perfect 60% Voids then Helium', 'dropdown', 'Max then Helium', ["Off", "Alternating", "Zone", "Max then Helium"], 'Golden'); + createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections.', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void"], 'Golden'); + createSetting('goldStrat', 'Strategy', 'VOID ONLY: After max Void golden upgrades, alternate between buying helium and battle upgrades. Or Choose a Zone to switch over completely at (zones lower than X will buy only battle, and zones higher than X only helium). Battle can be disabled completely with the goldNoBattle button. MAX THEN HELIUM setting so you can get the perfect 60% Voids then Helium', 'dropdown', 'Max then Helium', ["Off", "Alternating", "Zone", "Max then Helium"], 'Golden'); createSetting('goldAlternating', 'GU VOID: Alternating', 'Buy a helium upgrade after X-1 battle upgrades have been purchased', 'value', '2', null, 'Golden'); createSetting('goldZone', 'GU VOID: Zone', 'Buy a helium upgrade until zone X, then buy battle upgrades.', 'value', '200', null, 'Golden'); createSetting('goldNoBattle', 'GU VOID: No Battle', 'Green = Do NOT buy Battle Upgrades
Red = Buy Battle Upgrades.', 'boolean', true, null, 'Golden'); @@ -551,7 +551,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe var dropdownLabel = document.createElement("Label"); dropdownLabel.id = id + "Label"; - dropdownLabel.innerHTML = id + ":"; + dropdownLabel.innerHTML = name + ":"; dropdownLabel.setAttribute('style', 'margin-right: 0.3vw; font-size: 0.8vw;'); btnParent.appendChild(dropdownLabel); btnParent.appendChild(btn); From 09620365322a99c56c4a1ca7ca99d9ed54aafae0 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Tue, 3 Apr 2018 04:36:08 -0400 Subject: [PATCH 0047/3477] startup message --- AutoTrimps2.js | 10 +++++----- SettingsGUI.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index dec1ab0a1..603ebb971 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,10 +61,10 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "4/2", version: "v2.1.6.9b", description: "AutoPerks code was changed but still functions the same, except a new algorithm to reduce the time to allocate for high helium players. Test new algo with MODULES[\"perks\"].useAlgo2=true; .You can also clear all perks then allocate and have it work now. AutoMaps no longer considered as Lead challenge when in Chall^2", isNew: true}); -changelogList.push({date: "3/23", version: "v2.1.6.9", description: "Game's Map at Zone can be used with AT now, to run maps forever. AutoMaps setting was combined with RunUniqueMaps (variable has changed from boolean false,true to a value 0,1,2). Settings file has been migrated as such. New: Map SpecialMod is sort of working, at least. Geneticist Infinity bugfix. New AGU Settings for 60% Void (fixed). Many Graphs fixes. AutoMaps changes. Equipment Cap, see README at GitHub DarkTheme fix. Scientists Fix. Zek450 Perks Preset Changed. Ongoing Development...", isNew: true}); -changelogList.push({date: "3/22", version: "v2.1.6.8", description: "Settings GUI, make better. Import/export improved. Graph buttons: Cycle Up/Down. Internal code fixes. New Graph: Nurseries", isNew: false}); -changelogList.push({date: "3/24", version: "v2.1.6.5-stable", description: "Set up Stable Repository for the faint of heart.", isNew: true}); +changelogList.push({date: "4/2", version: "v2.1.6.9b", description: "Multiple Settings Were Combined. AutoPerks code was changed but still functions the same, except a new algorithm to reduce the time to allocate for high helium players. Test new algo with MODULES[\"perks\"].useAlgo2=true; .You can also clear all perks then allocate and have it work now. AutoMaps no longer considered as Lead challenge when in Chall^2. ", isNew: true}); +changelogList.push({date: "3/23", version: "v2.1.6.9", description: "Game's Map at Zone can be used with AT now, to run maps forever. AutoMaps setting was combined with RunUniqueMaps (variable has changed from boolean false,true to a value 0,1,2). Settings file has been migrated as such. New: Map SpecialMod is sort of working, at least. Geneticist Infinity bugfix. New AGU Settings for 60% Void (fixed). Many Graphs fixes. AutoMaps changes. Equipment Cap, see README at GitHub DarkTheme fix. Scientists Fix. Zek450 Perks Preset Changed. Ongoing Development...", isNew: false}); +changelogList.push({date: "3/24", version: "v2.1.6.5-stable", description: "Set up Stable Repository for the faint of heart.", isNew: false}); +//changelogList.push({date: "3/22", version: "v2.1.6.8", description: "Settings GUI, make better. Import/export improved. Graph buttons: Cycle Up/Down. Internal code fixes. New Graph: Nurseries", isNew: false}); //changelogList.push({date: "3/20", version: "v2.1.6.7", description: "Entirely Re-Arranged Settings Layout. Enjoy! New: Display Tab: EnhanceGrid + Go AFK Mode. GUI: Pinned AT Tab menu bar to top when scrolling. Minimize/Maxi/Close Buttons. ShowChangeLog Button. New Graph: FluffyXP&Xp/Hr (starts@300)", isNew: false}); //changelogList.push({date: "3/13", version: "v2.1.6.6", description: "Geneticist management changes. Equipment code improvements. ATscriptLoad improvements. attempt to track errors.", isNew: false}); //changelogList.push({date: "3/7", version: "v2.1.6.5", description: "Save/Reload Profiles in Import/Export. Magmamancer graph. Magmite/Magma Spam disableable.", isNew: false}); @@ -84,7 +84,7 @@ function printChangelog() { var footer = 'Ongoing Development - Report any bugs/problems please!\
Talk with the dev: genr8_#8163 @ AutoTrimps Discord Channel\ -
SeeReadMe Or check the commit history (if you want).' +
See ReadMe Or check the commit history (if you want).' , action = 'cancelTooltip()' , title = 'Script Update Notice
' + ATversion , acceptBtnText = "Thank you for playing AutoTrimps. Accept and Continue." diff --git a/SettingsGUI.js b/SettingsGUI.js index 40a2ba788..9f8504bc2 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -392,7 +392,7 @@ function initializeAllSettings() { //Line2 createSetting('ScryerSkipBoss2', ['Boss: NEVER (All Levels)','Boss: NEVER (Above VoidLevel)','Boss: MAYBE'], 'NEVER (All Levels) will NEVER use S in cell 100 of the world!!!
NEVER (Above VoidLevel) will NEVER use S in cell 100 of the world ABOVE the zone that your void maps are set to run at (Maps).
MAYBE treats the cell no differently to any other, Overkill and Min/Max Scryer is allowed.

Recommend NEVER (There is little benefit to double NON-HELIUM resources and a small chance of DE).', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate against Corrupted enemies
MAYBE means that Overkill and Min/Max use are allowed.
Magma maps and Corrupted Voidmaps are currently classified as corrupted and NEVER here will override Maps and Voidmaps use of Scryer

Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); - createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. This feature was added for 1 person, use at your own risk.
Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); + createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. NOTE: Use at your own risk.
Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); createSetting('ScryUseinPoison', 'Scry in Poison','-1 to disable, any other number (including 0) sets a minimum zone to use S in Poison', 'value', -1, null, 'Scryer'); createSetting('ScryUseinWind', 'Scry in Wind','-1 to disable, any other number (including 0) sets a minimum zone to use S in Wind', 'value', -1, null, 'Scryer'); createSetting('ScryUseinIce', 'Scry in Ice','-1 to disable, any other number (including 0) sets a minimum zone to use S in Ice', 'value', -1, null, 'Scryer'); From 60c45f8e1579b320979f9699fc81b10042f5d25b Mon Sep 17 00:00:00 2001 From: gen BTC Date: Tue, 3 Apr 2018 04:57:53 -0400 Subject: [PATCH 0048/3477] add some new dropdowns. PlayerLevel and ATModuleListDropdown remove unused file --- SettingsGUI.js | 4 ++ sparecode/laborfix.js | 104 ------------------------------------------ 2 files changed, 4 insertions(+), 104 deletions(-) delete mode 100644 sparecode/laborfix.js diff --git a/SettingsGUI.js b/SettingsGUI.js index 9f8504bc2..91ef0f3fd 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -184,6 +184,7 @@ function initializeAllTabs() { createTabs("Golden", "Golden Upgrade Settings"); createTabs("Nature", "Nature Settings"); createTabs("Display", "Display & Spam Settings"); + //createTabs("Modules", "Load/Unload Modules & Settings"); createTabs("Import Export", "Import & Export Settings"); //add a minimize button: var li_0 = document.createElement('li'); @@ -475,6 +476,9 @@ function initializeAllSettings() { //createSetting('ExportModuleVars', 'Export Custom Variables', 'Export your custom MODULES variables.', 'infoclick', 'ExportModuleVars', null, 'Import Export'); //createSetting('ImportModuleVars', 'Import Custom Variables', 'Import your custom MODULES variables (and save).', 'infoclick', 'ImportModuleVars', null, 'Import Export'); //createSetting('ResetModuleVars', 'Reset Custom Variables', 'Reset(Delete) your custom MODULES variables, and return the script to normal. ', 'infoclick', 'ResetModuleVars', null, 'Import Export'); + + //createSetting('PlayerLevel', 'PlayerLevel', 'PlayerLevel: Indicate around what level you are. noob, low, medium, high, spire, magma, expert, z450+, z500+, endgame and so on. Might be used to control which settings are visible in the future. ', 'dropdown', "Medium", ["Noob","Low","Medium","High","Spire","Magma","Expert","z450+","z500+","EndGame"], 'Modules'); + //createSetting('ATModuleListDropdown', 'Modules', 'AT Module List Dropdown: Lists all the individual modules (.js files) that have been auto-loaded. It might be possible to unload these or something in the future.', 'dropdown', ATmoduleList[0], ATmoduleList, 'Modules'); } initializeAllSettings(); //EXECUTE diff --git a/sparecode/laborfix.js b/sparecode/laborfix.js deleted file mode 100644 index 8689f037f..000000000 --- a/sparecode/laborfix.js +++ /dev/null @@ -1,104 +0,0 @@ -//"Auto Gather/Build" -function manualLabor() { - //vars - var breedingTrimps = game.resources.trimps.owned - game.resources.trimps.employed; - var trapTrimpsOK = getPageSetting('TrapTrimps'); - var targetBreed = parseInt(getPageSetting('GeneticistTimer')); - - //FRESH GAME LOWLEVEL NOHELIUM CODE. - if (game.global.world <=3 && game.global.totalHeliumEarned<=1000) { - if (game.global.buildingsQueue.length == 0 && (game.global.playerGathering != 'trimps' || game.buildings.Trap.owned == 0)){ - if (!game.triggers.wood.done || game.resources.food.owned < 10 || Math.floor(game.resources.food.owned) < Math.floor(game.resources.wood.owned)) { - setGather('food'); - return; - } - else { - setGather('wood'); - return; - } - } - } - //Traps and Trimps - if (trapTrimpsOK && (breedingTrimps < 5 || targetBreed < getBreedTime(true))) { - if (game.buildings.Trap.owned > 0) { - setGather('trimps');//gatherTrimps = true; - return; - } - if (game.buildings.Trap.owned == 0 && canAffordBuilding('Trap')) - safeBuyBuilding('Trap');//buyTraps = true; - } - //Buildings: - //if we have more than 2 buildings in queue, or (our modifier is real fast and trapstorm is off), build - if ((!game.talents.foreman.purchased && (game.global.buildingsQueue.length ? (game.global.buildingsQueue.length > 1 || game.global.autoCraftModifier == 0 || (getPlayerModifier() > 1000 && game.global.buildingsQueue[0] != 'Trap.1')) : false)) || - //if trapstorm is off (likely we havent gotten it yet, the game is still early, buildings take a while to build ), then Prioritize Storage buildings when they hit the front of the queue (should really be happening anyway since the queue should be >2(fits the clause above this), but in case they are the only object in the queue.) - (!game.global.trapBuildToggled && (game.global.buildingsQueue[0] == 'Barn.1' || game.global.buildingsQueue[0] == 'Shed.1' || game.global.buildingsQueue[0] == 'Forge.1')) || - //Build more traps if we have TrapTrimps on, and we own less than 1000 traps. - (trapTrimpsOK && game.global.trapBuildToggled && game.buildings.Trap.owned < 1000)) { - setGather('buildings');//buildBuildings = true; - return; - } - //Sciencey: - //if we have some upgrades sitting around which we don't have enough science for, gather science - if (document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') { - //if we have less than a minute of science - if (game.resources.science.owned < 100 || (game.resources.science.owned < getPsString('science', true) * 60 && game.global.turkimpTimer < 1)) - if (getPageSetting('ManualGather2') != 2) { - setGather('science'); - return; - } - if (game.resources.science.owned < scienceNeeded) { - //if manual is less than science production and turkimp, metal. (or science is set as disallowed) - if ((getPlayerModifier() < getPerSecBeforeManual('Scientist') && game.global.turkimpTimer > 0) || getPageSetting('ManualGather2') == 2) - setGather('metal'); - else if (getPageSetting('ManualGather2') != 2) { - setGather('science'); - return; - } - } - } - //If we got here, without exiting, gather Normal Resources: - var manualResourceList = { - 'food': 'Farmer', - 'wood': 'Lumberjack', - 'metal': 'Miner', - }; - var lowestResource = 'food'; - var lowestResourceRate = -1; - var haveWorkers = true; - for (var resource in manualResourceList) { - var job = manualResourceList[resource]; - var currentRate = game.jobs[job].owned * game.jobs[job].modifier; - // debug('Current rate for ' + resource + ' is ' + currentRate + ' is hidden? ' + (document.getElementById(resource).style.visibility == 'hidden')); - if (document.getElementById(resource).style.visibility != 'hidden') { - //find the lowest resource rate - if (currentRate === 0) { - currentRate = game.resources[resource].owned; - // debug('Current rate for ' + resource + ' is ' + currentRate + ' lowest ' + lowestResource + lowestResourceRate); - if ((haveWorkers) || (currentRate < lowestResourceRate)) { - // debug('New Lowest1 ' + resource + ' is ' + currentRate + ' lowest ' + lowestResource + lowestResourceRate+ ' haveworkers ' +haveWorkers); - haveWorkers = false; - lowestResource = resource; - lowestResourceRate = currentRate; - } - } - if ((currentRate < lowestResourceRate || lowestResourceRate == -1) && haveWorkers) { - // debug('New Lowest2 ' + resource + ' is ' + currentRate + ' lowest ' + lowestResource + lowestResourceRate); - lowestResource = resource; - lowestResourceRate = currentRate; - } - } - // debug('Current Stats ' + resource + ' is ' + currentRate + ' lowest ' + lowestResource + lowestResourceRate+ ' haveworkers ' +haveWorkers); - } - - if (game.global.playerGathering != lowestResource && !haveWorkers && !breedFire) { - if (game.global.turkimpTimer > 0) - setGather('metal'); - else - setGather(lowestResource);//gather the lowest resource - } else if (game.global.turkimpTimer > 0) - setGather('metal'); - else - setGather(lowestResource); - //ok - return true; -} \ No newline at end of file From 6e170790ce1014ed36ddbd09949f208a3737dad9 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Tue, 3 Apr 2018 05:41:54 -0400 Subject: [PATCH 0049/3477] work on settings migration in utils.js --- modules/utils.js | 64 +++++++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/modules/utils.js b/modules/utils.js index e7e392417..ee71b65af 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -66,26 +66,42 @@ function updateOldSettings(oldSettings) { var oldVer = oldSettings['ATversion']; debug("ATsettings: Updating v" + oldVer + " to v" + ATversion); if (versionIsOlder(oldVer, '2.1.6.9')) { - debug("ATsettings: Migrating AutoMaps + RunUniqueMaps to new AutoMaps."); - //migrate AutoMaps + RunUniqueMaps to new AutoMaps - var am = (oldSettings['AutoMaps']); - oldSettings['AutoMaps'] = am ? 1 : 0; - if (!oldSettings['RunUniqueMaps']) - oldSettings['AutoMaps']++; - delete oldSettings['RunUniqueMaps']; + debug("ATsettings: Migrating AutoMaps + RunUniqueMaps to new AutoMaps."); + //migrate AutoMaps + RunUniqueMaps to new AutoMaps + oldSettings['AutoMaps'].value = oldSettings['AutoMaps'].enabled ? 1 : 0; + if (!oldSettings['RunUniqueMaps'].enabled) + oldSettings['AutoMaps'].value++; + delete oldSettings['RunUniqueMaps']; } - /* - if (versionIsOlder(oldVer, '2.1.7.0')) { - debug("ATsettings: Migrating X + Y to new Z."); - //migrate X + Y to new Z - var am = (oldSettings['X']); - oldSettings['X'] = am ? 1 : 0; - if (!oldSettings['Y']) - oldSettings['X']++; - delete oldSettings['Y']; - } - */ + //These settingsneed to be migrated here: +/* +BuyBuildingsNew = BuyBuildings + BuyStorage +BuyJobsNew = BuyJobs + WorkerRatios +BuyWeaponsNew = BuyWeaponUpgrades + BuyWeapons +BuyArmorNew = BuyArmorUpgrades + BuyArmor +ManualGather2 was 2 now 3 (4=way) - needs to be converted. +BuyOneTimeOC = BuyOvclock + OneTimeOnly +PrestigeSkip1_2 = PrestigeSkipMode + PrestigeSkip2 +AutoHeirloomsNew = AutoHeirlooms + AutoHeirlooms2 +ScryerDieToUseS += ScryerDieZ +(+more since 5 days ago) +*/ + if (versionIsOlder(oldVer, '2.1.7.0')) { + //example:*untested* + var X='BuyBuildings'; + var Y='BuyStorage'; + var Z='BuyBuildingsNew'; + //migrate X + Y to new Z + var oldOne = oldSettings[X]; + var oldTwo = oldSettings[Y]; + var newOne = oldSettings[Z]; + debug("ATsettings: Migrating " + X + " + " + Y + " to new " + Z); + newOne.value = oldOne.enabled ? 1 : 0; + newOne.value+= oldTwo.enabled ? 1 : 0; + delete oldOne; + delete oldTwo; + } autoTrimpSettings = oldSettings; } @@ -168,6 +184,7 @@ function debug(message, type, lootIcon) { var graphs = getPageSetting('SpamGraphs'); var magmite = getPageSetting('SpamMagmite'); var perks = getPageSetting('SpamPerks'); + var profiles = getPageSetting('SpamProfiles'); var output = true; switch (type) { case null: @@ -202,6 +219,9 @@ function debug(message, type, lootIcon) { case "perks": output = perks; break; + case "profiles": + output = profiles; + break; } if (output) { if (enableDebug) @@ -373,13 +393,7 @@ window.onerror = function catchErrors(msg, url, lineNo, columnNo, error) { console.log("AT logged error: " + message); //ATServer.Upload(message); }; -/* -window.addEventListener('error', function(event) { - var message = JSON.stringify(event); - console.log("logged error: " + message); - //ATServer.Upload(message); -}); -*/ + function throwErrorfromModule() { throw new Error("We have successfully read the thrown error message out of a module"); } From 2ae36f2da22e532dde612c95dafa00e11431b81b Mon Sep 17 00:00:00 2001 From: gen BTC Date: Tue, 3 Apr 2018 08:59:40 -0400 Subject: [PATCH 0050/3477] script Module Load Unload in import export. protect Equipment from Null errors on bookmarklet. --- AutoTrimps2.js | 15 +++++++------- SettingsGUI.js | 13 +++++++++++-- modules/equipment.js | 42 ++++++++++++++++++++-------------------- modules/import-export.js | 26 +++++++++++++++++++++++++ user.js | 4 ++++ 5 files changed, 70 insertions(+), 30 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 603ebb971..bfd059238 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -30,7 +30,8 @@ if (atscript !== null) { function ATscriptLoad(pathname, modulename) { if (modulename == null) debug("Wrong Syntax. Script could not be loaded. Try ATscriptLoad(modulepath, 'example.js'); "); var script = document.createElement('script'); - script.src = basepath + pathname + modulename; + if (pathname == null) pathname = ''; + script.src = basepath + pathname + modulename + '.js'; script.id = modulename + '_MODULE'; //script.setAttribute('crossorigin',"use-credentials"); //script.setAttribute('crossorigin',"anonymous"); @@ -38,22 +39,22 @@ function ATscriptLoad(pathname, modulename) { } //Scripts can be unloaded like this: ATscriptUnload('scryer'); function ATscriptUnload(id) { - var $link = document.getElementById(id + '.js_MODULE'); + var $link = document.getElementById(id + '_MODULE'); if (!$link) return; document.head.removeChild($link); debug("Removing " + id + "_MODULE","other"); } -ATscriptLoad(modulepath, 'utils.js'); //Load stuff needed to load other stuff: +ATscriptLoad(modulepath, 'utils'); //Load stuff needed to load other stuff: //This starts up after 2.5 seconds. function initializeAutoTrimps() { loadPageVariables(); //get autoTrimpSettings - ATscriptLoad("",'SettingsGUI.js'); //populate Settings GUI - ATscriptLoad("",'Graphs.js'); //populate Graphs + 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']; for (var m in ATmoduleList) { - ATscriptLoad(modulepath, ATmoduleList[m] + '.js'); + ATscriptLoad(modulepath, ATmoduleList[m]); } // debug('AutoTrimps v' + ATversion + ' Loaded!', '*spinner3'); @@ -61,7 +62,7 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "4/2", version: "v2.1.6.9b", description: "Multiple Settings Were Combined. AutoPerks code was changed but still functions the same, except a new algorithm to reduce the time to allocate for high helium players. Test new algo with MODULES[\"perks\"].useAlgo2=true; .You can also clear all perks then allocate and have it work now. AutoMaps no longer considered as Lead challenge when in Chall^2. ", isNew: true}); +changelogList.push({date: "4/2", version: "v2.1.6.9b", description: "Import Export, Modules Load code Improvements. Multiple Buttons/Settings Were Combined. AutoPerks code was changed but still functions the same, except for a new algorithm that reduces the time to allocate for high helium players to near-instantaneous. Please test new algo with MODULES[\"perks\"].useAlgo2=true; .You can also clear all perks then allocate and have it work now. AutoMaps no longer considered as being in Lead challenge during Chall^2. ", isNew: true}); changelogList.push({date: "3/23", version: "v2.1.6.9", description: "Game's Map at Zone can be used with AT now, to run maps forever. AutoMaps setting was combined with RunUniqueMaps (variable has changed from boolean false,true to a value 0,1,2). Settings file has been migrated as such. New: Map SpecialMod is sort of working, at least. Geneticist Infinity bugfix. New AGU Settings for 60% Void (fixed). Many Graphs fixes. AutoMaps changes. Equipment Cap, see README at GitHub DarkTheme fix. Scientists Fix. Zek450 Perks Preset Changed. Ongoing Development...", isNew: false}); changelogList.push({date: "3/24", version: "v2.1.6.5-stable", description: "Set up Stable Repository for the faint of heart.", isNew: false}); //changelogList.push({date: "3/22", version: "v2.1.6.8", description: "Settings GUI, make better. Import/export improved. Graph buttons: Cycle Up/Down. Internal code fixes. New Graph: Nurseries", isNew: false}); diff --git a/SettingsGUI.js b/SettingsGUI.js index 91ef0f3fd..6be43e6eb 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -477,8 +477,17 @@ function initializeAllSettings() { //createSetting('ImportModuleVars', 'Import Custom Variables', 'Import your custom MODULES variables (and save).', 'infoclick', 'ImportModuleVars', null, 'Import Export'); //createSetting('ResetModuleVars', 'Reset Custom Variables', 'Reset(Delete) your custom MODULES variables, and return the script to normal. ', 'infoclick', 'ResetModuleVars', null, 'Import Export'); - //createSetting('PlayerLevel', 'PlayerLevel', 'PlayerLevel: Indicate around what level you are. noob, low, medium, high, spire, magma, expert, z450+, z500+, endgame and so on. Might be used to control which settings are visible in the future. ', 'dropdown', "Medium", ["Noob","Low","Medium","High","Spire","Magma","Expert","z450+","z500+","EndGame"], 'Modules'); - //createSetting('ATModuleListDropdown', 'Modules', 'AT Module List Dropdown: Lists all the individual modules (.js files) that have been auto-loaded. It might be possible to unload these or something in the future.', 'dropdown', ATmoduleList[0], ATmoduleList, 'Modules'); + //createSetting('PlayerLevel', 'PlayerLevel', 'PlayerLevel: Indicate around what level you are. noob, low, medium, high, spire, magma, expert, z450+, z500+, endgame and so on. Might be used to control which settings are visible in the future. ', 'dropdown', "Medium", ["Noob","Low","Medium","High","Spire","Magma","Expert","z450+","z500+","EndGame"], 'Display'); + + createSetting('ATModuleListDropdown', 'Modules', 'AT Module List Dropdown: Lists all the individual modules (.js files) that have been auto-loaded. It might be possible to unload these or something in the future.', 'dropdown', ATmoduleList[0], ATmoduleList, 'Import Export'); + document.getElementById('ATModuleListDropdown').multiple = true; //allow 4 multiple selections + document.getElementById('ATModuleListDropdown').size = 4; + document.getElementById('ATModuleListDropdown').height = '5vw'; + document.getElementById('ATModuleListDropdownLabel').style.verticalAlign = 'top'; + document.getElementById('ATModuleListDropdownLabel').parentNode.style.width = null; //make the next stuff fit on 1 line. + createSetting('ATModuleUnload', 'Unload Module', 'UnLoads a running module file this session', 'infoclick', 'ATModuleUnload', null, 'Import Export'); + createSetting('ATModuleLoad', 'ReLoad Module', 'Load/Reloads a module file (.js) and runs it.', 'infoclick', 'ATModuleLoad', null, 'Import Export'); + } initializeAllSettings(); //EXECUTE diff --git a/modules/equipment.js b/modules/equipment.js index 0c518a512..59e430ae0 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -322,32 +322,32 @@ function autoLevelEquipment() { Best[BKey].StatusBorder = evaluation.StatusBorder; } Best[BKey].Cost = evaluation.Cost; + //add up whats needed: + resourcesNeeded[equip.Resource] += Best[BKey].Cost; + //Apply colors from before: //white - Upgrade is not available //yellow - Upgrade is not affordable (or capped) //orange - Upgrade is affordable, but will lower stats //red - Yes, do it now! - + if (evaluation.Wall) + $equipName.style.color = 'yellow'; $equipName.style.border = '1px solid ' + evaluation.StatusBorder; + var $equipUpgrade = document.getElementById(equip.Upgrade); - if (evaluation.StatusBorder != 'white' && evaluation.StatusBorder != 'yellow') { - if ($equipUpgrade) - $equipUpgrade.style.color = evaluation.StatusBorder; - } - if (evaluation.StatusBorder == 'yellow') { + if (evaluation.StatusBorder != 'white' && evaluation.StatusBorder != 'yellow' && $equipUpgrade) + $equipUpgrade.style.color = evaluation.StatusBorder; + if (evaluation.StatusBorder == 'yellow' && $equipUpgrade) $equipUpgrade.style.color = 'white'; - } - if (evaluation.Wall) { - $equipName.style.color = 'yellow'; - } if (equipName == 'Gym' && needGymystic) { $equipName.style.color = 'white'; $equipName.style.border = '1px solid white'; - $equipUpgrade.style.color = 'red'; - $equipUpgrade.style.border = '2px solid red'; + if ($equipUpgrade) { + $equipUpgrade.style.color = 'red'; + $equipUpgrade.style.border = '2px solid red'; + } } - //add up whats needed: - resourcesNeeded[equip.Resource] += Best[BKey].Cost; + //Code is Spaced This Way So You Can Read It: if (evaluation.StatusBorder == 'red' && !(game.global.world < 60 && game.global.world >= 58 && MODULES["equipment"].waitTill60)) { @@ -357,20 +357,20 @@ function autoLevelEquipment() { if ( ( BuyWeaponUpgrades && equipmentList[equipName].Stat == 'attack' ) - || + || ( BuyWeaponUpgrades && equipmentList[equipName].Stat == 'block' ) - || + || ( BuyArmorUpgrades && equipmentList[equipName].Stat == 'health' && - //Only buy Armor prestiges when 'DelayArmorWhenNeeded' is on, IF: + //Only buy Armor prestiges when 'DelayArmorWhenNeeded' is on, IF: ( ( DelayArmorWhenNeeded && !shouldFarm) // not during "Farming" mode - || // or + || // or ( DelayArmorWhenNeeded && enoughDamageE) // has enough damage (not in "Wants more Damage" mode) - || // or + || // or ( DelayArmorWhenNeeded && !enoughDamageE && !enoughHealthE) // if neither enough dmg or health, then tis ok to buy. - || + || ( DelayArmorWhenNeeded && equipmentList[equipName].Resource == 'wood') - || + || ( !DelayArmorWhenNeeded) //or when its off. ) ) diff --git a/modules/import-export.js b/modules/import-export.js index 3b8dc5d0c..ba64e18dc 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -228,6 +228,32 @@ function ImportExportTooltip(what, event) { ondisplay = function() { document.getElementById('importBox').focus(); }; + } else if (what == "ATModuleLoad") { + var mods = document.getElementById('ATModuleListDropdown'); + var modnames = ""; + for (script in mods.selectedOptions) { + var $item = mods.selectedOptions[script]; + if ($item.value != null) { + ATscriptLoad(modulepath, $item.value); + //console.log($item.value); + modnames += $item.value + " "; + } + } + tooltipText = "Autotrimps - Loaded the MODULE .JS File(s): " + modnames; + costText = "
OK
"; + } else if (what == "ATModuleUnload") { + var mods = document.getElementById('ATModuleListDropdown'); + var modnames = ""; + for (script in mods.selectedOptions) { + var $item = mods.selectedOptions[script]; + if ($item.value != null) { + ATscriptUnload($item.value); + //console.log($item.value); + modnames += $item.value + " "; + } + } + tooltipText = "Autotrimps - UnLoaded the MODULE .JS File(s): " + modnames; + costText = "
OK
"; } else if (what == "ResetModuleVars") { resetModuleVars(); tooltipText = "Autotrimps MODULE variable settings have been successfully reset to its defaults!"; diff --git a/user.js b/user.js index dabe89d42..46ddf46a3 100644 --- a/user.js +++ b/user.js @@ -20,3 +20,7 @@ document.head.appendChild(script); // This File is Deprecated, please use .user.js instead (with the leading dot) so TamperMonkey/Greasemonkey can detect it as a script automatically. // Other than that they are identical and no change is required on your part if everything is working already. + +//You can use the following to auto-load your own forked repo as a local directory served from a local HTTPS webserver. +//the other bookmarklet wont load locally - the script.id will tell it to pull the rest of modules from the given URL. +//javascript:with(document)(script = createElement('script'), script.src='https://localhost:4443/AutoTrimps2.js', script.id='AutoTrimps-script',head.appendChild(script))._ \ No newline at end of file From ac651ddb8c31f1b3da458ccb82d912c1f3b02dc8 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Tue, 3 Apr 2018 09:17:27 -0400 Subject: [PATCH 0051/3477] AutoPerks can save custom ratios now --- modules/perks.js | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index 4004eaca2..98bf99a5b 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -189,10 +189,10 @@ AutoPerks.saveDumpPerk = function() { } AutoPerks.saveCustomRatios = function() { - var perkRatioBoxes = document.getElementsByClassName('perkRatios'); + var $perkRatioBoxes = document.getElementsByClassName('perkRatios'); var customRatios = []; - for(var i = 0; i < perkRatioBoxes.length; i++) { - customRatios.push({'id':perkRatioBoxes[i].id,'value':parseFloat(perkRatioBoxes[i].value)}); + for(var i = 0; i < $perkRatioBoxes.length; i++) { + customRatios.push({'id':$perkRatioBoxes[i].id,'value':parseFloat($perkRatioBoxes[i].value)}); } safeSetItems('AutoPerksCustomRatios', JSON.stringify(customRatios) ); } @@ -201,31 +201,31 @@ AutoPerks.saveCustomRatios = function() { // (and everytime the ratio-preset dropdown-selector is changed) //loads custom ratio selections from localstorage if applicable AutoPerks.setDefaultRatios = function() { - var perkRatioBoxes = document.getElementsByClassName("perkRatios"); + var $perkRatioBoxes = document.getElementsByClassName("perkRatios"); var ratioSet = document.getElementById("ratioPreset").selectedIndex; var currentPerk; - for(var i = 0; i < perkRatioBoxes.length; i++) { - currentPerk = AutoPerks.getPerkByName(perkRatioBoxes[i].id.substring(0, perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name - perkRatioBoxes[i].value = currentPerk.value[ratioSet]; + for(var i = 0; i < $perkRatioBoxes.length; i++) { + currentPerk = AutoPerks.getPerkByName($perkRatioBoxes[i].id.substring(0, $perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name + $perkRatioBoxes[i].value = currentPerk.value[ratioSet]; } //grab custom ratios if saved. if (ratioSet == document.getElementById("ratioPreset").length-1) { var tmp = JSON.parse(localStorage.getItem('AutoPerksCustomRatios')); if (tmp !== null) - customRatios = tmp; + AutoPerks.GUI.$customRatios = tmp; else { - // If "custom" is manually selected, and no file was found, start by setting all perkRatioBoxes to 0. - for(var i = 0; i < perkRatioBoxes.length; i++) { - perkRatioBoxes[i].value = 0; //initialize to 0. + // If "custom" is manually selected, and no file was found, start by setting all $perkRatioBoxes to 0. + for(var i = 0; i < $perkRatioBoxes.length; i++) { + $perkRatioBoxes[i].value = 0; //initialize to 0. } return; //then exit. } //if we have ratios in the storage file, load them - for(var i = 0; i < perkRatioBoxes.length; i++) { + for(var i = 0; i < $perkRatioBoxes.length; i++) { //do a quick sanity check (order) - if (customRatios[i].id != perkRatioBoxes[i].id) continue; - currentPerk = AutoPerks.getPerkByName(perkRatioBoxes[i].id.substring(0, perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name - perkRatioBoxes[i].value = customRatios[i].value; + if (AutoPerks.GUI.$customRatios[i].id != $perkRatioBoxes[i].id) continue; + currentPerk = AutoPerks.getPerkByName($perkRatioBoxes[i].id.substring(0, $perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name + $perkRatioBoxes[i].value = AutoPerks.GUI.$customRatios[i].value; } } //save the last ratio used @@ -233,12 +233,12 @@ AutoPerks.setDefaultRatios = function() { } //updates the internal perk variables with values grabbed from the custom ratio input boxes that the user may have changed. -AutoPerks.setNewRatios = function() { - var perkRatioBoxes = document.getElementsByClassName('perkRatios'); +AutoPerks.updatePerkRatios = function() { + var $perkRatioBoxes = document.getElementsByClassName('perkRatios'); var currentPerk; - for(var i = 0; i < perkRatioBoxes.length; i++) { - currentPerk = AutoPerks.getPerkByName(perkRatioBoxes[i].id.substring(0, perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name - currentPerk.updatedValue = parseFloat(perkRatioBoxes[i].value); + for(var i = 0; i < $perkRatioBoxes.length; i++) { + currentPerk = AutoPerks.getPerkByName($perkRatioBoxes[i].id.substring(0, $perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name + currentPerk.updatedValue = parseFloat($perkRatioBoxes[i].value); } AutoPerks.getPerkByName("toughness").updatedValue = AutoPerks.getPerkByName("resilience").updatedValue / 2; // Manually update tier II perks @@ -250,11 +250,11 @@ AutoPerks.setNewRatios = function() { //get ready / initialize AutoPerks.initialise = function() { - AutoPerks.initializePerks(); // Init all the new vars - AutoPerks.setNewRatios(); //grab new ratios if any //save custom ratios if "custom" is selected if (document.getElementById("ratioPreset").selectedIndex == document.getElementById("ratioPreset").length-1) AutoPerks.saveCustomRatios(); + AutoPerks.initializePerks(); // Init all the new vars + AutoPerks.updatePerkRatios(); //grab new ratios if any } //Main function (green "Allocate Perks" button): From e2e5eb3e7480c3ee7d98e952bb76e7dc55232b49 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Tue, 3 Apr 2018 09:42:40 -0400 Subject: [PATCH 0052/3477] Add a Fast Allocate button to turn the hidden setting on. Put Cunning/Curious on 2nd line. Default customratios to 1 instead of 0 if customs are not found. --- modules/perks.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index 98bf99a5b..464ce58f8 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -104,22 +104,17 @@ AutoPerks.displayGUI = function() { //Line 1 of the UI apGUI.$ratiosLine1 = document.createElement("DIV"); apGUI.$ratiosLine1.setAttribute('style', 'display: inline-block; text-align: left; width: 100%'); - var listratiosLine1 = ["Overkill","Resourceful","Coordinated","Resilience","Carpentry"]; + var listratiosLine1 = ["Overkill","Resourceful","Coordinated","Resilience","Carpentry","Artisanistry"]; for (var i in listratiosLine1) AutoPerks.createInput(listratiosLine1[i],apGUI.$ratiosLine1); apGUI.$customRatios.appendChild(apGUI.$ratiosLine1); //Line 2 of the UI apGUI.$ratiosLine2 = document.createElement("DIV"); apGUI.$ratiosLine2.setAttribute('style', 'display: inline-block; text-align: left; width: 100%'); - var listratiosLine2 = ["Artisanistry","Pheromones","Motivation","Power","Looting"]; + var listratiosLine2 = ["Pheromones","Motivation","Power","Looting","Cunning","Curious"]; for (var i in listratiosLine2) AutoPerks.createInput(listratiosLine2[i],apGUI.$ratiosLine2); //Line 3 of the UI - apGUI.$ratiosLine3 = document.createElement("DIV"); - apGUI.$ratiosLine3.setAttribute('style', 'display: inline-block; text-align: left; width: 100%'); - var listratiosLine3 = ["Cunning","Curious"]; - for (var i in listratiosLine3) - AutoPerks.createInput(listratiosLine3[i],apGUI.$ratiosLine3); //Create dump perk dropdown apGUI.$dumpperklabel = document.createElement("Label"); apGUI.$dumpperklabel.id = 'DumpPerk Label'; @@ -134,6 +129,13 @@ AutoPerks.displayGUI = function() { //Add the dump perk dropdown to UI Line 2 apGUI.$ratiosLine2.appendChild(apGUI.$dumpperklabel); apGUI.$ratiosLine2.appendChild(apGUI.$dumpperk); + //Toggle Algorithm 2 checkbox + apGUI.$toggleAlgo2 = document.createElement("DIV"); + apGUI.$toggleAlgo2.setAttribute('style', 'display: inline-block; text-align: left; margin-left: 1vw; width: 7vw;'); + apGUI.$toggleAlgo2.innerHTML = '\ + \ + Fast Allocate!:'; + apGUI.$ratiosLine2.appendChild(apGUI.$toggleAlgo2); //Create ratioPreset dropdown apGUI.$ratioPresetLabel = document.createElement("Label"); apGUI.$ratioPresetLabel.id = 'Ratio Preset Label'; @@ -154,7 +156,6 @@ AutoPerks.displayGUI = function() { apGUI.$ratiosLine1.appendChild(apGUI.$ratioPresetLabel); apGUI.$ratiosLine1.appendChild(apGUI.$ratioPreset); apGUI.$customRatios.appendChild(apGUI.$ratiosLine2); - apGUI.$customRatios.appendChild(apGUI.$ratiosLine3); //Add it all to the perk/portal screen var $portalWrapper = document.getElementById("portalWrapper") $portalWrapper.appendChild(apGUI.$customRatios); @@ -216,7 +217,7 @@ AutoPerks.setDefaultRatios = function() { else { // If "custom" is manually selected, and no file was found, start by setting all $perkRatioBoxes to 0. for(var i = 0; i < $perkRatioBoxes.length; i++) { - $perkRatioBoxes[i].value = 0; //initialize to 0. + $perkRatioBoxes[i].value = 1; //initialize to 1. } return; //then exit. } @@ -631,12 +632,14 @@ AutoPerks.lowercaseFirst = function(str) { AutoPerks.capitaliseFirstLetter = function(str) { return str.charAt(0).toUpperCase() + str.slice(1); } - AutoPerks.getPercent = function(spentHelium, totalHelium) { var frac = spentHelium / totalHelium; frac = (frac* 100).toPrecision(2); return frac + "%"; } +AutoPerks.toggleFastAllocate = function() { + MODULES["perks"].useAlgo2 = !MODULES["perks"].useAlgo2; +} AutoPerks.FixedPerk = function(name, base, level, max, fluffy) { this.id = -1; From 3b115bcbd3dc45ca59f43a8beac79979e41b0abf Mon Sep 17 00:00:00 2001 From: gen BTC Date: Tue, 3 Apr 2018 10:18:35 -0400 Subject: [PATCH 0053/3477] AutoPerks - on edit perk ratios, the saveCustomRatios dropdown now switches to "Custom" item when you change any ratio number. --- modules/perks.js | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index 464ce58f8..67d347432 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -69,6 +69,7 @@ AutoPerks.createInput = function(perkname,div) { if(game.options.menu.darkTheme.enabled != 2) perk1input.setAttribute("style", oldstyle + " color: black;"); else perk1input.setAttribute('style', oldstyle); perk1input.setAttribute('class', 'perkRatios'); + perk1input.setAttribute('onchange', 'AutoPerks.switchToCustomRatios()'); var perk1label = document.createElement("Label"); perk1label.id = perkname + 'Label'; perk1label.innerHTML = perkname; @@ -114,7 +115,6 @@ AutoPerks.displayGUI = function() { var listratiosLine2 = ["Pheromones","Motivation","Power","Looting","Cunning","Curious"]; for (var i in listratiosLine2) AutoPerks.createInput(listratiosLine2[i],apGUI.$ratiosLine2); - //Line 3 of the UI //Create dump perk dropdown apGUI.$dumpperklabel = document.createElement("Label"); apGUI.$dumpperklabel.id = 'DumpPerk Label'; @@ -143,6 +143,7 @@ AutoPerks.displayGUI = function() { apGUI.$ratioPresetLabel.setAttribute('style', 'margin-right: 1vw; color: white;'); apGUI.$ratioPreset = document.createElement("select"); apGUI.$ratioPreset.id = 'ratioPreset'; + apGUI.$ratioPreset.setAttribute('onchange', 'AutoPerks.setDefaultRatios()'); oldstyle = 'text-align: center; width: 110px;'; if(game.options.menu.darkTheme.enabled != 2) apGUI.$ratioPreset.setAttribute("style", oldstyle + " color: black;"); else apGUI.$ratioPreset.setAttribute('style', oldstyle); @@ -151,7 +152,6 @@ AutoPerks.displayGUI = function() { //load the last ratio used var loadLastPreset = localStorage.getItem('AutoperkSelectedRatioPresetID'); apGUI.$ratioPreset.selectedIndex = (loadLastPreset != null) ? loadLastPreset : 0; // First element is zxv (default) ratio. - apGUI.$ratioPreset.setAttribute('onchange', 'AutoPerks.setDefaultRatios()'); //Add the presets dropdown to UI Line 1 apGUI.$ratiosLine1.appendChild(apGUI.$ratioPresetLabel); apGUI.$ratiosLine1.appendChild(apGUI.$ratioPreset); @@ -190,12 +190,20 @@ AutoPerks.saveDumpPerk = function() { } AutoPerks.saveCustomRatios = function() { - var $perkRatioBoxes = document.getElementsByClassName('perkRatios'); - var customRatios = []; - for(var i = 0; i < $perkRatioBoxes.length; i++) { - customRatios.push({'id':$perkRatioBoxes[i].id,'value':parseFloat($perkRatioBoxes[i].value)}); + if (document.getElementById("ratioPreset").selectedIndex == document.getElementById("ratioPreset").length-1) { + var $perkRatioBoxes = document.getElementsByClassName('perkRatios'); + var customRatios = []; + for(var i = 0; i < $perkRatioBoxes.length; i++) { + customRatios.push({'id':$perkRatioBoxes[i].id,'value':parseFloat($perkRatioBoxes[i].value)}); + } + safeSetItems('AutoPerksCustomRatios', JSON.stringify(customRatios) ); } - safeSetItems('AutoPerksCustomRatios', JSON.stringify(customRatios) ); +} + +AutoPerks.switchToCustomRatios = function() { + var $rp = document.getElementById("ratioPreset"); + if ($rp.selectedIndex != $rp.length-1) + ($rp.selectedIndex = $rp.length-1); } //sets the ratioboxes with the default ratios embedded in the script when perks are instanciated. @@ -209,16 +217,16 @@ AutoPerks.setDefaultRatios = function() { currentPerk = AutoPerks.getPerkByName($perkRatioBoxes[i].id.substring(0, $perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name $perkRatioBoxes[i].value = currentPerk.value[ratioSet]; } - //grab custom ratios if saved. + //If "Custom" dropdown is selected: if (ratioSet == document.getElementById("ratioPreset").length-1) { + //Try to grab custom ratios from LocalStorage if they were saved. var tmp = JSON.parse(localStorage.getItem('AutoPerksCustomRatios')); if (tmp !== null) AutoPerks.GUI.$customRatios = tmp; else { - // If "custom" is manually selected, and no file was found, start by setting all $perkRatioBoxes to 0. - for(var i = 0; i < $perkRatioBoxes.length; i++) { + // If no file was found, start by setting all $perkRatioBoxes to 1. + for(var i = 0; i < $perkRatioBoxes.length; i++) $perkRatioBoxes[i].value = 1; //initialize to 1. - } return; //then exit. } //if we have ratios in the storage file, load them @@ -252,8 +260,7 @@ AutoPerks.updatePerkRatios = function() { //get ready / initialize AutoPerks.initialise = function() { //save custom ratios if "custom" is selected - if (document.getElementById("ratioPreset").selectedIndex == document.getElementById("ratioPreset").length-1) - AutoPerks.saveCustomRatios(); + AutoPerks.saveCustomRatios(); AutoPerks.initializePerks(); // Init all the new vars AutoPerks.updatePerkRatios(); //grab new ratios if any } From dff086a8c4502196f7a88df1294dfc0a17d3f31a Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 4 Apr 2018 17:07:38 +0100 Subject: [PATCH 0054/3477] Merge branch 'gh-pages' into 4-3_Kfro Merge edits, changes, and fixes by Gen. --- AutoTrimps2.js | 66 ++-- SettingsGUI.js | 65 ++-- modules/equipment.js | 42 +- modules/import-export.js | 112 +++--- modules/maps.js | 13 +- modules/perks.js | 811 +++++++++++++++++++++++---------------- modules/scryer.js | 40 +- modules/upgrades.js | 2 +- modules/utils.js | 64 +-- sparecode/laborfix.js | 104 ----- user.js | 4 + 11 files changed, 700 insertions(+), 623 deletions(-) delete mode 100644 sparecode/laborfix.js diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 057add7d5..bfd059238 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -1,6 +1,6 @@ // ==UserScript== // @name AutoTrimpsV2 -// @version 2.1.6.9-genbtc-3-23-2018 +// @version 2.1.6.9b-genbtc-4-2-2018 // @updateURL https://github.com/genbtc/AutoTrimps/AutoTrimps2.js // @description Automate all the trimps! // @author zininzinin, spindrjr, belaith, ishakaru, genBTC, Unihedron, coderPatsy @@ -8,39 +8,53 @@ // @include *kongregate.com/games/GreenSatellite/trimps // @grant none // ==/UserScript== -var ATversion = '2.1.6.9-genbtc-3-23-2018 + KFrowde-28-3-18'; +var ATversion = '2.1.6.9b-genbtc-4-2-2018'; //////////////////////////////////////////////////////////////////////////////// //Main Loader Initialize Function (loads first, load everything else)/////////// //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////// var atscript = document.getElementById('AutoTrimps-script') - , basepath = 'https://Kfrowde.github.io/AutoTrimps/' + , basepath = 'https://genBTC.github.io/AutoTrimps/' , modulepath = 'modules/' ; //This should redirect the script to wherever its being mirrored from. if (atscript !== null) { - basepath = atscript.getAttribute('src').replace(/AutoTrimps2\.js$/, ''); + basepath = atscript.src.replace(/AutoTrimps2\.js$/, ''); } +//This could potentially do something one day. like: read localhost url from tampermonkey. +// AKA do certain things when matched on a certain url. +//if (atscript.src.includes('localhost')) {;}; -function scriptLoad(pathname) { +//Script can be loaded like this: ATscriptLoad(modulepath, 'utils.js'); +function ATscriptLoad(pathname, modulename) { + if (modulename == null) debug("Wrong Syntax. Script could not be loaded. Try ATscriptLoad(modulepath, 'example.js'); "); var script = document.createElement('script'); - script.src = basepath + pathname; + if (pathname == null) pathname = ''; + script.src = basepath + pathname + modulename + '.js'; + script.id = modulename + '_MODULE'; //script.setAttribute('crossorigin',"use-credentials"); //script.setAttribute('crossorigin',"anonymous"); document.head.appendChild(script); } -scriptLoad(modulepath + 'utils.js'); //Load stuff needed to load other stuff: +//Scripts can be unloaded like this: ATscriptUnload('scryer'); +function ATscriptUnload(id) { + var $link = document.getElementById(id + '_MODULE'); + if (!$link) return; + document.head.removeChild($link); + debug("Removing " + id + "_MODULE","other"); +} +ATscriptLoad(modulepath, 'utils'); //Load stuff needed to load other stuff: //This starts up after 2.5 seconds. function initializeAutoTrimps() { loadPageVariables(); //get autoTrimpSettings - scriptLoad('SettingsGUI.js'); //populate Settings GUI - scriptLoad('Graphs.js'); //populate Graphs + ATscriptLoad('','SettingsGUI'); //populate Settings GUI + ATscriptLoad('','Graphs'); //populate Graphs //Load modules: - var ATmodules = ['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']; - for (var m in ATmodules) { - scriptLoad(modulepath + ATmodules[m] + '.js'); + 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']; + for (var m in ATmoduleList) { + ATscriptLoad(modulepath, ATmoduleList[m]); } // debug('AutoTrimps v' + ATversion + ' Loaded!', '*spinner3'); @@ -48,12 +62,12 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -//changelogList.push({date: "3/25", version: "v2.1.7.0", description: "", isNew: true}); -changelogList.push({date: "3/23", version: "v2.1.6.9", description: "Game's Map at Zone can be used with AT now, to run maps forever. AutoMaps setting was combined with RunUniqueMaps (variable has changed from boolean false,true to a value 0,1,2). Settings file has been migrated as such. New: Map SpecialMod is sort of working, at least. Geneticist Infinity bugfix. New AGU Settings for 60% Void (fixed). Many Graphs fixes. AutoMaps changes. Equipment Cap, see README at GitHub DarkTheme fix. Scientists Fix. Zek450 Perks Preset Changed. Ongoing Development...", isNew: true}); -changelogList.push({date: "3/22", version: "v2.1.6.8", description: "Settings GUI, make better. Import/export improved. Graph buttons: Cycle Up/Down. Internal code fixes. New Graph: Nurseries", isNew: false}); -changelogList.push({date: "3/24", version: "v2.1.6.5-stable", description: "Set up Stable Repository for the faint of heart.", isNew: true}); +changelogList.push({date: "4/2", version: "v2.1.6.9b", description: "Import Export, Modules Load code Improvements. Multiple Buttons/Settings Were Combined. AutoPerks code was changed but still functions the same, except for a new algorithm that reduces the time to allocate for high helium players to near-instantaneous. Please test new algo with MODULES[\"perks\"].useAlgo2=true; .You can also clear all perks then allocate and have it work now. AutoMaps no longer considered as being in Lead challenge during Chall^2. ", isNew: true}); +changelogList.push({date: "3/23", version: "v2.1.6.9", description: "Game's Map at Zone can be used with AT now, to run maps forever. AutoMaps setting was combined with RunUniqueMaps (variable has changed from boolean false,true to a value 0,1,2). Settings file has been migrated as such. New: Map SpecialMod is sort of working, at least. Geneticist Infinity bugfix. New AGU Settings for 60% Void (fixed). Many Graphs fixes. AutoMaps changes. Equipment Cap, see README at GitHub DarkTheme fix. Scientists Fix. Zek450 Perks Preset Changed. Ongoing Development...", isNew: false}); +changelogList.push({date: "3/24", version: "v2.1.6.5-stable", description: "Set up Stable Repository for the faint of heart.", isNew: false}); +//changelogList.push({date: "3/22", version: "v2.1.6.8", description: "Settings GUI, make better. Import/export improved. Graph buttons: Cycle Up/Down. Internal code fixes. New Graph: Nurseries", isNew: false}); //changelogList.push({date: "3/20", version: "v2.1.6.7", description: "Entirely Re-Arranged Settings Layout. Enjoy! New: Display Tab: EnhanceGrid + Go AFK Mode. GUI: Pinned AT Tab menu bar to top when scrolling. Minimize/Maxi/Close Buttons. ShowChangeLog Button. New Graph: FluffyXP&Xp/Hr (starts@300)", isNew: false}); -//changelogList.push({date: "3/13", version: "v2.1.6.6", description: "Geneticist management changes. Equipment code improvements. scriptLoad improvements. attempt to track errors.", isNew: false}); +//changelogList.push({date: "3/13", version: "v2.1.6.6", description: "Geneticist management changes. Equipment code improvements. ATscriptLoad improvements. attempt to track errors.", isNew: false}); //changelogList.push({date: "3/7", version: "v2.1.6.5", description: "Save/Reload Profiles in Import/Export. Magmamancer graph. Magmite/Magma Spam disableable.", isNew: false}); function assembleChangelog(date,version,description,isNew) { @@ -71,7 +85,7 @@ function printChangelog() { var footer = 'Ongoing Development - Report any bugs/problems please!\
Talk with the dev: genr8_#8163 @ AutoTrimps Discord Channel\ -
SeeReadMe Or check the commit history (if you want).' +
See ReadMe Or check the commit history (if you want).' , action = 'cancelTooltip()' , title = 'Script Update Notice
' + ATversion , acceptBtnText = "Thank you for playing AutoTrimps. Accept and Continue." @@ -103,6 +117,7 @@ function delayStartAgain(){ game.global.addonUser = true; game.global.autotrimps = true; //Actually Start mainLoop and guiLoop + MODULESdefault = JSON.parse(JSON.stringify(MODULES)); setInterval(mainLoop, runInterval); setInterval(guiLoop, runInterval*10); if (autoTrimpSettings.PrestigeBackup !== undefined && autoTrimpSettings.PrestigeBackup.selected != "") @@ -124,6 +139,7 @@ var autoTrimpSettings = {}; var MODULES = {}; var MODULESdefault = {}; var ATMODULES = {}; +var ATmoduleList = []; var bestBuilding; var scienceNeeded; @@ -199,15 +215,11 @@ function mainLoop() { else if (getPageSetting('BuyBuildingsNew')==1) { buyBuildings(); buyStorage(); } //"Buy Buildings & Storage" (") else if (getPageSetting('BuyBuildingsNew')==2) buyBuildings(); //"Buy Buildings" (") else if (getPageSetting('BuyBuildingsNew')==3) buyStorage(); //"Buy Storage" (") - //if (getPageSetting('BuyStorage')) buyStorage(); //"Buy Storage" (buildings.js) (Can be removed now) - //if (getPageSetting('BuyBuildings')) buyBuildings(); //"Buy Buildings" (buildings.js) (Can be removed now) - if (getPageSetting('BuyJobsNew')===0); //"Don't Buy Jobs" (Jobs.js) - else if (getPageSetting('BuyJobsNew')==1) { workerRatios(); buyJobs(); } //"Auto Worker Ratios" (") - else if (getPageSetting('BuyJobsNew')==2) buyJobs(); //"Manual Worker Ratios" (") - //if (getPageSetting('BuyJobs')) buyJobs(); //"Buy Jobs" (jobs.js) (Can be removed now) - //if (getPageSetting('WorkerRatios')) workerRatios(); //"Auto Worker Ratios" (jobs.js) (Can be removed now) + if (getPageSetting('BuyJobsNew')===0); //"Don't Buy Jobs" (Jobs.js) + else if (getPageSetting('BuyJobsNew')==1) { workerRatios(); buyJobs(); } //"Auto Worker Ratios" (") + else if (getPageSetting('BuyJobsNew')==2) buyJobs(); //"Manual Worker Ratios" (") if (getPageSetting('ManualGather2')<=1) manualLabor(); //"Auto Gather/Build" (gather.js) - else if (getPageSetting('ManualGather2')==2) manualLabor2(); //"Auto Gather/Build #2" (") + else if (getPageSetting('ManualGather2')==2) manualLabor2(); //"Auto Gather/Build #2" (") 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) @@ -237,7 +249,7 @@ function mainLoop() { //GUI Updates happen on this thread, every 1000ms function guiLoop() { updateCustomButtons(); - MODULESdefault = JSON.parse(JSON.stringify(MODULES)); + //MODULESdefault = JSON.parse(JSON.stringify(MODULES)); //Store the diff of our custom MODULES vars in the localStorage bin. safeSetItems('storedMODULES', JSON.stringify(compareModuleVars())); //Swiffy UI/Display tab diff --git a/SettingsGUI.js b/SettingsGUI.js index 634c8e27f..af489979f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -74,6 +74,7 @@ function automationMenuSettingsInit() { var autoSettings = document.createElement("DIV"); autoSettings.id = "autoSettings"; autoSettings.setAttribute("style", "display: none; max-height: 92.5vh;overflow: auto;"); + autoSettings.setAttribute("class","niceScroll"); settingsrow.appendChild(autoSettings); } automationMenuSettingsInit(); @@ -184,6 +185,7 @@ function initializeAllTabs() { createTabs("Golden", "Golden Upgrade Settings"); createTabs("Nature", "Nature Settings"); createTabs("Display", "Display & Spam Settings"); + //createTabs("Modules", "Load/Unload Modules & Settings"); createTabs("Import Export", "Import & Export Settings"); //add a minimize button: var li_0 = document.createElement('li'); @@ -238,7 +240,7 @@ function initializeAllSettings() { //CORE: //Line1: createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Auto Gather/Build #2', 'Science Research OFF'], 'Controls what YOU do. Manual does nothing
The Decision between AutoGather 1 or 2 is up to you, and they should be similar. Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); - createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); + createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All Upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); //createSetting('ManageBreedtimerNew', ['Manual Breed Timer', 'Auto Breed Timer', 'Auto No Patience'], 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges, and accounts for the patience mastery.
[ON](Yellow): The same as above, but ignores patience and will not set a breed timer longer than 30s.
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'multitoggle', 1, null, "Core"); //This replaces the two settings below, but do we really need an option to ignore patience?? createSetting('ManageBreedtimer', 'Auto Breed Timer', 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges (0, 3.5s, 10s, 30s).
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'boolean', true, null, "Core"); createSetting('GeneticistTimer', 'Geneticist Timer', 'Manages the breed timer by hiring/firing Geneticists for the purpose of setting the ideal anticpation stacks. Disable with -1 to disable the Hiring/Firing of geneticists.
Info: Potency and Nursery buying behavior is adjusted dynamically (and disabling no longer disables potency). The Automatic Genetecist Hiring Process can best be summarized by: Buy/Wait/Die,Repeat. (if you do not die, no action is taken). Also self-kills (trimpicide) aka force abandon when your anti-stacks aren\'t maxed out (conservatively).

Controlled automatically (locked) when Auto Breed Timer is on.', 'value', '30', null, "Core"); @@ -248,24 +250,21 @@ function initializeAllSettings() { //Line2 createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); - createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); //This should make sense to replace the two below. - //OLD createSetting('AutoFinishDaily', 'Auto Finish Daily', 'With this on, the He/Hr Portal and Custom Auto Portal options will auto-finish the daily whenever they trigger and THEN portal you.', 'boolean', true, null, 'Core'); - //OLD createSetting('AutoFinishDailyZone', 'Finish Daily Zone Mod', 'Finish Daily by this # of zones earlier/later than your regular Custom AutoPortal zone or your Helium Dont Portal Before zone. When Auto Finish Daily is on. Tip: Tune your value of He/HrDontPortalBefore to suit the daily, and then tune this. Can accept negative numbers for earlier, ie: -7 means portal 7 zones earlier than normal. Can also use positive numbers to DELAY portaling for later. When used with He/Hr AutoPortal, the number of zones early does not FORCE end the daily at that zone, only ALLOW it to end that early: it will Always end when your HE/hr drops enough to trigger the portal. Use 0 to disable.', 'valueNegative', 0, null, 'Core'); + createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); if (game.worldUnlocks.easterEgg) createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core'); //could really be removed?? createSetting('UsePatience', 'Enable Patience', 'Sets the default breed timer to 45 seconds if you have the Patience mastery.', 'boolean', true, null, 'Core'); - document.getElementById('UsePatience').parentNode.insertAdjacentHTML('afterend','
'); + createSetting('AutoAllocatePerks', 'Auto Allocate Perks', 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. ', 'boolean', false, null, 'Core'); + document.getElementById('AutoAllocatePerks').parentNode.insertAdjacentHTML('afterend','
'); //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. - createSetting('AutoPortal', 'Auto Portal Settings:', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); - //document.getElementById("AutoPortal").style="font-size: 1.0vw;"; //fit it on 1 line. - createSetting('HeliumHourChallenge', 'Challenge on Portal:', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); + createSetting('AutoPortal', 'AutoPortal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); + createSetting('HeliumHourChallenge', 'Portal Challenge', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); document.getElementById("HeliumHourChallengeLabel").innerHTML = "Portal Challenge:"; //fit it on 1 line. createSetting('CustomAutoPortal', 'Custom Portal', 'Automatically portal AFTER clearing this level.(ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "Core"); createSetting('HeHrDontPortalBefore', 'Don\'t Portal Before', 'Do NOT allow Helium per Hour AutoPortal setting to portal BEFORE this level is reached. It is an additional check that prevents drops in helium/hr from triggering autoportal. Set to 0 or -1 to completely disable this check. (only shows up with Helium per Hour set)', 'value', '999', null, "Core"); createSetting('HeliumHrBuffer', 'He/Hr Portal Buffer %', 'IMPORTANT SETTING. When using the He/Hr Autoportal, it will portal if your He/Hr drops by this amount of % lower than your best for current run, default is 0% (ie: set to 5 to portal at 95% of your best). Now with stuck protection - Allows portaling midzone if we exceed set buffer amount by 5x. (ie a normal 2% buffer setting would now portal mid-zone you fall below 10% buffer).', 'value', '0', null, 'Core'); - createSetting('AutoAllocatePerks', 'Auto Allocate Perks', 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. ', 'boolean', false, null, 'Core'); createSetting('PauseScript', 'Pause AutoTrimps', 'Pause AutoTrimps Script (not including the graphs module)', 'boolean', null, null, 'Core'); //code to locate the pause button at lower right var $pauseScript = document.getElementById('PauseScript'); @@ -310,10 +309,10 @@ function initializeAllSettings() { createSetting('LumberjackRatio', 'Lumberjack Ratio', '', 'value', '1', null, "Jobs"); createSetting('MinerRatio', 'Miner Ratio', '', 'value', '1', null, "Jobs"); //createSetting('ScientistRatio', 'Scientist Ratio', 'Advanced. This will allow you to cap your scientist to worker ratio, as well as disable the hiring of scientists.
-1 Allows the ratio to be set automatically (Recommended)
0 Turns off Scientist hiring
\>0 Set a custom ratio.', 'value', '-1', null, "Jobs"); - createSetting('MaxScientists', 'Max Scientists', 'Advanced. Cap your scientists (This is a ratio not an absolute number). recommend: -1 (infinite still controls itself)', 'value', '-1', null, "Jobs"); + createSetting('MaxScientists', 'Max Scientists', 'Advanced. Cap your scientists (This is an absolute number not a ratio). recommend: -1 (infinite still controls itself)', 'value', '-1', null, "Jobs"); //Line2 - createSetting('MaxExplorers', 'Max Explorers', 'Advanced. Cap your explorers (This is a ratio not an absolute number). recommend: -1', 'value', '-1', null, "Jobs"); //Explorers are important now! outdated setting tbh - createSetting('MaxTrainers', 'Max Trainers', 'Advanced. Cap your trainers (This is a ratio not an absolute number). recommend: -1', 'value', '-1', null, "Jobs"); //by the time that you stop needing block, food is abundant + createSetting('MaxExplorers', 'Max Explorers', 'Advanced. Cap your explorers (This is an absolute number not a ratio). recommend: -1', 'value', '-1', null, "Jobs"); //Explorers are important now! outdated setting tbh + createSetting('MaxTrainers', 'Max Trainers', 'Advanced. Cap your trainers (This is an absolute number not a ratio). recommend: -1', 'value', '-1', null, "Jobs"); //by the time that you stop needing block, food is abundant createSetting('TrainerCaptoTributes', 'Cap Trainers %', 'Only Buy a Trainer when its cost is LESS than X% of cost of a tribute. This setting can work in combination with the other one, or set the other one to -1 and this will take full control. Default: -1 (Disabled). 50% is close to the point where the cap does nothing. You can go as low as you want but recommended is 10% to 1%. (example: Trainer cost of 5001, Tribute cost of 100000, @ 5%, it would NOT buy the trainer.)', 'value', '-1', null, 'Jobs'); //this is a bit unnecessary, resource management by the script is already sufficient. @@ -342,8 +341,7 @@ function initializeAllSettings() { //AutoMaps + VoidMaps settings: -//Could combine automaps and run unique maps into one 3 way toggle: Automaps on, Non-unique maps only, Automaps off. - createSetting('AutoMaps', ["Auto Maps Off","Auto Maps","Auto Maps No Unique"], 'Recommended. Automatically run maps to progress. Very Important. Has multiple modes: Prestige, Voids, Want more Damage, Want more Health, Want Health & Damage, and Farming.Prestige takes precedence and does equal level maps until it gets what is needed as per Autotrimps Prestige dropdown setting. Voids is self explanatory: use the Void Difficulty Check setting to control the amount of farming. If \'want more damage\', it will only do 10 maps for 200% mapbonus damage bonus. If \'Farming\', it does maps beyond 10 if the displayed number is over >16x. \'Want more health[or and damage]\' is basically just a status message telling you need more health, theres not much that can be done besides tell AutoLevelEquipment to keep buying stuff. If you \'want health\' but your damage is OK to continue, invest in more HP perks.

Unique Maps are run automatically unless disabled.
Uniques Required to auto-run The Wall and Dimension of Anger. Also Required for challenges: Electricity, Mapocalypse, Meditate, and Crushed (etc) to complete their AutoPortal.

Maps/Levels:
The Block - 12
The Wall - 16
Dimension of Anger - 21
Trimple Of Doom - 34
The Prison - 82
Bionic Wonderland (only during Crushed) @ 127
NOTE: This should generally be on.
NOTE: Run Bionic Before Spire prevents the setting of Unique.
NOTICE: This does NOT auto-run all your Bionics according to your lack of Robotrimp status or whether you pass a certain level (yet).', 'multitoggle', 1, null, "Maps"); + createSetting('AutoMaps', ["Auto Maps Off","Auto Maps On","Auto Maps No Unique"], 'Recommended. Automatically run maps to progress. Very Important. Has multiple modes: Prestige, Voids, Want more Damage, Want more Health, Want Health & Damage, and Farming.Prestige takes precedence and does equal level maps until it gets what is needed as per Autotrimps Prestige dropdown setting. Voids is self explanatory: use the Void Difficulty Check setting to control the amount of farming. If \'want more damage\', it will only do 10 maps for 200% mapbonus damage bonus. If \'Farming\', it does maps beyond 10 if the displayed number is over >16x. \'Want more health[or and damage]\' is basically just a status message telling you need more health, theres not much that can be done besides tell AutoLevelEquipment to keep buying stuff. If you \'want health\' but your damage is OK to continue, invest in more HP perks.

Unique Maps are run automatically unless disabled.
Uniques Required to auto-run The Wall and Dimension of Anger. Also Required for challenges: Electricity, Mapocalypse, Meditate, and Crushed (etc) to complete their AutoPortal.

Maps/Levels:
The Block - 12
The Wall - 16
Dimension of Anger - 21
Trimple Of Doom - 34
The Prison - 82
Bionic Wonderland (only during Crushed) @ 127
NOTE: This should generally be on.
NOTE: Run Bionic Before Spire prevents the setting of Unique.
NOTICE: This does NOT auto-run all your Bionics according to your lack of Robotrimp status or whether you pass a certain level (yet).', 'multitoggle', 1, null, "Maps"); createSetting('DynamicSiphonology', 'Dynamic Siphonology', 'Recommended Always ON. Use the right level of siphonology based on your damage output. IE: Only uses siphonology if you are weak. With this OFF it means it ALWAYS uses the lowest siphonology map you can create. Siphonology is a perk you get at level 115-125ish, and means you receive map bonus stacks for running maps below your current zone - Up to 3 zones below (1 per perk level).', 'boolean', true, null, 'Maps'); //Should always be on? createSetting('PreferMetal', 'Prefer Metal Maps', 'Always prefer metal maps, intended for manual use, such as pre-spire farming. Remember to turn it back off after you\'re done farming!', 'boolean', false, null, 'Maps'); //rarely better tbh createSetting('MaxMapBonusAfterZone', 'Max MapBonus After', 'Always gets Max Map Bonus from this zone on. (inclusive and after).
NOTE: Set -1 to disable entirely (default). Set 0 to use it always.
Advanced:User can set a lower number than the default 10 maps with the AT hidden console command: MODULES[\\"maps\\"].maxMapBonusAfterZ = 9;', 'value', '-1', null, 'Maps'); @@ -396,7 +394,7 @@ function initializeAllSettings() { //Line2 createSetting('ScryerSkipBoss2', ['Boss: NEVER (All Levels)','Boss: NEVER (Above VoidLevel)','Boss: MAYBE'], 'NEVER (All Levels) will NEVER use S in cell 100 of the world!!!
NEVER (Above VoidLevel) will NEVER use S in cell 100 of the world ABOVE the zone that your void maps are set to run at (Maps).
MAYBE treats the cell no differently to any other, Overkill and Min/Max Scryer is allowed.

Recommend NEVER (There is little benefit to double NON-HELIUM resources and a small chance of DE).', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER means what it says!!!
FORCE means Scryer will ALWAYS activate against Corrupted enemies
MAYBE means that Overkill and Min/Max use are allowed.
Magma maps and Corrupted Voidmaps are currently classified as corrupted and NEVER here will override Maps and Voidmaps use of Scryer

Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); - createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. This feature was added for 1 person, use at your own risk.
Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); + createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. NOTE: Use at your own risk.
Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); createSetting('ScryUseinPoison', 'Scry in Poison','-1 to disable, any other number (including 0) sets a minimum zone to use S in Poison', 'value', -1, null, 'Scryer'); createSetting('ScryUseinWind', 'Scry in Wind','-1 to disable, any other number (including 0) sets a minimum zone to use S in Wind', 'value', -1, null, 'Scryer'); createSetting('ScryUseinIce', 'Scry in Ice','-1 to disable, any other number (including 0) sets a minimum zone to use S in Ice', 'value', -1, null, 'Scryer'); @@ -427,8 +425,8 @@ function initializeAllSettings() { //Golden Upgrade Strategies: - createSetting('AutoGoldenUpgrades', 'Auto Golden Upgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \"Max then Helium\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections.', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void"], 'Golden'); - createSetting('goldStrat', 'Auto Golden Strategy', 'VOID ONLY: After max Void golden upgrades, alternate between buying helium and battle upgrades. Or Choose a Zone to switch over completely at (zones lower than X will buy only battle, and zones higher than X only helium). Battle can be disabled completely with the goldNoBattle button. MAX THEN HELIUM setting so you can get the perfect 60% Voids then Helium', 'dropdown', 'Max then Helium', ["Off", "Alternating", "Zone", "Max then Helium"], 'Golden'); + createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections.', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void"], 'Golden'); + createSetting('goldStrat', 'Strategy', 'VOID ONLY: After max Void golden upgrades, alternate between buying helium and battle upgrades. Or Choose a Zone to switch over completely at (zones lower than X will buy only battle, and zones higher than X only helium). Battle can be disabled completely with the goldNoBattle button. MAX THEN HELIUM setting so you can get the perfect 60% Voids then Helium', 'dropdown', 'Max then Helium', ["Off", "Alternating", "Zone", "Max then Helium"], 'Golden'); createSetting('goldAlternating', 'GU VOID: Alternating', 'Buy a helium upgrade after X-1 battle upgrades have been purchased', 'value', '2', null, 'Golden'); createSetting('goldZone', 'GU VOID: Zone', 'Buy a helium upgrade until zone X, then buy battle upgrades.', 'value', '200', null, 'Golden'); createSetting('goldNoBattle', 'GU VOID: No Battle', 'Green = Do NOT buy Battle Upgrades
Red = Buy Battle Upgrades.', 'boolean', true, null, 'Golden'); @@ -472,13 +470,25 @@ function initializeAllSettings() { // Export/Import/Default settings createSetting('ImportAutoTrimps', 'Import AutoTrimps', 'Import your AutoTrimps Settings. Asks you to name it as a profile afterwards.', 'infoclick', 'ImportAutoTrimps', null, 'Import Export'); createSetting('ExportAutoTrimps', 'Export AutoTrimps', 'Export your AutoTrimps Settings as a output string text formatted in JSON.', 'infoclick', 'ExportAutoTrimps', null, 'Import Export'); - createSetting('DefaultAutoTrimps', 'Reset to Default', 'Reset everything to the way it was when you first installed the script. (Also ', 'infoclick', 'DefaultAutoTrimps', null, 'Import Export'); - settingsProfileMakeGUI(); //Settings Profile dropdown and Delete button. + createSetting('DefaultAutoTrimps', 'Reset to Default', 'Reset everything to the way it was when you first installed the script. ', 'infoclick', 'ResetDefaultSettingsProfiles', null, 'Import Export'); createSetting('CleanupAutoTrimps', 'Cleanup Saved Settings ', 'Deletes old values from previous versions of the script from your AutoTrimps Settings file.', 'infoclick', 'CleanupAutoTrimps', null, 'Import Export'); createSetting('allowSettingsUpload', 'Allow Analytics Upload', 'Uploads your AUTOTRIMPS saved settings files (the same as Export AutoTrimps on this tab) anonymously - to https://autotrimps.site = the official Autotrimps development server. It will remain private for now, and aggregated for analytics to improve the script in the future and see which features are being used. Please Opt in. The upload will be approximately a small 5-10KB uncompressed text file every time the script is LOADED (for the time being until it is refined), and there is no concern for any personal data leak or privacy concern. This is all in good faith, and you are welcome to check the open source file modules/client-server.js. In the future, I will have to make a more fine-grained data-usage privacy-policy. Possible other data collected in the near-future may include certain game stats such as your highest zone, helium amount, bones, resource/magma/DE amounts, perk ratio selections. ', 'boolean', true, null, 'Import Export'); + settingsProfileMakeGUI(); //Settings Profile dropdown and Delete button. (this always shows up first - can be here last) //createSetting('ExportModuleVars', 'Export Custom Variables', 'Export your custom MODULES variables.', 'infoclick', 'ExportModuleVars', null, 'Import Export'); //createSetting('ImportModuleVars', 'Import Custom Variables', 'Import your custom MODULES variables (and save).', 'infoclick', 'ImportModuleVars', null, 'Import Export'); //createSetting('ResetModuleVars', 'Reset Custom Variables', 'Reset(Delete) your custom MODULES variables, and return the script to normal. ', 'infoclick', 'ResetModuleVars', null, 'Import Export'); + + //createSetting('PlayerLevel', 'PlayerLevel', 'PlayerLevel: Indicate around what level you are. noob, low, medium, high, spire, magma, expert, z450+, z500+, endgame and so on. Might be used to control which settings are visible in the future. ', 'dropdown', "Medium", ["Noob","Low","Medium","High","Spire","Magma","Expert","z450+","z500+","EndGame"], 'Display'); + /* + createSetting('ATModuleListDropdown', 'Modules', 'AT Module List Dropdown: Lists all the individual modules (.js files) that have been auto-loaded. It might be possible to unload these or something in the future.', 'dropdown', ATmoduleList[0], ATmoduleList, 'Import Export'); + document.getElementById('ATModuleListDropdown').multiple = true; //allow 4 multiple selections + document.getElementById('ATModuleListDropdown').size = 4; + document.getElementById('ATModuleListDropdown').height = '5vw'; + document.getElementById('ATModuleListDropdownLabel').style.verticalAlign = 'top'; + document.getElementById('ATModuleListDropdownLabel').parentNode.style.width = null; //make the next stuff fit on 1 line. + createSetting('ATModuleUnload', 'Unload Module', 'UnLoads a running module file this session', 'infoclick', 'ATModuleUnload', null, 'Import Export'); + createSetting('ATModuleLoad', 'ReLoad Module', 'Load/Reloads a module file (.js) and runs it.', 'infoclick', 'ATModuleLoad', null, 'Import Export'); + */ } initializeAllSettings(); //EXECUTE @@ -555,7 +565,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe var dropdownLabel = document.createElement("Label"); dropdownLabel.id = id + "Label"; - dropdownLabel.innerHTML = id + ":"; + dropdownLabel.innerHTML = name + ":"; dropdownLabel.setAttribute('style', 'margin-right: 0.3vw; font-size: 0.8vw;'); btnParent.appendChild(dropdownLabel); btnParent.appendChild(btn); @@ -891,15 +901,18 @@ function updateCustomButtons() { debug("RunBionicBeforeSpire incompatible with AutoMaps No Unique Maps, changing..."); setPageSetting("AutoMaps",1); } - //make sure value buttons are set accurately. + //since this is a loop, make sure the Text contents of our buttons are set accurately. (after any setPageSetting) for (var setting in autoTrimpSettings) { - if (autoTrimpSettings[setting].type == 'value' || autoTrimpSettings[setting].type == 'valueNegative') { - var elem = document.getElementById(autoTrimpSettings[setting].id); + var item = autoTrimpSettings[setting]; + if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle') { + var elem = document.getElementById(item.id); if (elem != null) { - if (autoTrimpSettings[setting].value > -1 || autoTrimpSettings[setting].type == 'valueNegative') - elem.textContent = autoTrimpSettings[setting].name + ': ' + prettify(autoTrimpSettings[setting].value); + if (item.type == 'multitoggle') + elem.textContent = item.name[item.value]; + else if (item.value > -1 || item.type == 'valueNegative') + elem.textContent = item.name + ': ' + prettify(item.value); else - elem.innerHTML = autoTrimpSettings[setting].name + ': ' + ""; + elem.innerHTML = item.name + ': ' + ""; } } } diff --git a/modules/equipment.js b/modules/equipment.js index 12c50e4fa..b247b969b 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -321,32 +321,32 @@ function autoLevelEquipment() { Best[BKey].StatusBorder = evaluation.StatusBorder; } Best[BKey].Cost = evaluation.Cost; + //add up whats needed: + resourcesNeeded[equip.Resource] += Best[BKey].Cost; + //Apply colors from before: //white - Upgrade is not available //yellow - Upgrade is not affordable (or capped) //orange - Upgrade is affordable, but will lower stats //red - Yes, do it now! - + if (evaluation.Wall) + $equipName.style.color = 'yellow'; $equipName.style.border = '1px solid ' + evaluation.StatusBorder; + var $equipUpgrade = document.getElementById(equip.Upgrade); - if (evaluation.StatusBorder != 'white' && evaluation.StatusBorder != 'yellow') { - if ($equipUpgrade) - $equipUpgrade.style.color = evaluation.StatusBorder; - } - if (evaluation.StatusBorder == 'yellow') { + if (evaluation.StatusBorder != 'white' && evaluation.StatusBorder != 'yellow' && $equipUpgrade) + $equipUpgrade.style.color = evaluation.StatusBorder; + if (evaluation.StatusBorder == 'yellow' && $equipUpgrade) $equipUpgrade.style.color = 'white'; - } - if (evaluation.Wall) { - $equipName.style.color = 'yellow'; - } if (equipName == 'Gym' && needGymystic) { $equipName.style.color = 'white'; $equipName.style.border = '1px solid white'; - $equipUpgrade.style.color = 'red'; - $equipUpgrade.style.border = '2px solid red'; + if ($equipUpgrade) { + $equipUpgrade.style.color = 'red'; + $equipUpgrade.style.border = '2px solid red'; + } } - //add up whats needed: - resourcesNeeded[equip.Resource] += Best[BKey].Cost; + //Code is Spaced This Way So You Can Read It: if (evaluation.StatusBorder == 'red' && !(game.global.world < 60 && game.global.world >= 58 && MODULES["equipment"].waitTill60)) { @@ -356,20 +356,20 @@ function autoLevelEquipment() { if ( ( BuyWeaponUpgrades && equipmentList[equipName].Stat == 'attack' ) - || + || ( BuyWeaponUpgrades && equipmentList[equipName].Stat == 'block' ) - || + || ( BuyArmorUpgrades && equipmentList[equipName].Stat == 'health' && - //Only buy Armor prestiges when 'DelayArmorWhenNeeded' is on, IF: + //Only buy Armor prestiges when 'DelayArmorWhenNeeded' is on, IF: ( ( DelayArmorWhenNeeded && !shouldFarm) // not during "Farming" mode - || // or + || // or ( DelayArmorWhenNeeded && enoughDamageE) // has enough damage (not in "Wants more Damage" mode) - || // or + || // or ( DelayArmorWhenNeeded && !enoughDamageE && !enoughHealthE) // if neither enough dmg or health, then tis ok to buy. - || + || ( DelayArmorWhenNeeded && equipmentList[equipName].Resource == 'wood') - || + || ( !DelayArmorWhenNeeded) //or when its off. ) ) diff --git a/modules/import-export.js b/modules/import-export.js index 2859f7433..ba64e18dc 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -7,13 +7,13 @@ function settingsProfileMakeGUI() { var $settingsProfilesLabel = document.createElement("Label"); $settingsProfilesLabel.id = 'settingsProfiles Label'; $settingsProfilesLabel.innerHTML = "Settings Profile: "; - if (game.options.menu.darkTheme.enabled == 2) $settingsProfilesLabel.setAttribute("style", "margin-left: 1.2vw; margin-right: 0.8vw; color: #C8C8C8; font-size: 0.8vw;"); - else $settingsProfilesLabel.setAttribute("style", "margin-left: 1.2vw; margin-right: 0.8vw; color:white; font-size: 0.8vw;"); + if (game.options.menu.darkTheme.enabled == 2) $settingsProfilesLabel.setAttribute("style", "margin-left: 1.2vw; margin-right: 0.8vw; font-size: 0.8vw;"); + else $settingsProfilesLabel.setAttribute("style", "margin-left: 1.2vw; margin-right: 0.8vw; font-size: 0.8vw;"); $settingsProfiles = document.createElement("select"); $settingsProfiles.id = 'settingsProfiles'; $settingsProfiles.setAttribute('class', 'noselect'); $settingsProfiles.setAttribute('onchange', 'settingsProfileDropdownHandler()'); - var oldstyle = 'text-align: center; width: 160px; font-size: 1.1vw;'; + var oldstyle = 'text-align: center; width: 160px; font-size: 1.0vw;'; if(game.options.menu.darkTheme.enabled != 2) $settingsProfiles.setAttribute("style", oldstyle + " color: black;"); else $settingsProfiles.setAttribute('style', oldstyle); //Create settings profile selection dropdown @@ -23,12 +23,6 @@ function settingsProfileMakeGUI() { $settingsProfilesButton.innerHTML = "<Delete Profile"; $settingsProfilesButton.setAttribute('style', 'margin-left: 0.5vw; margin-right: 0.5vw; font-size: 0.8vw;'); $settingsProfilesButton.setAttribute('onclick','onDeleteProfileHandler()'); - //Add the $settingsProfiles dropdown to UI - var $ietab = document.getElementById('Import Export'); - //Any ERRORs here are caused by incorrect order loading of script and you should reload until its gone.(for now) - $ietab.insertBefore($settingsProfilesLabel, $ietab.childNodes[1]); - $ietab.insertBefore($settingsProfiles, $ietab.childNodes[2]); - $ietab.insertBefore($settingsProfilesButton, $ietab.childNodes[3]); //populate with a Default (read default settings): var innerhtml = ""; //populate with a Default (read default settings): @@ -36,9 +30,30 @@ function settingsProfileMakeGUI() { //Append a 2nd default item named "Save New..." and have it tied to a write function(); innerhtml += ""; //dont forget to populate the rest of it with stored items: - $settingsProfiles.innerHTML = innerhtml; + $settingsProfiles.innerHTML = innerhtml; + //Add the $settingsProfiles dropdown to UI + var $ietab = document.getElementById('Import Export'); + if ($ietab == null) return; + //Any ERRORs here are caused by incorrect order loading of script and you should reload until its gone.(for now) + $ietab.insertBefore($settingsProfilesLabel, $ietab.childNodes[1]); + $ietab.insertBefore($settingsProfiles, $ietab.childNodes[2]); + $ietab.insertBefore($settingsProfilesButton, $ietab.childNodes[3]); +} //self-executes at the bottom of the file. + +//Populate dropdown menu with list of AT SettingsProfiles +function initializeSettingsProfiles() { + if ($settingsProfiles == null) return; + //load the old data in: + var loadLastProfiles = localStorage.getItem('ATSelectedSettingsProfile'); + var oldpresets = loadLastProfiles ? JSON.parse(loadLastProfiles) : new Array(); //load the import. + oldpresets.forEach(function(elem){ + //Populate dropdown menu to reflect new name: + let optionElementReference = new Option(elem.name); + optionElementReference.id = 'customProfileRead'; + $settingsProfiles.add(optionElementReference); + }); + $settingsProfiles.selectedIndex = 0; } -//settingsProfileMakeGUI(); //runs at the bottom now: //This switches into the new profile when the dropdown is selected. //it is the "onchange" handler of the settingsProfiles dropdown @@ -141,22 +156,6 @@ function onDeleteProfile() { debug("Successfully deleted profile #: " + target, "profile"); } -//Populate dropdown menu with list of AT SettingsProfiles -function initializeSettingsProfiles() { - if ($settingsProfiles == null) return; - //load the old data in: - var loadLastProfiles = localStorage.getItem('ATSelectedSettingsProfile'); - var oldpresets = loadLastProfiles ? JSON.parse(loadLastProfiles) : new Array(); //load the import. - oldpresets.forEach(function(elem){ - //Populate dropdown menu to reflect new name: - let optionElementReference = new Option(elem.name); - optionElementReference.id = 'customProfileRead'; - $settingsProfiles.add(optionElementReference); - }); - $settingsProfiles.selectedIndex = 0; -} -initializeSettingsProfiles(); - //Handler for the popup/tooltip window for Import/Export/Default function ImportExportTooltip(what, event) { @@ -197,11 +196,6 @@ function ImportExportTooltip(what, event) { ondisplay = function() { document.getElementById('importBox').focus(); }; - } else if (what == "DefaultAutoTrimps") { - resetAutoTrimps(); - tooltipText = "Autotrimps has been successfully reset to its defaults! "; - costText = "

OK
"; - debug(tooltipText, "profile"); } else if (what == "CleanupAutoTrimps") { cleanupAutoTrimps(); tooltipText = "Autotrimps saved-settings have been attempted to be cleaned up. If anything broke, refreshing will fix it, but check that your settings are correct! (prestige in particular)"; @@ -234,6 +228,32 @@ function ImportExportTooltip(what, event) { ondisplay = function() { document.getElementById('importBox').focus(); }; + } else if (what == "ATModuleLoad") { + var mods = document.getElementById('ATModuleListDropdown'); + var modnames = ""; + for (script in mods.selectedOptions) { + var $item = mods.selectedOptions[script]; + if ($item.value != null) { + ATscriptLoad(modulepath, $item.value); + //console.log($item.value); + modnames += $item.value + " "; + } + } + tooltipText = "Autotrimps - Loaded the MODULE .JS File(s): " + modnames; + costText = "
OK
"; + } else if (what == "ATModuleUnload") { + var mods = document.getElementById('ATModuleListDropdown'); + var modnames = ""; + for (script in mods.selectedOptions) { + var $item = mods.selectedOptions[script]; + if ($item.value != null) { + ATscriptUnload($item.value); + //console.log($item.value); + modnames += $item.value + " "; + } + } + tooltipText = "Autotrimps - UnLoaded the MODULE .JS File(s): " + modnames; + costText = "
OK
"; } else if (what == "ResetModuleVars") { resetModuleVars(); tooltipText = "Autotrimps MODULE variable settings have been successfully reset to its defaults!"; @@ -349,19 +369,20 @@ function exportModuleVars() { function compareModuleVars() { var diffs = {}; var mods = Object.keys(MODULES); - for (var i=0,leni=mods.length;i= customVars.shouldFarmCell) || (scryerStuck)) && ( (game.resources.trimps.realMax() <= game.resources.trimps.owned + 1) - || (game.global.challengeActive == 'Lead' && game.global.lastClearedCell > 93) + || ((game.global.challengeActive == 'Lead' && !challSQ) && game.global.lastClearedCell > 93) || (doVoids && game.global.lastClearedCell > 93) ) ){ diff --git a/modules/perks.js b/modules/perks.js index 90dc3e876..835bb38b8 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -1,7 +1,7 @@ // ==UserScript== // @name AutoPerks // @namespace http://tampermonkey.net/ -// @version 1.0.3-3-3-2018+hiders+zeker +// @version 1.1.2-4-2-2018+genBTC // @description Trimps Automatic Perk Calculator // @author zxv, genBTC // @include *trimps.github.io* @@ -10,129 +10,21 @@ // ==/UserScript== //Create blank AutoPerks object -MODULES["perks"] = {}; var AutoPerks = {}; +MODULES["perks"] = {}; +MODULES["perks"].showDetails = true; //show which individual perks are spent; +MODULES["perks"].useAlgo2 = false; //use algorithm 2 instead. //Import the FastPriorityQueue.js general Library (not AT specific, but needed for perk queue) var head = document.getElementsByTagName('head')[0]; var queuescript = document.createElement('script'); queuescript.type = 'text/javascript'; -//This does NOT need to be changed to your own repo. Its a 3rd party file. +//This does not need to be changed to your own repo. Its a 3rd party file. queuescript.src = 'https://genbtc.github.io/AutoTrimps/FastPriorityQueue.js'; head.appendChild(queuescript); -//BEGIN AUTOPERKS GUI CODE:>>>>>>>>>>>>>> - -//Create Allocator button and add it to Trimps Perk Window -var buttonbar = document.getElementById("portalBtnContainer"); -var allocatorBtn1 = document.createElement("DIV"); -allocatorBtn1.id = 'allocatorBTN1'; -allocatorBtn1.setAttribute('class', 'btn inPortalBtn settingsBtn settingBtntrue'); -allocatorBtn1.setAttribute('onclick', 'AutoPerks.clickAllocate()'); -allocatorBtn1.textContent = 'Allocate Perks'; -buttonbar.appendChild(allocatorBtn1); -buttonbar.setAttribute('style', 'margin-bottom: 0.8vw;'); - -//Custom Creation for all perk customRatio boxes in Trimps Perk Window -AutoPerks.createInput = function(perkname,div) { - var perk1input = document.createElement("Input"); - perk1input.id = perkname + 'Ratio'; - var oldstyle = 'text-align: center; width: 60px;'; - if(game.options.menu.darkTheme.enabled != 2) perk1input.setAttribute("style", oldstyle + " color: black;"); - else perk1input.setAttribute('style', oldstyle); - perk1input.setAttribute('class', 'perkRatios'); - - var perk1label = document.createElement("Label"); - perk1label.id = perkname + 'Label'; - perk1label.innerHTML = perkname; - perk1label.setAttribute('style', 'margin-right: 1vw; width: 120px; color: white;'); - //add to the div. - div.appendChild(perk1input); - div.appendChild(perk1label); -} -var customRatios = document.createElement("DIV"); -customRatios.id = 'customRatios'; -//Line 1 of the UI -var ratiosLine1 = document.createElement("DIV"); -ratiosLine1.setAttribute('style', 'display: inline-block; text-align: left; width: 100%'); -var listratiosLine1 = ["Overkill","Resourceful","Coordinated","Resilience","Carpentry"]; -for (var i in listratiosLine1) - AutoPerks.createInput(listratiosLine1[i],ratiosLine1); -customRatios.appendChild(ratiosLine1); -//Line 2 of the UI -var ratiosLine2 = document.createElement("DIV"); -ratiosLine2.setAttribute('style', 'display: inline-block; text-align: left; width: 100%'); -var listratiosLine2 = ["Artisanistry","Pheromones","Motivation","Power","Looting"]; -for (var i in listratiosLine2) - AutoPerks.createInput(listratiosLine2[i],ratiosLine2); -//Line 3 of the UI -var ratiosLine3 = document.createElement("DIV"); -ratiosLine3.setAttribute('style', 'display: inline-block; text-align: left; width: 100%'); -var listratiosLine3 = ["Cunning","Curious"]; -for (var i in listratiosLine3) - AutoPerks.createInput(listratiosLine3[i],ratiosLine3); -//Create dump perk dropdown -var dumpperklabel = document.createElement("Label"); -dumpperklabel.id = 'DumpPerk Label'; -dumpperklabel.innerHTML = "Dump Perk:"; -dumpperklabel.setAttribute('style', 'margin-right: 1vw; color: white;'); -var dumpperk = document.createElement("select"); -dumpperk.id = 'dumpPerk'; -dumpperk.setAttribute('onchange', 'AutoPerks.saveDumpPerk()'); -var oldstyle = 'text-align: center; width: 120px;'; -if(game.options.menu.darkTheme.enabled != 2) dumpperk.setAttribute("style", oldstyle + " color: black;"); -else dumpperk.setAttribute('style', oldstyle); -//Add the dump perk dropdown to UI Line 2 -ratiosLine2.appendChild(dumpperklabel); -ratiosLine2.appendChild(dumpperk); -//Create ratioPreset dropdown -var ratioPresetLabel = document.createElement("Label"); -ratioPresetLabel.id = 'Ratio Preset Label'; -ratioPresetLabel.innerHTML = "Ratio Preset:"; -ratioPresetLabel.setAttribute('style', 'margin-right: 1vw; color: white;'); -var ratioPreset = document.createElement("select"); -ratioPreset.id = 'ratioPreset'; -var oldstyle = 'text-align: center; width: 110px;'; -if(game.options.menu.darkTheme.enabled != 2) ratioPreset.setAttribute("style", oldstyle + " color: black;"); -else ratioPreset.setAttribute('style', oldstyle); -//Populate dump perk dropdown list : -//var presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2,preset_Zek450,preset_Zek4502,preset_Zek4503]; -var html = "" -html += "" -html += "" -html += "" -html += "" -html += "" -html += "" -html += "" -html += "" -html += "" -html += "" -html += "" -html += "" -html += "" -html += "" -html += "" -//Specific ratios labeled above are configured down in the bottom of this file.Lines 543-556 -ratioPreset.innerHTML = html; -//load the last ratio used -var loadLastPreset = localStorage.getItem('AutoperkSelectedRatioPresetID'); -if (loadLastPreset != null) - ratioPreset.selectedIndex = loadLastPreset; // First element is zxv (default) ratio. -else - ratioPreset.selectedIndex = 0; -ratioPreset.setAttribute('onchange', 'AutoPerks.setDefaultRatios()'); -//Add the presets dropdown to UI Line 1 -ratiosLine1.appendChild(ratioPresetLabel); -ratiosLine1.appendChild(ratioPreset); -// -customRatios.appendChild(ratiosLine2); -customRatios.appendChild(ratiosLine3); -document.getElementById("portalWrapper").appendChild(customRatios); - -//END AUTOPERKS GUI CODE:>>>>>>>>>>>>>> //-------------------------------------- -//Ratio Presets: +//Ratio Presets - Perk proportions: // (in perk order): [looting,toughness,power,motivation,pheromones,artisanistry,carpentry,resilience,coordinated,resourceful,overkill,cunning,curious]; var preset_ZXV = [20, 0.5, 1, 1.5, 0.5, 1.5, 8, 1, 25, 2, 3, 1, 1]; var preset_ZXVnew = [50, 0.75, 1, 3, 0.75, 3, 10, 1.5, 60, 2, 5, 1, 1]; @@ -149,10 +41,148 @@ var preset_genBTC2 = [96, 19, 15.4, 8, 8, 7, 14, 19, 11, 1, 1, 1, 1]; var preset_Zek450 = [300, 1, 30, 2, 4, 2, 9, 8, 17, 0.1, 1, 320, 1]; var preset_Zek4502 = [350, 1, 40, 2, 3, 2, 5, 8, 2, 0.1, 1, 300, 20]; //Will update again in few days, this seems to be more optimal for more helium for now var preset_Zek4503 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 4, 0.04, 1, 120, 175]; //Final change till perky(?) integration -//gather these into an array of objects. +//gather these into an array of objects. this is one important object. var presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2,preset_Zek450,preset_Zek4502,preset_Zek4503]; -// -//BEGIN AUTOPERKS SCRIPT CODE:>>>>>>>>>>>>>> +//Specific ratios labeled above must be given the matching ID below. +//Ratio preset dropdown list +var presetListHtml = "\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +"; +//Custom Creation for all perk customRatio boxes in Trimps Perk Window +AutoPerks.createInput = function(perkname,div) { + var perk1input = document.createElement("Input"); + perk1input.id = perkname + 'Ratio'; + var oldstyle = 'text-align: center; width: 60px;'; + if(game.options.menu.darkTheme.enabled != 2) perk1input.setAttribute("style", oldstyle + " color: black;"); + else perk1input.setAttribute('style', oldstyle); + perk1input.setAttribute('class', 'perkRatios'); + perk1input.setAttribute('onchange', 'AutoPerks.switchToCustomRatios()'); + var perk1label = document.createElement("Label"); + perk1label.id = perkname + 'Label'; + perk1label.innerHTML = perkname; + perk1label.setAttribute('style', 'margin-right: 1vw; width: 120px; color: white;'); + //add to the div. + div.appendChild(perk1input); + div.appendChild(perk1label); +} +//-------------------------------------- +//BEGIN AUTOPERKS GUI CODE:>>>>>>>>>>>>>> +//-------------------------------------- +AutoPerks.GUI = {}; +AutoPerks.removeGUI = function() { + Object.keys(AutoPerks.GUI).forEach(function(key) { + var $elem = AutoPerks.GUI[key]; + $elem.parentNode.removeChild($elem); + delete AutoPerks.GUI[key]; + }); +} +AutoPerks.displayGUI = function() { + let apGUI = AutoPerks.GUI; + //Create Allocator button and add it to Trimps Perk Window + var $buttonbar = document.getElementById("portalBtnContainer"); + apGUI.$allocatorBtn1 = document.createElement("DIV"); + apGUI.$allocatorBtn1.id = 'allocatorBtn1'; + apGUI.$allocatorBtn1.setAttribute('class', 'btn inPortalBtn settingsBtn settingBtntrue'); + apGUI.$allocatorBtn1.setAttribute('onclick', 'AutoPerks.clickAllocate()'); + apGUI.$allocatorBtn1.textContent = 'Allocate Perks'; + $buttonbar.appendChild(apGUI.$allocatorBtn1); + $buttonbar.setAttribute('style', 'margin-bottom: 0.8vw;'); + apGUI.$customRatios = document.createElement("DIV"); + apGUI.$customRatios.id = 'customRatios'; + //Line 1 of the UI + apGUI.$ratiosLine1 = document.createElement("DIV"); + apGUI.$ratiosLine1.setAttribute('style', 'display: inline-block; text-align: left; width: 100%'); + var listratiosLine1 = ["Overkill","Resourceful","Coordinated","Resilience","Carpentry","Artisanistry"]; + for (var i in listratiosLine1) + AutoPerks.createInput(listratiosLine1[i],apGUI.$ratiosLine1); + apGUI.$customRatios.appendChild(apGUI.$ratiosLine1); + //Line 2 of the UI + apGUI.$ratiosLine2 = document.createElement("DIV"); + apGUI.$ratiosLine2.setAttribute('style', 'display: inline-block; text-align: left; width: 100%'); + var listratiosLine2 = ["Pheromones","Motivation","Power","Looting","Cunning","Curious"]; + for (var i in listratiosLine2) + AutoPerks.createInput(listratiosLine2[i],apGUI.$ratiosLine2); + //Create dump perk dropdown + apGUI.$dumpperklabel = document.createElement("Label"); + apGUI.$dumpperklabel.id = 'DumpPerk Label'; + apGUI.$dumpperklabel.innerHTML = "Dump Perk:"; + apGUI.$dumpperklabel.setAttribute('style', 'margin-right: 1vw; color: white;'); + apGUI.$dumpperk = document.createElement("select"); + apGUI.$dumpperk.id = 'dumpPerk'; + apGUI.$dumpperk.setAttribute('onchange', 'AutoPerks.saveDumpPerk()'); + var oldstyle = 'text-align: center; width: 120px;'; + if(game.options.menu.darkTheme.enabled != 2) apGUI.$dumpperk.setAttribute("style", oldstyle + " color: black;"); + else apGUI.$dumpperk.setAttribute('style', oldstyle); + //Add the dump perk dropdown to UI Line 2 + apGUI.$ratiosLine2.appendChild(apGUI.$dumpperklabel); + apGUI.$ratiosLine2.appendChild(apGUI.$dumpperk); + //Toggle Algorithm 2 checkbox + apGUI.$toggleAlgo2 = document.createElement("DIV"); + apGUI.$toggleAlgo2.setAttribute('style', 'display: inline-block; text-align: left; margin-left: 1vw; width: 7vw;'); + apGUI.$toggleAlgo2.innerHTML = '\ + \ + Fast Allocate!:'; + apGUI.$ratiosLine2.appendChild(apGUI.$toggleAlgo2); + //Create ratioPreset dropdown + apGUI.$ratioPresetLabel = document.createElement("Label"); + apGUI.$ratioPresetLabel.id = 'Ratio Preset Label'; + apGUI.$ratioPresetLabel.innerHTML = "Ratio Preset:"; + apGUI.$ratioPresetLabel.setAttribute('style', 'margin-right: 1vw; color: white;'); + apGUI.$ratioPreset = document.createElement("select"); + apGUI.$ratioPreset.id = 'ratioPreset'; + apGUI.$ratioPreset.setAttribute('onchange', 'AutoPerks.setDefaultRatios()'); + oldstyle = 'text-align: center; width: 110px;'; + if(game.options.menu.darkTheme.enabled != 2) apGUI.$ratioPreset.setAttribute("style", oldstyle + " color: black;"); + else apGUI.$ratioPreset.setAttribute('style', oldstyle); + //Populate ratio preset dropdown list from HTML above: + apGUI.$ratioPreset.innerHTML = presetListHtml; + //load the last ratio used + var loadLastPreset = localStorage.getItem('AutoperkSelectedRatioPresetID'); + apGUI.$ratioPreset.selectedIndex = (loadLastPreset != null) ? loadLastPreset : 0; // First element is zxv (default) ratio. + //Add the presets dropdown to UI Line 1 + apGUI.$ratiosLine1.appendChild(apGUI.$ratioPresetLabel); + apGUI.$ratiosLine1.appendChild(apGUI.$ratioPreset); + apGUI.$customRatios.appendChild(apGUI.$ratiosLine2); + //Add it all to the perk/portal screen + var $portalWrapper = document.getElementById("portalWrapper") + $portalWrapper.appendChild(apGUI.$customRatios); + //////////////////////////////////////// + //Main LOGIC Loop/////////////////////// + //////////////////////////////////////// + AutoPerks.initializePerks();// Init all the new vars + AutoPerks.populateDumpPerkList(); +} + +//populate dump perk dropdown list +AutoPerks.populateDumpPerkList = function() { + var $dumpDropdown = document.getElementById('dumpPerk'); + if ($dumpDropdown == null) return; + var html = ""; + var dumpperks = AutoPerks.getVariablePerks(); + for(var i in dumpperks) + html += "" + html += ""; + $dumpDropdown.innerHTML = html; + //load the last dump preset used + var loadLastDump = localStorage.getItem('AutoperkSelectedDumpPresetID'); + if (loadLastDump != null) + $dumpDropdown.selectedIndex = loadLastDump; + else + $dumpDropdown.selectedIndex = $dumpDropdown.length - 2; // Second to last element is looting_II (or other) +} AutoPerks.saveDumpPerk = function() { var dumpIndex = document.getElementById("dumpPerk").selectedIndex; @@ -160,43 +190,51 @@ AutoPerks.saveDumpPerk = function() { } AutoPerks.saveCustomRatios = function() { - var perkRatioBoxes = document.getElementsByClassName('perkRatios'); - var customRatios = []; - for(var i = 0; i < perkRatioBoxes.length; i++) { - customRatios.push({'id':perkRatioBoxes[i].id,'value':parseFloat(perkRatioBoxes[i].value)}); + if (document.getElementById("ratioPreset").selectedIndex == document.getElementById("ratioPreset").length-1) { + var $perkRatioBoxes = document.getElementsByClassName('perkRatios'); + var customRatios = []; + for(var i = 0; i < $perkRatioBoxes.length; i++) { + customRatios.push({'id':$perkRatioBoxes[i].id,'value':parseFloat($perkRatioBoxes[i].value)}); + } + safeSetItems('AutoPerksCustomRatios', JSON.stringify(customRatios) ); } - safeSetItems('AutoPerksCustomRatios', JSON.stringify(customRatios) ); } -//sets the ratioboxes with the default ratios embedded in the script when perks are instanciated. hardcoded @ lines 461-488 (ish) -//executed manually at the very last line of this file. (and everytime the ratio-preset dropdown-selector is changed) +AutoPerks.switchToCustomRatios = function() { + var $rp = document.getElementById("ratioPreset"); + if ($rp.selectedIndex != $rp.length-1) + ($rp.selectedIndex = $rp.length-1); +} + +//sets the ratioboxes with the default ratios embedded in the script when perks are instanciated. +// (and everytime the ratio-preset dropdown-selector is changed) //loads custom ratio selections from localstorage if applicable AutoPerks.setDefaultRatios = function() { - var perkRatioBoxes = document.getElementsByClassName("perkRatios"); + var $perkRatioBoxes = document.getElementsByClassName("perkRatios"); var ratioSet = document.getElementById("ratioPreset").selectedIndex; var currentPerk; - for(var i = 0; i < perkRatioBoxes.length; i++) { - currentPerk = AutoPerks.getPerkByName(perkRatioBoxes[i].id.substring(0, perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name - perkRatioBoxes[i].value = currentPerk.value[ratioSet]; + for(var i = 0; i < $perkRatioBoxes.length; i++) { + currentPerk = AutoPerks.getPerkByName($perkRatioBoxes[i].id.substring(0, $perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name + $perkRatioBoxes[i].value = currentPerk.value[ratioSet]; } - //grab custom ratios if saved. + //If "Custom" dropdown is selected: if (ratioSet == document.getElementById("ratioPreset").length-1) { + //Try to grab custom ratios from LocalStorage if they were saved. var tmp = JSON.parse(localStorage.getItem('AutoPerksCustomRatios')); if (tmp !== null) - customRatios = tmp; + AutoPerks.GUI.$customRatios = tmp; else { - // If "custom" is manually selected, and no file was found, start by setting all perkRatioBoxes to 0. - for(var i = 0; i < perkRatioBoxes.length; i++) { - perkRatioBoxes[i].value = 0; //initialize to 0. - } + // If no file was found, start by setting all $perkRatioBoxes to 1. + for(var i = 0; i < $perkRatioBoxes.length; i++) + $perkRatioBoxes[i].value = 1; //initialize to 1. return; //then exit. } //if we have ratios in the storage file, load them - for(var i = 0; i < perkRatioBoxes.length; i++) { + for(var i = 0; i < $perkRatioBoxes.length; i++) { //do a quick sanity check (order) - if (customRatios[i].id != perkRatioBoxes[i].id) continue; - currentPerk = AutoPerks.getPerkByName(perkRatioBoxes[i].id.substring(0, perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name - perkRatioBoxes[i].value = customRatios[i].value; + if (AutoPerks.GUI.$customRatios[i].id != $perkRatioBoxes[i].id) continue; + currentPerk = AutoPerks.getPerkByName($perkRatioBoxes[i].id.substring(0, $perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name + $perkRatioBoxes[i].value = AutoPerks.GUI.$customRatios[i].value; } } //save the last ratio used @@ -204,67 +242,70 @@ AutoPerks.setDefaultRatios = function() { } //updates the internal perk variables with values grabbed from the custom ratio input boxes that the user may have changed. -AutoPerks.setNewRatios = function() { - var perkRatioBoxes = document.getElementsByClassName('perkRatios'); +AutoPerks.updatePerkRatios = function() { + var $perkRatioBoxes = document.getElementsByClassName('perkRatios'); var currentPerk; - for(var i = 0; i < perkRatioBoxes.length; i++) { - currentPerk = AutoPerks.getPerkByName(perkRatioBoxes[i].id.substring(0, perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name - currentPerk.updatedValue = parseFloat(perkRatioBoxes[i].value); + for(var i = 0; i < $perkRatioBoxes.length; i++) { + currentPerk = AutoPerks.getPerkByName($perkRatioBoxes[i].id.substring(0, $perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name + currentPerk.updatedValue = parseFloat($perkRatioBoxes[i].value); } - - toughness.updatedValue = resilience.updatedValue / 2; + AutoPerks.getPerkByName("toughness").updatedValue = AutoPerks.getPerkByName("resilience").updatedValue / 2; // Manually update tier II perks var tierIIPerks = AutoPerks.getTierIIPerks(); for(var i in tierIIPerks) tierIIPerks[i].updatedValue = tierIIPerks[i].parent.updatedValue / tierIIPerks[i].relativeIncrease; } +//END AUTOPERKS GUI CODE:>>>>>>>>>>>>>> //get ready / initialize AutoPerks.initialise = function() { - AutoPerks.setperksByName(); - //This does something important but oddly enough but i cant figure out how the local var carries over to mean something later. - var perks = AutoPerks.getOwnedPerks(); - for(var i in perks) { - perks[i].level = 0; //errors out here if a new perk is added. - perks[i].spent = 0; - perks[i].updatedValue = perks[i].value; - } - - //grab new ratios if any - AutoPerks.setNewRatios(); //save custom ratios if "custom" is selected - if (document.getElementById("ratioPreset").selectedIndex == document.getElementById("ratioPreset").length-1) - AutoPerks.saveCustomRatios(); + AutoPerks.saveCustomRatios(); + AutoPerks.initializePerks(); // Init all the new vars + AutoPerks.updatePerkRatios(); //grab new ratios if any } //Main function (green "Allocate Perks" button): AutoPerks.clickAllocate = function() { AutoPerks.initialise(); // Reset all fixed perks to 0 and grab new ratios if any - var preSpentHe = 0; - var helium = AutoPerks.getHelium(); // Get fixed perks + var preSpentHe = 0; var fixedPerks = AutoPerks.getFixedPerks(); - for (var i = 0; i < fixedPerks.length; i++) { + for (var i in fixedPerks) { + //Maintain your existing fixed perks levels. fixedPerks[i].level = game.portal[AutoPerks.capitaliseFirstLetter(fixedPerks[i].name)].level; var price = AutoPerks.calculateTotalPrice(fixedPerks[i], fixedPerks[i].level); fixedPerks[i].spent += price; preSpentHe += price; } + if (preSpentHe) + debug("AutoPerks: Your existing fixed-perks reserve Helium: " + prettify(preSpentHe), "perks"); //if one of these is NaN, bugs. var remainingHelium = helium - preSpentHe; - // Get owned perks - var perks = AutoPerks.getOwnedPerks(); + //Check for NaN - if one of these is NaN, bugs. + if (Number.isNaN(remainingHelium)) + debug("AutoPerks: Major Error: Reading your Helium amount. " + remainingHelium, "perks"); // determine how to spend helium - AutoPerks.spendHelium(remainingHelium, perks); + if (MODULES["perks"].useAlgo2) + var result = AutoPerks.spendHelium2(remainingHelium); + else + var result = AutoPerks.spendHelium(remainingHelium); + if (result == false) { + debug("AutoPerks: Major Error: Make sure all ratios are set properly.","perks"); + return; + } + // Get owned perks + var perks = AutoPerks.getOwnedPerks(); //re-arrange perk points - AutoPerks.applyCalculations(perks); - debug("Finishing AutoPerks Auto-Allocate.","perks"); + AutoPerks.applyCalculations(perks,remainingHelium); + //Done + debug("AutoPerks: Auto-Allocate Finished.","perks"); } //NEW way: Get accurate count of helium (calcs it like the game does) @@ -281,20 +322,28 @@ AutoPerks.getHelium = function() { return respecMax; } +//Calculate Price AutoPerks.calculatePrice = function(perk, level) { // Calculate price of buying *next* level if(perk.fluffy) return Math.ceil(perk.base * Math.pow(10,level)); if(perk.type == 'exponential') return Math.ceil(level/2 + perk.base * Math.pow(1.3, level)); else if(perk.type == 'linear') return Math.ceil(perk.base + perk.increase * level); } - +//Calculate Total Price AutoPerks.calculateTotalPrice = function(perk, finalLevel) { + if(perk.type == 'linear' && !perk.fluffy) + return AutoPerks.calculateTIIprice(perk, finalLevel); var totalPrice = 0; for(var i = 0; i < finalLevel; i++) { totalPrice += AutoPerks.calculatePrice(perk, i); } return totalPrice; } - +//Calculate Tier 2 Total Price (Shortcut) +AutoPerks.calculateTIIprice = function(perk, finalLevel) { + //based on Trimps getAdditivePrice() @ main.js line 2056 + return Math.ceil((((finalLevel - 1) * finalLevel) / 2 * perk.increase) + (perk.base * finalLevel)); +} +//Calculate the increase in stat. AutoPerks.calculateIncrease = function(perk, level) { var increase = 0; var value; // Allows for custom perk ratios. @@ -307,37 +356,86 @@ AutoPerks.calculateIncrease = function(perk, level) { return increase / perk.baseIncrease * value; } -AutoPerks.spendHelium = function(helium, perks) { - debug("Beginning AutoPerks calculate how to spend " + helium + " Helium... This could take a while...","perks"); +AutoPerks.spendHelium = function(helium) { + debug("Beginning AutoPerks1 calculate how to spend " + prettify(helium) + " Helium... This could take a while...","perks"); if(helium < 0) { - debug("AutoPerks: Not enough helium to buy fixed perks.","perks"); + debug("AutoPerks: Major Error - Not enough helium to buy fixed perks.","perks"); //document.getElementById("nextCoordinated").innerHTML = "Not enough helium to buy fixed perks."; return; } - if(helium == NaN) { - debug("AutoPerks: Helium is Not a Number Error","perks"); + if (Number.isNaN(helium)) { + debug("AutoPerks: Major Error - Helium is Not a Number!","perks"); return; - } - + } + var perks = AutoPerks.getVariablePerks(); var effQueue = new FastPriorityQueue(function(a,b) { return a.efficiency > b.efficiency } ) // Queue that keeps most efficient purchase at the top // Calculate base efficiency of all perks + + var mostEff, price, inc; for(var i in perks) { - var price = AutoPerks.calculatePrice(perks[i], 0); - var inc = AutoPerks.calculateIncrease(perks[i], 0); + price = AutoPerks.calculatePrice(perks[i], 0); + inc = AutoPerks.calculateIncrease(perks[i], 0); perks[i].efficiency = inc/price; if(perks[i].efficiency <= 0) { debug("Perk ratios must be positive values.","perks"); - return; + return false; + } + if(perks[i].efficiency != 0) + effQueue.add(perks[i]); + } + + var i=0; + //Change the way we iterate. + function iterateQueue() { + mostEff = effQueue.poll(); + price = AutoPerks.calculatePrice(mostEff, mostEff.level); // Price of *next* purchase. + inc = AutoPerks.calculateIncrease(mostEff, mostEff.level); + mostEff.efficiency = inc / price; + i++; + } + for (iterateQueue() ; price <= helium ; iterateQueue() ) { + if(mostEff.level < mostEff.max) { // but first, check if the perk has reached its maximum value + // Purchase the most efficient perk + helium -= price; + mostEff.level++; + mostEff.spent += price; + price = AutoPerks.calculatePrice(mostEff, mostEff.level); // Price of *next* purchase. + inc = AutoPerks.calculateIncrease(mostEff, mostEff.level); + mostEff.efficiency = inc / price; + effQueue.add(mostEff); // Add back into queue run again until out of helium } - effQueue.add(perks[i]); } + debug("AutoPerks1: Pass One Complete. Loops ran: " + i, "perks"); - var mostEff = effQueue.poll(); - var price = AutoPerks.calculatePrice(mostEff, mostEff.level); // Price of *next* purchase. - var inc; - while(price <= helium) { + //Begin selectable dump perk code + var $selector = document.getElementById('dumpPerk'); + if ($selector != null && $selector.value != "None") { + var heb4dump = helium; + var index = $selector.selectedIndex; + var dumpPerk = AutoPerks.getPerkByName($selector[index].innerHTML); + //debug(AutoPerks.capitaliseFirstLetter(dumpPerk.name) + " level pre-dump: " + dumpPerk.level,"perks"); + if(dumpPerk.level < dumpPerk.max) { + for(price = AutoPerks.calculatePrice(dumpPerk, dumpPerk.level); price < helium && dumpPerk.level < dumpPerk.max; price = AutoPerks.calculatePrice(dumpPerk, dumpPerk.level)) { + helium -= price; + dumpPerk.spent += price; + dumpPerk.level++; + } + } + var dumpresults = heb4dump - helium; + debug("AutoPerks1: Dump Perk " + AutoPerks.capitaliseFirstLetter(dumpPerk.name) + " level post-dump: "+ dumpPerk.level + " Helium Dumped: " + prettify(dumpresults) + " He.", "perks"); + } //end dump perk code. + + var heB4round2 = helium; + //Repeat the process for spending round 2. This spends any extra helium we have that is less than the cost of the last point of the dump-perk. + while (effQueue.size > 1) { + mostEff = effQueue.poll(); + if (mostEff.level >= mostEff.max) continue; + price = AutoPerks.calculatePrice(mostEff, mostEff.level); + // Add back into queue run again until out of helium + // but first, check if the perk has reached its maximum value + if (price >= helium) continue; // Purchase the most efficient perk helium -= price; mostEff.level++; @@ -346,32 +444,99 @@ AutoPerks.spendHelium = function(helium, perks) { inc = AutoPerks.calculateIncrease(mostEff, mostEff.level); price = AutoPerks.calculatePrice(mostEff, mostEff.level); mostEff.efficiency = inc/price; - // Add back into queue run again until out of helium - if(mostEff.level < mostEff.max) // but first, check if the perk has reached its maximum value - effQueue.add(mostEff); + effQueue.add(mostEff); + } + var r2results = heB4round2 - helium; + debug("AutoPerks1: Pass two complete. Round 2 cleanup spend of : " + prettify(r2results),"perks"); +} + +AutoPerks.spendHelium2 = function(helium) { + debug("Beginning AutoPerks2 calculate how to spend " + prettify(helium) + " Helium... This could take a while...","perks"); + if(helium < 0) { + debug("AutoPerks: Major Error - Not enough helium to buy fixed perks.","perks"); + //document.getElementById("nextCoordinated").innerHTML = "Not enough helium to buy fixed perks."; + return; + } + if (Number.isNaN(helium)) { + debug("AutoPerks: Major Error - Helium is Not a Number!","perks"); + return; + } + + var perks = AutoPerks.getVariablePerks(); + + var effQueue = new FastPriorityQueue(function(a,b) { return a.efficiency > b.efficiency } ) // Queue that keeps most efficient purchase at the top + // Calculate base efficiency of all perks + for(var i in perks) { + var price = AutoPerks.calculatePrice(perks[i], 0); + var inc = AutoPerks.calculateIncrease(perks[i], 0); + perks[i].efficiency = inc/price; + if(perks[i].efficiency < 0) { + debug("Perk ratios must be positive values.","perks"); + return false; + } + if(perks[i].efficiency != 0) + effQueue.add(perks[i]); + } + + var mostEff, price, inc; + var packPrice,packLevel; + var i=0; + //Change the way we iterate. + function iterateQueue() { mostEff = effQueue.poll(); - price = AutoPerks.calculatePrice(mostEff, mostEff.level); + price = AutoPerks.calculatePrice(mostEff, mostEff.level); // Price of *next* purchase. + inc = AutoPerks.calculateIncrease(mostEff, mostEff.level); + mostEff.efficiency = inc / price; + i++; + } + for (iterateQueue() ; price <= helium ; iterateQueue() ) { + if(mostEff.level < mostEff.max) { // but first, check if the perk has reached its maximum value + // Purchase the most efficient perk + var t2 = mostEff.name.endsWith("_II"); + if (t2) { + packLevel = mostEff.increase * 10; + packPrice = AutoPerks.calculateTotalPrice(mostEff, mostEff.level + packLevel) - mostEff.spent; + } + if (t2 && packPrice <= helium) { + helium -= packPrice; + mostEff.level+= packLevel; + mostEff.spent += packPrice; + } else { + helium -= price; + mostEff.level++; + mostEff.spent += price; + } + price = AutoPerks.calculatePrice(mostEff, mostEff.level); // Price of *next* purchase. + inc = AutoPerks.calculateIncrease(mostEff, mostEff.level); + mostEff.efficiency = inc / price; + effQueue.add(mostEff); // Add back into queue run again until out of helium + } } - debug("AutoPerks: Pass one complete.","perks"); + debug("AutoPerks2: Pass One Complete. Loops ran: " + i, "perks"); //Begin selectable dump perk code - var selector = document.getElementById('dumpPerk'); - var index = selector.selectedIndex; - if(selector.value != "None") { - var dumpPerk = AutoPerks.getPerkByName(selector[index].innerHTML); - debug(AutoPerks.capitaliseFirstLetter(dumpPerk.name) + " level pre-dump: " + dumpPerk.level,"perks"); + var $selector = document.getElementById('dumpPerk'); + if ($selector != null && $selector.value != "None") { + var heb4dump = helium; + var index = $selector.selectedIndex; + var dumpPerk = AutoPerks.getPerkByName($selector[index].innerHTML); + //debug(AutoPerks.capitaliseFirstLetter(dumpPerk.name) + " level pre-dump: " + dumpPerk.level,"perks"); if(dumpPerk.level < dumpPerk.max) { - for(price = AutoPerks.calculatePrice(dumpPerk, dumpPerk.level); price <= helium; price = AutoPerks.calculatePrice(dumpPerk, dumpPerk.level)) { + for(price = AutoPerks.calculatePrice(dumpPerk, dumpPerk.level); price < helium && dumpPerk.level < dumpPerk.max; price = AutoPerks.calculatePrice(dumpPerk, dumpPerk.level)) { helium -= price; dumpPerk.spent += price; dumpPerk.level++; } } + var dumpresults = heb4dump - helium; + debug("AutoPerks2: Dump Perk " + AutoPerks.capitaliseFirstLetter(dumpPerk.name) + " level post-dump: "+ dumpPerk.level + " Helium Dumped: " + prettify(dumpresults) + " He.", "perks"); } //end dump perk code. - + + var heB4round2 = helium; //Repeat the process for spending round 2. This spends any extra helium we have that is less than the cost of the last point of the dump-perk. while (effQueue.size > 1) { mostEff = effQueue.poll(); + if (mostEff.level >= mostEff.max) continue; // but first, check if the perk has reached its maximum value price = AutoPerks.calculatePrice(mostEff, mostEff.level); if (price >= helium) continue; // Purchase the most efficient perk @@ -383,14 +548,16 @@ AutoPerks.spendHelium = function(helium, perks) { price = AutoPerks.calculatePrice(mostEff, mostEff.level); mostEff.efficiency = inc/price; // Add back into queue run again until out of helium - if(mostEff.level < mostEff.max) // but first, check if the perk has reached its maximum value - effQueue.add(mostEff); + effQueue.add(mostEff); } - debug("AutoPerks: Pass two complete.","perks"); + var r2results = heB4round2 - helium; + debug("AutoPerks2: Pass Two Complete. Cleanup Spent Any Leftover Helium: " + prettify(r2results) + " He.","perks"); } + + //Pushes the respec button, then the Clear All button, then assigns perk points based on what was calculated. -AutoPerks.applyCalculationsRespec = function(perks){ +AutoPerks.applyCalculationsRespec = function(perks,remainingHelium){ // *Apply calculations with respec if (game.global.canRespecPerks) { respecPerks(); @@ -398,68 +565,57 @@ AutoPerks.applyCalculationsRespec = function(perks){ if (game.global.respecActive) { clearPerks(); var preBuyAmt = game.global.buyAmt; - //var lastcustom = game.global.lastCustomAmt; + for(var i in perks) { var capitalized = AutoPerks.capitaliseFirstLetter(perks[i].name); game.global.buyAmt = perks[i].level; - //console.log(perks[i].name + " " + perks[i].level); - buyPortalUpgrade(capitalized); - } - var FixedPerks = AutoPerks.getFixedPerks(); - for(var i in FixedPerks) { - var capitalized = AutoPerks.capitaliseFirstLetter(FixedPerks[i].name); - game.global.buyAmt = FixedPerks[i].level; - //console.log(FixedPerks[i].name + " " + FixedPerks[i].level); - buyPortalUpgrade(capitalized); + if (getPortalUpgradePrice(capitalized) <= remainingHelium) { + if (MODULES["perks"].showDetails) + debug("AutoPerks-Respec Buying: " + capitalized + " " + perks[i].level, "perks"); + buyPortalUpgrade(capitalized); + } else + if (MODULES["perks"].showDetails) + debug("AutoPerks-Respec Error Couldn't Afford Asked Perk: " + capitalized + " " + perks[i].level, "perks"); } game.global.buyAmt = preBuyAmt; - //game.global.lastCustomAmt = lastcustom; numTab(1,true); //selects the 1st number of the buy-amount tab-bar (Always 1) cancelTooltip(); //displays the last perk we bought's tooltip without this. idk why. //activateClicked(); //click OK for them (disappears the window). } else { debug("A Respec would be required and is not available. You used it already, try again next portal.","perks"); - allocatorBtn1.setAttribute('class', 'btn inPortalBtn settingsBtn settingBtnfalse'); + AutoPerks.GUI.$allocatorBtn1.setAttribute('class', 'btn inPortalBtn settingsBtn settingBtnfalse'); tooltip("Automatic Perk Allocation Error", "customText", event, "A Respec would be required and is NOT available. You used it already, try again next portal. Press esc to close this tooltip." ); } } //Assigns perk points without respeccing if nothing is needed to be negative. -AutoPerks.applyCalculations = function(perks){ - // *Apply calculations WITHOUT respec +AutoPerks.applyCalculations = function(perks,remainingHelium){ + // // *Apply calculations WITHOUT respec var preBuyAmt = game.global.buyAmt; - //var lastcustom = game.global.lastCustomAmt; var needsRespec = false; for(var i in perks) { var capitalized = AutoPerks.capitaliseFirstLetter(perks[i].name); - game.global.buyAmt = perks[i].level - game.portal[capitalized].level; - //console.log(perks[i].name + " " + perks[i].level); + game.global.buyAmt = perks[i].level - game.portal[capitalized].level - game.portal[capitalized].levelTemp; if (game.global.buyAmt < 0) { needsRespec = true; - break; + if (MODULES["perks"].showDetails) + debug("AutoPerks RESPEC Required for: " + capitalized + " " + game.global.buyAmt, "perks"); + //break; } - else + else if (game.global.buyAmt > 0) { + if (MODULES["perks"].showDetails) + debug("AutoPerks-NoRespec Adding: " + capitalized + " " + game.global.buyAmt, "perks"); buyPortalUpgrade(capitalized); - } - var FixedPerks = AutoPerks.getFixedPerks(); - for(var i in FixedPerks) { - var capitalized = AutoPerks.capitaliseFirstLetter(FixedPerks[i].name); - game.global.buyAmt = FixedPerks[i].level - game.portal[capitalized].level; - //console.log(FixedPerks[i].name + " " + FixedPerks[i].level); - if (game.global.buyAmt < 0) { - needsRespec = true; - break; } - else - buyPortalUpgrade(capitalized); } + game.global.buyAmt = preBuyAmt; - //game.global.lastCustomAmt = lastcustom; numTab(1,true); //selects the 1st number of the buy-amount tab-bar (Always 1) cancelTooltip(); //displays the last perk we bought's tooltip without this. idk why. - if (needsRespec == true){ + if (needsRespec){ + debug("AutoPerks - A Respec is required. Trying respec...", "perks"); //get the variable, in this order, then switch screens (or else the sequence is messed up) var whichscreen = game.global.viewingUpgrades; cancelPortal(); @@ -467,25 +623,37 @@ AutoPerks.applyCalculations = function(perks){ viewPortalUpgrades(); else portalClicked(); - AutoPerks.applyCalculationsRespec(perks); + AutoPerks.applyCalculationsRespec(perks,remainingHelium); + // + if (MODULES["perks"].showDetails) { + var exportPerks = {}; + for (var item in game.portal){ + el = game.portal[item]; + //For smaller strings and backwards compatibility, perks not added to the object will be treated as if the perk is supposed to be level 0. + if (el.locked || el.level <= 0) continue; + //Add the perk to the object with the desired level + exportPerks[item] = el.level + el.levelTemp; + } + console.log(exportPerks); + } } } +AutoPerks.lowercaseFirst = function(str) { + return str.substr(0, 1).toLowerCase() + str.substr(1); +} AutoPerks.capitaliseFirstLetter = function(str) { return str.charAt(0).toUpperCase() + str.slice(1); } - AutoPerks.getPercent = function(spentHelium, totalHelium) { var frac = spentHelium / totalHelium; frac = (frac* 100).toPrecision(2); return frac + "%"; } - -AutoPerks.lowercaseFirst = function(str) { - return str.substr(0, 1).toLowerCase() + str.substr(1); +AutoPerks.toggleFastAllocate = function() { + MODULES["perks"].useAlgo2 = !MODULES["perks"].useAlgo2; } - AutoPerks.FixedPerk = function(name, base, level, max, fluffy) { this.id = -1; this.name = name; @@ -497,7 +665,7 @@ AutoPerks.FixedPerk = function(name, base, level, max, fluffy) { this.max = max || Number.MAX_VALUE; if (fluffy == "fluffy") { //This affects cost calculation on "Capable" fixed perk (during line 273) - this.fluffy = true; + this.fluffy = true; this.type = "linear"; this.increase = 10; } @@ -518,13 +686,11 @@ AutoPerks.VariablePerk = function(name, base, compounding, value, baseIncrease, this.level = level || 0; // How many levels have been invested into a perk this.spent = 0; // Total helium spent on each perk. function getRatiosFromPresets() { - //var perkOrder = [looting,toughness,power,motivation,pheromones,artisanistry,carpentry,resilience,coordinated,resourceful,overkill,cunning,curious]; var valueArray = []; for (var i=0; i"+AutoPerks.capitaliseFirstLetter(dumpperks[i].name)+"" -html += ""; -dumpDropdown.innerHTML = html; -//load the last dump preset used -var loadLastDump = localStorage.getItem('AutoperkSelectedDumpPresetID'); -if (loadLastDump != null) - dumpDropdown.selectedIndex = loadLastDump; -else - dumpDropdown.selectedIndex = dumpDropdown.length - 2; // Second to last element is looting_II (or other) +//Run the GUI: +AutoPerks.displayGUI(); \ No newline at end of file diff --git a/modules/scryer.js b/modules/scryer.js index 183632935..f15b12fc0 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -27,8 +27,9 @@ function useScryerStance() { || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never - var iscorrupt = getCurrentEnemy(1).mutation == ("Corruption" || "Healthy"); - iscorrupt = iscorrupt || (mutations.Magma.active() && game.global.mapsActive); + var curEnemy = getCurrentEnemy(1); + var iscorrupt = curEnemy && (curEnemy.mutation == "Corruption" || curEnemy.mutation == "Healthy"); + iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Magma.active()); iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_auto))) { autostancefunction(); @@ -85,9 +86,9 @@ function useScryerStance() { if (useoverkill && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')==0) useoverkill = false; //If lower than nature zone, do not use overkill //redundant now?? - if (useoverkill && ((getEmpowerment() = "Poison" && (game.global.world <= getPageSetting('ScryUseinPoison'))) - || (getEmpowerment() = "Wind" && (game.global.world <= getPageSetting('ScryUseinWind'))) - || (getEmpowerment() = "Ice" &&(game.global.world <= getPageSetting('ScryUseinIce'))))) + if (useoverkill && ((getEmpowerment() == "Poison" && (game.global.world <= getPageSetting('ScryUseinPoison'))) + || (getEmpowerment() == "Wind" && (game.global.world <= getPageSetting('ScryUseinWind'))) + || (getEmpowerment() == "Ice" &&(game.global.world <= getPageSetting('ScryUseinIce'))))) useoverkill = false; //Overkill button being on and being able to overkill in S will override any setting other than never spire & nature zone, regardless. if (useoverkill && game.portal.Overkill.level > 0) { @@ -102,35 +103,8 @@ function useScryerStance() { return; } } -/* -//If you cannot overkill, these situations will cause a return to autostance. - //check for spire not being Forced - use_auto = use_auto || !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')!=1; - //check for voids - use_auto = use_auto || game.global.mapsActive && getCurrentMapObject().location == "Void" && !getPageSetting('ScryerUseinVoidMaps2'); - //check for maps - use_auto = use_auto || game.global.mapsActive && !getPageSetting('ScryerUseinMaps2'); - //check for bosses above voidlevel - use_auto = use_auto || getPageSetting('ScryerSkipBoss2') == 1 && game.global.world > getPageSetting('VoidMaps') && game.global.lastClearedCell == 98; - //check for bosses (all levels) - use_auto = use_auto || getPageSetting('ScryerSkipBoss2') == 2 && game.global.lastClearedCell == 98; - if (use_auto) { - autostancefunction(); //falls back to autostance when not using S. - wantToScry = false; - return; - } - //check for corrupted cells (and exit) - var iscorrupt = getCurrentEnemy(1).mutation == "Corruption"; - iscorrupt = iscorrupt || (mutations.Magma.active() && game.global.mapsActive); - iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); - if (iscorrupt && getPageSetting('ScryerSkipCorrupteds2')) { - autostancefunction(); - wantToScry = false; - return; - } -*/ - //Default. (All Never and Always are accounted for, Overkill has decided whether to run, leaving solely what zones you want to run S in even when you can't overkill) +//Default. (All Never and Always are accounted for, Overkill has decided whether to run, leaving solely what zones you want to run S in even when you can't overkill) var min_zone = getPageSetting('ScryerMinZone'); var max_zone = getPageSetting('ScryerMaxZone'); var valid_min = game.global.world >= min_zone; diff --git a/modules/upgrades.js b/modules/upgrades.js index 84c5baae1..7207ac9df 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -7,7 +7,7 @@ function buyUpgrades() { upgrade = upgradeList[upgrade]; var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); - if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') != 1 || !canAffordCoordinationTrimps())) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps())) continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; //skip bloodlust during scientist challenges and while we have autofight enabled. diff --git a/modules/utils.js b/modules/utils.js index e7e392417..ee71b65af 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -66,26 +66,42 @@ function updateOldSettings(oldSettings) { var oldVer = oldSettings['ATversion']; debug("ATsettings: Updating v" + oldVer + " to v" + ATversion); if (versionIsOlder(oldVer, '2.1.6.9')) { - debug("ATsettings: Migrating AutoMaps + RunUniqueMaps to new AutoMaps."); - //migrate AutoMaps + RunUniqueMaps to new AutoMaps - var am = (oldSettings['AutoMaps']); - oldSettings['AutoMaps'] = am ? 1 : 0; - if (!oldSettings['RunUniqueMaps']) - oldSettings['AutoMaps']++; - delete oldSettings['RunUniqueMaps']; + debug("ATsettings: Migrating AutoMaps + RunUniqueMaps to new AutoMaps."); + //migrate AutoMaps + RunUniqueMaps to new AutoMaps + oldSettings['AutoMaps'].value = oldSettings['AutoMaps'].enabled ? 1 : 0; + if (!oldSettings['RunUniqueMaps'].enabled) + oldSettings['AutoMaps'].value++; + delete oldSettings['RunUniqueMaps']; } - /* - if (versionIsOlder(oldVer, '2.1.7.0')) { - debug("ATsettings: Migrating X + Y to new Z."); - //migrate X + Y to new Z - var am = (oldSettings['X']); - oldSettings['X'] = am ? 1 : 0; - if (!oldSettings['Y']) - oldSettings['X']++; - delete oldSettings['Y']; - } - */ + //These settingsneed to be migrated here: +/* +BuyBuildingsNew = BuyBuildings + BuyStorage +BuyJobsNew = BuyJobs + WorkerRatios +BuyWeaponsNew = BuyWeaponUpgrades + BuyWeapons +BuyArmorNew = BuyArmorUpgrades + BuyArmor +ManualGather2 was 2 now 3 (4=way) - needs to be converted. +BuyOneTimeOC = BuyOvclock + OneTimeOnly +PrestigeSkip1_2 = PrestigeSkipMode + PrestigeSkip2 +AutoHeirloomsNew = AutoHeirlooms + AutoHeirlooms2 +ScryerDieToUseS += ScryerDieZ +(+more since 5 days ago) +*/ + if (versionIsOlder(oldVer, '2.1.7.0')) { + //example:*untested* + var X='BuyBuildings'; + var Y='BuyStorage'; + var Z='BuyBuildingsNew'; + //migrate X + Y to new Z + var oldOne = oldSettings[X]; + var oldTwo = oldSettings[Y]; + var newOne = oldSettings[Z]; + debug("ATsettings: Migrating " + X + " + " + Y + " to new " + Z); + newOne.value = oldOne.enabled ? 1 : 0; + newOne.value+= oldTwo.enabled ? 1 : 0; + delete oldOne; + delete oldTwo; + } autoTrimpSettings = oldSettings; } @@ -168,6 +184,7 @@ function debug(message, type, lootIcon) { var graphs = getPageSetting('SpamGraphs'); var magmite = getPageSetting('SpamMagmite'); var perks = getPageSetting('SpamPerks'); + var profiles = getPageSetting('SpamProfiles'); var output = true; switch (type) { case null: @@ -202,6 +219,9 @@ function debug(message, type, lootIcon) { case "perks": output = perks; break; + case "profiles": + output = profiles; + break; } if (output) { if (enableDebug) @@ -373,13 +393,7 @@ window.onerror = function catchErrors(msg, url, lineNo, columnNo, error) { console.log("AT logged error: " + message); //ATServer.Upload(message); }; -/* -window.addEventListener('error', function(event) { - var message = JSON.stringify(event); - console.log("logged error: " + message); - //ATServer.Upload(message); -}); -*/ + function throwErrorfromModule() { throw new Error("We have successfully read the thrown error message out of a module"); } diff --git a/sparecode/laborfix.js b/sparecode/laborfix.js deleted file mode 100644 index 8689f037f..000000000 --- a/sparecode/laborfix.js +++ /dev/null @@ -1,104 +0,0 @@ -//"Auto Gather/Build" -function manualLabor() { - //vars - var breedingTrimps = game.resources.trimps.owned - game.resources.trimps.employed; - var trapTrimpsOK = getPageSetting('TrapTrimps'); - var targetBreed = parseInt(getPageSetting('GeneticistTimer')); - - //FRESH GAME LOWLEVEL NOHELIUM CODE. - if (game.global.world <=3 && game.global.totalHeliumEarned<=1000) { - if (game.global.buildingsQueue.length == 0 && (game.global.playerGathering != 'trimps' || game.buildings.Trap.owned == 0)){ - if (!game.triggers.wood.done || game.resources.food.owned < 10 || Math.floor(game.resources.food.owned) < Math.floor(game.resources.wood.owned)) { - setGather('food'); - return; - } - else { - setGather('wood'); - return; - } - } - } - //Traps and Trimps - if (trapTrimpsOK && (breedingTrimps < 5 || targetBreed < getBreedTime(true))) { - if (game.buildings.Trap.owned > 0) { - setGather('trimps');//gatherTrimps = true; - return; - } - if (game.buildings.Trap.owned == 0 && canAffordBuilding('Trap')) - safeBuyBuilding('Trap');//buyTraps = true; - } - //Buildings: - //if we have more than 2 buildings in queue, or (our modifier is real fast and trapstorm is off), build - if ((!game.talents.foreman.purchased && (game.global.buildingsQueue.length ? (game.global.buildingsQueue.length > 1 || game.global.autoCraftModifier == 0 || (getPlayerModifier() > 1000 && game.global.buildingsQueue[0] != 'Trap.1')) : false)) || - //if trapstorm is off (likely we havent gotten it yet, the game is still early, buildings take a while to build ), then Prioritize Storage buildings when they hit the front of the queue (should really be happening anyway since the queue should be >2(fits the clause above this), but in case they are the only object in the queue.) - (!game.global.trapBuildToggled && (game.global.buildingsQueue[0] == 'Barn.1' || game.global.buildingsQueue[0] == 'Shed.1' || game.global.buildingsQueue[0] == 'Forge.1')) || - //Build more traps if we have TrapTrimps on, and we own less than 1000 traps. - (trapTrimpsOK && game.global.trapBuildToggled && game.buildings.Trap.owned < 1000)) { - setGather('buildings');//buildBuildings = true; - return; - } - //Sciencey: - //if we have some upgrades sitting around which we don't have enough science for, gather science - if (document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') { - //if we have less than a minute of science - if (game.resources.science.owned < 100 || (game.resources.science.owned < getPsString('science', true) * 60 && game.global.turkimpTimer < 1)) - if (getPageSetting('ManualGather2') != 2) { - setGather('science'); - return; - } - if (game.resources.science.owned < scienceNeeded) { - //if manual is less than science production and turkimp, metal. (or science is set as disallowed) - if ((getPlayerModifier() < getPerSecBeforeManual('Scientist') && game.global.turkimpTimer > 0) || getPageSetting('ManualGather2') == 2) - setGather('metal'); - else if (getPageSetting('ManualGather2') != 2) { - setGather('science'); - return; - } - } - } - //If we got here, without exiting, gather Normal Resources: - var manualResourceList = { - 'food': 'Farmer', - 'wood': 'Lumberjack', - 'metal': 'Miner', - }; - var lowestResource = 'food'; - var lowestResourceRate = -1; - var haveWorkers = true; - for (var resource in manualResourceList) { - var job = manualResourceList[resource]; - var currentRate = game.jobs[job].owned * game.jobs[job].modifier; - // debug('Current rate for ' + resource + ' is ' + currentRate + ' is hidden? ' + (document.getElementById(resource).style.visibility == 'hidden')); - if (document.getElementById(resource).style.visibility != 'hidden') { - //find the lowest resource rate - if (currentRate === 0) { - currentRate = game.resources[resource].owned; - // debug('Current rate for ' + resource + ' is ' + currentRate + ' lowest ' + lowestResource + lowestResourceRate); - if ((haveWorkers) || (currentRate < lowestResourceRate)) { - // debug('New Lowest1 ' + resource + ' is ' + currentRate + ' lowest ' + lowestResource + lowestResourceRate+ ' haveworkers ' +haveWorkers); - haveWorkers = false; - lowestResource = resource; - lowestResourceRate = currentRate; - } - } - if ((currentRate < lowestResourceRate || lowestResourceRate == -1) && haveWorkers) { - // debug('New Lowest2 ' + resource + ' is ' + currentRate + ' lowest ' + lowestResource + lowestResourceRate); - lowestResource = resource; - lowestResourceRate = currentRate; - } - } - // debug('Current Stats ' + resource + ' is ' + currentRate + ' lowest ' + lowestResource + lowestResourceRate+ ' haveworkers ' +haveWorkers); - } - - if (game.global.playerGathering != lowestResource && !haveWorkers && !breedFire) { - if (game.global.turkimpTimer > 0) - setGather('metal'); - else - setGather(lowestResource);//gather the lowest resource - } else if (game.global.turkimpTimer > 0) - setGather('metal'); - else - setGather(lowestResource); - //ok - return true; -} \ No newline at end of file diff --git a/user.js b/user.js index 8c752034a..326256168 100644 --- a/user.js +++ b/user.js @@ -20,3 +20,7 @@ document.head.appendChild(script); // This File is Deprecated, please use .user.js instead (with the leading dot) so TamperMonkey/Greasemonkey can detect it as a script automatically. // Other than that they are identical and no change is required on your part if everything is working already. + +//You can use the following to auto-load your own forked repo as a local directory served from a local HTTPS webserver. +//the other bookmarklet wont load locally - the script.id will tell it to pull the rest of modules from the given URL. +//javascript:with(document)(script = createElement('script'), script.src='https://localhost:4443/AutoTrimps2.js', script.id='AutoTrimps-script',head.appendChild(script))._ \ No newline at end of file From fbced74dbc94dc9811f34e82a55ecf7dddc4da5b Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 4 Apr 2018 17:20:18 +0100 Subject: [PATCH 0055/3477] add my name to changelog to make it clear that it isn't main fork --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index bfd059238..e172a782a 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -8,7 +8,7 @@ // @include *kongregate.com/games/GreenSatellite/trimps // @grant none // ==/UserScript== -var ATversion = '2.1.6.9b-genbtc-4-2-2018'; +var ATversion = '2.1.6.9b-genbtc-4-2-2018 + KFrowde'; //////////////////////////////////////////////////////////////////////////////// //Main Loader Initialize Function (loads first, load everything else)/////////// From e5f39cbc64ebc96c289da8fc0bc0008d9a2b4ccb Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 4 Apr 2018 17:21:28 +0100 Subject: [PATCH 0056/3477] change URL --- user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user.js b/user.js index 326256168..3cf8251f3 100644 --- a/user.js +++ b/user.js @@ -21,6 +21,6 @@ document.head.appendChild(script); // This File is Deprecated, please use .user.js instead (with the leading dot) so TamperMonkey/Greasemonkey can detect it as a script automatically. // Other than that they are identical and no change is required on your part if everything is working already. -//You can use the following to auto-load your own forked repo as a local directory served from a local HTTPS webserver. +//You can use the following to auto-load your own forked repo as a local directory served from a local HTTPS webserver. //the other bookmarklet wont load locally - the script.id will tell it to pull the rest of modules from the given URL. -//javascript:with(document)(script = createElement('script'), script.src='https://localhost:4443/AutoTrimps2.js', script.id='AutoTrimps-script',head.appendChild(script))._ \ No newline at end of file +//javascript:with(document)(script = createElement('script'), script.src='https://localhost:4443/AutoTrimps2.js', script.id='AutoTrimps-script',head.appendChild(script))._ From bed3c5551cb4fdbfaff5f6dcea4be9e653ee9d07 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Wed, 4 Apr 2018 17:28:16 +0100 Subject: [PATCH 0057/3477] URL --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index e172a782a..22570ad67 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -15,7 +15,7 @@ var ATversion = '2.1.6.9b-genbtc-4-2-2018 + KFrowde'; //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////// var atscript = document.getElementById('AutoTrimps-script') - , basepath = 'https://genBTC.github.io/AutoTrimps/' + , basepath = 'https://Kfrowde.github.io/AutoTrimps/' , modulepath = 'modules/' ; //This should redirect the script to wherever its being mirrored from. From f220f3e0b5b2493fc773fab720118d879d58fd0b Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 12 Apr 2018 17:39:32 +0100 Subject: [PATCH 0058/3477] test removing the check for cell contents --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 45d71dd15..a98182292 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -106,7 +106,7 @@ else if(M["fightinfo"].exotics.indexOf(cell.name) > -1) // Exotic cell { - if(cell.special.length === 0) + //if(cell.special.length === 0) $cell.innerHTML = " "; $cell.title = cell.name; From 02cb8c3099ea86c8c45a9d340af3fa44dbdde54f Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 12 Apr 2018 17:59:32 +0100 Subject: [PATCH 0059/3477] try adding 2 icons to a cell --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index a98182292..a6644e0bf 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -107,7 +107,7 @@ else if(M["fightinfo"].exotics.indexOf(cell.name) > -1) // Exotic cell { //if(cell.special.length === 0) - $cell.innerHTML = " "; + $cell.innerHTML += " "; $cell.title = cell.name; //$cell.style.color = M["fightinfo"].colors.exotic; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) From 4864b8c75faa211b5f75b0ceece386972b597b46 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 12 Apr 2018 18:20:49 +0100 Subject: [PATCH 0060/3477] try individualising the overlay to diff imps --- modules/fight-info.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/fight-info.js b/modules/fight-info.js index a6644e0bf..3db165da7 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -104,6 +104,16 @@ $cell.style.textShadow = '0px 0px 15px #ffffff'; } + else if(cell.name.toLowerCase().indexOf('titimp') > -1) // titimp cell + { + if(cell.special.length === 0) + $cell.innerHTML = " "; + + $cell.title = cell.name; + $cell.style.color = M["fightinfo"].colors.bone; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) + $cell.style.textShadow = '0px 0px 15px #fb753f'; + } + else if(M["fightinfo"].exotics.indexOf(cell.name) > -1) // Exotic cell { //if(cell.special.length === 0) From 4dd120fdcaaac4cf928478031a3d1c8ea6db8e6e Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 12 Apr 2018 18:42:24 +0100 Subject: [PATCH 0061/3477] mo --- modules/fight-info.js | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 3db165da7..001b3249d 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -93,6 +93,7 @@ // Cell data var cell = cells[i]; + $cell.title = cell.name; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { @@ -104,17 +105,45 @@ $cell.style.textShadow = '0px 0px 15px #ffffff'; } + //Map Imports (replaces original cell contents cause of some fucked refresh thing that I couldn't fix) + else if(cell.name.toLowerCase().indexOf('goblimp') > -1) // feyimp cell + { + $cell.innerHTML = " "; + //$cell.title = cell.name; + $cell.style.textShadow = '0px 0px 15px #fb753f'; + } + + else if(cell.name.toLowerCase().indexOf('flutimp') > -1) // titimp cell + { + $cell.innerHTML = " "; + //$cell.title = cell.name; + $cell.style.textShadow = '0px 0px 15px #fb753f'; + } + + else if(cell.name.toLowerCase().indexOf('jestimp') > -1) // titimp cell + { + $cell.innerHTML = " "; + //$cell.title = cell.name; + $cell.style.textShadow = '0px 0px 15px #fb753f'; + } + else if(cell.name.toLowerCase().indexOf('titimp') > -1) // titimp cell { - if(cell.special.length === 0) - $cell.innerHTML = " "; + $cell.innerHTML = " "; + //$cell.title = cell.name; + $cell.style.textShadow = '0px 0px 15px #fb753f'; + } - $cell.title = cell.name; - $cell.style.color = M["fightinfo"].colors.bone; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) + else if(cell.name.toLowerCase().indexOf('chronoimp') > -1) // titimp cell + { + $cell.innerHTML = " "; + //$cell.title = cell.name; $cell.style.textShadow = '0px 0px 15px #fb753f'; } - else if(M["fightinfo"].exotics.indexOf(cell.name) > -1) // Exotic cell + + //World Imports (Adds second icon to the cells, doesn't seem to have same bug as maps do...) + /*else if(M["fightinfo"].exotics.indexOf(cell.name) > -1) // Exotic cell { //if(cell.special.length === 0) $cell.innerHTML += " "; @@ -122,7 +151,7 @@ $cell.title = cell.name; //$cell.style.color = M["fightinfo"].colors.exotic; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) $cell.style.textShadow = '0px 0px 15px #fb753f'; - } + }*/ else if(M["fightinfo"].powerful.indexOf(cell.name) > -1) // Powerful imp { From 9c2588b26fa1f0149a819ab2d43c50357c6f87cd Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 12 Apr 2018 19:00:58 +0100 Subject: [PATCH 0062/3477] only chrono works atm... --- modules/fight-info.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 001b3249d..266da962d 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -108,28 +108,28 @@ //Map Imports (replaces original cell contents cause of some fucked refresh thing that I couldn't fix) else if(cell.name.toLowerCase().indexOf('goblimp') > -1) // feyimp cell { - $cell.innerHTML = " "; + $cell.innerHTML = " "; //$cell.title = cell.name; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('flutimp') > -1) // titimp cell { - $cell.innerHTML = " "; + $cell.innerHTML = " "; //$cell.title = cell.name; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('jestimp') > -1) // titimp cell { - $cell.innerHTML = " "; + $cell.innerHTML = " "; //$cell.title = cell.name; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('titimp') > -1) // titimp cell { - $cell.innerHTML = " "; + $cell.innerHTML = " "; //$cell.title = cell.name; $cell.style.textShadow = '0px 0px 15px #fb753f'; } From 0d33b3604fe2f88ae4be8a9a2504027189544b9c Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 12 Apr 2018 22:39:54 +0100 Subject: [PATCH 0063/3477] Individual icons for each import --- modules/fight-info.js | 61 +++++++++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 266da962d..b2c0eebc6 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -106,43 +106,70 @@ } //Map Imports (replaces original cell contents cause of some fucked refresh thing that I couldn't fix) - else if(cell.name.toLowerCase().indexOf('goblimp') > -1) // feyimp cell + else if(cell.name.toLowerCase().indexOf('goblimp') > -1) // goblimp cell { - $cell.innerHTML = " "; - //$cell.title = cell.name; + $cell.innerHTML = " "; $cell.style.textShadow = '0px 0px 15px #fb753f'; } - else if(cell.name.toLowerCase().indexOf('flutimp') > -1) // titimp cell + else if(cell.name.toLowerCase().indexOf('flutimp') > -1) // flutimp cell { - $cell.innerHTML = " "; - //$cell.title = cell.name; + $cell.innerHTML = " "; $cell.style.textShadow = '0px 0px 15px #fb753f'; } - else if(cell.name.toLowerCase().indexOf('jestimp') > -1) // titimp cell + else if(cell.name.toLowerCase().indexOf('jestimp') > -1) // jestimp cell { - $cell.innerHTML = " "; - //$cell.title = cell.name; + $cell.innerHTML = " "; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('titimp') > -1) // titimp cell { - $cell.innerHTML = " "; - //$cell.title = cell.name; + $cell.innerHTML = " "; $cell.style.textShadow = '0px 0px 15px #fb753f'; } - else if(cell.name.toLowerCase().indexOf('chronoimp') > -1) // titimp cell + else if(cell.name.toLowerCase().indexOf('chronoimp') > -1) // chronoimp cell { - $cell.innerHTML = " "; - //$cell.title = cell.name; + $cell.innerHTML = " "; $cell.style.textShadow = '0px 0px 15px #fb753f'; } //World Imports (Adds second icon to the cells, doesn't seem to have same bug as maps do...) + else if(cell.name.toLowerCase().indexOf('feyimp') > -1) // feyimp cell + { + $cell.innerHTML += " "; + $cell.style.textShadow = '0px 0px 15px #fb753f'; + } + + else if(cell.name.toLowerCase().indexOf('tauntimp') > -1) // titimp cell + { + $cell.innerHTML += " "; + $cell.style.textShadow = '0px 0px 15px #fb753f'; + } + + else if(cell.name.toLowerCase().indexOf('venimp') > -1) // titimp cell + { + $cell.innerHTML += " "; + $cell.style.textShadow = '0px 0px 15px #fb753f'; + } + + else if(cell.name.toLowerCase().indexOf('whipimp') > -1) // titimp cell + { + $cell.innerHTML += " "; + $cell.style.textShadow = '0px 0px 15px #fb753f'; + } + + else if(cell.name.toLowerCase().indexOf('magnimp') > -1) // titimp cell + { + $cell.innerHTML += " "; + $cell.style.textShadow = '0px 0px 15px #fb753f'; + } + + + /*else if(M["fightinfo"].exotics.indexOf(cell.name) > -1) // Exotic cell { //if(cell.special.length === 0) @@ -164,7 +191,7 @@ } //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) - if(cell.name.toLowerCase().indexOf('poison') > -1) // Poison Token cell + else if(cell.name.toLowerCase().indexOf('poison') > -1) // Poison Token cell { if(cell.special.length === 0) $cell.innerHTML = " "; @@ -173,7 +200,7 @@ //$cell.style.color = M["fightinfo"].colors.exotic; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) $cell.style.textShadow = '0px 0px 10px #ffffff'; } - if(cell.name.toLowerCase().indexOf('wind') > -1) // Wind Token cell + else if(cell.name.toLowerCase().indexOf('wind') > -1) // Wind Token cell { if(cell.special.length === 0) $cell.innerHTML = " "; @@ -182,7 +209,7 @@ //$cell.style.color = M["fightinfo"].colors.exotic; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) $cell.style.textShadow = '0px 0px 10px #ffffff'; } - if(cell.name.toLowerCase().indexOf('ice') > -1) // Ice Token cell + else if(cell.name.toLowerCase().indexOf('ice') > -1) // Ice Token cell { if(cell.special.length === 0) $cell.innerHTML = " "; From 72d7eea0c9db357cbdb5ca3d513656565ba428e4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 12 Apr 2018 23:01:43 +0100 Subject: [PATCH 0064/3477] Update .user.js --- .user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.user.js b/.user.js index 0ef659162..e47110a79 100644 --- a/.user.js +++ b/.user.js @@ -1,6 +1,6 @@ // ==UserScript== -// @name AutoTrimps-genBTC -// @version 2.1.6.9-genbtc-3-23-2018 +// @name AutoTrimps-kfro +// @version 1.0-kfro // @namespace https://genbtc.github.io/AutoTrimps // @updateURL https://genbtc.github.io/AutoTrimps/.user.js // @description Automate all the trimps! From 08f393d3a49d26ed307d0fe9ac0e393a15c8613e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 12 Apr 2018 23:04:39 +0100 Subject: [PATCH 0065/3477] Update .user.js --- .user.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.user.js b/.user.js index e47110a79..d1709a7dd 100644 --- a/.user.js +++ b/.user.js @@ -1,20 +1,20 @@ // ==UserScript== // @name AutoTrimps-kfro // @version 1.0-kfro -// @namespace https://genbtc.github.io/AutoTrimps -// @updateURL https://genbtc.github.io/AutoTrimps/.user.js +// @namespace https://KFrowde.github.io/AutoTrimps +// @updateURL https://KFrowde.github.io/AutoTrimps/.user.js // @description Automate all the trimps! // @author zininzinin, spindrjr, Ishkaru, genBTC // @include *trimps.github.io* // @include *kongregate.com/games/GreenSatellite/trimps -// @connect *genbtc.github.io/AutoTrimps* +// @connect *KFrowde.github.io/AutoTrimps* // @connect *trimps.github.io* // @connect self // @grant none // ==/UserScript== var script = document.createElement('script'); -script.id = 'AutoTrimps-script'; +script.id = 'AutoTrimps-KFrowde'; //This can be edited to point to your own Github Repository URL. script.src = 'https://kfrowde.github.io/AutoTrimps/AutoTrimps2.js'; //script.setAttribute('crossorigin',"use-credentials"); From c99d9ed0715730cdfd198467242f5f707a63c75a Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 18:04:58 +0100 Subject: [PATCH 0066/3477] try using badName var instead of cell.name --- modules/fight-info.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index b2c0eebc6..d84a1e2f2 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -93,14 +93,13 @@ // Cell data var cell = cells[i]; - $cell.title = cell.name; + $cell.title = badName; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { if(cell.special.length === 0) $cell.innerHTML = " "; - $cell.title = cell.name; //$cell.style.color = M["fightinfo"].colors.bone; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) $cell.style.textShadow = '0px 0px 15px #ffffff'; } @@ -182,11 +181,7 @@ else if(M["fightinfo"].powerful.indexOf(cell.name) > -1) // Powerful imp { - if(cell.special.length === 0) - $cell.innerHTML = " "; - - $cell.title = cell.name; - //$cell.style.color = M["fightinfo"].colors.powerful; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) + $cell.innerHTML += " "; $cell.style.textShadow = '0px 0px 15px #8c0000'; } From 72b1edd018cee8daed23a09bba97f9d09fcb5516 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 18:10:33 +0100 Subject: [PATCH 0067/3477] test --- modules/fight-info.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index d84a1e2f2..06135da59 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -93,7 +93,8 @@ // Cell data var cell = cells[i]; - $cell.title = badName; + //Tooltip on world cells + $cell.title = document.getElementById("badGuyName").innerHTML; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From 7c138d6b5bb360a0ea6f2ff63eeb064f6b9ece9f Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 18:40:46 +0100 Subject: [PATCH 0068/3477] qwert --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 06135da59..49df005c9 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -94,7 +94,7 @@ var cell = cells[i]; //Tooltip on world cells - $cell.title = document.getElementById("badGuyName").innerHTML; + $cell.title = document.getElementById("badGuyMutation").innerHTML; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From 13c5d5b1d67becc7930e40b26f95603a096a9f12 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 18:42:30 +0100 Subject: [PATCH 0069/3477] innertext? --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 49df005c9..39df99c0b 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -94,7 +94,7 @@ var cell = cells[i]; //Tooltip on world cells - $cell.title = document.getElementById("badGuyMutation").innerHTML; + $cell.title = document.getElementById("badGuyMutation").innerText; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From 245d1095eb6515d27144a414504ee5155c06d815 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 18:44:42 +0100 Subject: [PATCH 0070/3477] qwert --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 39df99c0b..23e815998 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -94,7 +94,7 @@ var cell = cells[i]; //Tooltip on world cells - $cell.title = document.getElementById("badGuyMutation").innerText; + $cell.title = document.getElementById("badName").innerHTML; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From a3e83fcf42970d0a761db05e7303796dce58c4b8 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 18:48:20 +0100 Subject: [PATCH 0071/3477] meh --- modules/fight-info.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 23e815998..be2014323 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -94,7 +94,8 @@ var cell = cells[i]; //Tooltip on world cells - $cell.title = document.getElementById("badName").innerHTML; + var badName; + $cell.title = badName; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From 01c26fae8d0a5d28d7478b81f34b65799f52db33 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 18:53:34 +0100 Subject: [PATCH 0072/3477] qwerty --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index be2014323..0d2bb2756 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -94,7 +94,7 @@ var cell = cells[i]; //Tooltip on world cells - var badName; + var badName = document.getElementById("badGuyName").innerHTML; $cell.title = badName; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell From 4a54496fcf7cd4a27b6abafb2bd73517558a826e Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:09:30 +0100 Subject: [PATCH 0073/3477] qwerty --- modules/fight-info.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 0d2bb2756..080a90bfc 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -94,8 +94,8 @@ var cell = cells[i]; //Tooltip on world cells - var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = badName; + //var badName = document.getElementById("badGuyName").innerHTML; + $cell.title = document.getElementByID("mutationEffects[effectName].text".innerHTML; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From 24024da15b16171a64c12d619e7e09292c66be9e Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:11:52 +0100 Subject: [PATCH 0074/3477] qwerty --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 080a90bfc..d11950b7c 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,7 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = document.getElementByID("mutationEffects[effectName].text".innerHTML; + $cell.title = document.getElementByID("mutationEffects[effectName].text").innerHTML; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From f5721fa3bcd2ed7e34def63f35faa7649b295f46 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:14:29 +0100 Subject: [PATCH 0075/3477] typo --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index d11950b7c..197cc879c 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,7 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = document.getElementByID("mutationEffects[effectName].text").innerHTML; + $cell.title = document.getElementById("mutationEffects[effectName].text").innerHTML; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From 2ab112d3d0d66b9b0ada7ee60acbcaa92d893f52 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:18:11 +0100 Subject: [PATCH 0076/3477] qwerty --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 197cc879c..8f6d0850c 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,7 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = document.getElementById("mutationEffects[effectName].text").innerHTML; + $cell.title = document.getElementById("mutationEffects[effectName].text"); if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From 5ecf4da56ed48a4bdacb2e5473cda42cede984d2 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:30:08 +0100 Subject: [PATCH 0077/3477] qwerty --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 8f6d0850c..dc69124f4 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,7 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = document.getElementById("mutationEffects[effectName].text"); + $cell.title = document.getElementById("mutationEffects"); if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From 640b3ea4de7dbe7fea213e71b51b7666aab47a1c Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:32:40 +0100 Subject: [PATCH 0078/3477] Qwerty --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index dc69124f4..aa50e4664 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,7 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = document.getElementById("mutationEffects"); + $cell.title = document.getElementById("badName"); if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From e1219bd2cb84b4eceb27d14f2190acaab4448671 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:35:03 +0100 Subject: [PATCH 0079/3477] qwerty --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index aa50e4664..0c74d0493 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,7 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = document.getElementById("badName"); + $cell.title = document.getElementById("badGuyName"); if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From 44b0e62d973af142b162ede0b140ee0927eb79e0 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:37:34 +0100 Subject: [PATCH 0080/3477] meh --- modules/fight-info.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 0c74d0493..4da602881 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,13 +95,11 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = document.getElementById("badGuyName"); + $cell.title = document.getElementById("corrupted").innerHTML; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { - if(cell.special.length === 0) $cell.innerHTML = " "; - //$cell.style.color = M["fightinfo"].colors.bone; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) $cell.style.textShadow = '0px 0px 15px #ffffff'; } From 249997ea2f8db87922cdd6faaf26faff37b7020c Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:40:33 +0100 Subject: [PATCH 0081/3477] qwerty --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 4da602881..5608c9ff9 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,7 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = document.getElementById("corrupted").innerHTML; + $cell.title = document.getElementById("cell.corrupted").innerHTML; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From 629e92a03e09bc54b7df275f5898161d0184345f Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:41:34 +0100 Subject: [PATCH 0082/3477] no innnerHTML --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 5608c9ff9..62278730c 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,7 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = document.getElementById("cell.corrupted").innerHTML; + $cell.title = document.getElementById("cell.corrupted"); if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From 3b8a3000c3e9052e7941d1d0d8ac0f6cd7677042 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:45:57 +0100 Subject: [PATCH 0083/3477] qwerty --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 62278730c..0d6f99578 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,7 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = document.getElementById("cell.corrupted"); + $cell.title = document.getElementById("cell.corrupted").innerText; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From ba0ba95eacbdb5a6ec35b6335476311ba3b5b4eb Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:50:10 +0100 Subject: [PATCH 0084/3477] hmm --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 0d6f99578..de9722d33 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,7 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = document.getElementById("cell.corrupted").innerText; + $cell.title = cell.corrupted; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From 4fa424a75062e30cf46ab8ea4c87058ab7fe9c64 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:55:02 +0100 Subject: [PATCH 0085/3477] IT WORKS --- modules/fight-info.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index de9722d33..d352e5cb5 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,8 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = cell.corrupted; + $cell.title = cell.name + cell.corrupted; + if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { From c3576bd37b2f4eb036dc4eacaccd4fe939b714a5 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 19:58:26 +0100 Subject: [PATCH 0086/3477] try to add a space --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index d352e5cb5..55c50367b 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,7 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = cell.name + cell.corrupted; + $cell.title = cell.name&nsbp + cell.corrupted; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell From d9ba2f791a1d3fab7613e71ceea2b0849795f3b2 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 20:03:13 +0100 Subject: [PATCH 0087/3477] add space --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 55c50367b..b96128c93 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,7 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = cell.name&nsbp + cell.corrupted; + $cell.title = cell.name + " " + cell.corrupted; if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell From 8dac97f67996aafcf8e2d56e89d74be1f99983a9 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 20:12:27 +0100 Subject: [PATCH 0088/3477] try new things --- modules/fight-info.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index b96128c93..a945c13cf 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,7 +95,11 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - $cell.title = cell.name + " " + cell.corrupted; + if((cell.corrupted != "undefined") && (cell.corrupted != "none")) + { + $cell.title = cell.name + " " + cell.corrupted; + } + else{$cell.title = cell.name;} if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell From 550e3bf4d979bd5149b0cf21f9029005561dcc08 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 20:17:33 +0100 Subject: [PATCH 0089/3477] try Ponan_pinoy's changes --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index a945c13cf..7eef639ed 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -97,7 +97,7 @@ //var badName = document.getElementById("badGuyName").innerHTML; if((cell.corrupted != "undefined") && (cell.corrupted != "none")) { - $cell.title = cell.name + " " + cell.corrupted; + $cell.title = `${cell.name} ${mutationEffects[cell.name].title}`; } else{$cell.title = cell.name;} From 7c50556aa692a5b5d4b0df5326c9bee0e8b69716 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 20:38:11 +0100 Subject: [PATCH 0090/3477] try changing cell.name --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 7eef639ed..ae1046d53 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -97,7 +97,7 @@ //var badName = document.getElementById("badGuyName").innerHTML; if((cell.corrupted != "undefined") && (cell.corrupted != "none")) { - $cell.title = `${cell.name} ${mutationEffects[cell.name].title}`; + $cell.title = `${cell.name} ${mutationEffects[cell.corrupted].title}`; } else{$cell.title = cell.name;} From 6c642e44af93410b2e1d5d33875995079e01f34b Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 20:59:42 +0100 Subject: [PATCH 0091/3477] qwerty --- modules/fight-info.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index ae1046d53..54ea9372c 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -95,11 +95,11 @@ //Tooltip on world cells //var badName = document.getElementById("badGuyName").innerHTML; - if((cell.corrupted != "undefined") && (cell.corrupted != "none")) - { + //if((cell.corrupted != "undefined") && (cell.corrupted != "none")) + //{ $cell.title = `${cell.name} ${mutationEffects[cell.corrupted].title}`; - } - else{$cell.title = cell.name;} + //} + //else{$cell.title = cell.name;} if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell From cbcf77adebdaab51ed2812a52f7283d83524c236 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 21:03:45 +0100 Subject: [PATCH 0092/3477] try to fix it breaking --- modules/fight-info.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 54ea9372c..910b92f2b 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -94,12 +94,11 @@ var cell = cells[i]; //Tooltip on world cells - //var badName = document.getElementById("badGuyName").innerHTML; - //if((cell.corrupted != "undefined") && (cell.corrupted != "none")) - //{ + if(cell.corrupted) + { $cell.title = `${cell.name} ${mutationEffects[cell.corrupted].title}`; - //} - //else{$cell.title = cell.name;} + } + else{$cell.title = cell.name;} if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell @@ -144,31 +143,31 @@ //World Imports (Adds second icon to the cells, doesn't seem to have same bug as maps do...) else if(cell.name.toLowerCase().indexOf('feyimp') > -1) // feyimp cell { - $cell.innerHTML += " "; + $cell.innerHTML += ` `; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('tauntimp') > -1) // titimp cell { - $cell.innerHTML += " "; + $cell.innerHTML += ` `; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('venimp') > -1) // titimp cell { - $cell.innerHTML += " "; + $cell.innerHTML += ` `; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('whipimp') > -1) // titimp cell { - $cell.innerHTML += " "; + $cell.innerHTML += ` `; $cell.style.textShadow = '0px 0px 15px #fb753f'; } - else if(cell.name.toLowerCase().indexOf('magnimp') > -1) // titimp cell + else if(cell.name.toLowerCase().indexOf('magnimp') > -1) // magnimp cell { - $cell.innerHTML += " "; + $cell.innerHTML += ` `; $cell.style.textShadow = '0px 0px 15px #fb753f'; } From 6be41eb0620413eb93acfa6665f35d4998b2c5c0 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 21:08:46 +0100 Subject: [PATCH 0093/3477] try to remove 'emptiness, and preserve tokens of nature --- modules/fight-info.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 910b92f2b..fff7d4793 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -94,11 +94,11 @@ var cell = cells[i]; //Tooltip on world cells - if(cell.corrupted) + if(cell.corrupted != ("emptiness"||"null"||"undefined")) { - $cell.title = `${cell.name} ${mutationEffects[cell.corrupted].title}`; + $cell.title += ` \- ${cell.name} ${mutationEffects[cell.corrupted].title}`; } - else{$cell.title = cell.name;} + else{$cell.title += ` \- cell.name`;} if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell From 293a864e5e61def06e8f5c1f0c79f385dff38c23 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 21:25:29 +0100 Subject: [PATCH 0094/3477] Try and fix emptiness --- modules/fight-info.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index fff7d4793..524f5a709 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -94,11 +94,14 @@ var cell = cells[i]; //Tooltip on world cells - if(cell.corrupted != ("emptiness"||"null"||"undefined")) - { - $cell.title += ` \- ${cell.name} ${mutationEffects[cell.corrupted].title}`; - } - else{$cell.title += ` \- cell.name`;} + if(cell.corrupted != (null || "Emptiness")) + { + $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; + } + else + { + $cell.title += `cell.name`; + } if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell From c372585d11b82985d04afa5f9b66b0a289a37550 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 21:32:33 +0100 Subject: [PATCH 0095/3477] Grabz' suggestion --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 524f5a709..c1f70f4ed 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -94,7 +94,7 @@ var cell = cells[i]; //Tooltip on world cells - if(cell.corrupted != (null || "Emptiness")) + if(cell.corrupted != null && cell.corrupted !== "Emptiness") { $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; } From 79f825f753a77f631be2f7b734e905b73f8add7a Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 21:40:59 +0100 Subject: [PATCH 0096/3477] 75% working now --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index c1f70f4ed..9a02fe27c 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -100,7 +100,7 @@ } else { - $cell.title += `cell.name`; + $cell.title += ` ${cell.name}`; } From ca023f9cf90b758755d17748ed59a68564e4254e Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 21:45:55 +0100 Subject: [PATCH 0097/3477] 80% --- modules/fight-info.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 9a02fe27c..eabfa5997 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -94,13 +94,17 @@ var cell = cells[i]; //Tooltip on world cells - if(cell.corrupted != null && cell.corrupted !== "Emptiness") + if(cell.corrupted != null && cell.corrupted !== "none") { $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; } + else if(cell.title !== 0) + { + $cell.title += ` - ${cell.name}`; + } else { - $cell.title += ` ${cell.name}`; + $cell.title == ` '${cell.name}'`; } From fab4e44ea00577b788641282995b3f26d64c9142 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 21:48:11 +0100 Subject: [PATCH 0098/3477] 80% --- modules/fight-info.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index eabfa5997..4ccd07cab 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -98,13 +98,13 @@ { $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; } - else if(cell.title !== 0) + else if($cell.title === 0) { - $cell.title += ` - ${cell.name}`; + $cell.title += `${cell.name}`; } else { - $cell.title == ` '${cell.name}'`; + $cell.title == ` \- ${cell.name}`; } From e268415b2c44af4a4c8e1465d82e54651e3b3b71 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 21:51:02 +0100 Subject: [PATCH 0099/3477] meh --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 4ccd07cab..c4bd2118c 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -98,7 +98,7 @@ { $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; } - else if($cell.title === 0) + else if($cell.name === 0) { $cell.title += `${cell.name}`; } From a7234c2bffb540c8a99ff138115838425915f58a Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 21:58:37 +0100 Subject: [PATCH 0100/3477] 85% --- modules/fight-info.js | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index c4bd2118c..47155fe72 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -98,13 +98,9 @@ { $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; } - else if($cell.name === 0) - { - $cell.title += `${cell.name}`; - } else { - $cell.title == ` \- ${cell.name}`; + $cell.title == ` ${cell.name}`; } @@ -197,31 +193,21 @@ } //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) - else if(cell.name.toLowerCase().indexOf('poison') > -1) // Poison Token cell + else if(cell.title.toLowerCase().indexOf('poison') > -1) // Poison Token cell { - if(cell.special.length === 0) - $cell.innerHTML = " "; - - $cell.title = cell.name; - //$cell.style.color = M["fightinfo"].colors.exotic; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) + $cell.innerHTML += ` ` ; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.name.toLowerCase().indexOf('wind') > -1) // Wind Token cell - { - if(cell.special.length === 0) - $cell.innerHTML = " "; - $cell.title = cell.name; - //$cell.style.color = M["fightinfo"].colors.exotic; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) + else if(cell.title.toLowerCase().indexOf('wind') > -1) // Wind Token cell + { + $cell.innerHTML = ` `; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.name.toLowerCase().indexOf('ice') > -1) // Ice Token cell - { - if(cell.special.length === 0) - $cell.innerHTML = " "; - $cell.title = cell.name; - //$cell.style.color = M["fightinfo"].colors.exotic; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) + else if(cell.title.toLowerCase().indexOf('ice') > -1) // Ice Token cell + { + $cell.innerHTML = ` `; $cell.style.textShadow = '0px 0px 10px #ffffff'; } } From b3d1065d9e63e3d0846432690f27977cbd6e092a Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 22:39:25 +0100 Subject: [PATCH 0101/3477] test add spaces + cell title on non-corrupt --- modules/fight-info.js | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 47155fe72..19660b379 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -100,44 +100,50 @@ } else { - $cell.title == ` ${cell.name}`; + $cell.title == cell.name; } + //Glyphs if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { - $cell.innerHTML = " "; - //$cell.style.color = M["fightinfo"].colors.bone; //(This changes the colour of the glyph - bad bc it overrides trimps and looks bad against corruption etc) + if(cell.special.length !== 0){$cell.innerHTML += ' ';} + $cell.innerHTML += ``; $cell.style.textShadow = '0px 0px 15px #ffffff'; } //Map Imports (replaces original cell contents cause of some fucked refresh thing that I couldn't fix) else if(cell.name.toLowerCase().indexOf('goblimp') > -1) // goblimp cell { + if(cell.special.length !== 0){$cell.innerHTML += ' ';} $cell.innerHTML = " "; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('flutimp') > -1) // flutimp cell { + if(cell.special.length !== 0){$cell.innerHTML += ' ';} $cell.innerHTML = " "; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('jestimp') > -1) // jestimp cell { + if(cell.special.length !== 0){$cell.innerHTML += ' ';} $cell.innerHTML = " "; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('titimp') > -1) // titimp cell { + if(cell.special.length !== 0){$cell.innerHTML += ' ';} $cell.innerHTML = " "; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('chronoimp') > -1) // chronoimp cell { + if(cell.special.length !== 0){$cell.innerHTML += ' ';} $cell.innerHTML = " "; $cell.style.textShadow = '0px 0px 15px #fb753f'; } @@ -146,31 +152,36 @@ //World Imports (Adds second icon to the cells, doesn't seem to have same bug as maps do...) else if(cell.name.toLowerCase().indexOf('feyimp') > -1) // feyimp cell { - $cell.innerHTML += ` `; + if(cell.special.length !== 0){$cell.innerHTML += ' ';} + $cell.innerHTML += ``; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('tauntimp') > -1) // titimp cell { - $cell.innerHTML += ` `; + if(cell.special.length !== 0){$cell.innerHTML += ' ';} + $cell.innerHTML += ``; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('venimp') > -1) // titimp cell { - $cell.innerHTML += ` `; + if(cell.special.length !== 0){$cell.innerHTML += ' ';} + $cell.innerHTML += ``; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('whipimp') > -1) // titimp cell { - $cell.innerHTML += ` `; + if(cell.special.length !== 0){$cell.innerHTML += ' ';} + $cell.innerHTML += ``; $cell.style.textShadow = '0px 0px 15px #fb753f'; } else if(cell.name.toLowerCase().indexOf('magnimp') > -1) // magnimp cell { - $cell.innerHTML += ` `; + if(cell.special.length !== 0){$cell.innerHTML += ' ';} + $cell.innerHTML += ``; $cell.style.textShadow = '0px 0px 15px #fb753f'; } @@ -193,21 +204,21 @@ } //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) - else if(cell.title.toLowerCase().indexOf('poison') > -1) // Poison Token cell + else if(cell.name.toLowerCase().indexOf('poison') > -1) // Poison Token cell { - $cell.innerHTML += ` ` ; + $cell.innerHTML += `` ; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.title.toLowerCase().indexOf('wind') > -1) // Wind Token cell + else if(cell.name.toLowerCase().indexOf('wind') > -1) // Wind Token cell { - $cell.innerHTML = ` `; + $cell.innerHTML = ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.title.toLowerCase().indexOf('ice') > -1) // Ice Token cell + else if(cell.name.toLowerCase().indexOf('ice') > -1) // Ice Token cell { - $cell.innerHTML = ` `; + $cell.innerHTML = ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } } From 439fa22c2a1b6ccbf6a043f2f889afa4b2bcd542 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 22:44:04 +0100 Subject: [PATCH 0102/3477] seems to work a bit better --- modules/fight-info.js | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 19660b379..d0aae55a6 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -99,9 +99,7 @@ $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; } else - { $cell.title == cell.name; - } //Glyphs @@ -112,7 +110,14 @@ $cell.style.textShadow = '0px 0px 15px #ffffff'; } - //Map Imports (replaces original cell contents cause of some fucked refresh thing that I couldn't fix) + else if(M["fightinfo"].powerful.indexOf(cell.name) > -1) // Powerful imps + { + if(cell.special.length !== 0){$cell.innerHTML += ' ';} + $cell.innerHTML += " "; + $cell.style.textShadow = '0px 0px 15px #8c0000'; + } + + //Map Imports else if(cell.name.toLowerCase().indexOf('goblimp') > -1) // goblimp cell { if(cell.special.length !== 0){$cell.innerHTML += ' ';} @@ -149,7 +154,7 @@ } - //World Imports (Adds second icon to the cells, doesn't seem to have same bug as maps do...) + //World Imports else if(cell.name.toLowerCase().indexOf('feyimp') > -1) // feyimp cell { if(cell.special.length !== 0){$cell.innerHTML += ' ';} @@ -197,28 +202,24 @@ $cell.style.textShadow = '0px 0px 15px #fb753f'; }*/ - else if(M["fightinfo"].powerful.indexOf(cell.name) > -1) // Powerful imp - { - $cell.innerHTML += " "; - $cell.style.textShadow = '0px 0px 15px #8c0000'; - } //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) - else if(cell.name.toLowerCase().indexOf('poison') > -1) // Poison Token cell + else if(cell.title === "Token of Poison") // Poison Token cell { - $cell.innerHTML += `` ; + $cell.innerHTML += `` ; $cell.style.textShadow = '0px 0px 10px #ffffff'; } else if(cell.name.toLowerCase().indexOf('wind') > -1) // Wind Token cell { - $cell.innerHTML = ``; + $cell.innerHTML = ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.name.toLowerCase().indexOf('ice') > -1) // Ice Token cell + else if(cell.title === "Token of Ice") // Ice Token cell { - $cell.innerHTML = ``; + if(cell.special.length !== 0){$cell.innerHTML += ' ';} + $cell.innerHTML = ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } } From 4367d7d5aefab395870a3e2bc0feaab48a647bdc Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 22:46:36 +0100 Subject: [PATCH 0103/3477] = --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index d0aae55a6..6baed8c99 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -99,7 +99,7 @@ $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; } else - $cell.title == cell.name; + $cell.title = cell.name; //Glyphs From 41686a1fa14065b9077b7a94d88fcb62c0512c83 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 22:55:15 +0100 Subject: [PATCH 0104/3477] qwerty --- modules/fight-info.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 6baed8c99..11a655bf8 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -93,15 +93,6 @@ // Cell data var cell = cells[i]; - //Tooltip on world cells - if(cell.corrupted != null && cell.corrupted !== "none") - { - $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; - } - else - $cell.title = cell.name; - - //Glyphs if(cell.name.toLowerCase().indexOf('skele') > -1) // Skeletimp cell { @@ -222,6 +213,14 @@ $cell.innerHTML = ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } + + //Tooltip on world cells + if(cell.corrupted != null && cell.corrupted !== "none") + { + $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; + } + else + $cell.title += ` ${cell.name}`; } } From f46aedd6f47989c748e5e2dc87d6e2b6d6d2881f Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 23:08:12 +0100 Subject: [PATCH 0105/3477] qwerty --- modules/fight-info.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 11a655bf8..b88269d7f 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -195,19 +195,19 @@ //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) - else if(cell.title === "Token of Poison") // Poison Token cell + else if(cell.title.toLowerCase().indexOf('poison') > -1) // Poison Token cell { $cell.innerHTML += `` ; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.name.toLowerCase().indexOf('wind') > -1) // Wind Token cell + else if(cell.title.toLowerCase().indexOf('wind') > -1) // Wind Token cell { $cell.innerHTML = ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.title === "Token of Ice") // Ice Token cell + else if(cell.title.toLowerCase().indexOf('ice') > -1) // Ice Token cell { if(cell.special.length !== 0){$cell.innerHTML += ' ';} $cell.innerHTML = ``; From 9caf5fbc80dfcc92223fb09923055f4b39cae0e6 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 23:13:40 +0100 Subject: [PATCH 0106/3477] qwerty --- modules/fight-info.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index b88269d7f..68e5f899c 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -195,19 +195,19 @@ //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) - else if(cell.title.toLowerCase().indexOf('poison') > -1) // Poison Token cell + else if(cell.title != undefined && cell.title.toLowerCase().indexOf('poison') > -1) > -1) // Poison Token cell { $cell.innerHTML += `` ; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.title.toLowerCase().indexOf('wind') > -1) // Wind Token cell + else if(cell.title != undefined && cell.title.toLowerCase().indexOf('wind') > -1) // Wind Token cell { $cell.innerHTML = ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.title.toLowerCase().indexOf('ice') > -1) // Ice Token cell + else if(cell.title != undefined && cell.title.toLowerCase().indexOf('ice') > -1) // Ice Token cell { if(cell.special.length !== 0){$cell.innerHTML += ' ';} $cell.innerHTML = ``; From f4e8cd174b4e49acce31b9dfb5c15829635ccf1a Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 23:15:19 +0100 Subject: [PATCH 0107/3477] typo --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 68e5f899c..cd47d311e 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -195,7 +195,7 @@ //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) - else if(cell.title != undefined && cell.title.toLowerCase().indexOf('poison') > -1) > -1) // Poison Token cell + else if(cell.title != undefined && cell.title.toLowerCase().indexOf('poison') > -1) // Poison Token cell { $cell.innerHTML += `` ; $cell.style.textShadow = '0px 0px 10px #ffffff'; From a7d2cdb282b8f7a9d8f499776b3cb14d7ecfc923 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 23:18:13 +0100 Subject: [PATCH 0108/3477] test --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index cd47d311e..baacb2fe3 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -207,7 +207,7 @@ $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.title != undefined && cell.title.toLowerCase().indexOf('ice') > -1) // Ice Token cell + else if(cell.title != undefined) // Ice Token cell { if(cell.special.length !== 0){$cell.innerHTML += ' ';} $cell.innerHTML = ``; From d41e2f1dcf81a7f20a0edec12c6d68a52fc6bf4e Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 23:23:09 +0100 Subject: [PATCH 0109/3477] test --- modules/fight-info.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index baacb2fe3..0f3dc9210 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -203,14 +203,14 @@ else if(cell.title != undefined && cell.title.toLowerCase().indexOf('wind') > -1) // Wind Token cell { - $cell.innerHTML = ``; + $cell.innerHTML += ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } else if(cell.title != undefined) // Ice Token cell { if(cell.special.length !== 0){$cell.innerHTML += ' ';} - $cell.innerHTML = ``; + $cell.innerHTML += ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } From 639bddad71421f95db0c083df03a20e614195c05 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 23:26:20 +0100 Subject: [PATCH 0110/3477] class --- modules/fight-info.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 0f3dc9210..acdd68813 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -195,22 +195,22 @@ //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) - else if(cell.title != undefined && cell.title.toLowerCase().indexOf('poison') > -1) // Poison Token cell + else if(cell.title != undefined && cell.class.toLowerCase().indexOf('poison') > -1) // Poison Token cell { $cell.innerHTML += `` ; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.title != undefined && cell.title.toLowerCase().indexOf('wind') > -1) // Wind Token cell + else if(cell.class != undefined && cell.class.toLowerCase().indexOf('wind') > -1) // Wind Token cell { - $cell.innerHTML += ``; + $cell.innerHTML = ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.title != undefined) // Ice Token cell + else if(cell.class != undefined && cell.class.toLowerCase().indexOf('ice') > -1) // Ice Token cell { if(cell.special.length !== 0){$cell.innerHTML += ' ';} - $cell.innerHTML += ``; + $cell.innerHTML = ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } From 2e2171db818320991f56d0ae9178d58bd539c58f Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sat, 14 Apr 2018 23:40:41 +0100 Subject: [PATCH 0111/3477] class --- modules/fight-info.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index acdd68813..40a74da29 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -193,7 +193,6 @@ $cell.style.textShadow = '0px 0px 15px #fb753f'; }*/ - //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) else if(cell.title != undefined && cell.class.toLowerCase().indexOf('poison') > -1) // Poison Token cell { @@ -207,7 +206,7 @@ $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.class != undefined && cell.class.toLowerCase().indexOf('ice') > -1) // Ice Token cell + else if(className.toLowerCase().indexOf('ice') > -1) // Ice Token cell { if(cell.special.length !== 0){$cell.innerHTML += ' ';} $cell.innerHTML = ``; From c0c169d407a5c52c26b2e51881a80d144a4f99a4 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sun, 15 Apr 2018 00:02:46 +0100 Subject: [PATCH 0112/3477] classname --- modules/fight-info.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 40a74da29..ead4f45d2 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -194,19 +194,19 @@ }*/ //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) - else if(cell.title != undefined && cell.class.toLowerCase().indexOf('poison') > -1) // Poison Token cell + else if(document.getElementsByClassName("empoweredCellPoison")[0] != null) // Poison Token cell { $cell.innerHTML += `` ; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(cell.class != undefined && cell.class.toLowerCase().indexOf('wind') > -1) // Wind Token cell + else if(document.getElementsByClassName("empoweredCellWind")[0] != null) // Wind Token cell { $cell.innerHTML = ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } - else if(className.toLowerCase().indexOf('ice') > -1) // Ice Token cell + else if(document.getElementsByClassName("empoweredCellIce")[0] != null) // Ice Token cell { if(cell.special.length !== 0){$cell.innerHTML += ' ';} $cell.innerHTML = ``; From 9985629cd64bd2843b9bf5fcb01e4ca055bbf4ae Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sun, 15 Apr 2018 00:06:22 +0100 Subject: [PATCH 0113/3477] lol wtf --- modules/fight-info.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index ead4f45d2..4b62dfdb7 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -202,14 +202,14 @@ else if(document.getElementsByClassName("empoweredCellWind")[0] != null) // Wind Token cell { - $cell.innerHTML = ``; + $cell.innerHTML += ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } else if(document.getElementsByClassName("empoweredCellIce")[0] != null) // Ice Token cell { if(cell.special.length !== 0){$cell.innerHTML += ' ';} - $cell.innerHTML = ``; + $cell.innerHTML += ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; } From 7a46938cfaa98f2e586381276d46ad0706c432a3 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sun, 15 Apr 2018 00:20:46 +0100 Subject: [PATCH 0114/3477] revoke attempt at nature stuff --- modules/fight-info.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 4b62dfdb7..d195731f8 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -194,7 +194,7 @@ }*/ //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) - else if(document.getElementsByClassName("empoweredCellPoison")[0] != null) // Poison Token cell + /*else if(document.getElementsByClassName("empoweredCellPoison")[0] != null) // Poison Token cell { $cell.innerHTML += `` ; $cell.style.textShadow = '0px 0px 10px #ffffff'; @@ -211,7 +211,7 @@ if(cell.special.length !== 0){$cell.innerHTML += ' ';} $cell.innerHTML += ``; $cell.style.textShadow = '0px 0px 10px #ffffff'; - } + }*/ //Tooltip on world cells if(cell.corrupted != null && cell.corrupted !== "none") From 42407c06f48c1797c00ba6e3b06add4c1a93e1e6 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sun, 15 Apr 2018 00:26:54 +0100 Subject: [PATCH 0115/3477] revoke attempt at nature stuff --- modules/fight-info.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/fight-info.js b/modules/fight-info.js index d195731f8..bb6f719dd 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -218,6 +218,8 @@ { $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; } + else if (game.global.mapsActive) + $cell.title = `${cell.name}`; else $cell.title += ` ${cell.name}`; } From 46f4279786012946a32c46b71dcaed10389dd8cc Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sun, 15 Apr 2018 00:27:26 +0100 Subject: [PATCH 0116/3477] revoke attempt at nature stuff --- modules/fight-info.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/fight-info.js b/modules/fight-info.js index bb6f719dd..af4fb409d 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -219,7 +219,9 @@ $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; } else if (game.global.mapsActive) + { $cell.title = `${cell.name}`; + } else $cell.title += ` ${cell.name}`; } From 171a44234316c87edd349b45117453e7e1f8d64d Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sun, 15 Apr 2018 03:06:53 +0100 Subject: [PATCH 0117/3477] Finalising changes to Fight-Info module Issues: Map still loops nonstop (can't figure out how to improve the code swiffy commented out). Cause of this, overlay behaviour in maps is to REPLACE rather than add to vanilla trimp info/glyphs, otherwise you get an endless list of icons every time the script runs. Tokens of nature stuff still doesn't work... but its close. The current behaviour just slams a glyph into every cell. The code currently only puts one extra glyph into each cell. might be worth removing the else statements, and sticking with an IF? eg a token exotic imp. improved formatting for previous changes --- modules/fight-info.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index af4fb409d..d70f2fd36 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -10,10 +10,11 @@ "Improbability", "Omnipotrimp", "Mutimp", - "Hulking_Mutimp" + "Hulking_Mutimp", + "Cthulimp" ]; - // Exotic imps + // Exotic imps (This has been disabled) M["fightinfo"].exotics = [ "Feyimp", @@ -183,7 +184,7 @@ - /*else if(M["fightinfo"].exotics.indexOf(cell.name) > -1) // Exotic cell + /*else if(M["fightinfo"].exotics.indexOf(cell.name) > -1) // Exotic cell (also the Original code) { //if(cell.special.length === 0) $cell.innerHTML += " "; @@ -193,7 +194,7 @@ $cell.style.textShadow = '0px 0px 15px #fb753f'; }*/ - //This shit doesn't work and I don't know why (What is the celltitle??? is it the name of the nature? Imps are labelled Toxic/Gusty/Frozen but that didin't work either) + //This shit doesn't work and I don't know why tbh, the current behaviour spams ice glyphs everywhere /*else if(document.getElementsByClassName("empoweredCellPoison")[0] != null) // Poison Token cell { $cell.innerHTML += `` ; @@ -213,7 +214,7 @@ $cell.style.textShadow = '0px 0px 10px #ffffff'; }*/ - //Tooltip on world cells + //Tooltip on world cells, works reasonably well. special behaviour for maps cause of looping if(cell.corrupted != null && cell.corrupted !== "none") { $cell.title += `${cell.name} \- ${mutationEffects[cell.corrupted].title}`; From 93852fbe7d4f4cfc5b2efcccb535926a40ce1e7c Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Sun, 15 Apr 2018 03:18:40 +0100 Subject: [PATCH 0118/3477] Finalising changes to Fight-Info module Issues: Map still loops nonstop (can't figure out how to improve the code swiffy commented out). Cause of this, overlay behaviour in maps is to REPLACE rather than add to vanilla trimp info/glyphs, otherwise you get an endless list of icons every time the script runs. Tokens of nature stuff still doesn't work... but its close. The current behaviour just slams a glyph into every cell. The code currently only puts one extra glyph into each cell. might be worth removing the else statements, and sticking with an IF? eg a token exotic imp. improved formatting for previous changes --- modules/fight-info.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index d70f2fd36..214f74119 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -10,8 +10,7 @@ "Improbability", "Omnipotrimp", "Mutimp", - "Hulking_Mutimp", - "Cthulimp" + "Hulking_Mutimp" ]; // Exotic imps (This has been disabled) @@ -109,6 +108,11 @@ $cell.style.textShadow = '0px 0px 15px #8c0000'; } + else if(cell.name.toLowerCase().indexOf('cthulimp') > -1) // Cthulimp cell + { + $cell.style.textShadow = '0px 0px 15px #fb753f'; + } + //Map Imports else if(cell.name.toLowerCase().indexOf('goblimp') > -1) // goblimp cell { From c3664fac5e02f8cd7d66928a6605411843c1940d Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Thu, 26 Apr 2018 22:56:58 +0100 Subject: [PATCH 0119/3477] Add function for Finish Daily Z Mod to apply to Void Zone. --- SettingsGUI.js | 14 ++++++++------ modules/maps.js | 5 +++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index af489979f..da66f4165 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -250,12 +250,12 @@ function initializeAllSettings() { //Line2 createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); - createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); + createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); if (game.worldUnlocks.easterEgg) createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core'); //could really be removed?? createSetting('UsePatience', 'Enable Patience', 'Sets the default breed timer to 45 seconds if you have the Patience mastery.', 'boolean', true, null, 'Core'); - createSetting('AutoAllocatePerks', 'Auto Allocate Perks', 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. ', 'boolean', false, null, 'Core'); + createSetting('AutoAllocatePerks', 'Auto Allocate Perks', 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. ', 'boolean', false, null, 'Core'); document.getElementById('AutoAllocatePerks').parentNode.insertAdjacentHTML('afterend','
'); //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. @@ -359,9 +359,11 @@ function initializeAllSettings() { createSetting('MaxTox', 'Max Toxicity Stacks', 'Get maximum toxicity stacks before killing the improbability in each zone 60 and above. Generally only recommended for 1 run to maximize bone portal value. This setting will revert to disabled after a successful Max-Tox run + Toxicity Autoportal.', 'boolean', false, null, 'Maps'); //Line3 - createSetting('VoidMaps', 'Void Maps', '0 to disable The zone at which you want all your void maps to be cleared inclusive of the zone you type. Runs them at Cell 93 by default, unless you set a decimal value indicating the cell (example: 187.75). Use odd zones on Lead.', 'value', '0', null, "Maps"); + createSetting('VoidMaps', 'Void Maps', '0 to disable The zone at which you want all your void maps to be cleared inclusive of the zone you type. Runs them at Cell 93 by default, unless you set a decimal value indicating the cell (example: 187.75). Use odd zones on Lead.
If Daily Void Zone Mod is active, your Finish Daily Z Mod will apply to this number when a Daily is active.', 'value', '0', null, "Maps"); createSetting('RunNewVoidsUntilNew', 'New Voids Mod', '0 to disable. Positive numbers are added to your Void Map zone. -1 for no cap. This allows you to run new Void Maps obtained after your Void Map zone by adding this number to your Void Map zone.
Example Void map zone=185.75 and This setting=10. New Voids run until 197.75).
This means that any new void maps gained until Z197, cell 75 will be run. CAUTION: May severely slow you down by trying to do too-high level void maps. Default 0 (OFF).', 'value', '0', null, 'Maps'); //Should replace the two below //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); + //-1 Autograbs your Finish Daily Z Mod
0 Disables this setting
Positive Numbers add to your normal void zone on a daily
Possible number input? + createSetting('DailyVoidMod', 'Daily Void Zone Mod', 'If this is on, your daily autoportal mod (Core) will also apply to Void maps on dailies. For example, if you have void maps and autoportal set to 200 on normal runs, and your daily mod is 15, you will do voids and portal 15 zones later on a daily.', 'boolean', true, null, 'Maps'); createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. And I cba cause its a meh setting anyway. Advancing 2 zones more than doubles your income. Only useful for spire I, and IMO you may aswell actually play the game manually at SOME point. createSetting('AdvMapSpecialModifier', 'Map Special Modifier', 'EXPERIMENTAL. Attempt to select the BEST map special attacks mod. With this on, this will replace the normal behavior. If bugs, please report as this will become more default soon.', 'boolean', false, null, 'Maps'); @@ -477,16 +479,16 @@ function initializeAllSettings() { //createSetting('ExportModuleVars', 'Export Custom Variables', 'Export your custom MODULES variables.', 'infoclick', 'ExportModuleVars', null, 'Import Export'); //createSetting('ImportModuleVars', 'Import Custom Variables', 'Import your custom MODULES variables (and save).', 'infoclick', 'ImportModuleVars', null, 'Import Export'); //createSetting('ResetModuleVars', 'Reset Custom Variables', 'Reset(Delete) your custom MODULES variables, and return the script to normal. ', 'infoclick', 'ResetModuleVars', null, 'Import Export'); - + //createSetting('PlayerLevel', 'PlayerLevel', 'PlayerLevel: Indicate around what level you are. noob, low, medium, high, spire, magma, expert, z450+, z500+, endgame and so on. Might be used to control which settings are visible in the future. ', 'dropdown', "Medium", ["Noob","Low","Medium","High","Spire","Magma","Expert","z450+","z500+","EndGame"], 'Display'); /* createSetting('ATModuleListDropdown', 'Modules', 'AT Module List Dropdown: Lists all the individual modules (.js files) that have been auto-loaded. It might be possible to unload these or something in the future.', 'dropdown', ATmoduleList[0], ATmoduleList, 'Import Export'); document.getElementById('ATModuleListDropdown').multiple = true; //allow 4 multiple selections document.getElementById('ATModuleListDropdown').size = 4; - document.getElementById('ATModuleListDropdown').height = '5vw'; + document.getElementById('ATModuleListDropdown').height = '5vw'; document.getElementById('ATModuleListDropdownLabel').style.verticalAlign = 'top'; document.getElementById('ATModuleListDropdownLabel').parentNode.style.width = null; //make the next stuff fit on 1 line. - createSetting('ATModuleUnload', 'Unload Module', 'UnLoads a running module file this session', 'infoclick', 'ATModuleUnload', null, 'Import Export'); + createSetting('ATModuleUnload', 'Unload Module', 'UnLoads a running module file this session', 'infoclick', 'ATModuleUnload', null, 'Import Export'); createSetting('ATModuleLoad', 'ReLoad Module', 'Load/Reloads a module file (.js) and runs it.', 'infoclick', 'ATModuleLoad', null, 'Import Export'); */ } diff --git a/modules/maps.js b/modules/maps.js index 0e386e95a..160226b39 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -77,6 +77,11 @@ function autoMap() { var extraMapLevels = getPageSetting('AdvMapSpecialModifier') ? getExtraMapLevels() : 0; //FIND VOID MAPS LEVEL: var voidMapLevelSetting = getPageSetting('VoidMaps'); + //Add your daily zone mod onto the void maps level + var dailyVoidMod = getPageSetting('AutoFinishDailyNew'); + if ((game.global.challengeActive == "Daily") && (getPageSetting('AutoFinishDailyNew') != 999) && (getPageSetting('DailyVoidMod'))) { + (voidMapLevelSetting += dailyVoidMod); + } //decimal void maps are possible, using string function to avoid false float precision (0.29999999992). javascript can compare ints to strings anyway. var voidMapLevelSettingZone = (voidMapLevelSetting+"").split(".")[0]; var voidMapLevelSettingMap = (voidMapLevelSetting+"").split(".")[1]; From f86e89060b0f469bb65aa5459f067856404ad94d Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Fri, 27 Apr 2018 02:03:56 +0100 Subject: [PATCH 0120/3477] Add BAF3 with checks for Spire etc. Trial improvements for BAF2. --- SettingsGUI.js | 4 +- modules/fight.js | 100 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 70 insertions(+), 34 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index da66f4165..d8abd3afd 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -373,8 +373,8 @@ function initializeAllSettings() { //Combat //Subsection1Line1 - createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2',], '3-Way Button, Recommended. Will automatically handle fighting. The decision between BetterAutoFight 1 or 2 is up to your own discretion. The new BAF#2 does: A)Click fight anyway if we are dead and stuck in a loop due to Dimensional Generator and we can get away with adding time to it.(RemainingTime + ArmyAdd.Time < GeneTimer) and B) Clicks fight anyway if we are dead and have >=31 NextGroupTimer and deal with the consequences by firing genetecists afterwards. WARNING: If you autoportal with BetterAutoFight disabled, the game sits there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 1, null, "Combat"); - createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. Better Autofight 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); + createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
BAF3 = Uses vanilla autofight, and force fights when dead except in VM and Spire.
WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); + createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. AutoStance 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
0 = Always On
For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get 200 windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have 200 stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); diff --git a/modules/fight.js b/modules/fight.js index 4368395ea..d963ff18f 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -10,6 +10,7 @@ function ATselectAutoFight() { BAFsetting = getPageSetting('BetterAutoFight'); if (BAFsetting==1) betterAutoFight(); //"Better Auto Fight" (autofight.js) else if (BAFsetting==2) betterAutoFight2(); //"Better Auto Fight2" (") + else if (BAFsetting==3) betterAutoFight3(); //"Better Auto Fight3" (") else if (BAFsetting==0 && BAFsetting!=oldBAFsetting && game.global.autoBattle && game.global.pauseFight) pauseFight(); //turn on autofight on once when BAF is toggled off. else if (BAFsetting==0 && game.global.world == 1 && game.global.autoBattle && game.global.pauseFight) pauseFight(); //turn on autofight on lvl 1 if its off. else if (BAFsetting==0 && !game.global.autoBattle && game.global.soldierHealth == 0) betterAutoFight(); //use BAF as a backup for pre-Battle situations @@ -47,7 +48,8 @@ function betterAutoFight2() { pauseFight(); //Disable built-in autofight if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting) return; //sanity check. - var targetBreed = getPageSetting('GeneticistTimer'); + var spireBreed = getPageSetting('SpireBreedTimer'); + var targetBreed = (game.global.spireActive && spireBreed != -1) ? spireBreed : game.global.GeneticistassistSetting; //use custom breed value for spire var breeding = (game.resources.trimps.owned - game.resources.trimps.employed); var newSquadRdy = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; var adjustedMax = (game.portal.Coordinated.level) ? game.portal.Coordinated.currentSend : trimps.maxSoldiers; @@ -57,40 +59,74 @@ function betterAutoFight2() { //if armySend is less than half of what you have breeding, and what you have breeding is more than 10% of your total trimps. (when scientist I is incompleted) var lowLevelFight = game.resources.trimps.maxSoldiers < 0.5*breeding && breeding > 0.1*game.resources.trimps.realMax() && game.global.world <= 6 && game.global.sLevel < 1; + //accounts for the shitty rounding errors in trimp breeding with coord levels over 100 + var roundingError = (newsquadRdy && (game.global.lastBreedTime <== 1)); + + //chooses the correct patience value var breedTimerLimit = game.talents.patience.purchased && getPageSetting('UsePatience') ? 46 : 31; //Manually fight if: //game.global.soldierHealth > 0 //just fight if we're alive,or if == 0; we're dead, and also fight :P - if (!game.global.fighting) { - if (game.global.soldierHealth > 0) - battle(true); //just fight, dont speak. - else if (newSquadRdy || lowLevelFight || game.global.challengeActive == 'Watch') { - battle(true); - if (MODULES["fight"].enableDebug) - debug("AutoFight Default: New squad ready", "other"); - } - //Click Fight if we are dead and already have enough for our breed timer, and fighting would not add a significant amount of time - else if (getBreedTime() < customVars.breedTimerCutoff1 && (game.global.lastBreedTime/1000) > targetBreed) { - battle(true); - if (MODULES["fight"].enableDebug) - debug("AutoFight: BAF2 #1, breed < " + customVars.breedTimerCutoff1 + " && HiddenNextGroup > GeneTimer", "other"); - } - //AutoFight will now send Trimps to fight if it takes less than 0.5 seconds to create a new group of soldiers, if we havent bred fully yet - else if (getBreedTime() <= customVars.breedTimerCutoff2) { - battle(true); - if (MODULES["fight"].enableDebug) - debug("AutoFight: BAF2 #2, breed <= " + customVars.breedTimerCutoff2 + " s", "other"); - } - //Click fight anyway if we are dead and stuck in a loop due to Dimensional Generator and we can get away with adding time to it. - else if (getBreedTime(true)+addTime <= targetBreed && breeding>=adjustedMax && !(game.global.mapsActive && getCurrentMapObject().location == "Void")) { - battle(true); - if (MODULES["fight"].enableDebug) - debug("AutoFight: BAF2 #3, RemainingTime + ArmyAdd.Time < GeneTimer", "other"); - } - //Clicks fight anyway if we are dead and have >=breedTimerLimit NextGroupTimer and deal with the consequences by firing geneticists afterwards. - else if (game.global.soldierHealth == 0 && (game.global.lastBreedTime/1000)>=breedTimerLimit && targetBreed >= 0 && !game.jobs.Geneticist.locked && game.jobs.Geneticist.owned > 10 ) { - battle(true); - if (MODULES["fight"].enableDebug) - debug("AutoFight: BAF2 #4, NextGroupBreedTimer went over " + breedTimerLimit + " and we arent fighting.", "other"); + if (!game.global.fighting) { // !(game.global.spireActive || (game.global.mapsActive && getCurrentMapObject().location == "Void") || game.global.preMapsActive) + if (game.global.SpireActive){ + if((game.global.lastBreedtime/1000)>=targetBreed && (game.global.lastBreedtime/1000)>=breedTimerLimit) { + fightManual() + } } + else if (game.global.soldierHealth > 0) + fightManual(); //If you are not fighting but have health, fix this situation by clicking fight (fixes some weird Trimps errors) + //if max trimps, army size insignificant, or in Watch, or rounding error + else if (newSquadRdy || lowLevelFight || game.global.challengeActive == 'Watch' || roundingError) { + fightManual(); + if (MODULES["fight"].enableDebug) + debug("AutoFight Default: New squad ready", "other"); + } + //Click Fight if we are dead and already have enough for our breed timer, and fighting would not add a significant amount of time + else if (getBreedTime() < customVars.breedTimerCutoff1 && (game.global.lastBreedTime/1000) > targetBreed) { + fightManual(); + if (MODULES["fight"].enableDebug) + debug("AutoFight: BAF2 #1, breed < " + customVars.breedTimerCutoff1 + " && HiddenNextGroup > GeneTimer", "other"); + } + //AutoFight will now send Trimps to fight if it takes less than 0.5 seconds to create a new group of soldiers, if we havent bred fully yet + else if (getBreedTime() <= customVars.breedTimerCutoff2) { + fightManual(); + if (MODULES["fight"].enableDebug) + debug("AutoFight: BAF2 #2, breed <= " + customVars.breedTimerCutoff2 + " s", "other"); + } + //Click fight anyway if we are dead and stuck in a loop due to Dimensional Generator and we can get away with adding time to it. + else if (getBreedTime(true)+addTime <= targetBreed && breeding>=adjustedMax && !(game.global.mapsActive && getCurrentMapObject().location == "Void")) { + fightManual(); + if (MODULES["fight"].enableDebug) + debug("AutoFight: BAF2 #3, RemainingTime + ArmyAdd.Time < GeneTimer", "other"); + } + //Clicks fight anyway if we are dead and have >=breedTimerLimit NextGroupTimer and deal with the consequences by firing geneticists afterwards. + else if (game.global.soldierHealth == 0 && (game.global.lastBreedTime/1000)>=breedTimerLimit && targetBreed >= 0 && !game.jobs.Geneticist.locked && game.jobs.Geneticist.owned > 10 ) { + fightManual(); + if (MODULES["fight"].enableDebug) + debug("AutoFight: BAF2 #4, NextGroupBreedTimer went over " + breedTimerLimit + " and we arent fighting.", "other"); + } } } + +//NEW:: 3rd algorithm for Better Auto Fight (Basically brute force fight unless in spire or VM) +function betterAutoFight3() { + var customVars = MODULES["fight"]; + if (game.global.autoBattle && game.global.pauseFight) //check autofight available, and if it is off + pauseFight(); //activates autofight + if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive || (game.global.mapsActive && getCurrentMapObject().location == "Void")) + return; //sanity check. + if (!game.global.fighting) { + fightManual(); + } +} + +/* code borrowed from Sliverz as a starting point +if (game.global.soldierHealth == 0 && !(game.global.spireActive || (game.global.mapsActive && getCurrentMapObject().location == "Void") || game.global.preMapsActive)) { + fightManual(); + buyArmors(); + } + if (game.global.antiStacks != 45 && game.global.realBreedTime >= 45500 && !game.global.SpireActive) { + forceAbandonTrimps(); + } + if ((needPrestige || !enoughDamage) && game.global.world>=200 && (getEmpowerment() == "Ice" || (getEmpowerment() == "Wind" && game.global.realBreedTime >= 45500)) && !game.global.mapsActive && game.global.mapBonus != 10 && game.global.world!=game.options.menu.mapAtZone.setZone) { + forceAbandonTrimps(); + } */ From de7e8712f760ba2b995db3ecdaeff319cabd4a1f Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Fri, 27 Apr 2018 02:17:38 +0100 Subject: [PATCH 0121/3477] Error on line 63 --- modules/fight.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight.js b/modules/fight.js index d963ff18f..aac142882 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -60,7 +60,7 @@ function betterAutoFight2() { var lowLevelFight = game.resources.trimps.maxSoldiers < 0.5*breeding && breeding > 0.1*game.resources.trimps.realMax() && game.global.world <= 6 && game.global.sLevel < 1; //accounts for the shitty rounding errors in trimp breeding with coord levels over 100 - var roundingError = (newsquadRdy && (game.global.lastBreedTime <== 1)); + var roundingError = newsquadRdy && (game.global.lastBreedTime <== 1); //chooses the correct patience value var breedTimerLimit = game.talents.patience.purchased && getPageSetting('UsePatience') ? 46 : 31; From b8b6f3a2a566516fa75d0b5922652692bcc04f26 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Fri, 27 Apr 2018 02:19:26 +0100 Subject: [PATCH 0122/3477] rounding error var was fucked --- modules/fight.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index aac142882..71084410f 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -59,9 +59,6 @@ function betterAutoFight2() { //if armySend is less than half of what you have breeding, and what you have breeding is more than 10% of your total trimps. (when scientist I is incompleted) var lowLevelFight = game.resources.trimps.maxSoldiers < 0.5*breeding && breeding > 0.1*game.resources.trimps.realMax() && game.global.world <= 6 && game.global.sLevel < 1; - //accounts for the shitty rounding errors in trimp breeding with coord levels over 100 - var roundingError = newsquadRdy && (game.global.lastBreedTime <== 1); - //chooses the correct patience value var breedTimerLimit = game.talents.patience.purchased && getPageSetting('UsePatience') ? 46 : 31; @@ -74,8 +71,8 @@ function betterAutoFight2() { } else if (game.global.soldierHealth > 0) fightManual(); //If you are not fighting but have health, fix this situation by clicking fight (fixes some weird Trimps errors) - //if max trimps, army size insignificant, or in Watch, or rounding error - else if (newSquadRdy || lowLevelFight || game.global.challengeActive == 'Watch' || roundingError) { + //if max trimps, army size insignificant, or in Watch + else if (newSquadRdy || lowLevelFight || game.global.challengeActive == 'Watch') { fightManual(); if (MODULES["fight"].enableDebug) debug("AutoFight Default: New squad ready", "other"); From ee7a0b88cd89f4e2cbe1c9aa78bc362fdc4d8015 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Fri, 27 Apr 2018 03:01:57 +0100 Subject: [PATCH 0123/3477] get rid of void check --- modules/fight.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight.js b/modules/fight.js index 71084410f..03375b2d0 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -109,7 +109,7 @@ function betterAutoFight3() { var customVars = MODULES["fight"]; if (game.global.autoBattle && game.global.pauseFight) //check autofight available, and if it is off pauseFight(); //activates autofight - if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive || (game.global.mapsActive && getCurrentMapObject().location == "Void")) + if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive) return; //sanity check. if (!game.global.fighting) { fightManual(); From 123d8ddaaa61149726d7d5ea8edf451847683221 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 12:46:33 +0100 Subject: [PATCH 0124/3477] update to latest perks --- modules/perks.js | 125 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 88 insertions(+), 37 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index 835bb38b8..fc4c4120a 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -1,7 +1,7 @@ // ==UserScript== // @name AutoPerks // @namespace http://tampermonkey.net/ -// @version 1.1.2-4-2-2018+genBTC +// @version 1.1.3-4-7-2018+genBTC // @description Trimps Automatic Perk Calculator // @author zxv, genBTC // @include *trimps.github.io* @@ -38,14 +38,23 @@ var preset_HiderBalance = [75, 4, 8, 4, 1, 4, 24, 1, 75, 0.5, 3, 1, 1]; var preset_HiderMore = [20, 4, 10, 12, 1, 8, 8, 1, 40, 0.1, 0.5, 1, 1]; var preset_genBTC = [100, 8, 8, 4, 4, 5, 18, 8, 14, 1, 1, 1, 1]; var preset_genBTC2 = [96, 19, 15.4, 8, 8, 7, 14, 19, 11, 1, 1, 1, 1]; -var preset_Zek450 = [300, 1, 30, 2, 4, 2, 9, 8, 17, 0.1, 1, 320, 1]; -var preset_Zek4502 = [350, 1, 40, 2, 3, 2, 5, 8, 2, 0.1, 1, 300, 20]; //Will update again in few days, this seems to be more optimal for more helium for now -var preset_Zek4503 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 4, 0.04, 1, 120, 175]; //Final change till perky(?) integration +var preset_Zek450 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 4, 0.04, 1, 120, 175]; +// +var preset_space = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; +// +var preset_Zek059 = [7, 0.6, 3, 0.8, 0.3, 3, 25, 0.6, 0, 0, 0, 0, 0]; +var preset_Zek100 = [9.8, 1.8, 3.2, 2.6, 0.7, 2.9, 25, 1.8, 0, 0, 0, 0, 0]; +var preset_Zek180 = [13, 1.3, 4, 2.6, 0.7, 2.9, 25, 1.3, 35, 0.05, 1, 0, 0]; +var preset_Zek229 = [11.2, 0.58, 2.37, 1.464, 0.3, 2.02, 12.2, 0.58, 37, 0.22, 2.2, 0, 0]; +var preset_Zek299 = [16.8, 3, 1.9, 1.1, 1.2, 1, 17.1, 3, 100, 0.06, 0.8, 0, 0]; +var preset_Zek399 = [135, 6.1, 18.5, 6.5, 2.5, 6, 17, 6.1, 25, 0.08, 1, 0, 0]; +var preset_Zek449 = [245, 5.85, 29, 1.95, 2.8, 6, 6.1, 5.85, 15, 0.05, 1, 57, 0]; //gather these into an array of objects. this is one important object. -var presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2,preset_Zek450,preset_Zek4502,preset_Zek4503]; +var presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2,preset_space,preset_Zek059,preset_Zek100,preset_Zek180,preset_Zek229,preset_Zek299,preset_Zek399,preset_Zek449,preset_Zek450,preset_space]; //Specific ratios labeled above must be given the matching ID below. //Ratio preset dropdown list -var presetListHtml = "\ +var presetListHtml = "\ +\ \ \ \ @@ -57,15 +66,22 @@ var presetListHtml = "\ \ \ \ -\ -\ -\ -"; +\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +"; //Custom Creation for all perk customRatio boxes in Trimps Perk Window AutoPerks.createInput = function(perkname,div) { var perk1input = document.createElement("Input"); perk1input.id = perkname + 'Ratio'; - var oldstyle = 'text-align: center; width: 60px;'; + var oldstyle = 'text-align: center; width: calc(100vw/36); font-size: 1.0vw; '; if(game.options.menu.darkTheme.enabled != 2) perk1input.setAttribute("style", oldstyle + " color: black;"); else perk1input.setAttribute('style', oldstyle); perk1input.setAttribute('class', 'perkRatios'); @@ -73,7 +89,7 @@ AutoPerks.createInput = function(perkname,div) { var perk1label = document.createElement("Label"); perk1label.id = perkname + 'Label'; perk1label.innerHTML = perkname; - perk1label.setAttribute('style', 'margin-right: 1vw; width: 120px; color: white;'); + perk1label.setAttribute('style', 'margin-right: 0.7vw; width: calc(100vw/18); color: white; font-size: 0.9vw; font-weight: lighter; margin-left: 0.3vw; '); //add to the div. div.appendChild(perk1input); div.appendChild(perk1label); @@ -85,8 +101,14 @@ AutoPerks.GUI = {}; AutoPerks.removeGUI = function() { Object.keys(AutoPerks.GUI).forEach(function(key) { var $elem = AutoPerks.GUI[key]; - $elem.parentNode.removeChild($elem); - delete AutoPerks.GUI[key]; + if (!$elem) { + console.log("error in: "+key); + return; + } + if ($elem.parentNode) { + $elem.parentNode.removeChild($elem); + delete $elem; + } }); } AutoPerks.displayGUI = function() { @@ -119,11 +141,11 @@ AutoPerks.displayGUI = function() { apGUI.$dumpperklabel = document.createElement("Label"); apGUI.$dumpperklabel.id = 'DumpPerk Label'; apGUI.$dumpperklabel.innerHTML = "Dump Perk:"; - apGUI.$dumpperklabel.setAttribute('style', 'margin-right: 1vw; color: white;'); + apGUI.$dumpperklabel.setAttribute('style', 'margin-right: 1vw; color: white; font-size: 0.9vw;'); apGUI.$dumpperk = document.createElement("select"); apGUI.$dumpperk.id = 'dumpPerk'; apGUI.$dumpperk.setAttribute('onchange', 'AutoPerks.saveDumpPerk()'); - var oldstyle = 'text-align: center; width: 120px;'; + var oldstyle = 'text-align: center; width: 8vw; font-size: 0.8vw; font-weight: lighter; '; if(game.options.menu.darkTheme.enabled != 2) apGUI.$dumpperk.setAttribute("style", oldstyle + " color: black;"); else apGUI.$dumpperk.setAttribute('style', oldstyle); //Add the dump perk dropdown to UI Line 2 @@ -131,27 +153,41 @@ AutoPerks.displayGUI = function() { apGUI.$ratiosLine2.appendChild(apGUI.$dumpperk); //Toggle Algorithm 2 checkbox apGUI.$toggleAlgo2 = document.createElement("DIV"); - apGUI.$toggleAlgo2.setAttribute('style', 'display: inline-block; text-align: left; margin-left: 1vw; width: 7vw;'); + apGUI.$toggleAlgo2.setAttribute('style', 'display: inline; text-align: left; margin-left: 1vw;'); apGUI.$toggleAlgo2.innerHTML = '\ \ - Fast Allocate!:'; - apGUI.$ratiosLine2.appendChild(apGUI.$toggleAlgo2); + Fast Allocate!'; + $buttonbar.appendChild(apGUI.$toggleAlgo2); + var $fastAllocate = document.getElementById("fastAllocate"); + $fastAllocate.setAttribute("onmouseover", 'tooltip(\"FastAllocate\", \"customText\", event, \"Bulk buys thousands of Tier2 Perks at once to save time. Caution - May overshoot. Recommended for High Helium amounts above 1 Qi only.\")'); + $fastAllocate.setAttribute("onmouseout", 'tooltip("hide")'); //Create ratioPreset dropdown apGUI.$ratioPresetLabel = document.createElement("Label"); apGUI.$ratioPresetLabel.id = 'Ratio Preset Label'; apGUI.$ratioPresetLabel.innerHTML = "Ratio Preset:"; - apGUI.$ratioPresetLabel.setAttribute('style', 'margin-right: 1vw; color: white;'); + apGUI.$ratioPresetLabel.setAttribute('style', 'margin-right: 0.5vw; color: white; font-size: 0.9vw;'); apGUI.$ratioPreset = document.createElement("select"); apGUI.$ratioPreset.id = 'ratioPreset'; apGUI.$ratioPreset.setAttribute('onchange', 'AutoPerks.setDefaultRatios()'); - oldstyle = 'text-align: center; width: 110px;'; + oldstyle = 'text-align: center; width: 8vw; font-size: 0.8vw; font-weight: lighter; '; if(game.options.menu.darkTheme.enabled != 2) apGUI.$ratioPreset.setAttribute("style", oldstyle + " color: black;"); else apGUI.$ratioPreset.setAttribute('style', oldstyle); //Populate ratio preset dropdown list from HTML above: apGUI.$ratioPreset.innerHTML = presetListHtml; - //load the last ratio used + //Load the last ratio used var loadLastPreset = localStorage.getItem('AutoperkSelectedRatioPresetID'); - apGUI.$ratioPreset.selectedIndex = (loadLastPreset != null) ? loadLastPreset : 0; // First element is zxv (default) ratio. + var setID; + if (loadLastPreset != null) { + //these four lines are temporary to migrate Custom Ratios to the new dropdown. Once everyone has the name in localStorage we can remove this. + if (loadLastPreset == 15 && !localStorage.getItem('AutoperkSelectedRatioPresetName')) + loadLastPreset = 25; + if (localStorage.getItem('AutoperkSelectedRatioPresetName')=="customPreset") + loadLastPreset = 25; + setID = loadLastPreset; + } + else + setID = 0; // First element is zxv (default) ratio. + apGUI.$ratioPreset.selectedIndex = setID; //Add the presets dropdown to UI Line 1 apGUI.$ratiosLine1.appendChild(apGUI.$ratioPresetLabel); apGUI.$ratiosLine1.appendChild(apGUI.$ratioPreset); @@ -185,8 +221,9 @@ AutoPerks.populateDumpPerkList = function() { } AutoPerks.saveDumpPerk = function() { - var dumpIndex = document.getElementById("dumpPerk").selectedIndex; - safeSetItems('AutoperkSelectedDumpPresetID', dumpIndex); + var $dump = document.getElementById("dumpPerk"); + safeSetItems('AutoperkSelectedDumpPresetID', $dump.selectedIndex); + safeSetItems('AutoperkSelectedDumpPresetName', $dump.value); } AutoPerks.saveCustomRatios = function() { @@ -211,14 +248,17 @@ AutoPerks.switchToCustomRatios = function() { //loads custom ratio selections from localstorage if applicable AutoPerks.setDefaultRatios = function() { var $perkRatioBoxes = document.getElementsByClassName("perkRatios"); - var ratioSet = document.getElementById("ratioPreset").selectedIndex; + var $rp = document.getElementById("ratioPreset"); + if (!$rp || !$perkRatioBoxes || !$rp.selectedOptions[0]) return; + var ratioSet = $rp.selectedIndex; var currentPerk; + //set ratio boxes using getPerksByName to get values from the perkHolder for(var i = 0; i < $perkRatioBoxes.length; i++) { currentPerk = AutoPerks.getPerkByName($perkRatioBoxes[i].id.substring(0, $perkRatioBoxes[i].id.length - 5)); // Remove "ratio" from the id to obtain the perk name $perkRatioBoxes[i].value = currentPerk.value[ratioSet]; } //If "Custom" dropdown is selected: - if (ratioSet == document.getElementById("ratioPreset").length-1) { + if (ratioSet == $rp.length-1) { //Try to grab custom ratios from LocalStorage if they were saved. var tmp = JSON.parse(localStorage.getItem('AutoPerksCustomRatios')); if (tmp !== null) @@ -239,6 +279,7 @@ AutoPerks.setDefaultRatios = function() { } //save the last ratio used safeSetItems('AutoperkSelectedRatioPresetID', ratioSet); + safeSetItems('AutoperkSelectedRatioPresetName', $rp.selectedOptions[0].id); } //updates the internal perk variables with values grabbed from the custom ratio input boxes that the user may have changed. @@ -291,15 +332,15 @@ AutoPerks.clickAllocate = function() { debug("AutoPerks: Major Error: Reading your Helium amount. " + remainingHelium, "perks"); // determine how to spend helium + var result; if (MODULES["perks"].useAlgo2) - var result = AutoPerks.spendHelium2(remainingHelium); + result = AutoPerks.spendHelium2(remainingHelium); else - var result = AutoPerks.spendHelium(remainingHelium); + result = AutoPerks.spendHelium(remainingHelium); if (result == false) { debug("AutoPerks: Major Error: Make sure all ratios are set properly.","perks"); return; } - // Get owned perks var perks = AutoPerks.getOwnedPerks(); //re-arrange perk points @@ -325,7 +366,7 @@ AutoPerks.getHelium = function() { //Calculate Price AutoPerks.calculatePrice = function(perk, level) { // Calculate price of buying *next* level if(perk.fluffy) return Math.ceil(perk.base * Math.pow(10,level)); - if(perk.type == 'exponential') return Math.ceil(level/2 + perk.base * Math.pow(1.3, level)); + else if(perk.type == 'exponential') return Math.ceil(level/2 + perk.base * Math.pow(1.3, level)); else if(perk.type == 'linear') return Math.ceil(perk.base + perk.increase * level); } //Calculate Total Price @@ -361,11 +402,11 @@ AutoPerks.spendHelium = function(helium) { if(helium < 0) { debug("AutoPerks: Major Error - Not enough helium to buy fixed perks.","perks"); //document.getElementById("nextCoordinated").innerHTML = "Not enough helium to buy fixed perks."; - return; + return false; } if (Number.isNaN(helium)) { debug("AutoPerks: Major Error - Helium is Not a Number!","perks"); - return; + return false; } var perks = AutoPerks.getVariablePerks(); @@ -378,13 +419,18 @@ AutoPerks.spendHelium = function(helium) { price = AutoPerks.calculatePrice(perks[i], 0); inc = AutoPerks.calculateIncrease(perks[i], 0); perks[i].efficiency = inc/price; - if(perks[i].efficiency <= 0) { + if(perks[i].efficiency < 0) { debug("Perk ratios must be positive values.","perks"); return false; } + //Unsaid: If eff == 0, just do nothing. if(perks[i].efficiency != 0) effQueue.add(perks[i]); } + if (effQueue.size < 1) { + debug("All Perk Ratios were 0, or some other error.","perks"); + return false; + } var i=0; //Change the way we iterate. @@ -455,11 +501,11 @@ AutoPerks.spendHelium2 = function(helium) { if(helium < 0) { debug("AutoPerks: Major Error - Not enough helium to buy fixed perks.","perks"); //document.getElementById("nextCoordinated").innerHTML = "Not enough helium to buy fixed perks."; - return; + return false; } if (Number.isNaN(helium)) { debug("AutoPerks: Major Error - Helium is Not a Number!","perks"); - return; + return false; } var perks = AutoPerks.getVariablePerks(); @@ -474,9 +520,14 @@ AutoPerks.spendHelium2 = function(helium) { debug("Perk ratios must be positive values.","perks"); return false; } + //Unsaid: If eff == 0, just do nothing. if(perks[i].efficiency != 0) effQueue.add(perks[i]); } + if (effQueue.size < 1) { + debug("All Perk Ratios were 0, or some other error.","perks"); + return false; + } var mostEff, price, inc; var packPrice,packLevel; @@ -821,4 +872,4 @@ AutoPerks.getOwnedPerks = function() { } //Run the GUI: -AutoPerks.displayGUI(); \ No newline at end of file +AutoPerks.displayGUI(); From 75195c04e06f82b38d226cd2e1118e3b4a6c4545 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Fri, 27 Apr 2018 12:55:28 +0100 Subject: [PATCH 0125/3477] Add some +lvl support for VMs --- SettingsGUI.js | 1 + modules/fight.js | 4 +++- modules/maps.js | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index d8abd3afd..f51de0f4a 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -364,6 +364,7 @@ function initializeAllSettings() { //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); //-1 Autograbs your Finish Daily Z Mod
0 Disables this setting
Positive Numbers add to your normal void zone on a daily
Possible number input? createSetting('DailyVoidMod', 'Daily Void Zone Mod', 'If this is on, your daily autoportal mod (Core) will also apply to Void maps on dailies. For example, if you have void maps and autoportal set to 200 on normal runs, and your daily mod is 15, you will do voids and portal 15 zones later on a daily.', 'boolean', true, null, 'Maps'); + createSetting('PlusMapVoidToggle', 'Plus Maps for Voids', '-1/0 = Off
Max Value is 10!!!
If this is on, AT will grab a prestigious map X zones up, and run it once (to grab the dagger prestige). This is independent of the new special map mods button that Gen is testing. I cba to make this \'smart\' and actively calculate what zone to go for...
Values above 10 will NOT work at all. Advise 1-5.', 'value', '0', null, 'Maps'); createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. And I cba cause its a meh setting anyway. Advancing 2 zones more than doubles your income. Only useful for spire I, and IMO you may aswell actually play the game manually at SOME point. createSetting('AdvMapSpecialModifier', 'Map Special Modifier', 'EXPERIMENTAL. Attempt to select the BEST map special attacks mod. With this on, this will replace the normal behavior. If bugs, please report as this will become more default soon.', 'boolean', false, null, 'Maps'); diff --git a/modules/fight.js b/modules/fight.js index 03375b2d0..2d869ff0c 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -126,4 +126,6 @@ if (game.global.soldierHealth == 0 && !(game.global.spireActive || (game.global. } if ((needPrestige || !enoughDamage) && game.global.world>=200 && (getEmpowerment() == "Ice" || (getEmpowerment() == "Wind" && game.global.realBreedTime >= 45500)) && !game.global.mapsActive && game.global.mapBonus != 10 && game.global.world!=game.options.menu.mapAtZone.setZone) { forceAbandonTrimps(); - } */ + } + + */ diff --git a/modules/maps.js b/modules/maps.js index 160226b39..9674e95ba 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -32,6 +32,7 @@ MODULES["maps"].maxMapBonusAfterZ = MODULES["maps"].maxMapBonus; //Max Map Bon var stackingTox = false; var doVoids = false; var needToVoid = false; +var plusMapVoid = false; var needPrestige = false; var skippedPrestige = false; var voidCheckPercent = 0; @@ -908,3 +909,43 @@ function mapTimeEstimater() { mapTimeEstimate = 0; return mapTimeEstimate; } + +//NEW KFrowde + Sliverz +//Set up Vars +var plusMapVoidLastZone = null; +var plusMapVoid = (voidMapLevelSetting > 0) && (game.global.totalVoidMaps > 0) && (game.global.world == voidMapLevelSettingZone); //Sanity check +var plusMapVoidInput = getPageSetting('PlusMapVoidToggle') +//Check that you should do this, check you've enabled it between the correct values, check that it hasn't already run this zone +if ((plusMapVoid) && (plusMapVoidInput > 0 && plusMapVoidInput <= 10) && (plusMapVoidLastZone === null || plusMapVoidLastZone !== game.global.world)) { + document.getElementById("biomeAdvMapsSelect").value = "Random"; + document.getElementById('advExtraLevelSelect').value = plusMapVoidInput; + document.getElementById('advSpecialSelect').value = "p"; + document.getElementById("lootAdvMapsRange").value = 0; + document.getElementById("difficultyAdvMapsRange").value = 9; + document.getElementById("sizeAdvMapsRange").value = 9; + document.getElementById('advPerfectCheckbox').checked = false; + updateMapCost(); + buyMap(); + selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); + runMap(); + plusMapVoidLastZone = game.global.world; //This stops it from looping +} +else + return; + +/* +function plusFivePres(){ + document.getElementById("biomeAdvMapsSelect").value = "Random"; + document.getElementById('advExtraLevelSelect').value = 5; + document.getElementById('advSpecialSelect').value = "p"; + document.getElementById("lootAdvMapsRange").value = 0; + document.getElementById("difficultyAdvMapsRange").value = 9; + document.getElementById("sizeAdvMapsRange").value = 9; + document.getElementById('advPerfectCheckbox').checked = false; + updateMapCost(); + } +plusFivePres(); +buyMap(); +selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); +runMap(); +*/ From 4a6fa7a6a2c4eae18403fcc62440d27f952d7d3b Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Fri, 27 Apr 2018 13:09:41 +0100 Subject: [PATCH 0126/3477] bundle VM +lvl map into automaps --- modules/maps.js | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index 06f15ba5d..9da323990 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -95,6 +95,28 @@ function autoMap() { (game.global.world >= voidMapLevelSettingZone && getPageSetting('RunNewVoidsUntilNew') != 0 && (voidsuntil == -1 || game.global.world <= (voidsuntil + voidMapLevelSettingZone)))); if(game.global.totalVoidMaps == 0 || !needToVoid) doVoids = false; + + //NEW KFrowde + Sliverz + //Set up vars + var plusMapVoidLastZone + var plusMapVoid = (voidMapLevelSetting > 0) && (game.global.totalVoidMaps > 0) && (game.global.world == voidMapLevelSettingZone); //Sanity check + var plusMapVoidInput = getPageSetting('PlusMapVoidToggle') + //Check that you should do this, check you've enabled it between the correct values, check that it hasn't already run this zone + if ((plusMapVoid) && (plusMapVoidInput > 0 && plusMapVoidInput <= 10) && (plusMapVoidLastZone === null || plusMapVoidLastZone !== game.global.world)) { + document.getElementById("biomeAdvMapsSelect").value = "Random"; + document.getElementById('advExtraLevelSelect').value = plusMapVoidInput; + document.getElementById('advSpecialSelect').value = "p"; + document.getElementById("lootAdvMapsRange").value = 0; + document.getElementById("difficultyAdvMapsRange").value = 9; + document.getElementById("sizeAdvMapsRange").value = 9; + document.getElementById('advPerfectCheckbox').checked = false; + updateMapCost(); + buyMap(); + selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); + runMap(); + plusMapVoidLastZone = game.global.world; //This should have stopped it from looping + } + // if force prestige, check if we are behind any first if ((getPageSetting('ForcePresZ') >= 0) && ((game.global.world+extraMapLevels) >= getPageSetting('ForcePresZ'))) { const prestigeList = ['Supershield','Dagadder','Megamace','Polierarm','Axeidic','Greatersword','Harmbalest','Bootboost','Hellishmet','Pantastic','Smoldershoulder','Bestplate','GambesOP']; @@ -910,7 +932,7 @@ function mapTimeEstimater() { return mapTimeEstimate; } -//NEW KFrowde + Sliverz +/* //NEW KFrowde + Sliverz //Set up Vars var plusMapVoidLastZone = null; var plusMapVoid = (voidMapLevelSetting > 0) && (game.global.totalVoidMaps > 0) && (game.global.world == voidMapLevelSettingZone); //Sanity check @@ -929,7 +951,7 @@ if ((plusMapVoid) && (plusMapVoidInput > 0 && plusMapVoidInput <= 10) && (plusMa selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); runMap(); plusMapVoidLastZone = game.global.world; //This stops it from looping -} +}/* /* function plusFivePres(){ From f3f18144414e694c0097d82aabd38b157c4a2685 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 13:27:38 +0100 Subject: [PATCH 0127/3477] added spire sub --- SettingsGUI.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index f51de0f4a..5c9bd92c6 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -178,6 +178,7 @@ function initializeAllTabs() { createTabs("Jobs", "Jobs - Worker Settings"); createTabs("Gear", "Gear - Equipment Settings"); createTabs("Maps", "Maps - AutoMaps & VoidMaps Settings"); + createTabs("Spire", "Spire - Settings for Spires"); createTabs("Combat", "Combat & Stance Settings"); createTabs("Scryer", "Scryer Settings"); createTabs("Magma", "Dimensional Generator & Magmite Settings"); @@ -350,11 +351,6 @@ function initializeAllSettings() { createSetting('FarmWhenNomStacks7', 'Farm on >7 NOMstacks', 'Optional. If Improbability already has 5 NOMstacks, stack 30 Anticipation. If the Improbability has >7 NOMstacks on it, get +200% dmg from MapBonus. If we still cant kill it, enter Farming mode at 30 stacks, Even with DisableFarming On! (exits when we get under 10x). Farms if we hit 100 stacks in the world. If we ever hit (100) nomstacks in a map (likely a voidmap), farm, (exit the voidmap) and (prevent void from running, until situation is clear). Restarts any voidmaps if we hit 100 stacks. ', 'boolean', false, null, 'Maps'); //Line2 - createSetting('MaxStacksForSpire', 'Max Map Bonus for Spire', 'Get max map bonus before running the Spire.', 'boolean', false, null, 'Maps'); //Does farm before spire not cover this fairly well anyway? grabbing +1 equips would make way more difference anyway - createSetting('MinutestoFarmBeforeSpire', 'Farm Before Spire', 'Farm level 200/199(or BW) maps for X minutes before continuing onto attempting Spire.
NOTE: Set 0 to disable entirely (default).
Setting to -1/Infinite does not work here, set a very high number instead.', 'value', '0', null, 'Maps'); - createSetting('IgnoreSpiresUntil', 'Ignore Spires Until', 'Spire specific settings like end-at-cell are ignored until at least this zone is reached (0 to disable).
Does not work with Run Bionic Before Spire.', 'value', '200', null, 'Maps'); - createSetting('RunBionicBeforeSpire', 'Run Bionic Before Spire', 'CAUTION: Runs Bionic Wonderlands and repeatedly farms Bionic VI @ level 200 before attempting Spire, for the purpose of resource farming. Then it attempts the spire. The Minutes-Before-Spire timer runs concurrently to this, and needs to be set. If not set, it will exit without doing any Bionics... You can un-toggle it on the fly.
NOTE: Turning this on also mandates that Run Unique Maps be on.
WARNING: These 100 square maps take ~3x longer than normal maps.
WARNING: If you dont have Bionic Magnet mastery, this will run the 5 pre-requisites and take longer.
NOTE: In fact, it may not be what you want at all.', 'boolean', false, null, 'Maps'); //OUTDATED! - createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Maps'); createSetting('CorruptionCalc', 'Corruption Farm Mode', 'Recommended. Enabling this will cause the Automaps routine to take amount of corruption in a zone into account, to decide whether it should do maps first for map bonus. ONLY in Zone 181+ (or Headstart 1,2,3 zone: 176,166,151) ', 'boolean', true, null, 'Maps'); createSetting('MaxTox', 'Max Toxicity Stacks', 'Get maximum toxicity stacks before killing the improbability in each zone 60 and above. Generally only recommended for 1 run to maximize bone portal value. This setting will revert to disabled after a successful Max-Tox run + Toxicity Autoportal.', 'boolean', false, null, 'Maps'); @@ -372,6 +368,16 @@ function initializeAllSettings() { +//Spire + createSetting('MaxStacksForSpire', 'Max Map Bonus for Spire', 'Get max map bonus before running the Spire.', 'boolean', false, null, 'Spire'); //Does farm before spire not cover this fairly well anyway? grabbing +1 equips would make way more difference anyway + createSetting('MinutestoFarmBeforeSpire', 'Farm Before Spire', 'Farm level 200/199(or BW) maps for X minutes before continuing onto attempting Spire.
NOTE: Set 0 to disable entirely (default).
Setting to -1/Infinite does not work here, set a very high number instead.', 'value', '0', null, 'Spire'); + createSetting('IgnoreSpiresUntil', 'Ignore Spires Until', 'Spire specific settings like end-at-cell are ignored until at least this zone is reached (0 to disable).
Does not work with Run Bionic Before Spire.', 'value', '200', null, 'Spire'); + createSetting('RunBionicBeforeSpire', 'Run Bionic Before Spire', 'CAUTION: Runs Bionic Wonderlands and repeatedly farms Bionic VI @ level 200 before attempting Spire, for the purpose of resource farming. Then it attempts the spire. The Minutes-Before-Spire timer runs concurrently to this, and needs to be set. If not set, it will exit without doing any Bionics... You can un-toggle it on the fly.
NOTE: Turning this on also mandates that Run Unique Maps be on.
WARNING: These 100 square maps take ~3x longer than normal maps.
WARNING: If you dont have Bionic Magnet mastery, this will run the 5 pre-requisites and take longer.
NOTE: In fact, it may not be what you want at all.', 'boolean', false, null, 'Spire'); //OUTDATED! + createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Spire'); + + + + //Combat //Subsection1Line1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
BAF3 = Uses vanilla autofight, and force fights when dead except in VM and Spire.
WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); From 40b333127c2d1f6d367a7bb794267de4f7069f78 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 13:43:30 +0100 Subject: [PATCH 0128/3477] Added other spire settings, and BW raiding --- SettingsGUI.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 5c9bd92c6..70f9c0795 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -245,7 +245,6 @@ function initializeAllSettings() { //createSetting('ManageBreedtimerNew', ['Manual Breed Timer', 'Auto Breed Timer', 'Auto No Patience'], 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges, and accounts for the patience mastery.
[ON](Yellow): The same as above, but ignores patience and will not set a breed timer longer than 30s.
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'multitoggle', 1, null, "Core"); //This replaces the two settings below, but do we really need an option to ignore patience?? createSetting('ManageBreedtimer', 'Auto Breed Timer', 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges (0, 3.5s, 10s, 30s).
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'boolean', true, null, "Core"); createSetting('GeneticistTimer', 'Geneticist Timer', 'Manages the breed timer by hiring/firing Geneticists for the purpose of setting the ideal anticpation stacks. Disable with -1 to disable the Hiring/Firing of geneticists.
Info: Potency and Nursery buying behavior is adjusted dynamically (and disabling no longer disables potency). The Automatic Genetecist Hiring Process can best be summarized by: Buy/Wait/Die,Repeat. (if you do not die, no action is taken). Also self-kills (trimpicide) aka force abandon when your anti-stacks aren\'t maxed out (conservatively).

Controlled automatically (locked) when Auto Breed Timer is on.', 'value', '30', null, "Core"); - createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Core'); createSetting('BreedFire', 'Breed Fire', 'OPTIONAL. Fire Lumberjacks and Miners to speed up breeding when needed. Basically trades wood/metal to cut the wait between deaths down. Disclaimer: May heavily negatively impact wood-gathering. ', 'boolean', false, null, 'Core'); createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); @@ -298,9 +297,7 @@ function initializeAllSettings() { createSetting('WarpstationWall3', 'Warpstation Wall', 'Conserves Metal. Only buys 1 Warpstation when you can afford X warpstations metal cost (at the first one\'s price, simple math). -1, 0, 1 = disable. In other words, only allows warps that cost less than 1/nth your currently owned metal. (to save metal for prestiges)', 'value', -1, null, 'Buildings'); createSetting('MaxNursery', 'Max Nurseries', 'Advanced. Recommend: -1 until you reach Magma (z230+)', 'value', '-1', null, "Buildings"); createSetting('NoNurseriesUntil', 'No Nurseries Until z', 'For Magma z230+ purposes. Nurseries get shut down, and wasting nurseries early on is probably a bad idea. Might want to set this to 230+ for now. Can use combined with the old Max Nurseries cap setting.', 'value', -1, null, 'Buildings'); - createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Buildings'); - - + //Jobs @@ -369,13 +366,18 @@ function initializeAllSettings() { //Spire + //Line 1 createSetting('MaxStacksForSpire', 'Max Map Bonus for Spire', 'Get max map bonus before running the Spire.', 'boolean', false, null, 'Spire'); //Does farm before spire not cover this fairly well anyway? grabbing +1 equips would make way more difference anyway createSetting('MinutestoFarmBeforeSpire', 'Farm Before Spire', 'Farm level 200/199(or BW) maps for X minutes before continuing onto attempting Spire.
NOTE: Set 0 to disable entirely (default).
Setting to -1/Infinite does not work here, set a very high number instead.', 'value', '0', null, 'Spire'); createSetting('IgnoreSpiresUntil', 'Ignore Spires Until', 'Spire specific settings like end-at-cell are ignored until at least this zone is reached (0 to disable).
Does not work with Run Bionic Before Spire.', 'value', '200', null, 'Spire'); createSetting('RunBionicBeforeSpire', 'Run Bionic Before Spire', 'CAUTION: Runs Bionic Wonderlands and repeatedly farms Bionic VI @ level 200 before attempting Spire, for the purpose of resource farming. Then it attempts the spire. The Minutes-Before-Spire timer runs concurrently to this, and needs to be set. If not set, it will exit without doing any Bionics... You can un-toggle it on the fly.
NOTE: Turning this on also mandates that Run Unique Maps be on.
WARNING: These 100 square maps take ~3x longer than normal maps.
WARNING: If you dont have Bionic Magnet mastery, this will run the 5 pre-requisites and take longer.
NOTE: In fact, it may not be what you want at all.', 'boolean', false, null, 'Spire'); //OUTDATED! createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Spire'); + createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Spire'); + createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Buildings'); - + //Line 2 + //createSetting('BWraidingzone', 'BW Raiding', 'Raids BW at zone specified. Example: 495, will raid BWs at z495. Needs "Max BW to raid" setting to work. ', 'value', -1, null, 'Spire'); + //createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to world. ', 'value', -1, null, 'Spire'); //Combat From 763fd818d690031d98ed1ef79a8edc01f8e5c283 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 13:54:24 +0100 Subject: [PATCH 0129/3477] Started BW raid --- modules/other.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/other.js b/modules/other.js index 64bc59541..db905d91f 100644 --- a/modules/other.js +++ b/modules/other.js @@ -132,3 +132,15 @@ function exitSpireCell() { if(isActiveSpireAT() && game.global.lastClearedCell >= getPageSetting('ExitSpireCell')-1) endSpire(); } + +//var raided = false; + +//BWraidingzone +//function BWraidingzone() { + // getPageSetting('BWraidingzone') +//} + +//BWraidingmax +//function BWraidingmax() { + //getPageSetting('BWraidingmax') +//} From 9d4dbdad98b30619fb85e773222cba5364eabe96 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 15:22:20 +0100 Subject: [PATCH 0130/3477] Update other.js --- modules/other.js | 60 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index db905d91f..01a052638 100644 --- a/modules/other.js +++ b/modules/other.js @@ -133,12 +133,64 @@ function exitSpireCell() { endSpire(); } -//var raided = false; +var BWraidz = getPageSetting('BWraidingzone'); +var bwraid = false; +var prestraid = false; //BWraidingzone -//function BWraidingzone() { - // getPageSetting('BWraidingzone') -//} +function BWraidingzone() { + if (game.global.world == BWraidz && getPageSetting('AutoMaps') == 1 && game.global.mapsActive && !prestraid) + { + toggleAutoMaps(); + repeatClicked(); + while (game.options.menu.repeatUntil.enabled!=2) + { + toggleSetting('repeatUntil'); + } + setTimeout(function(){ + repeatClicked(); + game.global.world == BWraidz ? plusSixPres():plusFivePres(); + buyMap(); + selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); + runMap(); + prestraid = true; + },3000 ); + } + else if (prestraid && game.global.preMapsActive) + { + recycleMap(); + toggleAutoMaps(); + } + } + if (game.global.world == BWraidz+1) + { + game.options.menu.mapAtZone.enabled = 1; + bwraid = false; + } + +function plusFivePres() + { + document.getElementById("biomeAdvMapsSelect").value = "Random"; + document.getElementById('advExtraLevelSelect').value = 5; + document.getElementById('advSpecialSelect').value = 0; + document.getElementById("lootAdvMapsRange").value = 0; + document.getElementById("difficultyAdvMapsRange").value = 9; + document.getElementById("sizeAdvMapsRange").value = 9; + document.getElementById('advPerfectCheckbox').checked = false; + updateMapCost(); + } + + function plusSixPres() + { + document.getElementById("biomeAdvMapsSelect").value = "Random"; + document.getElementById('advExtraLevelSelect').value = 6; + document.getElementById('advSpecialSelect').value = 0; + document.getElementById("lootAdvMapsRange").value = 0; + document.getElementById("difficultyAdvMapsRange").value = 9; + document.getElementById("sizeAdvMapsRange").value = 9; + document.getElementById('advPerfectCheckbox').checked = false; + updateMapCost(); + } //BWraidingmax //function BWraidingmax() { From 321e2e59a2a7788b6bd031746d1c050927dc138c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 15:23:39 +0100 Subject: [PATCH 0131/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 70f9c0795..2ae4615a9 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -376,7 +376,7 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Buildings'); //Line 2 - //createSetting('BWraidingzone', 'BW Raiding', 'Raids BW at zone specified. Example: 495, will raid BWs at z495. Needs "Max BW to raid" setting to work. ', 'value', -1, null, 'Spire'); + createSetting('BWraidingzone', 'BW Raiding', 'Raids BW at zone specified. Example: 495, will raid BWs at z495. Needs "Max BW to raid" setting to work. ', 'value', -1, null, 'Spire'); //createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to world. ', 'value', -1, null, 'Spire'); From d5cc5bc746c3178350c872e2786463162a82317a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 15:31:29 +0100 Subject: [PATCH 0132/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 2ae4615a9..16fa734a6 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -376,7 +376,7 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Buildings'); //Line 2 - createSetting('BWraidingzone', 'BW Raiding', 'Raids BW at zone specified. Example: 495, will raid BWs at z495. Needs "Max BW to raid" setting to work. ', 'value', -1, null, 'Spire'); + createSetting('BWraidingzone', 'BW Raiding', 'Raids BW at zone specified. Example: 495, will raid BWs at z495. Needs Max BW to raid setting to work.', 'value', -1, null, 'Spire'); //createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to world. ', 'value', -1, null, 'Spire'); From d4c1442858098c0df0c6dd82cc22e36a14b31fd3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 15:37:44 +0100 Subject: [PATCH 0133/3477] Update other.js --- modules/other.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/other.js b/modules/other.js index 01a052638..afb742f01 100644 --- a/modules/other.js +++ b/modules/other.js @@ -140,7 +140,7 @@ var prestraid = false; //BWraidingzone function BWraidingzone() { if (game.global.world == BWraidz && getPageSetting('AutoMaps') == 1 && game.global.mapsActive && !prestraid) - { + toggleAutoMaps(); repeatClicked(); while (game.options.menu.repeatUntil.enabled!=2) @@ -149,18 +149,11 @@ function BWraidingzone() { } setTimeout(function(){ repeatClicked(); - game.global.world == BWraidz ? plusSixPres():plusFivePres(); - buyMap(); + plusSixPres(); selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); runMap(); prestraid = true; },3000 ); - } - else if (prestraid && game.global.preMapsActive) - { - recycleMap(); - toggleAutoMaps(); - } } if (game.global.world == BWraidz+1) { From 7630fd6d5192ffe2f368fe8e140ce3db8546e975 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 15:39:02 +0100 Subject: [PATCH 0134/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index afb742f01..0bfce93a4 100644 --- a/modules/other.js +++ b/modules/other.js @@ -149,7 +149,7 @@ function BWraidingzone() { } setTimeout(function(){ repeatClicked(); - plusSixPres(); + plusSixPres(); selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); runMap(); prestraid = true; From 333674761c734c66f2a912e9ec3c988bad58b9dc Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 15:47:56 +0100 Subject: [PATCH 0135/3477] Update other.js --- modules/other.js | 51 +++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0bfce93a4..ac38374b4 100644 --- a/modules/other.js +++ b/modules/other.js @@ -133,13 +133,37 @@ function exitSpireCell() { endSpire(); } +function plusFivePres() + { + document.getElementById("biomeAdvMapsSelect").value = "Random"; + document.getElementById('advExtraLevelSelect').value = 5; + document.getElementById('advSpecialSelect').value = 0; + document.getElementById("lootAdvMapsRange").value = 0; + document.getElementById("difficultyAdvMapsRange").value = 9; + document.getElementById("sizeAdvMapsRange").value = 9; + document.getElementById('advPerfectCheckbox').checked = false; + updateMapCost(); + } + + function plusSixPres() + { + document.getElementById("biomeAdvMapsSelect").value = "Random"; + document.getElementById('advExtraLevelSelect').value = 6; + document.getElementById('advSpecialSelect').value = 0; + document.getElementById("lootAdvMapsRange").value = 0; + document.getElementById("difficultyAdvMapsRange").value = 9; + document.getElementById("sizeAdvMapsRange").value = 9; + document.getElementById('advPerfectCheckbox').checked = false; + updateMapCost(); + } + var BWraidz = getPageSetting('BWraidingzone'); var bwraid = false; var prestraid = false; //BWraidingzone function BWraidingzone() { - if (game.global.world == BWraidz && getPageSetting('AutoMaps') == 1 && game.global.mapsActive && !prestraid) + if (game.global.world == BWraidz && !prestraid) toggleAutoMaps(); repeatClicked(); @@ -150,6 +174,7 @@ function BWraidingzone() { setTimeout(function(){ repeatClicked(); plusSixPres(); + buymap(); selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); runMap(); prestraid = true; @@ -161,29 +186,7 @@ function BWraidingzone() { bwraid = false; } -function plusFivePres() - { - document.getElementById("biomeAdvMapsSelect").value = "Random"; - document.getElementById('advExtraLevelSelect').value = 5; - document.getElementById('advSpecialSelect').value = 0; - document.getElementById("lootAdvMapsRange").value = 0; - document.getElementById("difficultyAdvMapsRange").value = 9; - document.getElementById("sizeAdvMapsRange").value = 9; - document.getElementById('advPerfectCheckbox').checked = false; - updateMapCost(); - } - - function plusSixPres() - { - document.getElementById("biomeAdvMapsSelect").value = "Random"; - document.getElementById('advExtraLevelSelect').value = 6; - document.getElementById('advSpecialSelect').value = 0; - document.getElementById("lootAdvMapsRange").value = 0; - document.getElementById("difficultyAdvMapsRange").value = 9; - document.getElementById("sizeAdvMapsRange").value = 9; - document.getElementById('advPerfectCheckbox').checked = false; - updateMapCost(); - } + //BWraidingmax //function BWraidingmax() { From b67b2ab8719c6be5f8c2ddf9c3ce160f8e10c687 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 15:48:48 +0100 Subject: [PATCH 0136/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index ac38374b4..c00b40adc 100644 --- a/modules/other.js +++ b/modules/other.js @@ -183,7 +183,7 @@ function BWraidingzone() { if (game.global.world == BWraidz+1) { game.options.menu.mapAtZone.enabled = 1; - bwraid = false; + prestraid = false; } From d050a4d88c555695e9716a1924d47da79552c10c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 15:53:38 +0100 Subject: [PATCH 0137/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 16fa734a6..ad9eb7117 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -376,7 +376,8 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Buildings'); //Line 2 - createSetting('BWraidingzone', 'BW Raiding', 'Raids BW at zone specified. Example: 495, will raid BWs at z495. Needs Max BW to raid setting to work.', 'value', -1, null, 'Spire'); + createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding Z.', 'boolean', false, null, 'Spire'); + createSetting('BWraidingzone', 'BW Raiding Z', 'Raids BW at zone specified. Example: 495, will raid BWs at z495. Needs Max BW to raid setting to work.', 'value', -1, null, 'Spire'); //createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to world. ', 'value', -1, null, 'Spire'); From 763534693618331b0489548fb3c44739c427df3a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 15:57:57 +0100 Subject: [PATCH 0138/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index c00b40adc..62cae6b9b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,7 +163,7 @@ var prestraid = false; //BWraidingzone function BWraidingzone() { - if (game.global.world == BWraidz && !prestraid) + if (BWraid == true && game.global.world == BWraidz && !prestraid && getPageSetting('AutoMaps') == 1) toggleAutoMaps(); repeatClicked(); From 3033df41d5d642ba19f3074de1b21fcda9175eb9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 16:06:29 +0100 Subject: [PATCH 0139/3477] Update other.js --- modules/other.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/modules/other.js b/modules/other.js index 62cae6b9b..648e9486b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,23 +163,24 @@ var prestraid = false; //BWraidingzone function BWraidingzone() { - if (BWraid == true && game.global.world == BWraidz && !prestraid && getPageSetting('AutoMaps') == 1) + if (BWraid == true && game.global.world == BWraidz && !prestraid && getPageSetting('AutoMaps') == 1) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on - toggleAutoMaps(); - repeatClicked(); - while (game.options.menu.repeatUntil.enabled!=2) + toggleAutoMaps(); //turns automaps off so it doest interfere + repeatClicked(); //??? + while (game.options.menu.repeatUntil.enabled!=2)// no idea what this is, but i assume its to make it repeat till no prestiges drop? { toggleSetting('repeatUntil'); - } - setTimeout(function(){ - repeatClicked(); - plusSixPres(); - buymap(); - selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); + } + setTimeout(function(){ //can this work without timeout? + repeatClicked(); //??? + plusSixPres(); //sets maps up + buymap(); //buys the prest 6 map, at least, i hope so + selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); //selects first map??? runMap(); - prestraid = true; - },3000 ); + prestraid = true; //successfully raided +6 map for all prestiges, so sets to true + },3000 ); //timeout } +// what does this do? if (game.global.world == BWraidz+1) { game.options.menu.mapAtZone.enabled = 1; From 26044edd844b48ff3ce2b1e557ff84328ae2a4cc Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 16:11:51 +0100 Subject: [PATCH 0140/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 648e9486b..984d8b95a 100644 --- a/modules/other.js +++ b/modules/other.js @@ -158,7 +158,7 @@ function plusFivePres() } var BWraidz = getPageSetting('BWraidingzone'); -var bwraid = false; +var bwraidedd = false; var prestraid = false; //BWraidingzone From 145d25eb65e5a39888fafb8bd59eb4ab025e14fd Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Fri, 27 Apr 2018 20:02:33 +0100 Subject: [PATCH 0141/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index ad9eb7117..1078cf85f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -245,6 +245,7 @@ function initializeAllSettings() { //createSetting('ManageBreedtimerNew', ['Manual Breed Timer', 'Auto Breed Timer', 'Auto No Patience'], 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges, and accounts for the patience mastery.
[ON](Yellow): The same as above, but ignores patience and will not set a breed timer longer than 30s.
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'multitoggle', 1, null, "Core"); //This replaces the two settings below, but do we really need an option to ignore patience?? createSetting('ManageBreedtimer', 'Auto Breed Timer', 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges (0, 3.5s, 10s, 30s).
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'boolean', true, null, "Core"); createSetting('GeneticistTimer', 'Geneticist Timer', 'Manages the breed timer by hiring/firing Geneticists for the purpose of setting the ideal anticpation stacks. Disable with -1 to disable the Hiring/Firing of geneticists.
Info: Potency and Nursery buying behavior is adjusted dynamically (and disabling no longer disables potency). The Automatic Genetecist Hiring Process can best be summarized by: Buy/Wait/Die,Repeat. (if you do not die, no action is taken). Also self-kills (trimpicide) aka force abandon when your anti-stacks aren\'t maxed out (conservatively).

Controlled automatically (locked) when Auto Breed Timer is on.', 'value', '30', null, "Core"); + createSetting('UsePatience', 'Enable Patience', 'Sets the default breed timer to 45 seconds if you have the Patience mastery.', 'boolean', true, null, 'Core'); createSetting('BreedFire', 'Breed Fire', 'OPTIONAL. Fire Lumberjacks and Miners to speed up breeding when needed. Basically trades wood/metal to cut the wait between deaths down. Disclaimer: May heavily negatively impact wood-gathering. ', 'boolean', false, null, 'Core'); createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); @@ -254,7 +255,6 @@ function initializeAllSettings() { createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); if (game.worldUnlocks.easterEgg) createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core'); //could really be removed?? - createSetting('UsePatience', 'Enable Patience', 'Sets the default breed timer to 45 seconds if you have the Patience mastery.', 'boolean', true, null, 'Core'); createSetting('AutoAllocatePerks', 'Auto Allocate Perks', 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. ', 'boolean', false, null, 'Core'); document.getElementById('AutoAllocatePerks').parentNode.insertAdjacentHTML('afterend','
'); From 4ec63eb1d6132b739a5052d0fbdd6d91b63daa85 Mon Sep 17 00:00:00 2001 From: KFrowde <37512082+KFrowde@users.noreply.github.com> Date: Fri, 27 Apr 2018 21:39:09 +0100 Subject: [PATCH 0142/3477] Cba to make this work. its buggy as hell --- SettingsGUI.js | 6 +++--- modules/maps.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 1078cf85f..5ab8c13c4 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -297,7 +297,7 @@ function initializeAllSettings() { createSetting('WarpstationWall3', 'Warpstation Wall', 'Conserves Metal. Only buys 1 Warpstation when you can afford X warpstations metal cost (at the first one\'s price, simple math). -1, 0, 1 = disable. In other words, only allows warps that cost less than 1/nth your currently owned metal. (to save metal for prestiges)', 'value', -1, null, 'Buildings'); createSetting('MaxNursery', 'Max Nurseries', 'Advanced. Recommend: -1 until you reach Magma (z230+)', 'value', '-1', null, "Buildings"); createSetting('NoNurseriesUntil', 'No Nurseries Until z', 'For Magma z230+ purposes. Nurseries get shut down, and wasting nurseries early on is probably a bad idea. Might want to set this to 230+ for now. Can use combined with the old Max Nurseries cap setting.', 'value', -1, null, 'Buildings'); - + //Jobs @@ -373,8 +373,8 @@ function initializeAllSettings() { createSetting('RunBionicBeforeSpire', 'Run Bionic Before Spire', 'CAUTION: Runs Bionic Wonderlands and repeatedly farms Bionic VI @ level 200 before attempting Spire, for the purpose of resource farming. Then it attempts the spire. The Minutes-Before-Spire timer runs concurrently to this, and needs to be set. If not set, it will exit without doing any Bionics... You can un-toggle it on the fly.
NOTE: Turning this on also mandates that Run Unique Maps be on.
WARNING: These 100 square maps take ~3x longer than normal maps.
WARNING: If you dont have Bionic Magnet mastery, this will run the 5 pre-requisites and take longer.
NOTE: In fact, it may not be what you want at all.', 'boolean', false, null, 'Spire'); //OUTDATED! createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Spire'); createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Spire'); - createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Buildings'); - + createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); + //Line 2 createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding Z.', 'boolean', false, null, 'Spire'); createSetting('BWraidingzone', 'BW Raiding Z', 'Raids BW at zone specified. Example: 495, will raid BWs at z495. Needs Max BW to raid setting to work.', 'value', -1, null, 'Spire'); diff --git a/modules/maps.js b/modules/maps.js index 9da323990..a1921c94c 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -96,7 +96,7 @@ function autoMap() { if(game.global.totalVoidMaps == 0 || !needToVoid) doVoids = false; - //NEW KFrowde + Sliverz + //NEW KFrowde + Sliverz This has several issues: 1 - Buys fuckloads of maps, 2 - enters a BW map instead of the one that you want //Set up vars var plusMapVoidLastZone var plusMapVoid = (voidMapLevelSetting > 0) && (game.global.totalVoidMaps > 0) && (game.global.world == voidMapLevelSettingZone); //Sanity check From c4b11bf4354bc31ea71dd285213cca764079dabe Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:03:21 +0100 Subject: [PATCH 0143/3477] Update other.js --- modules/other.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 984d8b95a..a17bbe762 100644 --- a/modules/other.js +++ b/modules/other.js @@ -167,6 +167,8 @@ function BWraidingzone() { toggleAutoMaps(); //turns automaps off so it doest interfere repeatClicked(); //??? + if (!game.global.preMapsActive && !game.global.mapsActive) { + mapsClicked(); while (game.options.menu.repeatUntil.enabled!=2)// no idea what this is, but i assume its to make it repeat till no prestiges drop? { toggleSetting('repeatUntil'); @@ -186,7 +188,7 @@ function BWraidingzone() { game.options.menu.mapAtZone.enabled = 1; prestraid = false; } - +} //BWraidingmax From 7bea1e318d16585e0bcd6e85c2f7b0faea018b25 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:06:56 +0100 Subject: [PATCH 0144/3477] Update other.js --- modules/other.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index a17bbe762..86df66784 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,11 +163,10 @@ var prestraid = false; //BWraidingzone function BWraidingzone() { - if (BWraid == true && game.global.world == BWraidz && !prestraid && getPageSetting('AutoMaps') == 1) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on + if (BWraid == true && game.global.world == BWraidz && !prestraid && getPageSetting('AutoMaps') == 1 && !game.global.preMapsActive && !game.global.mapsActive) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on toggleAutoMaps(); //turns automaps off so it doest interfere - repeatClicked(); //??? - if (!game.global.preMapsActive && !game.global.mapsActive) { + repeatClicked(); //???!game.global.preMapsActive && !game.global.mapsActive mapsClicked(); while (game.options.menu.repeatUntil.enabled!=2)// no idea what this is, but i assume its to make it repeat till no prestiges drop? { From 0de023e16f895b6a98c74f279d8a513954e9a78c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:07:30 +0100 Subject: [PATCH 0145/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 86df66784..1c8d63628 100644 --- a/modules/other.js +++ b/modules/other.js @@ -187,7 +187,7 @@ function BWraidingzone() { game.options.menu.mapAtZone.enabled = 1; prestraid = false; } -} + //BWraidingmax From d74ecfc4ffe69a5991db45111e380a8a1f2fb765 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:09:29 +0100 Subject: [PATCH 0146/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 1c8d63628..a66ae9376 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,7 +163,7 @@ var prestraid = false; //BWraidingzone function BWraidingzone() { - if (BWraid == true && game.global.world == BWraidz && !prestraid && getPageSetting('AutoMaps') == 1 && !game.global.preMapsActive && !game.global.mapsActive) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on + if (BWraid == true && game.global.world == BWraidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on toggleAutoMaps(); //turns automaps off so it doest interfere repeatClicked(); //???!game.global.preMapsActive && !game.global.mapsActive From 238f17b11cab4ebb232fe1357f89daac5378fd56 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:09:55 +0100 Subject: [PATCH 0147/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index a66ae9376..94999b7ff 100644 --- a/modules/other.js +++ b/modules/other.js @@ -165,7 +165,7 @@ var prestraid = false; function BWraidingzone() { if (BWraid == true && game.global.world == BWraidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on - toggleAutoMaps(); //turns automaps off so it doest interfere + //toggleAutoMaps(); //turns automaps off so it doest interfere repeatClicked(); //???!game.global.preMapsActive && !game.global.mapsActive mapsClicked(); while (game.options.menu.repeatUntil.enabled!=2)// no idea what this is, but i assume its to make it repeat till no prestiges drop? From 57db08005d2dce106a4454e9dc77db5f9bb86f21 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:12:47 +0100 Subject: [PATCH 0148/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 94999b7ff..f82a754e8 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,7 +163,7 @@ var prestraid = false; //BWraidingzone function BWraidingzone() { - if (BWraid == true && game.global.world == BWraidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on + if (game.global.world == BWraidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on //toggleAutoMaps(); //turns automaps off so it doest interfere repeatClicked(); //???!game.global.preMapsActive && !game.global.mapsActive From c30e0af511ff6c9abe5461d5ab87bb6fd1b1706a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:16:05 +0100 Subject: [PATCH 0149/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index f82a754e8..dd63d99fa 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,11 +163,11 @@ var prestraid = false; //BWraidingzone function BWraidingzone() { - if (game.global.world == BWraidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on + if (game.global.world == BWraidz && !prestraid) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on //toggleAutoMaps(); //turns automaps off so it doest interfere repeatClicked(); //???!game.global.preMapsActive && !game.global.mapsActive - mapsClicked(); + //mapsClicked(); while (game.options.menu.repeatUntil.enabled!=2)// no idea what this is, but i assume its to make it repeat till no prestiges drop? { toggleSetting('repeatUntil'); From c0a4e9c2cc59aa990044204cf615bfc267bce635 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:17:07 +0100 Subject: [PATCH 0150/3477] Update other.js --- modules/other.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index dd63d99fa..1923ac38b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -184,7 +184,6 @@ function BWraidingzone() { // what does this do? if (game.global.world == BWraidz+1) { - game.options.menu.mapAtZone.enabled = 1; prestraid = false; } From 27ba3b46a2df4058e89afc1a116d7cc1d7ddf2e0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:19:32 +0100 Subject: [PATCH 0151/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 1923ac38b..7abf3af68 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,7 +163,7 @@ var prestraid = false; //BWraidingzone function BWraidingzone() { - if (game.global.world == BWraidz && !prestraid) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on + while (game.global.world == BWraidz && !prestraid) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on //toggleAutoMaps(); //turns automaps off so it doest interfere repeatClicked(); //???!game.global.preMapsActive && !game.global.mapsActive From 67cc3cf5976badd39848c4d3b21bf8296e8efa46 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:21:56 +0100 Subject: [PATCH 0152/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 7abf3af68..ead1f5044 100644 --- a/modules/other.js +++ b/modules/other.js @@ -175,7 +175,7 @@ function BWraidingzone() { setTimeout(function(){ //can this work without timeout? repeatClicked(); //??? plusSixPres(); //sets maps up - buymap(); //buys the prest 6 map, at least, i hope so + buyMap(); //buys the prest 6 map, at least, i hope so selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); //selects first map??? runMap(); prestraid = true; //successfully raided +6 map for all prestiges, so sets to true From 574ec01155cf0f1255998552df6a82cdabde3ff3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:22:45 +0100 Subject: [PATCH 0153/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index ead1f5044..d4a5a4c40 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,7 +163,7 @@ var prestraid = false; //BWraidingzone function BWraidingzone() { - while (game.global.world == BWraidz && !prestraid) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on + if (game.global.world == BWraidz && !prestraid) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on //toggleAutoMaps(); //turns automaps off so it doest interfere repeatClicked(); //???!game.global.preMapsActive && !game.global.mapsActive From ac830dada573f18227321b6bab9fabbd295f25b7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:30:39 +0100 Subject: [PATCH 0154/3477] Update other.js --- modules/other.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index d4a5a4c40..ba3b5941a 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,11 +163,13 @@ var prestraid = false; //BWraidingzone function BWraidingzone() { - if (game.global.world == BWraidz && !prestraid) //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on + if (game.global.world == BWraidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive && getPageSetting('AutoMaps') == 1) { + mapsClicked(); + //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on - //toggleAutoMaps(); //turns automaps off so it doest interfere + toggleAutoMaps(); //turns automaps off so it doest interfere repeatClicked(); //???!game.global.preMapsActive && !game.global.mapsActive - //mapsClicked(); + mapsClicked(); while (game.options.menu.repeatUntil.enabled!=2)// no idea what this is, but i assume its to make it repeat till no prestiges drop? { toggleSetting('repeatUntil'); @@ -180,7 +182,9 @@ function BWraidingzone() { runMap(); prestraid = true; //successfully raided +6 map for all prestiges, so sets to true },3000 ); //timeout + toggleAutoMaps(); } +} // what does this do? if (game.global.world == BWraidz+1) { From 21ce4db3086361c3b3df99eadd15e0d7ed1c3d08 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:34:13 +0100 Subject: [PATCH 0155/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index ba3b5941a..55389d66f 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,7 +163,7 @@ var prestraid = false; //BWraidingzone function BWraidingzone() { - if (game.global.world == BWraidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive && getPageSetting('AutoMaps') == 1) { + if (game.global.world == BWraidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive) { mapsClicked(); //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on From 645e31f1df64ed95665761634d19843110ca6d2b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 27 Apr 2018 23:35:16 +0100 Subject: [PATCH 0156/3477] Update other.js --- modules/other.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index 55389d66f..39e479ac1 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,11 +163,9 @@ var prestraid = false; //BWraidingzone function BWraidingzone() { - if (game.global.world == BWraidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive) { - mapsClicked(); - //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on + if (game.global.world == BWraidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive) { //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on - toggleAutoMaps(); //turns automaps off so it doest interfere + //toggleAutoMaps(); //turns automaps off so it doest interfere repeatClicked(); //???!game.global.preMapsActive && !game.global.mapsActive mapsClicked(); while (game.options.menu.repeatUntil.enabled!=2)// no idea what this is, but i assume its to make it repeat till no prestiges drop? From e70e45fbdf5b3d89f28e75019f8e2dd8f2f2ef33 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 4 May 2018 19:41:44 +0100 Subject: [PATCH 0157/3477] Update other.js --- modules/other.js | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/modules/other.js b/modules/other.js index 39e479ac1..acda0ccd8 100644 --- a/modules/other.js +++ b/modules/other.js @@ -157,16 +157,17 @@ function plusFivePres() updateMapCost(); } -var BWraidz = getPageSetting('BWraidingzone'); +var Praidz = getPageSetting('Praidingzone'); var bwraidedd = false; var prestraid = false; //BWraidingzone -function BWraidingzone() { - if (game.global.world == BWraidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive) { //checks if raiding enabled, your zone matches the bwraidz setting, you havent raided yet and automaps is on - - //toggleAutoMaps(); //turns automaps off so it doest interfere - repeatClicked(); //???!game.global.preMapsActive && !game.global.mapsActive +function Praidingzone() { + if (game.global.world == Praidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive) { //checks if raiding enabled, your zone matches the Praidz setting, you havent raided yet and automaps is on + if (getPageSetting('AutoMaps') == 1){ + toggleAutoMaps(); //turns automaps off so it doest interfere + } + repeatClicked(); //toggles off repeat mapsClicked(); while (game.options.menu.repeatUntil.enabled!=2)// no idea what this is, but i assume its to make it repeat till no prestiges drop? { @@ -174,7 +175,7 @@ function BWraidingzone() { } setTimeout(function(){ //can this work without timeout? repeatClicked(); //??? - plusSixPres(); //sets maps up + if(game.global.world == Praidz){ plusSixPres();} buyMap(); //buys the prest 6 map, at least, i hope so selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); //selects first map??? runMap(); @@ -182,15 +183,19 @@ function BWraidingzone() { },3000 ); //timeout toggleAutoMaps(); } + else if (prestraid && game.global.preMapsActive){ + recycleMap(); + toggleAutoMaps(); + game.options.menu.mapAtZone.enabled = 0; + } } -// what does this do? - if (game.global.world == BWraidz+1) + + if (game.global.world == Praidz+1) { prestraid = false; } - //BWraidingmax //function BWraidingmax() { //getPageSetting('BWraidingmax') From e5d1d225993e69b324c877fd33b7720c04354767 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 4 May 2018 19:42:51 +0100 Subject: [PATCH 0158/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 5ab8c13c4..eb33fa776 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -377,7 +377,7 @@ function initializeAllSettings() { //Line 2 createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding Z.', 'boolean', false, null, 'Spire'); - createSetting('BWraidingzone', 'BW Raiding Z', 'Raids BW at zone specified. Example: 495, will raid BWs at z495. Needs Max BW to raid setting to work.', 'value', -1, null, 'Spire'); + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps at zone specified. Example: 495, will raid Maps at z+6.', 'value', -1, null, 'Spire'); //createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to world. ', 'value', -1, null, 'Spire'); From b9781086327e0d3a0293c958116957fa185b9099 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 4 May 2018 19:50:41 +0100 Subject: [PATCH 0159/3477] Update other.js --- modules/other.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index acda0ccd8..1fef0a261 100644 --- a/modules/other.js +++ b/modules/other.js @@ -161,7 +161,8 @@ var Praidz = getPageSetting('Praidingzone'); var bwraidedd = false; var prestraid = false; -//BWraidingzone +//Praidingzone + function Praidingzone() { if (game.global.world == Praidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive) { //checks if raiding enabled, your zone matches the Praidz setting, you havent raided yet and automaps is on if (getPageSetting('AutoMaps') == 1){ @@ -185,11 +186,14 @@ function Praidingzone() { } else if (prestraid && game.global.preMapsActive){ recycleMap(); - toggleAutoMaps(); + if (getPageSetting('AutoMaps') == 0){ + toggleAutoMaps(); + } game.options.menu.mapAtZone.enabled = 0; } } + if (game.global.world == Praidz+1) { prestraid = false; From 661ec0126549698bd75f43a96587b9b85bfbbaad Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 11:02:22 +0100 Subject: [PATCH 0160/3477] Update other.js --- modules/other.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 1fef0a261..2bbc1331c 100644 --- a/modules/other.js +++ b/modules/other.js @@ -158,7 +158,6 @@ function plusFivePres() } var Praidz = getPageSetting('Praidingzone'); -var bwraidedd = false; var prestraid = false; //Praidingzone @@ -189,7 +188,6 @@ function Praidingzone() { if (getPageSetting('AutoMaps') == 0){ toggleAutoMaps(); } - game.options.menu.mapAtZone.enabled = 0; } } @@ -198,6 +196,7 @@ function Praidingzone() { { prestraid = false; } +setInterval(Praidingzone, 1000); //BWraidingmax From 09785aa526b4ea8538440a5f3c02e3723dadb03f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 11:19:41 +0100 Subject: [PATCH 0161/3477] Update other.js --- modules/other.js | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/modules/other.js b/modules/other.js index 2bbc1331c..69d0d502d 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,40 +163,46 @@ var prestraid = false; //Praidingzone function Praidingzone() { - if (game.global.world == Praidz && !prestraid && !game.global.preMapsActive && !game.global.mapsActive) { //checks if raiding enabled, your zone matches the Praidz setting, you havent raided yet and automaps is on + if (game.global.world == Praidz && !prestraid) { //checks if raiding enabled, your zone matches the Praidz setting, you havent raided yet and automaps is on if (getPageSetting('AutoMaps') == 1){ toggleAutoMaps(); //turns automaps off so it doest interfere - } + } repeatClicked(); //toggles off repeat - mapsClicked(); - while (game.options.menu.repeatUntil.enabled!=2)// no idea what this is, but i assume its to make it repeat till no prestiges drop? - { + if (!game.global.preMapsActive && !game.global.mapsActive) { + mapsClicked(); + } + while (game.options.menu.repeatUntil.enabled!=2) { toggleSetting('repeatUntil'); } setTimeout(function(){ //can this work without timeout? repeatClicked(); //??? - if(game.global.world == Praidz){ plusSixPres();} - buyMap(); //buys the prest 6 map, at least, i hope so + if (game.global.world == Praidz && game.global.preMapsActive) { + plusSixPres(); + } + if (game.global.world == Praidz && game.global.preMapsActive) { + buyMap(); //buys the prest 6 map, at least, i hope so + } selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); //selects first map??? runMap(); prestraid = true; //successfully raided +6 map for all prestiges, so sets to true },3000 ); //timeout - toggleAutoMaps(); - } - else if (prestraid && game.global.preMapsActive){ - recycleMap(); + if (getPageSetting('AutoMaps') == 0) { + toggleAutoMaps(); //turns automaps back on + } + else if (prestraid && game.global.preMapsActive){ if (getPageSetting('AutoMaps') == 0){ - toggleAutoMaps(); - } + toggleAutoMaps(); + } } -} + } + } if (game.global.world == Praidz+1) { prestraid = false; } -setInterval(Praidingzone, 1000); +Praidingzone(); //BWraidingmax From 26e5f9666a14ff6f0327a486e813cdb0063053dd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 11:23:03 +0100 Subject: [PATCH 0162/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 69d0d502d..078e284ce 100644 --- a/modules/other.js +++ b/modules/other.js @@ -202,7 +202,7 @@ function Praidingzone() { { prestraid = false; } -Praidingzone(); + //BWraidingmax From 44f46a8086621d4e033e3312f894f428e9f07763 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 11:26:45 +0100 Subject: [PATCH 0163/3477] This will work, i command it --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 22570ad67..d2403cc27 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -238,6 +238,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('Praidingzone')>1) Praidingzone(); //Prestige Raiding (other.js) // //Runs any user provided scripts, see line 253 below if (userscriptOn) userscripts(); From 81c367361c74d75de14024e8f7f4adeb4af82be5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 11:35:07 +0100 Subject: [PATCH 0164/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index d2403cc27..f436634cf 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -207,7 +207,8 @@ function mainLoop() { setScienceNeeded(); //determine how much science is needed //EXECUTE CORE LOGIC - if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) + if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) + if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); if (agu && agu!='Off') autoGoldenUpgradesAT(agu); //"Golden Upgrades" (other.js) @@ -238,9 +239,8 @@ 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('Praidingzone')>1) Praidingzone(); //Prestige Raiding (other.js) // - //Runs any user provided scripts, see line 253 below + //Runs any user provided scripts, see line 254 below if (userscriptOn) userscripts(); // //rinse, repeat, done From 3b1575c0d81430919d5c84a6646cb77ff6738d0d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 11:37:08 +0100 Subject: [PATCH 0165/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 078e284ce..ba5d57008 100644 --- a/modules/other.js +++ b/modules/other.js @@ -160,9 +160,9 @@ function plusFivePres() var Praidz = getPageSetting('Praidingzone'); var prestraid = false; -//Praidingzone +//Praiding -function Praidingzone() { +function Praiding() { if (game.global.world == Praidz && !prestraid) { //checks if raiding enabled, your zone matches the Praidz setting, you havent raided yet and automaps is on if (getPageSetting('AutoMaps') == 1){ toggleAutoMaps(); //turns automaps off so it doest interfere From 3d75364e9aca4c4367eeb6b13ea83a17f6249b0d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 18:15:08 +0100 Subject: [PATCH 0166/3477] Update other.js --- modules/other.js | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/modules/other.js b/modules/other.js index ba5d57008..35509b930 100644 --- a/modules/other.js +++ b/modules/other.js @@ -166,36 +166,42 @@ function Praiding() { if (game.global.world == Praidz && !prestraid) { //checks if raiding enabled, your zone matches the Praidz setting, you havent raided yet and automaps is on if (getPageSetting('AutoMaps') == 1){ toggleAutoMaps(); //turns automaps off so it doest interfere + debug("Toggling AutoMaps"); } repeatClicked(); //toggles off repeat if (!game.global.preMapsActive && !game.global.mapsActive) { - mapsClicked(); + mapsClicked(); + debug("Going into Map Selection"); } - while (game.options.menu.repeatUntil.enabled!=2) { - toggleSetting('repeatUntil'); + if (game.options.menu.repeatUntil.enabled!=2) { + game.options.menu.repeatUntil.enabled = 2; } - setTimeout(function(){ //can this work without timeout? repeatClicked(); //??? + debug("Setting Map"); if (game.global.world == Praidz && game.global.preMapsActive) { - plusSixPres(); - } - if (game.global.world == Praidz && game.global.preMapsActive) { - buyMap(); //buys the prest 6 map, at least, i hope so + plusSixPres(); + buyMap(); //buys the prest 6 map, at least, i hope so } + debug("Bought Map"); selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); //selects first map??? + debug("Running Map"); runMap(); prestraid = true; //successfully raided +6 map for all prestiges, so sets to true - },3000 ); //timeout + debug("Successfully prestiged"); + } if (getPageSetting('AutoMaps') == 0) { - toggleAutoMaps(); //turns automaps back on + toggleAutoMaps(); //turns automaps back on + debug("Turning AutoMaps back off"); } - else if (prestraid && game.global.preMapsActive){ - if (getPageSetting('AutoMaps') == 0){ - toggleAutoMaps(); + else if (prestraid && game.global.preMapsActive){ + recycleMap(); + debug("Recycling Map"); + if (getPageSetting('AutoMaps') == 0){ + toggleAutoMaps(); + } } } - } if (game.global.world == Praidz+1) From 6a63da7bf102d715981f4c77987351ceb69075a0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 18:34:01 +0100 Subject: [PATCH 0167/3477] Update other.js --- modules/other.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/other.js b/modules/other.js index 35509b930..17e5a0df7 100644 --- a/modules/other.js +++ b/modules/other.js @@ -157,9 +157,6 @@ function plusFivePres() updateMapCost(); } -var Praidz = getPageSetting('Praidingzone'); -var prestraid = false; - //Praiding function Praiding() { @@ -175,8 +172,7 @@ function Praiding() { } if (game.options.menu.repeatUntil.enabled!=2) { game.options.menu.repeatUntil.enabled = 2; - } - repeatClicked(); //??? + } debug("Setting Map"); if (game.global.world == Praidz && game.global.preMapsActive) { plusSixPres(); From 34998437aed92bf0cc0c894f3682db2439be704e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 18:34:48 +0100 Subject: [PATCH 0168/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index f436634cf..62419e399 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -165,6 +165,8 @@ var needGymystic = true; //used in setScienceNeeded, buildings.js, equipment. var heirloomFlag = false; var heirloomCache = game.global.heirloomsExtra.length; var magmiteSpenderChanged = false; +var Praidz = getPageSetting('Praidingzone'); +var prestraid = false; //////////////////////////////////////// //Main LOGIC Loop/////////////////////// From 4f8e24f80f8d97f1cee5bfeb9a68d98645e11c63 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 18:37:04 +0100 Subject: [PATCH 0169/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 - 1 file changed, 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 62419e399..810de1e83 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -165,7 +165,6 @@ var needGymystic = true; //used in setScienceNeeded, buildings.js, equipment. var heirloomFlag = false; var heirloomCache = game.global.heirloomsExtra.length; var magmiteSpenderChanged = false; -var Praidz = getPageSetting('Praidingzone'); var prestraid = false; //////////////////////////////////////// From dda5949077acae7e2c7e6dc472187634e9fadbe1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 18:40:11 +0100 Subject: [PATCH 0170/3477] Update other.js --- modules/other.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/other.js b/modules/other.js index 17e5a0df7..0e44ad92a 100644 --- a/modules/other.js +++ b/modules/other.js @@ -160,6 +160,8 @@ function plusFivePres() //Praiding function Praiding() { +var Praidz = getPageSetting('Praidingzone'); +var prestraid = false; if (game.global.world == Praidz && !prestraid) { //checks if raiding enabled, your zone matches the Praidz setting, you havent raided yet and automaps is on if (getPageSetting('AutoMaps') == 1){ toggleAutoMaps(); //turns automaps off so it doest interfere From 7af9dfc4c96d3baa15c589aad4daeeaad214d8c7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 18:41:46 +0100 Subject: [PATCH 0171/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0e44ad92a..40af8099b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -1,5 +1,7 @@ MODULES["other"] = {}; MODULES["other"].enableRoboTrimpSpam = true; //set this to false to stop Spam of "Activated Robotrimp MagnetoShriek Ability" +var Praidz = getPageSetting('Praidingzone'); +var prestraid = false; //Activate Robo Trimp (will activate on the first zone after liquification) @@ -160,8 +162,6 @@ function plusFivePres() //Praiding function Praiding() { -var Praidz = getPageSetting('Praidingzone'); -var prestraid = false; if (game.global.world == Praidz && !prestraid) { //checks if raiding enabled, your zone matches the Praidz setting, you havent raided yet and automaps is on if (getPageSetting('AutoMaps') == 1){ toggleAutoMaps(); //turns automaps off so it doest interfere From 350fb99d5b36a3339855b03b73c22f2a8e6a4cd2 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 18:42:09 +0100 Subject: [PATCH 0172/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 - 1 file changed, 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 810de1e83..f436634cf 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -165,7 +165,6 @@ var needGymystic = true; //used in setScienceNeeded, buildings.js, equipment. var heirloomFlag = false; var heirloomCache = game.global.heirloomsExtra.length; var magmiteSpenderChanged = false; -var prestraid = false; //////////////////////////////////////// //Main LOGIC Loop/////////////////////// From dbc10ebd3dc41628ff2a87e59dc14258ad9aa0f6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 18:53:04 +0100 Subject: [PATCH 0173/3477] Update other.js --- modules/other.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/other.js b/modules/other.js index 40af8099b..5bcca3006 100644 --- a/modules/other.js +++ b/modules/other.js @@ -184,6 +184,9 @@ function Praiding() { selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); //selects first map??? debug("Running Map"); runMap(); + if (!game.global.repeatMap) { + repeatClicked(); + } prestraid = true; //successfully raided +6 map for all prestiges, so sets to true debug("Successfully prestiged"); } From 60bc37217240452326fd8dfb6bf2b7a2519bd91d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 19:04:26 +0100 Subject: [PATCH 0174/3477] Update other.js --- modules/other.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/modules/other.js b/modules/other.js index 5bcca3006..a8b3c795e 100644 --- a/modules/other.js +++ b/modules/other.js @@ -163,20 +163,19 @@ function plusFivePres() function Praiding() { if (game.global.world == Praidz && !prestraid) { //checks if raiding enabled, your zone matches the Praidz setting, you havent raided yet and automaps is on - if (getPageSetting('AutoMaps') == 1){ + if (getPageSetting('AutoMaps') == 1 && game.global.world == Praidz && !prestraid){ toggleAutoMaps(); //turns automaps off so it doest interfere debug("Toggling AutoMaps"); } - repeatClicked(); //toggles off repeat - if (!game.global.preMapsActive && !game.global.mapsActive) { + if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == Praidz && !prestraid) { mapsClicked(); debug("Going into Map Selection"); } - if (game.options.menu.repeatUntil.enabled!=2) { + if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == Praidz && !prestraid) { game.options.menu.repeatUntil.enabled = 2; } debug("Setting Map"); - if (game.global.world == Praidz && game.global.preMapsActive) { + if (game.global.world == Praidz && game.global.preMapsActive && !prestraid) { plusSixPres(); buyMap(); //buys the prest 6 map, at least, i hope so } @@ -184,19 +183,17 @@ function Praiding() { selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); //selects first map??? debug("Running Map"); runMap(); - if (!game.global.repeatMap) { + if (!game.global.repeatMap && game.global.world == Praidz && !prestraid) { repeatClicked(); } prestraid = true; //successfully raided +6 map for all prestiges, so sets to true debug("Successfully prestiged"); } - if (getPageSetting('AutoMaps') == 0) { + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == Praidz && prestraid) { toggleAutoMaps(); //turns automaps back on debug("Turning AutoMaps back off"); } else if (prestraid && game.global.preMapsActive){ - recycleMap(); - debug("Recycling Map"); if (getPageSetting('AutoMaps') == 0){ toggleAutoMaps(); From ee63dbe53acadcfe12eb864d3a28c432b16ef0c9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 19:06:01 +0100 Subject: [PATCH 0175/3477] Update other.js --- modules/other.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/other.js b/modules/other.js index a8b3c795e..f3ae84a21 100644 --- a/modules/other.js +++ b/modules/other.js @@ -193,12 +193,7 @@ function Praiding() { toggleAutoMaps(); //turns automaps back on debug("Turning AutoMaps back off"); } - else if (prestraid && game.global.preMapsActive){ - if (getPageSetting('AutoMaps') == 0){ - toggleAutoMaps(); - } - } } From 760fa09cfb18ef98734cbb85b31b881889b36e28 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 19:10:47 +0100 Subject: [PATCH 0176/3477] Update other.js --- modules/other.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/modules/other.js b/modules/other.js index f3ae84a21..69139cd10 100644 --- a/modules/other.js +++ b/modules/other.js @@ -1,6 +1,5 @@ MODULES["other"] = {}; MODULES["other"].enableRoboTrimpSpam = true; //set this to false to stop Spam of "Activated Robotrimp MagnetoShriek Ability" -var Praidz = getPageSetting('Praidingzone'); var prestraid = false; @@ -162,20 +161,20 @@ function plusFivePres() //Praiding function Praiding() { - if (game.global.world == Praidz && !prestraid) { //checks if raiding enabled, your zone matches the Praidz setting, you havent raided yet and automaps is on - if (getPageSetting('AutoMaps') == 1 && game.global.world == Praidz && !prestraid){ + if (game.global.world == getPageSetting('Praidingzone') && !prestraid) { //checks if raiding enabled, your zone matches the Praidz setting, you havent raided yet and automaps is on + if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid){ toggleAutoMaps(); //turns automaps off so it doest interfere debug("Toggling AutoMaps"); } - if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == Praidz && !prestraid) { + if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid) { mapsClicked(); debug("Going into Map Selection"); } - if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == Praidz && !prestraid) { + if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { game.options.menu.repeatUntil.enabled = 2; } debug("Setting Map"); - if (game.global.world == Praidz && game.global.preMapsActive && !prestraid) { + if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid) { plusSixPres(); buyMap(); //buys the prest 6 map, at least, i hope so } @@ -183,21 +182,21 @@ function Praiding() { selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); //selects first map??? debug("Running Map"); runMap(); - if (!game.global.repeatMap && game.global.world == Praidz && !prestraid) { + if (!game.global.repeatMap && game.global.world == getPageSetting('Praidingzone') && !prestraid) { repeatClicked(); } prestraid = true; //successfully raided +6 map for all prestiges, so sets to true debug("Successfully prestiged"); } - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == Praidz && prestraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('Praidingzone') && prestraid) { toggleAutoMaps(); //turns automaps back on - debug("Turning AutoMaps back off"); + debug("Turning AutoMaps back on"); } } - if (game.global.world == Praidz+1) + if (game.global.world !== getPageSetting('Praidingzone')) { prestraid = false; } From 48dd1d4e578122c74334636250314909d0e2e5ea Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 19:15:18 +0100 Subject: [PATCH 0177/3477] Update other.js --- modules/other.js | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/modules/other.js b/modules/other.js index 69139cd10..5a410c878 100644 --- a/modules/other.js +++ b/modules/other.js @@ -161,9 +161,9 @@ function plusFivePres() //Praiding function Praiding() { - if (game.global.world == getPageSetting('Praidingzone') && !prestraid) { //checks if raiding enabled, your zone matches the Praidz setting, you havent raided yet and automaps is on + if (game.global.world == getPageSetting('Praidingzone') && !prestraid) { if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid){ - toggleAutoMaps(); //turns automaps off so it doest interfere + toggleAutoMaps(); debug("Toggling AutoMaps"); } if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid) { @@ -176,31 +176,28 @@ function Praiding() { debug("Setting Map"); if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid) { plusSixPres(); - buyMap(); //buys the prest 6 map, at least, i hope so + buyMap(); } debug("Bought Map"); - selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); //selects first map??? + selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); debug("Running Map"); runMap(); if (!game.global.repeatMap && game.global.world == getPageSetting('Praidingzone') && !prestraid) { repeatClicked(); } - prestraid = true; //successfully raided +6 map for all prestiges, so sets to true + prestraid = true; debug("Successfully prestiged"); } if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('Praidingzone') && prestraid) { - toggleAutoMaps(); //turns automaps back on + toggleAutoMaps(); debug("Turning AutoMaps back on"); } - - } - - - if (game.global.world !== getPageSetting('Praidingzone')) - { + else if (game.global.world !== getPageSetting('Praidingzone')) { + debug("Setting prestraid back to false"); prestraid = false; } - + + } //BWraidingmax From 6c50f84988f4ecfb02f9850e8c46f7d7d130765a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 19:16:45 +0100 Subject: [PATCH 0178/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 5a410c878..f3d6a4f31 100644 --- a/modules/other.js +++ b/modules/other.js @@ -192,7 +192,7 @@ function Praiding() { toggleAutoMaps(); debug("Turning AutoMaps back on"); } - else if (game.global.world !== getPageSetting('Praidingzone')) { + else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { debug("Setting prestraid back to false"); prestraid = false; } From c1d85c664c1fb35e43b6969e50c0461c4612778f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 20:25:13 +0100 Subject: [PATCH 0179/3477] Update other.js --- modules/other.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index f3d6a4f31..9c2c77156 100644 --- a/modules/other.js +++ b/modules/other.js @@ -1,7 +1,7 @@ MODULES["other"] = {}; MODULES["other"].enableRoboTrimpSpam = true; //set this to false to stop Spam of "Activated Robotrimp MagnetoShriek Ability" var prestraid = false; - +var failpraid = false; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { @@ -161,9 +161,9 @@ function plusFivePres() //Praiding function Praiding() { - if (game.global.world == getPageSetting('Praidingzone') && !prestraid) { + if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid){ - toggleAutoMaps(); + autoTrimpSettings["AutoMaps"].value = 0; debug("Toggling AutoMaps"); } if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid) { @@ -176,11 +176,22 @@ function Praiding() { debug("Setting Map"); if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid) { plusSixPres(); + if (buyMap() > 0) { buyMap(); + failpraid = false; + } + else if (buyMap() < 0) { + if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { + autoTrimpSettings["AutoMaps"].value = 1; + failpraid = true; + } + return; + } debug("Bought Map"); selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); debug("Running Map"); + } runMap(); if (!game.global.repeatMap && game.global.world == getPageSetting('Praidingzone') && !prestraid) { repeatClicked(); @@ -189,7 +200,7 @@ function Praiding() { debug("Successfully prestiged"); } if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('Praidingzone') && prestraid) { - toggleAutoMaps(); + autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { From 97314c6b6c647ec3e612471bdd1c984a94419bd5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 21:35:18 +0100 Subject: [PATCH 0180/3477] Update other.js --- modules/other.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 9c2c77156..52b716ec8 100644 --- a/modules/other.js +++ b/modules/other.js @@ -158,6 +158,18 @@ function plusFivePres() updateMapCost(); } + function plusSevPres() + { + document.getElementById("biomeAdvMapsSelect").value = "Random"; + document.getElementById('advExtraLevelSelect').value = 7; + document.getElementById('advSpecialSelect').value = 0; + document.getElementById("lootAdvMapsRange").value = 0; + document.getElementById("difficultyAdvMapsRange").value = 9; + document.getElementById("sizeAdvMapsRange").value = 9; + document.getElementById('advPerfectCheckbox').checked = false; + updateMapCost(); + } + //Praiding function Praiding() { @@ -175,7 +187,7 @@ function Praiding() { } debug("Setting Map"); if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid) { - plusSixPres(); + ? plusSevPres():plusSixPres():plusFivePres(); if (buyMap() > 0) { buyMap(); failpraid = false; From 65ba535ed6d6bda9374c97ed8fca4abd47d473b4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 21:38:25 +0100 Subject: [PATCH 0181/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 52b716ec8..0426f3252 100644 --- a/modules/other.js +++ b/modules/other.js @@ -187,7 +187,7 @@ function Praiding() { } debug("Setting Map"); if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid) { - ? plusSevPres():plusSixPres():plusFivePres(); + plusSevPres():plusSixPres():plusFivePres(); if (buyMap() > 0) { buyMap(); failpraid = false; From b7cab60740974125ba3d04a15d3c0c901e91676c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 21:59:35 +0100 Subject: [PATCH 0182/3477] Update other.js --- modules/other.js | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0426f3252..57fa2af87 100644 --- a/modules/other.js +++ b/modules/other.js @@ -134,7 +134,7 @@ function exitSpireCell() { endSpire(); } -function plusFivePres() +function plusFivePres() { document.getElementById("biomeAdvMapsSelect").value = "Random"; document.getElementById('advExtraLevelSelect').value = 5; @@ -170,6 +170,41 @@ function plusFivePres() updateMapCost(); } + function plusPres() + { + document.getElementById("biomeAdvMapsSelect").value = "Random"; + document.getElementById('advExtraLevelSelect').value = plusMapToRun(game.global.world); + document.getElementById('advSpecialSelect').value = "p"; + document.getElementById("lootAdvMapsRange").value = 0; + document.getElementById("difficultyAdvMapsRange").value = 9; + document.getElementById("sizeAdvMapsRange").value = 9; + document.getElementById('advPerfectCheckbox').checked = false; + updateMapCost(); + } + + function plusMapToRun(zone) + { + var currentModifier = (zone-235)%15; + if (currentModifier == 1){ + if ( zone%10 == 1){ + return 4; + } + else if ( zone%10 == 6) + { + return 5; + } + } + else if (currentModifier == 5){ + if (zone%10 == 5) { + return 6; + } + else if ( zone%10 == 0) { + return 5; + } + } + return 0; + } + //Praiding function Praiding() { @@ -187,7 +222,7 @@ function Praiding() { } debug("Setting Map"); if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid) { - plusSevPres():plusSixPres():plusFivePres(); + plusPres(); if (buyMap() > 0) { buyMap(); failpraid = false; @@ -221,6 +256,7 @@ function Praiding() { } } + //BWraidingmax From 9e1c4d8749a8a8918edbc5f45812ed488e221952 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 22:03:10 +0100 Subject: [PATCH 0183/3477] Update other.js --- modules/other.js | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/modules/other.js b/modules/other.js index 57fa2af87..643890651 100644 --- a/modules/other.js +++ b/modules/other.js @@ -182,27 +182,12 @@ function plusFivePres() updateMapCost(); } - function plusMapToRun(zone) - { - var currentModifier = (zone-235)%15; - if (currentModifier == 1){ - if ( zone%10 == 1){ - return 4; - } - else if ( zone%10 == 6) - { - return 5; - } - } - else if (currentModifier == 5){ - if (zone%10 == 5) { - return 6; - } - else if ( zone%10 == 0) { - return 5; - } - } - return 0; + function plusMapToRun(zone) + { + if (zone %10 <=5) + return 5 - zone%10; + else + return 11 - zone%10; } //Praiding From 3852fa901bab9f46b92a37a0e7a698f671c859a7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 22:04:35 +0100 Subject: [PATCH 0184/3477] Update other.js --- modules/other.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/other.js b/modules/other.js index 643890651..c58c98b35 100644 --- a/modules/other.js +++ b/modules/other.js @@ -229,6 +229,7 @@ function Praiding() { repeatClicked(); } prestraid = true; + failpraid = false; debug("Successfully prestiged"); } if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('Praidingzone') && prestraid) { From b3f0fba5ba56f1cf3082a23000bcabf6435fca1a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 22:32:33 +0100 Subject: [PATCH 0185/3477] Update other.js --- modules/other.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index c58c98b35..0d951db8c 100644 --- a/modules/other.js +++ b/modules/other.js @@ -183,12 +183,12 @@ function plusFivePres() } function plusMapToRun(zone) - { - if (zone %10 <=5) +{ + if (zone %10 < 5) return 5 - zone%10; else return 11 - zone%10; - } +} //Praiding From 307c04498fc049e39d9052e451f80afdd4cab4f6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 12 May 2018 22:38:31 +0100 Subject: [PATCH 0186/3477] Update other.js --- modules/other.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0d951db8c..94fbb46e0 100644 --- a/modules/other.js +++ b/modules/other.js @@ -184,10 +184,12 @@ function plusFivePres() function plusMapToRun(zone) { - if (zone %10 < 5) - return 5 - zone%10; + if (zone % 10 == 9) + return 6 + else if (zone % 10 <5) + return 5 - zone % 10; else - return 11 - zone%10; + return 11 - zone % 10; } //Praiding From c4b0e3e5a9f365a253ab99c313ba195bd28f4ca9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 10:54:46 +0100 Subject: [PATCH 0187/3477] Update other.js --- modules/other.js | 53 ++++++------------------------------------------ 1 file changed, 6 insertions(+), 47 deletions(-) diff --git a/modules/other.js b/modules/other.js index 94fbb46e0..6b9660b70 100644 --- a/modules/other.js +++ b/modules/other.js @@ -134,42 +134,6 @@ function exitSpireCell() { endSpire(); } -function plusFivePres() - { - document.getElementById("biomeAdvMapsSelect").value = "Random"; - document.getElementById('advExtraLevelSelect').value = 5; - document.getElementById('advSpecialSelect').value = 0; - document.getElementById("lootAdvMapsRange").value = 0; - document.getElementById("difficultyAdvMapsRange").value = 9; - document.getElementById("sizeAdvMapsRange").value = 9; - document.getElementById('advPerfectCheckbox').checked = false; - updateMapCost(); - } - - function plusSixPres() - { - document.getElementById("biomeAdvMapsSelect").value = "Random"; - document.getElementById('advExtraLevelSelect').value = 6; - document.getElementById('advSpecialSelect').value = 0; - document.getElementById("lootAdvMapsRange").value = 0; - document.getElementById("difficultyAdvMapsRange").value = 9; - document.getElementById("sizeAdvMapsRange").value = 9; - document.getElementById('advPerfectCheckbox').checked = false; - updateMapCost(); - } - - function plusSevPres() - { - document.getElementById("biomeAdvMapsSelect").value = "Random"; - document.getElementById('advExtraLevelSelect').value = 7; - document.getElementById('advSpecialSelect').value = 0; - document.getElementById("lootAdvMapsRange").value = 0; - document.getElementById("difficultyAdvMapsRange").value = 9; - document.getElementById("sizeAdvMapsRange").value = 9; - document.getElementById('advPerfectCheckbox').checked = false; - updateMapCost(); - } - function plusPres() { document.getElementById("biomeAdvMapsSelect").value = "Random"; @@ -195,19 +159,17 @@ function plusFivePres() //Praiding function Praiding() { - if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { + if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid){ autoTrimpSettings["AutoMaps"].value = 0; - debug("Toggling AutoMaps"); + debug("Beginning Prestige Raiding..."); } if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid) { mapsClicked(); - debug("Going into Map Selection"); } if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { game.options.menu.repeatUntil.enabled = 2; } - debug("Setting Map"); if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid) { plusPres(); if (buyMap() > 0) { @@ -218,13 +180,12 @@ function Praiding() { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { autoTrimpSettings["AutoMaps"].value = 1; failpraid = true; + debug("Failed to prestige raid. Looks like you can't afford to.."); } return; } - debug("Bought Map"); selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); - debug("Running Map"); } runMap(); if (!game.global.repeatMap && game.global.world == getPageSetting('Praidingzone') && !prestraid) { @@ -232,15 +193,13 @@ function Praiding() { } prestraid = true; failpraid = false; - debug("Successfully prestiged"); + debug("...Successfully prestiged!"); } if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('Praidingzone') && prestraid) { autoTrimpSettings["AutoMaps"].value = 1; - debug("Turning AutoMaps back on"); } - else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { - debug("Setting prestraid back to false"); - prestraid = false; + else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { + prestraid = false; } } From 7ea530291a1225276911ce6cd42e48c4ad8bed53 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 13:45:26 +0100 Subject: [PATCH 0188/3477] Update SettingsGUI.js --- SettingsGUI.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index eb33fa776..a90e2fd3c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -376,9 +376,11 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 - createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding Z.', 'boolean', false, null, 'Spire'); - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps at zone specified. Example: 495, will raid Maps at z+6.', 'value', -1, null, 'Spire'); - //createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to world. ', 'value', -1, null, 'Spire'); + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); + createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); + createSetting('BWraidingmin', 'Max BW to raid', 'Raids BWs at zone specified. Example: 485, will raid all BWs for all gear starting from 485. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. ', 'value', -1, null, 'Spire'); + createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. ', 'value', -1, null, 'Spire'); + //Combat From 1d5c52807a90d513dc45d29ca2fbbca489bc6d13 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 14:17:37 +0100 Subject: [PATCH 0189/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index f436634cf..6d52f8cab 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -208,7 +208,8 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) - if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) + if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) + if (getPageSetting('BWraid') BWraid(); //BW Raiding (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); if (agu && agu!='Off') autoGoldenUpgradesAT(agu); //"Golden Upgrades" (other.js) From 5a6b896f379251e0b44f0c5f6ec600ceaec7f11e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 14:22:54 +0100 Subject: [PATCH 0190/3477] Update other.js --- modules/other.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/other.js b/modules/other.js index 6b9660b70..8b4a979a9 100644 --- a/modules/other.js +++ b/modules/other.js @@ -2,7 +2,8 @@ MODULES["other"] = {}; MODULES["other"].enableRoboTrimpSpam = true; //set this to false to stop Spam of "Activated Robotrimp MagnetoShriek Ability" var prestraid = false; var failpraid = false; - +var BWrmn = getPageSetting('BWraidingmin'); +var BWrmx = getPageSetting('BWraidingmax'); //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { //exit if the cooldown is active, or we havent unlocked robotrimp. @@ -206,7 +207,9 @@ function Praiding() { -//BWraidingmax -//function BWraidingmax() { - //getPageSetting('BWraidingmax') -//} +//BWraiding +function BWraid() { + getPageSetting('BWraidingmin'); + getPageSetting('BWraidingmax'); + debug('BWRmn ' + 'BWRmx'); +} From b431b429c5027d6f140b56cfcd71e39ac03a8c31 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 14:24:49 +0100 Subject: [PATCH 0191/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 6d52f8cab..b4c53d7eb 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -209,7 +209,7 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) - if (getPageSetting('BWraid') BWraid(); //BW Raiding (other.js) + if (getPageSetting('BWraid')) BWraid(); //BW Raiding (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); if (agu && agu!='Off') autoGoldenUpgradesAT(agu); //"Golden Upgrades" (other.js) From cbbc28f8184686af3f955d07bd1281487486b654 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 14:26:57 +0100 Subject: [PATCH 0192/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 8b4a979a9..0ac763ff5 100644 --- a/modules/other.js +++ b/modules/other.js @@ -211,5 +211,5 @@ function Praiding() { function BWraid() { getPageSetting('BWraidingmin'); getPageSetting('BWraidingmax'); - debug('BWRmn ' + 'BWRmx'); + debug('Converted ' + BWrmn + ' tokens to ' + BWrmx, 'nature'); } From 6fb3b94ab836243d7df071daf9648fc16a8dec41 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 14:27:24 +0100 Subject: [PATCH 0193/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index a90e2fd3c..675e5fa1e 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -378,7 +378,7 @@ function initializeAllSettings() { //Line 2 createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); - createSetting('BWraidingmin', 'Max BW to raid', 'Raids BWs at zone specified. Example: 485, will raid all BWs for all gear starting from 485. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. ', 'value', -1, null, 'Spire'); + createSetting('BWraidingmin', 'Min BW to raid', 'Raids BWs at zone specified. Example: 485, will raid all BWs for all gear starting from 485. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. ', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. ', 'value', -1, null, 'Spire'); From c77c8449c9497bc8a4fab6ac5adf0efa8c5439c0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 14:57:46 +0100 Subject: [PATCH 0194/3477] Update other.js --- modules/other.js | 55 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0ac763ff5..bcd5684c1 100644 --- a/modules/other.js +++ b/modules/other.js @@ -4,6 +4,7 @@ var prestraid = false; var failpraid = false; var BWrmn = getPageSetting('BWraidingmin'); var BWrmx = getPageSetting('BWraidingmax'); +var bwraided = false; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { //exit if the cooldown is active, or we havent unlocked robotrimp. @@ -161,17 +162,17 @@ function exitSpireCell() { function Praiding() { if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { - if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid){ + if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 0; - debug("Beginning Prestige Raiding..."); } - if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid) { + debug("Beginning Prestige Raiding..."); + if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { mapsClicked(); } - if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { + if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { game.options.menu.repeatUntil.enabled = 2; } - if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid) { + if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid && !failpraid) { plusPres(); if (buyMap() > 0) { buyMap(); @@ -189,14 +190,14 @@ function Praiding() { selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); } runMap(); - if (!game.global.repeatMap && game.global.world == getPageSetting('Praidingzone') && !prestraid) { + if (!game.global.repeatMap && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { repeatClicked(); } prestraid = true; failpraid = false; debug("...Successfully prestiged!"); } - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('Praidingzone') && prestraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('Praidingzone') && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; } else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { @@ -208,8 +209,42 @@ function Praiding() { //BWraiding +//BWrmn +//BWrmx function BWraid() { - getPageSetting('BWraidingmin'); - getPageSetting('BWraidingmax'); - debug('Converted ' + BWrmn + ' tokens to ' + BWrmx, 'nature'); + if (game.global.world == BWrmn && !bwraided && !failbwraid) { + if (getPageSetting('AutoMaps') == 1 && game.global.world == BWrmn && !bwraided && !failbwraid) { + autoTrimpSettings["AutoMaps"].value = 0; + } + debug("Beginning BW Raiding..."); + if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == BWrmn && !bwraided && !failbwraid) { + mapsClicked(); + } + if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == BWrmn && !bwraided && !failbwraid) { + game.options.menu.repeatUntil.enabled = 2; + } + if (game.global.world == BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { + //get bw map + } + /*else if cant find bw map{ + if (getPageSetting('AutoMaps') == 0 && game.global.world == BWrmn && !bwraided) { + autoTrimpSettings["AutoMaps"].value = 1; + failbwraid = true; + debug("Failed to BW raid. Looks like you don't have a BW to raid..."); + } + return; + */ + + } + + + + + + + + + + + From 06c0a2fbe3c647294bc317dc03f85e323070dc6c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 15:22:07 +0100 Subject: [PATCH 0195/3477] Update other.js --- modules/other.js | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/modules/other.js b/modules/other.js index bcd5684c1..9d1a6e0fb 100644 --- a/modules/other.js +++ b/modules/other.js @@ -196,15 +196,16 @@ function Praiding() { prestraid = true; failpraid = false; debug("...Successfully prestiged!"); - } + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('Praidingzone') && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; } else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { prestraid = false; - } + } } +} @@ -223,10 +224,11 @@ function BWraid() { if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == BWrmn && !bwraided && !failbwraid) { game.options.menu.repeatUntil.enabled = 2; } - if (game.global.world == BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { - //get bw map + /*if (game.global.world == BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { + get bw map + failbwraid = false; } - /*else if cant find bw map{ + else if cant find bw map { if (getPageSetting('AutoMaps') == 0 && game.global.world == BWrmn && !bwraided) { autoTrimpSettings["AutoMaps"].value = 1; failbwraid = true; @@ -234,17 +236,20 @@ function BWraid() { } return; */ - - + //} + selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); + runMap(); + if (!game.global.repeatMap && game.global.world == BWrmn && !bwraided && !failbwraid) { + repeatClicked(); + } + bwraided = true; + failbwraid = false; + debug("...Successfully BW raided!"); + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == BWrmn && bwraided && !failbwraid) { + autoTrimpSettings["AutoMaps"].value = 1; + } +} + else if (bwraided == true && game.global.world !== BWrmn) { + bwraided = false; + } } - - - - - - - - - - - From 714222cf12630655d6331b53a2a9f4d048dd3f7d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 19:02:32 +0100 Subject: [PATCH 0196/3477] Update SettingsGUI.js --- SettingsGUI.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 675e5fa1e..48eadac8b 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -253,9 +253,9 @@ function initializeAllSettings() { createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); - if (game.worldUnlocks.easterEgg) - createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core'); //could really be removed?? - createSetting('AutoAllocatePerks', 'Auto Allocate Perks', 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. ', 'boolean', false, null, 'Core'); + if (game.worldUnlocks.easterEgg){ + createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core');} + createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); document.getElementById('AutoAllocatePerks').parentNode.insertAdjacentHTML('afterend','
'); //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. @@ -378,10 +378,10 @@ function initializeAllSettings() { //Line 2 createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); - createSetting('BWraidingmin', 'Min BW to raid', 'Raids BWs at zone specified. Example: 485, will raid all BWs for all gear starting from 485. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. ', 'value', -1, null, 'Spire'); - createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. ', 'value', -1, null, 'Spire'); - - + createSetting('BWraidingmin', 'Min BW to raid', 'Raids BWs at zone specified. Example: 485, will raid all BWs for all gear starting from 485. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); + createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); + createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Spire'); + createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will dump 1000 helium into looting II until you can no longer afford to.', 'value', -1, null, 'Spire'); //Combat //Subsection1Line1 From 3856997662a230a5fd8cdb6fbfc340b5c587cc56 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 19:06:28 +0100 Subject: [PATCH 0197/3477] Update portal.js --- modules/portal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 49b44f56a..3b63a5851 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -113,7 +113,7 @@ function doPortal(challenge) { //Go into portal screen portalClicked(); //AutoPerks: do this first, because it reflashes the screen. - if (getPageSetting('AutoAllocatePerks') && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) + if (getPageSetting('AutoAllocatePerks')==1 && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) AutoPerks.clickAllocate(); //Auto Start Daily: if (getPageSetting('AutoStartDaily')) { From 5ebd38fd14f7ef1811b7a0703d0b6ba86c5baae1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 19:23:11 +0100 Subject: [PATCH 0198/3477] Update other.js --- modules/other.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/modules/other.js b/modules/other.js index 9d1a6e0fb..daaf6887e 100644 --- a/modules/other.js +++ b/modules/other.js @@ -5,6 +5,7 @@ var failpraid = false; var BWrmn = getPageSetting('BWraidingmin'); var BWrmx = getPageSetting('BWraidingmax'); var bwraided = false; +var perked = false; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { //exit if the cooldown is active, or we havent unlocked robotrimp. @@ -253,3 +254,25 @@ function BWraid() { bwraided = false; } } + +//AutoAllocate Looting II +function lootdump() { +if (game.global.world==lootdumpz && !perked && getPageSetting('AutoAllocatePerks')==1 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { + viewPortalUpgrades(); + game.global.lastCustomAmt = getPageSetting('lootdumpa'); + numTab(5, true); + if (getPortalUpgradePrice("Looting_II")+game.resources.helium.totalSpentTemp <= game.resources.helium.respecMax) { + buyPortalUpgrade('Looting_II'); + activateClicked(); + debug('Bought ' + lootdumpa + ' Looting II'); + } + else { + perked = true; + cancelPortal(); + debug("Done buying Looting II"); + } + } +else if (perked == true && game.global.world !== getPageSetting('lootdumpz')) { + perked = false; + } +} From bde3a8db8cf6e6c85fccbcbf592652d8f51431ad Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 19:24:34 +0100 Subject: [PATCH 0199/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index daaf6887e..cacc39d10 100644 --- a/modules/other.js +++ b/modules/other.js @@ -257,7 +257,7 @@ function BWraid() { //AutoAllocate Looting II function lootdump() { -if (game.global.world==lootdumpz && !perked && getPageSetting('AutoAllocatePerks')==1 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { +if (game.global.world==lootdumpz && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { viewPortalUpgrades(); game.global.lastCustomAmt = getPageSetting('lootdumpa'); numTab(5, true); From 1ee6977c27532a91c62aee51ce0fc0df522c5c4a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 19:26:45 +0100 Subject: [PATCH 0200/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index b4c53d7eb..99b9d617b 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -209,7 +209,8 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) - if (getPageSetting('BWraid')) BWraid(); //BW Raiding (other.js) + if (getPageSetting('BWraid')) BWraid(); //BW Raiding (other.js) + if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); if (agu && agu!='Off') autoGoldenUpgradesAT(agu); //"Golden Upgrades" (other.js) From 68e53531966e0f15a6829b8c59a6591d313ff2c2 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 19:30:48 +0100 Subject: [PATCH 0201/3477] Update SettingsGUI.js --- SettingsGUI.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 48eadac8b..19ab42430 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -378,11 +378,14 @@ function initializeAllSettings() { //Line 2 createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); + if (getPageSetting('BWraid')) { createSetting('BWraidingmin', 'Min BW to raid', 'Raids BWs at zone specified. Example: 485, will raid all BWs for all gear starting from 485. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); + } + if (getPageSetting('AutoAllocatePerks')==2) { createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Spire'); createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will dump 1000 helium into looting II until you can no longer afford to.', 'value', -1, null, 'Spire'); - + } //Combat //Subsection1Line1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
BAF3 = Uses vanilla autofight, and force fights when dead except in VM and Spire.
WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); From 86823f6e57a03784b17a5e7ea8ba51db8d145571 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 19:36:20 +0100 Subject: [PATCH 0202/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index cacc39d10..1b3f52931 100644 --- a/modules/other.js +++ b/modules/other.js @@ -257,7 +257,7 @@ function BWraid() { //AutoAllocate Looting II function lootdump() { -if (game.global.world==lootdumpz && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { +if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { viewPortalUpgrades(); game.global.lastCustomAmt = getPageSetting('lootdumpa'); numTab(5, true); From 23d5a2efbd7053b4256552b8776126763cb62a8b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 19:51:19 +0100 Subject: [PATCH 0203/3477] Update SettingsGUI.js --- SettingsGUI.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 19ab42430..10e467b89 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -378,14 +378,11 @@ function initializeAllSettings() { //Line 2 createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); - if (getPageSetting('BWraid')) { createSetting('BWraidingmin', 'Min BW to raid', 'Raids BWs at zone specified. Example: 485, will raid all BWs for all gear starting from 485. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); - } - if (getPageSetting('AutoAllocatePerks')==2) { createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Spire'); createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will dump 1000 helium into looting II until you can no longer afford to.', 'value', -1, null, 'Spire'); - } + //Combat //Subsection1Line1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
BAF3 = Uses vanilla autofight, and force fights when dead except in VM and Spire.
WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); @@ -857,6 +854,10 @@ function updateCustomButtons() { getPageSetting('AutoStance')==3 ? turnOn("ScryUseinWind"): turnOff("ScryUseinWind"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinIce"): turnOff("ScryUseinIce"); getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); + getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpa"): turnOff("lootdumpa"); + getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpz"): turnOff("lootdumpz"); + getPageSetting('BWraid') ? turnOn("BWrmn"): turnOff("BWrmn"); + getPageSetting('BWraid') ? turnOn("BWrmx"): turnOff("BWrmx"); /*//Make Scryer settings a little more user friendly if (getPageSetting('ScryerUseinVoidMaps2') !=0) { setPageSetting("ScryerUseinMaps2", "2"); } if (getPageSetting('ScryerUseinSpire2') !=1 && isActiveSpireAT()) { setPageSetting("ScryerSkipCorrupteds2", "2"); } */ From e7e195c9efe6fbdfd47eed100c18621e6b8e855c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 19:53:37 +0100 Subject: [PATCH 0204/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 10e467b89..0706becbe 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -856,8 +856,8 @@ function updateCustomButtons() { getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpa"): turnOff("lootdumpa"); getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpz"): turnOff("lootdumpz"); - getPageSetting('BWraid') ? turnOn("BWrmn"): turnOff("BWrmn"); - getPageSetting('BWraid') ? turnOn("BWrmx"): turnOff("BWrmx"); + getPageSetting('BWraid')==true ? turnOn("BWrmn"): turnOff("BWrmn"); + getPageSetting('BWraid')==true ? turnOn("BWrmx"): turnOff("BWrmx"); /*//Make Scryer settings a little more user friendly if (getPageSetting('ScryerUseinVoidMaps2') !=0) { setPageSetting("ScryerUseinMaps2", "2"); } if (getPageSetting('ScryerUseinSpire2') !=1 && isActiveSpireAT()) { setPageSetting("ScryerSkipCorrupteds2", "2"); } */ From 9800419bca25cae64cb7fdb835017a3407d3585c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 19:57:41 +0100 Subject: [PATCH 0205/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 0706becbe..0f589394f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -856,8 +856,8 @@ function updateCustomButtons() { getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpa"): turnOff("lootdumpa"); getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpz"): turnOff("lootdumpz"); - getPageSetting('BWraid')==true ? turnOn("BWrmn"): turnOff("BWrmn"); - getPageSetting('BWraid')==true ? turnOn("BWrmx"): turnOff("BWrmx"); + getPageSetting('BWraid')==true ? turnOn("BWraidingmin"): turnOff("BWraidingmin"); + getPageSetting('BWraid')==true ? turnOn("BWraidingmax"): turnOff("BWraidingmax"); /*//Make Scryer settings a little more user friendly if (getPageSetting('ScryerUseinVoidMaps2') !=0) { setPageSetting("ScryerUseinMaps2", "2"); } if (getPageSetting('ScryerUseinSpire2') !=1 && isActiveSpireAT()) { setPageSetting("ScryerSkipCorrupteds2", "2"); } */ From ac464960d9198c2c4e6745fab15b45e5b437ec8d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 20:00:19 +0100 Subject: [PATCH 0206/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 1b3f52931..faad8441d 100644 --- a/modules/other.js +++ b/modules/other.js @@ -264,7 +264,7 @@ if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting( if (getPortalUpgradePrice("Looting_II")+game.resources.helium.totalSpentTemp <= game.resources.helium.respecMax) { buyPortalUpgrade('Looting_II'); activateClicked(); - debug('Bought ' + lootdumpa + ' Looting II'); + debug('Bought ' + getPageSetting('lootdumpa') + ' Looting II'); } else { perked = true; From 6b716d9a0a0d6362ed74f330eb7610e0ad4284d1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 20:03:44 +0100 Subject: [PATCH 0207/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index faad8441d..ba3c7ae83 100644 --- a/modules/other.js +++ b/modules/other.js @@ -257,7 +257,7 @@ function BWraid() { //AutoAllocate Looting II function lootdump() { -if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { +if (game.global.world>=getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { viewPortalUpgrades(); game.global.lastCustomAmt = getPageSetting('lootdumpa'); numTab(5, true); From fb800436ec87bef6243b1f2d252994340e749741 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 20:05:05 +0100 Subject: [PATCH 0208/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index ba3c7ae83..faad8441d 100644 --- a/modules/other.js +++ b/modules/other.js @@ -257,7 +257,7 @@ function BWraid() { //AutoAllocate Looting II function lootdump() { -if (game.global.world>=getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { +if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { viewPortalUpgrades(); game.global.lastCustomAmt = getPageSetting('lootdumpa'); numTab(5, true); From f3a4505121eae9fd71d657e9fd96625ea2e03da4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 20:13:08 +0100 Subject: [PATCH 0209/3477] Update other.js --- modules/other.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/other.js b/modules/other.js index faad8441d..e3acda1e2 100644 --- a/modules/other.js +++ b/modules/other.js @@ -236,6 +236,16 @@ function BWraid() { debug("Failed to BW raid. Looks like you don't have a BW to raid..."); } return; + function findLastBionic() + { + for (var i = game.global.mapsOwnedArray.length -1; i>=0; i--) + { + if (game.global.mapsOwnedArray[i].location === "Bionic") + { + return game.global.mapsOwnedArray[i]; + } + } + } */ //} selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); From 4087f03a778d95b274c982a99a17a82699ca847d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 21:03:50 +0100 Subject: [PATCH 0210/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index e3acda1e2..15fe5f336 100644 --- a/modules/other.js +++ b/modules/other.js @@ -198,7 +198,7 @@ function Praiding() { failpraid = false; debug("...Successfully prestiged!"); - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('Praidingzone') && prestraid && !failpraid) { + if (getPageSetting('AutoMaps') !== 1 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; } else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { From 46f4336c364786f0332d294cafef26606068a904 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 21:06:01 +0100 Subject: [PATCH 0211/3477] Update other.js --- modules/other.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 15fe5f336..7d70bbdf9 100644 --- a/modules/other.js +++ b/modules/other.js @@ -193,9 +193,8 @@ function Praiding() { runMap(); if (!game.global.repeatMap && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { repeatClicked(); + prestraid = true; } - prestraid = true; - failpraid = false; debug("...Successfully prestiged!"); if (getPageSetting('AutoMaps') !== 1 && game.global.preMapsActive && prestraid && !failpraid) { From d8fd644b58673978d1198dad3d4c0525e7f2e668 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 21:08:00 +0100 Subject: [PATCH 0212/3477] Update other.js --- modules/other.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 7d70bbdf9..5212999cc 100644 --- a/modules/other.js +++ b/modules/other.js @@ -193,10 +193,9 @@ function Praiding() { runMap(); if (!game.global.repeatMap && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { repeatClicked(); - prestraid = true; } debug("...Successfully prestiged!"); - + prestraid = true; if (getPageSetting('AutoMaps') !== 1 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; } From 322de24da93e5cb11213bafb12d215cd35f8f7f5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 21:12:09 +0100 Subject: [PATCH 0213/3477] Update other.js --- modules/other.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/other.js b/modules/other.js index 5212999cc..23a0e33e4 100644 --- a/modules/other.js +++ b/modules/other.js @@ -196,7 +196,7 @@ function Praiding() { } debug("...Successfully prestiged!"); prestraid = true; - if (getPageSetting('AutoMaps') !== 1 && game.global.preMapsActive && prestraid && !failpraid) { + if (!getPageSetting('AutoMaps') && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; } else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { @@ -212,7 +212,7 @@ function Praiding() { //BWrmn //BWrmx function BWraid() { - if (game.global.world == BWrmn && !bwraided && !failbwraid) { + /*if (game.global.world == BWrmn && !bwraided && !failbwraid) { if (getPageSetting('AutoMaps') == 1 && game.global.world == BWrmn && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } @@ -223,7 +223,7 @@ function BWraid() { if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == BWrmn && !bwraided && !failbwraid) { game.options.menu.repeatUntil.enabled = 2; } - /*if (game.global.world == BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { + if (game.global.world == BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { get bw map failbwraid = false; } @@ -244,8 +244,8 @@ function BWraid() { } } } - */ - //} + + } selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); runMap(); if (!game.global.repeatMap && game.global.world == BWrmn && !bwraided && !failbwraid) { @@ -260,7 +260,7 @@ function BWraid() { } else if (bwraided == true && game.global.world !== BWrmn) { bwraided = false; - } + }*/ } //AutoAllocate Looting II From 4895213d677a4da4043de2f9cad3d114476995f4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 21:16:36 +0100 Subject: [PATCH 0214/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 23a0e33e4..c54e24910 100644 --- a/modules/other.js +++ b/modules/other.js @@ -197,7 +197,7 @@ function Praiding() { debug("...Successfully prestiged!"); prestraid = true; if (!getPageSetting('AutoMaps') && game.global.preMapsActive && prestraid && !failpraid) { - autoTrimpSettings["AutoMaps"].value = 1; + toggleAutoMaps(); } else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { prestraid = false; From e3408c850f80a5f80ecb7d4bd083e01995ccd8d3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 21:20:37 +0100 Subject: [PATCH 0215/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index c54e24910..acb07c70f 100644 --- a/modules/other.js +++ b/modules/other.js @@ -196,7 +196,7 @@ function Praiding() { } debug("...Successfully prestiged!"); prestraid = true; - if (!getPageSetting('AutoMaps') && game.global.preMapsActive && prestraid && !failpraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { toggleAutoMaps(); } else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { From 7a7dde1f4b47b5ef861aa4ade184026f55025068 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 21:25:01 +0100 Subject: [PATCH 0216/3477] Update other.js --- modules/other.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index acb07c70f..3f58c7037 100644 --- a/modules/other.js +++ b/modules/other.js @@ -199,11 +199,10 @@ function Praiding() { if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { toggleAutoMaps(); } + } else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { prestraid = false; } - - } } From 6312eea372308e4bcad5736a10dd12162cd2b436 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 13 May 2018 21:25:52 +0100 Subject: [PATCH 0217/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 3f58c7037..11079b225 100644 --- a/modules/other.js +++ b/modules/other.js @@ -197,7 +197,7 @@ function Praiding() { debug("...Successfully prestiged!"); prestraid = true; if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { - toggleAutoMaps(); + autoTrimpSettings["AutoMaps"].value = 1; } } else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { From ed5a6ed2c179e1066d03e55d5540ffb8edf5a3bd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 10:07:21 +0100 Subject: [PATCH 0218/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 11079b225..b9758ad07 100644 --- a/modules/other.js +++ b/modules/other.js @@ -152,7 +152,7 @@ function exitSpireCell() { function plusMapToRun(zone) { if (zone % 10 == 9) - return 6 + return 6; else if (zone % 10 <5) return 5 - zone % 10; else From 57e9a806cb6d466d7fb0694743bd71ca3152c816 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 10:09:25 +0100 Subject: [PATCH 0219/3477] Update other.js --- modules/other.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/other.js b/modules/other.js index b9758ad07..6e7309090 100644 --- a/modules/other.js +++ b/modules/other.js @@ -198,6 +198,7 @@ function Praiding() { prestraid = true; if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); } } else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { From 1b46df3beba8841af25fc935199a71617ee6096f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 10:14:12 +0100 Subject: [PATCH 0220/3477] Update other.js --- modules/other.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/other.js b/modules/other.js index 6e7309090..5a0ad66e3 100644 --- a/modules/other.js +++ b/modules/other.js @@ -201,6 +201,10 @@ function Praiding() { debug("Turning AutoMaps back on"); } } + else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); + } else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { prestraid = false; } From d3a1c721f7e37c6f20cc2e1a3c8886885b420a9f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 13:34:00 +0100 Subject: [PATCH 0221/3477] Update other.js --- modules/other.js | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/other.js b/modules/other.js index 5a0ad66e3..0b0749e77 100644 --- a/modules/other.js +++ b/modules/other.js @@ -137,8 +137,7 @@ function exitSpireCell() { endSpire(); } - function plusPres() - { +function plusPres() { document.getElementById("biomeAdvMapsSelect").value = "Random"; document.getElementById('advExtraLevelSelect').value = plusMapToRun(game.global.world); document.getElementById('advSpecialSelect').value = "p"; @@ -147,17 +146,24 @@ function exitSpireCell() { document.getElementById("sizeAdvMapsRange").value = 9; document.getElementById('advPerfectCheckbox').checked = false; updateMapCost(); - } + } - function plusMapToRun(zone) -{ +function plusMapToRun(zone) { if (zone % 10 == 9) return 6; else if (zone % 10 <5) return 5 - zone % 10; else return 11 - zone % 10; -} + } + +function findLastBionic() { + for (var i = game.global.mapsOwnedArray.length -1; i>=0; i--) { + if (game.global.mapsOwnedArray[i].location === "Bionic") { + return game.global.mapsOwnedArray[i]; + } + } + } //Praiding @@ -228,26 +234,16 @@ function BWraid() { game.options.menu.repeatUntil.enabled = 2; } if (game.global.world == BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { - get bw map + findLastBionic(); failbwraid = false; } - else if cant find bw map { + else if (game.global.world == BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { if (getPageSetting('AutoMaps') == 0 && game.global.world == BWrmn && !bwraided) { autoTrimpSettings["AutoMaps"].value = 1; failbwraid = true; debug("Failed to BW raid. Looks like you don't have a BW to raid..."); } return; - function findLastBionic() - { - for (var i = game.global.mapsOwnedArray.length -1; i>=0; i--) - { - if (game.global.mapsOwnedArray[i].location === "Bionic") - { - return game.global.mapsOwnedArray[i]; - } - } - } } selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); @@ -261,7 +257,11 @@ function BWraid() { if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == BWrmn && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; } -} + } + else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); + } else if (bwraided == true && game.global.world !== BWrmn) { bwraided = false; }*/ From 2280664f7192c9944caa5fd1d3a3e0899ac9eb53 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 16:00:29 +0100 Subject: [PATCH 0222/3477] Update other.js --- modules/other.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/other.js b/modules/other.js index 0b0749e77..63f06250e 100644 --- a/modules/other.js +++ b/modules/other.js @@ -251,6 +251,7 @@ function BWraid() { if (!game.global.repeatMap && game.global.world == BWrmn && !bwraided && !failbwraid) { repeatClicked(); } + if (BWlevel == BWrmx + 15 && !bwraided && !failbwraid) { bwraided = true; failbwraid = false; debug("...Successfully BW raided!"); From 5cd3f13cbedf87c23da6e1f4fa9def480e97ff6d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 17:52:20 +0100 Subject: [PATCH 0223/3477] Update other.js --- modules/other.js | 52 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/modules/other.js b/modules/other.js index 63f06250e..65e9cc6ca 100644 --- a/modules/other.js +++ b/modules/other.js @@ -222,50 +222,50 @@ function Praiding() { //BWrmn //BWrmx function BWraid() { - /*if (game.global.world == BWrmn && !bwraided && !failbwraid) { - if (getPageSetting('AutoMaps') == 1 && game.global.world == BWrmn && !bwraided && !failbwraid) { - autoTrimpSettings["AutoMaps"].value = 0; + if (game.global.world == BWrmn && !bwraided && !failbwraid) { + if (getPageSetting('AutoMaps') == 1 && game.global.world >= BWrmn && game.global.world <= BWrmx && !bwraided && !failbwraid) { + autoTrimpSettings["AutoMaps"].value = 0; } debug("Beginning BW Raiding..."); - if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == BWrmn && !bwraided && !failbwraid) { - mapsClicked(); + if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world >= BWrmn && game.global.world <= BWrmx && !bwraided && !failbwraid) { + mapsClicked(); } - if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == BWrmn && !bwraided && !failbwraid) { - game.options.menu.repeatUntil.enabled = 2; + if (game.options.menu.repeatUntil.enabled != 2 && game.global.world == BWrmn && !bwraided && !failbwraid) { + game.options.menu.repeatUntil.enabled = 2; } - if (game.global.world == BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { - findLastBionic(); + if (game.global.world >= BWrmn && game.global.world <= BWrmx && game.global.preMapsActive && !bwraided && !failbwraid) { + selectMap(findLastBionic()); failbwraid = false; } - else if (game.global.world == BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { - if (getPageSetting('AutoMaps') == 0 && game.global.world == BWrmn && !bwraided) { - autoTrimpSettings["AutoMaps"].value = 1; - failbwraid = true; - debug("Failed to BW raid. Looks like you don't have a BW to raid..."); - } - return; + else if (game.global.world >= BWrmn && game.global.world <= BWrmx && game.global.preMapsActive && !bwraided && !failbwraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.world >= BWrmn && game.global.world <= BWrmx && !bwraided) { + autoTrimpSettings["AutoMaps"].value = 1; + failbwraid = true; + debug("Failed to BW raid. Looks like you don't have a BW to raid..."); + } + return; } - selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); runMap(); - if (!game.global.repeatMap && game.global.world == BWrmn && !bwraided && !failbwraid) { + if (!game.global.repeatMap && game.global.world >= BWrmn && game.global.world <= BWrmx && !bwraided && !failbwraid) { repeatClicked(); } - if (BWlevel == BWrmx + 15 && !bwraided && !failbwraid) { - bwraided = true; - failbwraid = false; - debug("...Successfully BW raided!"); - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == BWrmn && bwraided && !failbwraid) { + if (findLastBionic().level > BWrmx && !bwraided && !failbwraid) { + bwraided = true; + failbwraid = false; + debug("...Successfully BW raided!"); + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world >= BWrmn && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; } - } - else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { + } + else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } else if (bwraided == true && game.global.world !== BWrmn) { bwraided = false; - }*/ + } + } } //AutoAllocate Looting II From c13c753a7b421328fff25dd5ed724e76c3dce15f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 17:56:46 +0100 Subject: [PATCH 0224/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 65e9cc6ca..d5bdcbfd9 100644 --- a/modules/other.js +++ b/modules/other.js @@ -222,7 +222,7 @@ function Praiding() { //BWrmn //BWrmx function BWraid() { - if (game.global.world == BWrmn && !bwraided && !failbwraid) { + if (game.global.world == BWrmn && !bwraided && !failbwraid && getPageSetting('BWraid')) { if (getPageSetting('AutoMaps') == 1 && game.global.world >= BWrmn && game.global.world <= BWrmx && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } From cc6dcf5f33fd3200b8ae547756ccd11e29e371cf Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 17:57:46 +0100 Subject: [PATCH 0225/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 0f589394f..e1f41830a 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -378,7 +378,7 @@ function initializeAllSettings() { //Line 2 createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); - createSetting('BWraidingmin', 'Min BW to raid', 'Raids BWs at zone specified. Example: 485, will raid all BWs for all gear starting from 485. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); + createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Spire'); createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will dump 1000 helium into looting II until you can no longer afford to.', 'value', -1, null, 'Spire'); From d553661de472d904510d54fb287cf8390e458efa Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 18:06:03 +0100 Subject: [PATCH 0226/3477] Update other.js --- modules/other.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/modules/other.js b/modules/other.js index d5bdcbfd9..1da6b5ec7 100644 --- a/modules/other.js +++ b/modules/other.js @@ -221,24 +221,30 @@ function Praiding() { //BWraiding //BWrmn //BWrmx -function BWraid() { +function BWraiding() { +debug("BW works"); if (game.global.world == BWrmn && !bwraided && !failbwraid && getPageSetting('BWraid')) { - if (getPageSetting('AutoMaps') == 1 && game.global.world >= BWrmn && game.global.world <= BWrmx && !bwraided && !failbwraid) { +debug("zone = min bw"); + if (getPageSetting('AutoMaps') == 1 && game.global.world >= BWrmn && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; +debug("turning off automaps"); } debug("Beginning BW Raiding..."); - if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world >= BWrmn && game.global.world <= BWrmx && !bwraided && !failbwraid) { + if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world >= BWrmn && !bwraided && !failbwraid) { mapsClicked(); +debug("maps"); } if (game.options.menu.repeatUntil.enabled != 2 && game.global.world == BWrmn && !bwraided && !failbwraid) { game.options.menu.repeatUntil.enabled = 2; +debug("repeat settings"); } - if (game.global.world >= BWrmn && game.global.world <= BWrmx && game.global.preMapsActive && !bwraided && !failbwraid) { + if (game.global.world >= BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { selectMap(findLastBionic()); failbwraid = false; + debug("found bw"); } - else if (game.global.world >= BWrmn && game.global.world <= BWrmx && game.global.preMapsActive && !bwraided && !failbwraid) { - if (getPageSetting('AutoMaps') == 0 && game.global.world >= BWrmn && game.global.world <= BWrmx && !bwraided) { + else if (game.global.world >= BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.world >= BWrmn && !bwraided) { autoTrimpSettings["AutoMaps"].value = 1; failbwraid = true; debug("Failed to BW raid. Looks like you don't have a BW to raid..."); @@ -247,8 +253,10 @@ function BWraid() { } runMap(); - if (!game.global.repeatMap && game.global.world >= BWrmn && game.global.world <= BWrmx && !bwraided && !failbwraid) { + debug("bw running"); + if (!game.global.repeatMap && game.global.world >= BWrmn && !bwraided && !failbwraid) { repeatClicked(); +debug("repeat on"); } if (findLastBionic().level > BWrmx && !bwraided && !failbwraid) { bwraided = true; From 18d57a7bedf1073ac52f32396ff981500baf6644 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 18:06:39 +0100 Subject: [PATCH 0227/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 99b9d617b..11d519417 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -209,7 +209,7 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) - if (getPageSetting('BWraid')) BWraid(); //BW Raiding (other.js) + if (getPageSetting('BWraid')==true) BWraiding(); //BW Raiding (other.js) if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); From 8eec211b0669147d1d6e8bfe9a987434eeb4230d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 18:08:55 +0100 Subject: [PATCH 0228/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 1da6b5ec7..2d76b01e1 100644 --- a/modules/other.js +++ b/modules/other.js @@ -2,7 +2,7 @@ MODULES["other"] = {}; MODULES["other"].enableRoboTrimpSpam = true; //set this to false to stop Spam of "Activated Robotrimp MagnetoShriek Ability" var prestraid = false; var failpraid = false; -var BWrmn = getPageSetting('BWraidingmin'); +var BWrmn = getPageSetting('BWraidingz'); var BWrmx = getPageSetting('BWraidingmax'); var bwraided = false; var perked = false; From aa0e93487f8dc3145d29519309427726f142b5c5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 18:11:12 +0100 Subject: [PATCH 0229/3477] Update other.js --- modules/other.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/other.js b/modules/other.js index 2d76b01e1..7f8dd68cd 100644 --- a/modules/other.js +++ b/modules/other.js @@ -5,6 +5,7 @@ var failpraid = false; var BWrmn = getPageSetting('BWraidingz'); var BWrmx = getPageSetting('BWraidingmax'); var bwraided = false; +var failbwraid = false; var perked = false; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { From bfc5a0e29af86c7eb07aba526c0eb9896653afde Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 18:23:43 +0100 Subject: [PATCH 0230/3477] Update other.js --- modules/other.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/other.js b/modules/other.js index 7f8dd68cd..a97736bff 100644 --- a/modules/other.js +++ b/modules/other.js @@ -223,24 +223,19 @@ function Praiding() { //BWrmn //BWrmx function BWraiding() { -debug("BW works"); if (game.global.world == BWrmn && !bwraided && !failbwraid && getPageSetting('BWraid')) { -debug("zone = min bw"); if (getPageSetting('AutoMaps') == 1 && game.global.world >= BWrmn && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; -debug("turning off automaps"); } debug("Beginning BW Raiding..."); if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world >= BWrmn && !bwraided && !failbwraid) { mapsClicked(); -debug("maps"); } if (game.options.menu.repeatUntil.enabled != 2 && game.global.world == BWrmn && !bwraided && !failbwraid) { game.options.menu.repeatUntil.enabled = 2; -debug("repeat settings"); } if (game.global.world >= BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { - selectMap(findLastBionic()); + selectMap(findLastBionic().id); failbwraid = false; debug("found bw"); } From 199fe90ef99660654a17cb818f7731dcce42cd10 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 18:26:52 +0100 Subject: [PATCH 0231/3477] Update other.js --- modules/other.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/other.js b/modules/other.js index a97736bff..02d89ccb2 100644 --- a/modules/other.js +++ b/modules/other.js @@ -223,6 +223,7 @@ function Praiding() { //BWrmn //BWrmx function BWraiding() { +debug("bw works"); if (game.global.world == BWrmn && !bwraided && !failbwraid && getPageSetting('BWraid')) { if (getPageSetting('AutoMaps') == 1 && game.global.world >= BWrmn && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; From a15fdc2ec0989aaf816288fe52df4bf5645d8d2f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 18:30:54 +0100 Subject: [PATCH 0232/3477] Update other.js --- modules/other.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/modules/other.js b/modules/other.js index 02d89ccb2..fd99393c5 100644 --- a/modules/other.js +++ b/modules/other.js @@ -2,8 +2,6 @@ MODULES["other"] = {}; MODULES["other"].enableRoboTrimpSpam = true; //set this to false to stop Spam of "Activated Robotrimp MagnetoShriek Ability" var prestraid = false; var failpraid = false; -var BWrmn = getPageSetting('BWraidingz'); -var BWrmx = getPageSetting('BWraidingmax'); var bwraided = false; var failbwraid = false; var perked = false; @@ -224,24 +222,24 @@ function Praiding() { //BWrmx function BWraiding() { debug("bw works"); - if (game.global.world == BWrmn && !bwraided && !failbwraid && getPageSetting('BWraid')) { - if (getPageSetting('AutoMaps') == 1 && game.global.world >= BWrmn && !bwraided && !failbwraid) { + if (game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { + if (getPageSetting('AutoMaps') == 1 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } debug("Beginning BW Raiding..."); - if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world >= BWrmn && !bwraided && !failbwraid) { + if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { mapsClicked(); } - if (game.options.menu.repeatUntil.enabled != 2 && game.global.world == BWrmn && !bwraided && !failbwraid) { + if (game.options.menu.repeatUntil.enabled != 2 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { game.options.menu.repeatUntil.enabled = 2; } - if (game.global.world >= BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { + if (game.global.world >= getPageSetting('BWraidingz') && game.global.preMapsActive && !bwraided && !failbwraid) { selectMap(findLastBionic().id); failbwraid = false; debug("found bw"); } - else if (game.global.world >= BWrmn && game.global.preMapsActive && !bwraided && !failbwraid) { - if (getPageSetting('AutoMaps') == 0 && game.global.world >= BWrmn && !bwraided) { + else if (game.global.world >= getPageSetting('BWraidingz') && game.global.preMapsActive && !bwraided && !failbwraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.world >= getPageSetting('BWraidingz') && !bwraided) { autoTrimpSettings["AutoMaps"].value = 1; failbwraid = true; debug("Failed to BW raid. Looks like you don't have a BW to raid..."); @@ -251,15 +249,15 @@ debug("bw works"); } runMap(); debug("bw running"); - if (!game.global.repeatMap && game.global.world >= BWrmn && !bwraided && !failbwraid) { + if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { repeatClicked(); debug("repeat on"); } - if (findLastBionic().level > BWrmx && !bwraided && !failbwraid) { + if (findLastBionic().level > getPageSetting('BWraidingz') && !bwraided && !failbwraid) { bwraided = true; failbwraid = false; debug("...Successfully BW raided!"); - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world >= BWrmn && bwraided && !failbwraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world >= getPageSetting('BWraidingz') && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; } } @@ -267,7 +265,7 @@ debug("repeat on"); autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } - else if (bwraided == true && game.global.world !== BWrmn) { + else if (bwraided == true && game.global.world !== getPageSetting('BWraidingz')) { bwraided = false; } } From effeac33b749718768f0f205784f893c088ff953 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 18:33:22 +0100 Subject: [PATCH 0233/3477] Update other.js --- modules/other.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index fd99393c5..cd2081f45 100644 --- a/modules/other.js +++ b/modules/other.js @@ -221,7 +221,6 @@ function Praiding() { //BWrmn //BWrmx function BWraiding() { -debug("bw works"); if (game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { if (getPageSetting('AutoMaps') == 1 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; @@ -236,7 +235,6 @@ debug("bw works"); if (game.global.world >= getPageSetting('BWraidingz') && game.global.preMapsActive && !bwraided && !failbwraid) { selectMap(findLastBionic().id); failbwraid = false; - debug("found bw"); } else if (game.global.world >= getPageSetting('BWraidingz') && game.global.preMapsActive && !bwraided && !failbwraid) { if (getPageSetting('AutoMaps') == 0 && game.global.world >= getPageSetting('BWraidingz') && !bwraided) { @@ -248,10 +246,8 @@ debug("bw works"); } runMap(); - debug("bw running"); if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { repeatClicked(); -debug("repeat on"); } if (findLastBionic().level > getPageSetting('BWraidingz') && !bwraided && !failbwraid) { bwraided = true; From 7a6af2bec9af33ba0aecdcb85017f1244a9f1dd6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 18:42:03 +0100 Subject: [PATCH 0234/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index cd2081f45..dd1d33b69 100644 --- a/modules/other.js +++ b/modules/other.js @@ -249,7 +249,7 @@ function BWraiding() { if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { repeatClicked(); } - if (findLastBionic().level > getPageSetting('BWraidingz') && !bwraided && !failbwraid) { + if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { bwraided = true; failbwraid = false; debug("...Successfully BW raided!"); From d41bc9b61145e1020bc12b63d7ad26eb81323825 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 18:45:46 +0100 Subject: [PATCH 0235/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index dd1d33b69..7a9eab951 100644 --- a/modules/other.js +++ b/modules/other.js @@ -225,7 +225,6 @@ function BWraiding() { if (getPageSetting('AutoMaps') == 1 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } - debug("Beginning BW Raiding..."); if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { mapsClicked(); } @@ -235,6 +234,7 @@ function BWraiding() { if (game.global.world >= getPageSetting('BWraidingz') && game.global.preMapsActive && !bwraided && !failbwraid) { selectMap(findLastBionic().id); failbwraid = false; + debug("Beginning BW Raiding..."); } else if (game.global.world >= getPageSetting('BWraidingz') && game.global.preMapsActive && !bwraided && !failbwraid) { if (getPageSetting('AutoMaps') == 0 && game.global.world >= getPageSetting('BWraidingz') && !bwraided) { From 0ff3d7a5d3a421f5abf598c0de3a0c8770b4968b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 18:51:57 +0100 Subject: [PATCH 0236/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index e1f41830a..efca54356 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -856,7 +856,7 @@ function updateCustomButtons() { getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpa"): turnOff("lootdumpa"); getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpz"): turnOff("lootdumpz"); - getPageSetting('BWraid')==true ? turnOn("BWraidingmin"): turnOff("BWraidingmin"); + getPageSetting('BWraid')==true ? turnOn("BWraidingz"): turnOff("BWraidingz"); getPageSetting('BWraid')==true ? turnOn("BWraidingmax"): turnOff("BWraidingmax"); /*//Make Scryer settings a little more user friendly if (getPageSetting('ScryerUseinVoidMaps2') !=0) { setPageSetting("ScryerUseinMaps2", "2"); } From 17425bff45b63a191d3f92d633034cda64cf670c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 22:13:03 +0100 Subject: [PATCH 0237/3477] Update perks.js --- modules/perks.js | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index fc4c4120a..a7d913bfa 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -26,19 +26,6 @@ head.appendChild(queuescript); //-------------------------------------- //Ratio Presets - Perk proportions: // (in perk order): [looting,toughness,power,motivation,pheromones,artisanistry,carpentry,resilience,coordinated,resourceful,overkill,cunning,curious]; -var preset_ZXV = [20, 0.5, 1, 1.5, 0.5, 1.5, 8, 1, 25, 2, 3, 1, 1]; -var preset_ZXVnew = [50, 0.75, 1, 3, 0.75, 3, 10, 1.5, 60, 2, 5, 1, 1]; -var preset_ZXV3 = [100, 1, 3, 3, 1, 3, 40, 2, 100, 1, 3, 1, 1]; -var preset_TruthEarly = [30, 4, 4, 4, 4, 2, 24, 8, 60, 2, 3, 1, 1]; -var preset_TruthLate = [120, 4, 4, 4, 4, 2, 24, 8, 60, 2, 3, 1, 1]; -var preset_nsheetz = [42, 1.75, 5, 4, 1.5, 5, 29, 3.5, 100, 1, 5, 1, 1]; -var preset_nsheetzNew= [160, 1.5, 5, 2.5, 1.5, 3.5, 18, 3, 100, 1, 10, 1, 1]; -var preset_HiderHehr = [90, 4, 12, 10, 1, 8, 8, 1, 20, 0.1, 3, 1, 1]; -var preset_HiderBalance = [75, 4, 8, 4, 1, 4, 24, 1, 75, 0.5, 3, 1, 1]; -var preset_HiderMore = [20, 4, 10, 12, 1, 8, 8, 1, 40, 0.1, 0.5, 1, 1]; -var preset_genBTC = [100, 8, 8, 4, 4, 5, 18, 8, 14, 1, 1, 1, 1]; -var preset_genBTC2 = [96, 19, 15.4, 8, 8, 7, 14, 19, 11, 1, 1, 1, 1]; -var preset_Zek450 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 4, 0.04, 1, 120, 175]; // var preset_space = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; // @@ -49,23 +36,12 @@ var preset_Zek229 = [11.2, 0.58, 2.37, 1.464, 0.3, 2.02, 12.2, 0.58, 37, 0.22, 2 var preset_Zek299 = [16.8, 3, 1.9, 1.1, 1.2, 1, 17.1, 3, 100, 0.06, 0.8, 0, 0]; var preset_Zek399 = [135, 6.1, 18.5, 6.5, 2.5, 6, 17, 6.1, 25, 0.08, 1, 0, 0]; var preset_Zek449 = [245, 5.85, 29, 1.95, 2.8, 6, 6.1, 5.85, 15, 0.05, 1, 57, 0]; +var preset_Zek450 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 4, 0.04, 1, 120, 175]; //gather these into an array of objects. this is one important object. -var presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2,preset_space,preset_Zek059,preset_Zek100,preset_Zek180,preset_Zek229,preset_Zek299,preset_Zek399,preset_Zek449,preset_Zek450,preset_space]; +var presetList = [preset_space,preset_Zek059,preset_Zek100,preset_Zek180,preset_Zek229,preset_Zek299,preset_Zek399,preset_Zek449,preset_Zek450,preset_space]; //Specific ratios labeled above must be given the matching ID below. //Ratio preset dropdown list var presetListHtml = "\ -\ -\ -\ -\ -\ -\ -\ -\ -\ -\ -\ -\ \ \ \ @@ -74,7 +50,7 @@ var presetListHtml = "\ \ \ \ -\ +\ \ "; //Custom Creation for all perk customRatio boxes in Trimps Perk Window From a6cbfd8e0ab305fb2f6aedaf31c59e81dcc7ba5c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 14 May 2018 22:24:49 +0100 Subject: [PATCH 0238/3477] Update other.js --- modules/other.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/other.js b/modules/other.js index 7a9eab951..dcabf38f1 100644 --- a/modules/other.js +++ b/modules/other.js @@ -209,10 +209,10 @@ function Praiding() { else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); - } - else if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { + if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { prestraid = false; - } + } + } } @@ -260,13 +260,12 @@ function BWraiding() { else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); - } - else if (bwraided == true && game.global.world !== getPageSetting('BWraidingz')) { + if (bwraided == true && game.global.world !== getPageSetting('BWraidingz')) { bwraided = false; - } - } -} - + } + } + } + } //AutoAllocate Looting II function lootdump() { if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { From 58a13964f7cdfb5163ea88d4a0d58dfd0bcc9778 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 15 May 2018 09:02:02 +0100 Subject: [PATCH 0239/3477] Update perks.js --- modules/perks.js | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index a7d913bfa..d51a01460 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -26,6 +26,21 @@ head.appendChild(queuescript); //-------------------------------------- //Ratio Presets - Perk proportions: // (in perk order): [looting,toughness,power,motivation,pheromones,artisanistry,carpentry,resilience,coordinated,resourceful,overkill,cunning,curious]; +var preset_ZXV = [20, 0.5, 1, 1.5, 0.5, 1.5, 8, 1, 25, 2, 3, 1, 1]; +var preset_ZXVnew = [50, 0.75, 1, 3, 0.75, 3, 10, 1.5, 60, 2, 5, 1, 1]; +var preset_ZXV3 = [100, 1, 3, 3, 1, 3, 40, 2, 100, 1, 3, 1, 1]; +var preset_TruthEarly = [30, 4, 4, 4, 4, 2, 24, 8, 60, 2, 3, 1, 1]; +var preset_TruthLate = [120, 4, 4, 4, 4, 2, 24, 8, 60, 2, 3, 1, 1]; +var preset_nsheetz = [42, 1.75, 5, 4, 1.5, 5, 29, 3.5, 100, 1, 5, 1, 1]; +var preset_nsheetzNew= [160, 1.5, 5, 2.5, 1.5, 3.5, 18, 3, 100, 1, 10, 1, 1]; +var preset_HiderHehr = [90, 4, 12, 10, 1, 8, 8, 1, 20, 0.1, 3, 1, 1]; +var preset_HiderBalance = [75, 4, 8, 4, 1, 4, 24, 1, 75, 0.5, 3, 1, 1]; +var preset_HiderMore = [20, 4, 10, 12, 1, 8, 8, 1, 40, 0.1, 0.5, 1, 1]; +var preset_genBTC = [100, 8, 8, 4, 4, 5, 18, 8, 14, 1, 1, 1, 1]; +var preset_genBTC2 = [96, 19, 15.4, 8, 8, 7, 14, 19, 11, 1, 1, 1, 1]; +var preset_Zek4501 = [300, 1, 30, 2, 4, 2, 9, 8, 17, 0.1, 1, 320, 1]; +var preset_Zek4502 = [350, 1, 40, 2, 3, 2, 5, 8, 2, 0.1, 1, 300, 20]; +var preset_Zek450 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 4, 0.04, 1, 120, 175]; // var preset_space = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; // @@ -36,12 +51,26 @@ var preset_Zek229 = [11.2, 0.58, 2.37, 1.464, 0.3, 2.02, 12.2, 0.58, 37, 0.22, 2 var preset_Zek299 = [16.8, 3, 1.9, 1.1, 1.2, 1, 17.1, 3, 100, 0.06, 0.8, 0, 0]; var preset_Zek399 = [135, 6.1, 18.5, 6.5, 2.5, 6, 17, 6.1, 25, 0.08, 1, 0, 0]; var preset_Zek449 = [245, 5.85, 29, 1.95, 2.8, 6, 6.1, 5.85, 15, 0.05, 1, 57, 0]; -var preset_Zek450 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 4, 0.04, 1, 120, 175]; //gather these into an array of objects. this is one important object. -var presetList = [preset_space,preset_Zek059,preset_Zek100,preset_Zek180,preset_Zek229,preset_Zek299,preset_Zek399,preset_Zek449,preset_Zek450,preset_space]; +var presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2,preset_Zek4501,preset_Zek4502,preset_Zek450,preset_space,preset_Zek059,preset_Zek100,preset_Zek180,preset_Zek229,preset_Zek299,preset_Zek399,preset_Zek449,preset_Zek450,preset_space]; //Specific ratios labeled above must be given the matching ID below. //Ratio preset dropdown list var presetListHtml = "\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +\ +\ \ \ \ @@ -50,7 +79,7 @@ var presetListHtml = "\ \ \ \ -\ +\ \ "; //Custom Creation for all perk customRatio boxes in Trimps Perk Window From 4982d74c19363510f7d1fb8a015ace6aacfcc913 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 25 May 2018 08:51:44 +0100 Subject: [PATCH 0240/3477] Update other.js --- modules/other.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index dcabf38f1..35f8c8bf4 100644 --- a/modules/other.js +++ b/modules/other.js @@ -256,6 +256,7 @@ function BWraiding() { if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world >= getPageSetting('BWraidingz') && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; } + } } else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; @@ -264,7 +265,7 @@ function BWraiding() { bwraided = false; } } - } + } //AutoAllocate Looting II function lootdump() { From 279cd83fb2c1eed74b7a3af4eeefea59fd407ccb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 19:13:14 +0100 Subject: [PATCH 0241/3477] Update battlecalc.js --- modules/battlecalc.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index c365db94c..7ae10f099 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -218,6 +218,14 @@ function getBattleStats(what,form,crit) { if (what == "attack" && Fluffy.isActive()){ var amt = Fluffy.getDamageModifier(); currentCalc *= amt; + //Amal attack + if (what == "attack" && game.jobs.Amalgamator.owned > 0){ + var amt = game.jobs.Amalgamator.getDamageMult(); + currentCalc *= amt; + //Amal health + if (what == "health" && game.jobs.Amalgamator.owned > 0){ + var amt = game.jobs.Amalgamator.getHealthMult(); + currentCalc *= amt; } if (crit) { var critChance = getPlayerCritChance(); From b537c6ef6269ee6d065a84b068c0822170edd42b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 19:17:19 +0100 Subject: [PATCH 0242/3477] Update battlecalc.js --- modules/battlecalc.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 7ae10f099..2da81db9e 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -218,10 +218,12 @@ function getBattleStats(what,form,crit) { if (what == "attack" && Fluffy.isActive()){ var amt = Fluffy.getDamageModifier(); currentCalc *= amt; + } //Amal attack if (what == "attack" && game.jobs.Amalgamator.owned > 0){ var amt = game.jobs.Amalgamator.getDamageMult(); currentCalc *= amt; + } //Amal health if (what == "health" && game.jobs.Amalgamator.owned > 0){ var amt = game.jobs.Amalgamator.getHealthMult(); @@ -281,7 +283,7 @@ function calcOurDmg(number,maxormin,disableStances,disableFlucts) { //number = b number *= ((vpAmt / 100) + 1); } if (game.global.totalSquaredReward > 0){ - number *= ((game.global.totalSquaredReward / 100) + 1) + number *= ((game.global.totalSquaredReward / 100) + 1); } if (game.talents.magmamancer.purchased){ number *= game.jobs.Magmamancer.getBonusPercent(); @@ -295,6 +297,12 @@ function calcOurDmg(number,maxormin,disableStances,disableFlucts) { //number = b if (Fluffy.isActive()){ number *= Fluffy.getDamageModifier(); } + if (game.jobs.Amalgamator.owned > 0){ + number *= game.jobs.Amalgamator.getDamageMult(); + } + if (game.jobs.Amalgamator.owned > 0){ + number *= game.jobs.Amalgamator.getHealthMult(); + } number *= (1 + (1 - game.empowerments.Ice.getCombatModifier())); if (game.global.challengeActive == "Daily"){ @@ -405,7 +413,7 @@ function calcDailyAttackMod(number) { number *= dailyModifiers.badMapStrength.getMult(game.global.dailyChallenge.badMapStrength.strength); } if (typeof game.global.dailyChallenge.bloodthirst !== 'undefined'){ - number *= dailyModifiers.bloodthirst.getMult(game.global.dailyChallenge.bloodthirst.strength, game.global.dailyChallenge.bloodthirst.stacks) + number *= dailyModifiers.bloodthirst.getMult(game.global.dailyChallenge.bloodthirst.strength, game.global.dailyChallenge.bloodthirst.stacks); } } return number; From 687384c1a5b152cc6c4b3183369ccf42385f0c91 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 19:31:26 +0100 Subject: [PATCH 0243/3477] Update .user.js --- .user.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.user.js b/.user.js index d1709a7dd..a826c40d4 100644 --- a/.user.js +++ b/.user.js @@ -1,22 +1,22 @@ // ==UserScript== -// @name AutoTrimps-kfro -// @version 1.0-kfro -// @namespace https://KFrowde.github.io/AutoTrimps -// @updateURL https://KFrowde.github.io/AutoTrimps/.user.js +// @name AutoTrimps-Zorn192 +// @version 1.0-Zorn192 +// @namespace https://Zorn192.github.io/AutoTrimps +// @updateURL https://Zorn192.github.io/AutoTrimps/.user.js // @description Automate all the trimps! -// @author zininzinin, spindrjr, Ishkaru, genBTC +// @author zininzinin, spindrjr, Ishkaru, genBTC, Zorn192 // @include *trimps.github.io* // @include *kongregate.com/games/GreenSatellite/trimps -// @connect *KFrowde.github.io/AutoTrimps* +// @connect *Zorn192.github.io/AutoTrimps* // @connect *trimps.github.io* // @connect self // @grant none // ==/UserScript== var script = document.createElement('script'); -script.id = 'AutoTrimps-KFrowde'; +script.id = 'AutoTrimps-Zorn192'; //This can be edited to point to your own Github Repository URL. -script.src = 'https://kfrowde.github.io/AutoTrimps/AutoTrimps2.js'; +script.src = 'https://Zorn192.github.io/AutoTrimps/AutoTrimps2.js'; //script.setAttribute('crossorigin',"use-credentials"); script.setAttribute('crossorigin',"anonymous"); document.head.appendChild(script); From ef3083699f63a891b11325ef0c265f2b3bba3e9c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 19:32:18 +0100 Subject: [PATCH 0244/3477] Update .user.js --- .user.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.user.js b/.user.js index a826c40d4..2a7663279 100644 --- a/.user.js +++ b/.user.js @@ -1,10 +1,10 @@ // ==UserScript== -// @name AutoTrimps-Zorn192 -// @version 1.0-Zorn192 +// @name AutoTrimps-Zek +// @version 1.0-Zek // @namespace https://Zorn192.github.io/AutoTrimps // @updateURL https://Zorn192.github.io/AutoTrimps/.user.js // @description Automate all the trimps! -// @author zininzinin, spindrjr, Ishkaru, genBTC, Zorn192 +// @author zininzinin, spindrjr, Ishkaru, genBTC, Zeker0 // @include *trimps.github.io* // @include *kongregate.com/games/GreenSatellite/trimps // @connect *Zorn192.github.io/AutoTrimps* @@ -14,7 +14,7 @@ // ==/UserScript== var script = document.createElement('script'); -script.id = 'AutoTrimps-Zorn192'; +script.id = 'AutoTrimps-Zek'; //This can be edited to point to your own Github Repository URL. script.src = 'https://Zorn192.github.io/AutoTrimps/AutoTrimps2.js'; //script.setAttribute('crossorigin',"use-credentials"); From 9812ec5d3f78091412533538d2dde988e1f38b95 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 19:32:56 +0100 Subject: [PATCH 0245/3477] Delete HiderTrimp.js --- sparecode/HiderTrimp.js | 208 ---------------------------------------- 1 file changed, 208 deletions(-) delete mode 100644 sparecode/HiderTrimp.js diff --git a/sparecode/HiderTrimp.js b/sparecode/HiderTrimp.js deleted file mode 100644 index 348c3df11..000000000 --- a/sparecode/HiderTrimp.js +++ /dev/null @@ -1,208 +0,0 @@ - -//original globals -var buildcounter = 0; -var autoTSettings = {}; -var version = "0.37b.17T2"; - -//setup talk button -document.getElementById("buildingsQueue").style = "width: 70%; float: left;"; -document.getElementById("queueContainer").insertAdjacentHTML('beforeend', '

Talk
'); -letMeTalk = document.getElementById("talkingBtn"); -letMeTalk.setAttribute("onmouseover", 'tooltip(\"Talk\", \"customText\", event, \"It knows a lot about how Trimps works.\")'); -letMeTalk.setAttribute("onmouseout", 'tooltip("hide")'); -//setup talk window -document.getElementById("boneWrapper").insertAdjacentHTML('beforebegin', ''); -document.getElementById("autotrimp").insertAdjacentHTML('beforeend', ''); - -//setup paint button -document.getElementById("queueContainer").insertAdjacentHTML('beforeend', '
Paint
'); -letMePaint = document.getElementById("paintingBtn"); -letMePaint.setAttribute("onmouseover", 'tooltip(\"Paint\", \"customText\", event, \"It can paint things.\")'); -letMePaint.setAttribute("onmouseout", 'tooltip("hide")'); -//setup paint window -document.getElementById("queueContainer").insertAdjacentHTML('beforebegin', ''); -//HiderTryThatFailed//document.getElementById("boneWrapper").insertAdjacentHTML('beforebegin', ''); -//beforebegin //afterbegin //beforeend //afterend - -function getNiceThingsDone() { - var zp = document.getElementById("zonePic").value; - var pp = document.getElementById("prePic").value; - var vp = document.getElementById("voidPic").value; - var mp = document.getElementById("mapPic").value; - var sp = document.getElementById("spirePic").value; - if (zp.length > 5 || pp.length > 5 || vp.length > 5 || mp.length > 5 || sp.length > 5) { - //bring the art. (mp.length > 5) - if (zp.length > 5 && !game.global.preMapsActive && !game.global.mapsActive && !game.global.spireActive) { - document.getElementById("trimps").insertAdjacentHTML('afterend', '
'); - } else if (pp.length > 5 && game.global.preMapsActive) { - document.getElementById("trimps").insertAdjacentHTML('afterend', '
'); - } else if (vp.length > 5 && game.global.mapsActive && getCurrentMapObject().location == "Void") { - document.getElementById("trimps").insertAdjacentHTML('afterend', '
'); - } else if (mp.length > 5 && game.global.mapsActive && getCurrentMapObject().location != "Void") { - document.getElementById("trimps").insertAdjacentHTML('afterend', '
'); - } else if (sp.length > 5 && game.global.world >= getPageSetting('IgnoreSpiresUntil') && (game.global.world == 200 || game.global.world == 300 || game.global.world == 400 || game.global.world == 500 || game.global.world == 600) && game.global.spireActive) { - document.getElementById("trimps").insertAdjacentHTML('afterend', '
'); - } - if ((sp.length > 5 || zp.length > 5) && game.resources.trimps.soldiers != 0 && !game.global.preMapsActive && !game.global.mapsActive && (new Date().getTime() - game.global.zoneStarted) > 1600 && game.global.gridArray.length != 0) { - var cells = document.getElementById("grid").getElementsByClassName("battleCell cellColorBeaten"); var oldstyle = cells[0].getAttribute('style'); for (var i=0; i < cells.length; i++) cells[i].setAttribute('style', oldstyle + '; background-color: rgba(0,0,0,0.3);'); - } - if ((mp.length > 5 || vp.length > 5) && game.resources.trimps.soldiers != 0 && game.global.mapsActive && (new Date().getTime() - game.global.mapStarted) > 1600 && game.global.mapGridArray.length != 0) { - var cells = document.getElementById("mapGrid").getElementsByClassName("battleCell cellColorBeaten"); var oldstyle = cells[0].getAttribute('style'); for (var i=0; i < cells.length; i++) cells[i].setAttribute('style', oldstyle + '; background-color: rgba(0,0,0,0.3);'); - } - } - //bring the light. - var BR0 = document.getElementById("BR").value*1; - var BG0 = document.getElementById("BG").value*1; - var BB0 = document.getElementById("BB").value*1; - var CR0 = document.getElementById("CR").value*1; - var CG0 = document.getElementById("CG").value*1; - var CB0 = document.getElementById("CB").value*1; - if ((BR0 > 0 && BG0 > 0 && BB0 > 0) || (CR0 > 0 && CG0 > 0 && CB0 > 0)) { - var colB = "background: rgb("+BR0+"," +BG0+","+ BB0+");"; - var colC = "background: rgb("+CR0+"," +CG0+","+ CB0+");"; - //document.getElementById("innerWrapper").style = "background: rgb(BR, BG, BB);"; - document.getElementById("innerWrapper").style = colB; - document.getElementById("battleContainer").style = colC; - document.getElementById("gridContainer").style = colC; - document.getElementById("science").style = colC; - document.getElementById("selectedMapContainer").style = colC; - document.getElementById("helium").style = colC; - document.getElementById("achievementWrapper").style = colC; - document.getElementById("buyContainer").style = colC; - document.getElementById("logContainer").style = colC; - document.getElementById("queueContainer").style = colC; - document.getElementById("wood").style = colC; - document.getElementById("fragments").style = colC; - document.getElementById("heirloomWrapper").style = colC; - document.getElementById("food").style = colC; - document.getElementById("metal").style = colC; - document.getElementById("gems").style = colC; - document.getElementById("trimps").style = colC; - } -} - -//setup options -function createInputSetting(pic,div) { - var picInput = document.createElement("Input"); - picInput.id = pic + "URL"; - picInput.setAttribute('style', 'text-align: center; width: 60px; color: black;'); - picInput.setAttribute('class', 'picInput'); - var perk1label = document.createElement("Label"); - picLable.id = pic + 'Label'; - picLable.innerHTML = pic; - picLable.setAttribute('style', 'margin-right: 1vw; width: 120px; color: white;'); - //add to the div. - div.appendChild(picInput); - div.appendChild(picLable); -} - -//Add new css rule -//document.styleSheets[2].insertRule(".settingBtn3 {background-color: #337AB7;}", 84); - -var getPercent = 0; -var reactPercent = 0; -function getStats() { - reactPercent = 0; - getPercent = (game.stats.heliumHour.value() / (game.global.totalHeliumEarned - (game.global.heliumLeftover + game.resources.helium.owned)))*100; - if (getPercent.toFixed(3) > 0.54) { - reactPercent = " An amazing result, share it with others, they will appriciate it."; - } else if (getPercent.toFixed(3) > 0.53) { - reactPercent = " GRATZ, A NEW WORLD RECORD!"; - } else if (getPercent.toFixed(3) > 0.52) { - reactPercent = " Only a few ever got this far."; - } else if (getPercent.toFixed(3) > 0.50) { - reactPercent = " it's not shameful to give up."; - } else if (getPercent.toFixed(3) > 0.40) { - reactPercent = " It's the final push."; - } else if (getPercent.toFixed(3) > 0.30) { - reactPercent = " Keep it comming..."; - } else if (getPercent.toFixed(3) <= 0.30) { - reactPercent = " Did you just portal?"; - } - return getPercent.toFixed(3) + '%'; //return -} - -var getGigaDelta = false; -var reactGigaDelta = false; -function getStats2() { - reactGigaDelta = true; - getGigaDelta = (getPageSetting('FirstGigastation') > 40 || getPageSetting('DeltaGigastation') > 2); - if (getGigaDelta == true) { - reactGigaDelta = "First Gigastation must be under 41 and Min Warpstation must be under two, if you don't know how it works, why don't you click on the chat and ask?"; - } else if (getGigaDelta == false) { - reactGigaDelta = "You know the Truth."; - } - return getGigaDelta; -} - -var getAutoPortal = false; -var reactAutoPortal = false; -function getStats3() { - reactAutoPortal = true; - getAutoPortal = (getPageSetting('HeliumHrBuffer') > 0 || autoTrimpSettings.AutoPortal.selected != "Helium Per Hour"); - if (getAutoPortal == true) { - reactAutoPortal = "The Helium/Hr Buffer must be set to 0 and Auto Portal is there in order to help you get better Helium per hour, if you don't know how it works, why don't you click on the chat and ask?"; - } else if (getAutoPortal == false) { - reactAutoPortal = "You know the Truth."; - } - return getAutoPortal; -} - -//setup convo array -var conversation = []; -conversation[0] = {Q:"Hello.",R1:"Tell me the Truth.",L1:1,R2:"How am i doing so far?",L2:5,R3:"Tell me what to do.",L3:3}; -conversation[1] = {Q:"" +reactGigaDelta,R1:"Be more honest please.",L1:6,R2:"What can go wrong in the Don't Touch Zone?",L2:4,R3:"I know the Truth.",L3:0}; -conversation[2] = {Q:"OK.",R1:"Again.",L1:0,R2:"How am i doing so far?",L2:5,R3:"What can go wrong in the Don't Touch Zone?",L3:4}; -conversation[3] = {Q:"Please set Auto Portal to Helium Per Hour and set First Gigastation to 40 (or less). Make sure that Min Warpstation is set to two (or less). And notice that some of the Void Maps will be done before your Void Maps settings, so please use it and set the Void Maps to no more then 10 Zones before you predict that you will Auto Portal. Have a nice AutoAutoTrimps experience.",R1:"Wow, HelpfulTrimp!",L1:0}; -conversation[4] = {Q:"You.",R1:"Meh.",L1:0}; -conversation[5] = {Q:"Your current Helium per hour gain is " + getStats() + "" +reactPercent,R1:"Cool.",L1:0,R2:"What can go wrong in the Don't Touch Zone?",L2:4,R3:"I know the Truth.",L3:0}; -conversation[6] = {Q:"" +reactAutoPortal,R1:"Please be much more honest.",L1:7,R2:"What can go wrong in the Don't Touch Zone?",L2:4,R3:"I know the Truth.",L3:0}; -conversation[7] = {Q:"I am not a real Trimp.",R1:"I knew the Truth.",L1:0}; -updateConvo(0); - -/* -conversation[0] = {Q:"Hello.",R1:"What?!?!",L1:3,R2:"Oh.",L2:1}; -conversation[1] = {Q:"What do you want to change? Click the buttons below.",R1:"Nothing.",L1:2,R2:"That's it.",L2:2}; -conversation[2] = {Q:"Ok.",R1:"Hello?",L1:0}; -conversation[3] = {Q:"I figured you'd find me eventually. Before you ask...yes, I can talk. No, none of the other trimps seem to be able to.",R1:"What else do you know?",L1:4}; -conversation[4] = {Q:"Not much more than you, unfortunately. Whatever brought you here is also what made me...smarter than the average trimp. Before you got here, I wasn't anymore self-aware than any other trimp.",R1:"What are we doing here?",L1:5}; -conversation[5] = {Q:"I don't know--I don't even know where here is. This is all new to me too.",R1:"Well, what do you suggest we do?",L1:6}; -conversation[6] = {Q:"Keep going. Maybe we'll find some answers. Since we're friends now, I've picked up a few tricks that will help us.",R1:"Like what?",L1:7}; -conversation[7] = {Q:"I can tell the trimps to build storage buildings before they get full. I can also buy Gyms and Tributes as soon as we can afford them, and read some upgrade books to you and the trimps when you're not available.",R1:"Which upgrade books?",L1:8, R2:"What else?", L2:9}; -conversation[8] = {Q:"The upgrades I can read are: Speedfarming, Speedlumber, Speedminer, Speedscience, (all the Mega versions too), Efficiency, TrainTacular, Gymystic, Potency, Egg, UberHut, UberHouse, UberMansion, UberHotel, UberResort, and Bounty",R1:"Ok, cool",L1:9}; -conversation[9] = {Q:"I can also highlight the housing that makes the most use of our gems, and the equipment that makes the best use of our metal.",R1:"Cool, what else?",L1:10}; -conversation[10] = {Q:"I'll bring us back to the world if we idle on the premap screen too long and I'll send you back to science-ing if you stay building on an empty queue. I can also unteach Shieldblock.",R1:"Why unteach Shieldblock?",L1:11, R2:"Anything else?",L2:12}; -conversation[11] = {Q:"As we learn more and more Gymystic, our shields becomes less and less useful for blocking. The extra health comes in real handy post z60.",R1:"I get it.",L1:12}; -conversation[12] = {Q:"I can help you respec the portal perks if you've already done it this round, and I can automatically flip between Dominance and Heap formations depending on the enemy we're facing.",R1:"Ok.",L1:13}; -conversation[13] = {Q:"That's it for now, but I'll let you know if I pick up any more tricks. Use the buttons below to let me know what you'd like done.",R1:"Ok.",L1:2}; -updateConvo(0); -*/ - - -//only functions below here -function updateConvo (place) { - conversation[1] = {Q:"" +reactGigaDelta,R1:"Be more honest please.",L1:6,R2:"What can go wrong in the Don't Touch Zone?",L2:4,R3:"I know the Truth.",L3:0}; - conversation[5] = {Q:"Your current Helium per hour gain is " + getStats() + "" +reactPercent,R1:"Cool.",L1:0,R2:"What can go wrong in the Don't Touch Zone?",L2:4,R3:"I know the Truth.",L3:0}; - conversation[6] = {Q:"" +reactAutoPortal,R1:"Please be much more honest.",L1:7,R2:"What can go wrong in the Don't Touch Zone?",L2:4,R3:"I know the Truth.",L3:0}; - document.getElementById("q").innerHTML = conversation[place].Q; - document.getElementById("1").innerHTML = conversation[place].R1; - document.getElementById("1").onclick = (function() { var test = conversation[place].L1; return function() {updateConvo(test + '');}})(); - if ("R2" in conversation[place]) {document.getElementById("2").innerHTML = conversation[place].R2;} - else {document.getElementById("2").innerHTML = "";} - if ("L2" in conversation[place]) {document.getElementById("2").onclick = (function() { var test = conversation[place].L2; return function() {updateConvo(test + '');}})();} - if ("R3" in conversation[place]) {document.getElementById("3").innerHTML = conversation[place].R3;} - else {document.getElementById("3").innerHTML = "";} - if ("L3" in conversation[place]) {document.getElementById("3").onclick = (function() { var test = conversation[place].L3; return function() {updateConvo(test + '');}})();} -} - -function talk() { - getStats(); - getStats2(); - getStats3(); - document.getElementById("autotrimp").style.display = "block"; -} - -function paint() { - getNiceThingsDone(); - document.getElementById("paintTrimp").style.display = "block"; -} From 7c93e493c60d20fa343fa6b7e5ca951615097845 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 19:34:04 +0100 Subject: [PATCH 0246/3477] Update README.md --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d495e29df..88a17b34c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,4 @@ -# AutoTrimps + genBTC -![Donate](https://blockchain.info/Resources/buttons/donate_64.png) -1genbtcPLjAEk6RnfC66chYniFKfP7vASNo one has donated bitcoin yet - be the first and I will be ever eternally grateful
-Automation script for the idle incremental game Trimps, originally based on the zininzinin fork and modified by genBTC (genr8_ on discord)
+# AutoTrimps + Zek [![Join the chat at https://gitter.im/AutoTrimps/Lobby](https://badges.gitter.im/AutoTrimps/Lobby.svg)](https://gitter.im/AutoTrimps/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ## Discussion / Discord Channel @@ -9,7 +6,8 @@ Automation script for the idle incremental game Trimps, originally based on the Discord is a chat program. Come to talk about AutoTrimps, for help, or suggestions for new features : https://discord.gg/0VbWe0dxB9kIfV2C (same one as zininzinin) ## Current Version (full changes below) - Ongoing Development! -- This version has beta changes by genBTC, forked from GenBTC. Including Autostance 3, Update to Swiffy Overlay, and Merging of buttons. Please tell me about bugs on Discord +- Too many to list +- This version has beta changes by Zek, forked from GenBTC + Kfro. Including Autostance 3, Update to Swiffy Overlay, and Merging of buttons. Please tell me about bugs on Discord - Mar 24, BATTLECALC CHANGES: - BattleCalc.js - getBattleStats() updated for the stuff added to AutoStance 1 a while ago, Life,C2,StillRowing, Copied from game code. - Mar 24, EQUIPMENT CHANGES: From df2e49cfc0d391ec9ccd69730c029f03bb9830ec Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 19:34:49 +0100 Subject: [PATCH 0247/3477] Delete install.user.js --- install.user.js | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 install.user.js diff --git a/install.user.js b/install.user.js deleted file mode 100644 index 9f127fb66..000000000 --- a/install.user.js +++ /dev/null @@ -1,19 +0,0 @@ -// ==UserScript== -// @name AutoTrimps-genBTC -// @namespace https://github.com/genbtc/AutoTrimps -// @version 2.1.6.9-genbtc-3-23-2018 -// @updateURL https://github.com/genbtc/AutoTrimps/install.user.js -// @description Automate all the trimps! -// @author zininzinin, spindrjr, Ishkaru, genBTC -// @include *trimps.github.io* -// @include *kongregate.com/games/GreenSatellite/trimps -// @grant none -// ==/UserScript== - -var script = document.createElement('script'); -script.id = 'AutoTrimps-script'; -//This can be edited to be your own Github Repository URL. -script.src = 'https://kfrowde.github.io/AutoTrimps/AutoTrimps2.js'; -//script.setAttribute('crossorigin',"use-credentials"); -script.setAttribute('crossorigin',"anonymous"); -document.head.appendChild(script); From 78c2fa96f690664dda0c263c7c6cd2c2b20653ec Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 19:35:18 +0100 Subject: [PATCH 0248/3477] Delete user.js --- user.js | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 user.js diff --git a/user.js b/user.js deleted file mode 100644 index 3cf8251f3..000000000 --- a/user.js +++ /dev/null @@ -1,26 +0,0 @@ -// ==UserScript== -// @name AutoTrimps-genBTC -// @namespace https://github.com/genbtc/AutoTrimps -// @version 2.1.6.9-genbtc-3-23-2018 -// @updateURL https://github.com/genbtc/AutoTrimps/user.js -// @description Automate all the trimps! -// @author zininzinin, spindrjr, Ishkaru, genBTC -// @include *trimps.github.io* -// @include *kongregate.com/games/GreenSatellite/trimps -// @grant none -// ==/UserScript== - -var script = document.createElement('script'); -script.id = 'AutoTrimps-script'; -//This can be edited to point to your own Github Repository URL. -script.src = 'https://kfrowde.github.io/AutoTrimps/AutoTrimps2.js'; -//script.setAttribute('crossorigin',"use-credentials"); -//script.setAttribute('crossorigin',"anonymous"); -document.head.appendChild(script); - -// This File is Deprecated, please use .user.js instead (with the leading dot) so TamperMonkey/Greasemonkey can detect it as a script automatically. -// Other than that they are identical and no change is required on your part if everything is working already. - -//You can use the following to auto-load your own forked repo as a local directory served from a local HTTPS webserver. -//the other bookmarklet wont load locally - the script.id will tell it to pull the rest of modules from the given URL. -//javascript:with(document)(script = createElement('script'), script.src='https://localhost:4443/AutoTrimps2.js', script.id='AutoTrimps-script',head.appendChild(script))._ From 7a5d0e4d53c1d415f7db4cd0ee990e5bda26b40b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 19:38:54 +0100 Subject: [PATCH 0249/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 11d519417..04b3c1390 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -3,19 +3,19 @@ // @version 2.1.6.9b-genbtc-4-2-2018 // @updateURL https://github.com/genbtc/AutoTrimps/AutoTrimps2.js // @description Automate all the trimps! -// @author zininzinin, spindrjr, belaith, ishakaru, genBTC, Unihedron, coderPatsy +// @author zininzinin, spindrjr, belaith, ishakaru, genBTC, Unihedron, coderPatsy, Kfro, Zeker0 // @include *trimps.github.io* // @include *kongregate.com/games/GreenSatellite/trimps // @grant none // ==/UserScript== -var ATversion = '2.1.6.9b-genbtc-4-2-2018 + KFrowde'; +var ATversion = '2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0'; //////////////////////////////////////////////////////////////////////////////// //Main Loader Initialize Function (loads first, load everything else)/////////// //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////// var atscript = document.getElementById('AutoTrimps-script') - , basepath = 'https://Kfrowde.github.io/AutoTrimps/' + , basepath = 'https://Zorn192.github.io/AutoTrimps/' , modulepath = 'modules/' ; //This should redirect the script to wherever its being mirrored from. @@ -62,9 +62,10 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE +changelogList.push({date: "28/05/2018", version: "v2.2", description: "Added single use prestige raiding, BW raiding, looting II dump, amals are now calcd properly. ", isNew: true}); changelogList.push({date: "4/2", version: "v2.1.6.9b", description: "Import Export, Modules Load code Improvements. Multiple Buttons/Settings Were Combined. AutoPerks code was changed but still functions the same, except for a new algorithm that reduces the time to allocate for high helium players to near-instantaneous. Please test new algo with MODULES[\"perks\"].useAlgo2=true; .You can also clear all perks then allocate and have it work now. AutoMaps no longer considered as being in Lead challenge during Chall^2. ", isNew: true}); -changelogList.push({date: "3/23", version: "v2.1.6.9", description: "Game's Map at Zone can be used with AT now, to run maps forever. AutoMaps setting was combined with RunUniqueMaps (variable has changed from boolean false,true to a value 0,1,2). Settings file has been migrated as such. New: Map SpecialMod is sort of working, at least. Geneticist Infinity bugfix. New AGU Settings for 60% Void (fixed). Many Graphs fixes. AutoMaps changes. Equipment Cap, see README at GitHub DarkTheme fix. Scientists Fix. Zek450 Perks Preset Changed. Ongoing Development...", isNew: false}); -changelogList.push({date: "3/24", version: "v2.1.6.5-stable", description: "Set up Stable Repository for the faint of heart.", isNew: false}); +//changelogList.push({date: "3/23", version: "v2.1.6.9", description: "Game's Map at Zone can be used with AT now, to run maps forever. AutoMaps setting was combined with RunUniqueMaps (variable has changed from boolean false,true to a value 0,1,2). Settings file has been migrated as such. New: Map SpecialMod is sort of working, at least. Geneticist Infinity bugfix. New AGU Settings for 60% Void (fixed). Many Graphs fixes. AutoMaps changes. Equipment Cap, see README at GitHub DarkTheme fix. Scientists Fix. Zek450 Perks Preset Changed. Ongoing Development...", isNew: false}); +//changelogList.push({date: "3/24", version: "v2.1.6.5-stable", description: "Set up Stable Repository for the faint of heart.", isNew: false}); //changelogList.push({date: "3/22", version: "v2.1.6.8", description: "Settings GUI, make better. Import/export improved. Graph buttons: Cycle Up/Down. Internal code fixes. New Graph: Nurseries", isNew: false}); //changelogList.push({date: "3/20", version: "v2.1.6.7", description: "Entirely Re-Arranged Settings Layout. Enjoy! New: Display Tab: EnhanceGrid + Go AFK Mode. GUI: Pinned AT Tab menu bar to top when scrolling. Minimize/Maxi/Close Buttons. ShowChangeLog Button. New Graph: FluffyXP&Xp/Hr (starts@300)", isNew: false}); //changelogList.push({date: "3/13", version: "v2.1.6.6", description: "Geneticist management changes. Equipment code improvements. ATscriptLoad improvements. attempt to track errors.", isNew: false}); From d0e396852fb2459d4a403b016b2dc644e69da7d3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 20:03:14 +0100 Subject: [PATCH 0250/3477] Update heirlooms.js --- modules/heirlooms.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 9c4dd20de..b245fec4b 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -326,6 +326,22 @@ function evaluateHeirloomMods(loom, location, upgrade) { } } break; + + case 'plaguebringer': + tempEff = loom.mods[m][1]/100; + eff += tempEff; + if(upgrade){ + steps = game.heirlooms.Shield.plaguebringer.steps[loom.rarity]; + tempEff = (steps[2]/100)/((game.heirlooms.Shield.plaguebringer.currentBonus/100) + 1); + tempEff = tempEff / getModUpgradeCost(loom, m); + if(tempEff > bestUpgrade.effect) { + bestUpgrade.effect = tempEff; + bestUpgrade.name = 'plaguebringer'; + bestUpgrade.index = m; + } + } + break; + case 'MinerSpeed': tempEff = 0.75*loom.mods[m][1]/100; eff += tempEff; @@ -439,11 +455,17 @@ function evaluateHeirloomMods(loom, location, upgrade) { tempEff = (av * ccb)/(cmb * ccb + 1 - ccb); eff += tempEff; } + else if(!checkForMod('plaguebringer', index, location)){ + steps = game.heirlooms[loom.type].plaguebringer.steps[loom.rarity]; + av = steps[0] + ((steps[1] - steps[0])/2); + tempEff = av/100; + eff += tempEff; + } } if(loom.type == 'Staff') { steps = game.heirlooms.defaultSteps[loom.rarity]; av = steps[0] + ((steps[1] - steps[0])/2); - if(!checkForMod('MinerSpeed', index, location) || !checkForMod('metalDrop', index, location) || !checkForMod('DragimpSpeed', index, location) || !checkForMod('gemsDrop', index, location)){ + if(!checkForMod('MinerSpeed', index, location) || !checkForMod('metalDrop', index, location) || !checkForMod('fragmentsDrop', index, location) || !checkForMod('ExplorerSpeed', index, location) || !checkForMod('FluffyExp', index, location)){ eff += 0.75*av/100; } else if(!checkForMod('FarmerSpeed', index, location) || !checkForMod('LumberjackSpeed', index, location)) { From 683356ae50594a428acc9524ee0f39b5e0df8ac3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 20:04:49 +0100 Subject: [PATCH 0251/3477] Update heirlooms.js --- modules/heirlooms.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index b245fec4b..7bb29cb3b 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -425,6 +425,19 @@ function evaluateHeirloomMods(loom, location, upgrade) { bestUpgrade.index = m; } } + case 'FluffyExp': + tempEff = 0.5*loom.mods[m][1]/100; + eff += tempEff; + if(upgrade) { + steps = game.heirlooms.defaultSteps[loom.rarity]; + tempEff = (0.5*steps[2]/100)/((game.heirlooms.Staff.FluffyExp.currentBonus/100) + 1); + tempEff = tempEff / getModUpgradeCost(loom, m); + if(tempEff > bestUpgrade.effect) { + bestUpgrade.effect = tempEff; + bestUpgrade.name = 'FluffyExp'; + bestUpgrade.index = m; + } + } break; case 'empty': var av; From 18e1567d03341fdbeb048569931a0529e85a9182 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 21:55:30 +0100 Subject: [PATCH 0252/3477] Update other.js --- modules/other.js | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/modules/other.js b/modules/other.js index 35f8c8bf4..897b83c00 100644 --- a/modules/other.js +++ b/modules/other.js @@ -164,13 +164,11 @@ function findLastBionic() { } } -//Praiding - function Praiding() { if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { - if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { - autoTrimpSettings["AutoMaps"].value = 0; - } + //if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { + //autoTrimpSettings["AutoMaps"].value = 0; + //} debug("Beginning Prestige Raiding..."); if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { mapsClicked(); @@ -185,8 +183,8 @@ function Praiding() { failpraid = false; } else if (buyMap() < 0) { - if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { - autoTrimpSettings["AutoMaps"].value = 1; + //if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { + //autoTrimpSettings["AutoMaps"].value = 1; failpraid = true; debug("Failed to prestige raid. Looks like you can't afford to.."); } @@ -194,21 +192,20 @@ function Praiding() { } selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); - } + runMap(); if (!game.global.repeatMap && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { repeatClicked(); } debug("...Successfully prestiged!"); prestraid = true; - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { - autoTrimpSettings["AutoMaps"].value = 1; - debug("Turning AutoMaps back on"); - } - } - else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { - autoTrimpSettings["AutoMaps"].value = 1; - debug("Turning AutoMaps back on"); + //if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { + //autoTrimpSettings["AutoMaps"].value = 1; + //debug("Turning AutoMaps back on"); + //} + //else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { + //autoTrimpSettings["AutoMaps"].value = 1; + //debug("Turning AutoMaps back on"); if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { prestraid = false; } From e7a9969c6f37ed0e757bfa7b5d7a8976f502402d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 21:59:46 +0100 Subject: [PATCH 0253/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 04b3c1390..c4280b275 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -209,7 +209,7 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) - if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) + //if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true) BWraiding(); //BW Raiding (other.js) if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) From aabe0c8eec52fc6115d356c5ad8d61246dc160ac Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 22:00:11 +0100 Subject: [PATCH 0254/3477] Update maps.js --- modules/maps.js | 41 +++-------------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index a1921c94c..e2b912430 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -761,6 +761,9 @@ function autoMap() { //run the Advanced Special Modifier script, bring if (getPageSetting('AdvMapSpecialModifier')) testMapSpecialModController(); + //run praiding + if (game.global.world == getPageSetting('Praidingzone')) + Praiding(); //if we can't afford the map we designed, pick our highest existing map //TODO Debug Output the mods we made. @@ -931,41 +934,3 @@ function mapTimeEstimater() { mapTimeEstimate = 0; return mapTimeEstimate; } - -/* //NEW KFrowde + Sliverz -//Set up Vars -var plusMapVoidLastZone = null; -var plusMapVoid = (voidMapLevelSetting > 0) && (game.global.totalVoidMaps > 0) && (game.global.world == voidMapLevelSettingZone); //Sanity check -var plusMapVoidInput = getPageSetting('PlusMapVoidToggle') -//Check that you should do this, check you've enabled it between the correct values, check that it hasn't already run this zone -if ((plusMapVoid) && (plusMapVoidInput > 0 && plusMapVoidInput <= 10) && (plusMapVoidLastZone === null || plusMapVoidLastZone !== game.global.world)) { - document.getElementById("biomeAdvMapsSelect").value = "Random"; - document.getElementById('advExtraLevelSelect').value = plusMapVoidInput; - document.getElementById('advSpecialSelect').value = "p"; - document.getElementById("lootAdvMapsRange").value = 0; - document.getElementById("difficultyAdvMapsRange").value = 9; - document.getElementById("sizeAdvMapsRange").value = 9; - document.getElementById('advPerfectCheckbox').checked = false; - updateMapCost(); - buyMap(); - selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); - runMap(); - plusMapVoidLastZone = game.global.world; //This stops it from looping -}/* - -/* -function plusFivePres(){ - document.getElementById("biomeAdvMapsSelect").value = "Random"; - document.getElementById('advExtraLevelSelect').value = 5; - document.getElementById('advSpecialSelect').value = "p"; - document.getElementById("lootAdvMapsRange").value = 0; - document.getElementById("difficultyAdvMapsRange").value = 9; - document.getElementById("sizeAdvMapsRange").value = 9; - document.getElementById('advPerfectCheckbox').checked = false; - updateMapCost(); - } -plusFivePres(); -buyMap(); -selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); -runMap(); -*/ From a95cf374770e81a9ca94ae939290786eb2833530 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 22:07:51 +0100 Subject: [PATCH 0255/3477] Update maps.js --- modules/maps.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index e2b912430..988c2cca5 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -761,9 +761,6 @@ function autoMap() { //run the Advanced Special Modifier script, bring if (getPageSetting('AdvMapSpecialModifier')) testMapSpecialModController(); - //run praiding - if (game.global.world == getPageSetting('Praidingzone')) - Praiding(); //if we can't afford the map we designed, pick our highest existing map //TODO Debug Output the mods we made. From a8346ad984d4efc0e3980cfd5a1eba0790dd8606 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 22:09:01 +0100 Subject: [PATCH 0256/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index c4280b275..04b3c1390 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -209,7 +209,7 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) - //if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) + if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true) BWraiding(); //BW Raiding (other.js) if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) From 6a9124cba8aa010bacc16d12a66e12e9198b2907 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 28 May 2018 22:09:51 +0100 Subject: [PATCH 0257/3477] Update other.js --- modules/other.js | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/modules/other.js b/modules/other.js index 897b83c00..35f8c8bf4 100644 --- a/modules/other.js +++ b/modules/other.js @@ -164,11 +164,13 @@ function findLastBionic() { } } +//Praiding + function Praiding() { if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { - //if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { - //autoTrimpSettings["AutoMaps"].value = 0; - //} + if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { + autoTrimpSettings["AutoMaps"].value = 0; + } debug("Beginning Prestige Raiding..."); if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { mapsClicked(); @@ -183,8 +185,8 @@ function Praiding() { failpraid = false; } else if (buyMap() < 0) { - //if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { - //autoTrimpSettings["AutoMaps"].value = 1; + if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { + autoTrimpSettings["AutoMaps"].value = 1; failpraid = true; debug("Failed to prestige raid. Looks like you can't afford to.."); } @@ -192,20 +194,21 @@ function Praiding() { } selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); - + } runMap(); if (!game.global.repeatMap && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { repeatClicked(); } debug("...Successfully prestiged!"); prestraid = true; - //if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { - //autoTrimpSettings["AutoMaps"].value = 1; - //debug("Turning AutoMaps back on"); - //} - //else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { - //autoTrimpSettings["AutoMaps"].value = 1; - //debug("Turning AutoMaps back on"); + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); + } + } + else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { prestraid = false; } From f1cc93f8fbf0f9ea3663773fdb7347d560b4ebda Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 30 May 2018 12:45:12 +0100 Subject: [PATCH 0258/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index efca54356..52397de2f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -435,7 +435,7 @@ function initializeAllSettings() { //Heirloom Settings createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'AutoHeirlooms 1 = Automatically evaluate and carry the best heirlooms, and recommend upgrades for equipped items. AutoHeirlooms will only change carried items when the heirlooms window is not open. Carried items will be compared and swapped with the types that are already carried. If a carry spot is empty, it will be filled with the best shield (if available). Evaluation is based ONLY on the following mods (listed in order of priority, high to low): Void Map Drop Chance/Trimp Attack, Crit Chance/Crit Damage, Miner Efficiency/Metal Drop, Gem Drop/Dragimp Efficiency, Farmer/Lumberjack Efficiency. For the purposes of carrying, rarity trumps all of the stat evaluations. Empty mod slots are valued at the average value of the best missing mod.
AutoHeirlooms 2 = New algorithm for Heirlooms. CAUTION: Turning this on will immediately re-sort your heirlooms according to the new algorithm, and turning it off again DOES revert to the original algorithm even though it may NOT have a visible result on your heirlooms. (fyi: This lack of action highlights one of the problems with the old one.', 'multitoggle', 0, null, 'Heirlooms'); createSetting('AutoUpgradeHeirlooms', 'Auto Upgrade Heirlooms', 'Automatically buys the upgrades the script advises for the Equipped shield and staff, until we are out of nullifium.', 'boolean', false, null, 'Heirlooms'); - + createSetting('loomprotect', 'Heirloom Protection','Will protect and carry any plagued heirlooms you pick up, this is a temporary solution until autoheirlooms is fixed. ', 'boolean', false, null, 'Heirlooms'); //Golden Upgrade Strategies: From e9c0410397141e079b7d95a93280c62f8e9eb299 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 30 May 2018 12:47:13 +0100 Subject: [PATCH 0259/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 04b3c1390..3a24b8015 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -208,7 +208,8 @@ function mainLoop() { setScienceNeeded(); //determine how much science is needed //EXECUTE CORE LOGIC - if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) + if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) + if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true) BWraiding(); //BW Raiding (other.js) if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) From 2dc16c83bd4079e76234309e80cfaf586c49da75 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 30 May 2018 12:48:19 +0100 Subject: [PATCH 0260/3477] Update heirlooms.js --- modules/heirlooms.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 7bb29cb3b..3fb5d8af6 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -556,3 +556,7 @@ function generateHeirloomIcon(heirloom, location, number){ html += locText + ', this)"> '; return html; } + +function protectloom() { + +} From 44a4a0d677bed6cb8a4473cc38992be9a11ef98c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 30 May 2018 13:35:20 +0100 Subject: [PATCH 0261/3477] Update heirlooms.js --- modules/heirlooms.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 3fb5d8af6..2c2e3c9a2 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -558,5 +558,13 @@ function generateHeirloomIcon(heirloom, location, number){ } function protectloom() { + if (getPageSetting('loomprotect') == true && game.global.heirloomsCarried.length < game.global.maxCarriedHeirlooms) { + for (var index in game.global.heirloomsExtra) { + var aLoom = game.global.heirloomsExtra[index]; + var data = {'location': 'heirloomsExtra', 'index': index, 'rarity': theLoom.rarity}; + } } + + + From 6f8a3f77471243894b6281a669457db10e85d474 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 30 May 2018 18:03:21 +0100 Subject: [PATCH 0262/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 3a24b8015..e2a2983c3 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -209,7 +209,7 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) - if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) + //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true) BWraiding(); //BW Raiding (other.js) if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) From 5fda8aa4200951fff9f82505406dc00cbe9ef101 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 30 May 2018 18:03:53 +0100 Subject: [PATCH 0263/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 52397de2f..772588177 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -435,7 +435,7 @@ function initializeAllSettings() { //Heirloom Settings createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'AutoHeirlooms 1 = Automatically evaluate and carry the best heirlooms, and recommend upgrades for equipped items. AutoHeirlooms will only change carried items when the heirlooms window is not open. Carried items will be compared and swapped with the types that are already carried. If a carry spot is empty, it will be filled with the best shield (if available). Evaluation is based ONLY on the following mods (listed in order of priority, high to low): Void Map Drop Chance/Trimp Attack, Crit Chance/Crit Damage, Miner Efficiency/Metal Drop, Gem Drop/Dragimp Efficiency, Farmer/Lumberjack Efficiency. For the purposes of carrying, rarity trumps all of the stat evaluations. Empty mod slots are valued at the average value of the best missing mod.
AutoHeirlooms 2 = New algorithm for Heirlooms. CAUTION: Turning this on will immediately re-sort your heirlooms according to the new algorithm, and turning it off again DOES revert to the original algorithm even though it may NOT have a visible result on your heirlooms. (fyi: This lack of action highlights one of the problems with the old one.', 'multitoggle', 0, null, 'Heirlooms'); createSetting('AutoUpgradeHeirlooms', 'Auto Upgrade Heirlooms', 'Automatically buys the upgrades the script advises for the Equipped shield and staff, until we are out of nullifium.', 'boolean', false, null, 'Heirlooms'); - createSetting('loomprotect', 'Heirloom Protection','Will protect and carry any plagued heirlooms you pick up, this is a temporary solution until autoheirlooms is fixed. ', 'boolean', false, null, 'Heirlooms'); + //createSetting('loomprotect', 'Heirloom Protection','Will protect and carry any plagued heirlooms you pick up, this is a temporary solution until autoheirlooms is fixed. ', 'boolean', false, null, 'Heirlooms'); //Golden Upgrade Strategies: From 69e6b4912de9ebfeef27158e75380736b924488c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 2 Jun 2018 12:47:43 +0100 Subject: [PATCH 0264/3477] Update other.js --- modules/other.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index 35f8c8bf4..04e10ecd4 100644 --- a/modules/other.js +++ b/modules/other.js @@ -209,10 +209,11 @@ function Praiding() { else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); - if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { + } + if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { prestraid = false; - } - } + } + } From 2880d616e88f837f2d2acc6e71ff8e52e294ff54 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 2 Jun 2018 20:58:16 +0100 Subject: [PATCH 0265/3477] Delete perky.js --- modules/perky.js | 791 ----------------------------------------------- 1 file changed, 791 deletions(-) delete mode 100644 modules/perky.js diff --git a/modules/perky.js b/modules/perky.js deleted file mode 100644 index 758bc44b1..000000000 --- a/modules/perky.js +++ /dev/null @@ -1,791 +0,0 @@ -// ==UserScript== -// @name Trimps - Autoperks - PERKY -// @namespace http://tampermonkey.net/ -// @version 0.5 -// @description try to take over the world! -// @author OG: Grimy -> Altizar -> Zeker0 -> genBTC -// @match https://trimps.github.io/* -// @include *trimps.github.io* -// @include *kongregate.com/games/GreenSatellite/trimps -// @grant GM_xmlhttpRequest -// ==/UserScript== - -//Create blank AutoPerks object -MODULES["perks"] = {}; -var AutoPerks = {}; - -var AutoPerks = { - data: { - he_left: 0, - zone: 60, - targetzone: 60, - perks: null, - weight: { - helium: 0, - attack: 0, - health: 0, - xp: 0, - trimps: 0 - }, - fluffy: { - xp: 0, - prestige: 0 - }, - mod: { - storage: 0.125, - soldiers: 0, - dg: 0, - tent_city: false, - whip: false, - magn: false, - taunt: false, - ven: false, - chronojest: 0, - prod: 0, - loot: 0, - breed_timer: 0 - } - }, - preset: "z450", - fixed: "", - Perk: /** @class */ (function () { - function Perk(base_cost, increment, cap, free, scaling) { - if (scaling === void 0) { - scaling = 30; - } - this.base_cost = base_cost; - this.increment = increment; - this.cap = cap; - this.free = free; - this.scaling = scaling; - this.locked = true; - this.level = 0; - this.pack = 1; - this.must = 0; - this.spent = 0; - } - // Compute the current cost of a perk, based on its current level. - Perk.prototype.cost = function () { - return this.increment - ? this.pack * - (this.base_cost + - this.increment * (this.level + (this.pack - 1) / 2)) - : Math.ceil(this.level / 2 + this.base_cost * AutoPerky.mult(this, this.scaling)); - }; - return Perk; - })(), - unlocks: "", - notation: 2, - perks: null, - presets: { - early: ["5", "4", "3"], - broken: ["7", "3", "1"], - mid: ["16", "5", "1"], - corruption: ["25", "7", "1"], - magma: ["35", "4", "3"], - z280: ["42", "6", "1"], - z400: ["88", "10", "1"], - z450: ["500", "50", "1"], - spire: ["0", "1", "1"], - nerfed: ["0", "4", "3"], - tent: ["5", "4", "3"], - scientist: ["0", "1", "3"], - carp: ["0", "0", "0"], - trapper: ["0", "7", "1"], - coord: ["0", "40", "1"], - trimp: ["0", "99", "1"], - metal: ["0", "7", "1"], - c2: ["0", "7", "1"], - custom: ["1", "1", "1"] - }, - notations: [ - [], - ( - "KMBTQaQiSxSpOcNoDcUdDdTdQadQidSxdSpdOdNdVUvDvTvQavQivSxvSpvOvNvTgUtgDtgTtgQatg" + - "QitgSxtgSptgOtgNtgQaaUqaDqaTqaQaqaQiqaSxqaSpqaOqaNqaQiaUqiDqiTqiQaqiQiqiSxqiSpqi" + - "OqiNqiSxaUsxDsxTsxQasxQisxSxsxSpsxOsxNsxSpaUspDspTspQaspQispSxspSpspOspNspOgUog" + - "DogTogQaogQiogSxogSpogOogNogNaUnDnTnQanQinSxnSpnOnNnCtUc" - ).split(/(?=[A-Z])/), - [], - ( - "a b c d e f g h i j k l m n o p q r s t u v w x y z" + - " aa ab ac ad ae af ag ah ai aj ak al am an ao ap aq ar as at au av aw ax ay az" + - " ba bb bc bd be bf bg bh bi bj bk bl bm bn bo bp bq br bs bt bu bv bw bx by bz" + - " ca cb cc cd ce cf cg ch ci cj ck cl cm cn co cp cq cr cs ct cu cv cw cx" - ).split(" "), - "KMBTQaQiSxSpOcNoDcUdDdTdQadQidSxdSpdOdNdVUvDvTvQavQivSxvSpvOvNvTg".split( - /(?=[A-Z])/ - ) - ], - add: function (perk, x) { - return 1 + perk.level * x / 100; - }, - mult: function (perk, x) { - return Math.pow(1 + x / 100, perk.level); - }, - mastery: function (name) { - if (!game.talents[name]) { - throw "unknown mastery: " + name; - } - return game.talents[name].purchased; - }, - parse_suffixes: function (str) { - str = str.replace(/\*.*|[^--9+a-z]/gi, ""); - var suffixes = AutoPerky.notations[AutoPerky.notation === "3" ? 3 : 1]; - for (var i = suffixes.length; i > 0; --i) { - str = str.replace(new RegExp(suffixes[i - 1] + "$", "i"), "E" + 3 * i); - } - return +str; - }, - parse_perks: function (fixed, unlocks) { - var perks = { - Looting_II: new AutoPerky.Perk(100e3, 10e3, Infinity, 1e4), - Carpentry_II: new AutoPerky.Perk(100e3, 10e3, Infinity, 1e4), - Motivation_II: new AutoPerky.Perk(50e3, 1e3, Infinity, 1e4), - Power_II: new AutoPerky.Perk(20e3, 500, Infinity, 1e4), - Toughness_II: new AutoPerky.Perk(20e3, 500, Infinity, 1e4), - Capable: new AutoPerky.Perk(1e8, 0, 10, 1e4, 900), - Cunning: new AutoPerky.Perk(1e11, 0, Infinity, 1e4), - Curious: new AutoPerky.Perk(1e14, 0, Infinity, 1e4), - Overkill: new AutoPerky.Perk(1e6, 0, 30, 1e4), - Resourceful: new AutoPerky.Perk(50e3, 0, Infinity, 1e6), - Coordinated: new AutoPerky.Perk(150e3, 0, Infinity, 1e4), - Siphonology: new AutoPerky.Perk(100e3, 0, 3, 1e4), - Anticipation: new AutoPerky.Perk(1000, 0, 10, 1e4), - Resilience: new AutoPerky.Perk(100, 0, Infinity, 1e4), - Meditation: new AutoPerky.Perk(75, 0, 7, 1e4), - Relentlessness: new AutoPerky.Perk(75, 0, 10, 1e4), - Carpentry: new AutoPerky.Perk(25, 0, Infinity, 1e4), - Artisanistry: new AutoPerky.Perk(15, 0, Infinity, 1e4), - Range: new AutoPerky.Perk(1, 0, 10, 1e4), - Agility: new AutoPerky.Perk(4, 0, 20, 1e4), - Bait: new AutoPerky.Perk(4, 0, Infinity, 1e7), - Trumps: new AutoPerky.Perk(3, 0, Infinity, 1e8), - Pheromones: new AutoPerky.Perk(3, 0, Infinity, 1e6), - Packrat: new AutoPerky.Perk(3, 0, Infinity, 1e7), - Motivation: new AutoPerky.Perk(2, 0, Infinity, 1e4), - Power: new AutoPerky.Perk(1, 0, Infinity, 1e4), - Toughness: new AutoPerky.Perk(1, 0, Infinity, 1e4), - Looting: new AutoPerky.Perk(1, 0, Infinity, 1e4) - }; - if (!unlocks.match(/>/)) { - unlocks = unlocks.replace(/(?=,|$)/g, ">0"); - } - var list = (unlocks + "," + fixed).split(/,/).filter(x => x); - for (var key in list) { - var item = list[key]; - var m = (m = item.match(/(\S+) *([<=>])=?(.*)/)); - if (!m) { - throw "Enter a list of perk levels, such as “power=42, toughness=51”."; - } - var tier2 = m[1].match(/2$|II$/); - var name = m[1].replace(/[ _]?(2|II)/i, "").replace(/^OK/i, "O").replace(/^Looty/i, "L"); - var regex = new RegExp(`^${name}[a-z]*${tier2 ? "_II" : ""}$`, "i"); - var matches = Object.keys(perks).filter(p => p.match(regex)); - if (matches.length > 1) { - throw `Ambiguous perk abbreviation: ${m[1]}.`; - } - if (matches.length < 1) { - throw `Unknown perk: ${m[1]}.`; - } - let level = m[3]; - if (!isFinite(level)) { - throw `Invalid number: ${m[3]}.`; - } - perks[matches[0]].locked = false; - if (m[2] != ">") { - perks[matches[0]].cap = parseInt(level); - } - if (m[2] != "<") { - perks[matches[0]].must = parseInt(level); - } - } - return perks; - }, - select_preset: function (name, manually) { - if (manually === void 0) { - manually = true; - } - this.data.weight = { - helium: parseInt(this.presets[name][0]), - attack: parseInt(this.presets[name][1]), - health: parseInt(this.presets[name][2]), - xp: Math.floor((+this.presets[name][0] + +this.presets[name][1] + +this.presets[name][2]) / 5), - trimps: 0 - }; - }, - read_data: function () { - this.data.zone = this.data.targetzone; - this.unlocks = Object.keys(game.portal).filter(function (perk) { - return !game.portal[perk].locked; - }).join(","); - this.data.perks = this.parse_perks(this.fixed, this.unlocks); - var preset = this.preset; - this.select_preset(preset); - if (preset == "trapper" && (!game || game.global.challengeActive != "Trapper")) { - throw "This preset requires a save currently running Trapper². Start a new run using “Trapper² (initial)”, export, and try again."; - } - this.update_dg(); - //extra settings - var zone = this.data.targetzone; - var helium = game.global.viewingUpgrades ? game.global.heliumLeftover : game.global.heliumLeftover + game.resources.helium.owned; - for (var perk in game.portal) { - helium += game.portal[perk].heliumSpent; - } - var unlocks = Object.keys(game.portal).filter(function (perk) { - return !game.portal[perk].locked; - }); - if (!game.global.canRespecPerks) { - unlocks = unlocks.map(function (perk) { - return perk + ">" + game.portal[perk].level; - }); - } - // Income - var tt = this.mastery("turkimp4") ? 1 : this.mastery("turkimp3") ? 0.6 : this.mastery("turkimp2") ? 0.4 : this.mastery("turkimp") ? 0.3 : 0.25; - var prod = 1 + tt; - var loot = 1 + 0.333 * tt; - var spires = Math.min(Math.floor((zone - 101) / 100), game.global.spiresCompleted); - loot *= zone < 100 ? 0.7 : 1 + (this.mastery("stillRowing") ? 0.3 : 0.2) * spires; - var chronojest = 27 * game.unlocks.imps.Jestimp + 15 * game.unlocks.imps.Chronoimp; - var cache = zone < 60 ? 0 : zone < 85 ? 7 : zone < 160 ? 10 : zone < 185 ? 14 : 20; - chronojest += (this.mastery("mapLoot2") ? 5 : 4) * cache; - for (var _i = 0, _a = game.global.StaffEquipped.mods || []; _i < _a.length; _i++) { - var mod = _a[_i]; - if (mod[0] === "MinerSpeed") { - prod *= 1 + 0.01 * mod[1]; - } else if (mod[0] === "metalDrop") { - loot *= 1 + 0.01 * mod[1]; - } - } - this.data.he_left = helium + (game.global.canRespecPerks ? 0 : game.resources.helium.owned); - this.data.fluffy = { - xp: game ? game.global.fluffyExp : 0, - prestige: game ? game.global.fluffyPrestige : 0 - }; - this.data.mod = { - storage: 0.125, - soldiers: 0, - dg: preset == "nerfed" ? 0 : this.data.mod.dg, - tent_city: preset == "tent", - whip: game.unlocks.imps.Whipimp, - magn: game.unlocks.imps.Magnimp, - taunt: game.unlocks.imps.Tauntimp, - ven: game.unlocks.imps.Venimp, - chronojest: chronojest, - prod: prod, - loot: loot, - breed_timer: 45 - }; - if (preset == "nerfed") { - this.data.he_left = 1e8; - this.data.zone = 200; - this.data.mod.dg = 0; - } - if (preset == "trapper") { - this.data.mod.soldiers = game.resources.trimps.owned; - this.data.mod.prod = 0; - this.data.perks.Pheromones.cap = 0; - this.data.perks.Anticipation.cap = 0; - } - if (preset == "spire") { - this.data.mod.prod = this.data.mod.loot = 0; - this.data.perks.Overkill.cap = 0; - this.data.zone = game.global.world; - } - if (preset == "carp") { - this.data.mod.prod = this.data.mod.loot = 0; - this.data.weight.trimps = 1e6; - } - if (preset == "metal") { - this.data.mod.prod = 0; - } - if (preset == "trimp") { - this.data.mod.soldiers = 1; - } - if (preset == "nerfed") { - this.data.perks.Overkill.cap = 1; - } - if (preset == "scientist") { - this.data.perks.Coordinated.cap = 0; - } - }, - update_dg: function () { - var max_zone = this.data.targetzone / 2 + 115; - var eff = 500e6 + 50e6 * game.generatorUpgrades.Efficiency.upgrades; - var capa = 3 + 0.4 * game.generatorUpgrades.Capacity.upgrades; - var max_fuel = game.permanentGeneratorUpgrades.Storage.owned ? capa * 1.5 : capa; - var supply = 230 + 2 * game.generatorUpgrades.Supply.upgrades; - var overclock = game.generatorUpgrades.Overclocker.upgrades; - overclock = overclock && 1 - 0.5 * Math.pow(0.99, overclock - 1); - var burn = game.permanentGeneratorUpgrades.Slowburn.owned ? 0.4 : 0.5; - var cells = this.mastery("magmaFlow") ? 18 : 16; - var accel = this.mastery("quickGen") ? 1.03 : 1.02; - var hs2 = this.mastery("hyperspeed2") ? (game.global.highestLevelCleared + 1) / 2 : 0; - var bs = 0.5 * this.mastery("blacksmith") + 0.25 * this.mastery("blacksmith2") + 0.15 * this.mastery("blacksmith3"); - bs *= game.global.highestLevelCleared + 1; - var housing = 0; - var fuel = 0; - var time = 0; - function tick(mult) { - housing += mult * eff * Math.sqrt(Math.min(capa, fuel)); - fuel -= burn; - } - for (var zone = 230; zone <= max_zone; ++zone) { - fuel += cells * (0.01 * Math.min(zone, supply) - 2.1); - var tick_time = Math.ceil(60 / Math.pow(accel, Math.floor((zone - 230) / 3))); - time += zone > bs ? 28 : zone > hs2 ? 20 : 15; - while (time >= tick_time) { - time -= tick_time; - tick(1); - } - while (fuel > max_fuel) { - tick(overclock); - } - housing *= 1.009; - } - while (fuel >= burn) { - tick(1); - } - this.data.mod.dg = housing; - }, - optimize: function (data) { - var he_left = data.he_left, - zone = data.zone, - fluffy = data.fluffy, - perks = data.perks, - weight = data.weight, - mod = data.mod; - var Looting_II = perks.Looting_II, - Carpentry_II = perks.Carpentry_II, - Motivation_II = perks.Motivation_II, - Power_II = perks.Power_II, - Toughness_II = perks.Toughness_II, - Capable = perks.Capable, - Cunning = perks.Cunning, - Curious = perks.Curious, - Overkill = perks.Overkill, - Resourceful = perks.Resourceful, - Coordinated = perks.Coordinated, - Siphonology = perks.Siphonology, - Anticipation = perks.Anticipation, - Resilience = perks.Resilience, - Meditation = perks.Meditation, - Relentlessness = perks.Relentlessness, - Carpentry = perks.Carpentry, - Artisanistry = perks.Artisanistry, - Range = perks.Range, - Agility = perks.Agility, - Bait = perks.Bait, - Trumps = perks.Trumps, - Pheromones = perks.Pheromones, - Packrat = perks.Packrat, - Motivation = perks.Motivation, - Power = perks.Power, - Toughness = perks.Toughness, - Looting = perks.Looting; - for (var name in perks) { - if (name.endsWith("_II")) { - perks[name].pack = Math.pow(10, Math.max(0, Math.floor(Math.log(he_left) / Math.log(100) - 4.2))); - } - } - for (var _i = 0, _a = ["whip", "magn", "taunt", "ven"]; _i < _a.length; _i++) { - var name = _a[_i]; - mod[name] = Math.pow(1.003, zone * 99 * 0.03 * mod[name]); - } - var books = Math.pow(1.25, zone) * Math.pow(zone > 100 ? 1.28 : 1.2, Math.max(zone - 59, 0)); - var gigas = Math.max(0, Math.min(zone - 60, zone / 2 - 25, zone / 3 - 12, zone / 5, zone / 10 + 17, 39)); - var base_housing = Math.pow(1.25, Math.min(zone / 2, 30) + gigas); - var mystic = zone >= 25 ? Math.floor(Math.min(zone / 5, 9 + zone / 25, 15)) : 0; - var tacular = (20 + zone - zone % 5) / 100; - var base_income = 600 * mod.whip * books; - var base_helium = Math.pow(zone - 19, 2); - var max_tiers = zone / 5 + +((zone - 1) % 10 < 5); - var exponents = { - cost: Math.pow(1.069, 0.85 * (zone < 60 ? 57 : 53)), - attack: Math.pow(1.19, 13), - health: Math.pow(1.19, 14), - block: Math.pow(1.19, 10) - }; - var equip_cost = { - attack: 211 * (weight.attack + weight.health) / weight.attack, - health: 248 * (weight.attack + weight.health) / weight.health, - block: 5 * (weight.attack + weight.health) / weight.health - }; - // Number of ticks it takes to one-shot an enemy. - function ticks() { - return 1 + +(Agility.level < 3) + Math.ceil(10 * AutoPerky.mult(Agility, -5)); - } - var moti = function () { - return AutoPerky.add(Motivation, 5) * AutoPerky.add(Motivation_II, 1); - }; - var looting = function () { - return AutoPerky.add(Looting, 5) * AutoPerky.add(Looting_II, 0.25); - }; - function income(ignore_prod) { - var storage = mod.storage * AutoPerky.mult(Resourceful, -5) / AutoPerky.add(Packrat, 20); - var loot = looting() * mod.magn / ticks(); - var prod = ignore_prod ? 0 : moti() * AutoPerky.add(Meditation, 1) * mod.prod; - var chronojest = mod.chronojest * 0.1 * prod * loot; - return (base_income * (prod + loot * mod.loot + chronojest) * (1 - storage)); - } - // Max population - var trimps = mod.tent_city - ? function () { - var carp = AutoPerky.mult(Carpentry, 10) * AutoPerky.add(Carpentry_II, 0.25); - var territory = AutoPerky.add(Trumps, 20); - return 10 * (mod.taunt + territory * (mod.taunt - 1) * 111) * carp; - } - : function () { - var carp = AutoPerky.mult(Carpentry, 10) * AutoPerky.add(Carpentry_II, 0.25); - var bonus = 3 + Math.max(Math.log(income() / base_income * carp / AutoPerky.mult(Resourceful, -5)), 0); - var territory = AutoPerky.add(Trumps, 20) * zone; - return (10 * (base_housing * bonus + territory) * carp * mod.taunt + mod.dg * carp); - }; - function equip(stat) { - var cost = equip_cost[stat] * AutoPerky.mult(Artisanistry, -5); - var levels = 1.136; - var tiers = Math.log(1 + income() * trimps() / cost) / Math.log(exponents.cost); - if (tiers > max_tiers + 0.45) { - levels = Math.log(1 + Math.pow(exponents.cost, tiers - max_tiers) * 0.2) / Math.log(1.2); - tiers = max_tiers; - } - return levels * Math.pow(exponents[stat], tiers); - } - // Number of buildings of a given kind that can be built with the current income. - // cost: base cost of the buildings - // exp: cost increase for each new level of the building - function building(cost, exp) { - cost *= 4 * AutoPerky.mult(Resourceful, -5); - return Math.log(1 + income(true) * trimps() * (exp - 1) / cost) / Math.log(exp); - } - // Number of zones spent in the Magma - function magma() { - return Math.max(zone - 229, 0); - } - // function mancers() { - // let tributes = building(10000, 1.05); - // let mancers = Math.log(loot * Math.pow(1.05, tributes) / 1e62) / Math.log(1.01); - // return magma() ? 1 + 0.6 * (1 - Math.pow(0.9999, mancers)) : 1; - // } - // Breed speed - function breed() { - var nurseries = building(2e6, 1.06) / (1 + 0.1 * Math.min(magma(), 20)); - var potency = 0.0085 * (zone >= 60 ? 0.1 : 1) * Math.pow(1.1, Math.floor(zone / 5)); - return potency * Math.pow(1.01, nurseries) * AutoPerky.add(Pheromones, 10) * mod.ven; - } - var group_size = []; - for (var coord = 0; coord <= Math.log(1 + he_left / 500e3) / Math.log(1.3); ++coord) { - var ratio = 1 + 0.25 * Math.pow(0.98, coord); - var result = 1; - for (var i = 0; i < 100; ++i) { - result = Math.ceil(result * ratio); - } - group_size[coord] = result / Math.pow(ratio, 100); - } - // Theoretical fighting group size (actual size is lower because of Coordinated) - function soldiers() { - var ratio = 1 + 0.25 * AutoPerky.mult(Coordinated, -2); - var pop = (mod.soldiers || trimps()) / 3; - if (mod.soldiers > 1) - pop += 36000 * AutoPerky.add(Bait, 100); - var coords = Math.log(pop / group_size[Coordinated.level]) / Math.log(ratio); - var available = zone - 1 + (magma() ? 100 : 0); - return group_size[0] * Math.pow(1.25, Math.min(coords, available)); - } - // Total attack - function attack() { - var attack = (0.15 + equip("attack")) * Math.pow(0.8, magma()); - attack *= AutoPerky.add(Power, 5) * AutoPerky.add(Power_II, 1); - attack *= AutoPerky.add(Relentlessness, 5 * AutoPerky.add(Relentlessness, 30)); - attack *= Math.pow(1 + Siphonology.level, 0.1) * AutoPerky.add(Range, 1); - attack *= AutoPerky.add(Anticipation, 6); - return soldiers() * attack; - } - // Total survivability (accounts for health and block) - function health() { - var health = (0.6 + equip("health")) * Math.pow(0.8, magma()); - health *= AutoPerky.add(Toughness, 5) * AutoPerky.add(Toughness_II, 1) * AutoPerky.mult(Resilience, 10); - // block - var gyms = building(400, 1.185); - var trainers = (gyms * Math.log(1.185) - Math.log(1 + gyms)) / Math.log(1.1) + 25 - mystic; - var block = 0.04 * gyms * Math.pow(1 + mystic / 100, gyms) * (1 + tacular * trainers); - // target number of attacks to survive - var attacks = 60; - if (zone < 70) { - // number of ticks needed to repopulate an army - var timer = - Math.log(1 + soldiers() * breed() / AutoPerky.add(Bait, 100)) / Math.log(1 + breed()); - attacks = timer / ticks(); - } else { - var ratio = 1 + 0.25 * AutoPerky.mult(Coordinated, -2); - var available = zone - 1 + (magma() ? 100 : 0); - var required = group_size[Coordinated.level] * Math.pow(ratio, available); - var fighting = Math.min(required / trimps(), 1 / 3); - var target_speed = fighting > 1e-9 ? (Math.pow(0.5 / (0.5 - fighting), 0.1 / mod.breed_timer) - 1) * 10 : fighting / mod.breed_timer; - var geneticists = Math.log(breed() / target_speed) / -Math.log(0.98); - health *= Math.pow(1.01, geneticists); - } - health /= attacks; - if (zone < 60) { - block += equip("block"); - } else { - block = Math.min(block, 4 * health); - } - return soldiers() * (block + health); - } - // XP earned by Fluffy over the run - fluffy.base = 0; - for (var z = 301; z < zone; ++z) { - fluffy.base += 50 * Math.pow(1.015, z - 300); - } - function xp() { - var total = fluffy.base * AutoPerky.add(Cunning, 25) * AutoPerky.add(Curious, 60); - var cap = Capable.level == 10 ? Infinity : 1000 * Math.pow(5, fluffy.prestige) * (AutoPerky.mult(Capable, 300) - 1) / 3; - return Math.max(1, Math.min(total, cap - fluffy.xp) + Math.min(total * 7, cap - fluffy.xp)); - } - var agility = function () { - return 1 / AutoPerky.mult(Agility, -5); - }; - var helium = function () { - return base_helium * looting() + 45; - }; - var overkill = function () { - return Math.max(0.2, Overkill.level); - }; - var stats = { - agility: agility, - helium: helium, - xp: xp, - attack: attack, - health: health, - overkill: overkill, - trimps: trimps - }; - function score() { - var result = 0; - for (var i in weight) { - if (!weight[i]) { - continue; - } - var stat = stats[i](); - if (!isFinite(stat)) { - throw Error(i + " is " + stat); - } - result += weight[i] * Math.log(stat); - } - return result; - } - function best_perk() { - var best; - var max = 0; - var baseline = score(); - for (var name in perks) { - var perk = perks[name]; - if (perk.locked || perk.level >= perk.cap || perk.cost() > he_left) { - continue; - } - perk.level += perk.pack; - var gain = score() - baseline; - perk.level -= perk.pack; - var efficiency = gain / perk.cost(); - if (efficiency >= max) { - max = efficiency; - best = perk; - } - } - return best; - } - mod.loot *= 20.8; // TODO: check that this is correct - weight.agility = (weight.helium + weight.attack) / 2; - weight.overkill = 0.25 * weight.attack * (2 - Math.pow(0.9, weight.helium / weight.attack)); - //Disable Bait if we are above z110 - if (zone > 110 && mod.soldiers <= 1 && Bait.must == 0) { - Bait.cap = 0; - } - if (!Capable.must) { - Capable.must = Math.ceil(Math.log(0.003 * fluffy.xp / Math.pow(5, fluffy.prestige) + 1) / Math.log(4)); - } - // Dirty fix - Capable.must = Math.min(Capable.must, 10, Math.floor(Math.log(he_left) / Math.log(10) - 7.5)); - for (var name in perks) { - var perk = perks[name]; - while (perk.level < perk.must) { - var cost = perk.cost(); - he_left -= cost; - perk.level += perk.pack; - perk.spent += cost; - } - } - if (he_left < 0) { - throw game && game.global.canRespecPerks ? "You don’t have enough Helium to afford your Fixed Perks." : "You don’t have a respec available."; - } - // Main loop - for (var best = void 0; (best = best_perk()); ) { - var spent = 0; - while (best.level < best.cap && (best.level < best.must || spent < he_left / best.free)) { - he_left -= best.cost(); - spent += best.cost(); - best.level += best.pack; - if (best.level == 1000 * best.pack) { - best.pack *= 10; - } - } - best.spent += spent; - } - for (var perk in perks) { - //console.log(perk, "=", perks[perk].level, "=", perks[perk].must); - } - return [he_left, perks]; - }, - init: function () { - var ratio = JSON.parse(localStorage.getItem("AutoperkCustomRatio")); - if (ratio !== null && ratio !== undefined && ratio.length === 3) { - this.presets["custom"] = ratio; - } - this.buildButtons(); - }, - run: function () { - this.inputs = this.read_data(); - this.optimize(this.data); - }, - clickAllocate: function () { - AutoPerky.run(); - this.applyCalculations(this.data.perks); - }, - applyCalculations: function (perks) { - var preBuyAmt = game.global.buyAmt; - if (game.global.canRespecPerks) { - respecPerks(); - } - if (game.global.respecActive) { - clearPerks(); - for (var i in perks) { - if (!game.portal[i].locked) { - game.global.buyAmt = perks[i].level; - buyPortalUpgrade(i); - } - } - } - game.global.buyAmt = preBuyAmt; - numTab(1, true); //selects the 1st number of the buy-amount tab-bar (Always 1) - cancelTooltip(); //displays the last perk we bought's tooltip without this. idk why. - }, - createInput: function (perkname, div) { - var perk1input = document.createElement("Input"); - perk1input.id = perkname + "Ratio"; - var oldstyle = "text-align: center; width: 60px;"; - if (game.options.menu.darkTheme.enabled != 2) { - perk1input.setAttribute("style", oldstyle + " color: black;"); - } else { - perk1input.setAttribute("style", oldstyle); - } - perk1input.setAttribute("class", "perkRatios"); - var perk1label = document.createElement("Label"); - perk1label.id = perkname + "Label"; - perk1label.innerHTML = perkname; - perk1label.setAttribute("style", "margin-right: 1vw; width: 120px; color: white;"); - //add to the div. - perk1input.setAttribute("onchange", "AutoPerky.saveRatios()"); - div.appendChild(perk1input); - div.appendChild(perk1label); - }, - saveRatios: function () { - if (this.preset === "custom") { - this.presets[this.preset][0] = parseInt(document.getElementById("HeliumRatio").value); - this.presets[this.preset][1] = parseInt(document.getElementById("AttackRatio").value); - this.presets[this.preset][2] = parseInt(document.getElementById("HealthRatio").value); - safeSetItems("AutoperkCustomRatio", JSON.stringify(this.presets[this.preset])); - } - if (this.fixed != document.getElementById("FixedRatio").value) { - this.fixed = document.getElementById("FixedRatio").value; - safeSetItems("AutoperkFixedPerks", this.fixed); - } - var loadZone = parseInt(document.getElementById("TargetRatio").value); - if (loadZone > 0) { - this.data.targetzone = loadZone; - safeSetItems("AutoperkTargetZone", this.data.targetzone); - } - }, - setDefaultRatios: function () { - if (this.preset !== document.getElementById("ratioPreset").value) { - var ratioSet = document.getElementById("ratioPreset").selectedIndex; - if (Number.isInteger(ratioSet)) { - safeSetItems("AutoperkSelectedRatioPresetID", ratioSet); - } - this.preset = document.getElementById("ratioPreset").value; - } - document.getElementById("HeliumRatio").value = this.presets[this.preset][0]; - document.getElementById("AttackRatio").value = this.presets[this.preset][1]; - document.getElementById("HealthRatio").value = this.presets[this.preset][2]; - if (this.preset === "custom") { - document.getElementById("HeliumRatio").disabled = false; - document.getElementById("AttackRatio").disabled = false; - document.getElementById("HealthRatio").disabled = false; - } else { - document.getElementById("HeliumRatio").disabled = true; - document.getElementById("AttackRatio").disabled = true; - document.getElementById("HealthRatio").disabled = true; - } - document.getElementById("FixedRatio").value = this.fixed; - document.getElementById("TargetRatio").value = this.data.targetzone; - }, - buildButtons: function () { - var buttonbar = document.getElementById("portalBtnContainer"); - var customRatios = document.createElement("DIV"); - customRatios.id = 'customRatios'; - this.createInput("Helium", customRatios); - this.createInput("Attack", customRatios); - this.createInput("Health", customRatios); - this.createInput("Target", customRatios); - this.createInput("Fixed", customRatios); - var loadFixed = localStorage.getItem("AutoperkFixedPerks"); - if (loadFixed !== null) { - this.fixed = loadFixed; - } - var loadZone = parseInt(localStorage.getItem("AutoperkTargetZone")); - if (loadZone > 0) { - this.data.targetzone = loadZone; - } else { - this.data.targetzone = - game.stats.highestVoidMap.valueTotal || game.global.highestLevelCleared; - } - //Create Allocator button and add it to Trimps Perk Window - var allocatorBtn1 = document.createElement("DIV"); - allocatorBtn1.id = "allocatorBTN1"; - allocatorBtn1.setAttribute("class", "btn inPortalBtn settingsBtn settingBtntrue"); - allocatorBtn1.setAttribute("onclick", "AutoPerky.clickAllocate();"); - allocatorBtn1.textContent = "Allocate Perks"; - buttonbar.appendChild(allocatorBtn1); - buttonbar.setAttribute("style", "margin-bottom: 0.8vw;"); - - var ratioPreset = document.createElement("select"); - ratioPreset.id = "ratioPreset"; - var oldstyle = "text-align: center; width: 110px;"; - if (game.options.menu.darkTheme.enabled != 2) - ratioPreset.setAttribute("style", oldstyle + " color: black;"); - else - ratioPreset.setAttribute("style", oldstyle); - //Populate dump perk dropdown list : - // var AutoPerky.presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2]; - var html = ""; - for (var key in this.presets) { - html += '"; - } - //Specific ratios labeled above are configured down in the bottom of this file.Lines 543-556 - ratioPreset.innerHTML = html; - //load the last ratio used - var loadLastPreset = localStorage.getItem("AutoperkSelectedRatioPresetID"); - if (loadLastPreset != null) - ratioPreset.selectedIndex = loadLastPreset; // First element is zxv (default) ratio. - else - ratioPreset.selectedIndex = 0; - ratioPreset.setAttribute("onchange", "AutoPerky.setDefaultRatios()"); - //Add the presets dropdown to UI Line 1 - customRatios.appendChild(ratioPreset); - document.getElementById("portalWrapper").appendChild(customRatios); - document.getElementById("FixedRatio").style["width"] = "480px"; - this.setDefaultRatios(); - } -}; - -AutoPerky.init(); \ No newline at end of file From 9f6f5a4ab1e33416c8032faa1cc0c766b5ec5b95 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 2 Jun 2018 20:59:00 +0100 Subject: [PATCH 0266/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 04e10ecd4..8a63af1b1 100644 --- a/modules/other.js +++ b/modules/other.js @@ -262,10 +262,10 @@ function BWraiding() { else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); + } if (bwraided == true && game.global.world !== getPageSetting('BWraidingz')) { bwraided = false; } - } } //AutoAllocate Looting II From 9a55a1b5d97baa52d2b03ccd564e8377da8733ae Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 14:36:31 +0100 Subject: [PATCH 0267/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 772588177..cbec829ab 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -435,8 +435,6 @@ function initializeAllSettings() { //Heirloom Settings createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'AutoHeirlooms 1 = Automatically evaluate and carry the best heirlooms, and recommend upgrades for equipped items. AutoHeirlooms will only change carried items when the heirlooms window is not open. Carried items will be compared and swapped with the types that are already carried. If a carry spot is empty, it will be filled with the best shield (if available). Evaluation is based ONLY on the following mods (listed in order of priority, high to low): Void Map Drop Chance/Trimp Attack, Crit Chance/Crit Damage, Miner Efficiency/Metal Drop, Gem Drop/Dragimp Efficiency, Farmer/Lumberjack Efficiency. For the purposes of carrying, rarity trumps all of the stat evaluations. Empty mod slots are valued at the average value of the best missing mod.
AutoHeirlooms 2 = New algorithm for Heirlooms. CAUTION: Turning this on will immediately re-sort your heirlooms according to the new algorithm, and turning it off again DOES revert to the original algorithm even though it may NOT have a visible result on your heirlooms. (fyi: This lack of action highlights one of the problems with the old one.', 'multitoggle', 0, null, 'Heirlooms'); createSetting('AutoUpgradeHeirlooms', 'Auto Upgrade Heirlooms', 'Automatically buys the upgrades the script advises for the Equipped shield and staff, until we are out of nullifium.', 'boolean', false, null, 'Heirlooms'); - //createSetting('loomprotect', 'Heirloom Protection','Will protect and carry any plagued heirlooms you pick up, this is a temporary solution until autoheirlooms is fixed. ', 'boolean', false, null, 'Heirlooms'); - //Golden Upgrade Strategies: createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections.', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void"], 'Golden'); From 559c35908ebfcb6c3b8849111b46ed5fa53905aa Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 18:46:40 +0100 Subject: [PATCH 0268/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index cbec829ab..c12b0aced 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -433,7 +433,7 @@ function initializeAllSettings() { //Heirloom Settings - createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'AutoHeirlooms 1 = Automatically evaluate and carry the best heirlooms, and recommend upgrades for equipped items. AutoHeirlooms will only change carried items when the heirlooms window is not open. Carried items will be compared and swapped with the types that are already carried. If a carry spot is empty, it will be filled with the best shield (if available). Evaluation is based ONLY on the following mods (listed in order of priority, high to low): Void Map Drop Chance/Trimp Attack, Crit Chance/Crit Damage, Miner Efficiency/Metal Drop, Gem Drop/Dragimp Efficiency, Farmer/Lumberjack Efficiency. For the purposes of carrying, rarity trumps all of the stat evaluations. Empty mod slots are valued at the average value of the best missing mod.
AutoHeirlooms 2 = New algorithm for Heirlooms. CAUTION: Turning this on will immediately re-sort your heirlooms according to the new algorithm, and turning it off again DOES revert to the original algorithm even though it may NOT have a visible result on your heirlooms. (fyi: This lack of action highlights one of the problems with the old one.', 'multitoggle', 0, null, 'Heirlooms'); + createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'Use Autoheirlooms 1. ', 'multitoggle', 0, null, 'Heirlooms'); createSetting('AutoUpgradeHeirlooms', 'Auto Upgrade Heirlooms', 'Automatically buys the upgrades the script advises for the Equipped shield and staff, until we are out of nullifium.', 'boolean', false, null, 'Heirlooms'); //Golden Upgrade Strategies: From 25ee13b63a07af4e0b9b579671907860894ca669 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 18:50:19 +0100 Subject: [PATCH 0269/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index c12b0aced..76be2dcd9 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -339,7 +339,7 @@ function initializeAllSettings() { //AutoMaps + VoidMaps settings: - createSetting('AutoMaps', ["Auto Maps Off","Auto Maps On","Auto Maps No Unique"], 'Recommended. Automatically run maps to progress. Very Important. Has multiple modes: Prestige, Voids, Want more Damage, Want more Health, Want Health & Damage, and Farming.Prestige takes precedence and does equal level maps until it gets what is needed as per Autotrimps Prestige dropdown setting. Voids is self explanatory: use the Void Difficulty Check setting to control the amount of farming. If \'want more damage\', it will only do 10 maps for 200% mapbonus damage bonus. If \'Farming\', it does maps beyond 10 if the displayed number is over >16x. \'Want more health[or and damage]\' is basically just a status message telling you need more health, theres not much that can be done besides tell AutoLevelEquipment to keep buying stuff. If you \'want health\' but your damage is OK to continue, invest in more HP perks.
Unique Maps are run automatically unless disabled.
Uniques Required to auto-run The Wall and Dimension of Anger. Also Required for challenges: Electricity, Mapocalypse, Meditate, and Crushed (etc) to complete their AutoPortal.

Maps/Levels:
The Block - 12
The Wall - 16
Dimension of Anger - 21
Trimple Of Doom - 34
The Prison - 82
Bionic Wonderland (only during Crushed) @ 127
NOTE: This should generally be on.
NOTE: Run Bionic Before Spire prevents the setting of Unique.
NOTICE: This does NOT auto-run all your Bionics according to your lack of Robotrimp status or whether you pass a certain level (yet).', 'multitoggle', 1, null, "Maps"); + createSetting('AutoMaps', ["Auto Maps Off","Auto Maps On","Auto Maps No Unique"], 'Automaps. The no unique setting will not run unique maps such as dimensions of anger. Recommended ON. ', 'multitoggle', 1, null, "Maps"); createSetting('DynamicSiphonology', 'Dynamic Siphonology', 'Recommended Always ON. Use the right level of siphonology based on your damage output. IE: Only uses siphonology if you are weak. With this OFF it means it ALWAYS uses the lowest siphonology map you can create. Siphonology is a perk you get at level 115-125ish, and means you receive map bonus stacks for running maps below your current zone - Up to 3 zones below (1 per perk level).', 'boolean', true, null, 'Maps'); //Should always be on? createSetting('PreferMetal', 'Prefer Metal Maps', 'Always prefer metal maps, intended for manual use, such as pre-spire farming. Remember to turn it back off after you\'re done farming!', 'boolean', false, null, 'Maps'); //rarely better tbh createSetting('MaxMapBonusAfterZone', 'Max MapBonus After', 'Always gets Max Map Bonus from this zone on. (inclusive and after).
NOTE: Set -1 to disable entirely (default). Set 0 to use it always.
Advanced:User can set a lower number than the default 10 maps with the AT hidden console command: MODULES[\\"maps\\"].maxMapBonusAfterZ = 9;', 'value', '-1', null, 'Maps'); From 049c409b834aae211715bbd87c60158f8682f774 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:08:08 +0100 Subject: [PATCH 0270/3477] Update heirlooms.js --- modules/heirlooms.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 2c2e3c9a2..7bb29cb3b 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -556,15 +556,3 @@ function generateHeirloomIcon(heirloom, location, number){ html += locText + ', this)"> '; return html; } - -function protectloom() { - if (getPageSetting('loomprotect') == true && game.global.heirloomsCarried.length < game.global.maxCarriedHeirlooms) { - for (var index in game.global.heirloomsExtra) { - var aLoom = game.global.heirloomsExtra[index]; - var data = {'location': 'heirloomsExtra', 'index': index, 'rarity': theLoom.rarity}; - } - -} - - - From 431e98e0bca6dc102efdba49400cdc02795bb0a3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:14:52 +0100 Subject: [PATCH 0271/3477] Update perks.js --- modules/perks.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index d51a01460..74255d181 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -156,7 +156,7 @@ AutoPerks.displayGUI = function() { //Add the dump perk dropdown to UI Line 2 apGUI.$ratiosLine2.appendChild(apGUI.$dumpperklabel); apGUI.$ratiosLine2.appendChild(apGUI.$dumpperk); - //Toggle Algorithm 2 checkbox + /*Toggle Algorithm 2 checkbox apGUI.$toggleAlgo2 = document.createElement("DIV"); apGUI.$toggleAlgo2.setAttribute('style', 'display: inline; text-align: left; margin-left: 1vw;'); apGUI.$toggleAlgo2.innerHTML = '\ @@ -165,7 +165,7 @@ AutoPerks.displayGUI = function() { $buttonbar.appendChild(apGUI.$toggleAlgo2); var $fastAllocate = document.getElementById("fastAllocate"); $fastAllocate.setAttribute("onmouseover", 'tooltip(\"FastAllocate\", \"customText\", event, \"Bulk buys thousands of Tier2 Perks at once to save time. Caution - May overshoot. Recommended for High Helium amounts above 1 Qi only.\")'); - $fastAllocate.setAttribute("onmouseout", 'tooltip("hide")'); + $fastAllocate.setAttribute("onmouseout", 'tooltip("hide")');*/ //Create ratioPreset dropdown apGUI.$ratioPresetLabel = document.createElement("Label"); apGUI.$ratioPresetLabel.id = 'Ratio Preset Label'; @@ -338,7 +338,7 @@ AutoPerks.clickAllocate = function() { // determine how to spend helium var result; - if (MODULES["perks"].useAlgo2) + if (getPageSetting('fastallocate')==true) result = AutoPerks.spendHelium2(remainingHelium); else result = AutoPerks.spendHelium(remainingHelium); From e0cde23374ce29cc4b362418cc57b8fd27d15e51 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:21:15 +0100 Subject: [PATCH 0272/3477] Update SettingsGUI.js --- SettingsGUI.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 76be2dcd9..835e28a74 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -253,8 +253,8 @@ function initializeAllSettings() { createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); - if (game.worldUnlocks.easterEgg){ - createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core');} + createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core'); + createSetting('fastallocate', 'Fast Allocate', 'Turn on if your helium is above 500Qa. Not recommended for low amounts of helium. ', 'boolean', false, null, 'Core'); createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); document.getElementById('AutoAllocatePerks').parentNode.insertAdjacentHTML('afterend','
'); @@ -847,6 +847,7 @@ function updateCustomButtons() { //if ShieldBlock is for sure, remove ShieldBlock from settingsbox (achievement=12 means z100). //(game.achievements.zones.finished < 12) ? turnOn("BuyShieldblock") : function(){turnOff("BuyShieldblock");setPageSetting("BuyShieldblock",false);}(); //if AS3 is not selected, remove Windstack settingsbox + !game.worldUnlocks.easterEgg.locked ? turnOn("AutoEggs"): turnOff("AutoEggs"); getPageSetting('AutoStance')==3 ? turnOn("WindStackingMin"): turnOff("WindStackingMin"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinPoison"): turnOff("ScryUseinPoison"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinWind"): turnOff("ScryUseinWind"); From 56ea86399acb1607b268e5bc23e995387b8acfaf Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:28:30 +0100 Subject: [PATCH 0273/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 835e28a74..b30817d12 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -253,7 +253,8 @@ function initializeAllSettings() { createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); - createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core'); + if (!game.worldUnlocks.easterEgg.locked) { + createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core');} createSetting('fastallocate', 'Fast Allocate', 'Turn on if your helium is above 500Qa. Not recommended for low amounts of helium. ', 'boolean', false, null, 'Core'); createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); document.getElementById('AutoAllocatePerks').parentNode.insertAdjacentHTML('afterend','
'); @@ -847,7 +848,6 @@ function updateCustomButtons() { //if ShieldBlock is for sure, remove ShieldBlock from settingsbox (achievement=12 means z100). //(game.achievements.zones.finished < 12) ? turnOn("BuyShieldblock") : function(){turnOff("BuyShieldblock");setPageSetting("BuyShieldblock",false);}(); //if AS3 is not selected, remove Windstack settingsbox - !game.worldUnlocks.easterEgg.locked ? turnOn("AutoEggs"): turnOff("AutoEggs"); getPageSetting('AutoStance')==3 ? turnOn("WindStackingMin"): turnOff("WindStackingMin"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinPoison"): turnOff("ScryUseinPoison"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinWind"): turnOff("ScryUseinWind"); From 462e84df60793a80b13b26d48c13c0066871b59f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:33:43 +0100 Subject: [PATCH 0274/3477] Update perks.js --- modules/perks.js | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index 74255d181..a35bdf665 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -12,8 +12,7 @@ //Create blank AutoPerks object var AutoPerks = {}; MODULES["perks"] = {}; -MODULES["perks"].showDetails = true; //show which individual perks are spent; -MODULES["perks"].useAlgo2 = false; //use algorithm 2 instead. +MODULES["perks"].showDetails = true; //show which individual perks are spent; //use algorithm 2 instead. //Import the FastPriorityQueue.js general Library (not AT specific, but needed for perk queue) var head = document.getElementsByTagName('head')[0]; @@ -156,16 +155,6 @@ AutoPerks.displayGUI = function() { //Add the dump perk dropdown to UI Line 2 apGUI.$ratiosLine2.appendChild(apGUI.$dumpperklabel); apGUI.$ratiosLine2.appendChild(apGUI.$dumpperk); - /*Toggle Algorithm 2 checkbox - apGUI.$toggleAlgo2 = document.createElement("DIV"); - apGUI.$toggleAlgo2.setAttribute('style', 'display: inline; text-align: left; margin-left: 1vw;'); - apGUI.$toggleAlgo2.innerHTML = '\ - \ - Fast Allocate!'; - $buttonbar.appendChild(apGUI.$toggleAlgo2); - var $fastAllocate = document.getElementById("fastAllocate"); - $fastAllocate.setAttribute("onmouseover", 'tooltip(\"FastAllocate\", \"customText\", event, \"Bulk buys thousands of Tier2 Perks at once to save time. Caution - May overshoot. Recommended for High Helium amounts above 1 Qi only.\")'); - $fastAllocate.setAttribute("onmouseout", 'tooltip("hide")');*/ //Create ratioPreset dropdown apGUI.$ratioPresetLabel = document.createElement("Label"); apGUI.$ratioPresetLabel.id = 'Ratio Preset Label'; @@ -706,9 +695,6 @@ AutoPerks.getPercent = function(spentHelium, totalHelium) { frac = (frac* 100).toPrecision(2); return frac + "%"; } -AutoPerks.toggleFastAllocate = function() { - MODULES["perks"].useAlgo2 = !MODULES["perks"].useAlgo2; -} AutoPerks.FixedPerk = function(name, base, level, max, fluffy) { this.id = -1; From e505bd092a2033fd71df1154603e5d4bcc0f5b71 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:34:29 +0100 Subject: [PATCH 0275/3477] Update GraphsOnly.user.js --- GraphsOnly.user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GraphsOnly.user.js b/GraphsOnly.user.js index 30f097dec..115c9d99d 100644 --- a/GraphsOnly.user.js +++ b/GraphsOnly.user.js @@ -21,10 +21,10 @@ function safeSetItems(name,data) { } } //This can be edited to point to your own Github Repository URL. -var basepath = 'https://genbtc.github.io/AutoTrimps/'; +var basepath = 'https://Zorn192.github.io/AutoTrimps/'; var script = document.createElement('script'); script.id = 'AutoTrimps-Graphs'; script.src = basepath + 'Graphs.js'; //script.setAttribute('crossorigin',"use-credentials"); script.setAttribute('crossorigin',"anonymous"); -document.head.appendChild(script); \ No newline at end of file +document.head.appendChild(script); From 7a34888f610a0e422b1c94bc10742c8df3a1cd87 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:35:02 +0100 Subject: [PATCH 0276/3477] Update GraphsOnly.user.js --- GraphsOnly.user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GraphsOnly.user.js b/GraphsOnly.user.js index 115c9d99d..186d5f043 100644 --- a/GraphsOnly.user.js +++ b/GraphsOnly.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name AutoTrimpsV2+genBTC-GraphsOnly -// @namespace https://github.com/genbtc/AutoTrimps +// @namespace https://github.com/Zorn192/AutoTrimps // @version 2.1.6.9-genbtc-3-23-2018 // @updateURL https://github.com/genbtc/AutoTrimps/GraphsOnly.user.js // @description Graphs Module (only) from AutoTrimps From 4ae43e7839581d8fa16acdefd1f2927679e780c3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:37:47 +0100 Subject: [PATCH 0277/3477] Delete v2.1.5.1 --- docs/v2.1.5.1 | 72 --------------------------------------------------- 1 file changed, 72 deletions(-) delete mode 100644 docs/v2.1.5.1 diff --git a/docs/v2.1.5.1 b/docs/v2.1.5.1 deleted file mode 100644 index 1600aadd9..000000000 --- a/docs/v2.1.5.1 +++ /dev/null @@ -1,72 +0,0 @@ -v2.1.5.1 - 12/23/2016 -AutoTrimps2.js: -internals: fix module load order bug -move automaps re-enable after portal to mainCleanup -NEW: make AT use betterautofight on Zone 1 before Battle upgrade even when better autofight is disabled -internals: Change ATrunning variable - -docs/TODO.md: -Add a conversation about Void map difficulty so I dont forget - -Graphs.js -NEW: Add Magmite Graph -dont push updates if the game is paused. fix import on pause Clear Time problem -Change Loot Sources graph to 60 datapoints, every 15 seconds. -internals: refactor time graph functions -Change Dark Essence graph to be Total owned, not gained that run. -internals: refactor code for Dark Essence per Hour graph, adjust 0's zone alignment -internals: tried to change Loot Sources from having 0.5 tick lengths on the x-axis but failed. - -Autofight.js - Refactor; -betterAutoFight2 use lowLevelFight when scientist 1 is incomplete, not complete. -IMPORTANT: betterAutoFight2 dont use #3 when VoidMap is first ran (so it waits and loads your full Anticipation stacks) - -Automaps.js -add MODULE variable for SpireFarm199Maps -NEW: add a more efficient health check to make sure you can in fact kill the enemy on that specific cell you're on and you arent stuck on it due to it being fast and lack of health etc. -TODO: Account for magmated voidmaps. -TODO: Account for dailymods in voidmaps. -NEW: Change entire system of map sliders: - fixed bug where it was picking Metal maps at low level. - start all map sliders on 9/9/9 and decrement cost if needed based on priority that is assigned based on which situation. - -Autostance.js -Fix rare case when your enemyHealth == baseDamage -Fix some bugs in Autostance2 with Crit -Start fixing the scryer checkOnly thing but didnt finish. -NEW: (mentioned in automaps) autoStanceCheck now handles individual cell health checks that follow all the autostance rules (for automap) - -Battlecalc.js -Allow functions to be called with variables to disable stance correction and min/max damage range fluctuation. - -Buildings 1 & 2.js -Fix Green highlighting -NEW: Delay buying Gyms if we NEED gymystic - -Equipment.js -NEW: Skip buying shields (w/ shieldblock) if we NEED gymystic -Uncap Equipment levels during Metal Challenge - -Gather.js -Change Trapping Behavior, make it identical between gather1 and gather2. -Make sure watch challenge doesnt get stuck. - -Jobs.js -Only try to buy jobs (and therefore print message) if we can afford them. (reduce spam) -Add Auto Worker Ratios for Metal Challenge (acts somewhat weird but better than nothing) - -Other.js -TODO: coding the Auto Dimensional Generator (determined which functions to use) -TODO: start coding for Overclocker upgrade (need help/advice) - -Portal.js -NEW: AutoFinishDailyZone : Finish Daily by this # of zones earlier/later than your regular Custom AutoPortal zone or your Helium Dont Portal Before zone - -Utils.js -moved to mainLoop in AutoTrimps2.js - -SettingsGUI.js -Change wording to "Better" Auto Fight -AutoFinishDailyZone -TODO: Start coding the importModuleVars stuff for "Import your custom MODULES variables " -Create a way to make negative value boxes. \ No newline at end of file From 202275c25237c74a59fff7af1bba77992805640a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:37:58 +0100 Subject: [PATCH 0278/3477] Delete main-doc.txt --- docs/main-doc.txt | 283 ---------------------------------------------- 1 file changed, 283 deletions(-) delete mode 100644 docs/main-doc.txt diff --git a/docs/main-doc.txt b/docs/main-doc.txt deleted file mode 100644 index 6a3cb24b1..000000000 --- a/docs/main-doc.txt +++ /dev/null @@ -1,283 +0,0 @@ -AutoTrimps - A Highly Extensive Idle Clicker Game Script - -Code Execution Structure,Behavior/Explanation: -============================================== -A script bootstrap file userscript "install.user.js" is ran by Tampermonkeyed/Greasemonkeyed and installed into permanence on the browser extension. This loads AutoTrimps2.js. First it loads utils.js for some tools, then it loads the Settings UI and then it Loads the Graphs, This loads all the 17 submodules *.js files in the modules/ dir, in a particular order as listed. From that point, a timeout/interval loop is set up to launch the Main Game and Re-run the "Main Loop" every 100ms (10x a second) in sync with the Game Loop. Also the Graphs has its own identical tick count and loop. Each module function is called during the "Main Loop" generally one by one, sequentially, in a particular order, each cycle. There is no future state, just current. The past state is limited to anything we explicitly choose to keep around like in the graphs db or other variables. -The main files are: AutoTrimps2.js, SettingsGUI.js, Graphs.js - Keep reading for details. The separate modules are documented below. - -MODULES (2018): -=============== -battlecalc.js -breedtimer.js -buildings.js -client-server.js -dimgen.js (not used anymore?) -dynprestige.js -equipment.js -fight.js -gather.js -heirlooms.js -import-export.js -jobs.js -magmite.js -maps.js -other.js -perks.js -portal.js -query.js -scryer.js -stance.js -upgrades.js -utils.js - -EXTERNAL FILES: -================ -FastPriorityQueue.js - AutoPerks - uses a 3rd party library for data queues -HighCharts.js - Graphs - uses a 3rd party library to draw the graphs... -tabs.css - User Interface - mandatory css styles for the settings tab or to rewrite or style the UI -dark-graph.css - Graphs - needed some tweaks to work for dark theme. - -GUI: -===== -Consists of SettingsGUI.js is the Settings section + styles of tabs.css - -SETTINGS: -========= -AlwaysArmorLvl2 -AutoFight -AutoGoldenUpgrades -AutoHeirlooms -AutoHeirlooms2 -AutoMaps -AutoPortal -AutoRoboTrimp -AutoStance -AutoUpgradeHeirlooms -BreedFire -BuyArmor -BuyArmorUpgrades -BuyBuildings -BuyJobs -BuyShieldblock -BuyStorage -BuyUpgrades -BuyWeapons -BuyWeaponUpgrades -CapEquip -CorruptionCalc -CustomAutoPortal -DefaultAutoTrimps -DelayArmorWhenNeeded -DeltaGigastation -DisableFarm -DynamicPrestige -DynamicSiphonology -ExitSpireCell -ExportAutoTrimps -FarmerRatio -FarmWhenNomStacks7 -FirstGigastation -GeneticistTimer -HeliumHourChallenge -HeliumHrBuffer -HireScientists -ImportAutoTrimps -LimitEquipment -LumberjackRatio -ManageBreedtimer -ManualGather -MaxCollector -MaxExplorers -MaxGateway -MaxGym -MaxHotel -MaxHouse -MaxHut -MaxMansion -MaxNursery -MaxResort -MaxTox -MaxTrainers -MaxTribute -MaxWormhole -MinerRatio -MinutestoFarmBeforeSpire -PauseScript -Prestige -RunBionicBeforeSpire -RunNewVoids -RunNewVoidsUntil -RunUniqueMaps -ScryerMaxZone -ScryerMinZone -ScryerSkipBoss2 -ScryerSkipCorrupteds2 -ScryerUseinMaps2 -ScryerUseinSpire2 -ScryerUseinVoidMaps2 -ScryerUseWhenOverkill -TrainerCaptoTributes -TrapTrimps -UseScryerStance -VoidCheck -VoidMaps -WaitTill60 -WarpstationCap -WarpstationWall -WorkerRatios - -GRAPHS - Graphs.js is the graphs section: + dark-graph.css (maybe need to darkify the css on the perks too window) -======= -HeliumPerHour -Helium -HeliumPerHour Instant -HeliumPerHour Delta -HeHr % / LifetimeHe -He % / LifetimeHe -Clear Time -Cumulative Clear Time -Run Time -Map Bonus -Void Maps -Void Map History -Loot Sources -Coords -Gigas -UnusedGigas -Lastwarp -Trimps -Nullifium Gained -DarkEssence -DarkEssencePerHour -OverkillCells -Magmite -Magmamancers - -AutoTrimps2.js Detailed Main Function Documentation (from 2016): -=================================================== -The main loop consists of the following subroutines, all of which are enable-able/disable-able by their buttons.: - workerRatios(); //"Auto Worker Ratios" - buyUpgrades(); //"Buy Upgrades" - autoGoldenUpgrades(); //"AutoGoldenUpgrades" (genBTC settings area) - buyStorage(); //"Buy Storage" - buyBuildings(); //"Buy Buildings" - buyJobs(); //"Buy Jobs" - manualLabor(); //"Auto Gather/Build" - autoMap(); //"Auto Maps" - manageGenes(); //"Genetecist Timer" / "Manage Breed Timer" - autoPortal(); //"Auto Portal" (hidden until level 60) - autoHeirlooms2(); or autoHeirlooms(); //"Auto Heirlooms 2" (genBTC settings area) or //"Auto Heirlooms" - toggleAutoTrap(); //"Trap Trimps" - autoRoboTrimp(); //"AutoRoboTrimp" (genBTC settings area) - autoNull(); //"Auto Upgrade Heirlooms" (genBTC settings area) - autoLevelEquipment(); //"Buy Armor", "Buy Armor Upgrades", "Buy Weapons","Buy Weapons Upgrades" - autoStance(); //"Auto Stance" - betterAutoFight(); //"Better Auto Fight" - prestigeChanging2(); //"Dynamic Prestige" (genBTC settings area) - userscripts(); //Runs any user provided scripts - by copying and pasting a function named userscripts() into the Chrome Dev console. (F12) - - -Version Numbered Files (files needing version string during minor upgrades): -====================== -.user.js -user.js -install.user.js -AutoTrimps2.js -Graphs.js -TODO: Should invent a tool/script to advance the version numbers, generate changelogs, auto-link docs. - -HOWTO = Become an AutoTrimps developer -====================================== -The script is setup to be able to be bootstrapped from Tampermonkey/Greasemonkey. -If you paste the AutoTrimps2.js into your Tampermonkey window directly, you can attempt to run a local developer copy and edit it in the tampermonkey edit window. This pulls from a repo and loads all the sub-modules .js files. -The point to understand is HTTPS and SSL is required. It has to be served over an actual HTTPS web-server so chrome can successfully load the secure content resources since https://trimps.github.io is technically the origin and any non-secure javascript resources will be flagged,denied and not-executed... -Simply, You can fork the project on github, find&replace my github URL with yours and upload all your changes to your own repo. And every time you make a change you will have to re-upload / defeat caching / reload to host the file. But this is non-ideal from a "agile" or "live" developer POV. -A better way is to set up a local HTTPS server, mirror my github repo to a local folder, and tell the webserver to run out of that folder, serving it up on https://localhost:4443 or some port number. -So instead of downloading Apache or a full complicated webserver or something, download python - or most computers these days have Python installed. You can use python to be a simple HTTP server with the following scripts, applicable to either Python2.x or Python3.x. -There are multiple ways to achieve the webserver, but this is the best way i've found (if it doesnt do HTTPS it wont work). -These scripts let you open a folder, double click the script, and start serving files out of that local dir instantly over HTTPS. -//(make sure you generate a self-signed .PEM cert to serve.) - this Cert is what provides the necessary SSL functionality - -# generate the cert with the following command (should be an openssl binary exe somewhere on the system) -# openssl req -new -x509 -keyout AutoTrimps.pem -out AutoTrimps.pem -days 365 -nodes -# run as follows: -# python https.py -# then in your browser, visit: -# https://localhost:4443 -# - -Choose the right version of https.py for your System: ----------------------------------------- -https.py = HTTPS Localhost Self serve - With Python 2: ----------------------------------------- -import BaseHTTPServer, SimpleHTTPServer -import ssl -httpd = BaseHTTPServer.HTTPServer(('localhost', 4443), SimpleHTTPServer.SimpleHTTPRequestHandler) -httpd.socket = ssl.wrap_socket (httpd.socket, certfile='./AutoTrimps.pem', server_side=True) -httpd.serve_forever() - ----------------------------------------- -https.py = HTTPS Localhost Self serve - With Python 3: ----------------------------------------- -import logging -import os -import sys -import http.server -import socketserver -import ssl -logging.info('Server running...') -httpd = socketserver.TCPServer(('localhost', 4443), http.server.SimpleHTTPRequestHandler) -httpd.socket = ssl.wrap_socket(httpd.socket, certfile='./AutoTrimps.pem', server_side=True) -httpd.serve_forever() - -//(make sure you generate a self-signed .PEM cert to serve.) - this Cert is what provides the necessary SSL functionality - -Make this batch script to double click to easily run the .py file from windows explorer without going to command line (mac/linux make a .sh file im sure you know how): --------------------- -SIMPLEHTTPSERVER.BAT --------------------- -@echo off -cd C:\Users\EOFL\Documents\GitHub\AutoTrimps -rem Infinite loop, counting from 1 to 10 with increment of 0. (just makes it restart on errors) -for /L %%n in (1,0,10) do ( - C:\Python36\python.exe https.py -) - - -HOWTO = Add A Button -===================== -All the buttons are created in SettingsGUI.js @ line 410 - with a function createSetting(): -This function takes 7 parameters and can make about 6 types of buttons: (boolean, value, valueNegative, dropdown, infoclick, multitoggle). The visual style will match similar. First determine the type of button, then copy a similar button. This explains the parameters: -function createSetting(id, name, description, type, defaultValue, list, container) -id = settings variable name -name = text on the button -description = tooltip when hovering inside the button. -type = boolean, value, valueNegative, dropdown, infoclick, multitoggle -defaultValue = pick the most common desirable setting -list = Only for dropdowns, the list of choices in ["one", "two", "three"] form -container = IMPORTANT: this will position the button in any of the tabbable sections "Main, Gear, Maps, Settings, Scryer" etc. - - These container tabs are what we will learn next: - -HOWTO = Add a New Tab (to the settings area.) -============================================= -All the tabs are created in SettingsGUI.js @ line 143 - the function is: initializeAllTabs(): -Inside there, follow the existing pattern and create a new line in the form of: - createTabs("Tab Name", "Tab Sub Heading"); - -Then you can use this new "Tab Name" as the container variable when you createSetting() and the button will go in there. - -HOWTO = Add a New Script Module -=============================== -AutoTrimps2.js is the module loader. Line 32: -var ATmodules = ['query', 'import-export', 'upgrades', 'heirlooms', 'buildings', 'jobs', 'equipment', 'gather', 'stance', 'battlecalc', 'maps', 'breedtimer', 'dynprestige', 'fight', 'scryer', 'magmite', 'portal', 'other', 'client-server', 'perks']; -They refer to .js files of the same name in the "modules" directory. -All you have to do is create a new file in modules/ named something.js and add ,'something' to the end of that list. -The script will then load it on startup, so it either has to run itself self-sufficiently, or you need to use ATs userscripts functionality to run it, something like this: -function userscripts() -{ - runModuleWhatever.FunctionFromThatModuleFile(); -} -Any function named userscripts will execute 10 times per second at the final portion of each game cycle. -This way means you can add your own code without contaminating AutoTrimps files directly. -Some Files contain/require game-code overwrites that need to be periodically checked and maintained. These are undocumented. Some are for the GUI and some are in utils.js maybe some for the heirlooms, and also graph loot... \ No newline at end of file From bfb72c22cdc5a28507475d288def7535e7951639 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:38:04 +0100 Subject: [PATCH 0279/3477] Delete dailymodifiers.txt --- docs/dailymodifiers.txt | 94 ----------------------------------------- 1 file changed, 94 deletions(-) delete mode 100644 docs/dailymodifiers.txt diff --git a/docs/dailymodifiers.txt b/docs/dailymodifiers.txt deleted file mode 100644 index 951395309..000000000 --- a/docs/dailymodifiers.txt +++ /dev/null @@ -1,94 +0,0 @@ -badHealth = enemy, health -badMapHealth = enemy, health -badMapStrength = enemy, attack -badStrength = enemy, attack -bloodthirst = enemy, stacks -bogged = self, health, drain -crits = enemy, crit -dedication = gathering -dysfunctional = breeding -evenTrimpBuff = self,+attack -explosive = enemy, attack, drainy -famine = gathering, loot -karma = loot, stacks -large = housing -maxDamage = self,attack -minDamage = self,attack -oddTrimpNerf = self,-attack -plague = -health, stacks -rampage = self, +attack, stacks -slippery= dodge -toxic = breeding, stacks -weakness= self, -attack, stacks - -Main.js @ line 5455 -var dailyModifiers = -{ - minDamage: { - description : "Trimp min damage reduced by X % (additive)." - }, - maxDamage: { - description : "Trimp max damage increased by X % (additive)." - }, - plague: { - //Half of electricity - description : "Enemies stack a debuff with each attack, damaging Trimps for X% of total health per turn per stack, resets on Trimp death." - }, - weakness: { - description : "Enemies stack a debuff with each attack, reducing Trimp attack by X% per stack. Stacks cap at 9 and reset on Trimp death." - }, - large: { - description : "All housing can store X% fewer Trimps" - }, - dedication: { - description : "Gain X% more resources from gathering" - }, - famine: { - description : "Gain X% less Metal, Food, Wood, and Gems from all sources" - }, - badStrength: { - description : "Enemy attack increased by X%." - }, - badHealth: { - description : "Enemy health increased by X%." - }, - badMapStrength: { - description : "Enemy attack in maps increased by X%." - }, - badMapHealth: { - description : "Enemy health in maps increased by X%." - }, - crits: { - description : "Enemies have a 25% chance to crit for X% of normal damage" - }, - bogged: { - description : "Your Trimps lose X% of their max health after each attack." - }, - dysfunctional: { - description : "Your Trimps breed X% slower" - }, - oddTrimpNerf: { - description : "Trimps have X% less attack on odd numbered zones" - }, - evenTrimpBuff: { - description : "Trimps have X% more attack on even numbered zones" - }, - karma: { - description : 'Gain a stack after killing an enemy, increasing all non Helium loot by X%. Stacks cap at Y, and reset after clearing a zone.' - }, - toxic: { - description : "Gain a stack after killing an enemy, reducing breed speed by X% (compounding). Stacks cap at Y, and reset after clearing a zone." - }, - bloodthirst: { - description : "Enemies gain a stack of Bloodthirst whenever Trimps die.Every X stacks, enemies will heal to full and gain an additive 50 % attack.Stacks cap at Y, and reset after killing an enemy." - }, - explosive: { - description : " Enemies instantly deal % of their attack damage when killed if (str > 15) UNLESS your block is as high as your maximum health " - }, - slippery: { - description : " Enemies have a % chance to dodge your attacks on odd ? / ?even zones." - }, - rampage: { - description : "Gain a stack after killing an enemy, increasing Trimp attack by % (additive). Stacks cap at ? , and reset when your Trimps die." - }, -} From 5f9b2353960156494357bccc2b9c8f6d29f10248 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:38:11 +0100 Subject: [PATCH 0280/3477] Delete TODO.md --- docs/TODO.md | 136 --------------------------------------------------- 1 file changed, 136 deletions(-) delete mode 100644 docs/TODO.md diff --git a/docs/TODO.md b/docs/TODO.md deleted file mode 100644 index 7bd8d4d26..000000000 --- a/docs/TODO.md +++ /dev/null @@ -1,136 +0,0 @@ -Document Code Structure: (for other developers): see main-doc.txt ----------------- -Main-Documentation (main-doc.txt) -TODO List (this file - TODO.md) -Update README.md/changelog(.json?)/version # (manually for now) -Code Comments (getting better) - -Near Future: ------------------------- -WebSite https://autotrimps.site - even just a link to github, or link to tutorials on how to install. --GRAPHS! -TODO 1: Add notes or labels to graph runs. (to indicate which settings we used) -TODO 1: HighCharts annotations module for "notes" comments to indicate which graph runs were what. -TODO: IMPLEMENTING A STANDARD FOR CLOUD GRAPH STATISTICS: - -now : Highest zone, helium, bones, Perk preset/ratios. - -next: ATSettings, MODULES, which graphs were clicked on. - - -new TODO LIST: 3/3/2018 and 3/4/2018 extended to 3/7 still working on it as of 3/20. -------------------------------------- -XXXX: AutoPerks - background thread / web worker -XXXX: AutoPerks - allocate speed improvement, shortcuts, (36 million iterations and 15 seconds @ 720Qa HE) - - maybe slow due to OO structure and repeated resolutions for pass2. -TODO: Perky - implement Altizar Perky new Perk manager interface -TODO: SPAM tab - more granular settings. maybe every module could have its own toggle? - working on it. -TODO: "Map Special Modifier": Special Modifiers, Perfect Sliders (way more fragments), Extra Zones (+0 to +10) - with a save config option - if you create a config with FA and +5 zones, and save it, next time you/the script creates a map, it will remember the setting - so if you want you can use the script to create 3 setups (there are 3 slots to save your config) - + maps should be only created at poison zones and when they will provide new equipment - prestigious when you need prestiges, lmc when you need more lvls in your eq - perfect sliders when you can afford it - make perfect sliders like if you're able to afford 3x the cost of it in frags, just buy it. otherwise no. and it will be rarer that way but still useful - another valid idea is burn out all your frags on perfect near the end i guess -TODO: (from old TODO LIST: 8/17/2016) BionicW toggle that can let AT do Bionic Wonderland maps if they haven't ever been done before? - (in the same vein, check for "Speed" achievements for unique maps and do them if they're not done yet and possible) -TODO: for alfa166: "Bionic OverBurner" :smiley: Make it Configurable to run BW 470 one time at z480 to unlock and run BW485, (with the +5 map kit) -TODO: Make a more configurable Auto Spend Nulli function for 2018 -TODO: Should invent a tool/script to plug in the version numbers, changelogs, docs. -TODO: Instead of hard-coded changelog, Break changelog out into a seperate file and HTTPRequest it, parse it and run it through a standardized display function. - Pull external .JSON Changelog and stuff from this site's API (obviously have to create a new server endpoint PHP script) -TODO: Modular Structured load of the modules/*.js files is less than robust now. Check status of each loaded, tally a count, double check success. - -FAR: In this way, the tracking and loading of modules can be timestamped and version controlled for itemization and aggregate cloud managed. -FAR TODO: Cloud management of Save Files (already uploading save files and naming them. just need to download) -FAR TODO: Cloud distributed graphs. Show similar users graphs? (STARTED) - -Could just upload all the graphs after every run (how to detect full run?) -FAR TODO: Theoretically the graphs database can be used as a pro-active future prediction model and conditions can be inferred from past runs. - Example: If Helium per/hour is ABOUT to go down based on previous cached runs (during the ambiguity period of about a few zones), portal earlier. - Think like Grace %% setting but automatic. -FAR TODO: Analysis of the Userbase and custom settings, even make queries to ask server for better decision making based on global multi-client probability state -TODO: Develop an internal utility for me to Scrape/Grep/Grok the .json analytics files already on the server. -FAR TODO: Import/Export/Append Graphs. is delete working on refresh? -FAR TODO: Graphs encoding vs. storage is wasteful of space. We need more. Compress data or RLE it -TODO: Structure of Graphs.js is very wonky and can be re-sorted, nested somehow. -TODO: GUI javascript warning message "Are you sure?" OK/cancel template. -TODO: Bundle a newbie profile into the profiles-defaults. -TODO: Keep generating content in this file very late at night, that nobody can see or care about - real smart use of my time. - - -Bugs To Fix: ----------------- -Last github pull request is from 2016 = needs to be cleared. Has useful code that could be imported into Settings file for version comparisons and settings migrations/in-place upgrades. -All Issues from January to February have been resolved. -Any Issues remaining from prior 2017 should be disregarded. -BUG 1: Bone Portal messes with graphs / Importing a savedgame in progress produces bad graphs -BUG 2: The graphs still can miss time and have gaps/skips and has zone innacuracies, additionally it can fail to track Trimps data entirely during background window Javascript AFK/idle/catchup mode. -BUG 2: Overkill and certain graphs can skip progress and get mis-aligned if the script was paused or was backgrounded. - - -Done Did: ----------- -Done: Visible Version Status Number in UI / Startup popup messages -Done: Essence graph -Done: Renamed Module names: Some stuff is named auto, some stuff isnt. Its AutoTrimps so isn't everything auto? Redundant? -Done: Renamed NewUI2.js as SettingsGUI - needs new name, some love. -Done: Add autotrimps.site data json upload capability (thanks to Swiffy) -Done: BUG 1: Liquification - the Auto-Skip-tons-of-zones-in-beginning - causes overkill graph to be off by a LOT. -Not actually a thing: "Max Magmamancers By Zone #" so we can buy them at the start, to gain 5% attack for the first 10 minutes, usually for cases when the void zone which is the same as the portal zone, and you want to stack that level up with all you've got. - -5% Attack is only given after 5 minutes. Misunderstanding. -Done: AutoTrimps Presets dropdown list to name, save, reload different profiles -Done: Partially: Split SettingsGUI.js up into front-end DOM+GUI, back-end functions for Settings/Modules/Profiles, and createSettings+descriptions. -Done: Fluffy XP Graph -Done: Pin the ATSettings Tab MenuBar + Minimize,Maximize,Close buttons. -Done: TODO: Graphs, make 2 arrows to cycle sequentially through the graphs without using the dropdown everytime. -Done: TODO: Put changelog show/hide popup Button into settings -Done: PrintChangelog: print changelog function should be refactored: another function should be made to create a DOM element for all the changelog lines, scrape the API data into it, and then print tooltip with header/footer. - -Other Improvements: ------------------- -AUTOMAPS: -Rewrite the automaps way of deciding/picking/buying/running maps. (convo below) ---------------------------------------------------------------------------------- --: Decide whether map stacks can help speed you up or not: -If you're more limited by you being dead and your lack of health, than damage output, its probably more likely to not be worth it. -also if you don't have the overkill perk increasing damage can get inefficient when damage output is wasted -so keeping a good "survivability to damage output" ratio is better than optimizing "damage output" -keep a count of how long you were dead and how long you were doing damage -if you're never dead, then the damage boost from map stacks is USUALLY worth it. (cant say for sure but im pretty sure) -I still think you'd have to run 1 full map to know for sure if its worth it. then extrapolate that out times 10 --: Summary: -never dead -> damage boost helps when not "early game when you're ripping through bad guys" -almost never alive, frequently dead -> if more damage output than damage taken (and enough hp to react to fast guys), go on, otherwise farm -occasionally dead and dies faster than breeding -> needs more damage -occasionally dead and dies slower than breeding -> advance -Also while doing this, determine more refined rules for entering the 3 modes: want dmg/want health/farming - --:230+ regular maps should really be treated differently from corruption -they don't have block pierce, and no special abilities --it doesnt go into the map bonus mode soon enough because of the fact that its gauging the zone on non-corrupted enemies - //we will get at least 85 toxstacks from the 1st voidmap UNLESS we have overkill, then we dont get enough. - //if a new fight group is available and anticipation stacks aren't 30, abandon and grab a new group - - -VOIDMAPS: -Void Map Farming - based on how much damage you do rather than your health/survival ---------------------------------------------------------------------------------- --:Voidmaps: - //TODO: Account for magmated voidmaps. (not /2) - //TODO: Account for daily. --:On Voids Diff: -if you have enough HP to survive poisonous without genetecists, i guess its easy -poison is really bad before you get geneticists for example -before you have geneticists poisonous is just awful -if you block everything, heinous is awful -if you almost block everything, destructive is awful -and then the double hit is somewhere in the middle -yeah i think they shift a lot depending on how strong you are -if you're strong enough that doing voids at 190 is a joke but can't do them later after you finish corrupted for example -for me right now I usually block close to 100% of the damage, which is why destruction and heinous are worst -poison is completely trivial when the maps are already easy -destruction = % damage, heinous = crit -if you're trying to do the void maps before you're actually strong though poison is a killer -yea thats a good point, people doing them at the challenge boundary vs at the end of their run -I also thing the difficulty check should consider block, if it doesn't already do that -i always found poison to be the most obnoxious of them early on because when you don't even have geneticists to fire to make breeding faster again it just takes sooo long -for a large part of the game I only did VMs when I could completely block everything, which made them trivial From 559ee4d83f0e6507c6e49c7dc9ea4a81c0679933 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:38:16 +0100 Subject: [PATCH 0281/3477] Delete SettingsTooltipDocumentation.txt --- docs/SettingsTooltipDocumentation.txt | 71 --------------------------- 1 file changed, 71 deletions(-) delete mode 100644 docs/SettingsTooltipDocumentation.txt diff --git a/docs/SettingsTooltipDocumentation.txt b/docs/SettingsTooltipDocumentation.txt deleted file mode 100644 index 289452cc1..000000000 --- a/docs/SettingsTooltipDocumentation.txt +++ /dev/null @@ -1,71 +0,0 @@ -Auto Gather/Build - Automatically gathers resources (and uses Turkimp on metal). Auto speed-builds your build queue and auto-researches science on demand. -Better Auto Fight - Will automatically handle fighting. It gives you autofight before you get the Battle upgrade in Zone 1.. .CAUTION: If you autoportal with BetterAutoFight disabled, the game sits there doing nothing until you click FIGHT. (not good for afk) -Auto Stance - Automatically swap stances to avoid death. -Trap Trimps - Automatically trap trimps when needed, including building traps. -Buy Storage - Will buy storage when resource is almost full. (like AutoStorage, even anticipates Jestimp) -Buy Jobs - Buys jobs based on ratios configured below. CAUTION: you cannot manually assign jobs with this. Toggle if you need to. -Buy Buildings - Will buy non storage buildings as soon as they are available -Buy Upgrades - Autobuy non equipment Upgrades -Buy Armor - Auto-Buy/Level-Up the most cost efficient armor available. -Buy Armor Upgrades - (Prestiges) & Gymystic. Will buy the most efficient armor upgrade available. -Buy Weapons - Auto-Buy/Level-Up the most cost efficient weapon available. -Buy Weapon Upgrades - (Prestiges) Will buy the most efficient weapon upgrade available. -Buy Shield Block - Will buy the shield block upgrade. CAUTION: If you are progressing past zone 60, you probably don't want this :) -Run Unique Maps - Relies on AutoMaps to choose to run Unique maps. Required for AutoPortal. Also needed for challenges: Electricity, Mapocalypse, Meditate, and Crushed (etc). Needed to auto-run The Wall and Dimension of Anger. -Auto Heirlooms - Automatically evaluate and carry the best heirlooms, and recommend upgrades for equipped items. AutoHeirlooms will only change carried items when the heirlooms window is not open. Carried items will be compared and swapped with the types that are already carried. If a carry spot is empty, it will be filled with the best shield (if available). Evaluation is based ONLY on the following mods (listed in order of priority, high to low): Void Map Drop Chance/Trimp Attack, Crit Chance/Crit Damage, Miner Efficiency/Metal Drop, Gem Drop/Dragimp Efficiency, Farmer/Lumberjack Efficiency. For the purposes of carrying, rarity trumps all of the stat evaluations. Empty mod slots are valued at the average value of the best missing mod. -Hire Scientists - Enable or disable hiring of scientists. Math: ScientistRatio=(FarmerRatio+LumberjackRatio+MinerRatio)/25 and stops hiring scientists after 250k Farmers. -Manage Breed Timer - Automatically manage the breed timer by purchasing Genetecists. Sets ideal anticpation stacks. If not using AutoStance, this will probably be undesirable... Picks appropriate times for various challenges (3.5s,11s,30s). Delays purchasing potency and nurseries if trying to raise the timer. EFFECTIVELY LOCKS THE BREED TIMER -Geneticist Timer - Breed time in seconds to shoot for using geneticists. Disable with -1 (and Disable ManageBreedTimer) to disable the Hiring/Firing of genetecists (and potency upgrades). CANNOT CHANGE WITH MANAGE BREED TIMER OPTION ON -Farmer Ratio - -Lumberjack Ratio - -Miner Ratio - -Max Explorers - Map the planet!! -Max Trainers - Fist bump me bro -Max Huts - -Max Houses - -Max Mansions - -Max Hotels - -Max Resorts - -Max Gateways - WARNING: Not recommended to raise above 25 -Max Wormholes - WARNING: Wormholes cost helium! Values below 0 do nothing. -Max Collectors - -First Gigastation - How many warpstations to buy before your first gigastation -Delta Gigastation - How many extra warpstations to buy for each gigastation. Supports fractional values. For example 2.5 will buy +2/+3/+2/+3... -Max Gyms - -Max Tributes - -Max Nurseries - -Void Maps - The zone at which you want all your void maps to be cleared (Cell 96). 0 is off -Prestige - Acquire prestiges through the selected item (inclusive) as soon as they are available in maps. Forces equip first mode. Automap must be enabled. THIS IS AN IMPORTANT SETTING related to speed climbing and should probably always be on something. If you find the script getting stuck somewhere, particularly where you should easily be able to kill stuff, setting this to an option lower down in the list will help ensure you are more powerful at all times, but will spend more time acquiring the prestiges in maps. -Auto Portal - Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option in the genBTC settings, which is like a grace percentage of how low it can dip without triggering. CAUTION: Selecting He/hr may immediately portal you if its lower. -Challenge for Helium per Hour and Custom - Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. -Custom Portal - Automatically portal AFTER clearing this level.(ie: setting to 200 would portal when you first reach level 201) -Limit Equipment - Limit levels of equipment bought to:(level 11 - the prestige level). At or Above Prestige X (10), your equipment will remain at level 1. In other words, do not level equipment after ~level ~51, and only buy Prestiges. CAUTION: may reduce He/hr performance in many cases. -Breed Fire - Fire Lumberjacks and Miners to speed up breeding when needed. (Not genetecists). -Max Toxicity Stacks - Get maximum toxicity stacks before killing the improbability in each zone 60 and above. Generally only recommended for 1 run to maximize bone portal value. This setting will revert to disabled after a successful Max-Tox run + Toxicity Autoportal. -Run New Voids - Run new void maps acquired after the set void map zone. Runs them at Cell 95 by default, unless you set a decimal value indicating the cell, like: 187.75 CAUTION: May severely slow you down by trying to do too-high level voidmaps. Use the adjacent RunNewVoidsUntil setting to limit this. -Void Difficulty Check - How many hits to be able to take from a void map boss in dominance stance before we attempt the map. Higher values will get you stronger (by farming for health) before attempting. 2 should be fine. -Disable Farming - Disables the farming section of the automaps algorithm. This will cause it to always return to the zone upon reaching 10 map stacks. TROUBLESHOOTING: Save and Refresh when you toggle this, if necessary. INFO: The new Trimps 3.22 map-buttons greatly eliminate the usefulness of this. ALSO: NO LONGER DISABLES SIPHONOLOGY. -PauseAutoTrimps - PauseAutoTrimps(notincludingthegraphsmodule) -Warpstation Cap - Do not level Warpstations past Basewarp+DeltaGiga **. Without this, if a Giga wasnt available, it would level infinitely (wastes metal better spent on prestiges instead.) **The script bypasses this cap each time a new giga is bought, when it insta-buys as many as it can afford (since AT keeps available metal/gems to a low, overbuying beyond the cap to what is affordable at that first moment is not a bad thing). -Cap Equip to 10 - Do not level equipment past 10. Similar to LimitEquipment, Helps for early game when the script wants to level your tier2s to 40+, but unlike LimitEquipment, does not impact Zone 60+. -Skip Gear Level 58&59 - Dont Buy Gear during level 58 and 59, wait till level 60, when cost drops down to 10%. -Delay Armor - Delay buying armor prestige upgrades during Want More Damage or Farming automap-modes. -Dynamic Siphonology - Use the right level of siphonology based on your damage output. -Farm on >7 NomStacks - On Improbability(cell 100). Meant to be used with DisableFarming (otherwise farming would take care of this, but its slower). If Improbability already has 5 NomStacks, stack 30 Anticipation. If the Improbability has >7 NomStacks on it, get +200% dmg from MapBonus. If we still cant kill it, enter Farming mode at 30 stacks, Even with DisableFarming On! (exits when we get under 20x) -AutoRoboTrimp - Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable) -He/Hr Portal Buffer % - When using the He/Hr Autoportal, it will portal if your He/Hr drops by this amount of % lower than your best for current run, default is 0% (ie: set to 5 to portal at 95% of your best) -Run New Voids Until - Put a cap on what zone new voids will run at, until this zone, inclusive. -Always Buy Lvl 2 Armor - Always Buy the 2nd point of Armor even if we dont need the HP. Its the most cost effective level, and the HP _need_ script isnt always adequate. -Dynamic Prestige - EXPERIMENTAL: Skip getting prestiges at first, and Gradually work up to the desired Prestige setting you have set. Runs with Dagger to save a significant amount of time until we need better gear, then starts increasing the prestige setting near the end of the run. ---NEW ALGORITHM 7/23/2016--- Examines which prestiges you have, how many missing ones youd need to achieve the desired target and starts running 5 maps or 2 maps every zone, Until the target prestige is reached. Example: For mace, starts getting the prerequisite prestiges 10 zones away from max, then more and more, finally reaching the desired prestige by the last final zone (also goes for 9 mapbonus on the last zone). IMPORTANT NOTE PLEASE READ: Final Zone Number is inherently tied to the AutoPortal setting. When using the Helium per Hour setting, it uses the zone we portaled at last run (game.global.lastPortal). If the AutoPortal is set to a challenge, it will use the last zone of the challenge. CAUTION: EXPERIMENTAL, please come to Discord chat if you have problems. -undefined - undefined -Run Bionic Before Spire - Run the Bionic Wonderlands I through VI and then repeatedly farms VI(level 200) before attempting Spire, for the purpose of farming. WARNING: The point at which it stops farming has yet to be fully decided upon or set in stone, so it currently runs Bionic VI until it runs out of new prestige item rewards, then runs Bionic VII until it runs out of prestige items from that one, and then attempts the spire. This amounts to somewhere around 144 minutes. DO NOT USE WITH HE/HR PORTAL. Not meant to be used every time, He/Hr suffers. -Cap Trainers to a % of Tributes - Only Buy a Trainer when its cost is LESS than X% of cost of a tribute. This setting can work in combination with the other one, or set the other one to -1 and this will take full control. Default: -1 (Disabled). 50% is close to the point where the cap does nothing. You can go as low as you want but recommended is 10% to 1%. (example: Trainer cost of 5001, Tribute cost of 100000, @ 5%, it would NOT buy the trainer.) -PrestigeBackup - Acquire prestiges through the selected item (inclusive) as soon as they are available in maps. Forces equip first mode. Automap must be enabled. THIS IS AN IMPORTANT SETTING related to speed climbing and should probably always be on something. If you find the script getting stuck somewhere, particularly where you should easily be able to kill stuff, setting this to an option lower down in the list will help ensure you are more powerful at all times, but will spend more time acquiring the prestiges in maps. -Auto Heirlooms2 - New algorithm for Heirlooms. While enabled, the old AutoHeirlooms algorithm will be disabled (the button will stay lit or you can turn that one off). CAUTION: Turning this on will immediately re-sort your heirlooms according to the new algorithm, and turning it off again DOES revert to the original algorithm even though it may NOT have a visible result on your heirlooms. (fyi: This lack of action highlights one of the problems with the old one.) -AutoGoldenUpgrades - Automatically Buy the specified Golden Upgrades as they become available. -Auto Upgrade Heirlooms - Automatically buy the upgrade the script advises for the Equipped shield and staff, until we are out of nullifium. -Minutes to Farm Before Spire - Farm level 200 maps for X minutes before continuing to beat spire (0 to disable) -Auto Maps - Automatically run maps to progress. Very Important. -Auto Worker Ratios - Automatically changes worker ratios based on current progress. WARNING: overrides worker ratio settings. Settings: 1/1/1 up to 300k trimps, 3/3/5 up to 3mil trimps, then 3/1/4 above 3 mil trimps, then 1/1/10 above 1000 tributes, then 1/2/22 above 1500 tributes. Uses 1/40/8 in Spire since we get plenty of metal from that. -Warpstation Wall - Do not level Warpstations if it costs over 1/4th of the current metal we own. (Experimental) -Exit Spire After Cell - Exits the Spire after completing cell X. example: 40 for Row 4. (0 to disable) \ No newline at end of file From 6be8a305f99ff1648b8155e426e0b49b307eba98 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 3 Jun 2018 19:38:20 +0100 Subject: [PATCH 0282/3477] Delete AutoPerks EfficiencyQueue.txt --- docs/AutoPerks EfficiencyQueue.txt | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 docs/AutoPerks EfficiencyQueue.txt diff --git a/docs/AutoPerks EfficiencyQueue.txt b/docs/AutoPerks EfficiencyQueue.txt deleted file mode 100644 index 9a0337c6a..000000000 --- a/docs/AutoPerks EfficiencyQueue.txt +++ /dev/null @@ -1,29 +0,0 @@ -How AutoPerks Works: ----------------------- -Get list of Ratio'ed Perks. -Create an Efficiency queue of each of the 16 perks. - - Current Level - - Current Price @ that level - - Current Stat Increase @ that Level. - - Current Efficiency (price / stat increase). -Then the list of 16 perks is sorted by Efficiency, and the 1st one on the list is purchased. -Repeat ad nauseum 36 million iterations. - -for (var e in effQueue.array) { console.log("Effiency@ " + effQueue.array[e].efficiency + " Perk name: " + effQueue.array[e].name);} - -Effiency@ 30.00000000000003 Perk name: power -Effiency@ 4.0000000000000036 Perk name: toughness -Effiency@ 3.200000000000003e-9 Perk name: cunning -Effiency@ 1.3333333333333346 Perk name: pheromones -Effiency@ 1.0000000000000009 Perk name: motivation -Effiency@ 0.36 Perk name: carpentry -Effiency@ 0.13333333333333333 Perk name: artisanistry -Effiency@ 0.08 Perk name: resilience -Effiency@ 0.00030000000000000024 Perk name: power_II -Effiency@ 0.00014999999999999682 Perk name: looting_II -Effiency@ 0.00011333333333333333 Perk name: coordinated -Effiency@ 0.00004000000000000004 Perk name: toughness_II -Effiency@ 0.000008000000000000006 Perk name: motivation_II -Effiency@ 0.000002249999999999952 Perk name: carpentry_II -Effiency@ 0.000002 Perk name: resourceful -Effiency@ 0.000001 Perk name: overkill \ No newline at end of file From 33d5008b0813a0550b29923b97a1bc94cd873a4f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 4 Jun 2018 21:42:50 +0100 Subject: [PATCH 0283/3477] Update heirlooms.js --- modules/heirlooms.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 7bb29cb3b..6baca205f 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -328,7 +328,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { break; case 'plaguebringer': - tempEff = loom.mods[m][1]/100; + tempEff = loom.mods[m][1]/10; eff += tempEff; if(upgrade){ steps = game.heirlooms.Shield.plaguebringer.steps[loom.rarity]; From eee2a40abf90f1efc3e1d3c69c1d19f8483e5515 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 4 Jun 2018 21:45:48 +0100 Subject: [PATCH 0284/3477] Update heirlooms.js --- modules/heirlooms.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 6baca205f..fcaa70f0c 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -328,7 +328,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { break; case 'plaguebringer': - tempEff = loom.mods[m][1]/10; + tempEff = loom.mods[m][1]/1; eff += tempEff; if(upgrade){ steps = game.heirlooms.Shield.plaguebringer.steps[loom.rarity]; @@ -426,7 +426,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } } case 'FluffyExp': - tempEff = 0.5*loom.mods[m][1]/100; + tempEff = 0.5*loom.mods[m][1]/1; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -447,13 +447,13 @@ function evaluateHeirloomMods(loom, location, upgrade) { if(!checkForMod('trimpAttack', index, location)){ steps = game.heirlooms[loom.type].trimpAttack.steps[loom.rarity]; av = steps[0] + ((steps[1] - steps[0])/2); - tempEff = av/100; + tempEff = av/10; eff += tempEff; } else if(!checkForMod('voidMaps', index, location)){ steps = game.heirlooms[loom.type].voidMaps.steps[loom.rarity]; av = steps[0] + ((steps[1] - steps[0])/2); - tempEff = (steps[2]/100); + tempEff = (steps[2]/10); eff += tempEff; } else if(!checkForMod('critChance', index, location)){ @@ -471,7 +471,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { else if(!checkForMod('plaguebringer', index, location)){ steps = game.heirlooms[loom.type].plaguebringer.steps[loom.rarity]; av = steps[0] + ((steps[1] - steps[0])/2); - tempEff = av/100; + tempEff = av/1; eff += tempEff; } } @@ -479,7 +479,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; av = steps[0] + ((steps[1] - steps[0])/2); if(!checkForMod('MinerSpeed', index, location) || !checkForMod('metalDrop', index, location) || !checkForMod('fragmentsDrop', index, location) || !checkForMod('ExplorerSpeed', index, location) || !checkForMod('FluffyExp', index, location)){ - eff += 0.75*av/100; + eff += 0.75*av/10; } else if(!checkForMod('FarmerSpeed', index, location) || !checkForMod('LumberjackSpeed', index, location)) { eff += 0.5*av/100; From c0aff5a1e68bb7aeb8998d4533d8961e65652d94 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 4 Jun 2018 21:48:18 +0100 Subject: [PATCH 0285/3477] Update heirlooms.js --- modules/heirlooms.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index fcaa70f0c..d95be4928 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -328,7 +328,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { break; case 'plaguebringer': - tempEff = loom.mods[m][1]/1; + tempEff = loom.mods[m][1]*100; eff += tempEff; if(upgrade){ steps = game.heirlooms.Shield.plaguebringer.steps[loom.rarity]; @@ -371,7 +371,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'DragimpSpeed': - tempEff = 0.75*loom.mods[m][1]/100; + tempEff = 0.75*loom.mods[m][1]/10000; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -385,7 +385,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'gemsDrop': - tempEff = 0.75*loom.mods[m][1]/100; + tempEff = 0.75*loom.mods[m][1]/10000; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -399,7 +399,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'FarmerSpeed': - tempEff = 0.5*loom.mods[m][1]/100; + tempEff = 0.5*loom.mods[m][1]/10000; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -413,7 +413,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'LumberjackSpeed': - tempEff = 0.5*loom.mods[m][1]/100; + tempEff = 0.5*loom.mods[m][1]/10000; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -426,7 +426,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } } case 'FluffyExp': - tempEff = 0.5*loom.mods[m][1]/1; + tempEff = 0.5*loom.mods[m][1]*100; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; From 5b5f1b6ebf0fffa255b7767b82b5c2825b2b698c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 4 Jun 2018 21:53:08 +0100 Subject: [PATCH 0286/3477] Update heirlooms.js --- modules/heirlooms.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index d95be4928..90e44c22e 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -328,11 +328,11 @@ function evaluateHeirloomMods(loom, location, upgrade) { break; case 'plaguebringer': - tempEff = loom.mods[m][1]*100; + tempEff = loom.mods[m][1]*1000000; eff += tempEff; if(upgrade){ steps = game.heirlooms.Shield.plaguebringer.steps[loom.rarity]; - tempEff = (steps[2]/100)/((game.heirlooms.Shield.plaguebringer.currentBonus/100) + 1); + tempEff = (steps[2]/10)/((game.heirlooms.Shield.plaguebringer.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -375,7 +375,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.75*steps[2]/100)/((game.heirlooms.Staff.DragimpSpeed.currentBonus/100) + 1); + tempEff = (0.75*steps[2]/10000)/((game.heirlooms.Staff.DragimpSpeed.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -389,7 +389,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.75*steps[2]/100)/((game.heirlooms.Staff.gemsDrop.currentBonus/100) + 1); + tempEff = (0.75*steps[2]/10000)/((game.heirlooms.Staff.gemsDrop.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -403,7 +403,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.5*steps[2]/100)/((game.heirlooms.Staff.FarmerSpeed.currentBonus/100) + 1); + tempEff = (0.5*steps[2]/10000)/((game.heirlooms.Staff.FarmerSpeed.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -417,7 +417,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.5*steps[2]/100)/((game.heirlooms.Staff.LumberjackSpeed.currentBonus/100) + 1); + tempEff = (0.5*steps[2]/10000)/((game.heirlooms.Staff.LumberjackSpeed.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -426,11 +426,11 @@ function evaluateHeirloomMods(loom, location, upgrade) { } } case 'FluffyExp': - tempEff = 0.5*loom.mods[m][1]*100; + tempEff = 0.5*loom.mods[m][1]*100000; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.5*steps[2]/100)/((game.heirlooms.Staff.FluffyExp.currentBonus/100) + 1); + tempEff = (0.5*steps[2]/10)/((game.heirlooms.Staff.FluffyExp.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; From 42848026b670495c98723f2d23c911cae5061662 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 4 Jun 2018 21:55:42 +0100 Subject: [PATCH 0287/3477] Update heirlooms.js --- modules/heirlooms.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 90e44c22e..b5dbf0cda 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -332,7 +332,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { eff += tempEff; if(upgrade){ steps = game.heirlooms.Shield.plaguebringer.steps[loom.rarity]; - tempEff = (steps[2]/10)/((game.heirlooms.Shield.plaguebringer.currentBonus/100) + 1); + tempEff = (steps[2]/1)/((game.heirlooms.Shield.plaguebringer.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -371,7 +371,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'DragimpSpeed': - tempEff = 0.75*loom.mods[m][1]/10000; + tempEff = 0.75*loom.mods[m][1]/1000; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -385,7 +385,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'gemsDrop': - tempEff = 0.75*loom.mods[m][1]/10000; + tempEff = 0.75*loom.mods[m][1]/1000; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -399,7 +399,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'FarmerSpeed': - tempEff = 0.5*loom.mods[m][1]/10000; + tempEff = 0.5*loom.mods[m][1]/1000; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -413,7 +413,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'LumberjackSpeed': - tempEff = 0.5*loom.mods[m][1]/10000; + tempEff = 0.5*loom.mods[m][1]/1000; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -430,7 +430,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.5*steps[2]/10)/((game.heirlooms.Staff.FluffyExp.currentBonus/100) + 1); + tempEff = (0.5*steps[2]/1)/((game.heirlooms.Staff.FluffyExp.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; From d0a6c349f47c25b8760d47f8f2e21c92de550714 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 4 Jun 2018 21:59:15 +0100 Subject: [PATCH 0288/3477] Update heirlooms.js --- modules/heirlooms.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index b5dbf0cda..2276597ec 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -371,11 +371,11 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'DragimpSpeed': - tempEff = 0.75*loom.mods[m][1]/1000; + tempEff = 0.75*loom.mods[m][1]/100; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.75*steps[2]/10000)/((game.heirlooms.Staff.DragimpSpeed.currentBonus/100) + 1); + tempEff = (0.75*steps[2]/100)/((game.heirlooms.Staff.DragimpSpeed.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -385,11 +385,11 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'gemsDrop': - tempEff = 0.75*loom.mods[m][1]/1000; + tempEff = 0.75*loom.mods[m][1]/100; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.75*steps[2]/10000)/((game.heirlooms.Staff.gemsDrop.currentBonus/100) + 1); + tempEff = (0.75*steps[2]/100)/((game.heirlooms.Staff.gemsDrop.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -399,11 +399,11 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'FarmerSpeed': - tempEff = 0.5*loom.mods[m][1]/1000; + tempEff = 0.5*loom.mods[m][1]/100; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.5*steps[2]/10000)/((game.heirlooms.Staff.FarmerSpeed.currentBonus/100) + 1); + tempEff = (0.5*steps[2]/100)/((game.heirlooms.Staff.FarmerSpeed.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -413,11 +413,11 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'LumberjackSpeed': - tempEff = 0.5*loom.mods[m][1]/1000; + tempEff = 0.5*loom.mods[m][1]/100; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.5*steps[2]/10000)/((game.heirlooms.Staff.LumberjackSpeed.currentBonus/100) + 1); + tempEff = (0.5*steps[2]/100)/((game.heirlooms.Staff.LumberjackSpeed.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -479,7 +479,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; av = steps[0] + ((steps[1] - steps[0])/2); if(!checkForMod('MinerSpeed', index, location) || !checkForMod('metalDrop', index, location) || !checkForMod('fragmentsDrop', index, location) || !checkForMod('ExplorerSpeed', index, location) || !checkForMod('FluffyExp', index, location)){ - eff += 0.75*av/10; + eff += 0.75*av/100; } else if(!checkForMod('FarmerSpeed', index, location) || !checkForMod('LumberjackSpeed', index, location)) { eff += 0.5*av/100; From 559a5d4244fd32b6099286bcba47f42e55364de9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 4 Jun 2018 22:48:55 +0100 Subject: [PATCH 0289/3477] Update battlecalc.js --- modules/battlecalc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 2da81db9e..436b1a507 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -226,7 +226,7 @@ function getBattleStats(what,form,crit) { } //Amal health if (what == "health" && game.jobs.Amalgamator.owned > 0){ - var amt = game.jobs.Amalgamator.getHealthMult(); + var amt = game.jobs.Amalgamator.owned; currentCalc *= amt; } if (crit) { @@ -301,7 +301,7 @@ function calcOurDmg(number,maxormin,disableStances,disableFlucts) { //number = b number *= game.jobs.Amalgamator.getDamageMult(); } if (game.jobs.Amalgamator.owned > 0){ - number *= game.jobs.Amalgamator.getHealthMult(); + number *= game.jobs.Amalgamator.owned; } number *= (1 + (1 - game.empowerments.Ice.getCombatModifier())); From eef316cef6372b6e75a27261ddd4e6d1a51f0334 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 4 Jun 2018 22:58:11 +0100 Subject: [PATCH 0290/3477] Update battlecalc.js --- modules/battlecalc.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 436b1a507..1e137313b 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -226,8 +226,8 @@ function getBattleStats(what,form,crit) { } //Amal health if (what == "health" && game.jobs.Amalgamator.owned > 0){ - var amt = game.jobs.Amalgamator.owned; - currentCalc *= amt; + var amt = game.jobs.Amalgamator.getHealthMult(); + currentCalc *= (1 + (amt / 100)); } if (crit) { var critChance = getPlayerCritChance(); @@ -301,7 +301,7 @@ function calcOurDmg(number,maxormin,disableStances,disableFlucts) { //number = b number *= game.jobs.Amalgamator.getDamageMult(); } if (game.jobs.Amalgamator.owned > 0){ - number *= game.jobs.Amalgamator.owned; + number *= ((game.jobs.Amalgamator.getHealthMult() / 100) + 1); } number *= (1 + (1 - game.empowerments.Ice.getCombatModifier())); From 664cbe92bda51742be87e2ac7d5251f09b1f3890 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 5 Jun 2018 09:59:45 +0100 Subject: [PATCH 0291/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index e2a2983c3..bdb51bea1 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,14 +62,10 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE +changelogList.push({date: "05/06/2018", version: "v2.3", description: "Updated Heirloom calc, should be 4.8 ready. Ratios will be updated soon. ", isNew: true}); changelogList.push({date: "28/05/2018", version: "v2.2", description: "Added single use prestige raiding, BW raiding, looting II dump, amals are now calcd properly. ", isNew: true}); -changelogList.push({date: "4/2", version: "v2.1.6.9b", description: "Import Export, Modules Load code Improvements. Multiple Buttons/Settings Were Combined. AutoPerks code was changed but still functions the same, except for a new algorithm that reduces the time to allocate for high helium players to near-instantaneous. Please test new algo with MODULES[\"perks\"].useAlgo2=true; .You can also clear all perks then allocate and have it work now. AutoMaps no longer considered as being in Lead challenge during Chall^2. ", isNew: true}); +//changelogList.push({date: "4/2", version: "v2.1.6.9b", description: "Import Export, Modules Load code Improvements. Multiple Buttons/Settings Were Combined. AutoPerks code was changed but still functions the same, except for a new algorithm that reduces the time to allocate for high helium players to near-instantaneous. Please test new algo with MODULES[\"perks\"].useAlgo2=true; .You can also clear all perks then allocate and have it work now. AutoMaps no longer considered as being in Lead challenge during Chall^2. ", isNew: true}); //changelogList.push({date: "3/23", version: "v2.1.6.9", description: "Game's Map at Zone can be used with AT now, to run maps forever. AutoMaps setting was combined with RunUniqueMaps (variable has changed from boolean false,true to a value 0,1,2). Settings file has been migrated as such. New: Map SpecialMod is sort of working, at least. Geneticist Infinity bugfix. New AGU Settings for 60% Void (fixed). Many Graphs fixes. AutoMaps changes. Equipment Cap, see README at GitHub DarkTheme fix. Scientists Fix. Zek450 Perks Preset Changed. Ongoing Development...", isNew: false}); -//changelogList.push({date: "3/24", version: "v2.1.6.5-stable", description: "Set up Stable Repository for the faint of heart.", isNew: false}); -//changelogList.push({date: "3/22", version: "v2.1.6.8", description: "Settings GUI, make better. Import/export improved. Graph buttons: Cycle Up/Down. Internal code fixes. New Graph: Nurseries", isNew: false}); -//changelogList.push({date: "3/20", version: "v2.1.6.7", description: "Entirely Re-Arranged Settings Layout. Enjoy! New: Display Tab: EnhanceGrid + Go AFK Mode. GUI: Pinned AT Tab menu bar to top when scrolling. Minimize/Maxi/Close Buttons. ShowChangeLog Button. New Graph: FluffyXP&Xp/Hr (starts@300)", isNew: false}); -//changelogList.push({date: "3/13", version: "v2.1.6.6", description: "Geneticist management changes. Equipment code improvements. ATscriptLoad improvements. attempt to track errors.", isNew: false}); -//changelogList.push({date: "3/7", version: "v2.1.6.5", description: "Save/Reload Profiles in Import/Export. Magmamancer graph. Magmite/Magma Spam disableable.", isNew: false}); function assembleChangelog(date,version,description,isNew) { return (isNew) From df40c8f64d8e39f88ec68e49d02cd2bacc0eafd9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 5 Jun 2018 10:03:35 +0100 Subject: [PATCH 0292/3477] Update other.js --- modules/other.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/other.js b/modules/other.js index 8a63af1b1..603d2b0e6 100644 --- a/modules/other.js +++ b/modules/other.js @@ -277,6 +277,7 @@ if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting( if (getPortalUpgradePrice("Looting_II")+game.resources.helium.totalSpentTemp <= game.resources.helium.respecMax) { buyPortalUpgrade('Looting_II'); activateClicked(); + cancelPortal(); debug('Bought ' + getPageSetting('lootdumpa') + ' Looting II'); } else { From c19149148c8c6c2360b168e1812365f2bcd3021c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 5 Jun 2018 16:40:49 +0100 Subject: [PATCH 0293/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 603d2b0e6..21fcedd51 100644 --- a/modules/other.js +++ b/modules/other.js @@ -222,7 +222,7 @@ function Praiding() { //BWrmn //BWrmx function BWraiding() { - if (game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { + if (game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid') || prestraid) { if (getPageSetting('AutoMaps') == 1 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } From f9b3d7e740ea7c9818a741bb49ca339a06eaf650 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 5 Jun 2018 16:53:12 +0100 Subject: [PATCH 0294/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 21fcedd51..d1deb2f72 100644 --- a/modules/other.js +++ b/modules/other.js @@ -222,7 +222,7 @@ function Praiding() { //BWrmn //BWrmx function BWraiding() { - if (game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid') || prestraid) { + if (game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid') && prestraid || !prestraid) { if (getPageSetting('AutoMaps') == 1 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } From 426d1675a3f7f6aa3589fae03920f4aa519fc3fb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 5 Jun 2018 16:55:25 +0100 Subject: [PATCH 0295/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index d1deb2f72..603d2b0e6 100644 --- a/modules/other.js +++ b/modules/other.js @@ -222,7 +222,7 @@ function Praiding() { //BWrmn //BWrmx function BWraiding() { - if (game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid') && prestraid || !prestraid) { + if (game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { if (getPageSetting('AutoMaps') == 1 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } From 259a611f2ed387f3460e924157a15b7a54b63a86 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 5 Jun 2018 17:08:15 +0100 Subject: [PATCH 0296/3477] Update other.js --- modules/other.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 603d2b0e6..27932bc8b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -5,6 +5,7 @@ var failpraid = false; var bwraided = false; var failbwraid = false; var perked = false; +var prestraidon = false; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { //exit if the cooldown is active, or we havent unlocked robotrimp. @@ -167,7 +168,8 @@ function findLastBionic() { //Praiding function Praiding() { - if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { + if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { + prestraidon = true; if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 0; } @@ -201,6 +203,7 @@ function Praiding() { } debug("...Successfully prestiged!"); prestraid = true; + prestraidon = false; if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); @@ -212,6 +215,7 @@ function Praiding() { } if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { prestraid = false; + prestraidon = false; } } @@ -222,7 +226,7 @@ function Praiding() { //BWrmn //BWrmx function BWraiding() { - if (game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { + if (!prestraidon && game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { if (getPageSetting('AutoMaps') == 1 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } From dd08bcd74afc2fdb7bae5aed7417a4cd1ef0db47 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 5 Jun 2018 17:18:02 +0100 Subject: [PATCH 0297/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index bdb51bea1..48c5b5097 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -207,7 +207,7 @@ function mainLoop() { if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) - if (getPageSetting('BWraid')==true) BWraiding(); //BW Raiding (other.js) + if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); From ca0582741a3f2c1bda3b777569bdc884eefb637b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 5 Jun 2018 17:36:27 +0100 Subject: [PATCH 0298/3477] Update other.js --- modules/other.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 27932bc8b..eca864b01 100644 --- a/modules/other.js +++ b/modules/other.js @@ -251,8 +251,11 @@ function BWraiding() { } runMap(); - if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { - repeatClicked(); + if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && findLastBionic().level > getPageSetting('BWraidingz')) { + game.global.repeatMap = true; + } + else if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && findLastBionic().level <= getPageSetting('BWraidingz')) { + game.global.repeatMap = false; } if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { bwraided = true; From 208461ef30a8ad0d7f93bc45579b9cd05aeb2bc5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 5 Jun 2018 18:01:01 +0100 Subject: [PATCH 0299/3477] Update other.js --- modules/other.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index eca864b01..1d6f6dac0 100644 --- a/modules/other.js +++ b/modules/other.js @@ -251,11 +251,11 @@ function BWraiding() { } runMap(); - if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && findLastBionic().level > getPageSetting('BWraidingz')) { - game.global.repeatMap = true; + if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level > getPageSetting('BWraidingz')) { + repeatClicked(); } - else if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && findLastBionic().level <= getPageSetting('BWraidingz')) { - game.global.repeatMap = false; + else if (game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level <= getPageSetting('BWraidingz')) { + repeatClicked(); } if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { bwraided = true; From 34084886e18a0affbba9a7adfff4bf160ad7bed6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 6 Jun 2018 13:57:19 +0100 Subject: [PATCH 0300/3477] Update battlecalc.js --- modules/battlecalc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 1e137313b..2da81db9e 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -227,7 +227,7 @@ function getBattleStats(what,form,crit) { //Amal health if (what == "health" && game.jobs.Amalgamator.owned > 0){ var amt = game.jobs.Amalgamator.getHealthMult(); - currentCalc *= (1 + (amt / 100)); + currentCalc *= amt; } if (crit) { var critChance = getPlayerCritChance(); @@ -301,7 +301,7 @@ function calcOurDmg(number,maxormin,disableStances,disableFlucts) { //number = b number *= game.jobs.Amalgamator.getDamageMult(); } if (game.jobs.Amalgamator.owned > 0){ - number *= ((game.jobs.Amalgamator.getHealthMult() / 100) + 1); + number *= game.jobs.Amalgamator.getHealthMult(); } number *= (1 + (1 - game.empowerments.Ice.getCombatModifier())); From 11f22bdc918e3ee84368ae457efaaef256715db4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 6 Jun 2018 14:34:38 +0100 Subject: [PATCH 0301/3477] Update README.md --- README.md | 196 +----------------------------------------------------- 1 file changed, 1 insertion(+), 195 deletions(-) diff --git a/README.md b/README.md index 88a17b34c..b24f297b0 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ took a break ***Option 1***: Install TamperMonkey (Chrome) or GreaseMonkey (Firefox) -**EASY INSTALL click here: https://github.com/genbtc/AutoTrimps/raw/gh-pages/.user.js** (the Monkeys will detect this and prompt you to install it) +**EASY INSTALL click here: https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js** (the Monkeys will detect this and prompt you to install it) Overly detailed Chrome/TamperMonkey Instructions: - Open the TamperMonkey dashboard and go to utilities – in the URL box paste https://github.com/genbtc/AutoTrimps/raw/gh-pages/.user.js and click IMPORT @@ -81,200 +81,6 @@ Feel free to submit any bugs/suggestions as issues here on github. The fact that it works at all is misleading new players into thinking its perfect. Its not. If your highest zone is under z60, you have not unlocked the stats required, and have not experienced the full meta with its various paradigm shifts. If you are just starting, my advice is to play along naturally and use AutoTrimps as a tool, not a crutch. Play with the settings as if it was the game, Dont expect to go unattended, if AT chooses wrong, and make the RIGHT choice yourself. Additionally, its not coded to run one-time challenges for you, only repeatable ones for helium. During this part of the game, content is king - automating literally removes the fun of the game. If you find that many flaws in the automation exist for you, level up. Keep in mind the challenge of maintaining the code is that it has to work for everyone. AT cant see the future and doesnt run simulations, it exists only in the present moment. Post any suggestions on how it can be better, or volunteer to adapt the code, or produce some sort of low-level player guide with what youve learned. Happy scripting! -genBTC -## Current feature changes by genBTC -- Current as of : -- *** 11/7/2017, v2.1.5.7 Merge DerSkagg PullRequest In*** -- New AutoGoldenUpgrades - After max void golden upgrades, alternate between buying helium and battle upgrades. Or Choose a Zone to switch over completely at. -- *** 8/26/2017, v2.1.5.6 Merge Unihedro Branch In*** -- Uni changes include: Dont buy Coords, Trimple Z#, Scryer Suicide Z#, Safety First, Forced Prestige Z#, Prefer Metal Maps, Nursery Count Pre-Spire, Finish Challenge2, DontCare/PowerSaving/DontRushVoids, Prestige Skip 2, Auto Eggs. -- See his branch here @ https://github.com/Unihedro/AutoTrimps -- Past Changes: -- *** April Unihedro Branch Changes *** -- 4/17 v2.1.5.5u3 - fix improvedautostorage hijack -- Fixed a certain specific stupid bug caused by how graph overwrites some functions unnecessarily -- 4/16 v2.1.5.5u2 - do more map stacks if not enoughHealth -- No longer forces Buy Storage off -- 4/15 v2.1.5.5u1 - new settings BuyOvclock -- 4/14 v2.1.5.4u6 - Improved nurseries map and betterautostorage -- 4/14 v2.1.5.4u5 - Auto Eggs, some more 4.3 support -- 4/12 v2.1.5.4u4 - AutoTrimps lifecycle changes -- 4/11 v2.1.5.4u3 - fixed spire farming, autogen supply zone -- 4/10 v2.1.5.4u2 - PrestigeSkip2 -- 4/09 v2.1.5.4u1 - Magma: AutoGen, AutoGen2 -- 4/08 v2.1.5.3u6 - ForcePresZ -- 4/07 + 4/06: -- U5: FinishC2, PowerSaving -- U4: PreferMetal, PreSpireNurseries -- U3: LinearZ, SupplyWall, OneTimeOnly -- U2: TrimpleZ, ScryerDieZ, IgnoreCrits -- U1: Don't buy Coords / Skip challenge maps -- ***1/10/2017*** -- new setting Buy Warp to Hit Coord (genbtc page) -- AutoStance support for Plague/Bogged Daily -- Update Map Sliders decisions - less loot% reduction -- ***12/23/2016*** -- v2.1.5.2-genbtc-12-23-2016+Modular -- ***12/20*** -- Gear tab to Settings UI. Customize your equip level cap. -- Internally Disable Farm mode if we have nothing left to farm for (no prestiges,capped equip) to prevent infinite farming. -- ***12/19*** -- Skip prestige if >=2 unbought prestiges (maps settings) -- Bug Fixes + redo geneticists buying again. -- NEW: Add Map Bonus Graph -- ***12/18*** -- Fixed: dynamic prestige not reverting to dagger after the target zone is reached -- Graphs - clear time, removed #2s, (essence graph might be messed up but its fixed now) -- Change forceAbandonTrimps "sitting around breeding forever when not on full anti stacks" from 60 seconds to 31. -- Fix BAF2 #4 for players without geneticists. -- Buildings cost efficiency + jobs low level fixes -- Some low level jobs and Buildings fixes. -- ***12/14*** -- NEW: AutoAllocatePerks (genbtc settings) - uses AutoPerks ratio system to Auto Spend Helium during AutoPortal -- ***12/12*** -- Fix: HeHrBuffer will now portal midzone if you exceed 5x your buffer -- ***12/10*** -- New: AutoStartDaily option (read tooltip) -- New way to buy geneticists (fast) -- ***12/9*** -- Fixed: DynamicPrestige=-1 wasnt disabling it -- Fixed: needPrestige conflicting with needFarmSpire -- ***12/8*** -- FarmWithNomStacks changes (read tooltip) -- Nom stacks now calced by Autostance1 -- Default VoidDifficultyCheck is now defaulting to 6 -- ***12/6*** -- AutoMagmiteSpender now has a new cost efficiency algorithm.(read new tooltip) -- AT now does its Nursery map for Blacksmithery owners at z50 not z60, to prevent breeding time-stalls.(+fixed bug) -- ***12/4*** -- Completely rewrite lots of the Graphs.js code. -- Converted the codebase into individual files, to help people find stuff. -- For automaps, Not enough Health doesnt do 10 maps anymore, it only does 1. -- Adjust enoughHealth calculation for people without D stance. -- Add a farm lower level zones option (maps settings tab). -- ***12/2*** -- Changed Automaps farming/damage/health calculations. AutoMaps farms above 16x now. (10x in Lead, 10x in Nom with the Farm on >7 NOMstacks option). -- Hover over the Farming/Advancing/WantMoreDamage status area to see the precise number now. Read the AutoMaps tooltip in settings for slightly more information. -- Add dailymods: weakness, rampage, oddtrimpnerf, eventrimpbuff, badStrength, badMapStrength, bloodthirst to Autostance1. (and AS2 has minDmg, maxDmg too) -- ***11/29*** -- Puts a 5 second pause in between cycling AutoMagmiteSpender from "on portal" to "always" so you can switch it to "off" without it spending all your magmite. -- Make multi-toggle tooltip title give the name of all 3 options to be more descriptive. -- new calcBadGuyDmg function, used in DynamicGyms. -- stop using stopScientistsatFarmers and use MaxScientists instead. -- hire 1 miner,farmer,lumber each cycle even if our breed timer is low to do something tiny, so earlygame isnt stuck on 0 -- fix/re-arrange lazy Trainers duplicate code -- exit autostance if Formations isnt done (like level <60) -- Lead damage stacks were wrongly on 0.0005, its 0.0003. -- Trimpicide Mod #1: consider Titimp = forceAbandon and kill titimp if theres less than 5 seconds left on it or, we stand to gain more than 5 antistacks. -- Trimpicide Mod #2: if we're sitting around breeding for >60s while being over 5 anti stacks away from target. -- Include beta autostance2 code that im working on so I dont have a bunch of crazy local commits. -- ***11/26*** -- Patch corruption detection, and Scryer tooltips -- Dynamic Gyms - dont buy gyms if your block is higher than enemy attack -- Auto Magmamancer management after 10 mins -- Auto Finish Daily on portal (genbtc settings) -- Gym Wall (genbtc settings) -- ***11/23*** -- Auto Magmite Spender can now be toggled to Always Run -- AutoTrimpicide/Force-Abandon is now toggleable -- New Better AutoFight #2(optional) -- New Hover tooltips: Screenshot beta0.1, more to come -- ***11/22*** -- Auto Spend Magmite before portaling - (setting in genBTC page)- Part 1 buys any permanent one-and-done upgrades in order from most expensive to least. Part 2 then finds/buys the cheapest non-permanent multi-upgrade and repeats itself until you cant buy anymore. -- Buy 2 buildings instead of 1 if we have the mastery -- Entirely remove high lumberjack ratio during Spire. -- During Magma with 3000+ Tributes, switch to 1/12/12 auto-worker-ratios instead of 1/2/22. -- Add a 10 second timeout Popup window that can postpone Autoportal when clicked. -- Added a No Nurseries Until setting, in genBTC page -- ***11/20*** -- Fixed spire map bug -- Added new ratios to AutoPerks (ZXV3,truth_late) -- AutoFight if timer is <0.5 not <0.1 now -- ***11/19*** -- Doesnt run the 10 maps for Mapbonus before Spire now. Please increase/adjust your MinutesBeforeSpire Timer accordingly (the 10 maps were never accounted for in that timer). -- Re-arranged all the categories in the settings window and updated tooltips -- Kill your trimps (AutoTrimpicide) for Anti-Stacks more often - -## Gap in Changelog exists here. - -## Prior feature changes by genBTC (up to date as of 8/5/2016): -- Minutes to Farm Before Spire - force some time to be spent so you can for sure complete Spire (recommended: 3-10 minutes) -- Auto Upgrade Heirlooms - spends ALL your nullifium on the recommended upgrades -- Auto Golden Upgrades = Buys all the Golden Helium, Battle, or Voids when available. -- Always Runs 10 maps for 200% map bonus before attempting Spire (happens after the first death if you don't select "Map At Spire" in regular Trimps settings) -- AutoHeirlooms2 - new algorithm to sort/carry/recycle the Heirlooms (the original had a bug) -- Cap Trainers to a % of Tributes - Only buy a trainer when its cost is less than X% of the cost of a tribute. Prevents from competing with food resources, if you care. -- Run Bionic Before Spire - meant as a one time function (like max tox is) to farm the Bionic Wonderland maps for a LONG time(2 hours-ish) before entering Spire. (not HE/hr efficient) -- Dynamic Prestige: Skip prestiges at the beginning of the run which saves time, and delay them until the end when you need them most and can provide resources from farming too) -- Helium per Hour Portal "Buffer" - now you can customize how much He/Hr is allowed to drop before portaling -- Auto Robo Trimp - activate the MagnetoShriek ability on the bosses every 5 levels starting from the level you specify. (recommended set to 60) - -## Individual changes (from pinned messages on the Discord channel) -- 7/30 Patch heirlooms2 not carrying all protected heirlooms due to some indexing bug -- 7/28 Add 3 new graphs. Update Graphs, fix He/hr shifted by 1 bug. -- 7/27 Works on level 1 fresh new games a lot better, and added a new function Auto Upgrade Heirlooms which spends ALL your nullifium on the advised upgrade automatically -Also bugfix Adjust storage buying so that the script cannot buy a storage building before it is unlocked at level 1 and 70% -- 7/23 Important Fix for Heirloom2 and fix tooltips. -Reason: It was trying too hard to maintain equal shield/staff amounts, now it will not leave any better heirlooms (rarity/mods) in the temporary "extras" pile. -- 7/23 ~~Automatically gets 10 map stacks During Spire.~~ -- 7/22 Add new feature: Auto Golden Upgrades (in genBTC advanced settings) -- 7/22 Brand new AutoHeirlooms2 algorithm & Dynamic Prestige Algorithm (by Hyppy) -There is a new setting in the genBTC settings called "AutoHeirlooms2" and this will override the original. -I have not immediately switched over because Heirlooms are sensitive and I dont want to be responsible for anyone's heirlooms losses -So when you enable this new setting for the new algorithm, Take notice of what is going on, and manually "Protect" button any heirlooms you need to before portal-recycling -This image is a quick documentation of the heirloom carry bug, and the fix: https://puu.sh/qb6zj/903364c3d2.png -- 7/21 Fix helium per hour portal bug. -- 7/20 Dynamic Prestige now works with Helium Per Hour Autoportal setting! It uses the Last Run's portal zone in this situation. -- 7/17 Add Corruption handling for 2 of the corruption types (Strong and Tough). -- 7/16 Dynamic Prestige has been altered, if you are having a bug, reload, toggle your prestige dropdown setting to something else, and back, and portal to start a fresh run. -- 7/16 Added a new "Protect Heirloom" button in the Heirlooms dialog: Mark certain heirlooms from being auto-recycled on portal if/when a better one is found by the AutoHeirloom script. -- 7/6 New EasyMode Worker Ratios, >1000 tributes = 1/1/10 and >1500 tributes = 1/2/22 - -## Feature changes added by genBTC since before 4/27/2016 and Trimps version 3.22: -- Change Genetecist Timer to 10 sec instead of 11sec. (was commonly showing 11.4s because it rounds. that is too much) -- 'Farm on >7 NomStacks': During Nom, take precautions not to get too many stacks. (On Improbability(cell 100). Meant to be used with DisableFarming (otherwise farming would take care of this, but its slower). If Improbability already has 5 NomStacks, stack 30 Anticipation. If the Improbability has >7 NomStacks on it, get +200% dmg from MapBonus. If we still cant kill it, enter Farming mode at 30 stacks, Even with DisableFarming On!') -- Dynamic Siphonology - only when needed based on (Enemyhealth / baseDamage) -Created a new setting in the advanced options. "Dynamic Siphonology". -It will switch to the proper Map-level as soon as the current map is completed. -So you can choose original behavior of always using the lowest level map, -or the modified behavior, which increases the map level based on your damage. -The old behavior of "no siphonology at all when using DisableFarming" is no longer applied, under any circumstance. -- Skip Gear Level 58&59: Dont Buy Gear during level 58 and 59, wait till level 60, when cost drops down to 10%. -- Cap Equip to 10: Do not level equipment past 10. Similar to LimitEquipment, Helps for early game when the script wants to level your tier2s to 40+, but unlike LimitEquipment, should not impact Zone 60+. -- Delay Armor When needed: Delay buying armor prestige upgrades during Want More Damage or Farming automap-modes. -- Add console debug messages to the map selection/buying/running section. -- Put a numerical status on the "Farming"&"Want more Damage" UI indicator. -This way you can see things progressing, instead of wondering what is going on. -The number pertains to Enemy Health / Base Damage(non-stance). Above 16 means farm. Below 10 means stop farming. -- Farm @ cell 61 (megamining) not 82 (megafarming). -- Farm if enemyHealth divided by baseDamage (in X stance) is between 10 and 16. (Used to be 10 and 15). -Means it will farm very slightly less. -- Take Map Bonus +%Damage into account for farming decisions. (so you can farm less.) -- Stop from firing all scientists when it reaches the threshhold. (250k farmers) -Farmers will be maintained at the current level, not fired entirely. I -- Add WarpStation Cap (deltaGiga+baseWarp) feature. -Stop making warpstations if we are past the deltagiga + base -warpstations (and no giga upgrade is available). Will also remove the -green highlight around the icon. This will save you metal to use on -weapons,armor, etc. -NOTE: (the cap will ONLY work on incremental buys, it will not come into -effect when the game uses a gigastation and immediately BULK-buys as -many warpstations as it can afford. In this way it can buy over the cap. I think this is actually preferrable.) -- Add an Export/Import/Reset AutoTrimps settings buttons. -- Add a seperate "genBTC's settings UI" button, -- Better Tooltip Help - -**Voidmaps and Toxicity changes:** - -- Voidmaps: Do voids @ cell 96 Instead of 98. (to prevent overkill). Before, it only applied to Tox runs. -- Voidmap + Max-Tox runs: If we need to do a voidmap and have already more than 1415 stacks, (smallest voidmap is 85 cells) consider tox-stack finished. -- For normal-tox: Instead of starting the voidmap at 1400 stacks, start at (1500-theVoidmap.size) in case its an 85 cell voidmap. -- Regular Tox-Run: Avoid another non-unique map cycle due to having the amount of tox stacks we need. -- Max-Tox Run: During a Toxicity + Max Tox run AutoPortal, unset the MaxTox setting from the settings page, so we dont' run 2 Max-Tox's in a row (will go back to normal Tox run). - -## Original zininzinin version's historical changes -See changelog at the original version's github page: https://github.com/zininzinin/AutoTrimps/blob/c8eac4c80d0a1a5ebe36bc44c7655c335a2dea7b/README.md#recent-changes - - ## Easy explanation of Colors for EquipUpgrades / prestiges highlights - white - Upgrade is not available - yellow - Upgrade is not affordable From d12622a86caeb2253cc611df230a1b8bbfb2a212 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 6 Jun 2018 14:36:29 +0100 Subject: [PATCH 0302/3477] Update README.md --- README.md | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index b24f297b0..810183f9a 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,9 @@ Discord is a chat program. Come to talk about AutoTrimps, for help, or suggestio ## Current Version (full changes below) - Ongoing Development! - Too many to list - This version has beta changes by Zek, forked from GenBTC + Kfro. Including Autostance 3, Update to Swiffy Overlay, and Merging of buttons. Please tell me about bugs on Discord + +Zek - New changes will be posted here^ + - Mar 24, BATTLECALC CHANGES: - BattleCalc.js - getBattleStats() updated for the stuff added to AutoStance 1 a while ago, Life,C2,StillRowing, Copied from game code. - Mar 24, EQUIPMENT CHANGES: @@ -39,12 +42,12 @@ took a break ## Script Installation **Please backup your game via export before and during use to prevent losing your save due to corruption!** -***Option 1***: Install TamperMonkey (Chrome) or GreaseMonkey (Firefox) +***Your only Option***: Install TamperMonkey (Chrome) or GreaseMonkey (Firefox) **EASY INSTALL click here: https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js** (the Monkeys will detect this and prompt you to install it) Overly detailed Chrome/TamperMonkey Instructions: -- Open the TamperMonkey dashboard and go to utilities – in the URL box paste https://github.com/genbtc/AutoTrimps/raw/gh-pages/.user.js and click IMPORT +- Open the TamperMonkey dashboard and go to utilities – in the URL box paste https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js and click IMPORT - Alternatively, paste the contents of `.user.js` into a user script (pay attention, it says .user.js - this contains 4 lines of code that loads AutoTrimps2.js) - The script should automatically load everytime you go to https://trimps.github.io or the game on Kongregate - You will know you have the script loaded if you see the Automation and Graphs buttons in the game menu at the bottom @@ -54,26 +57,7 @@ Overly detailed Chrome/TamperMonkey Instructions: FireFox/GreaseMonkey instructions: - GreaseMonkey identifies userscripts by visiting a URL that ends with ".user.js" in them: -- Visit this URL, and Agree to install the userscript: https://github.com/genbtc/AutoTrimps/raw/gh-pages/.user.js - -***Option 2***: Via a Bookmark (does not work with Kongregate - maybe it does now that I added an include kongregate line to the file) -- Create new bookmark and set its target to: -```js -javascript:with(document)(head.appendChild(createElement('script')).src='https://genbtc.github.io/AutoTrimps/AutoTrimps2.js')._ -``` -- This bookmark button has to be clicked manually after you go to https://trimps.github.io - -***Option 3***: Paste into console (last resort for debugging, dont do this) - -Chrome Instructions -- You can copy and paste the entire contents of AutoTrimps2.js into the Dev Console (F12 in chrome) of the page. (make sure the dropdown box to the left of "Preserve Log" is set to "top" - or "mainFrame (indexKong.html)" for kongregate. - -Firefox Instructions -- Push Ctrl+Shift+K to go into console and look for the "Select an iframe" icon, and choose http://trimps.github.io/indexKong.html - -Notes: -If you would like to use only the graphs module, replace `AutoTrimps2.js` with `Graphs.js` in the bookmark or your userscript. -Feel free to submit any bugs/suggestions as issues here on github. +- Visit this URL, and Agree to install the userscript: https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js ***LowLevelPlayer Notes:*** From 151f8276fe3ea54446d90d0a03e3acb12a954b24 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 6 Jun 2018 19:49:30 +0100 Subject: [PATCH 0303/3477] Update other.js --- modules/other.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/other.js b/modules/other.js index 1d6f6dac0..3b6de3145 100644 --- a/modules/other.js +++ b/modules/other.js @@ -250,7 +250,9 @@ function BWraiding() { return; } + if (findLastBionic().level <= getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { runMap(); + } if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level > getPageSetting('BWraidingz')) { repeatClicked(); } From 410c00aa2f31f75dce17859829728c4748408402 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 6 Jun 2018 20:51:07 +0100 Subject: [PATCH 0304/3477] Update battlecalc.js --- modules/battlecalc.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 2da81db9e..c35b51f98 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -383,6 +383,9 @@ function calcBadGuyDmg(enemy,attack,daily,maxormin,disableFlucts) { } else if (game.global.challengeActive == "Corrupted"){ number *= 3; + } + else if (game.global.challengeActive == "Obliterated"){ + number = (number == -1) ? 1e12 : (1e12 * number); } if (daily) number = calcDailyAttackMod(number); From 6655a9cd2dd903969387958f145be8507f79fc98 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 6 Jun 2018 20:53:06 +0100 Subject: [PATCH 0305/3477] Update battlecalc.js --- modules/battlecalc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index c35b51f98..49e5b0fa8 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -385,7 +385,7 @@ function calcBadGuyDmg(enemy,attack,daily,maxormin,disableFlucts) { number *= 3; } else if (game.global.challengeActive == "Obliterated"){ - number = (number == -1) ? 1e12 : (1e12 * number); + number *= (number == -1) ? 1e12 : (1e12 * number); } if (daily) number = calcDailyAttackMod(number); From d259c53035f9123a885b25c609194b0d8013e9e7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 6 Jun 2018 20:55:06 +0100 Subject: [PATCH 0306/3477] Update battlecalc.js --- modules/battlecalc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 49e5b0fa8..75f9b501e 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -385,7 +385,7 @@ function calcBadGuyDmg(enemy,attack,daily,maxormin,disableFlucts) { number *= 3; } else if (game.global.challengeActive == "Obliterated"){ - number *= (number == -1) ? 1e12 : (1e12 * number); + number *= 10; } if (daily) number = calcDailyAttackMod(number); From 9f4d7aa4d3fd37ad15461e0572116392aa8da599 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 6 Jun 2018 21:01:40 +0100 Subject: [PATCH 0307/3477] Update battlecalc.js --- modules/battlecalc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 75f9b501e..c8c6916e9 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -385,7 +385,7 @@ function calcBadGuyDmg(enemy,attack,daily,maxormin,disableFlucts) { number *= 3; } else if (game.global.challengeActive == "Obliterated"){ - number *= 10; + number *= 1e12; } if (daily) number = calcDailyAttackMod(number); From 713fc167f9177281fa82a8e558a3d3440716589a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 7 Jun 2018 12:31:54 +0100 Subject: [PATCH 0308/3477] Update SettingsGUI.js --- SettingsGUI.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index b30817d12..174d72454 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -243,10 +243,10 @@ function initializeAllSettings() { createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Auto Gather/Build #2', 'Science Research OFF'], 'Controls what YOU do. Manual does nothing
The Decision between AutoGather 1 or 2 is up to you, and they should be similar. Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All Upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); //createSetting('ManageBreedtimerNew', ['Manual Breed Timer', 'Auto Breed Timer', 'Auto No Patience'], 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges, and accounts for the patience mastery.
[ON](Yellow): The same as above, but ignores patience and will not set a breed timer longer than 30s.
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'multitoggle', 1, null, "Core"); //This replaces the two settings below, but do we really need an option to ignore patience?? - createSetting('ManageBreedtimer', 'Auto Breed Timer', 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges (0, 3.5s, 10s, 30s).
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'boolean', true, null, "Core"); - createSetting('GeneticistTimer', 'Geneticist Timer', 'Manages the breed timer by hiring/firing Geneticists for the purpose of setting the ideal anticpation stacks. Disable with -1 to disable the Hiring/Firing of geneticists.
Info: Potency and Nursery buying behavior is adjusted dynamically (and disabling no longer disables potency). The Automatic Genetecist Hiring Process can best be summarized by: Buy/Wait/Die,Repeat. (if you do not die, no action is taken). Also self-kills (trimpicide) aka force abandon when your anti-stacks aren\'t maxed out (conservatively).

Controlled automatically (locked) when Auto Breed Timer is on.', 'value', '30', null, "Core"); - createSetting('UsePatience', 'Enable Patience', 'Sets the default breed timer to 45 seconds if you have the Patience mastery.', 'boolean', true, null, 'Core'); - createSetting('BreedFire', 'Breed Fire', 'OPTIONAL. Fire Lumberjacks and Miners to speed up breeding when needed. Basically trades wood/metal to cut the wait between deaths down. Disclaimer: May heavily negatively impact wood-gathering. ', 'boolean', false, null, 'Core'); + //createSetting('ManageBreedtimer', 'Auto Breed Timer', 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges (0, 3.5s, 10s, 30s).
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'boolean', true, null, "Core"); + //createSetting('GeneticistTimer', 'Geneticist Timer', 'Manages the breed timer by hiring/firing Geneticists for the purpose of setting the ideal anticpation stacks. Disable with -1 to disable the Hiring/Firing of geneticists.
Info: Potency and Nursery buying behavior is adjusted dynamically (and disabling no longer disables potency). The Automatic Genetecist Hiring Process can best be summarized by: Buy/Wait/Die,Repeat. (if you do not die, no action is taken). Also self-kills (trimpicide) aka force abandon when your anti-stacks aren\'t maxed out (conservatively).

Controlled automatically (locked) when Auto Breed Timer is on.', 'value', '30', null, "Core"); + //createSetting('UsePatience', 'Enable Patience', 'Sets the default breed timer to 45 seconds if you have the Patience mastery.', 'boolean', true, null, 'Core'); + //createSetting('BreedFire', 'Breed Fire', 'OPTIONAL. Fire Lumberjacks and Miners to speed up breeding when needed. Basically trades wood/metal to cut the wait between deaths down. Disclaimer: May heavily negatively impact wood-gathering. ', 'boolean', false, null, 'Core'); createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); //Line2 @@ -257,7 +257,10 @@ function initializeAllSettings() { createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core');} createSetting('fastallocate', 'Fast Allocate', 'Turn on if your helium is above 500Qa. Not recommended for low amounts of helium. ', 'boolean', false, null, 'Core'); createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); + createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Core'); + createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will dump 1000 helium into looting II until you can no longer afford to.', 'value', -1, null, 'Core'); document.getElementById('AutoAllocatePerks').parentNode.insertAdjacentHTML('afterend','
'); + //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. createSetting('AutoPortal', 'AutoPortal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); @@ -381,9 +384,10 @@ function initializeAllSettings() { createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); - createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Spire'); - createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will dump 1000 helium into looting II until you can no longer afford to.', 'value', -1, null, 'Spire'); + + + //Combat //Subsection1Line1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
BAF3 = Uses vanilla autofight, and force fights when dead except in VM and Spire.
WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); From 6a7d8fd5a2389a109d4672d1a8919d704d6d8803 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 7 Jun 2018 12:33:48 +0100 Subject: [PATCH 0309/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 48c5b5097..f3975559e 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -222,7 +222,7 @@ function mainLoop() { if (getPageSetting('ManualGather2')<=1) manualLabor(); //"Auto Gather/Build" (gather.js) else if (getPageSetting('ManualGather2')==2) manualLabor2(); //"Auto Gather/Build #2" (") getPageSetting('AutoMaps') > 0 ? autoMap() : updateAutoMapsStatus(); //"Auto Maps" (automaps.js) - if (getPageSetting('GeneticistTimer') >= 0) autoBreedTimer(); //"Geneticist Timer" / "Auto Breed Timer" (autobreedtimer.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" if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); //"AutoRoboTrimp" (other.js) From 151b0b7e1fae591ef22afef1371c0e99570252d2 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 7 Jun 2018 12:38:08 +0100 Subject: [PATCH 0310/3477] Update SettingsGUI.js --- SettingsGUI.js | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 174d72454..c8008c7a8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -242,24 +242,17 @@ function initializeAllSettings() { //Line1: createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Auto Gather/Build #2', 'Science Research OFF'], 'Controls what YOU do. Manual does nothing
The Decision between AutoGather 1 or 2 is up to you, and they should be similar. Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All Upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); - //createSetting('ManageBreedtimerNew', ['Manual Breed Timer', 'Auto Breed Timer', 'Auto No Patience'], 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges, and accounts for the patience mastery.
[ON](Yellow): The same as above, but ignores patience and will not set a breed timer longer than 30s.
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'multitoggle', 1, null, "Core"); //This replaces the two settings below, but do we really need an option to ignore patience?? - //createSetting('ManageBreedtimer', 'Auto Breed Timer', 'Genetecist management is controlled by the Timer setting box to the right, not this.
Explanation:
[ON](Green): All this does is auto-choose the appropriate timer for various challenges (0, 3.5s, 10s, 30s).
[OFF](Red): You set the Timer yourself! Even if this is red, it still tampers with genetecists if the timer is >= 0.
Note: Using AutoStance is recommended to survive the full 30 seconds or else Auto will probably be undesirable.', 'boolean', true, null, "Core"); - //createSetting('GeneticistTimer', 'Geneticist Timer', 'Manages the breed timer by hiring/firing Geneticists for the purpose of setting the ideal anticpation stacks. Disable with -1 to disable the Hiring/Firing of geneticists.
Info: Potency and Nursery buying behavior is adjusted dynamically (and disabling no longer disables potency). The Automatic Genetecist Hiring Process can best be summarized by: Buy/Wait/Die,Repeat. (if you do not die, no action is taken). Also self-kills (trimpicide) aka force abandon when your anti-stacks aren\'t maxed out (conservatively).

Controlled automatically (locked) when Auto Breed Timer is on.', 'value', '30', null, "Core"); - //createSetting('UsePatience', 'Enable Patience', 'Sets the default breed timer to 45 seconds if you have the Patience mastery.', 'boolean', true, null, 'Core'); - //createSetting('BreedFire', 'Breed Fire', 'OPTIONAL. Fire Lumberjacks and Miners to speed up breeding when needed. Basically trades wood/metal to cut the wait between deaths down. Disclaimer: May heavily negatively impact wood-gathering. ', 'boolean', false, null, 'Core'); createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); - - //Line2 - createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); - createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); - createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); - if (!game.worldUnlocks.easterEgg.locked) { - createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core');} createSetting('fastallocate', 'Fast Allocate', 'Turn on if your helium is above 500Qa. Not recommended for low amounts of helium. ', 'boolean', false, null, 'Core'); createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Core'); createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will dump 1000 helium into looting II until you can no longer afford to.', 'value', -1, null, 'Core'); - document.getElementById('AutoAllocatePerks').parentNode.insertAdjacentHTML('afterend','
'); + + //Line2 + createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); + createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); + createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); + document.getElementById('FinishC2').parentNode.insertAdjacentHTML('afterend','
'); //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. @@ -455,7 +448,9 @@ function initializeAllSettings() { createSetting('AutoPoison', 'Poison', 'Spend/convert Poison tokens', 'dropdown', 'Off', ['Off', 'Empowerment', 'Transfer', 'Convert to Wind', 'Convert to Ice', 'Convert to Both'], 'Nature'); createSetting('AutoWind', 'Wind', 'Spend/convert Wind tokens', 'dropdown', 'Off', ['Off', 'Empowerment', 'Transfer', 'Convert to Poison', 'Convert to Ice', 'Convert to Both'], 'Nature'); createSetting('AutoIce', 'Ice', 'Spend/convert Ice tokens', 'dropdown', 'Off', ['Off', 'Empowerment', 'Transfer', 'Convert to Poison', 'Convert to Wind', 'Convert to Both'], 'Nature'); - + if (!game.worldUnlocks.easterEgg.locked) { + createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core');} + //Display settings: From 3fbcd655b3f12cb13bc2c3eb871bbb6b8ba937c6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 7 Jun 2018 14:30:02 +0100 Subject: [PATCH 0311/3477] Update other.js --- modules/other.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/other.js b/modules/other.js index 3b6de3145..3c6fd9a79 100644 --- a/modules/other.js +++ b/modules/other.js @@ -190,6 +190,7 @@ function Praiding() { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { autoTrimpSettings["AutoMaps"].value = 1; failpraid = true; + prestraidon = false; debug("Failed to prestige raid. Looks like you can't afford to.."); } return; From 19b863d56b31733ad7a526ecb971b3c2a232646d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 7 Jun 2018 15:06:10 +0100 Subject: [PATCH 0312/3477] Update maps.js --- modules/maps.js | 543 ++++++++++++++++++++++++------------------------ 1 file changed, 275 insertions(+), 268 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index 988c2cca5..8c8adba9f 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -1,32 +1,32 @@ MODULES["maps"] = {}; //These can be changed (in the console) if you know what you're doing: MODULES["maps"].enoughDamageCutoff = 4; //above this the game will do maps for map bonus stacks -MODULES["maps"].farmingCutoff = 16; //above this the game will farm. -MODULES["maps"].numHitsSurvived = 8; //survive X hits in D stance or not enough Health. +MODULES["maps"].farmingCutoff = 16; //above this the game will farm. +MODULES["maps"].numHitsSurvived = 8; //survive X hits in D stance or not enough Health. MODULES["maps"].LeadfarmingCutoff = 10; //lead has its own farmingCutoff -MODULES["maps"].NomfarmingCutoff = 10; //nom has its own farmingCutoff -MODULES["maps"].NurseryMapLevel = 50; //with blacksmithery, run map for nursery on this level +MODULES["maps"].NomfarmingCutoff = 10; //nom has its own farmingCutoff +MODULES["maps"].NurseryMapLevel = 50; //with blacksmithery, run map for nursery on this level //if FarmWhenNomStacks7 setting is on = [x, y, z]; -MODULES["maps"].NomFarmStacksCutoff = [7,30,100]; +MODULES["maps"].NomFarmStacksCutoff = [7, 30, 100]; //[x] get maxMapBonus (10) if we go above (7) stacks on Improbability (boss) //[y] go into maps on (30) stacks on Improbability (boss), farm until we fall under the 'NomfarmingCutoff' (10) //[z] restarts your voidmap if you hit (100) stacks -MODULES["maps"].MapTierZone = [72,47,16]; //descending order for these. +MODULES["maps"].MapTierZone = [72, 47, 16]; //descending order for these. // .MapTier?Sliders = [size,difficulty,loot,biome]; -MODULES["maps"].MapTier0Sliders = [9,9,9,'Mountain']; //Zone 72+ (old: 9/9/9 Metal) -MODULES["maps"].MapTier1Sliders = [9,9,9,'Depths']; //Zone 47-72 (old: 9/9/4 Metal) -MODULES["maps"].MapTier2Sliders = [9,9,9,'Random']; //Zone 16-47 (old: 9/9/0 Random) -MODULES["maps"].MapTier3Sliders = [9,9,9,'Random']; //Zone 6-16 (old: 9/0/0 Random) -MODULES["maps"].preferGardens = !getPageSetting('PreferMetal'); //prefer run Garden maps instead of ^^ if we have Decay done -MODULES["maps"].maxMapBonus = 10; //cap how many maps are run during Want More Damage mode -MODULES["maps"].wantHealthMapBonus = 10;//cap how many maps are run during Want More Health mode -MODULES["maps"].SpireFarm199Maps = true; //this will farm spire on 199 maps instead of 200 maps when Map Reducer is bought -MODULES["maps"].watchChallengeMaps = [15, 25, 35, 50]; //during 'watch' challenge, run maps on these levels: +MODULES["maps"].MapTier0Sliders = [9, 9, 9, 'Mountain']; //Zone 72+ (old: 9/9/9 Metal) +MODULES["maps"].MapTier1Sliders = [9, 9, 9, 'Depths']; //Zone 47-72 (old: 9/9/4 Metal) +MODULES["maps"].MapTier2Sliders = [9, 9, 9, 'Random']; //Zone 16-47 (old: 9/9/0 Random) +MODULES["maps"].MapTier3Sliders = [9, 9, 9, 'Random']; //Zone 6-16 (old: 9/0/0 Random) +MODULES["maps"].preferGardens = !getPageSetting('PreferMetal'); //prefer run Garden maps instead of ^^ if we have Decay done +MODULES["maps"].maxMapBonus = 10; //cap how many maps are run during Want More Damage mode +MODULES["maps"].wantHealthMapBonus = 10; //cap how many maps are run during Want More Health mode +MODULES["maps"].SpireFarm199Maps = true; //this will farm spire on 199 maps instead of 200 maps when Map Reducer is bought +MODULES["maps"].watchChallengeMaps = [15, 25, 35, 50]; //during 'watch' challenge, run maps on these levels: MODULES["maps"].shouldFarmCell = 59; -MODULES["maps"].SkipNumUnboughtPrestiges = 2; //exceeding this number of unbought prestiges will trigger a skip of prestige mode. +MODULES["maps"].SkipNumUnboughtPrestiges = 2; //exceeding this number of unbought prestiges will trigger a skip of prestige mode. MODULES["maps"].UnearnedPrestigesRequired = 2; -MODULES["maps"].maxMapBonusAfterZ = MODULES["maps"].maxMapBonus; //Max Map Bonus After Zone uses this many stacks - //- init as default value (10). user can set if they want. +MODULES["maps"].maxMapBonusAfterZ = MODULES["maps"].maxMapBonus; //Max Map Bonus After Zone uses this many stacks +//- init as default value (10). user can set if they want. //Initialize Global Vars (dont mess with these ones, nothing good can come from it). var stackingTox = false; @@ -57,15 +57,17 @@ function autoMap() { // if(game.options.menu.alwaysAbandon.enabled == 1) toggleSetting('alwaysAbandon'); //if we are prestige mapping, force equip first mode var prestige = autoTrimpSettings.Prestige.selected; - if(prestige != "Off" && game.options.menu.mapLoot.enabled != 1) toggleSetting('mapLoot'); + if (prestige != "Off" && game.options.menu.mapLoot.enabled != 1) toggleSetting('mapLoot'); //Control in-map right-side-buttons for people who can't control themselves. If you wish to use these buttons manually, turn off autoMaps temporarily. - if(game.options.menu.repeatUntil.enabled == 2) toggleSetting('repeatUntil'); - if(game.options.menu.exitTo.enabled != 0) toggleSetting('exitTo'); - if(game.options.menu.repeatVoids.enabled != 0) toggleSetting('repeatVoids'); + if (game.options.menu.repeatUntil.enabled == 2) toggleSetting('repeatUntil'); + if (game.options.menu.exitTo.enabled != 0) toggleSetting('exitTo'); + if (game.options.menu.repeatVoids.enabled != 0) toggleSetting('repeatVoids'); //exit and do nothing if we are prior to zone 6 (maps haven't been unlocked): - if (!game.global.mapsUnlocked || !(baseDamage > 0)) { //if we have no damage, why bother running anything? (this fixes weird bugs) - enoughDamage = true; enoughHealth = true; shouldFarm = false; - updateAutoMapsStatus(); //refresh the UI status (10x per second) + if (!game.global.mapsUnlocked || !(baseDamage > 0)) { //if we have no damage, why bother running anything? (this fixes weird bugs) + enoughDamage = true; + enoughHealth = true; + shouldFarm = false; + updateAutoMapsStatus(); //refresh the UI status (10x per second) return; } //if we are in mapology and we have no credits, exit @@ -81,19 +83,19 @@ function autoMap() { //Add your daily zone mod onto the void maps level var dailyVoidMod = getPageSetting('AutoFinishDailyNew'); if ((game.global.challengeActive == "Daily") && (getPageSetting('AutoFinishDailyNew') != 999) && (getPageSetting('DailyVoidMod'))) { - (voidMapLevelSetting += dailyVoidMod); + (voidMapLevelSetting += dailyVoidMod); } //decimal void maps are possible, using string function to avoid false float precision (0.29999999992). javascript can compare ints to strings anyway. - var voidMapLevelSettingZone = (voidMapLevelSetting+"").split(".")[0]; - var voidMapLevelSettingMap = (voidMapLevelSetting+"").split(".")[1]; + var voidMapLevelSettingZone = (voidMapLevelSetting + "").split(".")[0]; + var voidMapLevelSettingMap = (voidMapLevelSetting + "").split(".")[1]; if (voidMapLevelSettingMap === undefined || (game.global.challengeActive == 'Lead' && !challSQ)) voidMapLevelSettingMap = 90; - if (voidMapLevelSettingMap.length == 1) voidMapLevelSettingMap += "0"; //entering 187.70 becomes 187.7, this will bring it back to 187.70 + if (voidMapLevelSettingMap.length == 1) voidMapLevelSettingMap += "0"; //entering 187.70 becomes 187.7, this will bring it back to 187.70 var voidsuntil = getPageSetting('RunNewVoidsUntilNew'); needToVoid = voidMapLevelSetting > 0 && game.global.totalVoidMaps > 0 && game.global.lastClearedCell + 1 >= voidMapLevelSettingMap && - (game.global.world == voidMapLevelSettingZone || - (game.global.world >= voidMapLevelSettingZone && getPageSetting('RunNewVoidsUntilNew') != 0 && (voidsuntil == -1 || game.global.world <= (voidsuntil + voidMapLevelSettingZone)))); - if(game.global.totalVoidMaps == 0 || !needToVoid) + (game.global.world == voidMapLevelSettingZone || + (game.global.world >= voidMapLevelSettingZone && getPageSetting('RunNewVoidsUntilNew') != 0 && (voidsuntil == -1 || game.global.world <= (voidsuntil + voidMapLevelSettingZone)))); + if (game.global.totalVoidMaps == 0 || !needToVoid) doVoids = false; //NEW KFrowde + Sliverz This has several issues: 1 - Buys fuckloads of maps, 2 - enters a BW map instead of the one that you want @@ -103,31 +105,31 @@ function autoMap() { var plusMapVoidInput = getPageSetting('PlusMapVoidToggle') //Check that you should do this, check you've enabled it between the correct values, check that it hasn't already run this zone if ((plusMapVoid) && (plusMapVoidInput > 0 && plusMapVoidInput <= 10) && (plusMapVoidLastZone === null || plusMapVoidLastZone !== game.global.world)) { - document.getElementById("biomeAdvMapsSelect").value = "Random"; - document.getElementById('advExtraLevelSelect').value = plusMapVoidInput; - document.getElementById('advSpecialSelect').value = "p"; - document.getElementById("lootAdvMapsRange").value = 0; - document.getElementById("difficultyAdvMapsRange").value = 9; - document.getElementById("sizeAdvMapsRange").value = 9; - document.getElementById('advPerfectCheckbox').checked = false; - updateMapCost(); - buyMap(); - selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); - runMap(); - plusMapVoidLastZone = game.global.world; //This should have stopped it from looping + document.getElementById("biomeAdvMapsSelect").value = "Random"; + document.getElementById('advExtraLevelSelect').value = plusMapVoidInput; + document.getElementById('advSpecialSelect').value = "p"; + document.getElementById("lootAdvMapsRange").value = 0; + document.getElementById("difficultyAdvMapsRange").value = 9; + document.getElementById("sizeAdvMapsRange").value = 9; + document.getElementById('advPerfectCheckbox').checked = false; + updateMapCost(); + buyMap(); + selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length - 1].id); + runMap(); + plusMapVoidLastZone = game.global.world; //This should have stopped it from looping } // if force prestige, check if we are behind any first - if ((getPageSetting('ForcePresZ') >= 0) && ((game.global.world+extraMapLevels) >= getPageSetting('ForcePresZ'))) { - const prestigeList = ['Supershield','Dagadder','Megamace','Polierarm','Axeidic','Greatersword','Harmbalest','Bootboost','Hellishmet','Pantastic','Smoldershoulder','Bestplate','GambesOP']; - needPrestige = prestigeList.some(pres => game.mapUnlocks[pres].last <= (game.global.world+extraMapLevels) - 5); + if ((getPageSetting('ForcePresZ') >= 0) && ((game.global.world + extraMapLevels) >= getPageSetting('ForcePresZ'))) { + const prestigeList = ['Supershield', 'Dagadder', 'Megamace', 'Polierarm', 'Axeidic', 'Greatersword', 'Harmbalest', 'Bootboost', 'Hellishmet', 'Pantastic', 'Smoldershoulder', 'Bestplate', 'GambesOP']; + needPrestige = prestigeList.some(pres => game.mapUnlocks[pres].last <= (game.global.world + extraMapLevels) - 5); } else - //calculate if we are behind on unlocking prestiges - needPrestige = prestige != "Off" && game.mapUnlocks[prestige] && game.mapUnlocks[prestige].last <= (game.global.world+extraMapLevels) - 5 && game.global.challengeActive != "Frugal"; + //calculate if we are behind on unlocking prestiges + needPrestige = prestige != "Off" && game.mapUnlocks[prestige] && game.mapUnlocks[prestige].last <= (game.global.world + extraMapLevels) - 5 && game.global.challengeActive != "Frugal"; //dont need prestige if we are caught up, and have (2) unbought prestiges: skippedPrestige = false; - if (needPrestige && (getPageSetting('PrestigeSkip1_2')==1 || getPageSetting('PrestigeSkip1_2')==2)) { - var prestigeList = ['Dagadder','Megamace','Polierarm','Axeidic','Greatersword','Harmbalest','Bootboost','Hellishmet','Pantastic','Smoldershoulder','Bestplate','GambesOP']; + if (needPrestige && (getPageSetting('PrestigeSkip1_2') == 1 || getPageSetting('PrestigeSkip1_2') == 2)) { + var prestigeList = ['Dagadder', 'Megamace', 'Polierarm', 'Axeidic', 'Greatersword', 'Harmbalest', 'Bootboost', 'Hellishmet', 'Pantastic', 'Smoldershoulder', 'Bestplate', 'GambesOP']; var numUnbought = 0; for (var i in prestigeList) { var p = prestigeList[i]; @@ -140,22 +142,22 @@ function autoMap() { } } // Don't need prestige if there aren't many weapon prestiges left - if ((needPrestige || skippedPrestige) && (getPageSetting('PrestigeSkip1_2')==1 || getPageSetting('PrestigeSkip1_2')==3)) { - const prestigeList = ['Dagadder','Megamace','Polierarm','Axeidic','Greatersword','Harmbalest']; - const numLeft = prestigeList.filter(pres => game.mapUnlocks[pres].last <= (game.global.world+extraMapLevels) - 5); + if ((needPrestige || skippedPrestige) && (getPageSetting('PrestigeSkip1_2') == 1 || getPageSetting('PrestigeSkip1_2') == 3)) { + const prestigeList = ['Dagadder', 'Megamace', 'Polierarm', 'Axeidic', 'Greatersword', 'Harmbalest']; + const numLeft = prestigeList.filter(pres => game.mapUnlocks[pres].last <= (game.global.world + extraMapLevels) - 5); const shouldSkip = numLeft <= customVars.UnearnedPrestigesRequired; if (shouldSkip != skippedPrestige) { // not both conditions are met / is met but not already skipped: unskip it / do skip it - needPrestige = !needPrestige; - skippedPrestige = !skippedPrestige; + needPrestige = !needPrestige; + skippedPrestige = !skippedPrestige; } } -//START CALCULATING DAMAGES: + //START CALCULATING DAMAGES: var AutoStance = getPageSetting('AutoStance'); //calculate crits (baseDamage was calced in function autoStance) this is a weighted average of nonCrit + Crit. (somewhere in the middle) - ourBaseDamage = (baseDamage * (1-getPlayerCritChance()) + (baseDamage * getPlayerCritChance() * getPlayerCritDamageMult())); + ourBaseDamage = (baseDamage * (1 - getPlayerCritChance()) + (baseDamage * getPlayerCritChance() * getPlayerCritDamageMult())); //calculate with map bonus - var mapbonusmulti = 1 + (0.20*game.global.mapBonus); + var mapbonusmulti = 1 + (0.20 * game.global.mapBonus); //(autostance2 has mapbonusmulti built in) ourBaseDamage2 = ourBaseDamage; //keep a version without mapbonus ourBaseDamage *= mapbonusmulti; @@ -163,46 +165,46 @@ function autoMap() { //get average enemyhealth and damage for the next zone, cell 50, snimp type and multiply it by a max range fluctuation of 1.2 var enemyDamage; var enemyHealth; - if (AutoStance<=1) { + if (AutoStance <= 1) { enemyDamage = getEnemyMaxAttack(game.global.world + 1, 50, 'Snimp', 1.2); enemyDamage = calcDailyAttackMod(enemyDamage); //daily mods: badStrength,badMapStrength,bloodthirst } else { - enemyDamage = calcBadGuyDmg(null,getEnemyMaxAttack(game.global.world + 1, 50, 'Snimp', 1.0),true,true); //(enemy,attack,daily,maxormin,[disableFlucts]) + enemyDamage = calcBadGuyDmg(null, getEnemyMaxAttack(game.global.world + 1, 50, 'Snimp', 1.0), true, true); //(enemy,attack,daily,maxormin,[disableFlucts]) } - enemyHealth = getEnemyMaxHealth(game.global.world + 1,50); - if(game.global.challengeActive == "Toxicity") { + enemyHealth = getEnemyMaxHealth(game.global.world + 1, 50); + if (game.global.challengeActive == "Toxicity") { enemyHealth *= 2; } //Corruption Zone Proportionality Farming Calculator: var corrupt = game.global.world >= mutations.Corruption.start(true); if (getPageSetting('CorruptionCalc') && corrupt) { - var cptnum = getCorruptedCellsNum(); //count corrupted cells + var cptnum = getCorruptedCellsNum(); //count corrupted cells var cpthlth = getCorruptScale("health"); //get corrupted health mod - var cptpct = cptnum / 100; //percentage of zone which is corrupted. - var hlthprop = cptpct * cpthlth; //Proportion of cells corrupted * health of a corrupted cell - if (hlthprop >= 1) //dont allow sub-1 numbers to make the number less + var cptpct = cptnum / 100; //percentage of zone which is corrupted. + var hlthprop = cptpct * cpthlth; //Proportion of cells corrupted * health of a corrupted cell + if (hlthprop >= 1) //dont allow sub-1 numbers to make the number less enemyHealth *= hlthprop; - var cptatk = getCorruptScale("attack"); //get corrupted attack mod - var atkprop = cptpct * cptatk; //Proportion of cells corrupted * attack of a corrupted cell + var cptatk = getCorruptScale("attack"); //get corrupted attack mod + var atkprop = cptpct * cptatk; //Proportion of cells corrupted * attack of a corrupted cell if (atkprop >= 1) enemyDamage *= atkprop; //console.log("enemy dmg:" + enemyDamage + " enemy hp:" + enemyHealth + " base dmg: " + ourBaseDamage); } // enter farming if it takes over 4 hits in D stance (16) (and exit if under.) - if(!getPageSetting('DisableFarm')) { + if (!getPageSetting('DisableFarm')) { shouldFarm = enemyHealth > (ourBaseDamage * customVars.farmingCutoff); - if(game.options.menu.repeatUntil.enabled == 1) toggleSetting('repeatUntil'); //turn repeat forever on if farming is on. + if (game.options.menu.repeatUntil.enabled == 1) toggleSetting('repeatUntil'); //turn repeat forever on if farming is on. } //Lead specific farming calcuation section: - if((game.global.challengeActive == 'Lead' && !challSQ)) { + if ((game.global.challengeActive == 'Lead' && !challSQ)) { ourBaseDamage /= mapbonusmulti; - if (AutoStance<=1) + if (AutoStance <= 1) enemyDamage *= (1 + (game.challenges.Lead.stacks * 0.04)); enemyHealth *= (1 + (game.challenges.Lead.stacks * 0.04)); //if the zone is odd: (skip the +2 calc for the last level. - if (game.global.world % 2 == 1 && game.global.world != 179){ - //calculate for the next level in advance (since we only farm on odd, and evens are very tough) + if (game.global.world % 2 == 1 && game.global.world != 179) { + //calculate for the next level in advance (since we only farm on odd, and evens are very tough) if (AutoStance <= 1) { enemyDamage = getEnemyMaxAttack(game.global.world + 1, 99, 'Snimp', 1.2); enemyDamage = calcDailyAttackMod(enemyDamage); //daily mods: badStrength,badMapStrength,bloodthirst @@ -216,7 +218,7 @@ function autoMap() { ourBaseDamage *= mapbonusmulti; } //let people disable this if they want. - if(!getPageSetting('DisableFarm')) { + if (!getPageSetting('DisableFarm')) { shouldFarm = enemyHealth > (ourBaseDamage * customVars.LeadfarmingCutoff); } } @@ -224,37 +226,37 @@ function autoMap() { var pierceMod = (game.global.brokenPlanet && !game.global.mapsActive) ? getPierceAmt() : 0; const FORMATION_MOD_1 = game.upgrades.Dominance.done ? 2 : 1; //asks if we can survive x number of hits in either D stance or X stance. - enoughHealth = (baseHealth/FORMATION_MOD_1 > customVars.numHitsSurvived * (enemyDamage - baseBlock/FORMATION_MOD_1 > 0 ? enemyDamage - baseBlock/FORMATION_MOD_1 : enemyDamage * pierceMod)); + enoughHealth = (baseHealth / FORMATION_MOD_1 > customVars.numHitsSurvived * (enemyDamage - baseBlock / FORMATION_MOD_1 > 0 ? enemyDamage - baseBlock / FORMATION_MOD_1 : enemyDamage * pierceMod)); enoughDamage = (ourBaseDamage * customVars.enoughDamageCutoff > enemyHealth); //remove this in the meantime until it works for everyone. -/* if (!wantToScry) { - //enough health if we can survive 8 hits in D stance (health/2 and block/2) - enoughHealth = (baseHealth/2 > 8 * (enemyDamage - baseBlock/2 > 0 ? enemyDamage - baseBlock/2 : enemyDamage * pierceMod)); - //enough damage if we can one-shot the enemy in D (ourBaseDamage*4) - enoughDamage = (ourBaseDamage * 4) > enemyHealth; - scryerStuck = false; - } else { - //enough health if we can pass all the tests in autostance2 under the best of the worst conditions. - //enough damage if we can one-shot the enemy in S (ourBaseDamage/2) - var result = autoStanceCheck(true); - enoughHealth = result[0]; - enoughDamage = result[1]; - scryerStuck = !enoughHealth; - } */ + /* if (!wantToScry) { + //enough health if we can survive 8 hits in D stance (health/2 and block/2) + enoughHealth = (baseHealth/2 > 8 * (enemyDamage - baseBlock/2 > 0 ? enemyDamage - baseBlock/2 : enemyDamage * pierceMod)); + //enough damage if we can one-shot the enemy in D (ourBaseDamage*4) + enoughDamage = (ourBaseDamage * 4) > enemyHealth; + scryerStuck = false; + } else { + //enough health if we can pass all the tests in autostance2 under the best of the worst conditions. + //enough damage if we can one-shot the enemy in S (ourBaseDamage/2) + var result = autoStanceCheck(true); + enoughHealth = result[0]; + enoughDamage = result[1]; + scryerStuck = !enoughHealth; + } */ //Health:Damage ratio: (status) HDratio = enemyHealth / ourBaseDamage; - updateAutoMapsStatus(); //refresh the UI status (10x per second) + updateAutoMapsStatus(); //refresh the UI status (10x per second) -//BEGIN AUTOMAPS DECISIONS: + //BEGIN AUTOMAPS DECISIONS: //variables for doing maps var selectedMap = "world"; var shouldFarmLowerZone = false; shouldDoMaps = false; //prevents map-screen from flickering on and off during startup when base damage is 0. - if (ourBaseDamage > 0){ + if (ourBaseDamage > 0) { shouldDoMaps = !enoughDamage || shouldFarm || scryerStuck; } //Check our graph history and - Estimate = The zone should take around this long in milliseconds. @@ -274,24 +276,24 @@ function autoMap() { //FarmWhenNomStacks7 var restartVoidMap = false; - if(game.global.challengeActive == 'Nom' && getPageSetting('FarmWhenNomStacks7')) { + if (game.global.challengeActive == 'Nom' && getPageSetting('FarmWhenNomStacks7')) { //Get maxMapBonus (10) if we go above (7) stacks on Improbability (boss) - if (game.global.gridArray[99].nomStacks > customVars.NomFarmStacksCutoff[0]){ + if (game.global.gridArray[99].nomStacks > customVars.NomFarmStacksCutoff[0]) { if (game.global.mapBonus != customVars.maxMapBonus) shouldDoMaps = true; } //Go into maps on (30) stacks on Improbability (boss), farm until we fall under (10) H:D ratio - if (game.global.gridArray[99].nomStacks == customVars.NomFarmStacksCutoff[1]){ + if (game.global.gridArray[99].nomStacks == customVars.NomFarmStacksCutoff[1]) { shouldFarm = (HDratio > customVars.NomfarmingCutoff); shouldDoMaps = true; } //If we ever hit (100) nomstacks in the world, farm. - if(!game.global.mapsActive && game.global.gridArray[game.global.lastClearedCell + 1].nomStacks >= customVars.NomFarmStacksCutoff[2]) { + if (!game.global.mapsActive && game.global.gridArray[game.global.lastClearedCell + 1].nomStacks >= customVars.NomFarmStacksCutoff[2]) { shouldFarm = (HDratio > customVars.NomfarmingCutoff); shouldDoMaps = true; } //If we ever hit (100) nomstacks in a map (likely a voidmap), farm, (exit the voidmap and prevent void from running, until situation is clear) - if(game.global.mapsActive && game.global.mapGridArray[game.global.lastClearedMapCell + 1].nomStacks >= customVars.NomFarmStacksCutoff[2]) { + if (game.global.mapsActive && game.global.mapGridArray[game.global.lastClearedMapCell + 1].nomStacks >= customVars.NomFarmStacksCutoff[2]) { shouldFarm = (HDratio > customVars.NomfarmingCutoff); shouldDoMaps = true; restartVoidMap = true; @@ -306,14 +308,13 @@ function autoMap() { var prestigeitemsleft; if (game.global.mapsActive) { prestigeitemsleft = addSpecials(true, true, getCurrentMapObject()); - } - else if (lastMapWeWereIn) { + } else if (lastMapWeWereIn) { prestigeitemsleft = addSpecials(true, true, lastMapWeWereIn); } //check if we have unbought+available prestiges - var prestigeList = ['Dagadder','Megamace','Polierarm','Axeidic','Greatersword','Harmbalest']; + var prestigeList = ['Dagadder', 'Megamace', 'Polierarm', 'Axeidic', 'Greatersword', 'Harmbalest']; var numUnbought = 0; - for (var i=0,len=prestigeList.length; i < len; i++) { + for (var i = 0, len = prestigeList.length; i < len; i++) { var p = prestigeList[i]; if (game.upgrades[p].allowed - game.upgrades[p].done > 0) numUnbought++; @@ -327,24 +328,23 @@ function autoMap() { } //stack tox stacks if we are doing max tox, or if we need to clear our void maps - if(game.global.challengeActive == 'Toxicity' && game.global.lastClearedCell > 93 && game.challenges.Toxicity.stacks < 1500 && ((getPageSetting('MaxTox') && game.global.world > 59) || needToVoid)) { + if (game.global.challengeActive == 'Toxicity' && game.global.lastClearedCell > 93 && game.challenges.Toxicity.stacks < 1500 && ((getPageSetting('MaxTox') && game.global.world > 59) || needToVoid)) { shouldDoMaps = true; //we will get at least 85 toxstacks from the 1st voidmap (unless we have overkill) -// if (!game.portal.Overkill.locked && game.stats.cellsOverkilled.value) + // if (!game.portal.Overkill.locked && game.stats.cellsOverkilled.value) stackingTox = !(needToVoid && game.challenges.Toxicity.stacks > 1415); //force abandon army - if(!game.global.mapsActive && !game.global.preMapsActive) { + if (!game.global.mapsActive && !game.global.preMapsActive) { mapsClicked(); mapsClicked(); } - } - else stackingTox = false; + } else stackingTox = false; //during 'watch' challenge, run maps on these levels: var watchmaps = customVars.watchChallengeMaps; var shouldDoWatchMaps = false; - if (game.global.challengeActive == 'Watch' && watchmaps.indexOf(game.global.world) > -1 && game.global.mapBonus < 1){ + if (game.global.challengeActive == 'Watch' && watchmaps.indexOf(game.global.world) > -1 && game.global.mapBonus < 1) { shouldDoMaps = true; shouldDoWatchMaps = true; } @@ -361,8 +361,8 @@ function autoMap() { // but not when 3A. home detector is purchased, or 3B. we don't need nurseries if (game.buildings.Nursery.locked && game.talents.blacksmith.purchased && !(game.talents.housing.purchased || (getPageSetting('PreSpireNurseries') < 0 ? - !(getPageSetting('MaxNursery') && game.global.world >= getPageSetting('NoNurseriesUntil')) : - !getPageSetting('PreSpireNurseries'))) && game.global.world >= customVars.NurseryMapLevel) { + !(getPageSetting('MaxNursery') && game.global.world >= getPageSetting('NoNurseriesUntil')) : + !getPageSetting('PreSpireNurseries'))) && game.global.world >= customVars.NurseryMapLevel) { shouldDoMaps = true; shouldDoWatchMaps = true; //TODO coding: this is overloaded - not ideal. } @@ -381,18 +381,18 @@ function autoMap() { //Lower Farming Zone = Lowers the zone used during Farming mode. Starts 10 zones below current and Finds the minimum map level you can successfully one-shot var siphlvl = shouldFarmLowerZone ? game.global.world - 10 : game.global.world - game.portal.Siphonology.level; var maxlvl = game.talents.mapLoot.purchased ? game.global.world - 1 : game.global.world; - maxlvl += extraMapLevels; // extraMapLevels : advanced slider - if (getPageSetting('DynamicSiphonology') || shouldFarmLowerZone){ + maxlvl += extraMapLevels; // extraMapLevels : advanced slider + if (getPageSetting('DynamicSiphonology') || shouldFarmLowerZone) { for (siphlvl; siphlvl < maxlvl; siphlvl++) { //check HP vs damage and find how many siphonology levels we need. - var maphp = getEnemyMaxHealth(siphlvl) * 1.1; // 1.1 mod is for all maps (taken out of the function) - var cpthlth = getCorruptScale("health")/2; //get corrupted health mod + var maphp = getEnemyMaxHealth(siphlvl) * 1.1; // 1.1 mod is for all maps (taken out of the function) + var cpthlth = getCorruptScale("health") / 2; //get corrupted health mod if (mutations.Magma.active()) maphp *= cpthlth; - var mapdmg = ourBaseDamage2 * (game.unlocks.imps.Titimp ? 2 : 1); // *2 for titimp. (ourBaseDamage2 has no mapbonus in it) + var mapdmg = ourBaseDamage2 * (game.unlocks.imps.Titimp ? 2 : 1); // *2 for titimp. (ourBaseDamage2 has no mapbonus in it) if (game.upgrades.Dominance.done && !getPageSetting('ScryerUseinMaps2')) - mapdmg*=4; //dominance stance and not-scryer stance in maps. - if (mapdmg < maphp){ + mapdmg *= 4; //dominance stance and not-scryer stance in maps. + if (mapdmg < maphp) { break; } } @@ -403,7 +403,7 @@ function autoMap() { if (!game.global.mapsOwnedArray[map].noRecycle) { obj[map] = game.global.mapsOwnedArray[map].level; //Get matching map for our siphonology level - if(game.global.mapsOwnedArray[map].level == siphlvl) + if (game.global.mapsOwnedArray[map].level == siphlvl) siphonMap = map; } } @@ -419,86 +419,96 @@ function autoMap() { selectedMap = "create"; //Look through all the maps we have and figure out, find and Run Uniques if we need to - var runUniques = (getPageSetting('AutoMaps')==1); + var runUniques = (getPageSetting('AutoMaps') == 1); if (runUniques) { - for (var map in game.global.mapsOwnedArray) { - var theMap = game.global.mapsOwnedArray[map]; - if (theMap.noRecycle) { - if (theMap.name == 'The Wall' && game.upgrades.Bounty.allowed == 0 && !game.talents.bounty.purchased) { - var theMapDifficulty = Math.ceil(theMap.difficulty / 2); - if(game.global.world < 15 + theMapDifficulty) continue; - selectedMap = theMap.id; - break; - } - if (theMap.name == 'Dimension of Anger' && document.getElementById("portalBtn").style.display == "none" && !game.talents.portal.purchased) { - var theMapDifficulty = Math.ceil(theMap.difficulty / 2); - if(game.global.world < 20 + theMapDifficulty) continue; - selectedMap = theMap.id; - break; - } - var dont = game.global.runningChallengeSquared; - if(theMap.name == 'The Block' && !game.upgrades.Shieldblock.allowed && ((game.global.challengeActive == "Scientist" || game.global.challengeActive == "Trimp") && !dont || getPageSetting('BuyShieldblock'))) { - var theMapDifficulty = Math.ceil(theMap.difficulty / 2); - if(game.global.world < 11 + theMapDifficulty) continue; - selectedMap = theMap.id; - break; - } - var treasure = getPageSetting('TrimpleZ'); - if (theMap.name == 'Trimple Of Doom' && (!dont && (game.global.challengeActive == "Meditate" || game.global.challengeActive == "Trapper") && game.mapUnlocks.AncientTreasure.canRunOnce && game.global.world >= treasure)) { - var theMapDifficulty = Math.ceil(theMap.difficulty / 2); - if ((game.global.world < 33 + theMapDifficulty) || treasure > -33 && treasure < 33) continue; - selectedMap = theMap.id; - if (treasure < 0) // need to reset - setPageSetting('TrimpleZ', 0); - break; - } - if (!dont) { - //run the prison only if we are 'cleared' to run level 80 + 1 level per 200% difficulty. Could do more accurate calc if needed - if(theMap.name == 'The Prison' && (game.global.challengeActive == "Electricity" || game.global.challengeActive == "Mapocalypse")) { - var theMapDifficulty = Math.ceil(theMap.difficulty / 2); - if(game.global.world < 80 + theMapDifficulty) continue; - selectedMap = theMap.id; - break; - } - if(theMap.name == 'Bionic Wonderland' && game.global.challengeActive == "Crushed" ) { - var theMapDifficulty = Math.ceil(theMap.difficulty / 2); - if(game.global.world < 125 + theMapDifficulty) continue; - selectedMap = theMap.id; - break; - } - } - //Bionic Before Spire - mandates preReq of UniqueMaps. run Bionics before spire to farm. - if (getPageSetting('RunBionicBeforeSpire') && (game.global.world == 200) && theMap.name.includes('Bionic Wonderland')){ - //this is how to check if a bionic is green or not. - var bionicnumber = 1 + ((theMap.level - 125) / 15); - //if numbers match, map is green, so run it. (do the pre-requisite bionics one at a time in order) - if (bionicnumber == game.global.bionicOwned && bionicnumber < 6){ - selectedMap = theMap.id; - break; - } - if (shouldDoSpireMaps && theMap.name == 'Bionic Wonderland VI'){ - selectedMap = theMap.id; - break; - } - } //TODO Spire II+?? - //other unique maps here - } - } + for (var map in game.global.mapsOwnedArray) { + var theMap = game.global.mapsOwnedArray[map]; + if (theMap.noRecycle) { + if (theMap.name == 'The Wall' && game.upgrades.Bounty.allowed == 0 && !game.talents.bounty.purchased) { + var theMapDifficulty = Math.ceil(theMap.difficulty / 2); + if (game.global.world < 15 + theMapDifficulty) continue; + selectedMap = theMap.id; + break; + } + if (theMap.name == 'Dimension of Anger' && document.getElementById("portalBtn").style.display == "none" && !game.talents.portal.purchased) { + var theMapDifficulty = Math.ceil(theMap.difficulty / 2); + if (game.global.world < 20 + theMapDifficulty) continue; + selectedMap = theMap.id; + break; + } + var dont = game.global.runningChallengeSquared; + if (theMap.name == 'The Block' && !game.upgrades.Shieldblock.allowed && ((game.global.challengeActive == "Scientist" || game.global.challengeActive == "Trimp") && !dont || getPageSetting('BuyShieldblock'))) { + var theMapDifficulty = Math.ceil(theMap.difficulty / 2); + if (game.global.world < 11 + theMapDifficulty) continue; + selectedMap = theMap.id; + break; + } + var treasure = getPageSetting('TrimpleZ'); + if (theMap.name == 'Trimple Of Doom' && (!dont && (game.global.challengeActive == "Meditate" || game.global.challengeActive == "Trapper") && game.mapUnlocks.AncientTreasure.canRunOnce && game.global.world >= treasure)) { + var theMapDifficulty = Math.ceil(theMap.difficulty / 2); + if ((game.global.world < 33 + theMapDifficulty) || treasure > -33 && treasure < 33) continue; + selectedMap = theMap.id; + if (treasure < 0) // need to reset + setPageSetting('TrimpleZ', 0); + break; + } + if (!dont) { + //run the prison only if we are 'cleared' to run level 80 + 1 level per 200% difficulty. Could do more accurate calc if needed + if (theMap.name == 'The Prison' && (game.global.challengeActive == "Electricity" || game.global.challengeActive == "Mapocalypse")) { + var theMapDifficulty = Math.ceil(theMap.difficulty / 2); + if (game.global.world < 80 + theMapDifficulty) continue; + selectedMap = theMap.id; + break; + } + if (theMap.name == 'Bionic Wonderland' && game.global.challengeActive == "Crushed") { + var theMapDifficulty = Math.ceil(theMap.difficulty / 2); + if (game.global.world < 125 + theMapDifficulty) continue; + selectedMap = theMap.id; + break; + } + } + //Bionic Before Spire - mandates preReq of UniqueMaps. run Bionics before spire to farm. + if (getPageSetting('RunBionicBeforeSpire') && (game.global.world == 200) && theMap.name.includes('Bionic Wonderland')) { + //this is how to check if a bionic is green or not. + var bionicnumber = 1 + ((theMap.level - 125) / 15); + //if numbers match, map is green, so run it. (do the pre-requisite bionics one at a time in order) + if (bionicnumber == game.global.bionicOwned && bionicnumber < 6) { + selectedMap = theMap.id; + break; + } + if (shouldDoSpireMaps && theMap.name == 'Bionic Wonderland VI') { + selectedMap = theMap.id; + break; + } + } //TODO Spire II+?? + //other unique maps here + } + } } -//VOIDMAPS: + //VOIDMAPS: //Only proceed if we needToVoid right now. if (needToVoid) { //voidArray: make an array with all our voidmaps, so we can sort them by real-world difficulty level var voidArray = []; //values are easiest to hardest. (hardest has the highest value) - var prefixlist = {'Deadly':10, 'Heinous':11, 'Poisonous':20, 'Destructive':30}; + var prefixlist = { + 'Deadly': 10, + 'Heinous': 11, + 'Poisonous': 20, + 'Destructive': 30 + }; var prefixkeys = Object.keys(prefixlist); - var suffixlist = {'Descent':7.077, 'Void':8.822, 'Nightmare':9.436, 'Pit':10.6}; + var suffixlist = { + 'Descent': 7.077, + 'Void': 8.822, + 'Nightmare': 9.436, + 'Pit': 10.6 + }; var suffixkeys = Object.keys(suffixlist); for (var map in game.global.mapsOwnedArray) { var theMap = game.global.mapsOwnedArray[map]; - if(theMap.location == 'Void') { + if (theMap.location == 'Void') { for (var pre in prefixkeys) { if (theMap.name.includes(prefixkeys[pre])) theMap.sortByDiff = 1 * prefixlist[prefixkeys[pre]]; @@ -517,7 +527,7 @@ function autoMap() { for (var map in voidArraySorted) { var theMap = voidArraySorted[map]; //if we are on toxicity, don't clear until we will have max stacks at the last cell. - if(game.global.challengeActive == 'Toxicity' && game.challenges.Toxicity.stacks < (1500 - theMap.size)) break; + if (game.global.challengeActive == 'Toxicity' && game.challenges.Toxicity.stacks < (1500 - theMap.size)) break; doVoids = true; //check to make sure we won't get 1-shot in nostance by boss var eAttack = getEnemyMaxAttack(game.global.world, theMap.size, 'Voidsnimp', theMap.difficulty); @@ -526,44 +536,43 @@ function autoMap() { //TODO: Account for magmated voidmaps. (not /2) //TODO: Account for daily. var ourHealth = baseHealth; - if(game.global.challengeActive == 'Balance') { + if (game.global.challengeActive == 'Balance') { var stacks = game.challenges.Balance.balanceStacks ? (game.challenges.Balance.balanceStacks > theMap.size) ? theMap.size : game.challenges.Balance.balanceStacks : false; eAttack *= 2; - if(stacks) { - for (i = 0; i < stacks; i++ ) { + if (stacks) { + for (i = 0; i < stacks; i++) { ourHealth *= 1.01; } } } - if(game.global.challengeActive == 'Toxicity') eAttack *= 5; + if (game.global.challengeActive == 'Toxicity') eAttack *= 5; //break to prevent finishing map to finish a challenge? //continue to check for doable map? var diff = parseInt(getPageSetting('VoidCheck')) > 0 ? parseInt(getPageSetting('VoidCheck')) : 2; - var ourBlock = getBattleStats("block", true); //use block tooltip (after death block) instead of current army block. - if(ourHealth/diff < eAttack - ourBlock) { + var ourBlock = getBattleStats("block", true); //use block tooltip (after death block) instead of current army block. + if (ourHealth / diff < eAttack - ourBlock) { shouldFarm = true; - voidCheckPercent = Math.round((ourHealth/diff)/(eAttack-ourBlock)*100); - abandonVoidMap(); //exit/restart if below <95% health, we have ForceAbandon on, and its not due to randomly losing anti stacks + voidCheckPercent = Math.round((ourHealth / diff) / (eAttack - ourBlock) * 100); + abandonVoidMap(); //exit/restart if below <95% health, we have ForceAbandon on, and its not due to randomly losing anti stacks break; - } - else { + } else { voidCheckPercent = 0; - if(getPageSetting('DisableFarm')) + if (getPageSetting('DisableFarm')) shouldFarm = shouldFarm || false; } //only go into the voidmap if we need to. if (!restartVoidMap) selectedMap = theMap.id; //Restart the voidmap if we hit (100) nomstacks on the final boss - if(game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.challengeActive == "Nom" && getPageSetting('FarmWhenNomStacks7')) { - if(game.global.mapGridArray[theMap.size-1].nomStacks >= customVars.NomFarmStacksCutoff[2]) { + if (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.challengeActive == "Nom" && getPageSetting('FarmWhenNomStacks7')) { + if (game.global.mapGridArray[theMap.size - 1].nomStacks >= customVars.NomFarmStacksCutoff[2]) { mapsClicked(true); } } break; } } -//MAPS CREATION pt1: + //MAPS CREATION pt1: //map if we don't have health/dmg or we need to clear void maps or if we are prestige mapping, and our set item has a new prestige available if (shouldDoMaps || doVoids || needPrestige) { //selectedMap = world here if we haven't set it to create yet, meaning we found appropriate high level map, or siphon map @@ -575,13 +584,13 @@ function autoMap() { selectedMap = game.global.mapsOwnedArray[highestMap].id; else selectedMap = "create"; - //if needPrestige, TRY to find current level map as the highest level map we own. + //if needPrestige, TRY to find current level map as the highest level map we own. } else if (needPrestige || (extraMapLevels > 0)) { if ((game.global.world + extraMapLevels) == game.global.mapsOwnedArray[highestMap].level) selectedMap = game.global.mapsOwnedArray[highestMap].id; else selectedMap = "create"; - //if shouldFarm is true, use a siphonology adjusted map, as long as we aren't trying to prestige + //if shouldFarm is true, use a siphonology adjusted map, as long as we aren't trying to prestige } else if (siphonMap != -1) selectedMap = game.global.mapsOwnedArray[siphonMap].id; //if we dont' have an appropriate max level map, or a siphon map, we need to make one @@ -590,21 +599,21 @@ function autoMap() { } //if selectedMap != world, it already has a map ID and will be run below } -//LEAD EVEN ZONE EXIT + //LEAD EVEN ZONE EXIT //don't map on even worlds if on Lead Challenge, except if person is dumb and wants to void on even - if((game.global.challengeActive == 'Lead' && !challSQ) && !doVoids && (game.global.world % 2 == 0 || game.global.lastClearedCell < customVars.shouldFarmCell)) { - if(game.global.preMapsActive) + if ((game.global.challengeActive == 'Lead' && !challSQ) && !doVoids && (game.global.world % 2 == 0 || game.global.lastClearedCell < customVars.shouldFarmCell)) { + if (game.global.preMapsActive) mapsClicked(); return; //exit } -//REPEAT BUTTON: + //REPEAT BUTTON: //Repeat Button Management (inside a map): if (!game.global.preMapsActive && game.global.mapsActive) { //Set the repeatBionics flag (farm bionics before spire), for the repeat button management code. var repeatBionics = getPageSetting('RunBionicBeforeSpire') && game.global.bionicOwned >= 6; //if we are doing the right map, and it's not a norecycle (unique) map, and we aren't going to hit max map bonus //or repeatbionics is true and there are still prestige items available to get - var doDefaultMapBonus = game.global.mapBonus < customVars.maxMapBonus-1; + var doDefaultMapBonus = game.global.mapBonus < customVars.maxMapBonus - 1; if (selectedMap == game.global.currentMapId && (!getCurrentMapObject().noRecycle && (doDefaultMapBonus || vanillaMapatZone || doMaxMapBonus || shouldFarm || stackingTox || needPrestige || shouldDoSpireMaps) || repeatBionics)) { var targetPrestige = autoTrimpSettings.Prestige.selected; //make sure repeat map is on @@ -612,11 +621,11 @@ function autoMap() { repeatClicked(); } //if we aren't here for dmg/hp, and we see the prestige we are after on the last cell of this map, and it's the last one available, turn off repeat to avoid an extra map cycle - if (!shouldDoMaps && (game.global.mapGridArray[game.global.mapGridArray.length - 1].special == targetPrestige && game.mapUnlocks[targetPrestige].last >= (game.global.world+extraMapLevels - 9 ))) { + if (!shouldDoMaps && (game.global.mapGridArray[game.global.mapGridArray.length - 1].special == targetPrestige && game.mapUnlocks[targetPrestige].last >= (game.global.world + extraMapLevels - 9))) { repeatClicked(); } //avoid another map cycle due to having the amount of tox stacks we need. - if (stackingTox && (game.challenges.Toxicity.stacks + game.global.mapGridArray.length - (game.global.lastClearedMapCell + 1) >= 1500)){ + if (stackingTox && (game.challenges.Toxicity.stacks + game.global.mapGridArray.length - (game.global.lastClearedMapCell + 1) >= 1500)) { repeatClicked(); } //turn off repeat maps if we doing Watch maps. @@ -641,31 +650,30 @@ function autoMap() { mapsClicked(true); } } -//FORCE EXIT WORLD->MAPS - //clicks the maps button, once or twice (inside the world): + //FORCE EXIT WORLD->MAPS + //clicks the maps button, once or twice (inside the world): } else if (!game.global.preMapsActive && !game.global.mapsActive) { if (selectedMap != "world") { //if we should not be in the world, and the button is not already clicked, click map button once (and wait patiently until death) - if (!game.global.switchToMaps){ + if (!game.global.switchToMaps) { mapsClicked(); } //Get Impatient/Abandon if: (need prestige / _NEED_ to do void maps / on lead in odd world.) AND (a new army is ready, OR _need_ to void map OR lead farming and we're almost done with the zone) (handle shouldDoWatchMaps elsewhere below) if ((!getPageSetting('PowerSaving') || (getPageSetting('PowerSaving') == 2) && doVoids) && game.global.switchToMaps && !shouldDoWatchMaps && (needPrestige || doVoids || - ((game.global.challengeActive == 'Lead' && !challSQ) && game.global.world % 2 == 1) || - (!enoughDamage && enoughHealth && game.global.lastClearedCell < 9) || - (shouldFarm && game.global.lastClearedCell >= customVars.shouldFarmCell) || - (scryerStuck)) - && - ( - (game.resources.trimps.realMax() <= game.resources.trimps.owned + 1) - || ((game.global.challengeActive == 'Lead' && !challSQ) && game.global.lastClearedCell > 93) - || (doVoids && game.global.lastClearedCell > 93) - ) - ){ + ((game.global.challengeActive == 'Lead' && !challSQ) && game.global.world % 2 == 1) || + (!enoughDamage && enoughHealth && game.global.lastClearedCell < 9) || + (shouldFarm && game.global.lastClearedCell >= customVars.shouldFarmCell) || + (scryerStuck)) && + ( + (game.resources.trimps.realMax() <= game.resources.trimps.owned + 1) || + ((game.global.challengeActive == 'Lead' && !challSQ) && game.global.lastClearedCell > 93) || + (doVoids && game.global.lastClearedCell > 93) + ) + ) { //output stuck message if (scryerStuck) { - debug("Got perma-stuck on cell " + (game.global.lastClearedCell+2) + " during scryer stance. Are your scryer settings correct? Entering map to farm to fix it."); + debug("Got perma-stuck on cell " + (game.global.lastClearedCell + 2) + " during scryer stance. Are your scryer settings correct? Entering map to farm to fix it."); } mapsClicked(); } @@ -674,19 +682,18 @@ function autoMap() { if (shouldDoWatchMaps) { mapsClicked(); } -//MAPS CREATION pt2: + //MAPS CREATION pt2: } else if (game.global.preMapsActive) { if (selectedMap == "world") { - mapsClicked(); //go back - } - else if (selectedMap == "create") { + mapsClicked(); //go back + } else if (selectedMap == "create") { var $mapLevelInput = document.getElementById("mapLevelInput"); $mapLevelInput.value = needPrestige ? game.global.world : siphlvl; //choose spire level 199 or 200 if (preSpireFarming && MODULES["maps"].SpireFarm199Maps) $mapLevelInput.value = game.talents.mapLoot.purchased ? game.global.world - 1 : game.global.world; - var decrement; //['size','diff','loot'] - var tier; //taken from MODULES vars at the top of this file. + var decrement; //['size','diff','loot'] + var tier; //taken from MODULES vars at the top of this file. //instead of normal map locations, use Plentiful (Gardens) if the Decay challenge has been completed. (for +25% better loot) var useGardens = (customVars.preferGardens && game.global.decayDone); if (game.global.world >= customVars.MapTierZone[0]) { @@ -704,7 +711,7 @@ function autoMap() { } else { //Zone 6-16 (old: 9/0/0 Random): tier = customVars.MapTier3Sliders; - decrement = ['diff','loot']; + decrement = ['diff', 'loot']; } //NEW: start all maps off on 9/9/9 sliders and decrement from there. sizeAdvMapsRange.value = tier[0]; @@ -717,7 +724,7 @@ function autoMap() { //recalculate cost. updateMapCost(); //if we are "Farming" for resources, make sure it's Plentiful OR metal (and always aim for lowest difficulty) - if(shouldFarm || !enoughDamage || !enoughHealth || game.global.challengeActive == 'Metal') { + if (shouldFarm || !enoughDamage || !enoughHealth || game.global.challengeActive == 'Metal') { biomeAdvMapsSelect.value = useGardens ? "Plentiful" : "Mountain"; updateMapCost(); } @@ -727,7 +734,7 @@ function autoMap() { if (shouldFarm) decrement.push('size'); } - //Decrement 1 - use priorities first: + //Decrement 1 - use priorities first: //if we STILL cant afford the map, lower the loot slider (less loot) while (decrement.indexOf('loot') > -1 && lootAdvMapsRange.value > 0 && updateMapCost(true) > game.resources.fragments.owned) { lootAdvMapsRange.value -= 1; @@ -742,7 +749,7 @@ function autoMap() { while (decrement.indexOf('size') > -1 && sizeAdvMapsRange.value > 0 && updateMapCost(true) > game.resources.fragments.owned) { sizeAdvMapsRange.value -= 1; } - //Decrement 2 - if its still too expensive: + //Decrement 2 - if its still too expensive: //if we STILL cant afford the map, lower the loot slider (less loot) while (lootAdvMapsRange.value > 0 && updateMapCost(true) > game.resources.fragments.owned) { lootAdvMapsRange.value -= 1; @@ -758,31 +765,31 @@ function autoMap() { sizeAdvMapsRange.value -= 1; } - //run the Advanced Special Modifier script, bring + //run the Advanced Special Modifier script, bring if (getPageSetting('AdvMapSpecialModifier')) testMapSpecialModController(); - //if we can't afford the map we designed, pick our highest existing map - //TODO Debug Output the mods we made. + //if we can't afford the map we designed, pick our highest existing map + //TODO Debug Output the mods we made. var maplvlpicked = parseInt($mapLevelInput.value) + (getPageSetting('AdvMapSpecialModifier') ? getExtraMapLevels() : 0); if (updateMapCost(true) > game.resources.fragments.owned) { selectMap(game.global.mapsOwnedArray[highestMap].id); - debug("Can't afford the map we designed, #" + maplvlpicked , "maps", '*crying2'); + debug("Can't afford the map we designed, #" + maplvlpicked, "maps", '*crying2'); debug("...selected our highest map instead # " + game.global.mapsOwnedArray[highestMap].id + " Level: " + game.global.mapsOwnedArray[highestMap].level, "maps", '*happy2'); runMap(); lastMapWeWereIn = getCurrentMapObject(); - //if we can afford it, buy it and run it: + //if we can afford it, buy it and run it: } else { debug("Buying a Map, level: #" + maplvlpicked, "maps", 'th-large'); var result = buyMap(); - if(result == -2){ + if (result == -2) { debug("Too many maps, recycling now: ", "maps", 'th-large'); recycleBelow(true); debug("Retrying, Buying a Map, level: #" + maplvlpicked, "maps", 'th-large'); buyMap(); } } - //if we already have a map picked, run it + //if we already have a map picked, run it } else { selectMap(selectedMap); var themapobj = game.global.mapsOwnedArray[getMapIndex(selectedMap)]; @@ -800,17 +807,16 @@ function updateAutoMapsStatus(get) { //automaps status var status; var minSp = getPageSetting('MinutestoFarmBeforeSpire'); - if(getPageSetting('AutoMaps') == 0) status = 'Off'; + if (getPageSetting('AutoMaps') == 0) status = 'Off'; else if (game.global.challengeActive == "Mapology" && game.challenges.Mapology.credits < 1) status = 'Out of Map Credits'; else if (preSpireFarming) { - var secs = Math.floor(60 - (spireTime*60)%60).toFixed(0) + var secs = Math.floor(60 - (spireTime * 60) % 60).toFixed(0) var mins = Math.floor(minSp - spireTime).toFixed(0); var hours = minSp - (spireTime / 60).toFixed(2); - var spiretimeStr = (spireTime>=60) ? - (hours + 'h') : (mins + 'm:' + (secs>=10 ? secs : ('0'+secs)) + 's'); + var spiretimeStr = (spireTime >= 60) ? + (hours + 'h') : (mins + 'm:' + (secs >= 10 ? secs : ('0' + secs)) + 's'); status = 'Farming for Spire ' + spiretimeStr + ' left'; - } - else if (spireMapBonusFarming) status = 'Getting Spire Map Bonus'; + } else if (spireMapBonusFarming) status = 'Getting Spire Map Bonus'; else if (doMaxMapBonus) status = 'Max Map Bonus After Zone'; else if (!game.global.mapsUnlocked) status = ' '; else if (needPrestige && !doVoids) status = 'Prestige'; @@ -829,12 +835,12 @@ function updateAutoMapsStatus(get) { status += '
Prestige Skipped'; //hider he/hr% status - var getPercent = (game.stats.heliumHour.value() / (game.global.totalHeliumEarned - (game.global.heliumLeftover + game.resources.helium.owned)))*100; - var lifetime = (game.resources.helium.owned / (game.global.totalHeliumEarned-game.resources.helium.owned))*100; - var hiderStatus = 'He/hr: ' + getPercent.toFixed(3) + '%
   He: ' + lifetime.toFixed(3) +'%'; + var getPercent = (game.stats.heliumHour.value() / (game.global.totalHeliumEarned - (game.global.heliumLeftover + game.resources.helium.owned))) * 100; + var lifetime = (game.resources.helium.owned / (game.global.totalHeliumEarned - game.resources.helium.owned)) * 100; + var hiderStatus = 'He/hr: ' + getPercent.toFixed(3) + '%
   He: ' + lifetime.toFixed(3) + '%'; if (get) { - return [status,getPercent,lifetime]; + return [status, getPercent, lifetime]; } else { document.getElementById('autoMapStatus').innerHTML = status; document.getElementById('hiderStatus').innerHTML = hiderStatus; @@ -854,12 +860,13 @@ function updateAutoMapsStatus(get) { //Automaps: Map Special Modifier Selector Decider Magical Action Taker //TODO: a priority list? Which is more important, perfect slide, LMC or the +x value? -MODULES["maps"].advSpecialMapMod_numZones = 3; //The default amount of +x zones you try to skip and work backwards from there. (if its too hard you will fail the map there is no dmg check only cost yet) +MODULES["maps"].advSpecialMapMod_numZones = 3; //The default amount of +x zones you try to skip and work backwards from there. (if its too hard you will fail the map there is no dmg check only cost yet) var advExtraMapLevels = 0; + function testMapSpecialModController() { //var mapSpecialMods = ["Fast Attacks", "Large Cache", "Small Savory Cache", "Small Wooden Cache", "Small Metal Cache", "Prestigious", "Huge Cache", "Large Savory Cache", "Large Wooden Cache", "Large Metal Cache"]; - var mapSpecialMods=[]; - Object.keys(mapSpecialModifierConfig).forEach(function(key){ + var mapSpecialMods = []; + Object.keys(mapSpecialModifierConfig).forEach(function(key) { var elem = mapSpecialModifierConfig[key]; if ((game.global.highestLevelCleared + 1) >= elem.unlocksAt) mapSpecialMods.push(elem.name); @@ -873,36 +880,36 @@ function testMapSpecialModController() { return; if (game.global.highestLevelCleared >= 59) { if (needPrestige) - maxIndex=6; + maxIndex = 6; //Set the special mod to some max. $advSpecialMod.selectedIndex = maxIndex; if ($advSpecialMod.selectedIndex == 0) return; //Check Hyperspeed 2 or Fast Attacks if (!needPrestige && game.talents.hyperspeed2.purchased && (game.global.world > Math.floor((game.global.highestLevelCleared + 1) * 0.5))) - $advSpecialMod.selectedIndex=1; + $advSpecialMod.selectedIndex = 1; else if (needPrestige) - $advSpecialMod.selectedIndex=0; - if (game.global.mapExtraBonus != "fa" && $advSpecialMod.selectedIndex==1) ; + $advSpecialMod.selectedIndex = 0; + if (game.global.mapExtraBonus != "fa" && $advSpecialMod.selectedIndex == 1); //map frag cost is stored in: document.getElementById("mapCostFragmentCost").innerHTML var mc = updateMapCost(true); var my = game.resources.fragments.owned; - var pct = mc/my*100; + var pct = mc / my * 100; while ($advSpecialMod.selectedIndex > 0 && mc > my) { $advSpecialMod.selectedIndex -= 1; } var mc = updateMapCost(true); var my = game.resources.fragments.owned; - var pct = mc/my*100; + var pct = mc / my * 100; if ($advSpecialMod.value != "0") //if its 0 it fails { console.log("Set the map special modifier to: " + mapSpecialModifierConfig[$advSpecialMod.value].name + ". Cost: " + pct.toFixed(2) + "% of your fragments."); } //TODO: - var specialMod = getSpecialModifierSetting(); //either 0 or the abbreviation/property of mapSpecialModifierConfig - var perfectAllowed = (game.global.highestLevelCleared >= 109); //levels are 109 and 209 for Perfect sliders and Extra Levels - var perfectChecked = checkPerfectChecked(); //Perfect Checkboxes + var specialMod = getSpecialModifierSetting(); //either 0 or the abbreviation/property of mapSpecialModifierConfig + var perfectAllowed = (game.global.highestLevelCleared >= 109); //levels are 109 and 209 for Perfect sliders and Extra Levels + var perfectChecked = checkPerfectChecked(); //Perfect Checkboxes var $advPerfect = document.getElementById('advPerfectCheckbox'); - var extraMapLevels = getPageSetting('AdvMapSpecialModifier') ? getExtraMapLevels() : 0; //Extra Levels + var extraMapLevels = getPageSetting('AdvMapSpecialModifier') ? getExtraMapLevels() : 0; //Extra Levels //Set the extra level to max ( 3 ) var extraAllowed = (game.global.highestLevelCleared >= 209); @@ -912,7 +919,7 @@ function testMapSpecialModController() { return; var maplvlpicked = document.getElementById("mapLevelInput").value; if (maplvlpicked == game.global.world) //then the +x zones dropdown is open. - $advExtraLevel.selectedIndex=MODULES["maps"].advSpecialMapMod_numZones; + $advExtraLevel.selectedIndex = MODULES["maps"].advSpecialMapMod_numZones; else $advExtraLevel.selectedIndex = 0; while ($advExtraLevel.selectedIndex > 0 && (updateMapCost(true) > game.resources.fragments.owned)) { @@ -924,7 +931,7 @@ function testMapSpecialModController() { function mapTimeEstimater() { //Check our graph history and - Estimate = The zone should take around this long in milliseconds. var thiszone = lookUpZoneData(game.global.world); - var lastzone = lookUpZoneData(game.global.world-1); + var lastzone = lookUpZoneData(game.global.world - 1); if (thiszone && lastzone) mapTimeEstimate = thiszone.currentTime - lastzone.currentTime; else From 84032592af661936953a7fb114a5042af4c52fdb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 7 Jun 2018 22:07:01 +0100 Subject: [PATCH 0313/3477] Update other.js --- modules/other.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index 3c6fd9a79..37c7eb353 100644 --- a/modules/other.js +++ b/modules/other.js @@ -170,7 +170,7 @@ function findLastBionic() { function Praiding() { if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { prestraidon = true; - if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { + if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 0; } debug("Beginning Prestige Raiding..."); @@ -182,11 +182,11 @@ function Praiding() { } if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid && !failpraid) { plusPres(); - if (buyMap() > 0) { + if (updateMapCost(true) => game.resources.fragments.owned) { buyMap(); failpraid = false; } - else if (buyMap() < 0) { + else if (updateMapCost(true) < game.resources.fragments.owned) { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { autoTrimpSettings["AutoMaps"].value = 1; failpraid = true; From 17fd6eeb8b7ec056160d3f965928d4ce968d9c6f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 7 Jun 2018 22:10:24 +0100 Subject: [PATCH 0314/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 37c7eb353..3596b4b6b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -182,11 +182,11 @@ function Praiding() { } if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid && !failpraid) { plusPres(); - if (updateMapCost(true) => game.resources.fragments.owned) { + if (updateMapCost >= game.resources.fragments.owned) { buyMap(); failpraid = false; } - else if (updateMapCost(true) < game.resources.fragments.owned) { + else if (updateMapCost < game.resources.fragments.owned) { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { autoTrimpSettings["AutoMaps"].value = 1; failpraid = true; From a5af59c46c2cc4a9d0c0e0776da609d37633620e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 7 Jun 2018 22:19:32 +0100 Subject: [PATCH 0315/3477] Update other.js --- modules/other.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 3596b4b6b..d39b52372 100644 --- a/modules/other.js +++ b/modules/other.js @@ -6,6 +6,7 @@ var bwraided = false; var failbwraid = false; var perked = false; var prestraidon = false; +var cost = updateMapCost(true); //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { //exit if the cooldown is active, or we havent unlocked robotrimp. @@ -182,11 +183,11 @@ function Praiding() { } if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid && !failpraid) { plusPres(); - if (updateMapCost >= game.resources.fragments.owned) { + if (cost >= game.resources.fragments.owned) { buyMap(); failpraid = false; } - else if (updateMapCost < game.resources.fragments.owned) { + else if (cost < game.resources.fragments.owned) { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { autoTrimpSettings["AutoMaps"].value = 1; failpraid = true; From 6209d8a8aea133ce82f6b7a3bb541d9bf19cfbcb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 7 Jun 2018 22:20:47 +0100 Subject: [PATCH 0316/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index d39b52372..f98dacf63 100644 --- a/modules/other.js +++ b/modules/other.js @@ -183,11 +183,11 @@ function Praiding() { } if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid && !failpraid) { plusPres(); - if (cost >= game.resources.fragments.owned) { + if (cost <= game.resources.fragments.owned) { buyMap(); failpraid = false; } - else if (cost < game.resources.fragments.owned) { + else if (cost > game.resources.fragments.owned) { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { autoTrimpSettings["AutoMaps"].value = 1; failpraid = true; From fb1f0a83efd976f775355ef2d13206f47da8ee6c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 7 Jun 2018 22:26:43 +0100 Subject: [PATCH 0317/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index f98dacf63..a12ce38ec 100644 --- a/modules/other.js +++ b/modules/other.js @@ -255,10 +255,10 @@ function BWraiding() { if (findLastBionic().level <= getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { runMap(); } - if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level > getPageSetting('BWraidingz')) { + if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level > getPageSetting('BWraidingz') && game.global.mapsActive) { repeatClicked(); } - else if (game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level <= getPageSetting('BWraidingz')) { + else if (game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level <= getPageSetting('BWraidingz') && game.global.mapsActive) { repeatClicked(); } if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { From ee75f215c8bea7f4aebe56bc82f41565151806f1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 7 Jun 2018 22:33:08 +0100 Subject: [PATCH 0318/3477] Update stance.js --- modules/stance.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index d2883ff2e..1f9a950ec 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -563,14 +563,10 @@ function autoStance3() { if (getPageSetting('AutoStance') == 0) return; if (!game.upgrades.Formations.done) return; - var windstackzone = getPageSetting('WindStackingMin') + var windstackzone = getPageSetting('WindStackingMin'); if(game.global.world>=80) { - if( getEmpowerment() != "Wind" - || game.global.mapsActive - || game.empowerments.Wind.currentDebuffPower==200 - || (windstackzone < 0) - || (windstackzone >= game.global.world)) { + if( getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200 || (windstackzone < 0) || (windstackzone >= game.global.world) || game.global.spireActive) { setFormation(2); return; } From e917f064dcdcca3df415318d21d961fb01eade39 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 8 Jun 2018 17:24:01 +0100 Subject: [PATCH 0319/3477] Update other.js --- modules/other.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index a12ce38ec..ffc5253d9 100644 --- a/modules/other.js +++ b/modules/other.js @@ -174,9 +174,9 @@ function Praiding() { if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 0; } - debug("Beginning Prestige Raiding..."); if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { mapsClicked(); + debug("Beginning Prestige Raiding..."); } if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { game.options.menu.repeatUntil.enabled = 2; @@ -191,12 +191,14 @@ function Praiding() { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { autoTrimpSettings["AutoMaps"].value = 1; failpraid = true; - prestraidon = false; + prestraidon = false; debug("Failed to prestige raid. Looks like you can't afford to.."); } return; } + } + if (cost <= game.resources.fragments.owned) { selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); } runMap(); From 36947051365f28351b8094cba409d2e542b1afdb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 8 Jun 2018 17:32:04 +0100 Subject: [PATCH 0320/3477] Update other.js --- modules/other.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/other.js b/modules/other.js index ffc5253d9..d691c96a9 100644 --- a/modules/other.js +++ b/modules/other.js @@ -7,6 +7,7 @@ var failbwraid = false; var perked = false; var prestraidon = false; var cost = updateMapCost(true); +var mapbought = true; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { //exit if the cooldown is active, or we havent unlocked robotrimp. @@ -169,8 +170,10 @@ function findLastBionic() { //Praiding function Praiding() { - if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { - prestraidon = true; + if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { + if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { + prestraidon = true; + } if (getPageSetting('AutoMaps') == 1 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 0; } @@ -186,19 +189,21 @@ function Praiding() { if (cost <= game.resources.fragments.owned) { buyMap(); failpraid = false; + mapbought = true; } else if (cost > game.resources.fragments.owned) { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { autoTrimpSettings["AutoMaps"].value = 1; failpraid = true; - prestraidon = false; + prestraidon = false; + mapbought = false; debug("Failed to prestige raid. Looks like you can't afford to.."); } return; } - } - if (cost <= game.resources.fragments.owned) { + } + if (mapbought == true) { selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); } runMap(); From cb4e42062cdc54f15f02b527a138e07f7aef50f9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 8 Jun 2018 17:42:14 +0100 Subject: [PATCH 0321/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index d691c96a9..97bd94ee5 100644 --- a/modules/other.js +++ b/modules/other.js @@ -6,7 +6,7 @@ var bwraided = false; var failbwraid = false; var perked = false; var prestraidon = false; -var cost = updateMapCost(true); +var cost = (updateMapCost(true)); var mapbought = true; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { From 102426ddc72dedfbe61f86a56eb0f7a24f2aaeb7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 9 Jun 2018 10:34:35 +0100 Subject: [PATCH 0322/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index c8008c7a8..78de7f45f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -431,7 +431,7 @@ function initializeAllSettings() { //Heirloom Settings - createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'Use Autoheirlooms 1. ', 'multitoggle', 0, null, 'Heirlooms'); + createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'Use Autoheirlooms 2. It will keep heirlooms on portal. ', 'multitoggle', 0, null, 'Heirlooms'); createSetting('AutoUpgradeHeirlooms', 'Auto Upgrade Heirlooms', 'Automatically buys the upgrades the script advises for the Equipped shield and staff, until we are out of nullifium.', 'boolean', false, null, 'Heirlooms'); //Golden Upgrade Strategies: From 9f09ce896a1e59bb91e0615b33536256e386d9f4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 9 Jun 2018 10:48:37 +0100 Subject: [PATCH 0323/3477] Update maps.js --- modules/maps.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/maps.js b/modules/maps.js index 8c8adba9f..2b45e9713 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -48,6 +48,7 @@ var spireMapBonusFarming = false; var spireTime = 0; var doMaxMapBonus = false; var vanillaMapatZone = false; +var additionalCritMulti = (getPlayerCritChance() > 2) ? 25 : 5; //AutoMap - function originally created by Belaith (in 1971) //anything/everything to do with maps. @@ -155,7 +156,12 @@ function autoMap() { //START CALCULATING DAMAGES: var AutoStance = getPageSetting('AutoStance'); //calculate crits (baseDamage was calced in function autoStance) this is a weighted average of nonCrit + Crit. (somewhere in the middle) + if (getPlayerCritChance() > 1) { + ourBaseDamage = (baseDamage * (1 - getPlayerCritChance()) + (baseDamage * getPlayerCritChance() * getPlayerCritDamageMult() * additionalCritMulti)); + } + else { ourBaseDamage = (baseDamage * (1 - getPlayerCritChance()) + (baseDamage * getPlayerCritChance() * getPlayerCritDamageMult())); + } //calculate with map bonus var mapbonusmulti = 1 + (0.20 * game.global.mapBonus); //(autostance2 has mapbonusmulti built in) From 6ef903002fceb8937ee04f53b09345174c628a37 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 9 Jun 2018 10:52:57 +0100 Subject: [PATCH 0324/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index f3975559e..5e4191679 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -172,7 +172,7 @@ function mainLoop() { if(getPageSetting('PauseScript') || game.options.menu.pauseGame.enabled || game.global.viewingUpgrades) return; ATrunning = true; if(game.options.menu.showFullBreed.enabled != 1) toggleSetting("showFullBreed"); //more detail - addbreedTimerInsideText.innerHTML = parseFloat(game.global.lastBreedTime/1000).toFixed(1) + 's'; //add hidden next group breed timer; + addbreedTimerInsideText.innerHTML = ((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) + 's'; //add breed time for next army; addToolTipToArmyCount(); //Add hidden tooltip for army count (SettingsGUI.js @ end) //Heirloom: if (mainCleanup() // Z1 new world From 545c0a7a53d3ad7b1a55f24044173dd02353708e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 9 Jun 2018 18:38:21 +0100 Subject: [PATCH 0325/3477] Update stance.js --- modules/stance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index 1f9a950ec..c4ea86ca7 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -2,7 +2,7 @@ function calcBaseDamageinX() { //baseDamage - baseDamage = game.global.soldierCurrentAttack * (1 + (game.global.achievementBonus / 100)) * ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1) * (1 + (game.global.roboTrimpLevel * 0.2)) * (1 + (game.global.totalSquaredReward / 100)) * (game.talents.stillRowing2.purchased ? (1 + (0.06 * game.global.spireRows)) : 1) * (game.talents.healthStrength.purchased ? (1 + (0.15 * mutations.Healthy.cellCount())) : 1) * (Fluffy.isActive() ? Fluffy.getDamageModifier() : 1) * (1 + (1 - game.empowerments.Ice.getCombatModifier())) * (game.talents.magmamancer.purchased ? game.jobs.Magmamancer.getBonusPercent() : 1); + baseDamage = game.global.soldierCurrentAttack * (1 + (game.global.achievementBonus / 100)) * ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1) * (1 + (game.global.roboTrimpLevel * 0.2)) * (1 + (game.global.totalSquaredReward / 100)) * (game.talents.stillRowing2.purchased ? (1 + (0.06 * game.global.spireRows)) : 1) * (game.talents.healthStrength.purchased ? (1 + (0.15 * mutations.Healthy.cellCount())) : 1) * (Fluffy.isActive() ? Fluffy.getDamageModifier() : 1) * (1 + (1 - game.empowerments.Ice.getCombatModifier())) * (game.talents.magmamancer.purchased ? game.jobs.Magmamancer.getBonusPercent() : 1) * (game.jobs.Amalgamator.owned > 0 ? game.jobs.Amalgamator.getDamageMult() : 1); if (game.global.challengeActive == "Daily"){ if (typeof game.global.dailyChallenge.weakness !== 'undefined'){ baseDamage *= dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); From c4ff6d66db6a4ddb6676e913884860ed4fbae599 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 9 Jun 2018 21:30:33 +0100 Subject: [PATCH 0326/3477] Update maps.js --- modules/maps.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index 2b45e9713..300edb94a 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -378,10 +378,12 @@ function autoMap() { if (doMaxMapBonus) shouldDoMaps = true; //Allow automaps to work with in-game Map at Zone option: - vanillaMapatZone = (game.options.menu.mapAtZone.enabled && game.options.menu.mapAtZone.setZone == game.global.world && !isActiveSpireAT()); + vanillaMapatZone = (game.options.menu.mapAtZone.enabled && game.global.canMapAtZone && !isActiveSpireAT()); if (vanillaMapatZone) - shouldDoMaps = true; - + for (var x = 0; x < game.options.menu.mapAtZone.setZone.length; x++){ + if (game.global.world == game.options.menu.mapAtZone.setZone[x]) + shouldDoMaps = true; + } //Dynamic Siphonology section (when necessary) //Lower Farming Zone = Lowers the zone used during Farming mode. Starts 10 zones below current and Finds the minimum map level you can successfully one-shot From d3ca5d6bda414c6e46f0b12fd9f47323e5c24b5a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 15:22:58 +0100 Subject: [PATCH 0327/3477] Update battlecalc.js --- modules/battlecalc.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index c8c6916e9..c305c6ca6 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -229,6 +229,12 @@ function getBattleStats(what,form,crit) { var amt = game.jobs.Amalgamator.getHealthMult(); currentCalc *= amt; } + if (what == "attack" && game.singleRunBonuses.sharpTrimps.owned) { + currentCalc *= 1.5; + } + if (game.jobs.Magmamancer.owend > 0) { + currentCalc *= game.jobs.Magmamancer.getBonusPercent(); + } if (crit) { var critChance = getPlayerCritChance(); if (what == "attack" && critChance){ @@ -303,6 +309,9 @@ function calcOurDmg(number,maxormin,disableStances,disableFlucts) { //number = b if (game.jobs.Amalgamator.owned > 0){ number *= game.jobs.Amalgamator.getHealthMult(); } + if (game.singleRunBonuses.sharpTrimps.owned) { + number *= 1.5; + } number *= (1 + (1 - game.empowerments.Ice.getCombatModifier())); if (game.global.challengeActive == "Daily"){ From 0becadcfa81e0ded5869d67b6bbfa324ebaa5414 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 15:27:09 +0100 Subject: [PATCH 0328/3477] Update stance.js --- modules/stance.js | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index c4ea86ca7..ccfda9345 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -2,21 +2,7 @@ function calcBaseDamageinX() { //baseDamage - baseDamage = game.global.soldierCurrentAttack * (1 + (game.global.achievementBonus / 100)) * ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1) * (1 + (game.global.roboTrimpLevel * 0.2)) * (1 + (game.global.totalSquaredReward / 100)) * (game.talents.stillRowing2.purchased ? (1 + (0.06 * game.global.spireRows)) : 1) * (game.talents.healthStrength.purchased ? (1 + (0.15 * mutations.Healthy.cellCount())) : 1) * (Fluffy.isActive() ? Fluffy.getDamageModifier() : 1) * (1 + (1 - game.empowerments.Ice.getCombatModifier())) * (game.talents.magmamancer.purchased ? game.jobs.Magmamancer.getBonusPercent() : 1) * (game.jobs.Amalgamator.owned > 0 ? game.jobs.Amalgamator.getDamageMult() : 1); - if (game.global.challengeActive == "Daily"){ - if (typeof game.global.dailyChallenge.weakness !== 'undefined'){ - baseDamage *= dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); - } - if (typeof game.global.dailyChallenge.oddTrimpNerf !== 'undefined' && ((game.global.world % 2) == 1)){ - baseDamage *= dailyModifiers.oddTrimpNerf.getMult(game.global.dailyChallenge.oddTrimpNerf.strength); - } - if (typeof game.global.dailyChallenge.evenTrimpBuff !== 'undefined' && ((game.global.world % 2) == 0)){ - baseDamage *= dailyModifiers.evenTrimpBuff.getMult(game.global.dailyChallenge.evenTrimpBuff.strength); - } - if (typeof game.global.dailyChallenge.rampage !== 'undefined'){ - baseDamage *= dailyModifiers.rampage.getMult(game.global.dailyChallenge.rampage.strength, game.global.dailyChallenge.rampage.stacks); - } - } + baseDamage = getBattleStats("attack", false, true); //baseBlock baseBlock = game.global.soldierCurrentBlock; //baseHealth @@ -47,7 +33,7 @@ function calcBaseDamageinX() { //goes to battlecalc.js which came from Trimps "updates.js" line 1103 function calcBaseDamageinX2() { //baseDamage - baseDamage = calcOurDmg(game.global.soldierCurrentAttack,false); + baseDamage = getBattleStats("attack", false, true); //baseBlock baseBlock = getBattleStats("block"); //baseHealth From 3e2e56bbfe7d702e807959de6ced29ddb81aa489 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 15:54:04 +0100 Subject: [PATCH 0329/3477] Create ATcalc.js --- modules/ATcalc.js | 100 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 modules/ATcalc.js diff --git a/modules/ATcalc.js b/modules/ATcalc.js new file mode 100644 index 000000000..b8dc2281b --- /dev/null +++ b/modules/ATcalc.js @@ -0,0 +1,100 @@ +var trimpATK = calculateDamageAT(game.global.soldierCurrentAttack, true, true); + +function calculateDamageAT(number, buildString, isTrimp, noCheckAchieve, cell) { //number = base attack + var fluctuation = .2; //%fluctuation + var maxFluct = -1; + var minFluct = -1; + if (isTrimp){ + //Situational Trimp damage increases + if (game.jobs.Amalgamator.owned > 0){ + number *= game.jobs.Amalgamator.getDamageMult(); + } + if (game.challenges.Electricity.stacks > 0) { //Electricity + number *= (1 - (game.challenges.Electricity.stacks * 0.1)); + } + if (game.global.antiStacks > 0) { + number *= ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1); + updateAntiStacks(); + } + if (!game.global.mapsActive && game.global.mapBonus > 0){ + number *= ((game.global.mapBonus * .2) + 1); + } + if (game.global.titimpLeft >= 1 && game.global.mapsActive){ + number *= 2; + } + if (game.global.achievementBonus > 0){ + number *= (1 + (game.global.achievementBonus / 100)); + } + if (game.global.challengeActive == "Discipline"){ + fluctuation = .995; + } + else if (game.portal.Range.level > 0){ + minFluct = fluctuation - (.02 * game.portal.Range.level); + } + if (game.global.challengeActive == "Decay"){ + number *= 5; + number *= Math.pow(0.995, game.challenges.Decay.stacks); + } + if (game.global.roboTrimpLevel > 0){ + number *= ((0.2 * game.global.roboTrimpLevel) + 1); + } + if (game.global.challengeActive == "Lead" && ((game.global.world % 2) == 1)){ + number *= 1.5; + } + if (game.goldenUpgrades.Battle.currentBonus > 0){ + number *= game.goldenUpgrades.Battle.currentBonus + 1; + } + if (game.talents.voidPower.purchased && game.global.voidBuff){ + var vpAmt = (game.talents.voidPower2.purchased) ? ((game.talents.voidPower3.purchased) ? 65 : 35) : 15; + number *= ((vpAmt / 100) + 1); + } + if (game.global.totalSquaredReward > 0){ + number *= ((game.global.totalSquaredReward / 100) + 1) + } + if (getEmpowerment() == "Ice"){ + number *= 1 + (1 - game.empowerments.Ice.getCombatModifier()); + } + if (game.talents.magmamancer.purchased){ + number *= game.jobs.Magmamancer.getBonusPercent(); + } + if (game.talents.stillRowing2.purchased){ + number *= ((game.global.spireRows * 0.06) + 1); + } + if (game.talents.healthStrength.purchased && mutations.Healthy.active()){ + number *= ((0.15 * mutations.Healthy.cellCount()) + 1); + } + if (game.global.sugarRush > 0){ + number *= sugarRush.getAttackStrength(); + } + if (game.global.challengeActive == "Life") { + number *= game.challenges.Life.getHealthMult(); + } + if (game.singleRunBonuses.sharpTrimps.owned){ + number *= 1.5; + } + if (game.global.challengeActive == "Daily"){ + if (typeof game.global.dailyChallenge.minDamage !== 'undefined'){ + if (minFluct == -1) minFluct = fluctuation; + minFluct += dailyModifiers.minDamage.getMult(game.global.dailyChallenge.minDamage.strength); + } + if (typeof game.global.dailyChallenge.maxDamage !== 'undefined'){ + if (maxFluct == -1) maxFluct = fluctuation; + maxFluct += dailyModifiers.maxDamage.getMult(game.global.dailyChallenge.maxDamage.strength); + } + if (typeof game.global.dailyChallenge.weakness !== 'undefined'){ + number *= dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); + } + if (typeof game.global.dailyChallenge.oddTrimpNerf !== 'undefined' && ((game.global.world % 2) == 1)){ + number *= dailyModifiers.oddTrimpNerf.getMult(game.global.dailyChallenge.oddTrimpNerf.strength); + } + if (typeof game.global.dailyChallenge.evenTrimpBuff !== 'undefined' && ((game.global.world % 2) == 0)){ + number *= dailyModifiers.evenTrimpBuff.getMult(game.global.dailyChallenge.evenTrimpBuff.strength); + } + if (typeof game.global.dailyChallenge.rampage !== 'undefined'){ + number *= dailyModifiers.rampage.getMult(game.global.dailyChallenge.rampage.strength, game.global.dailyChallenge.rampage.stacks); + } + } + if (Fluffy.isActive()){ + number *= Fluffy.getDamageModifier(); + } + From c6acc80bfb0f287d07b4b1576c39c1ea8aed687d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 15:55:42 +0100 Subject: [PATCH 0330/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 5e4191679..ec61d16b5 100644 --- a/AutoTrimps2.js +++ b/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', 'client-server', 'perks', /* 'perky', */ 'fight-info', 'performance', 'ATcalc']; for (var m in ATmoduleList) { ATscriptLoad(modulepath, ATmoduleList[m]); } From 4153d1ba25be70d5b4fe9fa7febc517628c35e65 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 15:59:33 +0100 Subject: [PATCH 0331/3477] Update ATcalc.js --- modules/ATcalc.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/ATcalc.js b/modules/ATcalc.js index b8dc2281b..a8f8e387a 100644 --- a/modules/ATcalc.js +++ b/modules/ATcalc.js @@ -49,7 +49,7 @@ function calculateDamageAT(number, buildString, isTrimp, noCheckAchieve, cell) { number *= ((vpAmt / 100) + 1); } if (game.global.totalSquaredReward > 0){ - number *= ((game.global.totalSquaredReward / 100) + 1) + number *= ((game.global.totalSquaredReward / 100) + 1); } if (getEmpowerment() == "Ice"){ number *= 1 + (1 - game.empowerments.Ice.getCombatModifier()); @@ -98,3 +98,5 @@ function calculateDamageAT(number, buildString, isTrimp, noCheckAchieve, cell) { number *= Fluffy.getDamageModifier(); } + } +} From cf59d9d296400ce2e95d4edd893a6dbb62779ffc Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 16:04:20 +0100 Subject: [PATCH 0332/3477] Update ATcalc.js --- modules/ATcalc.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/ATcalc.js b/modules/ATcalc.js index a8f8e387a..27236a671 100644 --- a/modules/ATcalc.js +++ b/modules/ATcalc.js @@ -1,10 +1,9 @@ -var trimpATK = calculateDamageAT(game.global.soldierCurrentAttack, true, true); +var trimpATK = (calculateDamageAT(game.global.soldierCurrentAttack)); -function calculateDamageAT(number, buildString, isTrimp, noCheckAchieve, cell) { //number = base attack +function calculateDamageAT(number) { //number = base attack var fluctuation = .2; //%fluctuation var maxFluct = -1; var minFluct = -1; - if (isTrimp){ //Situational Trimp damage increases if (game.jobs.Amalgamator.owned > 0){ number *= game.jobs.Amalgamator.getDamageMult(); @@ -99,4 +98,4 @@ function calculateDamageAT(number, buildString, isTrimp, noCheckAchieve, cell) { } } -} + From 10e36a68f788b6be30820427baa551d7942dd0b8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 16:06:53 +0100 Subject: [PATCH 0333/3477] Update ATcalc.js --- modules/ATcalc.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/ATcalc.js b/modules/ATcalc.js index 27236a671..aa0e8a91a 100644 --- a/modules/ATcalc.js +++ b/modules/ATcalc.js @@ -96,6 +96,8 @@ function calculateDamageAT(number) { //number = base attack if (Fluffy.isActive()){ number *= Fluffy.getDamageModifier(); } + else + return number; } From 3693999c954082f1ba241e45dd6e2981bef55dfb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 16:12:12 +0100 Subject: [PATCH 0334/3477] Update ATcalc.js --- modules/ATcalc.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ATcalc.js b/modules/ATcalc.js index aa0e8a91a..3774ffaec 100644 --- a/modules/ATcalc.js +++ b/modules/ATcalc.js @@ -1,7 +1,8 @@ var trimpATK = (calculateDamageAT(game.global.soldierCurrentAttack)); -function calculateDamageAT(number) { //number = base attack - var fluctuation = .2; //%fluctuation +function calculateDamageAT() { +var currentCalc = game.global.soldierCurrentAttack; +var fluctuation = .2; //%fluctuation var maxFluct = -1; var minFluct = -1; //Situational Trimp damage increases @@ -96,7 +97,6 @@ function calculateDamageAT(number) { //number = base attack if (Fluffy.isActive()){ number *= Fluffy.getDamageModifier(); } - else return number; } From 0ce675cab4b631aa9f39b6dc64f4dc390db4f925 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 16:12:31 +0100 Subject: [PATCH 0335/3477] Update ATcalc.js --- modules/ATcalc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ATcalc.js b/modules/ATcalc.js index 3774ffaec..4aea97844 100644 --- a/modules/ATcalc.js +++ b/modules/ATcalc.js @@ -1,4 +1,4 @@ -var trimpATK = (calculateDamageAT(game.global.soldierCurrentAttack)); +var trimpATK = (calculateDamageAT()); function calculateDamageAT() { var currentCalc = game.global.soldierCurrentAttack; From 400c5712b9b43976f5d64d00158ab18e42670e43 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 16:14:58 +0100 Subject: [PATCH 0336/3477] Update ATcalc.js --- modules/ATcalc.js | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/modules/ATcalc.js b/modules/ATcalc.js index 4aea97844..b802bd71d 100644 --- a/modules/ATcalc.js +++ b/modules/ATcalc.js @@ -1,29 +1,29 @@ var trimpATK = (calculateDamageAT()); function calculateDamageAT() { -var currentCalc = game.global.soldierCurrentAttack; +var currentCalcAT = game.global.soldierCurrentAttack; var fluctuation = .2; //%fluctuation var maxFluct = -1; var minFluct = -1; //Situational Trimp damage increases if (game.jobs.Amalgamator.owned > 0){ - number *= game.jobs.Amalgamator.getDamageMult(); + currentCalcAT *= game.jobs.Amalgamator.getDamageMult(); } if (game.challenges.Electricity.stacks > 0) { //Electricity - number *= (1 - (game.challenges.Electricity.stacks * 0.1)); + currentCalcAT *= (1 - (game.challenges.Electricity.stacks * 0.1)); } if (game.global.antiStacks > 0) { - number *= ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1); + currentCalcAT *= ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1); updateAntiStacks(); } if (!game.global.mapsActive && game.global.mapBonus > 0){ - number *= ((game.global.mapBonus * .2) + 1); + currentCalcAT *= ((game.global.mapBonus * .2) + 1); } if (game.global.titimpLeft >= 1 && game.global.mapsActive){ - number *= 2; + currentCalcAT *= 2; } if (game.global.achievementBonus > 0){ - number *= (1 + (game.global.achievementBonus / 100)); + currentCalcAT *= (1 + (game.global.achievementBonus / 100)); } if (game.global.challengeActive == "Discipline"){ fluctuation = .995; @@ -32,45 +32,45 @@ var fluctuation = .2; //%fluctuation minFluct = fluctuation - (.02 * game.portal.Range.level); } if (game.global.challengeActive == "Decay"){ - number *= 5; - number *= Math.pow(0.995, game.challenges.Decay.stacks); + currentCalcAT *= 5; + currentCalcAT *= Math.pow(0.995, game.challenges.Decay.stacks); } if (game.global.roboTrimpLevel > 0){ - number *= ((0.2 * game.global.roboTrimpLevel) + 1); + currentCalcAT *= ((0.2 * game.global.roboTrimpLevel) + 1); } if (game.global.challengeActive == "Lead" && ((game.global.world % 2) == 1)){ - number *= 1.5; + currentCalcAT *= 1.5; } if (game.goldenUpgrades.Battle.currentBonus > 0){ - number *= game.goldenUpgrades.Battle.currentBonus + 1; + currentCalcAT *= game.goldenUpgrades.Battle.currentBonus + 1; } if (game.talents.voidPower.purchased && game.global.voidBuff){ var vpAmt = (game.talents.voidPower2.purchased) ? ((game.talents.voidPower3.purchased) ? 65 : 35) : 15; - number *= ((vpAmt / 100) + 1); + currentCalcAT *= ((vpAmt / 100) + 1); } if (game.global.totalSquaredReward > 0){ - number *= ((game.global.totalSquaredReward / 100) + 1); + currentCalcAT *= ((game.global.totalSquaredReward / 100) + 1); } if (getEmpowerment() == "Ice"){ - number *= 1 + (1 - game.empowerments.Ice.getCombatModifier()); + currentCalcAT *= 1 + (1 - game.empowerments.Ice.getCombatModifier()); } if (game.talents.magmamancer.purchased){ - number *= game.jobs.Magmamancer.getBonusPercent(); + currentCalcAT *= game.jobs.Magmamancer.getBonusPercent(); } if (game.talents.stillRowing2.purchased){ - number *= ((game.global.spireRows * 0.06) + 1); + currentCalcAT *= ((game.global.spireRows * 0.06) + 1); } if (game.talents.healthStrength.purchased && mutations.Healthy.active()){ - number *= ((0.15 * mutations.Healthy.cellCount()) + 1); + currentCalcAT *= ((0.15 * mutations.Healthy.cellCount()) + 1); } if (game.global.sugarRush > 0){ - number *= sugarRush.getAttackStrength(); + currentCalcAT *= sugarRush.getAttackStrength(); } if (game.global.challengeActive == "Life") { - number *= game.challenges.Life.getHealthMult(); + currentCalcAT *= game.challenges.Life.getHealthMult(); } if (game.singleRunBonuses.sharpTrimps.owned){ - number *= 1.5; + currentCalcAT *= 1.5; } if (game.global.challengeActive == "Daily"){ if (typeof game.global.dailyChallenge.minDamage !== 'undefined'){ @@ -82,22 +82,22 @@ var fluctuation = .2; //%fluctuation maxFluct += dailyModifiers.maxDamage.getMult(game.global.dailyChallenge.maxDamage.strength); } if (typeof game.global.dailyChallenge.weakness !== 'undefined'){ - number *= dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); + currentCalcAT *= dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); } if (typeof game.global.dailyChallenge.oddTrimpNerf !== 'undefined' && ((game.global.world % 2) == 1)){ - number *= dailyModifiers.oddTrimpNerf.getMult(game.global.dailyChallenge.oddTrimpNerf.strength); + currentCalcAT *= dailyModifiers.oddTrimpNerf.getMult(game.global.dailyChallenge.oddTrimpNerf.strength); } if (typeof game.global.dailyChallenge.evenTrimpBuff !== 'undefined' && ((game.global.world % 2) == 0)){ - number *= dailyModifiers.evenTrimpBuff.getMult(game.global.dailyChallenge.evenTrimpBuff.strength); + currentCalcAT *= dailyModifiers.evenTrimpBuff.getMult(game.global.dailyChallenge.evenTrimpBuff.strength); } if (typeof game.global.dailyChallenge.rampage !== 'undefined'){ - number *= dailyModifiers.rampage.getMult(game.global.dailyChallenge.rampage.strength, game.global.dailyChallenge.rampage.stacks); + currentCalcAT *= dailyModifiers.rampage.getMult(game.global.dailyChallenge.rampage.strength, game.global.dailyChallenge.rampage.stacks); } } if (Fluffy.isActive()){ - number *= Fluffy.getDamageModifier(); + currentCalcAT *= Fluffy.getDamageModifier(); } - return number; + return currentCalcAT; } From 1e8f4abf14a616eee1d8a929a0a4059b518f271e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 16:29:17 +0100 Subject: [PATCH 0337/3477] Update stance.js --- modules/stance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index ccfda9345..46137487e 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -2,7 +2,7 @@ function calcBaseDamageinX() { //baseDamage - baseDamage = getBattleStats("attack", false, true); + baseDamage = (calculateDamageAT()); //baseBlock baseBlock = game.global.soldierCurrentBlock; //baseHealth From 68ebbedf5ab97c19d3cd4a8286cb93731bb18498 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 18:32:44 +0100 Subject: [PATCH 0338/3477] Update stance.js --- modules/stance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index 46137487e..b91807a86 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -2,7 +2,7 @@ function calcBaseDamageinX() { //baseDamage - baseDamage = (calculateDamageAT()); + baseDamage = (getBattleStats("attack", false, true)); //baseBlock baseBlock = game.global.soldierCurrentBlock; //baseHealth From 13c07638c775e2ff9873de4c59332625b51890af Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 18:35:20 +0100 Subject: [PATCH 0339/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 97bd94ee5..5c9efa7d2 100644 --- a/modules/other.js +++ b/modules/other.js @@ -186,12 +186,12 @@ function Praiding() { } if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid && !failpraid) { plusPres(); - if (cost <= game.resources.fragments.owned) { + if (updateMapCost(true) <= game.resources.fragments.owned) { buyMap(); failpraid = false; mapbought = true; } - else if (cost > game.resources.fragments.owned) { + else if (updateMapCost(true) <= game.resources.fragments.owned > game.resources.fragments.owned) { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { autoTrimpSettings["AutoMaps"].value = 1; failpraid = true; From f03d5c5a62a6a3045edf10cb7d96b008b91865ee Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 18:37:59 +0100 Subject: [PATCH 0340/3477] Update ATcalc.js --- modules/ATcalc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ATcalc.js b/modules/ATcalc.js index b802bd71d..181c10540 100644 --- a/modules/ATcalc.js +++ b/modules/ATcalc.js @@ -1,4 +1,4 @@ -var trimpATK = (calculateDamageAT()); +var trimpATK = calculateDamage(game.global.soldierCurrentAttack, true, true); function calculateDamageAT() { var currentCalcAT = game.global.soldierCurrentAttack; From f8a229800c730023e3ae672df5f04d05c357c080 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 18:47:39 +0100 Subject: [PATCH 0341/3477] Update ATcalc.js --- modules/ATcalc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ATcalc.js b/modules/ATcalc.js index 181c10540..e399f74b6 100644 --- a/modules/ATcalc.js +++ b/modules/ATcalc.js @@ -1,5 +1,5 @@ -var trimpATK = calculateDamage(game.global.soldierCurrentAttack, true, true); - +var trimpATK1 = calculateDamage(game.global.soldierCurrentAttack, true, true); +var trimpATK = parseFloat(trimpATK1) function calculateDamageAT() { var currentCalcAT = game.global.soldierCurrentAttack; var fluctuation = .2; //%fluctuation From 9fd237c23a10f56c051ef30319b5fca4a69d3be3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 18:52:21 +0100 Subject: [PATCH 0342/3477] Update ATcalc.js --- modules/ATcalc.js | 103 +--------------------------------------------- 1 file changed, 2 insertions(+), 101 deletions(-) diff --git a/modules/ATcalc.js b/modules/ATcalc.js index e399f74b6..74c936ca3 100644 --- a/modules/ATcalc.js +++ b/modules/ATcalc.js @@ -1,103 +1,4 @@ +function calculateDamageAT() { var trimpATK1 = calculateDamage(game.global.soldierCurrentAttack, true, true); var trimpATK = parseFloat(trimpATK1) -function calculateDamageAT() { -var currentCalcAT = game.global.soldierCurrentAttack; -var fluctuation = .2; //%fluctuation - var maxFluct = -1; - var minFluct = -1; - //Situational Trimp damage increases - if (game.jobs.Amalgamator.owned > 0){ - currentCalcAT *= game.jobs.Amalgamator.getDamageMult(); - } - if (game.challenges.Electricity.stacks > 0) { //Electricity - currentCalcAT *= (1 - (game.challenges.Electricity.stacks * 0.1)); - } - if (game.global.antiStacks > 0) { - currentCalcAT *= ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1); - updateAntiStacks(); - } - if (!game.global.mapsActive && game.global.mapBonus > 0){ - currentCalcAT *= ((game.global.mapBonus * .2) + 1); - } - if (game.global.titimpLeft >= 1 && game.global.mapsActive){ - currentCalcAT *= 2; - } - if (game.global.achievementBonus > 0){ - currentCalcAT *= (1 + (game.global.achievementBonus / 100)); - } - if (game.global.challengeActive == "Discipline"){ - fluctuation = .995; - } - else if (game.portal.Range.level > 0){ - minFluct = fluctuation - (.02 * game.portal.Range.level); - } - if (game.global.challengeActive == "Decay"){ - currentCalcAT *= 5; - currentCalcAT *= Math.pow(0.995, game.challenges.Decay.stacks); - } - if (game.global.roboTrimpLevel > 0){ - currentCalcAT *= ((0.2 * game.global.roboTrimpLevel) + 1); - } - if (game.global.challengeActive == "Lead" && ((game.global.world % 2) == 1)){ - currentCalcAT *= 1.5; - } - if (game.goldenUpgrades.Battle.currentBonus > 0){ - currentCalcAT *= game.goldenUpgrades.Battle.currentBonus + 1; - } - if (game.talents.voidPower.purchased && game.global.voidBuff){ - var vpAmt = (game.talents.voidPower2.purchased) ? ((game.talents.voidPower3.purchased) ? 65 : 35) : 15; - currentCalcAT *= ((vpAmt / 100) + 1); - } - if (game.global.totalSquaredReward > 0){ - currentCalcAT *= ((game.global.totalSquaredReward / 100) + 1); - } - if (getEmpowerment() == "Ice"){ - currentCalcAT *= 1 + (1 - game.empowerments.Ice.getCombatModifier()); - } - if (game.talents.magmamancer.purchased){ - currentCalcAT *= game.jobs.Magmamancer.getBonusPercent(); - } - if (game.talents.stillRowing2.purchased){ - currentCalcAT *= ((game.global.spireRows * 0.06) + 1); - } - if (game.talents.healthStrength.purchased && mutations.Healthy.active()){ - currentCalcAT *= ((0.15 * mutations.Healthy.cellCount()) + 1); - } - if (game.global.sugarRush > 0){ - currentCalcAT *= sugarRush.getAttackStrength(); - } - if (game.global.challengeActive == "Life") { - currentCalcAT *= game.challenges.Life.getHealthMult(); - } - if (game.singleRunBonuses.sharpTrimps.owned){ - currentCalcAT *= 1.5; - } - if (game.global.challengeActive == "Daily"){ - if (typeof game.global.dailyChallenge.minDamage !== 'undefined'){ - if (minFluct == -1) minFluct = fluctuation; - minFluct += dailyModifiers.minDamage.getMult(game.global.dailyChallenge.minDamage.strength); - } - if (typeof game.global.dailyChallenge.maxDamage !== 'undefined'){ - if (maxFluct == -1) maxFluct = fluctuation; - maxFluct += dailyModifiers.maxDamage.getMult(game.global.dailyChallenge.maxDamage.strength); - } - if (typeof game.global.dailyChallenge.weakness !== 'undefined'){ - currentCalcAT *= dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); - } - if (typeof game.global.dailyChallenge.oddTrimpNerf !== 'undefined' && ((game.global.world % 2) == 1)){ - currentCalcAT *= dailyModifiers.oddTrimpNerf.getMult(game.global.dailyChallenge.oddTrimpNerf.strength); - } - if (typeof game.global.dailyChallenge.evenTrimpBuff !== 'undefined' && ((game.global.world % 2) == 0)){ - currentCalcAT *= dailyModifiers.evenTrimpBuff.getMult(game.global.dailyChallenge.evenTrimpBuff.strength); - } - if (typeof game.global.dailyChallenge.rampage !== 'undefined'){ - currentCalcAT *= dailyModifiers.rampage.getMult(game.global.dailyChallenge.rampage.strength, game.global.dailyChallenge.rampage.stacks); - } - } - if (Fluffy.isActive()){ - currentCalcAT *= Fluffy.getDamageModifier(); - } - return currentCalcAT; - - } - +} From 8ddf07de1b9277693909e75b5c173a3a3abeaf2d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 18:54:27 +0100 Subject: [PATCH 0343/3477] Update ATcalc.js --- modules/ATcalc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/ATcalc.js b/modules/ATcalc.js index 74c936ca3..9f77a7599 100644 --- a/modules/ATcalc.js +++ b/modules/ATcalc.js @@ -1,4 +1,5 @@ function calculateDamageAT() { var trimpATK1 = calculateDamage(game.global.soldierCurrentAttack, true, true); var trimpATK = parseFloat(trimpATK1) +return trimpATK; } From ad712d3420259c41b078a3653c312bef37e2015a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 18:56:22 +0100 Subject: [PATCH 0344/3477] Update stance.js --- modules/stance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index b91807a86..61be04375 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -2,7 +2,7 @@ function calcBaseDamageinX() { //baseDamage - baseDamage = (getBattleStats("attack", false, true)); + baseDamage = calculateDamageAT(); //baseBlock baseBlock = game.global.soldierCurrentBlock; //baseHealth From e45bfbc9ddae372e8fb746218cc2431bbd77b7e1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 19:35:22 +0100 Subject: [PATCH 0345/3477] Update stance.js --- modules/stance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index 61be04375..b91807a86 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -2,7 +2,7 @@ function calcBaseDamageinX() { //baseDamage - baseDamage = calculateDamageAT(); + baseDamage = (getBattleStats("attack", false, true)); //baseBlock baseBlock = game.global.soldierCurrentBlock; //baseHealth From 765cf96d8fa860c9ac96c0988b4fb391474f5a9f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 22:55:42 +0100 Subject: [PATCH 0346/3477] Update other.js --- modules/other.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/other.js b/modules/other.js index 5c9efa7d2..a9fa0292e 100644 --- a/modules/other.js +++ b/modules/other.js @@ -241,6 +241,7 @@ function BWraiding() { } if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { mapsClicked(); + mapsClicked(); } if (game.options.menu.repeatUntil.enabled != 2 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { game.options.menu.repeatUntil.enabled = 2; From a8c0303347b8188d64318c36d63e1ac558d59027 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 22:57:18 +0100 Subject: [PATCH 0347/3477] Update other.js --- modules/other.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index a9fa0292e..eb516f66d 100644 --- a/modules/other.js +++ b/modules/other.js @@ -179,7 +179,8 @@ function Praiding() { } if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { mapsClicked(); - debug("Beginning Prestige Raiding..."); + mapsClicked(); + debug("Beginning Prestige Raiding..."); } if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { game.options.menu.repeatUntil.enabled = 2; From 541a098b1fcdda392909caba7e6d8d08951f093d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 23:01:59 +0100 Subject: [PATCH 0348/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index eb516f66d..70fa80751 100644 --- a/modules/other.js +++ b/modules/other.js @@ -7,7 +7,7 @@ var failbwraid = false; var perked = false; var prestraidon = false; var cost = (updateMapCost(true)); -var mapbought = true; +var mapbought = false; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { //exit if the cooldown is active, or we havent unlocked robotrimp. From 9dad57e8ae5f233e7a36df0d84f7f090dc278e37 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 23:04:09 +0100 Subject: [PATCH 0349/3477] Update other.js --- modules/other.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/other.js b/modules/other.js index 70fa80751..5efe4780b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -214,6 +214,7 @@ function Praiding() { debug("...Successfully prestiged!"); prestraid = true; prestraidon = false; + mapbought = false; if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); @@ -226,6 +227,7 @@ function Praiding() { if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { prestraid = false; prestraidon = false; + mapbought = false; } } From 9c11ad614f47e8e3cbaadf073ebf4aa59b4601a0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 10 Jun 2018 23:31:17 +0100 Subject: [PATCH 0350/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index ec61d16b5..9c91764ab 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,7 +62,8 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "05/06/2018", version: "v2.3", description: "Updated Heirloom calc, should be 4.8 ready. Ratios will be updated soon. ", isNew: true}); +changelogList.push({date: "05/06/2018", version: "v2.2.2", description: "Fixed map at zone. Updated calcs. Praiding should work for everyone now. BW raiding still being tested, but should work. Ratios being tested, finding optimum coord and carp. Any bugs, please let me know, thanks. ", isNew: true}); +changelogList.push({date: "05/06/2018", version: "v2.2.1", description: "Updated Heirloom calc, should be 4.8 ready. Ratios will be updated soon. ", isNew: true}); changelogList.push({date: "28/05/2018", version: "v2.2", description: "Added single use prestige raiding, BW raiding, looting II dump, amals are now calcd properly. ", isNew: true}); //changelogList.push({date: "4/2", version: "v2.1.6.9b", description: "Import Export, Modules Load code Improvements. Multiple Buttons/Settings Were Combined. AutoPerks code was changed but still functions the same, except for a new algorithm that reduces the time to allocate for high helium players to near-instantaneous. Please test new algo with MODULES[\"perks\"].useAlgo2=true; .You can also clear all perks then allocate and have it work now. AutoMaps no longer considered as being in Lead challenge during Chall^2. ", isNew: true}); //changelogList.push({date: "3/23", version: "v2.1.6.9", description: "Game's Map at Zone can be used with AT now, to run maps forever. AutoMaps setting was combined with RunUniqueMaps (variable has changed from boolean false,true to a value 0,1,2). Settings file has been migrated as such. New: Map SpecialMod is sort of working, at least. Geneticist Infinity bugfix. New AGU Settings for 60% Void (fixed). Many Graphs fixes. AutoMaps changes. Equipment Cap, see README at GitHub DarkTheme fix. Scientists Fix. Zek450 Perks Preset Changed. Ongoing Development...", isNew: false}); From 8be62ef5142bd3ec5df4a465cbceeb2de7e24207 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 11 Jun 2018 08:32:37 +0100 Subject: [PATCH 0351/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 5efe4780b..b5e03649d 100644 --- a/modules/other.js +++ b/modules/other.js @@ -187,12 +187,12 @@ function Praiding() { } if (game.global.world == getPageSetting('Praidingzone') && game.global.preMapsActive && !prestraid && !failpraid) { plusPres(); - if (updateMapCost(true) <= game.resources.fragments.owned) { + if ((updateMapCost(true) <= game.resources.fragments.owned)) { buyMap(); failpraid = false; mapbought = true; } - else if (updateMapCost(true) <= game.resources.fragments.owned > game.resources.fragments.owned) { + else if ((updateMapCost(true) > game.resources.fragments.owned)) { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { autoTrimpSettings["AutoMaps"].value = 1; failpraid = true; From 8945c12cab8415f892f71ae696594bf3e495b769 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 11 Jun 2018 08:38:31 +0100 Subject: [PATCH 0352/3477] Update other.js --- modules/other.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index b5e03649d..17c6aa6ef 100644 --- a/modules/other.js +++ b/modules/other.js @@ -179,7 +179,6 @@ function Praiding() { } if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { mapsClicked(); - mapsClicked(); debug("Beginning Prestige Raiding..."); } if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { @@ -244,7 +243,6 @@ function BWraiding() { } if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { mapsClicked(); - mapsClicked(); } if (game.options.menu.repeatUntil.enabled != 2 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { game.options.menu.repeatUntil.enabled = 2; From 3ec7f9d95c77182f8f886c87e738cfd75c7c80e3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 11 Jun 2018 08:49:04 +0100 Subject: [PATCH 0353/3477] Update other.js --- modules/other.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/other.js b/modules/other.js index 17c6aa6ef..488145534 100644 --- a/modules/other.js +++ b/modules/other.js @@ -179,6 +179,9 @@ function Praiding() { } if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { mapsClicked(); + if (!game.global.switchToMaps) { + mapsClicked(); + } debug("Beginning Prestige Raiding..."); } if (game.options.menu.repeatUntil.enabled!=2 && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { @@ -190,6 +193,7 @@ function Praiding() { buyMap(); failpraid = false; mapbought = true; + debug("Map successfully bought!"); } else if ((updateMapCost(true) > game.resources.fragments.owned)) { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { @@ -243,6 +247,9 @@ function BWraiding() { } if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { mapsClicked(); + if (!game.global.switchToMaps) { + mapsClicked(); + } } if (game.options.menu.repeatUntil.enabled != 2 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { game.options.menu.repeatUntil.enabled = 2; From 5e7dafc3735a08618e3deecb2763d822c7761f36 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 11 Jun 2018 08:52:24 +0100 Subject: [PATCH 0354/3477] Update other.js --- modules/other.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 488145534..d113085fe 100644 --- a/modules/other.js +++ b/modules/other.js @@ -193,7 +193,6 @@ function Praiding() { buyMap(); failpraid = false; mapbought = true; - debug("Map successfully bought!"); } else if ((updateMapCost(true) > game.resources.fragments.owned)) { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { From 0d83d28426d011e66957b68758d6533caa6e79ef Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 11 Jun 2018 12:41:39 +0100 Subject: [PATCH 0355/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index d113085fe..e18faeed9 100644 --- a/modules/other.js +++ b/modules/other.js @@ -208,8 +208,8 @@ function Praiding() { } if (mapbought == true) { selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); + runMap(); } - runMap(); if (!game.global.repeatMap && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { repeatClicked(); } @@ -222,7 +222,7 @@ function Praiding() { debug("Turning AutoMaps back on"); } } - else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } From 773cfe58dc57c1c2c88a1eb6f57341628a0088bb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 11 Jun 2018 13:26:28 +0100 Subject: [PATCH 0356/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index e18faeed9..960cdd4b6 100644 --- a/modules/other.js +++ b/modules/other.js @@ -179,7 +179,7 @@ function Praiding() { } if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { mapsClicked(); - if (!game.global.switchToMaps) { + if (!game.global.preMapsActive) { mapsClicked(); } debug("Beginning Prestige Raiding..."); From 4b15ec2d24dc8b851eb09dabedb86c666140776c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 11 Jun 2018 14:40:35 +0100 Subject: [PATCH 0357/3477] Update other.js --- modules/other.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/modules/other.js b/modules/other.js index 960cdd4b6..4517bff1d 100644 --- a/modules/other.js +++ b/modules/other.js @@ -170,24 +170,27 @@ function findLastBionic() { //Praiding function Praiding() { - if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { - if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { + var PRaidZoneArray = getPageSetting('Praidingzone').split(,); + for(var i = 0;i game.resources.fragments.owned)) { - if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('Praidingzone') && !prestraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.world == i Date: Mon, 11 Jun 2018 14:43:28 +0100 Subject: [PATCH 0358/3477] Update other.js --- modules/other.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index 4517bff1d..c6c609a91 100644 --- a/modules/other.js +++ b/modules/other.js @@ -170,9 +170,8 @@ function findLastBionic() { //Praiding function Praiding() { - var PRaidZoneArray = getPageSetting('Praidingzone').split(,); - for(var i = 0;i Date: Mon, 11 Jun 2018 14:45:34 +0100 Subject: [PATCH 0359/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index c6c609a91..0cbf57b8f 100644 --- a/modules/other.js +++ b/modules/other.js @@ -171,7 +171,7 @@ function findLastBionic() { function Praiding() { var PRaidZoneArray = getPageSetting('Praidingzone').split(','); - for(var i = 0;i Date: Mon, 11 Jun 2018 14:47:07 +0100 Subject: [PATCH 0360/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 0cbf57b8f..f0e1a3757 100644 --- a/modules/other.js +++ b/modules/other.js @@ -171,7 +171,7 @@ function findLastBionic() { function Praiding() { var PRaidZoneArray = getPageSetting('Praidingzone').split(','); - for var i = 0;i Date: Mon, 11 Jun 2018 14:50:25 +0100 Subject: [PATCH 0361/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index f0e1a3757..41104bd84 100644 --- a/modules/other.js +++ b/modules/other.js @@ -233,7 +233,7 @@ function Praiding() { prestraidon = false; mapbought = false; } - + } } From aeeebf6d0576150be0ec1483191870a38cd58bb2 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 11 Jun 2018 15:00:40 +0100 Subject: [PATCH 0362/3477] Update other.js --- modules/other.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/other.js b/modules/other.js index 41104bd84..b9cdd6a67 100644 --- a/modules/other.js +++ b/modules/other.js @@ -172,24 +172,24 @@ function findLastBionic() { function Praiding() { var PRaidZoneArray = getPageSetting('Praidingzone').split(','); for (var i = 0;i game.resources.fragments.owned)) { - if (getPageSetting('AutoMaps') == 0 && game.global.world == i Date: Mon, 11 Jun 2018 22:47:20 +0100 Subject: [PATCH 0363/3477] Update other.js --- modules/other.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/modules/other.js b/modules/other.js index b9cdd6a67..5daaad178 100644 --- a/modules/other.js +++ b/modules/other.js @@ -170,12 +170,9 @@ function findLastBionic() { //Praiding function Praiding() { - var PRaidZoneArray = getPageSetting('Praidingzone').split(','); - for (var i = 0;i Date: Mon, 11 Jun 2018 22:52:52 +0100 Subject: [PATCH 0364/3477] Update other.js --- modules/other.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index 5daaad178..d07960211 100644 --- a/modules/other.js +++ b/modules/other.js @@ -170,7 +170,7 @@ function findLastBionic() { //Praiding function Praiding() { - if (getPageSetting('Praidingzone') && !prestraid && !failpraid) { + if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { prestraidon = true; if (getPageSetting('AutoMaps') == 1 && !prestraid && !failpraid) { @@ -209,10 +209,10 @@ function Praiding() { selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); runMap(); } - if (!prestraid && !failpraid) { + if (!prestraid && !failpraid && !game.global.repeatMap) { repeatClicked(); + debug("...Successfully prestiged!"); } - debug("...Successfully prestiged!"); prestraid = true; prestraidon = false; mapbought = false; From d72feb5782e3a63f8ef244986594f1c0fa6bee19 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 13 Jun 2018 11:40:10 +0100 Subject: [PATCH 0365/3477] Update other.js --- modules/other.js | 60 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index d07960211..260eb034a 100644 --- a/modules/other.js +++ b/modules/other.js @@ -6,8 +6,10 @@ var bwraided = false; var failbwraid = false; var perked = false; var prestraidon = false; -var cost = (updateMapCost(true)); var mapbought = false; +var failpvoidraid = false; +var prestvoid = false; +var mapboughtvoid = false; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { //exit if the cooldown is active, or we havent unlocked robotrimp. @@ -289,6 +291,62 @@ function BWraiding() { } } +//VoidPraid +//Prest before voids + function Praidingvoid() { + if (game.global.world == getPageSetting('VoidMaps') && getPageSetting('VoidPraid') == true && !prestvoid && !failpvoidraid) { + if (getPageSetting('AutoMaps') == 1 && !prestvoid && !failpvoidraid) { + autoTrimpSettings["AutoMaps"].value = 0; + } + if (!game.global.preMapsActive && !game.global.mapsActive && !prestvoid && !failpvoidraid) { + mapsClicked(); + if (!game.global.preMapsActive) { + mapsClicked(); + } + debug("Beginning Prestige Raiding for Voids..."); + } + if (game.options.menu.repeatUntil.enabled!=2 && !prestvoid && !failpvoidraid) { + game.options.menu.repeatUntil.enabled = 2; + } + if (game.global.preMapsActive && !prestvoid && !failpvoidraid) { + plusPres(); + if ((updateMapCost(true) <= game.resources.fragments.owned)) { + buyMap(); + failpvoidraid = false; + mapboughtvoid = true; + } + else if ((updateMapCost(true) > game.resources.fragments.owned)) { + if (getPageSetting('AutoMaps') == 0 && !prestvoid) { + autoTrimpSettings["AutoMaps"].value = 1; + failpvoidraid = true; + mapboughtvoid = false; + debug("Failed to prestige raid for Voids. Looks like you can't afford to.."); + } + return; + + } + } + if (mapboughtvoid == true) { + selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); + runMap(); + } + if (!prestvoid && !failpvoidraid && !game.global.repeatMap) { + repeatClicked(); + debug("...Successfully prestiged!"); + } + prestvoid = true; + mapboughtvoid = false; + } + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestvoid && !failpvoidraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); + } + if (prestvoid == true && game.global.world !== getPageSetting('VoidMaps')) { + prestvoid = false; + mapboughtvoid = false; + } + +} //AutoAllocate Looting II function lootdump() { if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { From b1824b56e3c101f88124148197f3b5b030a166fe Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 13 Jun 2018 11:40:23 +0100 Subject: [PATCH 0366/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 78de7f45f..6b073aca8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -354,7 +354,7 @@ function initializeAllSettings() { //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); //-1 Autograbs your Finish Daily Z Mod
0 Disables this setting
Positive Numbers add to your normal void zone on a daily
Possible number input? createSetting('DailyVoidMod', 'Daily Void Zone Mod', 'If this is on, your daily autoportal mod (Core) will also apply to Void maps on dailies. For example, if you have void maps and autoportal set to 200 on normal runs, and your daily mod is 15, you will do voids and portal 15 zones later on a daily.', 'boolean', true, null, 'Maps'); - createSetting('PlusMapVoidToggle', 'Plus Maps for Voids', '-1/0 = Off
Max Value is 10!!!
If this is on, AT will grab a prestigious map X zones up, and run it once (to grab the dagger prestige). This is independent of the new special map mods button that Gen is testing. I cba to make this \'smart\' and actively calculate what zone to go for...
Values above 10 will NOT work at all. Advise 1-5.', 'value', '0', null, 'Maps'); + createSetting('VoidPraid', 'Plus Maps for Voids', 'Raid Prestiges before running Void Maps. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS PRAIDING. ', 'boolean', 'false', null, 'Maps'); createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. And I cba cause its a meh setting anyway. Advancing 2 zones more than doubles your income. Only useful for spire I, and IMO you may aswell actually play the game manually at SOME point. createSetting('AdvMapSpecialModifier', 'Map Special Modifier', 'EXPERIMENTAL. Attempt to select the BEST map special attacks mod. With this on, this will replace the normal behavior. If bugs, please report as this will become more default soon.', 'boolean', false, null, 'Maps'); From 2a23925873cdd0a65e08860a381f5c112515492d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 13 Jun 2018 11:42:39 +0100 Subject: [PATCH 0367/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 9c91764ab..12c1aa9ae 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -209,6 +209,7 @@ function mainLoop() { //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) + if (getPageSetting('VoidPraid')==true)Praidingvoid(); if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); From ec8d4bf902c83d6b6fa07c570d1492d2b1e7b4c1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 13 Jun 2018 11:45:21 +0100 Subject: [PATCH 0368/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 12c1aa9ae..fa466e035 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,11 +62,10 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE +changelogList.push({date: "13/06/2018", version: "v2.2.3", description: "Plus maps for voids has been changed. It now works the same as Prestige raiding. Check tooltip for more details. Ratios will be out soon, including the new z500. ", isNew: true}); changelogList.push({date: "05/06/2018", version: "v2.2.2", description: "Fixed map at zone. Updated calcs. Praiding should work for everyone now. BW raiding still being tested, but should work. Ratios being tested, finding optimum coord and carp. Any bugs, please let me know, thanks. ", isNew: true}); changelogList.push({date: "05/06/2018", version: "v2.2.1", description: "Updated Heirloom calc, should be 4.8 ready. Ratios will be updated soon. ", isNew: true}); -changelogList.push({date: "28/05/2018", version: "v2.2", description: "Added single use prestige raiding, BW raiding, looting II dump, amals are now calcd properly. ", isNew: true}); -//changelogList.push({date: "4/2", version: "v2.1.6.9b", description: "Import Export, Modules Load code Improvements. Multiple Buttons/Settings Were Combined. AutoPerks code was changed but still functions the same, except for a new algorithm that reduces the time to allocate for high helium players to near-instantaneous. Please test new algo with MODULES[\"perks\"].useAlgo2=true; .You can also clear all perks then allocate and have it work now. AutoMaps no longer considered as being in Lead challenge during Chall^2. ", isNew: true}); -//changelogList.push({date: "3/23", version: "v2.1.6.9", description: "Game's Map at Zone can be used with AT now, to run maps forever. AutoMaps setting was combined with RunUniqueMaps (variable has changed from boolean false,true to a value 0,1,2). Settings file has been migrated as such. New: Map SpecialMod is sort of working, at least. Geneticist Infinity bugfix. New AGU Settings for 60% Void (fixed). Many Graphs fixes. AutoMaps changes. Equipment Cap, see README at GitHub DarkTheme fix. Scientists Fix. Zek450 Perks Preset Changed. Ongoing Development...", isNew: false}); +changelogList.push({date: "28/05/2018", version: "v2.2", description: "Welcome to the Zek fork. Added single use prestige raiding, BW raiding, looting II dump, amals are now calcd properly. ", isNew: true}); function assembleChangelog(date,version,description,isNew) { return (isNew) From 831b803292b164684a3c7ad595da6b88268600cb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 13 Jun 2018 11:47:02 +0100 Subject: [PATCH 0369/3477] Update maps.js --- modules/maps.js | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index 300edb94a..192e0f26b 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -32,7 +32,6 @@ MODULES["maps"].maxMapBonusAfterZ = MODULES["maps"].maxMapBonus; //Max Map Bonus var stackingTox = false; var doVoids = false; var needToVoid = false; -var plusMapVoid = false; var needPrestige = false; var skippedPrestige = false; var voidCheckPercent = 0; @@ -99,27 +98,6 @@ function autoMap() { if (game.global.totalVoidMaps == 0 || !needToVoid) doVoids = false; - //NEW KFrowde + Sliverz This has several issues: 1 - Buys fuckloads of maps, 2 - enters a BW map instead of the one that you want - //Set up vars - var plusMapVoidLastZone - var plusMapVoid = (voidMapLevelSetting > 0) && (game.global.totalVoidMaps > 0) && (game.global.world == voidMapLevelSettingZone); //Sanity check - var plusMapVoidInput = getPageSetting('PlusMapVoidToggle') - //Check that you should do this, check you've enabled it between the correct values, check that it hasn't already run this zone - if ((plusMapVoid) && (plusMapVoidInput > 0 && plusMapVoidInput <= 10) && (plusMapVoidLastZone === null || plusMapVoidLastZone !== game.global.world)) { - document.getElementById("biomeAdvMapsSelect").value = "Random"; - document.getElementById('advExtraLevelSelect').value = plusMapVoidInput; - document.getElementById('advSpecialSelect').value = "p"; - document.getElementById("lootAdvMapsRange").value = 0; - document.getElementById("difficultyAdvMapsRange").value = 9; - document.getElementById("sizeAdvMapsRange").value = 9; - document.getElementById('advPerfectCheckbox').checked = false; - updateMapCost(); - buyMap(); - selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length - 1].id); - runMap(); - plusMapVoidLastZone = game.global.world; //This should have stopped it from looping - } - // if force prestige, check if we are behind any first if ((getPageSetting('ForcePresZ') >= 0) && ((game.global.world + extraMapLevels) >= getPageSetting('ForcePresZ'))) { const prestigeList = ['Supershield', 'Dagadder', 'Megamace', 'Polierarm', 'Axeidic', 'Greatersword', 'Harmbalest', 'Bootboost', 'Hellishmet', 'Pantastic', 'Smoldershoulder', 'Bestplate', 'GambesOP']; From 469da059c9c34d2835aab5058db17037ec44077b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 13 Jun 2018 12:31:23 +0100 Subject: [PATCH 0370/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index fa466e035..f3a1e1dec 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -63,9 +63,9 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE changelogList.push({date: "13/06/2018", version: "v2.2.3", description: "Plus maps for voids has been changed. It now works the same as Prestige raiding. Check tooltip for more details. Ratios will be out soon, including the new z500. ", isNew: true}); -changelogList.push({date: "05/06/2018", version: "v2.2.2", description: "Fixed map at zone. Updated calcs. Praiding should work for everyone now. BW raiding still being tested, but should work. Ratios being tested, finding optimum coord and carp. Any bugs, please let me know, thanks. ", isNew: true}); -changelogList.push({date: "05/06/2018", version: "v2.2.1", description: "Updated Heirloom calc, should be 4.8 ready. Ratios will be updated soon. ", isNew: true}); -changelogList.push({date: "28/05/2018", version: "v2.2", description: "Welcome to the Zek fork. Added single use prestige raiding, BW raiding, looting II dump, amals are now calcd properly. ", isNew: true}); +changelogList.push({date: "05/06/2018", version: "v2.2.2", description: "Fixed map at zone. Updated calcs. Praiding should work for everyone now. BW raiding still being tested, but should work. Ratios being tested, finding optimum coord and carp. Any bugs, please let me know, thanks. ", isNew: false}); +changelogList.push({date: "05/06/2018", version: "v2.2.1", description: "Updated Heirloom calc, should be 4.8 ready. Ratios will be updated soon. ", isNew: false}); +changelogList.push({date: "28/05/2018", version: "v2.2", description: "Welcome to the Zek fork. Added single use prestige raiding, BW raiding, looting II dump, amals are now calcd properly. ", isNew: false}); function assembleChangelog(date,version,description,isNew) { return (isNew) @@ -81,8 +81,8 @@ function printChangelog() { }; var footer = 'Ongoing Development - Report any bugs/problems please!\ -
Talk with the dev: genr8_#8163 @ AutoTrimps Discord Channel\ -
See ReadMe Or check the commit history (if you want).' +
Talk with the dev: < ZӘK >#2509 @ AutoTrimps Discord Channel\ +
See ReadMe Or check the commit history (if you want).' , action = 'cancelTooltip()' , title = 'Script Update Notice
' + ATversion , acceptBtnText = "Thank you for playing AutoTrimps. Accept and Continue." From 4df5210bfc3d3b4e90a85ad2b9d9d8eca549f63e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 17:00:38 +0100 Subject: [PATCH 0371/3477] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 810183f9a..f2e3e37fc 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ # AutoTrimps + Zek -[![Join the chat at https://gitter.im/AutoTrimps/Lobby](https://badges.gitter.im/AutoTrimps/Lobby.svg)](https://gitter.im/AutoTrimps/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ## Discussion / Discord Channel - -Discord is a chat program. Come to talk about AutoTrimps, for help, or suggestions for new features : https://discord.gg/0VbWe0dxB9kIfV2C (same one as zininzinin) + +Discord is a chat program. Come to talk about AutoTrimps, for help, or suggestions for new features : https://discord.gg/Ztcnfjr (Shhhh) ## Current Version (full changes below) - Ongoing Development! - Too many to list From da18c9f8112a48cc45dec3c54ff97fd8b5d6f372 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 19:33:16 +0100 Subject: [PATCH 0372/3477] Update heirlooms.js --- modules/heirlooms.js | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 2276597ec..26b51e3ef 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -273,9 +273,8 @@ function evaluateHeirloomMods(loom, location, upgrade) { tempEff = ((loom.mods[m][1]/100) * cmb)/(ccb * cmb + 1 - ccb); eff += tempEff; if(upgrade){ - if(loom.mods[m][1] >= 30) break; steps = game.heirlooms.Shield.critChance.steps[loom.rarity]; - tempEff = ((steps[2]/100) * critmult)/((critchance * critmult) + 1 - critchance); + tempEff = ((steps[2]/10) * critmult)/((critchance * critmult) + 1 - critchance); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -289,7 +288,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { eff += tempEff; if(upgrade){ steps = game.heirlooms.Shield.critDamage.steps[loom.rarity]; - tempEff = ((steps[2]/100)* critchance)/((critchance * critmult) + 1 - critchance); + tempEff = ((steps[2]/10)* critchance)/((critchance * critmult) + 1 - critchance); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -303,7 +302,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { eff += tempEff; if(upgrade){ steps = game.heirlooms.Shield.trimpAttack.steps[loom.rarity]; - tempEff = (steps[2]/100)/((game.heirlooms.Shield.trimpAttack.currentBonus/100) + 1); + tempEff = (steps[2]/10)/((game.heirlooms.Shield.trimpAttack.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -317,7 +316,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { eff += tempEff; if(upgrade){ steps = game.heirlooms.Shield.voidMaps.steps[loom.rarity]; - tempEff = (steps[2]/100)/((game.heirlooms.Shield.voidMaps.currentBonus/100) + 1); + tempEff = (steps[2]/10)/((game.heirlooms.Shield.voidMaps.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -347,7 +346,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.75*steps[2]/100)/((game.heirlooms.Staff.MinerSpeed.currentBonus/100) + 1); + tempEff = (0.75*steps[2]/10)/((game.heirlooms.Staff.MinerSpeed.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -361,7 +360,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.75*steps[2]/100)/((game.heirlooms.Staff.metalDrop.currentBonus/100) + 1); + tempEff = (0.75*steps[2]/10)/((game.heirlooms.Staff.metalDrop.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -370,12 +369,12 @@ function evaluateHeirloomMods(loom, location, upgrade) { } } break; - case 'DragimpSpeed': - tempEff = 0.75*loom.mods[m][1]/100; + case 'fragmentsDrop': + tempEff = 0.75*loom.mods[m][1]/10; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.75*steps[2]/100)/((game.heirlooms.Staff.DragimpSpeed.currentBonus/100) + 1); + tempEff = (0.75*steps[2]/10)/((game.heirlooms.Staff.fragmentsDrop.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -384,12 +383,12 @@ function evaluateHeirloomMods(loom, location, upgrade) { } } break; - case 'gemsDrop': + case 'ExplorerSpeed': tempEff = 0.75*loom.mods[m][1]/100; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.75*steps[2]/100)/((game.heirlooms.Staff.gemsDrop.currentBonus/100) + 1); + tempEff = (0.75*steps[2]/100)/((game.heirlooms.Staff.ExplorerSpeed.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -399,11 +398,11 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'FarmerSpeed': - tempEff = 0.5*loom.mods[m][1]/100; + tempEff = 0.5*loom.mods[m][1]/1000; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.5*steps[2]/100)/((game.heirlooms.Staff.FarmerSpeed.currentBonus/100) + 1); + tempEff = (0.5*steps[2]/1000)/((game.heirlooms.Staff.FarmerSpeed.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -413,11 +412,11 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'LumberjackSpeed': - tempEff = 0.5*loom.mods[m][1]/100; + tempEff = 0.5*loom.mods[m][1]/1000; eff += tempEff; if(upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.5*steps[2]/100)/((game.heirlooms.Staff.LumberjackSpeed.currentBonus/100) + 1); + tempEff = (0.5*steps[2]/1000)/((game.heirlooms.Staff.LumberjackSpeed.currentBonus/100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if(tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; From b8936f1374e66d65120d6a01b311ecf1dacef6de Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 20:41:33 +0100 Subject: [PATCH 0373/3477] Update other.js --- modules/other.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/modules/other.js b/modules/other.js index 260eb034a..2008e48f6 100644 --- a/modules/other.js +++ b/modules/other.js @@ -369,3 +369,36 @@ else if (perked == true && game.global.world !== getPageSetting('lootdumpz')) { perked = false; } } + +function buyWeps() { + if (game.equipment.Dagger.level < CapEquip2) { + game.global.buyAmt = 1; + buyEquipment('Dagger'); + cancelTooltip(); + } + if (game.equipment.Mace.level < CapEquip2) { + game.global.buyAmt = 1; + buyEquipment('Mace'); + cancelTooltip(); + } + if (game.equipment.Polearm.level < CapEquip2) { + game.global.buyAmt = 1; + buyEquipment('Polearm'); + cancelTooltip(); + } + if (game.equipment.Battleaxe.level < CapEquip2) { + game.global.buyAmt = 1; + buyEquipment('Battleaxe'); + cancelTooltip(); + } + if (game.equipment.Greatsword.level < CapEquip2) { + game.global.buyAmt = 1; + buyEquipment('Greatsword'); + cancelTooltip(); + } + if (game.equipment.Arbalest.level < CapEquip2) { + game.global.buyAmt = 1; + buyEquipment('Arbalest'); + cancelTooltip(); + } +} From 6add83e6bcea1959f822cf310b817fcc7739c691 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 20:43:16 +0100 Subject: [PATCH 0374/3477] Update upgrades.js --- modules/upgrades.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 7207ac9df..25833a4e1 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -12,8 +12,6 @@ function buyUpgrades() { if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; //skip bloodlust during scientist challenges and while we have autofight enabled. if (upgrade == 'Bloodlust' && game.global.challengeActive == 'Scientist' && getPageSetting('BetterAutoFight')) continue; - //skip potency when autoBreedTimer is disabled - if (upgrade == 'Potency' && getPageSetting('GeneticistTimer') >= 0) continue; //Main logics: if (!available) continue; From ad852e1b9f1ffc0ba2a074256f5513b2088bb684 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 20:52:37 +0100 Subject: [PATCH 0375/3477] Update other.js --- modules/other.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/other.js b/modules/other.js index 2008e48f6..de4c42bf6 100644 --- a/modules/other.js +++ b/modules/other.js @@ -371,32 +371,32 @@ else if (perked == true && game.global.world !== getPageSetting('lootdumpz')) { } function buyWeps() { - if (game.equipment.Dagger.level < CapEquip2) { + if (game.equipment.Dagger.level < getPageSetting('CapEquip2')) { game.global.buyAmt = 1; buyEquipment('Dagger'); cancelTooltip(); } - if (game.equipment.Mace.level < CapEquip2) { + if (game.equipment.Mace.level < getPageSetting('CapEquip2')) { game.global.buyAmt = 1; buyEquipment('Mace'); cancelTooltip(); } - if (game.equipment.Polearm.level < CapEquip2) { + if (game.equipment.Polearm.level < getPageSetting('CapEquip2')) { game.global.buyAmt = 1; buyEquipment('Polearm'); cancelTooltip(); } - if (game.equipment.Battleaxe.level < CapEquip2) { + if (game.equipment.Battleaxe.level < getPageSetting('CapEquip2')) { game.global.buyAmt = 1; buyEquipment('Battleaxe'); cancelTooltip(); } - if (game.equipment.Greatsword.level < CapEquip2) { + if (game.equipment.Greatsword.level < getPageSetting('CapEquip2')) { game.global.buyAmt = 1; buyEquipment('Greatsword'); cancelTooltip(); } - if (game.equipment.Arbalest.level < CapEquip2) { + if (game.equipment.Arbalest.level < getPageSetting('CapEquip2')) { game.global.buyAmt = 1; buyEquipment('Arbalest'); cancelTooltip(); From 9571022e84355d68672cc7668966a352fbed425d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 21:24:50 +0100 Subject: [PATCH 0376/3477] Update other.js --- modules/other.js | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/modules/other.js b/modules/other.js index de4c42bf6..cc18de006 100644 --- a/modules/other.js +++ b/modules/other.js @@ -371,34 +371,25 @@ else if (perked == true && game.global.world !== getPageSetting('lootdumpz')) { } function buyWeps() { - if (game.equipment.Dagger.level < getPageSetting('CapEquip2')) { - game.global.buyAmt = 1; - buyEquipment('Dagger'); - cancelTooltip(); + preBuy(); + game.global.buyAmt = 1; + if (game.equipment.Dagger.level < getPageSetting('CapEquip2') && canAffordBuilding('Dagger', null, null, true)) { + buyEquipment('Dagger', true, true); } - if (game.equipment.Mace.level < getPageSetting('CapEquip2')) { - game.global.buyAmt = 1; - buyEquipment('Mace'); - cancelTooltip(); + if (game.equipment.Mace.level < getPageSetting('CapEquip2') && canAffordBuilding('Mace', null, null, true)) { + buyEquipment('Mace', true, true); } - if (game.equipment.Polearm.level < getPageSetting('CapEquip2')) { - game.global.buyAmt = 1; - buyEquipment('Polearm'); - cancelTooltip(); + if (game.equipment.Polearm.level < getPageSetting('CapEquip2') && canAffordBuilding('Polearm', null, null, true)) { + buyEquipment('Polearm', true, true); } - if (game.equipment.Battleaxe.level < getPageSetting('CapEquip2')) { - game.global.buyAmt = 1; - buyEquipment('Battleaxe'); - cancelTooltip(); + if (game.equipment.Battleaxe.level < getPageSetting('CapEquip2') && canAffordBuilding('Battleaxe', null, null, true)) { + buyEquipment('Battleaxe', true, true); } - if (game.equipment.Greatsword.level < getPageSetting('CapEquip2')) { - game.global.buyAmt = 1; - buyEquipment('Greatsword'); - cancelTooltip(); + if (game.equipment.Greatsword.level < getPageSetting('CapEquip2') && canAffordBuilding('Greatsword', null, null, true)) { + buyEquipment('Greatsword', true, true); } - if (game.equipment.Arbalest.level < getPageSetting('CapEquip2')) { - game.global.buyAmt = 1; - buyEquipment('Arbalest'); - cancelTooltip(); + if (game.equipment.Arbalest.level < getPageSetting('CapEquip2') && canAffordBuilding('Arbalest', null, null, true)) { + buyEquipment('Arbalest', true, true); } + postBuy(); } From a16b2d7ed123f08e374da92b8c64b220c0a76894 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 21:29:51 +0100 Subject: [PATCH 0377/3477] Update other.js --- modules/other.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/other.js b/modules/other.js index cc18de006..7b3787329 100644 --- a/modules/other.js +++ b/modules/other.js @@ -10,6 +10,7 @@ var mapbought = false; var failpvoidraid = false; var prestvoid = false; var mapboughtvoid = false; +var bwraidon = false; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { //exit if the cooldown is active, or we havent unlocked robotrimp. @@ -237,6 +238,7 @@ function Praiding() { //BWrmn //BWrmx function BWraiding() { + bwraidon = true; if (!prestraidon && game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { if (getPageSetting('AutoMaps') == 1 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; @@ -259,6 +261,7 @@ function BWraiding() { if (getPageSetting('AutoMaps') == 0 && game.global.world >= getPageSetting('BWraidingz') && !bwraided) { autoTrimpSettings["AutoMaps"].value = 1; failbwraid = true; + bwraidon = false; debug("Failed to BW raid. Looks like you don't have a BW to raid..."); } return; @@ -285,9 +288,11 @@ function BWraiding() { else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); + bwraidon = false; } if (bwraided == true && game.global.world !== getPageSetting('BWraidingz')) { bwraided = false; + bwraidon = false; } } From dc047cff4246641d4f6670adf0da5d3a38ee2dcb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 21:30:37 +0100 Subject: [PATCH 0378/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index f3a1e1dec..01c38ad62 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -208,6 +208,7 @@ function mainLoop() { //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) + if (getPageSetting('BWraid'==true && bwraidon) buyWeps(); if (getPageSetting('VoidPraid')==true)Praidingvoid(); if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) From 3d0cb21054601487b429dd0fd1b7c1cede393ece Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 21:32:09 +0100 Subject: [PATCH 0379/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 01c38ad62..d2adf7f9f 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -208,7 +208,7 @@ function mainLoop() { //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) - if (getPageSetting('BWraid'==true && bwraidon) buyWeps(); + if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); if (getPageSetting('VoidPraid')==true)Praidingvoid(); if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) From 31a648b37d1609761197a5a3ead4b2b0836e8d8c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 21:38:28 +0100 Subject: [PATCH 0380/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index d2adf7f9f..4b7865b84 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -204,12 +204,12 @@ function mainLoop() { setScienceNeeded(); //determine how much science is needed //EXECUTE CORE LOGIC - if (getPageSetting('ExitSpireCell') >0) exitSpireCell(); //"Exit Spire After Cell" (other.js) + if (getPageSetting('ExitSpireCell') > 0) exitSpireCell(); //"Exit Spire After Cell" (other.js) //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) - if (getPageSetting('Praidingzone') >0) Praiding(); //Prestige Raiding (other.js) - if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) - if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); - if (getPageSetting('VoidPraid')==true)Praidingvoid(); + if (getPageSetting('Praidingzone') > 0 && game.global.world == getPageSetting('Praidingzone')) Praiding(); //Prestige Raiding (other.js) + if (getPageSetting('BWraid')==true && game.global.world == getPageSetting('BWraidingz')){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) + if (game.global.world == getPageSetting('BWraidingz') && getPageSetting('BWraid')==true && bwraidon) buyWeps(); + if (getPageSetting('VoidPraid')==true && game.global.world == getPageSetting('VoidMaps'))Praidingvoid(); if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); From 3ebf046960cd8fd4b362d75279dfc13225905f37 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 21:41:43 +0100 Subject: [PATCH 0381/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 4b7865b84..74a98b801 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -206,10 +206,10 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') > 0) exitSpireCell(); //"Exit Spire After Cell" (other.js) //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) - if (getPageSetting('Praidingzone') > 0 && game.global.world == getPageSetting('Praidingzone')) Praiding(); //Prestige Raiding (other.js) - if (getPageSetting('BWraid')==true && game.global.world == getPageSetting('BWraidingz')){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) - if (game.global.world == getPageSetting('BWraidingz') && getPageSetting('BWraid')==true && bwraidon) buyWeps(); - if (getPageSetting('VoidPraid')==true && game.global.world == getPageSetting('VoidMaps'))Praidingvoid(); + if (getPageSetting('Praidingzone') > 0) Praiding(); //Prestige Raiding (other.js) + if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) + if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); + if (getPageSetting('VoidPraid')==true) Praidingvoid(); if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); From 5185f0fa73424bbbc5bdb3fff7138456e85e0b50 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 21:42:45 +0100 Subject: [PATCH 0382/3477] Update other.js --- modules/other.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 7b3787329..ead3f8bf5 100644 --- a/modules/other.js +++ b/modules/other.js @@ -238,7 +238,6 @@ function Praiding() { //BWrmn //BWrmx function BWraiding() { - bwraidon = true; if (!prestraidon && game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { if (getPageSetting('AutoMaps') == 1 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; @@ -261,7 +260,6 @@ function BWraiding() { if (getPageSetting('AutoMaps') == 0 && game.global.world >= getPageSetting('BWraidingz') && !bwraided) { autoTrimpSettings["AutoMaps"].value = 1; failbwraid = true; - bwraidon = false; debug("Failed to BW raid. Looks like you don't have a BW to raid..."); } return; @@ -269,6 +267,7 @@ function BWraiding() { } if (findLastBionic().level <= getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { runMap(); + bwraidon = true; } if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level > getPageSetting('BWraidingz') && game.global.mapsActive) { repeatClicked(); From 4b569216c406a51da60885e0029a7d4376bb0cee Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 21:50:44 +0100 Subject: [PATCH 0383/3477] Update other.js --- modules/other.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index ead3f8bf5..05a131574 100644 --- a/modules/other.js +++ b/modules/other.js @@ -239,6 +239,11 @@ function Praiding() { //BWrmx function BWraiding() { if (!prestraidon && game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { + if (game.global.mapsActive) { + if (getCurrentMapObject().level <= getPageSetting('BWraidingmax')) { + buyWeps(); + } + } if (getPageSetting('AutoMaps') == 1 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } @@ -267,14 +272,13 @@ function BWraiding() { } if (findLastBionic().level <= getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { runMap(); - bwraidon = true; } if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level > getPageSetting('BWraidingz') && game.global.mapsActive) { repeatClicked(); } else if (game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level <= getPageSetting('BWraidingz') && game.global.mapsActive) { repeatClicked(); - } + } if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { bwraided = true; failbwraid = false; @@ -287,11 +291,9 @@ function BWraiding() { else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); - bwraidon = false; } if (bwraided == true && game.global.world !== getPageSetting('BWraidingz')) { bwraided = false; - bwraidon = false; } } From 9abbec52b31edd218f81cb092458fda465740890 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 21:55:26 +0100 Subject: [PATCH 0384/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 05a131574..83f8d0541 100644 --- a/modules/other.js +++ b/modules/other.js @@ -270,7 +270,7 @@ function BWraiding() { return; } - if (findLastBionic().level <= getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { + if (findLastBionic().level <= getPageSetting('BWraidingmax') && !bwraided && !failbwraid && game.global.preMapsActive) { runMap(); } if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level > getPageSetting('BWraidingz') && game.global.mapsActive) { From ce781c0ca435338b6d3d3bb96af4c69b2c28eb3d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 22:00:38 +0100 Subject: [PATCH 0385/3477] Update other.js --- modules/other.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/other.js b/modules/other.js index 83f8d0541..219868172 100644 --- a/modules/other.js +++ b/modules/other.js @@ -239,11 +239,6 @@ function Praiding() { //BWrmx function BWraiding() { if (!prestraidon && game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { - if (game.global.mapsActive) { - if (getCurrentMapObject().level <= getPageSetting('BWraidingmax')) { - buyWeps(); - } - } if (getPageSetting('AutoMaps') == 1 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } @@ -279,6 +274,11 @@ function BWraiding() { else if (game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level <= getPageSetting('BWraidingz') && game.global.mapsActive) { repeatClicked(); } + if (game.global.mapsActive && !bwraided && !failbwraid) { + if (getCurrentMapObject().level <= getPageSetting('BWraidingmax')) { + buyWeps(); + } + } if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { bwraided = true; failbwraid = false; From 51e302c3742147a6997a954b8cb19b7b800b3919 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 22:03:59 +0100 Subject: [PATCH 0386/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 219868172..e24da9b15 100644 --- a/modules/other.js +++ b/modules/other.js @@ -274,7 +274,7 @@ function BWraiding() { else if (game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level <= getPageSetting('BWraidingz') && game.global.mapsActive) { repeatClicked(); } - if (game.global.mapsActive && !bwraided && !failbwraid) { + if (game.global.mapsActive) { if (getCurrentMapObject().level <= getPageSetting('BWraidingmax')) { buyWeps(); } From 3b86d781d9540452c07906bf0fb7360b4a643452 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 22:06:46 +0100 Subject: [PATCH 0387/3477] Update other.js --- modules/other.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/other.js b/modules/other.js index e24da9b15..b7a4b3f87 100644 --- a/modules/other.js +++ b/modules/other.js @@ -274,11 +274,6 @@ function BWraiding() { else if (game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level <= getPageSetting('BWraidingz') && game.global.mapsActive) { repeatClicked(); } - if (game.global.mapsActive) { - if (getCurrentMapObject().level <= getPageSetting('BWraidingmax')) { - buyWeps(); - } - } if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { bwraided = true; failbwraid = false; From 708cc1f760c483dcbd7e8ec565709496d02f1811 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 14 Jun 2018 22:10:42 +0100 Subject: [PATCH 0388/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 74a98b801..963cb8ab9 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -241,6 +241,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 (game.global.mapsActive && getPageSetting('BWraid') == true && game.global.world == getPageSetting('BWraidingz') && getCurrentMapObject().level <= getPageSetting('BWraidingmax')) buyWeps(); // //Runs any user provided scripts, see line 254 below if (userscriptOn) userscripts(); From ef6023b3f02fa8e594661eb413a8c6ef437820c8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 15 Jun 2018 12:07:57 +0100 Subject: [PATCH 0389/3477] Update perks.js --- modules/perks.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index a35bdf665..967ba6162 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -37,9 +37,6 @@ var preset_HiderBalance = [75, 4, 8, 4, 1, 4, 24, 1, 75, 0.5, 3, 1, 1]; var preset_HiderMore = [20, 4, 10, 12, 1, 8, 8, 1, 40, 0.1, 0.5, 1, 1]; var preset_genBTC = [100, 8, 8, 4, 4, 5, 18, 8, 14, 1, 1, 1, 1]; var preset_genBTC2 = [96, 19, 15.4, 8, 8, 7, 14, 19, 11, 1, 1, 1, 1]; -var preset_Zek4501 = [300, 1, 30, 2, 4, 2, 9, 8, 17, 0.1, 1, 320, 1]; -var preset_Zek4502 = [350, 1, 40, 2, 3, 2, 5, 8, 2, 0.1, 1, 300, 20]; -var preset_Zek450 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 4, 0.04, 1, 120, 175]; // var preset_space = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; // @@ -50,8 +47,10 @@ var preset_Zek229 = [11.2, 0.58, 2.37, 1.464, 0.3, 2.02, 12.2, 0.58, 37, 0.22, 2 var preset_Zek299 = [16.8, 3, 1.9, 1.1, 1.2, 1, 17.1, 3, 100, 0.06, 0.8, 0, 0]; var preset_Zek399 = [135, 6.1, 18.5, 6.5, 2.5, 6, 17, 6.1, 25, 0.08, 1, 0, 0]; var preset_Zek449 = [245, 5.85, 29, 1.95, 2.8, 6, 6.1, 5.85, 15, 0.05, 1, 57, 0]; +var preset_Zek450 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 6, 0.03, 1, 120, 175]; +var preset_Zek500 = [600, 2.4, 60, 2, 1, 2.5, 8, 2.4, 4, 0.02, 1, 145, 180]; //gather these into an array of objects. this is one important object. -var presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2,preset_Zek4501,preset_Zek4502,preset_Zek450,preset_space,preset_Zek059,preset_Zek100,preset_Zek180,preset_Zek229,preset_Zek299,preset_Zek399,preset_Zek449,preset_Zek450,preset_space]; +var presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2,preset_space,preset_Zek059,preset_Zek100,preset_Zek180,preset_Zek229,preset_Zek299,preset_Zek399,preset_Zek449,preset_Zek450,preset_Zek500,preset_space]; //Specific ratios labeled above must be given the matching ID below. //Ratio preset dropdown list var presetListHtml = "\ @@ -67,9 +66,6 @@ var presetListHtml = "\ \ \ \ -\ -\ -\ \ \ \ @@ -78,7 +74,8 @@ var presetListHtml = "\ \ \ \ -\ +\ +\ \ "; //Custom Creation for all perk customRatio boxes in Trimps Perk Window From 076bf63cd20a6d589c0849ce82cc6ebdf8be3d64 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 15 Jun 2018 12:11:30 +0100 Subject: [PATCH 0390/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 963cb8ab9..0f67de16b 100644 --- a/AutoTrimps2.js +++ b/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', 'ATcalc']; + ATmoduleList = ['query', 'portal', 'upgrades', 'heirlooms', 'buildings', 'jobs', 'equipment', 'gather', 'stance', 'battlecalc', 'maps', 'breedtimer', 'dynprestige', 'fight', 'scryer', 'magmite', 'other', 'import-export', 'client-server', 'perks', 'fight-info', 'performance', 'ATcalc']; for (var m in ATmoduleList) { ATscriptLoad(modulepath, ATmoduleList[m]); } @@ -62,7 +62,8 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "13/06/2018", version: "v2.2.3", description: "Plus maps for voids has been changed. It now works the same as Prestige raiding. Check tooltip for more details. Ratios will be out soon, including the new z500. ", isNew: true}); +changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: true}); +changelogList.push({date: "13/06/2018", version: "v2.2.3", description: "Plus maps for voids has been changed. It now works the same as Prestige raiding. Check tooltip for more details. Ratios will be out soon, including the new z500. ", isNew: false}); changelogList.push({date: "05/06/2018", version: "v2.2.2", description: "Fixed map at zone. Updated calcs. Praiding should work for everyone now. BW raiding still being tested, but should work. Ratios being tested, finding optimum coord and carp. Any bugs, please let me know, thanks. ", isNew: false}); changelogList.push({date: "05/06/2018", version: "v2.2.1", description: "Updated Heirloom calc, should be 4.8 ready. Ratios will be updated soon. ", isNew: false}); changelogList.push({date: "28/05/2018", version: "v2.2", description: "Welcome to the Zek fork. Added single use prestige raiding, BW raiding, looting II dump, amals are now calcd properly. ", isNew: false}); From 80318dbdb630b8f5f49f75a5357c7319997b5a2f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 15 Jun 2018 12:15:08 +0100 Subject: [PATCH 0391/3477] Update perks.js --- modules/perks.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index 967ba6162..50414bc5c 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -42,13 +42,13 @@ var preset_space = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; // var preset_Zek059 = [7, 0.6, 3, 0.8, 0.3, 3, 25, 0.6, 0, 0, 0, 0, 0]; var preset_Zek100 = [9.8, 1.8, 3.2, 2.6, 0.7, 2.9, 25, 1.8, 0, 0, 0, 0, 0]; -var preset_Zek180 = [13, 1.3, 4, 2.6, 0.7, 2.9, 25, 1.3, 35, 0.05, 1, 0, 0]; -var preset_Zek229 = [11.2, 0.58, 2.37, 1.464, 0.3, 2.02, 12.2, 0.58, 37, 0.22, 2.2, 0, 0]; -var preset_Zek299 = [16.8, 3, 1.9, 1.1, 1.2, 1, 17.1, 3, 100, 0.06, 0.8, 0, 0]; -var preset_Zek399 = [135, 6.1, 18.5, 6.5, 2.5, 6, 17, 6.1, 25, 0.08, 1, 0, 0]; -var preset_Zek449 = [245, 5.85, 29, 1.95, 2.8, 6, 6.1, 5.85, 15, 0.05, 1, 57, 0]; -var preset_Zek450 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 6, 0.03, 1, 120, 175]; -var preset_Zek500 = [600, 2.4, 60, 2, 1, 2.5, 8, 2.4, 4, 0.02, 1, 145, 180]; +var preset_Zek180 = [13, 1.3, 4, 2.6, 0.7, 2.9, 25, 1.3, 37, 0.05, 1, 0, 0]; +var preset_Zek229 = [11.2, 0.58, 2.37, 1.464, 0.3, 2.02, 12.2, 0.58, 39, 0.22, 2.2, 0, 0]; +var preset_Zek299 = [16.8, 3, 1.9, 1.1, 1.2, 1, 17.1, 3, 105, 0.06, 0.8, 0, 0]; +var preset_Zek399 = [135, 6.1, 18.5, 6.5, 2.5, 6, 17, 6.1, 28, 0.08, 1, 0, 0]; +var preset_Zek449 = [245, 5.85, 29, 1.95, 2.8, 6, 6.1, 5.85, 18, 0.05, 1, 57, 0]; +var preset_Zek450 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 10, 0.03, 1, 120, 175]; +var preset_Zek500 = [600, 2.4, 60, 2, 1, 2.5, 8, 2.4, 8, 0.02, 1, 145, 180]; //gather these into an array of objects. this is one important object. var presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2,preset_space,preset_Zek059,preset_Zek100,preset_Zek180,preset_Zek229,preset_Zek299,preset_Zek399,preset_Zek449,preset_Zek450,preset_Zek500,preset_space]; //Specific ratios labeled above must be given the matching ID below. From 43f79165f0c727f82aa4db090707b60f5941ff61 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 15 Jun 2018 12:33:04 +0100 Subject: [PATCH 0392/3477] Update other.js --- modules/other.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/modules/other.js b/modules/other.js index b7a4b3f87..685110e91 100644 --- a/modules/other.js +++ b/modules/other.js @@ -150,6 +150,7 @@ function plusPres() { document.getElementById("difficultyAdvMapsRange").value = 9; document.getElementById("sizeAdvMapsRange").value = 9; document.getElementById('advPerfectCheckbox').checked = false; + document.getElementById("mapLevelInput").value = game.global.world; updateMapCost(); } @@ -394,3 +395,30 @@ function buyWeps() { } postBuy(); } + +function buyArms() { + preBuy(); + game.global.buyAmt = 10; + if (game.equipment.Shield.level < getPageSetting('CapEquip2') && canAffordBuilding('Shield', null, null, true)) { + buyEquipment('Shield', true, true); + } + if (game.equipment.Boots.level < getPageSetting('CapEquip2') && canAffordBuilding('Boots', null, null, true)) { + buyEquipment('Boots', true, true); + } + if (game.equipment.Helmet.level < getPageSetting('CapEquip2') && canAffordBuilding('Helmet', null, null, true)) { + buyEquipment('Helmet', true, true); + } + if (game.equipment.Pants.level < getPageSetting('CapEquip2') && canAffordBuilding('Pants', null, null, true)) { + buyEquipment('Pants', true, true); + } + if (game.equipment.Shoulderguards.level < getPageSetting('CapEquip2') && canAffordBuilding('Shoulderguards', null, null, true)) { + buyEquipment('Shoulderguards', true, true); + } + if (game.equipment.Breastplate.level < getPageSetting('CapEquip2') && canAffordBuilding('Breastplate', null, null, true)) { + buyEquipment('Breastplate', true, true); + } + if (game.equipment.Gambeson.level < getPageSetting('CapEquip2') && canAffordBuilding('Gambeson', null, null, true)) { + buyEquipment('Gambeson', true, true); + } + postBuy(); +} From e8b25ca4232fb05c2f966781af27aaa50f961b9c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 15 Jun 2018 12:43:27 +0100 Subject: [PATCH 0393/3477] Update fight.js --- modules/fight.js | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index 2d869ff0c..b76d8a309 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -112,20 +112,10 @@ function betterAutoFight3() { if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive) return; //sanity check. if (!game.global.fighting) { - fightManual(); + fightManual(); + } + if (game.global.soldierHealth == 0 && !game.global.preMapsActive) { + buyArms(); } } -/* code borrowed from Sliverz as a starting point -if (game.global.soldierHealth == 0 && !(game.global.spireActive || (game.global.mapsActive && getCurrentMapObject().location == "Void") || game.global.preMapsActive)) { - fightManual(); - buyArmors(); - } - if (game.global.antiStacks != 45 && game.global.realBreedTime >= 45500 && !game.global.SpireActive) { - forceAbandonTrimps(); - } - if ((needPrestige || !enoughDamage) && game.global.world>=200 && (getEmpowerment() == "Ice" || (getEmpowerment() == "Wind" && game.global.realBreedTime >= 45500)) && !game.global.mapsActive && game.global.mapBonus != 10 && game.global.world!=game.options.menu.mapAtZone.setZone) { - forceAbandonTrimps(); - } - - */ From 3e4c8d048f987c7636929e6f2726579f67532dfb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 15 Jun 2018 13:33:51 +0100 Subject: [PATCH 0394/3477] Update stance.js --- modules/stance.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index b91807a86..8cf2ce1bb 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -542,23 +542,24 @@ function autoStanceCheck(enemyCrit) { function autoStance3() { //get back to a baseline of no stance (X) - calcBaseDamageinX(); + calcBaseDamageinX2(); //no need to continue if (game.global.gridArray.length === 0) return; if (game.global.soldierHealth <= 0) return; //dont calculate stances when dead, cause the "current" numbers are not updated when dead. if (getPageSetting('AutoStance') == 0) return; if (!game.upgrades.Formations.done) return; + if (game.global.world <= 70) return; var windstackzone = getPageSetting('WindStackingMin'); - if(game.global.world>=80) { - if( getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200 || (windstackzone < 0) || (windstackzone >= game.global.world) || game.global.spireActive) { - setFormation(2); - return; + if (getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200 || (windstackzone < 0) || (windstackzone >= game.global.world) || game.global.spireActive) { + if (!(game.global.mapsActive && game.global.mapsOwnedArray[getMapIndex(game.global.currentMapId)].bonus === "lmc")) { + setFormation(2); + return; + } } else if (game.global.world >= windstackzone) { setFormation(4); return; } - } } From 13c2258fbc7a14264b569332188dd14063d7e6ab Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 15 Jun 2018 19:18:17 +0100 Subject: [PATCH 0395/3477] Update heirlooms.js --- modules/heirlooms.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 26b51e3ef..10c8011d4 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -25,7 +25,7 @@ function worthOfHeirlooms(){ } } - +var animated = (game.options.menu.showHeirloomAnimations.enabled) ? "animated " : ""; //NEW: //makes an array of heirlooms sitting in the temporary extra area to indicate to the autoHeirlooms2() function which to Carry/Drop var worth2 = {'Shield': [], 'Staff': []}; From f453c1372472af7ba99942a09ccbd672503c0021 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 15 Jun 2018 23:09:25 +0100 Subject: [PATCH 0396/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 685110e91..cbc91737b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -245,7 +245,7 @@ function BWraiding() { } if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { mapsClicked(); - if (!game.global.switchToMaps) { + if (!game.global.preMapsActive) { mapsClicked(); } } From a86931789ac3f724ed6f4a0616910c2174681e5a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 15 Jun 2018 23:11:50 +0100 Subject: [PATCH 0397/3477] Update fight.js --- modules/fight.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index b76d8a309..23e306752 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -111,11 +111,11 @@ function betterAutoFight3() { pauseFight(); //activates autofight if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive) return; //sanity check. + if (!game.global.fighting && !game.global.preMapsActive) { + buyArms(); + } if (!game.global.fighting) { fightManual(); } - if (game.global.soldierHealth == 0 && !game.global.preMapsActive) { - buyArms(); - } } From 5958122aec47483ee230b0b7e43789ce3ad26bc8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 16 Jun 2018 14:20:05 +0100 Subject: [PATCH 0398/3477] Update heirlooms.js --- modules/heirlooms.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 10c8011d4..7226c6c19 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -543,7 +543,7 @@ function newSelectHeirloom(number, location, elem){ } //replacement function that inserts a new onclick action into the heirloom icons so it can populate the proper Protect icon. (yes this is the best way to do it.) -function generateHeirloomIcon(heirloom, location, number){ +/*function generateHeirloomIcon(heirloom, location, number){ if (typeof heirloom.name === 'undefined') return ""; var icon = (heirloom.type == "Shield") ? 'icomoon icon-shield3' : 'glyphicon glyphicon-grain'; var html = ' '; return html; } +*/ From 6c91d386d551eaa20937a62d26681d408ee619c9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 16 Jun 2018 14:51:02 +0100 Subject: [PATCH 0399/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 6b073aca8..937a21948 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -699,7 +699,7 @@ function autoSetValueToolTip(id, text,negative) { if (negative) tooltipText += 'Accepts negative numbers as validated inputs.'; else - tooltipText += 'Put -1 for Infinite.'; + tooltipText += ' Put -1 for Infinite.'; tooltipText += '

'; var costText = '

Apply
Cancel
'; game.global.lockTooltip = true; From 4d45e82facc03b2f38a3b96b171ba3695cc95480 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 16 Jun 2018 15:05:04 +0100 Subject: [PATCH 0400/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 937a21948..c5d04cbe9 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -697,7 +697,7 @@ function autoSetValueToolTip(id, text,negative) { var elem = document.getElementById("tooltipDiv"); var tooltipText = 'Type a number below. You can also use shorthand such as 2e5 or 200k.'; if (negative) - tooltipText += 'Accepts negative numbers as validated inputs.'; + tooltipText += ' Accepts negative numbers as validated inputs.'; else tooltipText += ' Put -1 for Infinite.'; tooltipText += '

'; From 22517b2d3e48b5754c0bf22b0407b4945eff44a4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 17 Jun 2018 13:45:50 +0100 Subject: [PATCH 0401/3477] Update other.js --- modules/other.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index cbc91737b..12e3bcb34 100644 --- a/modules/other.js +++ b/modules/other.js @@ -11,6 +11,7 @@ var failpvoidraid = false; var prestvoid = false; var mapboughtvoid = false; var bwraidon = false; + //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { //exit if the cooldown is active, or we havent unlocked robotrimp. @@ -296,8 +297,13 @@ function BWraiding() { //VoidPraid //Prest before voids function Praidingvoid() { - if (game.global.world == getPageSetting('VoidMaps') && getPageSetting('VoidPraid') == true && !prestvoid && !failpvoidraid) { - if (getPageSetting('AutoMaps') == 1 && !prestvoid && !failpvoidraid) { + var dailyvoidpraid = getPageSetting('DailyVoidMod'); + var VMzone = getPageSetting('VoidMaps'); + if ((game.global.challengeActive == "Daily") && (getPageSetting('AutoFinishDailyNew') != 999) && (getPageSetting('DailyVoidMod'))) { + (VMzone += dailyvoidpraid); + } + if (game.global.world == VMzone && getPageSetting('VoidPraid') == true && !prestvoid && !failpvoidraid) { + if (getPageSetting('AutoMaps') == 1 && !prestvoid && !failpvoidraid) { autoTrimpSettings["AutoMaps"].value = 0; } if (!game.global.preMapsActive && !game.global.mapsActive && !prestvoid && !failpvoidraid) { @@ -343,7 +349,7 @@ function BWraiding() { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } - if (prestvoid == true && game.global.world !== getPageSetting('VoidMaps')) { + if (prestvoid == true && game.global.world !== VMzone) { prestvoid = false; mapboughtvoid = false; } From 6f3ced23860f3817d4b1ad59211065a78f75bb31 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 12:53:20 +0100 Subject: [PATCH 0402/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index c5d04cbe9..3132da3fb 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -257,7 +257,7 @@ function initializeAllSettings() { //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. createSetting('AutoPortal', 'AutoPortal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); - createSetting('HeliumHourChallenge', 'Portal Challenge', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); + createSetting('HeliumHourChallenge', 'Portal Challenge', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. Do not choose a challenge if you havent unlocked it. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); document.getElementById("HeliumHourChallengeLabel").innerHTML = "Portal Challenge:"; //fit it on 1 line. createSetting('CustomAutoPortal', 'Custom Portal', 'Automatically portal AFTER clearing this level.(ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "Core"); createSetting('HeHrDontPortalBefore', 'Don\'t Portal Before', 'Do NOT allow Helium per Hour AutoPortal setting to portal BEFORE this level is reached. It is an additional check that prevents drops in helium/hr from triggering autoportal. Set to 0 or -1 to completely disable this check. (only shows up with Helium per Hour set)', 'value', '999', null, "Core"); @@ -484,7 +484,6 @@ function initializeAllSettings() { createSetting('ExportAutoTrimps', 'Export AutoTrimps', 'Export your AutoTrimps Settings as a output string text formatted in JSON.', 'infoclick', 'ExportAutoTrimps', null, 'Import Export'); createSetting('DefaultAutoTrimps', 'Reset to Default', 'Reset everything to the way it was when you first installed the script. ', 'infoclick', 'ResetDefaultSettingsProfiles', null, 'Import Export'); createSetting('CleanupAutoTrimps', 'Cleanup Saved Settings ', 'Deletes old values from previous versions of the script from your AutoTrimps Settings file.', 'infoclick', 'CleanupAutoTrimps', null, 'Import Export'); - createSetting('allowSettingsUpload', 'Allow Analytics Upload', 'Uploads your AUTOTRIMPS saved settings files (the same as Export AutoTrimps on this tab) anonymously - to https://autotrimps.site = the official Autotrimps development server. It will remain private for now, and aggregated for analytics to improve the script in the future and see which features are being used. Please Opt in. The upload will be approximately a small 5-10KB uncompressed text file every time the script is LOADED (for the time being until it is refined), and there is no concern for any personal data leak or privacy concern. This is all in good faith, and you are welcome to check the open source file modules/client-server.js. In the future, I will have to make a more fine-grained data-usage privacy-policy. Possible other data collected in the near-future may include certain game stats such as your highest zone, helium amount, bones, resource/magma/DE amounts, perk ratio selections. ', 'boolean', true, null, 'Import Export'); settingsProfileMakeGUI(); //Settings Profile dropdown and Delete button. (this always shows up first - can be here last) //createSetting('ExportModuleVars', 'Export Custom Variables', 'Export your custom MODULES variables.', 'infoclick', 'ExportModuleVars', null, 'Import Export'); //createSetting('ImportModuleVars', 'Import Custom Variables', 'Import your custom MODULES variables (and save).', 'infoclick', 'ImportModuleVars', null, 'Import Export'); From bde00af1bb54c04e311e22695697294375a26035 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 12:55:14 +0100 Subject: [PATCH 0403/3477] Update client-server.js --- modules/client-server.js | 83 ---------------------------------------- 1 file changed, 83 deletions(-) diff --git a/modules/client-server.js b/modules/client-server.js index 988cd7ef1..8b1378917 100644 --- a/modules/client-server.js +++ b/modules/client-server.js @@ -1,84 +1 @@ -/* - * AutoTrimps Client-Server EndPoint Data Transferance script. - * - * March 4.2018 - Simple AT data save endpoint script -- orig by Swiffy - * -*/ -//MODULES["client-server"] = {}; -//The ATServer{} object has 3 commands: GetID(), SaveData(), Upload() -//All Data is uncompressed, unencrypted, plaintext for clarity. No private info is leaked. -var ATServer = -{ - //SERVER_IP: '207.246.77.188', - SERVER_HOSTNAME: 'https://autotrimps.site/ATendpoint.php' -} - -ATServer.GetID = function(callback) -{ - var req = new XMLHttpRequest(); - - req.onreadystatechange = function() - { - if (this.readyState == 4 && this.status == 200) - { - callback(JSON.parse(req.responseText).data.id); - } - } - - req.open('GET', ATServer.SERVER_HOSTNAME, true); - req.setRequestHeader('req', 'get_id'); - req.send(); -} - -ATServer.SaveData = function(id, data, callback) -{ - var req = new XMLHttpRequest(); - - req.onreadystatechange = function() - { - if (this.readyState == 4 && this.status == 200) - { - callback(JSON.parse(req.responseText)); - } - } - - req.open('POST', ATServer.SERVER_HOSTNAME + '?id=' + id, true); - req.setRequestHeader('req', 'save_data'); - req.setRequestHeader("Content-Type", "application/json"); - req.send(JSON.stringify(data)); -} - -ATServer.Upload = function(data) -{ - ATServer.GetID(function(id) - { - autoTrimpSettings.analyticsID = autoTrimpSettings.analyticsID || id; - //debug("Server generated ID: " + autoTrimpSettings.analyticsID, "other"); - ATServer.SaveData(autoTrimpSettings.analyticsID, data, function(response) - { - debug("Submitted analytics data w/ ID: " + autoTrimpSettings.analyticsID, "other"); - }); - }); -} - -//Data to be uploaded: The version of AutoTrimps and the list of your settings file. Also list of saved/named profiles. -// note to newbs: typing in autoTrimpSettings into console and expanding the arrow will show you what is all in here. -//------------------------------------------------------------------------------------------------------------------- -//TODO: This is part of the ATsettings variable management:, it might make sense to move to that file, splitting here -//------------------------------------------------------------------------------------------------------------------- - -ATServer.UploadSettings = function() { - var loadLastProfiles = localStorage.getItem('ATSelectedSettingsProfile'); - var allProfiles = loadLastProfiles ? JSON.parse(loadLastProfiles) : new Array(); //load the import. - var ulData = { - settings: JSON.parse(serializeSettings()), //Line 41 utils.js - grabs fresh autoTrimpSettings from localstorage, reduces the length and parses it. - profiles: allProfiles, //every saved profile. - modules: MODULES - }; - ATServer.Upload(ulData); - debug("AutoTrimps Settings File was Uploaded for analytics/usage! This is controlled with a new button on AT's Import/Export tab.","general"); -} -if (getPageSetting('allowSettingsUpload')) { - ATServer.UploadSettings(); -} From ef209cb69967415f2e6b48c5c1136830edce044f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 12:55:19 +0100 Subject: [PATCH 0404/3477] Delete client-server.js --- modules/client-server.js | 1 - 1 file changed, 1 deletion(-) delete mode 100644 modules/client-server.js diff --git a/modules/client-server.js b/modules/client-server.js deleted file mode 100644 index 8b1378917..000000000 --- a/modules/client-server.js +++ /dev/null @@ -1 +0,0 @@ - From 7340670e32edb711743785e3cb74d98516a5ab4a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 13:00:41 +0100 Subject: [PATCH 0405/3477] Update maps.js --- modules/maps.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/maps.js b/modules/maps.js index 192e0f26b..0cc018aa2 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -137,9 +137,13 @@ function autoMap() { if (getPlayerCritChance() > 1) { ourBaseDamage = (baseDamage * (1 - getPlayerCritChance()) + (baseDamage * getPlayerCritChance() * getPlayerCritDamageMult() * additionalCritMulti)); } - else { + else if (getPlayerCritChance() > 0) { ourBaseDamage = (baseDamage * (1 - getPlayerCritChance()) + (baseDamage * getPlayerCritChance() * getPlayerCritDamageMult())); } + else if (getPlayerCritChance() <= 0) { + ourBaseDamage = baseDamage; + } + //calculate with map bonus var mapbonusmulti = 1 + (0.20 * game.global.mapBonus); //(autostance2 has mapbonusmulti built in) From 1102a2fb08b3135893e20195d9657278472ed9e3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 14:42:25 +0100 Subject: [PATCH 0406/3477] Update tabs.css --- tabs.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tabs.css b/tabs.css index f409ff489..4696b4ad5 100644 --- a/tabs.css +++ b/tabs.css @@ -90,3 +90,7 @@ ul.tab li a:hover {background-color: #ddd;} .queueItemName, #queueTimeRemaining { z-index: 0!important; } + +.heirloomRare8 { +text-shadow: none +} From 6109777ca8621c65e90370843bc3591bf64f69e5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 14:52:12 +0100 Subject: [PATCH 0407/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 0f67de16b..1cb7c6ee3 100644 --- a/AutoTrimps2.js +++ b/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', 'fight-info', 'performance', 'ATcalc']; + ATmoduleList = ['query', 'portal', 'upgrades', 'heirlooms', 'buildings', 'jobs', 'equipment', 'gather', 'stance', 'battlecalc', 'maps', 'breedtimer', 'dynprestige', 'fight', 'scryer', 'magmite', 'other', 'import-export', 'perks', 'fight-info', 'performance', 'ATcalc']; for (var m in ATmoduleList) { ATscriptLoad(modulepath, ATmoduleList[m]); } From 887d70904123469c0d01b06c044e166346ce3b55 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 14:55:06 +0100 Subject: [PATCH 0408/3477] Update tabs.css --- tabs.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tabs.css b/tabs.css index 4696b4ad5..eb747f4f3 100644 --- a/tabs.css +++ b/tabs.css @@ -94,3 +94,7 @@ ul.tab li a:hover {background-color: #ddd;} .heirloomRare8 { text-shadow: none } + +#wrapper { +background: -webkit-linear-gradient(left, #323341 12%,#626368 29.5%,#727275 47%,#727275 53%,#4c4d56 70.5%,#323341 88%); +} From fa9729d6849a12fd0b859d4ce895ca9ef5ffb790 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 14:57:46 +0100 Subject: [PATCH 0409/3477] Update tabs.css --- tabs.css | 1 + 1 file changed, 1 insertion(+) diff --git a/tabs.css b/tabs.css index eb747f4f3..d295c7989 100644 --- a/tabs.css +++ b/tabs.css @@ -96,5 +96,6 @@ text-shadow: none } #wrapper { +style: none background: -webkit-linear-gradient(left, #323341 12%,#626368 29.5%,#727275 47%,#727275 53%,#4c4d56 70.5%,#323341 88%); } From f49b4a4b9a4ba5ee3b2f9683d4355c39574e8e95 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 14:59:59 +0100 Subject: [PATCH 0410/3477] Update tabs.css --- tabs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tabs.css b/tabs.css index d295c7989..9734b978d 100644 --- a/tabs.css +++ b/tabs.css @@ -96,6 +96,6 @@ text-shadow: none } #wrapper { -style: none +element.style: none background: -webkit-linear-gradient(left, #323341 12%,#626368 29.5%,#727275 47%,#727275 53%,#4c4d56 70.5%,#323341 88%); } From 729176406f05b3a97e49e8a3613ca396217e2f32 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 15:01:05 +0100 Subject: [PATCH 0411/3477] Update tabs.css --- tabs.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tabs.css b/tabs.css index 9734b978d..33a6d2e8e 100644 --- a/tabs.css +++ b/tabs.css @@ -92,10 +92,10 @@ ul.tab li a:hover {background-color: #ddd;} } .heirloomRare8 { -text-shadow: none +text-shadow: none; } #wrapper { -element.style: none +element.style: none; background: -webkit-linear-gradient(left, #323341 12%,#626368 29.5%,#727275 47%,#727275 53%,#4c4d56 70.5%,#323341 88%); } From 06834d957231d5c527435e6e1d0868d3b61c0b2d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 15:03:20 +0100 Subject: [PATCH 0412/3477] Update tabs.css --- tabs.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabs.css b/tabs.css index 33a6d2e8e..17e8fc4eb 100644 --- a/tabs.css +++ b/tabs.css @@ -95,7 +95,10 @@ ul.tab li a:hover {background-color: #ddd;} text-shadow: none; } +.element.style { +background: none; +} + #wrapper { -element.style: none; background: -webkit-linear-gradient(left, #323341 12%,#626368 29.5%,#727275 47%,#727275 53%,#4c4d56 70.5%,#323341 88%); } From 0b3b3f5440f1eb3f78517cdc3c41b6857f923f1d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 15:06:54 +0100 Subject: [PATCH 0413/3477] Update tabs.css --- tabs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tabs.css b/tabs.css index 17e8fc4eb..5517803c1 100644 --- a/tabs.css +++ b/tabs.css @@ -95,7 +95,7 @@ ul.tab li a:hover {background-color: #ddd;} text-shadow: none; } -.element.style { +.element.style, #wrapper { background: none; } From aee0c05b58c3e2affa9066709348f326bb2fa6c9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 15:09:24 +0100 Subject: [PATCH 0414/3477] Update tabs.css --- tabs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tabs.css b/tabs.css index 5517803c1..05651c27d 100644 --- a/tabs.css +++ b/tabs.css @@ -95,7 +95,7 @@ ul.tab li a:hover {background-color: #ddd;} text-shadow: none; } -.element.style, #wrapper { +#wrapper { background: none; } From 1878da833d3dadf4734305e82fb98d0b8b5549e4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 15:14:56 +0100 Subject: [PATCH 0415/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 3132da3fb..f7a996b78 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -713,6 +713,9 @@ function autoSetValueToolTip(id, text,negative) { box.setSelectionRange(0, box.value.length); } catch (e) { box.select(); + } + catch (,) { + box.select(); } box.focus(); } From aaf554e42bb9332946edbdef3efd6c6d304ffa2c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 15:17:19 +0100 Subject: [PATCH 0416/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index f7a996b78..b7b29ccc1 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -714,7 +714,7 @@ function autoSetValueToolTip(id, text,negative) { } catch (e) { box.select(); } - catch (,) { + catch (',') { box.select(); } box.focus(); From 446e98c46a61d217c7724bd43ccd803d17dbc58d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 15:19:17 +0100 Subject: [PATCH 0417/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index b7b29ccc1..3132da3fb 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -713,9 +713,6 @@ function autoSetValueToolTip(id, text,negative) { box.setSelectionRange(0, box.value.length); } catch (e) { box.select(); - } - catch (',') { - box.select(); } box.focus(); } From c6bb3046412f9cc96904c17603ae0a3b01db2a56 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 15:43:37 +0100 Subject: [PATCH 0418/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 3132da3fb..65c1e6256 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -750,7 +750,9 @@ function autoSetValue(id,negative) { } } else return; autoTrimpSettings[id].value = num; - if (num > -1 || negative) + if (num.split(',')[1]) + document.getElementById(id).textContent = ranstring + ': ' + num; + else if (num > -1 || negative) document.getElementById(id).textContent = ranstring + ': ' + prettify(num); else document.getElementById(id).innerHTML = ranstring + ': ' + ""; From 080e90b7cfd0cbef910ee6cd802c5a2cbfb049aa Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 16:00:34 +0100 Subject: [PATCH 0419/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 65c1e6256..29686996f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -746,7 +746,7 @@ function autoSetValue(id,negative) { } if (base) num = Math.round(parseFloat(num.split(letters)[0]) * Math.pow(1000, base)); } - if (!base) num = parseFloat(num); + if (!base && !num.split(',')[1]) num = parseFloat(num); } } else return; autoTrimpSettings[id].value = num; From cbad92b8904090940e79278bd57c7e43ee17093b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 17:49:48 +0100 Subject: [PATCH 0420/3477] Update SettingsGUI.js --- SettingsGUI.js | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 29686996f..cf8992792 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -723,6 +723,28 @@ function onKeyPressSetting(event, id,negative) { } } //Custom Number Box - Suffix handler for numerical to string values in the prompted popup +function parseNum(num) { + if (num.split('e')[1]) { + num = num.split('e'); + num = Math.floor(parseFloat(num[0]) * (Math.pow(10, parseInt(num[1])))); + } else { + var letters = num.replace(/[^a-z]/gi, ''); + var base = 0; + if (letters.length) { + var suffices = ['K', 'M', 'B', 'T', 'Qa', 'Qi', 'Sx', 'Sp', 'Oc', 'No', 'Dc', 'Ud', 'Dd', 'Td', 'Qad', 'Qid', 'Sxd', 'Spd', 'Od', 'Nd', 'V', 'Uv', 'Dv', 'Tv', 'Qav', 'Qiv', 'Sxv', 'Spv', 'Ov', 'Nv', 'Tt']; + for (var x = 0; x < suffices.length; x++) { + if (suffices[x].toLowerCase() == letters) { + base = x + 1; + break; + } + } + if (base) num = Math.round(parseFloat(num.split(letters)[0]) * Math.pow(1000, base)); + } + if (!base) num = parseFloat(num); + } + return num; +} + function autoSetValue(id,negative) { var num = 0; unlockTooltip(); @@ -730,28 +752,16 @@ function autoSetValue(id,negative) { var numBox = document.getElementById('customNumberBox'); if (numBox) { num = numBox.value.toLowerCase(); - if (num.split('e')[1]) { - num = num.split('e'); - num = Math.floor(parseFloat(num[0]) * (Math.pow(10, parseInt(num[1])))); + if (num.split(',')[1]) { + num = num.split(',').map(parseNum); } else { - var letters = num.replace(/[^a-z]/gi, ''); - var base = 0; - if (letters.length) { - var suffices = ['K', 'M', 'B', 'T', 'Qa', 'Qi', 'Sx', 'Sp', 'Oc', 'No', 'Dc', 'Ud', 'Dd', 'Td', 'Qad', 'Qid', 'Sxd', 'Spd', 'Od', 'Nd', 'V', 'Uv', 'Dv', 'Tv', 'Qav', 'Qiv', 'Sxv', 'Spv', 'Ov', 'Nv', 'Tt']; - for (var x = 0; x < suffices.length; x++) { - if (suffices[x].toLowerCase() == letters) { - base = x + 1; - break; - } - } - if (base) num = Math.round(parseFloat(num.split(letters)[0]) * Math.pow(1000, base)); - } - if (!base && !num.split(',')[1]) num = parseFloat(num); + num = parseNum(num); } } else return; autoTrimpSettings[id].value = num; - if (num.split(',')[1]) - document.getElementById(id).textContent = ranstring + ': ' + num; + if (Array.isArray(num)) { + document.getElementById(id).textContent = ranstring + ': ' + num.map(prettify).join(','); + } else if (num > -1 || negative) document.getElementById(id).textContent = ranstring + ': ' + prettify(num); else From f12e9eddff0fae37ca5472a4c7a8ca9f32b8119d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 18:13:30 +0100 Subject: [PATCH 0421/3477] Update other.js --- modules/other.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 12e3bcb34..e87efcfe9 100644 --- a/modules/other.js +++ b/modules/other.js @@ -175,6 +175,12 @@ function findLastBionic() { //Praiding function Praiding() { + PraidingZone = (autoTrimpSettings.Praidingzone.value); + if (PraidingZone) { + for (var x = 0; x < autoTrimpSettings.Praidingzone.value.length; x++) { + if (game.global.world == autoTrimpSettings.Praidingzone.value[x]) { + + if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { prestraidon = true; @@ -231,7 +237,9 @@ function Praiding() { prestraidon = false; mapbought = false; } - + } + } + } } From 758a6c5bdb14d96181419d310aee384c582e3599 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 18:19:08 +0100 Subject: [PATCH 0422/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index e87efcfe9..b837dae38 100644 --- a/modules/other.js +++ b/modules/other.js @@ -181,7 +181,7 @@ function Praiding() { if (game.global.world == autoTrimpSettings.Praidingzone.value[x]) { - if (game.global.world == getPageSetting('Praidingzone') && !prestraid && !failpraid) { + if (!prestraid && !failpraid) { prestraidon = true; if (getPageSetting('AutoMaps') == 1 && !prestraid && !failpraid) { @@ -232,7 +232,7 @@ function Praiding() { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } - if (prestraid == true && game.global.world !== getPageSetting('Praidingzone')) { + if (prestraid == true && game.global.world !== autoTrimpSettings.Praidingzone.value[x]) { prestraid = false; prestraidon = false; mapbought = false; From 3d064e7affd78ef9fc8f98aa975e58a43331abad Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 18:27:15 +0100 Subject: [PATCH 0423/3477] Update other.js --- modules/other.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/other.js b/modules/other.js index b837dae38..7f5365cce 100644 --- a/modules/other.js +++ b/modules/other.js @@ -180,7 +180,6 @@ function Praiding() { for (var x = 0; x < autoTrimpSettings.Praidingzone.value.length; x++) { if (game.global.world == autoTrimpSettings.Praidingzone.value[x]) { - if (!prestraid && !failpraid) { prestraidon = true; @@ -227,7 +226,10 @@ function Praiding() { prestraid = true; prestraidon = false; mapbought = false; - } + } + } + } + } if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); @@ -236,10 +238,7 @@ function Praiding() { prestraid = false; prestraidon = false; mapbought = false; - } - } - } - } + } } From d7e42f55899fe626ac75adcc966f80129500b207 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 18:31:10 +0100 Subject: [PATCH 0424/3477] Update other.js --- modules/other.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index 7f5365cce..0a89dee5d 100644 --- a/modules/other.js +++ b/modules/other.js @@ -222,10 +222,11 @@ function Praiding() { if (!prestraid && !failpraid && !game.global.repeatMap) { repeatClicked(); debug("...Successfully prestiged!"); + prestraid = true; + prestraidon = false; + mapbought = false; } - prestraid = true; - prestraidon = false; - mapbought = false; + } } } From 6a99d21671bf8c4218e9aa118887535fe4c6ad92 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 18:37:25 +0100 Subject: [PATCH 0425/3477] Update other.js --- modules/other.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0a89dee5d..e6070d533 100644 --- a/modules/other.js +++ b/modules/other.js @@ -175,8 +175,7 @@ function findLastBionic() { //Praiding function Praiding() { - PraidingZone = (autoTrimpSettings.Praidingzone.value); - if (PraidingZone) { + if (autoTrimpSettings.Praidingzone.value.length >= 1) { for (var x = 0; x < autoTrimpSettings.Praidingzone.value.length; x++) { if (game.global.world == autoTrimpSettings.Praidingzone.value[x]) { @@ -235,11 +234,15 @@ function Praiding() { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } - if (prestraid == true && game.global.world !== autoTrimpSettings.Praidingzone.value[x]) { - prestraid = false; - prestraidon = false; - mapbought = false; + if (autoTrimpSettings.Praidingzone.value.length >= 1) { + for (var x = 0; x < autoTrimpSettings.Praidingzone.value.length; x++) { + if (prestraid == true && game.global.world !== autoTrimpSettings.Praidingzone.value[x]) { + prestraid = false; + prestraidon = false; + mapbought = false; } + } + } } From 44265e33b44767c8863258936ee252d51c87e18c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 18:44:03 +0100 Subject: [PATCH 0426/3477] Update other.js --- modules/other.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index e6070d533..0aea22d3e 100644 --- a/modules/other.js +++ b/modules/other.js @@ -221,11 +221,13 @@ function Praiding() { if (!prestraid && !failpraid && !game.global.repeatMap) { repeatClicked(); debug("...Successfully prestiged!"); - prestraid = true; + + } + if (prestraidon) { + prestraid = true; prestraidon = false; mapbought = false; - } - + } } } } From 9f73b65a6eb5df519ec1bd138cb880f03a3bb538 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 18:54:10 +0100 Subject: [PATCH 0427/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0aea22d3e..fe9c170f2 100644 --- a/modules/other.js +++ b/modules/other.js @@ -220,10 +220,10 @@ function Praiding() { } if (!prestraid && !failpraid && !game.global.repeatMap) { repeatClicked(); - debug("...Successfully prestiged!"); } - if (prestraidon) { + if (game.global.preMapsActive && !prestraid && !failpraid) { + debug("...Successfully prestiged!"); prestraid = true; prestraidon = false; mapbought = false; From 09efdf1cf3e4240e63ce3634347f02d4a468a7bb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 18:59:28 +0100 Subject: [PATCH 0428/3477] Update other.js --- modules/other.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index fe9c170f2..697f56a4c 100644 --- a/modules/other.js +++ b/modules/other.js @@ -177,9 +177,8 @@ function findLastBionic() { function Praiding() { if (autoTrimpSettings.Praidingzone.value.length >= 1) { for (var x = 0; x < autoTrimpSettings.Praidingzone.value.length; x++) { - if (game.global.world == autoTrimpSettings.Praidingzone.value[x]) { - if (!prestraid && !failpraid) { + if (game.global.world == autoTrimpSettings.Praidingzone.value[x] && !prestraid && !failpraid) { prestraidon = true; if (getPageSetting('AutoMaps') == 1 && !prestraid && !failpraid) { @@ -230,7 +229,7 @@ function Praiding() { } } } - } + } if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; From b1e759717b4680ffa8704a0d04aed510111e25fa Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 21:08:00 +0100 Subject: [PATCH 0429/3477] Update other.js --- modules/other.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index 697f56a4c..590606000 100644 --- a/modules/other.js +++ b/modules/other.js @@ -235,15 +235,13 @@ function Praiding() { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } - if (autoTrimpSettings.Praidingzone.value.length >= 1) { - for (var x = 0; x < autoTrimpSettings.Praidingzone.value.length; x++) { - if (prestraid == true && game.global.world !== autoTrimpSettings.Praidingzone.value[x]) { + if (autoTrimpSettings.Praidingzone.value.every(zone >= zone != game.global.zone) && prestraid && !failpraid) { { prestraid = false; prestraidon = false; mapbought = false; } } - } + } From aef93283896c7bd6e02c0a359f475e336473a344 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 21:21:54 +0100 Subject: [PATCH 0430/3477] Update other.js --- modules/other.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 590606000..ed045a0b5 100644 --- a/modules/other.js +++ b/modules/other.js @@ -235,7 +235,7 @@ function Praiding() { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } - if (autoTrimpSettings.Praidingzone.value.every(zone >= zone != game.global.zone) && prestraid && !failpraid) { { + if (autoTrimpSettings.Praidingzone.value.every(isBelowThreshold) && prestraid && !failpraid) { prestraid = false; prestraidon = false; mapbought = false; @@ -243,6 +243,10 @@ function Praiding() { } } + +function isBelowThreshold(currentValue) { + return currentValue != game.global.world; +} From 7cdd54bc32e27b864bdab7cc2dcedfad99aae026 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 21:22:45 +0100 Subject: [PATCH 0431/3477] Update other.js --- modules/other.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index ed045a0b5..d0fbc0be1 100644 --- a/modules/other.js +++ b/modules/other.js @@ -241,8 +241,6 @@ function Praiding() { mapbought = false; } } - -} function isBelowThreshold(currentValue) { return currentValue != game.global.world; From 1a2bebf20cf4eec58a74d4da5ff830b2c702fce6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 21:25:54 +0100 Subject: [PATCH 0432/3477] Update other.js --- modules/other.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index d0fbc0be1..3c0c30f2c 100644 --- a/modules/other.js +++ b/modules/other.js @@ -221,12 +221,9 @@ function Praiding() { repeatClicked(); } - if (game.global.preMapsActive && !prestraid && !failpraid) { - debug("...Successfully prestiged!"); - prestraid = true; + prestraid = true; prestraidon = false; mapbought = false; - } } } From 1a74feb030aa3756a14fa243b4769776a1a6673f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 21:29:24 +0100 Subject: [PATCH 0433/3477] Update other.js --- modules/other.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/other.js b/modules/other.js index 3c0c30f2c..eeee7d398 100644 --- a/modules/other.js +++ b/modules/other.js @@ -222,8 +222,8 @@ function Praiding() { } prestraid = true; - prestraidon = false; - mapbought = false; + prestraidon = false; + mapbought = false; } } @@ -233,9 +233,9 @@ function Praiding() { debug("Turning AutoMaps back on"); } if (autoTrimpSettings.Praidingzone.value.every(isBelowThreshold) && prestraid && !failpraid) { - prestraid = false; - prestraidon = false; - mapbought = false; + prestraid = false; + prestraidon = false; + mapbought = false; } } From b925cad696006cd116262a857a016735176c0c80 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 21:32:09 +0100 Subject: [PATCH 0434/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 1cb7c6ee3..7b1914d1f 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,11 +62,12 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE +changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: true}); changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: true}); changelogList.push({date: "13/06/2018", version: "v2.2.3", description: "Plus maps for voids has been changed. It now works the same as Prestige raiding. Check tooltip for more details. Ratios will be out soon, including the new z500. ", isNew: false}); changelogList.push({date: "05/06/2018", version: "v2.2.2", description: "Fixed map at zone. Updated calcs. Praiding should work for everyone now. BW raiding still being tested, but should work. Ratios being tested, finding optimum coord and carp. Any bugs, please let me know, thanks. ", isNew: false}); changelogList.push({date: "05/06/2018", version: "v2.2.1", description: "Updated Heirloom calc, should be 4.8 ready. Ratios will be updated soon. ", isNew: false}); -changelogList.push({date: "28/05/2018", version: "v2.2", description: "Welcome to the Zek fork. Added single use prestige raiding, BW raiding, looting II dump, amals are now calcd properly. ", isNew: false}); +//changelogList.push({date: "28/05/2018", version: "v2.2", description: "Welcome to the Zek fork. Added single use prestige raiding, BW raiding, looting II dump, amals are now calcd properly. ", isNew: false}); function assembleChangelog(date,version,description,isNew) { return (isNew) @@ -81,7 +82,7 @@ function printChangelog() { body+=result; }; var footer = - 'Ongoing Development - Report any bugs/problems please!\ + 'ZӘK Fork - Report any bugs/problems please!\
Talk with the dev: < ZӘK >#2509 @ AutoTrimps Discord Channel\
See ReadMe Or check the commit history (if you want).' , action = 'cancelTooltip()' From 0cbb22caa708263a24e072330b320da1b8809455 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 21:54:10 +0100 Subject: [PATCH 0435/3477] Update fight.js --- modules/fight.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index 23e306752..2fb8e60d9 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -69,7 +69,7 @@ function betterAutoFight2() { fightManual() } } - else if (game.global.soldierHealth > 0) + else if (game.global.soldierHealth > 0)getPageSetting('AutoMaps') == 1 fightManual(); //If you are not fighting but have health, fix this situation by clicking fight (fixes some weird Trimps errors) //if max trimps, army size insignificant, or in Watch else if (newSquadRdy || lowLevelFight || game.global.challengeActive == 'Watch') { @@ -114,8 +114,16 @@ function betterAutoFight3() { if (!game.global.fighting && !game.global.preMapsActive) { buyArms(); } + if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) < 45) { + if (game.global.antiStacks < 45) { + mapsClicked(); + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive || game.global.mapsActive) { + mapsClicked(); + } + } + } if (!game.global.fighting) { fightManual(); } } - +//((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) From 6a5f3294201f7779cc0932530f8c23ae259cbf22 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 21:58:35 +0100 Subject: [PATCH 0436/3477] Update fight.js --- modules/fight.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index 2fb8e60d9..cfd96d7d3 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -17,7 +17,7 @@ function ATselectAutoFight() { oldBAFsetting = BAFsetting; //enables built-in autofight once when disabled } -//old: Handles manual fighting automatically, in a different way. +/*//old: Handles manual fighting automatically, in a different way. function betterAutoFight() { var customVars = MODULES["fight"]; if (game.global.autoBattle && !game.global.pauseFight) @@ -102,7 +102,7 @@ function betterAutoFight2() { debug("AutoFight: BAF2 #4, NextGroupBreedTimer went over " + breedTimerLimit + " and we arent fighting.", "other"); } } -} +}*/ //NEW:: 3rd algorithm for Better Auto Fight (Basically brute force fight unless in spire or VM) function betterAutoFight3() { @@ -126,4 +126,3 @@ function betterAutoFight3() { fightManual(); } } -//((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) From cb2d003edf1ce9fc89cd0b5fb81b9f5808011949 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 22:04:23 +0100 Subject: [PATCH 0437/3477] Update fight.js --- modules/fight.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index cfd96d7d3..a40f84ef4 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -17,7 +17,7 @@ function ATselectAutoFight() { oldBAFsetting = BAFsetting; //enables built-in autofight once when disabled } -/*//old: Handles manual fighting automatically, in a different way. +//old: Handles manual fighting automatically, in a different way. function betterAutoFight() { var customVars = MODULES["fight"]; if (game.global.autoBattle && !game.global.pauseFight) @@ -102,7 +102,7 @@ function betterAutoFight2() { debug("AutoFight: BAF2 #4, NextGroupBreedTimer went over " + breedTimerLimit + " and we arent fighting.", "other"); } } -}*/ +} //NEW:: 3rd algorithm for Better Auto Fight (Basically brute force fight unless in spire or VM) function betterAutoFight3() { @@ -114,7 +114,7 @@ function betterAutoFight3() { if (!game.global.fighting && !game.global.preMapsActive) { buyArms(); } - if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) < 45) { + if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45) { if (game.global.antiStacks < 45) { mapsClicked(); if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive || game.global.mapsActive) { From 72879938ed0618dc6da6d696ea1ba2cf1189da47 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 22:07:08 +0100 Subject: [PATCH 0438/3477] Update fight.js --- modules/fight.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index a40f84ef4..0777994bd 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -114,14 +114,14 @@ function betterAutoFight3() { if (!game.global.fighting && !game.global.preMapsActive) { buyArms(); } - if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45) { + /*if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45) { if (game.global.antiStacks < 45) { mapsClicked(); if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive || game.global.mapsActive) { mapsClicked(); } } - } + }*/ if (!game.global.fighting) { fightManual(); } From 2f8863cba4de6bb4e7e8c0a94f32f9e88c032e09 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 22:10:27 +0100 Subject: [PATCH 0439/3477] Update fight.js --- modules/fight.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index 0777994bd..37a17894e 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -6,7 +6,7 @@ MODULES["fight"].enableDebug = true; //controls whether betterAutoFight2 is S //selector function, called from main. var BAFsetting, oldBAFsetting; -function ATselectAutoFight() { +/*function ATselectAutoFight() { BAFsetting = getPageSetting('BetterAutoFight'); if (BAFsetting==1) betterAutoFight(); //"Better Auto Fight" (autofight.js) else if (BAFsetting==2) betterAutoFight2(); //"Better Auto Fight2" (") @@ -15,7 +15,7 @@ function ATselectAutoFight() { else if (BAFsetting==0 && game.global.world == 1 && game.global.autoBattle && game.global.pauseFight) pauseFight(); //turn on autofight on lvl 1 if its off. else if (BAFsetting==0 && !game.global.autoBattle && game.global.soldierHealth == 0) betterAutoFight(); //use BAF as a backup for pre-Battle situations oldBAFsetting = BAFsetting; //enables built-in autofight once when disabled -} +}*/ //old: Handles manual fighting automatically, in a different way. function betterAutoFight() { From bd292bf6356b7699f1477cabecd2ed64551dddf9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 22:12:26 +0100 Subject: [PATCH 0440/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 7b1914d1f..d2065c365 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -237,7 +237,9 @@ function mainLoop() { else if (getPageSetting('AutoStance')==2) autoStance2(); //"Auto Stance #2" (") else if (getPageSetting('AutoStance')==3) autoStance3(); //"Auto Stance #3" (") if (getPageSetting('UseAutoGen')) autoGenerator(); //"Auto Generator ON" (magmite.js) - ATselectAutoFight(); // pick the right version of Fight/AutoFight/BetterAutoFight/BAF2 (fight.js) + if (getPageSetting('BetterAutoFight')==1) betterAutoFight(); //"Better Auto Fight" + if (getPageSetting('BetterAutoFight')==2) betterAutoFight2(); //"Better Auto Fight2" + if (getPageSetting('BetterAutoFight')==3) betterAutoFight3(); //"Better Auto Fight3" var forcePrecZ = (getPageSetting('ForcePresZ')<0) || (game.global.world0 && forcePrecZ) prestigeChanging2(); //"Dynamic Prestige" (dynprestige.js) else autoTrimpSettings.Prestige.selected = document.getElementById('Prestige').value; //just make sure the UI setting and the internal setting are aligned. From a422bbde35ccd5099f805f86dd8289b3abf976de Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 22:13:55 +0100 Subject: [PATCH 0441/3477] Update fight.js --- modules/fight.js | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index 37a17894e..cd9bb1885 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -4,19 +4,6 @@ MODULES["fight"].breedTimerCutoff1 = 2; MODULES["fight"].breedTimerCutoff2 = 0.5; MODULES["fight"].enableDebug = true; //controls whether betterAutoFight2 is Spammy or not. -//selector function, called from main. -var BAFsetting, oldBAFsetting; -/*function ATselectAutoFight() { - BAFsetting = getPageSetting('BetterAutoFight'); - if (BAFsetting==1) betterAutoFight(); //"Better Auto Fight" (autofight.js) - else if (BAFsetting==2) betterAutoFight2(); //"Better Auto Fight2" (") - else if (BAFsetting==3) betterAutoFight3(); //"Better Auto Fight3" (") - else if (BAFsetting==0 && BAFsetting!=oldBAFsetting && game.global.autoBattle && game.global.pauseFight) pauseFight(); //turn on autofight on once when BAF is toggled off. - else if (BAFsetting==0 && game.global.world == 1 && game.global.autoBattle && game.global.pauseFight) pauseFight(); //turn on autofight on lvl 1 if its off. - else if (BAFsetting==0 && !game.global.autoBattle && game.global.soldierHealth == 0) betterAutoFight(); //use BAF as a backup for pre-Battle situations - oldBAFsetting = BAFsetting; //enables built-in autofight once when disabled -}*/ - //old: Handles manual fighting automatically, in a different way. function betterAutoFight() { var customVars = MODULES["fight"]; @@ -72,7 +59,7 @@ function betterAutoFight2() { else if (game.global.soldierHealth > 0)getPageSetting('AutoMaps') == 1 fightManual(); //If you are not fighting but have health, fix this situation by clicking fight (fixes some weird Trimps errors) //if max trimps, army size insignificant, or in Watch - else if (newSquadRdy || lowLevelFight || game.global.challengeActive == 'Watch') { + if (newSquadRdy || lowLevelFight || game.global.challengeActive == 'Watch') { fightManual(); if (MODULES["fight"].enableDebug) debug("AutoFight Default: New squad ready", "other"); From 80ec5f48261e2305babefb8f2c8f4c3a7e8acc8c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 22:17:00 +0100 Subject: [PATCH 0442/3477] Update fight.js --- modules/fight.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index cd9bb1885..67aa79a86 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -101,14 +101,14 @@ function betterAutoFight3() { if (!game.global.fighting && !game.global.preMapsActive) { buyArms(); } - /*if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45) { + if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45) { if (game.global.antiStacks < 45) { mapsClicked(); if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive || game.global.mapsActive) { mapsClicked(); } } - }*/ + } if (!game.global.fighting) { fightManual(); } From 174149032142c9f0e9f2a83b4b3f54455b6c740a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 22:19:22 +0100 Subject: [PATCH 0443/3477] Update fight.js --- modules/fight.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index 67aa79a86..a2ec1b9d1 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -102,11 +102,8 @@ function betterAutoFight3() { buyArms(); } if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45) { - if (game.global.antiStacks < 45) { + if (game.global.antiStacks < 45 && !game.global.preMapsActive) { mapsClicked(); - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive || game.global.mapsActive) { - mapsClicked(); - } } } if (!game.global.fighting) { From 8762197a2c5389ea6c4cc477f31bcd03def775ee Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 22:25:43 +0100 Subject: [PATCH 0444/3477] Update fight.js --- modules/fight.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index a2ec1b9d1..c4cd30a88 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -101,11 +101,10 @@ function betterAutoFight3() { if (!game.global.fighting && !game.global.preMapsActive) { buyArms(); } - if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45) { - if (game.global.antiStacks < 45 && !game.global.preMapsActive) { + if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45 && game.global.antiStacks < 45 && !game.global.preMapsActive) { mapsClicked(); } - } + if (!game.global.fighting) { fightManual(); } From 182bc69205e9ddd81a08e8f2f0980ee66d8e2574 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 22:28:45 +0100 Subject: [PATCH 0445/3477] Update fight.js --- modules/fight.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index c4cd30a88..8a1edc16c 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -101,9 +101,9 @@ function betterAutoFight3() { if (!game.global.fighting && !game.global.preMapsActive) { buyArms(); } - if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45 && game.global.antiStacks < 45 && !game.global.preMapsActive) { - mapsClicked(); - } + //if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45 && game.global.antiStacks < 45 && !game.global.preMapsActive) { + //mapsClicked(); + // } if (!game.global.fighting) { fightManual(); From 8a6144c642438e02ead3e87feeeb66e3ccd77df1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 18 Jun 2018 22:36:03 +0100 Subject: [PATCH 0446/3477] Update other.js --- modules/other.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index eeee7d398..0a8925284 100644 --- a/modules/other.js +++ b/modules/other.js @@ -27,6 +27,10 @@ function autoRoboTrimp() { } } +function isBelowThreshold(currentValue) { + return currentValue != game.global.world; +} + //Version 3.6 Golden Upgrades //setting param : get the numerical value of the selected index of the dropdown box function autoGoldenUpgradesAT(setting) { @@ -238,10 +242,6 @@ function Praiding() { mapbought = false; } } - -function isBelowThreshold(currentValue) { - return currentValue != game.global.world; -} From f756b4a34a0f7e3b5e6fc58b6c63cbe063850f43 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 09:42:15 +0100 Subject: [PATCH 0447/3477] Update battlecalc.js --- modules/battlecalc.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index c305c6ca6..afe3d0f3f 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -100,10 +100,6 @@ function getBattleStats(what,form,crit) { if ((game.global.formation == 1 && what == "health") || (game.global.formation == 2 && what == "attack") || (game.global.formation == 3 && what == "block")) formStrength = 4; currentCalc *= formStrength; } - //Add Titimp - if (game.global.titimpLeft > 1 && game.global.mapsActive && what == "attack"){ - currentCalc *= 2; - } //Add map bonus if (!game.global.mapsActive && game.global.mapBonus > 0 && what == "attack"){ var mapBonusMult = 0.2 * game.global.mapBonus; @@ -256,12 +252,7 @@ function calcOurDmg(number,maxormin,disableStances,disableFlucts) { //number = b number *= ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1); updateAntiStacks(); } - // if (!game.global.mapsActive && game.global.mapBonus > 0){ - // number *= ((game.global.mapBonus * .2) + 1); - // } - // if (game.global.titimpLeft >= 1 && game.global.mapsActive){ - // number *= 2; - // } + if (game.global.achievementBonus > 0){ number *= (1 + (game.global.achievementBonus / 100)); } From 5387148d1f8bc6ef1924c81fc45a1d5b7b14e061 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 09:43:03 +0100 Subject: [PATCH 0448/3477] Update maps.js --- modules/maps.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maps.js b/modules/maps.js index 0cc018aa2..5fdf6bbeb 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -379,7 +379,7 @@ function autoMap() { var cpthlth = getCorruptScale("health") / 2; //get corrupted health mod if (mutations.Magma.active()) maphp *= cpthlth; - var mapdmg = ourBaseDamage2 * (game.unlocks.imps.Titimp ? 2 : 1); // *2 for titimp. (ourBaseDamage2 has no mapbonus in it) + var mapdmg = ourBaseDamage2; if (game.upgrades.Dominance.done && !getPageSetting('ScryerUseinMaps2')) mapdmg *= 4; //dominance stance and not-scryer stance in maps. if (mapdmg < maphp) { From 120197a96bc29e26ea064eb767a32b05197e481d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 09:43:45 +0100 Subject: [PATCH 0449/3477] Update stance.js --- modules/stance.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 8cf2ce1bb..be075b05e 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -175,7 +175,6 @@ function autoStance() { xDamage += game.global.soldierHealth * 0.2; bDamage += game.global.soldierHealth * 0.2; } - baseDamage *= (game.global.titimpLeft > 0 ? 2 : 1); //consider titimp //double attack is OK if the buff isn't double attack, or we will survive a double attack. see main.js @ 7197-7217 https://puu.sh/ssVNP/95f699a879.png (cant prevent the 2nd hit) var isDoubleAttack = game.global.voidBuff == 'doubleAttack' || (enemy && enemy.corrupted == 'corruptDbl'); // quality bugfix by uni @ 2.1.5.4u5 @@ -232,7 +231,6 @@ function autoStance() { } else setFormation("0"); } - baseDamage /= (game.global.titimpLeft > 0 ? 2 : 1); //unconsider titimp :P } function autoStance2() { From 9443fa3db52776e4acc315a36eab1f9997aba60c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 10:30:09 +0100 Subject: [PATCH 0450/3477] pinoy patch --- SettingsGUI.js | 32 +++++++++++++++++++++----------- modules/utils.js | 3 +++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index cf8992792..b396289a7 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -540,7 +540,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe }; btn.setAttribute("style", "font-size: 1.1vw;"); btn.setAttribute('class', 'noselect settingsBtn btn-info'); - btn.setAttribute("onclick", 'autoSetValueToolTip("' + id + '", "' + name + '",'+`${(type == 'valueNegative')}`+')'); + btn.setAttribute("onclick", `autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})`; btn.setAttribute("onmouseover", 'tooltip(\"' + name + '\", \"customText\", event, \"' + description + '\")'); btn.setAttribute("onmouseout", 'tooltip("hide")'); btn.textContent = name; @@ -691,7 +691,7 @@ function settingChanged(id) { } //Popup Tooltip - ask them to enter some numerical input. (STANDARDIZED) -function autoSetValueToolTip(id, text,negative) { +function autoSetValueToolTip(id, text,negative, multi) { ranstring = text; var elem = document.getElementById("tooltipDiv"); var tooltipText = 'Type a number below. You can also use shorthand such as 2e5 or 200k.'; @@ -699,8 +699,8 @@ function autoSetValueToolTip(id, text,negative) { tooltipText += ' Accepts negative numbers as validated inputs.'; else tooltipText += ' Put -1 for Infinite.'; - tooltipText += '

'; - var costText = '
Apply
Cancel
'; + tooltipText += `

`; + var costText = '
Apply
Cancel
'; game.global.lockTooltip = true; elem.style.left = '32.5%'; elem.style.top = '25%'; @@ -717,12 +717,12 @@ function autoSetValueToolTip(id, text,negative) { box.focus(); } //Keyboard handler - Enter Key accepts popup -function onKeyPressSetting(event, id,negative) { +function onKeyPressSetting(event, id,negative, multi) { if (event.which == 13 || event.keyCode == 13) { - autoSetValue(id,negative); + autoSetValue(id,negative, multi); } } -//Custom Number Box - Suffix handler for numerical to string values in the prompted popup + function parseNum(num) { if (num.split('e')[1]) { num = num.split('e'); @@ -745,7 +745,17 @@ function parseNum(num) { return num; } -function autoSetValue(id,negative) { +//Custom Number Box - Suffix handler for numerical to string values in the prompted popup +function parseNum(num) { + if (multi) { + num = num.split(',').map(parseNum); + } else { + num = parseNum(num); + } + return num; +} + +function autoSetValue(id,negative, multi) { var num = 0; unlockTooltip(); tooltip('hide'); @@ -760,9 +770,9 @@ function autoSetValue(id,negative) { } else return; autoTrimpSettings[id].value = num; if (Array.isArray(num)) { - document.getElementById(id).textContent = ranstring + ': ' + num.map(prettify).join(','); - } - else if (num > -1 || negative) ++ document.getElementById(id).textContent = ranstring + ': ' + num.map(prettify).join(','); ++ } ++ else if (num > -1 || negative) document.getElementById(id).textContent = ranstring + ': ' + prettify(num); else document.getElementById(id).innerHTML = ranstring + ': ' + ""; diff --git a/modules/utils.js b/modules/utils.js index ee71b65af..ac1e796d3 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -137,6 +137,9 @@ function getPageSetting(setting) { if (autoTrimpSettings[setting].type == 'boolean') { // debug('found a boolean'); return autoTrimpSettings[setting].enabled; + } else if (autoTrimpSettings[setting].type == 'multiValue') { + // debug('found a multivalue'); + return autoTrimpSettings[setting].value.map(x => parseFloat(x)); } else if (autoTrimpSettings[setting].type == 'value' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a value'); return parseFloat(autoTrimpSettings[setting].value); From 19086881dd6752c3607e937628b807cd22aeb25d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 10:31:54 +0100 Subject: [PATCH 0451/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index b396289a7..cdbc9a8fa 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -373,7 +373,7 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'multiValue', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); From 2fb5f8615303ec756cb99c52a59e867fd44ba790 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 10:33:39 +0100 Subject: [PATCH 0452/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index cdbc9a8fa..b15c3a6df 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -540,7 +540,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe }; btn.setAttribute("style", "font-size: 1.1vw;"); btn.setAttribute('class', 'noselect settingsBtn btn-info'); - btn.setAttribute("onclick", `autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})`; + btn.setAttribute("onclick", 'autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})'; btn.setAttribute("onmouseover", 'tooltip(\"' + name + '\", \"customText\", event, \"' + description + '\")'); btn.setAttribute("onmouseout", 'tooltip("hide")'); btn.textContent = name; From 4eda09264a5815d26d631c60266d2a0ccd84a368 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 10:54:40 +0100 Subject: [PATCH 0453/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index b15c3a6df..13db3d95c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -540,7 +540,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe }; btn.setAttribute("style", "font-size: 1.1vw;"); btn.setAttribute('class', 'noselect settingsBtn btn-info'); - btn.setAttribute("onclick", 'autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})'; + btn.setAttribute("onclick", 'autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})'); btn.setAttribute("onmouseover", 'tooltip(\"' + name + '\", \"customText\", event, \"' + description + '\")'); btn.setAttribute("onmouseout", 'tooltip("hide")'); btn.textContent = name; From dfd05c85f76e78eef3f39df4b5d825f365512232 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 11:27:12 +0100 Subject: [PATCH 0454/3477] Revert "Update SettingsGUI.js" This reverts commit 4eda09264a5815d26d631c60266d2a0ccd84a368. --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 13db3d95c..b15c3a6df 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -540,7 +540,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe }; btn.setAttribute("style", "font-size: 1.1vw;"); btn.setAttribute('class', 'noselect settingsBtn btn-info'); - btn.setAttribute("onclick", 'autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})'); + btn.setAttribute("onclick", 'autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})'; btn.setAttribute("onmouseover", 'tooltip(\"' + name + '\", \"customText\", event, \"' + description + '\")'); btn.setAttribute("onmouseout", 'tooltip("hide")'); btn.textContent = name; From f2b8d64d231712f58d954687e068166a16f2febf Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 11:27:17 +0100 Subject: [PATCH 0455/3477] Revert "Update SettingsGUI.js" This reverts commit 2fb5f8615303ec756cb99c52a59e867fd44ba790. --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index b15c3a6df..cdbc9a8fa 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -540,7 +540,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe }; btn.setAttribute("style", "font-size: 1.1vw;"); btn.setAttribute('class', 'noselect settingsBtn btn-info'); - btn.setAttribute("onclick", 'autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})'; + btn.setAttribute("onclick", `autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})`; btn.setAttribute("onmouseover", 'tooltip(\"' + name + '\", \"customText\", event, \"' + description + '\")'); btn.setAttribute("onmouseout", 'tooltip("hide")'); btn.textContent = name; From 3f303e21fae0c37f05c39340c7c78328993aaedd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 11:27:21 +0100 Subject: [PATCH 0456/3477] Revert "Update SettingsGUI.js" This reverts commit 19086881dd6752c3607e937628b807cd22aeb25d. --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index cdbc9a8fa..b396289a7 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -373,7 +373,7 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'multiValue', -1, null, 'Spire'); + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); From afd58d0fc64ada3c146423ebe835572ce287b88a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 11:27:34 +0100 Subject: [PATCH 0457/3477] Revert "pinoy patch" This reverts commit 9443fa3db52776e4acc315a36eab1f9997aba60c. --- SettingsGUI.js | 32 +++++++++++--------------------- modules/utils.js | 3 --- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index b396289a7..cf8992792 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -540,7 +540,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe }; btn.setAttribute("style", "font-size: 1.1vw;"); btn.setAttribute('class', 'noselect settingsBtn btn-info'); - btn.setAttribute("onclick", `autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})`; + btn.setAttribute("onclick", 'autoSetValueToolTip("' + id + '", "' + name + '",'+`${(type == 'valueNegative')}`+')'); btn.setAttribute("onmouseover", 'tooltip(\"' + name + '\", \"customText\", event, \"' + description + '\")'); btn.setAttribute("onmouseout", 'tooltip("hide")'); btn.textContent = name; @@ -691,7 +691,7 @@ function settingChanged(id) { } //Popup Tooltip - ask them to enter some numerical input. (STANDARDIZED) -function autoSetValueToolTip(id, text,negative, multi) { +function autoSetValueToolTip(id, text,negative) { ranstring = text; var elem = document.getElementById("tooltipDiv"); var tooltipText = 'Type a number below. You can also use shorthand such as 2e5 or 200k.'; @@ -699,8 +699,8 @@ function autoSetValueToolTip(id, text,negative, multi) { tooltipText += ' Accepts negative numbers as validated inputs.'; else tooltipText += ' Put -1 for Infinite.'; - tooltipText += `

`; - var costText = '
Apply
Cancel
'; + tooltipText += '

'; + var costText = '
Apply
Cancel
'; game.global.lockTooltip = true; elem.style.left = '32.5%'; elem.style.top = '25%'; @@ -717,12 +717,12 @@ function autoSetValueToolTip(id, text,negative, multi) { box.focus(); } //Keyboard handler - Enter Key accepts popup -function onKeyPressSetting(event, id,negative, multi) { +function onKeyPressSetting(event, id,negative) { if (event.which == 13 || event.keyCode == 13) { - autoSetValue(id,negative, multi); + autoSetValue(id,negative); } } - +//Custom Number Box - Suffix handler for numerical to string values in the prompted popup function parseNum(num) { if (num.split('e')[1]) { num = num.split('e'); @@ -745,17 +745,7 @@ function parseNum(num) { return num; } -//Custom Number Box - Suffix handler for numerical to string values in the prompted popup -function parseNum(num) { - if (multi) { - num = num.split(',').map(parseNum); - } else { - num = parseNum(num); - } - return num; -} - -function autoSetValue(id,negative, multi) { +function autoSetValue(id,negative) { var num = 0; unlockTooltip(); tooltip('hide'); @@ -770,9 +760,9 @@ function autoSetValue(id,negative, multi) { } else return; autoTrimpSettings[id].value = num; if (Array.isArray(num)) { -+ document.getElementById(id).textContent = ranstring + ': ' + num.map(prettify).join(','); -+ } -+ else if (num > -1 || negative) + document.getElementById(id).textContent = ranstring + ': ' + num.map(prettify).join(','); + } + else if (num > -1 || negative) document.getElementById(id).textContent = ranstring + ': ' + prettify(num); else document.getElementById(id).innerHTML = ranstring + ': ' + ""; diff --git a/modules/utils.js b/modules/utils.js index ac1e796d3..ee71b65af 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -137,9 +137,6 @@ function getPageSetting(setting) { if (autoTrimpSettings[setting].type == 'boolean') { // debug('found a boolean'); return autoTrimpSettings[setting].enabled; - } else if (autoTrimpSettings[setting].type == 'multiValue') { - // debug('found a multivalue'); - return autoTrimpSettings[setting].value.map(x => parseFloat(x)); } else if (autoTrimpSettings[setting].type == 'value' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a value'); return parseFloat(autoTrimpSettings[setting].value); From 98b836d774ce4d90da8cfd74193a6ce664e498c0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 21:32:50 +0100 Subject: [PATCH 0458/3477] Revert "Revert "pinoy patch"" This reverts commit afd58d0fc64ada3c146423ebe835572ce287b88a. --- SettingsGUI.js | 32 +++++++++++++++++++++----------- modules/utils.js | 3 +++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index cf8992792..b396289a7 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -540,7 +540,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe }; btn.setAttribute("style", "font-size: 1.1vw;"); btn.setAttribute('class', 'noselect settingsBtn btn-info'); - btn.setAttribute("onclick", 'autoSetValueToolTip("' + id + '", "' + name + '",'+`${(type == 'valueNegative')}`+')'); + btn.setAttribute("onclick", `autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})`; btn.setAttribute("onmouseover", 'tooltip(\"' + name + '\", \"customText\", event, \"' + description + '\")'); btn.setAttribute("onmouseout", 'tooltip("hide")'); btn.textContent = name; @@ -691,7 +691,7 @@ function settingChanged(id) { } //Popup Tooltip - ask them to enter some numerical input. (STANDARDIZED) -function autoSetValueToolTip(id, text,negative) { +function autoSetValueToolTip(id, text,negative, multi) { ranstring = text; var elem = document.getElementById("tooltipDiv"); var tooltipText = 'Type a number below. You can also use shorthand such as 2e5 or 200k.'; @@ -699,8 +699,8 @@ function autoSetValueToolTip(id, text,negative) { tooltipText += ' Accepts negative numbers as validated inputs.'; else tooltipText += ' Put -1 for Infinite.'; - tooltipText += '

'; - var costText = '
Apply
Cancel
'; + tooltipText += `

`; + var costText = '
Apply
Cancel
'; game.global.lockTooltip = true; elem.style.left = '32.5%'; elem.style.top = '25%'; @@ -717,12 +717,12 @@ function autoSetValueToolTip(id, text,negative) { box.focus(); } //Keyboard handler - Enter Key accepts popup -function onKeyPressSetting(event, id,negative) { +function onKeyPressSetting(event, id,negative, multi) { if (event.which == 13 || event.keyCode == 13) { - autoSetValue(id,negative); + autoSetValue(id,negative, multi); } } -//Custom Number Box - Suffix handler for numerical to string values in the prompted popup + function parseNum(num) { if (num.split('e')[1]) { num = num.split('e'); @@ -745,7 +745,17 @@ function parseNum(num) { return num; } -function autoSetValue(id,negative) { +//Custom Number Box - Suffix handler for numerical to string values in the prompted popup +function parseNum(num) { + if (multi) { + num = num.split(',').map(parseNum); + } else { + num = parseNum(num); + } + return num; +} + +function autoSetValue(id,negative, multi) { var num = 0; unlockTooltip(); tooltip('hide'); @@ -760,9 +770,9 @@ function autoSetValue(id,negative) { } else return; autoTrimpSettings[id].value = num; if (Array.isArray(num)) { - document.getElementById(id).textContent = ranstring + ': ' + num.map(prettify).join(','); - } - else if (num > -1 || negative) ++ document.getElementById(id).textContent = ranstring + ': ' + num.map(prettify).join(','); ++ } ++ else if (num > -1 || negative) document.getElementById(id).textContent = ranstring + ': ' + prettify(num); else document.getElementById(id).innerHTML = ranstring + ': ' + ""; diff --git a/modules/utils.js b/modules/utils.js index ee71b65af..ac1e796d3 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -137,6 +137,9 @@ function getPageSetting(setting) { if (autoTrimpSettings[setting].type == 'boolean') { // debug('found a boolean'); return autoTrimpSettings[setting].enabled; + } else if (autoTrimpSettings[setting].type == 'multiValue') { + // debug('found a multivalue'); + return autoTrimpSettings[setting].value.map(x => parseFloat(x)); } else if (autoTrimpSettings[setting].type == 'value' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a value'); return parseFloat(autoTrimpSettings[setting].value); From 48d054b6f0ce5ad4e58c53088dcca2a740b5dbd3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 21:32:53 +0100 Subject: [PATCH 0459/3477] Revert "Revert "Update SettingsGUI.js"" This reverts commit 3f303e21fae0c37f05c39340c7c78328993aaedd. --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index b396289a7..cdbc9a8fa 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -373,7 +373,7 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'multiValue', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); From 01db8c91936458a6fc9731c185eedfa3122ea8b5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 21:32:54 +0100 Subject: [PATCH 0460/3477] Revert "Revert "Update SettingsGUI.js"" This reverts commit f2b8d64d231712f58d954687e068166a16f2febf. --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index cdbc9a8fa..b15c3a6df 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -540,7 +540,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe }; btn.setAttribute("style", "font-size: 1.1vw;"); btn.setAttribute('class', 'noselect settingsBtn btn-info'); - btn.setAttribute("onclick", `autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})`; + btn.setAttribute("onclick", 'autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})'; btn.setAttribute("onmouseover", 'tooltip(\"' + name + '\", \"customText\", event, \"' + description + '\")'); btn.setAttribute("onmouseout", 'tooltip("hide")'); btn.textContent = name; From b1411a307a491d133d58b81dcac9a1921973d830 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 21:33:12 +0100 Subject: [PATCH 0461/3477] Revert "Revert "Update SettingsGUI.js"" This reverts commit dfd05c85f76e78eef3f39df4b5d825f365512232. --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index b15c3a6df..13db3d95c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -540,7 +540,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe }; btn.setAttribute("style", "font-size: 1.1vw;"); btn.setAttribute('class', 'noselect settingsBtn btn-info'); - btn.setAttribute("onclick", 'autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})'; + btn.setAttribute("onclick", 'autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})'); btn.setAttribute("onmouseover", 'tooltip(\"' + name + '\", \"customText\", event, \"' + description + '\")'); btn.setAttribute("onmouseout", 'tooltip("hide")'); btn.textContent = name; From 4954092e82bc143cca6bf61bdc1759b98dcdf783 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 21:36:42 +0100 Subject: [PATCH 0462/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 13db3d95c..05909e182 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -540,7 +540,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe }; btn.setAttribute("style", "font-size: 1.1vw;"); btn.setAttribute('class', 'noselect settingsBtn btn-info'); - btn.setAttribute("onclick", 'autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})'); + btn.setAttribute("onclick", `autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})`); btn.setAttribute("onmouseover", 'tooltip(\"' + name + '\", \"customText\", event, \"' + description + '\")'); btn.setAttribute("onmouseout", 'tooltip("hide")'); btn.textContent = name; From ad68d55b05a557f122514eaf1f064e60934716f7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 21:40:52 +0100 Subject: [PATCH 0463/3477] Update SettingsGUI.js --- SettingsGUI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 05909e182..63e8f2f77 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -770,9 +770,9 @@ function autoSetValue(id,negative, multi) { } else return; autoTrimpSettings[id].value = num; if (Array.isArray(num)) { -+ document.getElementById(id).textContent = ranstring + ': ' + num.map(prettify).join(','); -+ } -+ else if (num > -1 || negative) + document.getElementById(id).textContent = ranstring + ': ' + num.map(prettify).join(','); + } + else if (num > -1 || negative) document.getElementById(id).textContent = ranstring + ': ' + prettify(num); else document.getElementById(id).innerHTML = ranstring + ': ' + ""; From eb403c5a7dff903879404a26e8b1c1f3863f51f9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 21:42:38 +0100 Subject: [PATCH 0464/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 63e8f2f77..4e2789974 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -373,7 +373,7 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'multiValue', -1, null, 'Spire'); + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); From 25e505ce839ccdeac857bcdf23aafeee58adf92c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 21:53:27 +0100 Subject: [PATCH 0465/3477] Update SettingsGUI.js --- SettingsGUI.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 4e2789974..7b0c5b5e8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -745,16 +745,6 @@ function parseNum(num) { return num; } -//Custom Number Box - Suffix handler for numerical to string values in the prompted popup -function parseNum(num) { - if (multi) { - num = num.split(',').map(parseNum); - } else { - num = parseNum(num); - } - return num; -} - function autoSetValue(id,negative, multi) { var num = 0; unlockTooltip(); @@ -762,7 +752,7 @@ function autoSetValue(id,negative, multi) { var numBox = document.getElementById('customNumberBox'); if (numBox) { num = numBox.value.toLowerCase(); - if (num.split(',')[1]) { + if (multi) { num = num.split(',').map(parseNum); } else { num = parseNum(num); From 114161ea889df03e4ae7cbc5ac8e819481d7632a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 21:55:22 +0100 Subject: [PATCH 0466/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 7b0c5b5e8..b990800d4 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -373,7 +373,7 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'multiValue', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); From 70f34ab62f67476f9ecaccadf618d1fb79485417 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 21:58:10 +0100 Subject: [PATCH 0467/3477] Update SettingsGUI.js --- SettingsGUI.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index b990800d4..3ed90ec49 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -547,6 +547,24 @@ function createSetting(id, name, description, type, defaultValue, list, containe btnParent.appendChild(btn); if (container) document.getElementById(container).appendChild(btnParent); else document.getElementById("autoSettings").appendChild(btnParent); + } else if (type == 'multiValue' || type == 'valueNegative') { + if (!(loaded && id == loaded.id)) + autoTrimpSettings[id] = { + id: id, + name: name, + description: description, + type: type, + value: loaded === undefined ? defaultValue : loaded + }; + btn.setAttribute("style", "font-size: 1.1vw;"); + btn.setAttribute('class', 'noselect settingsBtn btn-info'); + btn.setAttribute("onclick", `autoSetValueToolTip("${id}", "${name}", ${type == 'valueNegative'}, ${type == 'multiValue'})`); + btn.setAttribute("onmouseover", 'tooltip(\"' + name + '\", \"customText\", event, \"' + description + '\")'); + btn.setAttribute("onmouseout", 'tooltip("hide")'); + btn.textContent = name; + btnParent.appendChild(btn); + if (container) document.getElementById(container).appendChild(btnParent); + else document.getElementById("autoSettings").appendChild(btnParent); } else if (type == 'dropdown') { if (!(loaded && id == loaded.id)) autoTrimpSettings[id] = { From a3e7f2b7b2def25a68f5faebf564fb497e341b92 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 22:02:03 +0100 Subject: [PATCH 0468/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 + 1 file changed, 1 insertion(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 3ed90ec49..4eceb43d0 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -547,6 +547,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe btnParent.appendChild(btn); if (container) document.getElementById(container).appendChild(btnParent); else document.getElementById("autoSettings").appendChild(btnParent); +//god help me } else if (type == 'multiValue' || type == 'valueNegative') { if (!(loaded && id == loaded.id)) autoTrimpSettings[id] = { From 857c6cbe36a3afa1c97c05d214908935417039e7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 22:03:45 +0100 Subject: [PATCH 0469/3477] Update utils.js --- modules/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/utils.js b/modules/utils.js index ac1e796d3..c0216e17e 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -139,7 +139,7 @@ function getPageSetting(setting) { return autoTrimpSettings[setting].enabled; } else if (autoTrimpSettings[setting].type == 'multiValue') { // debug('found a multivalue'); - return autoTrimpSettings[setting].value.map(x => parseFloat(x)); + return autoTrimpSettings[setting].value(x => parseFloat(x)); } else if (autoTrimpSettings[setting].type == 'value' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a value'); return parseFloat(autoTrimpSettings[setting].value); From 51e3dfdad510d4f402372ce3326d78421006adaa Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 22:06:24 +0100 Subject: [PATCH 0470/3477] Update utils.js --- modules/utils.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/utils.js b/modules/utils.js index c0216e17e..793f04a84 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -164,6 +164,9 @@ function setPageSetting(setting, value) { } else if (autoTrimpSettings[setting].type == 'value' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a value'); autoTrimpSettings[setting].value = value; + } else if (autoTrimpSettings[setting].type == 'multiValue' || autoTrimpSettings[setting].type == 'valueNegative') { + // debug('found a multiValue'); + autoTrimpSettings[setting].value = value; } else if (autoTrimpSettings[setting].type == 'multitoggle') { // debug('found a value'); autoTrimpSettings[setting].value = value; From c0606404f091cabfb5d6b1a816f2dc165e809840 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 22:10:17 +0100 Subject: [PATCH 0471/3477] Update utils.js --- modules/utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/utils.js b/modules/utils.js index 793f04a84..04fb3811b 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -139,7 +139,7 @@ function getPageSetting(setting) { return autoTrimpSettings[setting].enabled; } else if (autoTrimpSettings[setting].type == 'multiValue') { // debug('found a multivalue'); - return autoTrimpSettings[setting].value(x => parseFloat(x)); + return autoTrimpSettings[Praidingzone].value(x => parseFloat(x)); } else if (autoTrimpSettings[setting].type == 'value' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a value'); return parseFloat(autoTrimpSettings[setting].value); @@ -166,7 +166,7 @@ function setPageSetting(setting, value) { autoTrimpSettings[setting].value = value; } else if (autoTrimpSettings[setting].type == 'multiValue' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a multiValue'); - autoTrimpSettings[setting].value = value; + autoTrimpSettings[Praidingzone].value = value; } else if (autoTrimpSettings[setting].type == 'multitoggle') { // debug('found a value'); autoTrimpSettings[setting].value = value; From 0b13d21f64bfaba9fd6591506ec25830be4891da Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 22:11:52 +0100 Subject: [PATCH 0472/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 4eceb43d0..de4afcd58 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -373,7 +373,7 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'multiValue', -1, null, 'Spire'); + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); From cedbd6802636a75c19364c8245d3c904c8b90178 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 22:13:33 +0100 Subject: [PATCH 0473/3477] Update utils.js --- modules/utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/utils.js b/modules/utils.js index 04fb3811b..793f04a84 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -139,7 +139,7 @@ function getPageSetting(setting) { return autoTrimpSettings[setting].enabled; } else if (autoTrimpSettings[setting].type == 'multiValue') { // debug('found a multivalue'); - return autoTrimpSettings[Praidingzone].value(x => parseFloat(x)); + return autoTrimpSettings[setting].value(x => parseFloat(x)); } else if (autoTrimpSettings[setting].type == 'value' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a value'); return parseFloat(autoTrimpSettings[setting].value); @@ -166,7 +166,7 @@ function setPageSetting(setting, value) { autoTrimpSettings[setting].value = value; } else if (autoTrimpSettings[setting].type == 'multiValue' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a multiValue'); - autoTrimpSettings[Praidingzone].value = value; + autoTrimpSettings[setting].value = value; } else if (autoTrimpSettings[setting].type == 'multitoggle') { // debug('found a value'); autoTrimpSettings[setting].value = value; From ef2c72b1a59c166c82efea245fa804d79ec39136 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 22:17:00 +0100 Subject: [PATCH 0474/3477] Update utils.js --- modules/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/utils.js b/modules/utils.js index 793f04a84..49fed546e 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -139,7 +139,7 @@ function getPageSetting(setting) { return autoTrimpSettings[setting].enabled; } else if (autoTrimpSettings[setting].type == 'multiValue') { // debug('found a multivalue'); - return autoTrimpSettings[setting].value(x => parseFloat(x)); + return parseInt(autoTrimpSettings[setting].value); } else if (autoTrimpSettings[setting].type == 'value' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a value'); return parseFloat(autoTrimpSettings[setting].value); From ff50ddc715e09b012f131236254fd44369891f91 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 22:20:26 +0100 Subject: [PATCH 0475/3477] Update utils.js --- modules/utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/utils.js b/modules/utils.js index 49fed546e..1b576848c 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -139,7 +139,7 @@ function getPageSetting(setting) { return autoTrimpSettings[setting].enabled; } else if (autoTrimpSettings[setting].type == 'multiValue') { // debug('found a multivalue'); - return parseInt(autoTrimpSettings[setting].value); + return parseInt(autoTrimpSettings[setting].value.map); } else if (autoTrimpSettings[setting].type == 'value' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a value'); return parseFloat(autoTrimpSettings[setting].value); @@ -166,7 +166,7 @@ function setPageSetting(setting, value) { autoTrimpSettings[setting].value = value; } else if (autoTrimpSettings[setting].type == 'multiValue' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a multiValue'); - autoTrimpSettings[setting].value = value; + autoTrimpSettings[setting].value.map = value; } else if (autoTrimpSettings[setting].type == 'multitoggle') { // debug('found a value'); autoTrimpSettings[setting].value = value; From 9a6ab280b4d7b1f8ad5eeb627cc06f7cffaae354 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 22:26:51 +0100 Subject: [PATCH 0476/3477] Update other.js --- modules/other.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0a8925284..02de6d1ce 100644 --- a/modules/other.js +++ b/modules/other.js @@ -179,10 +179,10 @@ function findLastBionic() { //Praiding function Praiding() { - if (autoTrimpSettings.Praidingzone.value.length >= 1) { - for (var x = 0; x < autoTrimpSettings.Praidingzone.value.length; x++) { + // if (autoTrimpSettings.Praidingzone.value ) { + //for (var x = 0; x < autoTrimpSettings.Praidingzone.value.length; x++) { - if (game.global.world == autoTrimpSettings.Praidingzone.value[x] && !prestraid && !failpraid) { + if (game.global.world == autoTrimpSettings.Praidingzone.value/*[x]*/ && !prestraid && !failpraid) { prestraidon = true; if (getPageSetting('AutoMaps') == 1 && !prestraid && !failpraid) { @@ -231,12 +231,12 @@ function Praiding() { } } - } + // } if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } - if (autoTrimpSettings.Praidingzone.value.every(isBelowThreshold) && prestraid && !failpraid) { + if (autoTrimpSettings.Praidingzone.value != game.global.world/*.every(isBelowThreshold)*/ && prestraid && !failpraid) { prestraid = false; prestraidon = false; mapbought = false; From 16e674418caa3fae77fc621743be139f44ec3383 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 22:28:31 +0100 Subject: [PATCH 0477/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 02de6d1ce..bd64b9506 100644 --- a/modules/other.js +++ b/modules/other.js @@ -229,7 +229,7 @@ function Praiding() { prestraidon = false; mapbought = false; } - } + // } // } if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { From cc3f760d09fc536ba84c7b399b49d823113d575f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 19 Jun 2018 22:34:01 +0100 Subject: [PATCH 0478/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index d2065c365..002f2eacc 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -208,7 +208,7 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') > 0) exitSpireCell(); //"Exit Spire After Cell" (other.js) //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) - if (getPageSetting('Praidingzone') > 0) Praiding(); //Prestige Raiding (other.js) + if (autoTrimpSettings.Praidingzone.value > 0) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); if (getPageSetting('VoidPraid')==true) Praidingvoid(); From 59408be1b62528b9f26d5036b4686656087160db Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 20 Jun 2018 13:18:00 +0100 Subject: [PATCH 0479/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index de4afcd58..4eceb43d0 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -373,7 +373,7 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'value', -1, null, 'Spire'); + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'multiValue', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); From 90d60fd83f5488b617fb728fa3b272cfe36cc891 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 20 Jun 2018 13:18:49 +0100 Subject: [PATCH 0480/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 002f2eacc..b7d3f0b46 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -208,7 +208,7 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') > 0) exitSpireCell(); //"Exit Spire After Cell" (other.js) //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) - if (autoTrimpSettings.Praidingzone.value > 0) Praiding(); //Prestige Raiding (other.js) + if (getPageSetting('Praidingzone').length) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); if (getPageSetting('VoidPraid')==true) Praidingvoid(); From ad3335b3a782e95df2ed70b8d40da93f7a3d1a71 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 20 Jun 2018 13:21:50 +0100 Subject: [PATCH 0481/3477] Update utils.js --- modules/utils.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/utils.js b/modules/utils.js index 1b576848c..f2673b22a 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -137,9 +137,10 @@ function getPageSetting(setting) { if (autoTrimpSettings[setting].type == 'boolean') { // debug('found a boolean'); return autoTrimpSettings[setting].enabled; - } else if (autoTrimpSettings[setting].type == 'multiValue') { - // debug('found a multivalue'); - return parseInt(autoTrimpSettings[setting].value.map); + } else if (autoTrimpSettings[setting].type == 'multiValue') { + // debug('found a multivalue'); + return Array.from(autoTrimpSettings[setting].value) + .map(x => parseInt(x)); } else if (autoTrimpSettings[setting].type == 'value' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a value'); return parseFloat(autoTrimpSettings[setting].value); @@ -166,7 +167,7 @@ function setPageSetting(setting, value) { autoTrimpSettings[setting].value = value; } else if (autoTrimpSettings[setting].type == 'multiValue' || autoTrimpSettings[setting].type == 'valueNegative') { // debug('found a multiValue'); - autoTrimpSettings[setting].value.map = value; + autoTrimpSettings[setting].value = value; } else if (autoTrimpSettings[setting].type == 'multitoggle') { // debug('found a value'); autoTrimpSettings[setting].value = value; From b93c24750cd52c0adcfd8277e04d06a499b3f5d0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 20 Jun 2018 13:24:57 +0100 Subject: [PATCH 0482/3477] Update other.js --- modules/other.js | 91 ++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/modules/other.js b/modules/other.js index bd64b9506..3f6e7afb5 100644 --- a/modules/other.js +++ b/modules/other.js @@ -179,69 +179,68 @@ function findLastBionic() { //Praiding function Praiding() { - // if (autoTrimpSettings.Praidingzone.value ) { - //for (var x = 0; x < autoTrimpSettings.Praidingzone.value.length; x++) { + if (getPageSetting('Praidingzone').length) { + if (getPageSetting('Praidingzone').includes(game.global.world) && !prestraid && !failpraid) { + debug('World Zone matches a Praiding Zone!'); + prestraidon = true; - if (game.global.world == autoTrimpSettings.Praidingzone.value/*[x]*/ && !prestraid && !failpraid) { - prestraidon = true; - - if (getPageSetting('AutoMaps') == 1 && !prestraid && !failpraid) { + if (getPageSetting('AutoMaps') == 1 && !prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 0; - } - if (!game.global.preMapsActive && !game.global.mapsActive && !prestraid && !failpraid) { + } + if (!game.global.preMapsActive && !game.global.mapsActive && !prestraid && !failpraid) { + mapsClicked(); + if (!game.global.preMapsActive) { mapsClicked(); - if (!game.global.preMapsActive) { - mapsClicked(); - } - debug("Beginning Prestige Raiding..."); - } - if (game.options.menu.repeatUntil.enabled!=2 && !prestraid && !failpraid) { - game.options.menu.repeatUntil.enabled = 2; } - if (game.global.preMapsActive && !prestraid && !failpraid) { + debug("Beginning Prestige Raiding..."); + } + if (game.options.menu.repeatUntil.enabled!=2 && !prestraid && !failpraid) { + game.options.menu.repeatUntil.enabled = 2; + } + if (game.global.preMapsActive && !prestraid && !failpraid) { plusPres(); if ((updateMapCost(true) <= game.resources.fragments.owned)) { buyMap(); failpraid = false; mapbought = true; } - else if ((updateMapCost(true) > game.resources.fragments.owned)) { - if (getPageSetting('AutoMaps') == 0 && !prestraid) { - autoTrimpSettings["AutoMaps"].value = 1; - failpraid = true; - prestraidon = false; - mapbought = false; - debug("Failed to prestige raid. Looks like you can't afford to.."); + else if ((updateMapCost(true) > game.resources.fragments.owned)) { + if (getPageSetting('AutoMaps') == 0 && !prestraid) { + autoTrimpSettings["AutoMaps"].value = 1; + failpraid = true; + prestraidon = false; + mapbought = false; + debug("Failed to prestige raid. Looks like you can't afford to.."); } return; } - } - if (mapbought == true) { + } + if (mapbought == true) { selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); runMap(); - } - if (!prestraid && !failpraid && !game.global.repeatMap) { - repeatClicked(); - - } - prestraid = true; - prestraidon = false; - mapbought = false; - } - // } - - // } + } + if (!prestraid && !failpraid && !game.global.repeatMap) { + repeatClicked(); + + } + prestraid = true; + prestraidon = false; + mapbought = false; + } + } + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { - autoTrimpSettings["AutoMaps"].value = 1; - debug("Turning AutoMaps back on"); - } - if (autoTrimpSettings.Praidingzone.value != game.global.world/*.every(isBelowThreshold)*/ && prestraid && !failpraid) { - prestraid = false; - prestraidon = false; - mapbought = false; - } - } + autoTrimpSettings["AutoMaps"].value = 1; + debug("Prestige raiding successfull!"); + debug("Turning AutoMaps back on"); + } + if (getPageSetting('Praidingzone').every(isBelowThreshold) && prestraid && !failpraid) { + prestraid = false; + prestraidon = false; + mapbought = false; + } +} From 0de5b0bab26f43207ac8c2311d43f104cd965382 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 20 Jun 2018 18:48:36 +0100 Subject: [PATCH 0483/3477] Update other.js --- modules/other.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/other.js b/modules/other.js index 3f6e7afb5..1b483c664 100644 --- a/modules/other.js +++ b/modules/other.js @@ -225,6 +225,7 @@ function Praiding() { } prestraid = true; + failpraid = false prestraidon = false; mapbought = false; } @@ -237,6 +238,7 @@ function Praiding() { } if (getPageSetting('Praidingzone').every(isBelowThreshold) && prestraid && !failpraid) { prestraid = false; + failpraid = false prestraidon = false; mapbought = false; } From c3abb625276c9e4fb386bdd731eee9dba09a17cc Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 20 Jun 2018 18:51:14 +0100 Subject: [PATCH 0484/3477] Update other.js --- modules/other.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/other.js b/modules/other.js index 1b483c664..92e83e1fc 100644 --- a/modules/other.js +++ b/modules/other.js @@ -301,6 +301,7 @@ function BWraiding() { } if (bwraided == true && game.global.world !== getPageSetting('BWraidingz')) { bwraided = false; + failbwraid = false; } } @@ -353,6 +354,7 @@ function BWraiding() { debug("...Successfully prestiged!"); } prestvoid = true; + failpvoidraid = false; mapboughtvoid = false; } if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestvoid && !failpvoidraid) { @@ -361,6 +363,7 @@ function BWraiding() { } if (prestvoid == true && game.global.world !== VMzone) { prestvoid = false; + failpvoidraid = false; mapboughtvoid = false; } From ef3394e243f6a8447661123e5de3865df46f26e3 Mon Sep 17 00:00:00 2001 From: spikenskab <36603307+spikenskab@users.noreply.github.com> Date: Wed, 20 Jun 2018 23:51:35 +0100 Subject: [PATCH 0485/3477] Fix reset of Praiding status vars if (getPageSetting('Praidingzone').every(isBelowThreshold) && prestraid && !failpraid) { changed to if (getPageSetting('Praidingzone').every(isBelowThreshold)) { If we failed to afford a map, then (i) failpraid is true (ii) prestraid is false so the branch resetting failpraid never gets run. Since getPageSetting('Praidingzone').every(isBelowThreshold) is never true on a Praidingzone, we can safely reset all these variables to false regardless of the state of failpraid or prestraid. --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 92e83e1fc..abb897a20 100644 --- a/modules/other.js +++ b/modules/other.js @@ -236,7 +236,7 @@ function Praiding() { debug("Prestige raiding successfull!"); debug("Turning AutoMaps back on"); } - if (getPageSetting('Praidingzone').every(isBelowThreshold) && prestraid && !failpraid) { + if (getPageSetting('Praidingzone').every(isBelowThreshold)) { prestraid = false; failpraid = false prestraidon = false; From d382331c12a776880ce6fd6dad5dca4a1bb28d46 Mon Sep 17 00:00:00 2001 From: Th3Legendary Date: Fri, 22 Jun 2018 17:04:21 +0300 Subject: [PATCH 0486/3477] Fix heirloom animations --- modules/heirlooms.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 7226c6c19..0cb1796a1 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -543,10 +543,11 @@ function newSelectHeirloom(number, location, elem){ } //replacement function that inserts a new onclick action into the heirloom icons so it can populate the proper Protect icon. (yes this is the best way to do it.) -/*function generateHeirloomIcon(heirloom, location, number){ +function generateHeirloomIcon(heirloom, location, number){ if (typeof heirloom.name === 'undefined') return ""; var icon = (heirloom.type == "Shield") ? 'icomoon icon-shield3' : 'glyphicon glyphicon-grain'; - var html = ' Date: Fri, 22 Jun 2018 18:04:10 +0100 Subject: [PATCH 0487/3477] Update heirlooms.js --- modules/heirlooms.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 0cb1796a1..e2508f4af 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -556,4 +556,3 @@ function generateHeirloomIcon(heirloom, location, number){ html += locText + ', this)"> '; return html; } -*/ From 2cfa7bd97b79100da135d4d68de813b094ae9434 Mon Sep 17 00:00:00 2001 From: spikenskab <36603307+spikenskab@users.noreply.github.com> Date: Fri, 22 Jun 2018 19:24:27 +0100 Subject: [PATCH 0488/3477] Fix calcBaseDamageinX calcs Changed calcBaseDamageinX2() to exclude crit damage to stop it being double counted in maps.js, scryer.js, and stance.js Changed calcBaseDamageinX() to stop it trying to remove formation effects from values that already exclude them. --- modules/stance.js | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index be075b05e..52fef59ba 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -9,31 +9,13 @@ function calcBaseDamageinX() { baseHealth = game.global.soldierHealthMax; //if (game.global.soldierHealth <= 0) return; //dont calculate stances when dead, cause the "current" numbers are not updated when dead. - - //D stance - if (game.global.formation == 2) - baseDamage /= 4; - else if (game.global.formation != "0") - baseDamage *= 2; - - //B stance - if (game.global.formation == 3) - baseBlock /= 4; - else if (game.global.formation != "0") - baseBlock *= 2; - - //H stance - if (game.global.formation == 1) - baseHealth /= 4; - else if (game.global.formation != "0") - baseHealth *= 2; - //S stance is accounted for (combination of all the above's else clauses) + // deleted calculations to get back to base damage as calling getBattleStats() with second arg=false excludes effects of formation already } //goes to battlecalc.js which came from Trimps "updates.js" line 1103 function calcBaseDamageinX2() { - //baseDamage - baseDamage = getBattleStats("attack", false, true); + //baseDamage - changed getBattleStats() call to exclude crit damage to avoid double counting in maps.js, scryer.js and stance.js + baseDamage = getBattleStats("attack", false, false); //baseBlock baseBlock = getBattleStats("block"); //baseHealth From 3ee026d90c9f7e8ac9f9132bf6d199d3958ffdb9 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sat, 23 Jun 2018 21:10:46 +0100 Subject: [PATCH 0489/3477] Update Trimp damage calculations for v4.8 * rewrite calcOurDmg() function in battlecalc.js to accout for changes in Trimps 4.8 function calcOurDmg(minMaxAvg, incStance, incFlucts) minMaxAvg: string; "min", "max", or "avg" as required incStance: boolean; true to include stance modifiers, false otherwise incFlucts: boolean; true to account for variation in attack strength as modified by Range perk. Adapted from Trimps code, calculates minimum, maximum, and average damage while correctly accounting for crit chances > 100%, megacrits, etc and new daily modifiers. * began updating code to use calcOurDmg in place of other functions and removed local calculations of crit damage etc. where calcOurDmg() has handled it already. * Deleted modules/ATcalc.js Nothing uses it, and it's out of date for 4.8 --- AutoTrimps2.js | 6 +- modules/ATcalc.js | 5 - modules/battlecalc.js | 258 +++++++++++++++++++++++++----------------- modules/maps.js | 29 +++-- modules/scryer.js | 5 +- modules/stance.js | 32 +++--- 6 files changed, 194 insertions(+), 141 deletions(-) delete mode 100644 modules/ATcalc.js diff --git a/AutoTrimps2.js b/AutoTrimps2.js index b7d3f0b46..3428aaa71 100644 --- a/AutoTrimps2.js +++ b/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', 'perks', 'fight-info', 'performance', 'ATcalc']; + ATmoduleList = ['query', 'portal', 'upgrades', 'heirlooms', 'buildings', 'jobs', 'equipment', 'gather', 'stance', 'battlecalc', 'maps', 'breedtimer', 'dynprestige', 'fight', 'scryer', 'magmite', 'other', 'import-export', 'perks', 'fight-info', 'performance']; for (var m in ATmoduleList) { ATscriptLoad(modulepath, ATmoduleList[m]); } @@ -237,8 +237,8 @@ function mainLoop() { else if (getPageSetting('AutoStance')==2) autoStance2(); //"Auto Stance #2" (") else if (getPageSetting('AutoStance')==3) autoStance3(); //"Auto Stance #3" (") if (getPageSetting('UseAutoGen')) autoGenerator(); //"Auto Generator ON" (magmite.js) - if (getPageSetting('BetterAutoFight')==1) betterAutoFight(); //"Better Auto Fight" - if (getPageSetting('BetterAutoFight')==2) betterAutoFight2(); //"Better Auto Fight2" + if (getPageSetting('BetterAutoFight')==1) betterAutoFight(); //"Better Auto Fight" + if (getPageSetting('BetterAutoFight')==2) betterAutoFight2(); //"Better Auto Fight2" if (getPageSetting('BetterAutoFight')==3) betterAutoFight3(); //"Better Auto Fight3" var forcePrecZ = (getPageSetting('ForcePresZ')<0) || (game.global.world0 && forcePrecZ) prestigeChanging2(); //"Dynamic Prestige" (dynprestige.js) diff --git a/modules/ATcalc.js b/modules/ATcalc.js deleted file mode 100644 index 9f77a7599..000000000 --- a/modules/ATcalc.js +++ /dev/null @@ -1,5 +0,0 @@ -function calculateDamageAT() { -var trimpATK1 = calculateDamage(game.global.soldierCurrentAttack, true, true); -var trimpATK = parseFloat(trimpATK1) -return trimpATK; -} diff --git a/modules/battlecalc.js b/modules/battlecalc.js index afe3d0f3f..1a10ec408 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -240,115 +240,167 @@ function getBattleStats(what,form,crit) { return currentCalc; } -function calcOurDmg(number,maxormin,disableStances,disableFlucts) { //number = base attack - var fluctuation = .2; //%fluctuation - var maxFluct = -1; - var minFluct = -1; - //Situational Trimp damage increases - if (game.global.radioStacks > 0) { - number *= (1 - (game.global.radioStacks * 0.1)); - } - if (game.global.antiStacks > 0) { - number *= ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1); - updateAntiStacks(); - } - - if (game.global.achievementBonus > 0){ - number *= (1 + (game.global.achievementBonus / 100)); - } - if (game.global.challengeActive == "Discipline"){ - fluctuation = .995; - } - else if (game.portal.Range.level > 0){ - minFluct = fluctuation - (.02 * game.portal.Range.level); - } - if (game.global.challengeActive == "Decay"){ - number *= 5; - number *= Math.pow(0.995, game.challenges.Decay.stacks); - } - if (game.global.roboTrimpLevel > 0){ - number *= ((0.2 * game.global.roboTrimpLevel) + 1); - } - if (game.global.challengeActive == "Lead" && ((game.global.world % 2) == 1)){ - number *= 1.5; - } - if (game.goldenUpgrades.Battle.currentBonus > 0){ - number *= game.goldenUpgrades.Battle.currentBonus + 1; - } - if (game.talents.voidPower.purchased && game.global.voidBuff){ - var vpAmt = (game.talents.voidPower2.purchased) ? ((game.talents.voidPower3.purchased) ? 65 : 35) : 15; - number *= ((vpAmt / 100) + 1); - } - if (game.global.totalSquaredReward > 0){ - number *= ((game.global.totalSquaredReward / 100) + 1); - } - if (game.talents.magmamancer.purchased){ - number *= game.jobs.Magmamancer.getBonusPercent(); - } - if (game.talents.stillRowing2.purchased){ - number *= ((game.global.spireRows * 0.06) + 1); - } - if (game.talents.healthStrength.purchased && mutations.Healthy.active()){ - number *= ((0.15 * mutations.Healthy.cellCount()) + 1); - } - if (Fluffy.isActive()){ - number *= Fluffy.getDamageModifier(); - } - if (game.jobs.Amalgamator.owned > 0){ - number *= game.jobs.Amalgamator.getDamageMult(); - } - if (game.jobs.Amalgamator.owned > 0){ - number *= game.jobs.Amalgamator.getHealthMult(); - } - if (game.singleRunBonuses.sharpTrimps.owned) { +function calcOurDmg(minMaxAvg, incStance, incFlucts) { + // This function is adapted from calculateDamage() function in main.js of Trimps (trimps.github.io) + // https://github.com/Trimps/Trimps.github.io + // Trimps is Copyright (C) Zach Hood (2016) + + // Calculates the minimum, maximum or average Trimp attack while accounting + // for daily modifiers, crits, megacrits etc. + // minMaxAvg is one of "min", "max", or "avg" depending on what is wnated + // incStance is true if formation damage modifiers are to be included, + // false otherwise + + var number = game.global.soldierCurrentAttack; + var fluctuation = .2; //%fluctuation + var maxFluct = -1; + var minFluct = -1; + + //Situational Trimp damage increases + if (game.jobs.Amalgamator.owned > 0){ + number *= game.jobs.Amalgamator.getDamageMult(); + } + if (game.challenges.Electricity.stacks > 0) { //Electricity + number *= (1 - (game.challenges.Electricity.stacks * 0.1)); + } + if (game.global.antiStacks > 0) { + number *= ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1); + // updateAntiStacks(); + } + if (!game.global.mapsActive && game.global.mapBonus > 0){ + number *= ((game.global.mapBonus * .2) + 1); + } + if (game.global.titimpLeft >= 1 && game.global.mapsActive){ + number *= 2; + } + if (game.global.achievementBonus > 0){ + number *= (1 + (game.global.achievementBonus / 100)); + } + if (game.global.challengeActive == "Discipline"){ + fluctuation = .995; + } + else if (game.portal.Range.level > 0){ + minFluct = fluctuation - (.02 * game.portal.Range.level); + } + if (game.global.challengeActive == "Decay"){ + number *= 5; + number *= Math.pow(0.995, game.challenges.Decay.stacks); + } + if (game.global.roboTrimpLevel > 0){ + number *= ((0.2 * game.global.roboTrimpLevel) + 1); + } + if (game.global.challengeActive == "Lead" && ((game.global.world % 2) == 1)){ number *= 1.5; - } - number *= (1 + (1 - game.empowerments.Ice.getCombatModifier())); + } + if (game.goldenUpgrades.Battle.currentBonus > 0){ + number *= game.goldenUpgrades.Battle.currentBonus + 1; + } + if (game.talents.voidPower.purchased && game.global.voidBuff){ + var vpAmt = (game.talents.voidPower2.purchased) ? ((game.talents.voidPower3.purchased) ? 65 : 35) : 15; + number *= ((vpAmt / 100) + 1); + } + if (game.global.totalSquaredReward > 0){ + number *= ((game.global.totalSquaredReward / 100) + 1) + } + if (getEmpowerment() == "Ice"){ + number *= 1 + (1 - game.empowerments.Ice.getCombatModifier()); + } + if (game.talents.magmamancer.purchased){ + number *= game.jobs.Magmamancer.getBonusPercent(); + } + if (game.talents.stillRowing2.purchased){ + number *= ((game.global.spireRows * 0.06) + 1); + } + if (game.talents.healthStrength.purchased && mutations.Healthy.active()){ + number *= ((0.15 * mutations.Healthy.cellCount()) + 1); + } + if (game.global.sugarRush > 0){ + number *= sugarRush.getAttackStrength(); + } + if (game.global.challengeActive == "Life") { + number *= game.challenges.Life.getHealthMult(); + } + if (game.singleRunBonuses.sharpTrimps.owned){ + number *= 1.5; + } + if (game.global.challengeActive == "Daily"){ + if (typeof game.global.dailyChallenge.minDamage !== 'undefined'){ + if (minFluct == -1) minFluct = fluctuation; + minFluct += dailyModifiers.minDamage.getMult(game.global.dailyChallenge.minDamage.strength); + } + if (typeof game.global.dailyChallenge.maxDamage !== 'undefined'){ + if (maxFluct == -1) maxFluct = fluctuation; + maxFluct += dailyModifiers.maxDamage.getMult(game.global.dailyChallenge.maxDamage.strength); + } + if (typeof game.global.dailyChallenge.weakness !== 'undefined'){ + number *= dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); + } + if (typeof game.global.dailyChallenge.oddTrimpNerf !== 'undefined' && ((game.global.world % 2) == 1)){ + number *= dailyModifiers.oddTrimpNerf.getMult(game.global.dailyChallenge.oddTrimpNerf.strength); + } + if (typeof game.global.dailyChallenge.evenTrimpBuff !== 'undefined' && ((game.global.world % 2) == 0)){ + number *= dailyModifiers.evenTrimpBuff.getMult(game.global.dailyChallenge.evenTrimpBuff.strength); + } + if (typeof game.global.dailyChallenge.rampage !== 'undefined'){ + number *= dailyModifiers.rampage.getMult(game.global.dailyChallenge.rampage.strength, game.global.dailyChallenge.rampage.stacks); + } + } + if (Fluffy.isActive()){ + number *= Fluffy.getDamageModifier(); + } - if (game.global.challengeActive == "Daily"){ - if (typeof game.global.dailyChallenge.minDamage !== 'undefined'){ - if (minFluct == -1) minFluct = fluctuation; - minFluct += dailyModifiers.minDamage.getMult(game.global.dailyChallenge.minDamage.strength); - } - if (typeof game.global.dailyChallenge.maxDamage !== 'undefined'){ - if (maxFluct == -1) maxFluct = fluctuation; - maxFluct += dailyModifiers.maxDamage.getMult(game.global.dailyChallenge.maxDamage.strength); - } - if (typeof game.global.dailyChallenge.weakness !== 'undefined'){ - number *= dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); - } - if (typeof game.global.dailyChallenge.oddTrimpNerf !== 'undefined' && ((game.global.world % 2) == 1)){ - number *= dailyModifiers.oddTrimpNerf.getMult(game.global.dailyChallenge.oddTrimpNerf.strength); - } - if (typeof game.global.dailyChallenge.evenTrimpBuff !== 'undefined' && ((game.global.world % 2) == 0)){ - number *= dailyModifiers.evenTrimpBuff.getMult(game.global.dailyChallenge.evenTrimpBuff.strength); - } - if (typeof game.global.dailyChallenge.rampage !== 'undefined'){ - number *= dailyModifiers.rampage.getMult(game.global.dailyChallenge.rampage.strength, game.global.dailyChallenge.rampage.stacks); - } - } - if (!disableStances) { - //Formations - if (game.global.formation == 2) - number /= 4; - else if (game.global.formation != "0") - number *= 2; - } - if (!disableFlucts) { - if (minFluct > 1) minFluct = 1; - if (maxFluct == -1) maxFluct = fluctuation; - if (minFluct == -1) minFluct = fluctuation; - var min = Math.floor(number * (1 - minFluct)); - var max = Math.ceil(number + (number * maxFluct)); + // reverse effects of stance if incStance is false; + if (!incStance && game.global.formation !== 0) { + number /= (game.global.formation == 2) ? 4 : 0.5; + } + + // Calculate effect of crits and megacrits on max, min, and avg damage + var min = number; + var max = number; + var avg = number; + + var critTier = 0; + var critChance = getPlayerCritChance(); + if (critChance > 0){ + critTier = Math.floor(critChance); + critChance = critChance % 1; + + if (critTier > 0){ + min *= getPlayerCritDamageMult(); + max = min; + if (critTier > 1){ + min *= getMegaCritDamageMult(critTier); + if (critChance > 0) max = number * getMegaCritDamageMult(critTier + 1); + else max = min; + } + avg = max * critChance + min * (1 - critChance); + } + } + if critChance < 0 { + min *= 0.2; + if (critChance <= -1) max *= 0.2; + avg = max * (1 + critChance) + min * -critChance; + } + + if (incFlucts) { + // Account for variation in attack as modified by Range perk; + if (minFluct > 1) minFluct = 1; + if (maxFluct == -1) maxFluct = fluctuation; + if (minFluct == -1) minFluct = fluctuation; + + min *= (1 - minFluct); + max *= (1 + maxFluct); + avg *= 1 + (maxFluct - minFluct)/2; + } + + if (minMaxAvg == "min") return min; + else if (minMaxAvg == "max") return max; + else if (minMaxAvg == "avg") return avg; - //number = Math.floor(Math.random() * ((max + 1) - min)) + min; - return maxormin ? max : min; - } - else - return number; } + function calcBadGuyDmg(enemy,attack,daily,maxormin,disableFlucts) { var number; if (enemy) diff --git a/modules/maps.js b/modules/maps.js index 5fdf6bbeb..66d1b7364 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -133,23 +133,21 @@ function autoMap() { //START CALCULATING DAMAGES: var AutoStance = getPageSetting('AutoStance'); - //calculate crits (baseDamage was calced in function autoStance) this is a weighted average of nonCrit + Crit. (somewhere in the middle) - if (getPlayerCritChance() > 1) { - ourBaseDamage = (baseDamage * (1 - getPlayerCritChance()) + (baseDamage * getPlayerCritChance() * getPlayerCritDamageMult() * additionalCritMulti)); - } - else if (getPlayerCritChance() > 0) { - ourBaseDamage = (baseDamage * (1 - getPlayerCritChance()) + (baseDamage * getPlayerCritChance() * getPlayerCritDamageMult())); - } - else if (getPlayerCritChance() <= 0) { - ourBaseDamage = baseDamage; - } - + // crits and megacrits already accounted for now + // For farming, we always want average damage + ourBaseDamage = calcOurDmg("avg",false,true); + //calculate with map bonus var mapbonusmulti = 1 + (0.20 * game.global.mapBonus); - //(autostance2 has mapbonusmulti built in) - ourBaseDamage2 = ourBaseDamage; //keep a version without mapbonus - ourBaseDamage *= mapbonusmulti; - + //(autostances have mapbonusmulti built in) + if (game.global.mapsActive || game.global.preMapsActive) { + ourBaseDamage2 = ourBaseDamage; //keep a version without mapbonus + ourBaseDamage *= mapbonusmulti; + } + else { + ourBaseDamage2 = ourBaseDamage; + ourBaseDamage2 /= mapbonusmulti; + } //get average enemyhealth and damage for the next zone, cell 50, snimp type and multiply it by a max range fluctuation of 1.2 var enemyDamage; var enemyHealth; @@ -214,6 +212,7 @@ function autoMap() { var pierceMod = (game.global.brokenPlanet && !game.global.mapsActive) ? getPierceAmt() : 0; const FORMATION_MOD_1 = game.upgrades.Dominance.done ? 2 : 1; //asks if we can survive x number of hits in either D stance or X stance. + // health calculation looks off as damage in excess of block not accounted for in else clause of ternary operator enoughHealth = (baseHealth / FORMATION_MOD_1 > customVars.numHitsSurvived * (enemyDamage - baseBlock / FORMATION_MOD_1 > 0 ? enemyDamage - baseBlock / FORMATION_MOD_1 : enemyDamage * pierceMod)); enoughDamage = (ourBaseDamage * customVars.enoughDamageCutoff > enemyHealth); diff --git a/modules/scryer.js b/modules/scryer.js index f15b12fc0..659984b79 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -92,9 +92,10 @@ function useScryerStance() { useoverkill = false; //Overkill button being on and being able to overkill in S will override any setting other than never spire & nature zone, regardless. if (useoverkill && game.portal.Overkill.level > 0) { - var avgDamage = (baseDamage * (1-getPlayerCritChance()) + (baseDamage * getPlayerCritChance() * getPlayerCritDamageMult())); + // being conservative about overkill choice for maximum speed - using min + var minDamage = calcOurDmg("min",false,true); var Sstance = 0.5; - var ovkldmg = avgDamage * Sstance * (game.portal.Overkill.level*0.005); + var ovkldmg = minDamage * Sstance * (game.portal.Overkill.level*0.005); //are we going to overkill in S? var ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; if (ovklHDratio < 8) { diff --git a/modules/stance.js b/modules/stance.js index 52fef59ba..418488b3d 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -1,8 +1,10 @@ //MODULES["stance"] = {}; function calcBaseDamageinX() { - //baseDamage - baseDamage = (getBattleStats("attack", false, true)); + // baseDamage + // baseDamage = (getBattleStats("attack", false, true)); + // calculate average damage including crit and megacrit effects, excluding stance and including flucts + baseDamage = calcOurDmg("avg", false, true); //baseBlock baseBlock = game.global.soldierCurrentBlock; //baseHealth @@ -14,8 +16,9 @@ function calcBaseDamageinX() { //goes to battlecalc.js which came from Trimps "updates.js" line 1103 function calcBaseDamageinX2() { - //baseDamage - changed getBattleStats() call to exclude crit damage to avoid double counting in maps.js, scryer.js and stance.js - baseDamage = getBattleStats("attack", false, false); + // baseDamage - now using average damage (excluding stance modifiers, including flucts) including crits and megacrits + // "avg" might be better here... + baseDamage = calcOurDmg("min", false, true); //baseBlock baseBlock = getBattleStats("block"); //baseHealth @@ -330,8 +333,9 @@ function autoStance2() { xDamage += added; bDamage += added; } - baseDamage *= (game.global.titimpLeft > 0 ? 2 : 1); //consider titimp - baseDamage *= (!game.global.mapsActive && game.global.mapBonus > 0) ? ((game.global.mapBonus * .2) + 1) : 1; //consider mapbonus + // Handled by calcOurDmg() now + // baseDamage *= (game.global.titimpLeft > 0 ? 2 : 1); //consider titimp + // baseDamage *= (!game.global.mapsActive && game.global.mapBonus > 0) ? ((game.global.mapBonus * .2) + 1) : 1; //consider mapbonus //handle Daily Challenge explosion/suicide var xExplosionOK = true; @@ -340,10 +344,11 @@ function autoStance2() { var explosionDmg = 0; var explosiveDamage = 1 + game.global.dailyChallenge['explosive'].strength; - var playerCritMult = getPlayerCritChance() ? getPlayerCritDamageMult() : 1; - var playerDCritDmg = (baseDamage*4) * playerCritMult; - var playerXCritDmg = (baseDamage) * playerCritMult; - + // var playerCritMult = getPlayerCritChance() ? getPlayerCritDamageMult() : 1; + // var playerDCritDmg = (baseDamage*4) * playerCritMult; + // var playerXCritDmg = (baseDamage) * playerCritMult; + var playerDCritDmg = calcOurDmg("max",false,true) * 4; + var playerXCritDmg = calcOurDmg("max",false,true); // I don't know if I have to use x or d damage or just the base damage multiplier for this calculation. explosionDmg = calcBadGuyDmg(enemy,null,true,true) * explosiveDamage; xExplosionOK = ((xHealth - missingHealth > explosionDmg) || (enemyHealth > playerXCritDmg)); @@ -408,15 +413,16 @@ function autoStance2() { setFormation(1); //the last thing that runs } } - baseDamage /= (game.global.titimpLeft > 0 ? 2 : 1); //unconsider titimp - baseDamage /= (!game.global.mapsActive && game.global.mapBonus > 0) ? ((game.global.mapBonus * .2) + 1) : 1; //unconsider mapbonus + // Handled by calcOurDmg() now; + // baseDamage /= (game.global.titimpLeft > 0 ? 2 : 1); //unconsider titimp + // baseDamage /= (!game.global.mapsActive && game.global.mapBonus > 0) ? ((game.global.mapBonus * .2) + 1) : 1; //unconsider mapbonus return true; } function autoStanceCheck(enemyCrit) { if (game.global.gridArray.length === 0) return [true,true]; //baseDamage //in stance attack, //min, //disable stances, //enable flucts - var ourDamage = calcOurDmg(game.global.soldierCurrentAttack,true,true,true); + var ourDamage = calcOurDmg("min",false,true); //baseBlock var ourBlock = game.global.soldierCurrentBlock; //baseHealth From 49b7e287154fa110130efd6b103f0a5e588c972d Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sat, 23 Jun 2018 21:21:41 +0100 Subject: [PATCH 0490/3477] Fix syntax Missing parentheses --- modules/battlecalc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 1a10ec408..3d916dac0 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -376,7 +376,7 @@ function calcOurDmg(minMaxAvg, incStance, incFlucts) { avg = max * critChance + min * (1 - critChance); } } - if critChance < 0 { + if (critChance < 0) { min *= 0.2; if (critChance <= -1) max *= 0.2; avg = max * (1 + critChance) + min * -critChance; From e7dd2decdebd60b510c8ef4c498f397623f2984b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 10:18:32 +0100 Subject: [PATCH 0491/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 4eceb43d0..5646e0f53 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -435,7 +435,7 @@ function initializeAllSettings() { createSetting('AutoUpgradeHeirlooms', 'Auto Upgrade Heirlooms', 'Automatically buys the upgrades the script advises for the Equipped shield and staff, until we are out of nullifium.', 'boolean', false, null, 'Heirlooms'); //Golden Upgrade Strategies: - createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections.', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void"], 'Golden'); + createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections. Make sure vanilla setting Locking is off. ', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void"], 'Golden'); createSetting('goldStrat', 'Strategy', 'VOID ONLY: After max Void golden upgrades, alternate between buying helium and battle upgrades. Or Choose a Zone to switch over completely at (zones lower than X will buy only battle, and zones higher than X only helium). Battle can be disabled completely with the goldNoBattle button. MAX THEN HELIUM setting so you can get the perfect 60% Voids then Helium', 'dropdown', 'Max then Helium', ["Off", "Alternating", "Zone", "Max then Helium"], 'Golden'); createSetting('goldAlternating', 'GU VOID: Alternating', 'Buy a helium upgrade after X-1 battle upgrades have been purchased', 'value', '2', null, 'Golden'); createSetting('goldZone', 'GU VOID: Zone', 'Buy a helium upgrade until zone X, then buy battle upgrades.', 'value', '200', null, 'Golden'); From 960bf9b6b8fe361f565918da2f226e2e5af3ba7d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 12:37:04 +0100 Subject: [PATCH 0492/3477] Update other.js --- modules/other.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/other.js b/modules/other.js index abb897a20..75d0438bb 100644 --- a/modules/other.js +++ b/modules/other.js @@ -441,3 +441,9 @@ function buyArms() { } postBuy(); } + +function trimpcide() { +if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45 && game.global.antiStacks < 45) { + forceAbandonTrimps(); + } +} From dd44b4b4e86dec64bac32cb9d24c4d464fba59f4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 12:37:53 +0100 Subject: [PATCH 0493/3477] Update fight.js --- modules/fight.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index 8a1edc16c..f61e5abec 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -101,9 +101,6 @@ function betterAutoFight3() { if (!game.global.fighting && !game.global.preMapsActive) { buyArms(); } - //if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45 && game.global.antiStacks < 45 && !game.global.preMapsActive) { - //mapsClicked(); - // } if (!game.global.fighting) { fightManual(); From e7a302dfed8cacf026b9c5f4e84f8f80ff9cbf4c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 12:39:00 +0100 Subject: [PATCH 0494/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index b7d3f0b46..2b45108e6 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -212,6 +212,7 @@ function mainLoop() { if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); if (getPageSetting('VoidPraid')==true) Praidingvoid(); + if (getPageSetting('ForceAbandon')==true) trimpcide(); if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); From e5a8707d44bbf153f3ba8ffaeece764af318e60d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 12:44:39 +0100 Subject: [PATCH 0495/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 2b45108e6..156b65049 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -212,7 +212,7 @@ function mainLoop() { if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); if (getPageSetting('VoidPraid')==true) Praidingvoid(); - if (getPageSetting('ForceAbandon')==true) trimpcide(); + if (getPageSetting('ForceAbandon')==true && game.talents.patience.purchased) trimpcide(); if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); From bd1381b03cd44d3086737829d2bfcf1822cd8c28 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 24 Jun 2018 13:56:47 +0100 Subject: [PATCH 0496/3477] Fix crit calcs --- modules/battlecalc.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 3d916dac0..069ee58f7 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -350,7 +350,7 @@ function calcOurDmg(minMaxAvg, incStance, incFlucts) { } // reverse effects of stance if incStance is false; - if (!incStance && game.global.formation !== 0) { + if (!incStance && game.global.formation != 0) { number /= (game.global.formation == 2) ? 4 : 0.5; } @@ -364,17 +364,16 @@ function calcOurDmg(minMaxAvg, incStance, incFlucts) { if (critChance > 0){ critTier = Math.floor(critChance); critChance = critChance % 1; - - if (critTier > 0){ - min *= getPlayerCritDamageMult(); - max = min; - if (critTier > 1){ + max *= getPlayerCritDamageMult); + if (critTier > 0){ // we always crit if this is the case + min = max; + if (critTier > 1){ // we always megacrit if this is the case min *= getMegaCritDamageMult(critTier); - if (critChance > 0) max = number * getMegaCritDamageMult(critTier + 1); - else max = min; } - avg = max * critChance + min * (1 - critChance); + if (critChance > 0) max *= getMegaCritDamageMult(critTier + 1); + else max = min; } + avg = max * critChance + min * (1 - critChance); } if (critChance < 0) { min *= 0.2; From 13b35940aa457fc4395854baad7827d728949047 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 24 Jun 2018 14:00:59 +0100 Subject: [PATCH 0497/3477] Fix typo --- modules/battlecalc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 069ee58f7..f9433c7d4 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -364,7 +364,7 @@ function calcOurDmg(minMaxAvg, incStance, incFlucts) { if (critChance > 0){ critTier = Math.floor(critChance); critChance = critChance % 1; - max *= getPlayerCritDamageMult); + max *= getPlayerCritDamageMult(); if (critTier > 0){ // we always crit if this is the case min = max; if (critTier > 1){ // we always megacrit if this is the case From 793955145f11315059ce205e1fa9cc1a9a6003f3 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 24 Jun 2018 14:15:18 +0100 Subject: [PATCH 0498/3477] Try calcDamageinX2() with avg instead of min --- modules/stance.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 418488b3d..1837e318b 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -17,13 +17,13 @@ function calcBaseDamageinX() { //goes to battlecalc.js which came from Trimps "updates.js" line 1103 function calcBaseDamageinX2() { // baseDamage - now using average damage (excluding stance modifiers, including flucts) including crits and megacrits - // "avg" might be better here... - baseDamage = calcOurDmg("min", false, true); + // Was originally roughly equivalent to min damage, testing out max instead + baseDamage = calcOurDmg("avg", false, true); //baseBlock baseBlock = getBattleStats("block"); //baseHealth baseHealth = getBattleStats("health"); - //stances are not needed, if you do need it, call the function with (,true) + //stances are not needed, if you do need it, call the function with (,true,) } //Autostance - function originally created by Belaith (in 1971) //Automatically swap formations (stances) to avoid dying From 08cabc796ed1d2084d38501fdf0bc67beb40ada3 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 24 Jun 2018 14:41:54 +0100 Subject: [PATCH 0499/3477] Fix mapbonus calc --- modules/maps.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index 66d1b7364..f3f6e6f9c 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -140,13 +140,13 @@ function autoMap() { //calculate with map bonus var mapbonusmulti = 1 + (0.20 * game.global.mapBonus); //(autostances have mapbonusmulti built in) - if (game.global.mapsActive || game.global.preMapsActive) { - ourBaseDamage2 = ourBaseDamage; //keep a version without mapbonus + if (game.global.mapsActive) { + ourBaseDamage2 = ourBaseDamage; // keep a version without mapbonus ourBaseDamage *= mapbonusmulti; } else { ourBaseDamage2 = ourBaseDamage; - ourBaseDamage2 /= mapbonusmulti; + ourBaseDamage2 /= mapbonusmulti; // remove effect of mapbonus } //get average enemyhealth and damage for the next zone, cell 50, snimp type and multiply it by a max range fluctuation of 1.2 var enemyDamage; From f1830f56debe4ec86310270b1d863ddda6aee786 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 24 Jun 2018 14:54:51 +0100 Subject: [PATCH 0500/3477] Check for -1 = disabled in ScryUsein$nature properly --- modules/scryer.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 659984b79..fd5a61329 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -86,9 +86,9 @@ function useScryerStance() { if (useoverkill && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')==0) useoverkill = false; //If lower than nature zone, do not use overkill //redundant now?? - if (useoverkill && ((getEmpowerment() == "Poison" && (game.global.world <= getPageSetting('ScryUseinPoison'))) - || (getEmpowerment() == "Wind" && (game.global.world <= getPageSetting('ScryUseinWind'))) - || (getEmpowerment() == "Ice" &&(game.global.world <= getPageSetting('ScryUseinIce'))))) + if (useoverkill && ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) + || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) + || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce'))))) useoverkill = false; //Overkill button being on and being able to overkill in S will override any setting other than never spire & nature zone, regardless. if (useoverkill && game.portal.Overkill.level > 0) { From 1aa56550cb45cc3e6a7c1d7cdf0be05ab9d90d30 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 15:29:38 +0100 Subject: [PATCH 0501/3477] Update other.js --- modules/other.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 75d0438bb..48d3a8fe3 100644 --- a/modules/other.js +++ b/modules/other.js @@ -443,7 +443,11 @@ function buyArms() { } function trimpcide() { -if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= 45 && game.global.antiStacks < 45) { +var antistacklimit = 45; +if (!game.talents.patience.purchased) { +antistacklimit = 30; +} +if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit) { forceAbandonTrimps(); } } From b4ef0c87144178040285876ec7514c130e67c924 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 15:41:42 +0100 Subject: [PATCH 0502/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 156b65049..2b45108e6 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -212,7 +212,7 @@ function mainLoop() { if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); if (getPageSetting('VoidPraid')==true) Praidingvoid(); - if (getPageSetting('ForceAbandon')==true && game.talents.patience.purchased) trimpcide(); + if (getPageSetting('ForceAbandon')==true) trimpcide(); if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); From ad00d31c568f241b348ee5c0fbbe5374df9a0c68 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 15:47:22 +0100 Subject: [PATCH 0503/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 5646e0f53..130806e78 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -388,7 +388,7 @@ function initializeAllSettings() { createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
0 = Always On
For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get 200 windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have 200 stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); - createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks aren\'t maxed, force abandon and grab a new group. Located in the geneticist management script.', 'boolean', true, null, 'Combat'); + createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks aren\'t maxed, force abandon and grab a new group. Will not abandon in voids or spire. Recommended ON. ', 'boolean', true, null, 'Combat'); createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); From c37e2d3c8d1194b7ef1ba16ed1109ca76a65b220 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 15:49:12 +0100 Subject: [PATCH 0504/3477] Update other.js --- modules/other.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/other.js b/modules/other.js index 48d3a8fe3..1a83ce6ee 100644 --- a/modules/other.js +++ b/modules/other.js @@ -449,5 +449,6 @@ antistacklimit = 30; } if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit) { forceAbandonTrimps(); + ('Killing trimps, Getting ' + antistacklimit + ' stacks'); } } From 7faa0e6ddcd1d5c99ae001b4da02d33ad459c996 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 15:51:47 +0100 Subject: [PATCH 0505/3477] Update other.js --- modules/other.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/other.js b/modules/other.js index 1a83ce6ee..8f3696bc3 100644 --- a/modules/other.js +++ b/modules/other.js @@ -443,12 +443,12 @@ function buyArms() { } function trimpcide() { -var antistacklimit = 45; -if (!game.talents.patience.purchased) { -antistacklimit = 30; -} -if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit) { - forceAbandonTrimps(); - ('Killing trimps, Getting ' + antistacklimit + ' stacks'); - } + var antistacklimit = 45; + if (!game.talents.patience.purchased) { + antistacklimit = 30; + } + if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit) { + forceAbandonTrimps(); + debug('Killing trimps, Getting ' + antistacklimit + ' stacks'); + } } From 842320ca73470ab62cfdf181550066a8673316fd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 15:53:32 +0100 Subject: [PATCH 0506/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 8f3696bc3..b9a88239b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -449,6 +449,6 @@ function trimpcide() { } if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit) { forceAbandonTrimps(); - debug('Killing trimps, Getting ' + antistacklimit + ' stacks'); + debug('Killing trimps, Getting ' + antistacklimit + ' Antistacks'); } } From 7e52787ee5264770e04a5a8bbf1c1210ab9811bb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 16:20:53 +0100 Subject: [PATCH 0507/3477] Update index.html --- index.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index ae613e88e..c3415cf44 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - Autotrimps by genbtc + Autotrimps by Zek @@ -18,13 +18,13 @@

Autotrimps

Automation for the idle incremental game 'Trimps'

-

View the Project on GitHub genbtc/AutoTrimps

+

View the Project on GitHub /AutoTrimps

@@ -54,7 +54,7 @@

Having trouble with Pages? Check out our documentation or contact support and we’ll help you sort it out.

-

This project is maintained by genbtc

+

This project is maintained by Zek

Hosted on GitHub Pages — Theme by orderedlist

From 2882d27fed50c035c870d59956a64ef3acacbd3c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 16:23:14 +0100 Subject: [PATCH 0508/3477] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index c3415cf44..b1d8025ba 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,7 @@

Autotrimps

Automation for the idle incremental game 'Trimps'

-

View the Project on GitHub /AutoTrimps

+

View the Project on GitHub

    From 0374d45efacd2efe64fc4f5f2b60fab223befffd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 24 Jun 2018 16:30:10 +0100 Subject: [PATCH 0509/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 2b45108e6..d587ffc58 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -1,6 +1,6 @@ // ==UserScript== // @name AutoTrimpsV2 -// @version 2.1.6.9b-genbtc-4-2-2018 +// @version Zek-2.2.5 // @updateURL https://github.com/genbtc/AutoTrimps/AutoTrimps2.js // @description Automate all the trimps! // @author zininzinin, spindrjr, belaith, ishakaru, genBTC, Unihedron, coderPatsy, Kfro, Zeker0 From a9ea1e24cd3927516ef4f0e3ee925e7dcdec9b87 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 24 Jun 2018 16:35:15 +0100 Subject: [PATCH 0510/3477] Fix scryer overkill damage calc --- modules/scryer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index fd5a61329..8a65d592f 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -93,12 +93,13 @@ function useScryerStance() { //Overkill button being on and being able to overkill in S will override any setting other than never spire & nature zone, regardless. if (useoverkill && game.portal.Overkill.level > 0) { // being conservative about overkill choice for maximum speed - using min + // could add a setting to choose whether scryer overkill uses min or avg damage to decide whether to scry var minDamage = calcOurDmg("min",false,true); var Sstance = 0.5; var ovkldmg = minDamage * Sstance * (game.portal.Overkill.level*0.005); //are we going to overkill in S? var ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; - if (ovklHDratio < 8) { + if (ovklHDratio < 2) { // S min damage = X min damage / 2 if (oktoswitch) setFormation(4); return; From acb5af2f3a901dc846c428ee79cfe5e43359d12f Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 24 Jun 2018 16:59:43 +0100 Subject: [PATCH 0511/3477] Exclude Ice atk bonus from automap calc Excludes Ice attack bonus from automaps attack for mapbonus calculation to stop it jumping in and out of maps, losing any titimp bonus each time. --- modules/maps.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/maps.js b/modules/maps.js index f3f6e6f9c..c38a7d788 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -136,6 +136,11 @@ function autoMap() { // crits and megacrits already accounted for now // For farming, we always want average damage ourBaseDamage = calcOurDmg("avg",false,true); + // exclude ice damage in maps to stop jumping in and out of maps, losing titimp bonus + // should maybe consider disabling in world too? + if (game.global.mapsActive && getEmpowerment() == "Ice"){ + ourBaseDamage /= 1 + (1 - game.empowerments.Ice.getCombatModifier()); + } //calculate with map bonus var mapbonusmulti = 1 + (0.20 * game.global.mapBonus); From c8b2e776bdccac1a61b4eae0cd27650b111e0f31 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 24 Jun 2018 19:45:30 +0100 Subject: [PATCH 0512/3477] Stop scry in nature forcing scry in maps Stops scry in nature settings from forcing scryer in maps and lets the maybe calculation happen instead (unless never or always scry in maps is set). --- modules/scryer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 8a65d592f..6c04ec17c 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -45,9 +45,9 @@ function useScryerStance() { //check spire Force use_scryer = use_scryer || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); //Check Nature Min Zone - use_scryer = use_scryer || ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world >= getPageSetting('ScryUseinPoison'))) + use_scryer = use_scryer || (!game.global.mapsActive && ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world >= getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world >= getPageSetting('ScryUseinWind'))) - || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce')))); + || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce'))))); //check Corrupted Force if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 1) || (use_scryer)) { setFormation(4); From 50385f9979414779ac6a0ebe30ffad86094670b4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 25 Jun 2018 09:58:49 +0100 Subject: [PATCH 0513/3477] Update other.js --- modules/other.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index b9a88239b..0a0fc4a2a 100644 --- a/modules/other.js +++ b/modules/other.js @@ -280,12 +280,9 @@ function BWraiding() { if (findLastBionic().level <= getPageSetting('BWraidingmax') && !bwraided && !failbwraid && game.global.preMapsActive) { runMap(); } - if (!game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level > getPageSetting('BWraidingz') && game.global.mapsActive) { + if (!game.global.repeatMap && game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && game.global.mapsActive) { repeatClicked(); } - else if (game.global.repeatMap && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid && getCurrentMapObject().level <= getPageSetting('BWraidingz') && game.global.mapsActive) { - repeatClicked(); - } if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { bwraided = true; failbwraid = false; From fd15df75e9b5b5fe13ca5043e27087a86013e6c5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 25 Jun 2018 12:53:21 +0100 Subject: [PATCH 0514/3477] Update other.js --- modules/other.js | 117 ++++++++++++++++++++++++++--------------------- 1 file changed, 64 insertions(+), 53 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0a0fc4a2a..49dbe7527 100644 --- a/modules/other.js +++ b/modules/other.js @@ -245,63 +245,74 @@ function Praiding() { } - -//BWraiding -//BWrmn -//BWrmx function BWraiding() { - if (!prestraidon && game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { - if (getPageSetting('AutoMaps') == 1 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { - autoTrimpSettings["AutoMaps"].value = 0; - } - if (!game.global.preMapsActive && !game.global.mapsActive && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { - mapsClicked(); - if (!game.global.preMapsActive) { - mapsClicked(); - } - } - if (game.options.menu.repeatUntil.enabled != 2 && game.global.world >= getPageSetting('BWraidingz') && !bwraided && !failbwraid) { - game.options.menu.repeatUntil.enabled = 2; - } - if (game.global.world >= getPageSetting('BWraidingz') && game.global.preMapsActive && !bwraided && !failbwraid) { - selectMap(findLastBionic().id); - failbwraid = false; - debug("Beginning BW Raiding..."); - } - else if (game.global.world >= getPageSetting('BWraidingz') && game.global.preMapsActive && !bwraided && !failbwraid) { - if (getPageSetting('AutoMaps') == 0 && game.global.world >= getPageSetting('BWraidingz') && !bwraided) { - autoTrimpSettings["AutoMaps"].value = 1; - failbwraid = true; - debug("Failed to BW raid. Looks like you don't have a BW to raid..."); + + if (!prestraidon && game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { + + if (getPageSetting('AutoMaps') == 1 && !bwraided && !failbwraid) { + autoTrimpSettings["AutoMaps"].value = 0; + } + + if (!game.global.preMapsActive && !game.global.mapsActive && !bwraided && !failbwraid) { + mapsClicked(); + + if (!game.global.preMapsActive) { + mapsClicked(); } - return; + } + + if (game.options.menu.repeatUntil.enabled != 2 && !bwraided && !failbwraid) { + game.options.menu.repeatUntil.enabled = 2; + } + + if (game.global.preMapsActive && !bwraided && !failbwraid) { + selectMap(findLastBionic().id); + failbwraid = false; + debug("Beginning BW Raiding..."); + } + + else if (game.global.preMapsActive && !bwraided && !failbwraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('BWraidingz') && !bwraided) { + autoTrimpSettings["AutoMaps"].value = 1; + failbwraid = true; + debug("Failed to BW raid. Looks like you don't have a BW to raid..."); + } - } - if (findLastBionic().level <= getPageSetting('BWraidingmax') && !bwraided && !failbwraid && game.global.preMapsActive) { - runMap(); - } - if (!game.global.repeatMap && game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && game.global.mapsActive) { - repeatClicked(); - } - if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { - bwraided = true; - failbwraid = false; - debug("...Successfully BW raided!"); - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world >= getPageSetting('BWraidingz') && bwraided && !failbwraid) { + } + + if (findLastBionic().level <= getPageSetting('BWraidingmax') && !bwraided && !failbwraid && game.global.preMapsActive) { + runMap(); + } + + if (!game.global.repeatMap && !bwraided && !failbwraid && game.global.mapsActive) { + repeatClicked(); + } + + if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { + bwraided = true; + failbwraid = false; + debug("...Successfully BW raided!"); + } + + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('BWraidingz') && bwraided && !failbwraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); + } + + } + + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; - } - } - } - else if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && bwraided && !failbwraid) { - autoTrimpSettings["AutoMaps"].value = 1; - debug("Turning AutoMaps back on"); - } - if (bwraided == true && game.global.world !== getPageSetting('BWraidingz')) { - bwraided = false; - failbwraid = false; - } - - } + debug("Turning AutoMaps back on"); + } + + if (bwraided && !failbwraid && game.global.world !== getPageSetting('BWraidingz')) { + bwraided = false; + failbwraid = false; + } + +} + //VoidPraid //Prest before voids function Praidingvoid() { From 430f7627de374dbb15286df30fb70d198ce8ecc0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 25 Jun 2018 14:34:58 +0100 Subject: [PATCH 0515/3477] Update other.js --- modules/other.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/other.js b/modules/other.js index 49dbe7527..a4037a1d7 100644 --- a/modules/other.js +++ b/modules/other.js @@ -460,3 +460,18 @@ function trimpcide() { debug('Killing trimps, Getting ' + antistacklimit + ' Antistacks'); } } + +function ATspirebreed() { + +var prebreedtimer = game.global.GeneticistassistSetting; +var spirebreedtimer = getPageSetting('SpireBreedTimer') + + if (spirebreedtimer >= 1) { + if (prebreedtimer != spirebreedtimer && game.global.Geneticistassist && prebreedtimer >= 1 && game.global.spireActive) { + game.global.GeneticistassistSetting=spirebreedtimer + } + else if (!game.global.spireActive && prebreedtimer != game.global.GeneticistassistSetting) { + game.global.GeneticistassistSetting = prebreedtimer + } + } +} From d3642a520363e10befad81a15e55fd033152f105 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 25 Jun 2018 14:37:02 +0100 Subject: [PATCH 0516/3477] Update other.js --- modules/other.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index a4037a1d7..32d0a1858 100644 --- a/modules/other.js +++ b/modules/other.js @@ -464,14 +464,14 @@ function trimpcide() { function ATspirebreed() { var prebreedtimer = game.global.GeneticistassistSetting; -var spirebreedtimer = getPageSetting('SpireBreedTimer') +var spirebreedtimer = getPageSetting('SpireBreedTimer'); if (spirebreedtimer >= 1) { if (prebreedtimer != spirebreedtimer && game.global.Geneticistassist && prebreedtimer >= 1 && game.global.spireActive) { - game.global.GeneticistassistSetting=spirebreedtimer + game.global.GeneticistassistSetting=spirebreedtimer; } else if (!game.global.spireActive && prebreedtimer != game.global.GeneticistassistSetting) { - game.global.GeneticistassistSetting = prebreedtimer + game.global.GeneticistassistSetting = prebreedtimer; } } } From 680be2f2fb495fce401d6be79e0d91f2e5187829 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 25 Jun 2018 14:37:10 +0100 Subject: [PATCH 0517/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 275ff73b8..58867bed1 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -207,6 +207,7 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') > 0) exitSpireCell(); //"Exit Spire After Cell" (other.js) + if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone').length) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) From 706f28583e6562d8ba9ce3c89bed756fb08e92a4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 25 Jun 2018 15:02:00 +0100 Subject: [PATCH 0518/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 58867bed1..567540ed7 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -207,7 +207,7 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') > 0) exitSpireCell(); //"Exit Spire After Cell" (other.js) - if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); + //if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone').length) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) From afec0183a49b6720ba3d26d1b7e4790b14bbcdec Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 12:22:17 +0100 Subject: [PATCH 0519/3477] Update other.js --- modules/other.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index 32d0a1858..1a16a5211 100644 --- a/modules/other.js +++ b/modules/other.js @@ -11,6 +11,7 @@ var failpvoidraid = false; var prestvoid = false; var mapboughtvoid = false; var bwraidon = false; +var prebreedtimer = game.global.GeneticistassistSetting; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { @@ -464,11 +465,10 @@ function trimpcide() { function ATspirebreed() { var prebreedtimer = game.global.GeneticistassistSetting; -var spirebreedtimer = getPageSetting('SpireBreedTimer'); - if (spirebreedtimer >= 1) { - if (prebreedtimer != spirebreedtimer && game.global.Geneticistassist && prebreedtimer >= 1 && game.global.spireActive) { - game.global.GeneticistassistSetting=spirebreedtimer; + if (getPageSetting('SpireBreedTimer') >= 1) { + if (prebreedtimer != getPageSetting('SpireBreedTimer') && game.global.Geneticistassist && prebreedtimer >= 1 && game.global.spireActive) { + game.global.GeneticistassistSetting=getPageSetting('SpireBreedTimer'); } else if (!game.global.spireActive && prebreedtimer != game.global.GeneticistassistSetting) { game.global.GeneticistassistSetting = prebreedtimer; From 712ff42f8852226bba3243e54ed2ac601289714f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 12:31:05 +0100 Subject: [PATCH 0520/3477] Update other.js --- modules/other.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 1a16a5211..30204a605 100644 --- a/modules/other.js +++ b/modules/other.js @@ -458,7 +458,6 @@ function trimpcide() { } if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit) { forceAbandonTrimps(); - debug('Killing trimps, Getting ' + antistacklimit + ' Antistacks'); } } From d28a59ef7cc5ff5c336e1dd6b91571e15e7a308a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 12:32:20 +0100 Subject: [PATCH 0521/3477] Update breedtimer.js --- modules/breedtimer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/breedtimer.js b/modules/breedtimer.js index d262e2090..d0daf4635 100644 --- a/modules/breedtimer.js +++ b/modules/breedtimer.js @@ -223,5 +223,5 @@ function forceAbandonTrimps() { mapsClicked(); mapsClicked(); } - debug("Killed your army! (to get " + targetBreed + " Anti-stacks). Trimpicide successful.","other"); + debug('Killing trimps, Getting ' + antistacklimit + ' Antistacks'); } From 4e96613d1ae5bf469a0064019223633b9aa3c194 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 12:32:48 +0100 Subject: [PATCH 0522/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 567540ed7..58867bed1 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -207,7 +207,7 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') > 0) exitSpireCell(); //"Exit Spire After Cell" (other.js) - //if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); + if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone').length) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) From aad6cc1ba5368e76fd1c2634c2ee087dcc3f3341 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 12:39:45 +0100 Subject: [PATCH 0523/3477] Update other.js --- modules/other.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index 30204a605..bf77ad37e 100644 --- a/modules/other.js +++ b/modules/other.js @@ -463,11 +463,9 @@ function trimpcide() { function ATspirebreed() { -var prebreedtimer = game.global.GeneticistassistSetting; - if (getPageSetting('SpireBreedTimer') >= 1) { if (prebreedtimer != getPageSetting('SpireBreedTimer') && game.global.Geneticistassist && prebreedtimer >= 1 && game.global.spireActive) { - game.global.GeneticistassistSetting=getPageSetting('SpireBreedTimer'); + game.global.GeneticistassistSetting = getPageSetting('SpireBreedTimer'); } else if (!game.global.spireActive && prebreedtimer != game.global.GeneticistassistSetting) { game.global.GeneticistassistSetting = prebreedtimer; From 543b1a0b5d1644dc2c375f16635f8515d01a551d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 12:41:05 +0100 Subject: [PATCH 0524/3477] Update breedtimer.js --- modules/breedtimer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/breedtimer.js b/modules/breedtimer.js index d0daf4635..9de0fd03a 100644 --- a/modules/breedtimer.js +++ b/modules/breedtimer.js @@ -223,5 +223,5 @@ function forceAbandonTrimps() { mapsClicked(); mapsClicked(); } - debug('Killing trimps, Getting ' + antistacklimit + ' Antistacks'); + } From 53f0f7f3b075d776ed14bb0a5f11ee45e1d5ab1b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 13:27:26 +0100 Subject: [PATCH 0525/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index bf77ad37e..ec21599ef 100644 --- a/modules/other.js +++ b/modules/other.js @@ -463,7 +463,7 @@ function trimpcide() { function ATspirebreed() { - if (getPageSetting('SpireBreedTimer') >= 1) { + if (getPageSetting('SpireBreedTimer') >= 1 && getPageSetting('IgnoreSpiresUntil') <= game.global.world) { if (prebreedtimer != getPageSetting('SpireBreedTimer') && game.global.Geneticistassist && prebreedtimer >= 1 && game.global.spireActive) { game.global.GeneticistassistSetting = getPageSetting('SpireBreedTimer'); } From b3c7b85461fb863f5da6ee5517fb6cd92876d782 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 13:35:21 +0100 Subject: [PATCH 0526/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 58867bed1..2f5081ec6 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,11 +62,12 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: true}); -changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: true}); +changelogList.push({date: "15/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: true}); +changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: false}); +changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: false}); changelogList.push({date: "13/06/2018", version: "v2.2.3", description: "Plus maps for voids has been changed. It now works the same as Prestige raiding. Check tooltip for more details. Ratios will be out soon, including the new z500. ", isNew: false}); -changelogList.push({date: "05/06/2018", version: "v2.2.2", description: "Fixed map at zone. Updated calcs. Praiding should work for everyone now. BW raiding still being tested, but should work. Ratios being tested, finding optimum coord and carp. Any bugs, please let me know, thanks. ", isNew: false}); -changelogList.push({date: "05/06/2018", version: "v2.2.1", description: "Updated Heirloom calc, should be 4.8 ready. Ratios will be updated soon. ", isNew: false}); +//changelogList.push({date: "05/06/2018", version: "v2.2.2", description: "Fixed map at zone. Updated calcs. Praiding should work for everyone now. BW raiding still being tested, but should work. Ratios being tested, finding optimum coord and carp. Any bugs, please let me know, thanks. ", isNew: false}); +//changelogList.push({date: "05/06/2018", version: "v2.2.1", description: "Updated Heirloom calc, should be 4.8 ready. Ratios will be updated soon. ", isNew: false}); //changelogList.push({date: "28/05/2018", version: "v2.2", description: "Welcome to the Zek fork. Added single use prestige raiding, BW raiding, looting II dump, amals are now calcd properly. ", isNew: false}); function assembleChangelog(date,version,description,isNew) { From 29c48e51aef5533e0584aff8f5e323d2270f10df Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 13:36:22 +0100 Subject: [PATCH 0527/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 2f5081ec6..7395475ad 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,7 +62,7 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "15/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: true}); +changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: true}); changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: false}); changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: false}); changelogList.push({date: "13/06/2018", version: "v2.2.3", description: "Plus maps for voids has been changed. It now works the same as Prestige raiding. Check tooltip for more details. Ratios will be out soon, including the new z500. ", isNew: false}); From 17a1316d508d7ad8250d2d6322c92f726f78f76c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 13:42:17 +0100 Subject: [PATCH 0528/3477] Update fight.js --- modules/fight.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index f61e5abec..2fc9d839a 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -98,9 +98,6 @@ function betterAutoFight3() { pauseFight(); //activates autofight if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive) return; //sanity check. - if (!game.global.fighting && !game.global.preMapsActive) { - buyArms(); - } if (!game.global.fighting) { fightManual(); From bb4076d23b977dca19377cb3c9c580678f13cdae Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 13:47:02 +0100 Subject: [PATCH 0529/3477] Update other.js --- modules/other.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/other.js b/modules/other.js index ec21599ef..ec2625d68 100644 --- a/modules/other.js +++ b/modules/other.js @@ -472,3 +472,9 @@ function ATspirebreed() { } } } + +function helptrimpsnotdie () { + if (!game.global.fighting && !game.global.preMapsActive) { + buyArms(); + } +} From 2da71817a073b5bb3ae4f1d02e958765c2e23805 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 13:50:12 +0100 Subject: [PATCH 0530/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 + 1 file changed, 1 insertion(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 130806e78..53f7ec5f2 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -331,6 +331,7 @@ function initializeAllSettings() { createSetting('PrestigeSkip1_2', ['Prestige Skip Off','Prestige Skip 1 & 2', 'Prestige Skip 1', 'Prestige Skip 2'], 'Prestige Skip 1: If there are more than 2 Unbought Prestiges (besides Shield), ie: sitting in your upgrades window but you cant afford them, AutoMaps will not enter Prestige Mode, and/or will exit from it. The amount of unboughts can be configured with this variable MODULES[\\"maps\\"].SkipNumUnboughtPrestiges = 2;
    Prestige Skip 2: If there are 2 or fewer Unobtained Weapon Prestiges in maps, ie: there are less than 2 types to run for, AutoMaps will not enter Prestige Mode, and/or will exit from it. For users who tends to not need the last few prestiges due to resource gain not keeping up. The amount of unboughts can be configured with MODULES.maps.UnearnedPrestigesRequired. If PrestigeSkipMode is enabled, both conditions need to be reached before exiting.', 'multitoggle', 0, null, "Gear"); createSetting('DelayArmorWhenNeeded', 'Delay Armor Prestige', 'Delays buying armor prestige-upgrades during Want More Damage or Farming automap-modes, Although if you need health AND damage, it WILL buy armor prestiges tho. NOTE: Applies to Prestiges only', 'boolean', false, null, 'Gear'); createSetting('BuyShieldblock', 'Buy Shield Block', 'Will buy the shield block upgrade. CAUTION: If you are progressing past zone 60, you probably don\'t want this :)', 'boolean', false, null, "Gear"); + createSetting('trimpsnotdie', 'Buy Armor on Death', 'Buys 10 levels of Armor when Trimps die. Useful when your trimps die frequentely. ', 'boolean', false, null, "Gear"); From b643d630689e94bbb78d50cb9d87e52dc732fb2e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 13:51:41 +0100 Subject: [PATCH 0531/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 7395475ad..346a10539 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -209,6 +209,7 @@ function mainLoop() { //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') > 0) exitSpireCell(); //"Exit Spire After Cell" (other.js) if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); + if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) if (getPageSetting('Praidingzone').length) Praiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) From 4114830ab4208b472de0ae972796f6514c1eeddf Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 13:54:55 +0100 Subject: [PATCH 0532/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 53f7ec5f2..fadfbd0ab 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -332,7 +332,7 @@ function initializeAllSettings() { createSetting('DelayArmorWhenNeeded', 'Delay Armor Prestige', 'Delays buying armor prestige-upgrades during Want More Damage or Farming automap-modes, Although if you need health AND damage, it WILL buy armor prestiges tho. NOTE: Applies to Prestiges only', 'boolean', false, null, 'Gear'); createSetting('BuyShieldblock', 'Buy Shield Block', 'Will buy the shield block upgrade. CAUTION: If you are progressing past zone 60, you probably don\'t want this :)', 'boolean', false, null, "Gear"); createSetting('trimpsnotdie', 'Buy Armor on Death', 'Buys 10 levels of Armor when Trimps die. Useful when your trimps die frequentely. ', 'boolean', false, null, "Gear"); - + createSetting('gearamounttobuy', 'Gear Levels to Buy', 'Set the amount of Gear Levels to buy for AT. I.e if set to 1 will buy 1 level at a time. Recommended value 1. ', 'value', 1, null, "Gear"); From 7fdf2d7f8ac06acadbf9bec77840d58f74ddfa2c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 13:56:45 +0100 Subject: [PATCH 0533/3477] Update equipment.js --- modules/equipment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/equipment.js b/modules/equipment.js index 59e430ae0..856a9fb49 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -393,7 +393,7 @@ function autoLevelEquipment() { //(same function) //LEVELING EQUIPMENT SECTION: preBuy(); - game.global.buyAmt = 1; //needed for buyEquipment() + game.global.buyAmt = getPageSetting('gearamounttobuy'); //needed for buyEquipment() var BuyWeaponLevels = ((getPageSetting('BuyWeaponsNew')==1) || (getPageSetting('BuyWeaponsNew')==3)); var BuyArmorLevels = ((getPageSetting('BuyArmorNew')==1) || (getPageSetting('BuyArmorNew')==3)); for (var stat in Best) { From 958981ce37b89773e88694c0054524765f0c25dd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 13:57:34 +0100 Subject: [PATCH 0534/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index fadfbd0ab..3f5a7bd0b 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -332,7 +332,7 @@ function initializeAllSettings() { createSetting('DelayArmorWhenNeeded', 'Delay Armor Prestige', 'Delays buying armor prestige-upgrades during Want More Damage or Farming automap-modes, Although if you need health AND damage, it WILL buy armor prestiges tho. NOTE: Applies to Prestiges only', 'boolean', false, null, 'Gear'); createSetting('BuyShieldblock', 'Buy Shield Block', 'Will buy the shield block upgrade. CAUTION: If you are progressing past zone 60, you probably don\'t want this :)', 'boolean', false, null, "Gear"); createSetting('trimpsnotdie', 'Buy Armor on Death', 'Buys 10 levels of Armor when Trimps die. Useful when your trimps die frequentely. ', 'boolean', false, null, "Gear"); - createSetting('gearamounttobuy', 'Gear Levels to Buy', 'Set the amount of Gear Levels to buy for AT. I.e if set to 1 will buy 1 level at a time. Recommended value 1. ', 'value', 1, null, "Gear"); + createSetting('gearamounttobuy', 'Gear Levels to Buy', 'Set the amount of Gear Levels to buy for AT. I.e if set to 1 will buy 1 level at a time. Recommended value 1. MUST ALWAYS HAVE A VALUE GREATER THAN 1! ', 'value', 1, null, "Gear"); From 4e001073c801235cc67178727644d4b6b8c995c9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 26 Jun 2018 14:10:41 +0100 Subject: [PATCH 0535/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index ec2625d68..a15c7e3ad 100644 --- a/modules/other.js +++ b/modules/other.js @@ -402,7 +402,7 @@ else if (perked == true && game.global.world !== getPageSetting('lootdumpz')) { function buyWeps() { preBuy(); - game.global.buyAmt = 1; + game.global.buyAmt = getPageSetting('gearamounttobuy'); if (game.equipment.Dagger.level < getPageSetting('CapEquip2') && canAffordBuilding('Dagger', null, null, true)) { buyEquipment('Dagger', true, true); } From 9c00fbc18cc7e1d35d7611f494d82db7d4a196a1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 27 Jun 2018 18:39:14 +0100 Subject: [PATCH 0536/3477] Update battlecalc.js --- modules/battlecalc.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index f9433c7d4..94f7f6925 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -270,9 +270,6 @@ function calcOurDmg(minMaxAvg, incStance, incFlucts) { if (!game.global.mapsActive && game.global.mapBonus > 0){ number *= ((game.global.mapBonus * .2) + 1); } - if (game.global.titimpLeft >= 1 && game.global.mapsActive){ - number *= 2; - } if (game.global.achievementBonus > 0){ number *= (1 + (game.global.achievementBonus / 100)); } From c50385fd40782d1f3518919cd15b0829c7274447 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 07:28:41 +0100 Subject: [PATCH 0537/3477] Update breedtimer.js --- modules/breedtimer.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/breedtimer.js b/modules/breedtimer.js index 9de0fd03a..4aeedc871 100644 --- a/modules/breedtimer.js +++ b/modules/breedtimer.js @@ -173,24 +173,25 @@ function autoBreedTimer() { //Abandon trimps function that should handle all special cases. function abandonVoidMap() { var customVars = MODULES["breedtimer"]; - //do nothing if the button isnt set to on. if (!getPageSetting('ForceAbandon')) return; - //exit out of the voidmap if we go back into void-farm-for-health mode (less than 95%, account for some leeway during equipment buying.) if (game.global.mapsActive && getCurrentMapObject().location == "Void") { - var targetBreed = parseInt(getPageSetting('GeneticistTimer')); if(voidCheckPercent < customVars.voidCheckPercent) { - //only exit if it happened for reasons other than random losses of anti-stacks. if (game.portal.Anticipation.level) { - if (targetBreed == 0 || targetBreed == -1) + var antistacklimitv = 45; + if (!game.talents.patience.purchased) { + antistacklimitv = 30; + } + if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimitv && game.global.antiStacks < antistacklimitv) { mapsClicked(true); - else if (game.global.antiStacks == targetBreed) + } + else if (game.global.antiStacks == antistacklimitv) mapsClicked(true); } else mapsClicked(true); } return; - } + } } //Abandon trimps function that should handle all special cases. function forceAbandonTrimps() { From 40d342fdf80629e80de3fba1242dd78a05c6a262 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 07:34:34 +0100 Subject: [PATCH 0538/3477] Update other.js --- modules/other.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/other.js b/modules/other.js index a15c7e3ad..21f3884f7 100644 --- a/modules/other.js +++ b/modules/other.js @@ -459,6 +459,11 @@ function trimpcide() { if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit) { forceAbandonTrimps(); } + if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit && game.global.mapsActive) { + if (getCurrentMapObject().location == "Void") { + abandonVoidMap(); + } + } } function ATspirebreed() { From 2f5dfe61d6b94b8acf23e9652b03d09b39d1e4ba Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 07:46:45 +0100 Subject: [PATCH 0539/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 3f5a7bd0b..fae860a3e 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -374,7 +374,7 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones.', 'multiValue', -1, null, 'Spire'); + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); @@ -389,7 +389,7 @@ function initializeAllSettings() { createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get 200 windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have 200 stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); - createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks aren\'t maxed, force abandon and grab a new group. Will not abandon in voids or spire. Recommended ON. ', 'boolean', true, null, 'Combat'); + createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks aren\'t maxed, force abandon and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); From 91e68c11dc57ebb46543273d4ceb226c190e49cf Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 07:56:45 +0100 Subject: [PATCH 0540/3477] Update perks.js --- modules/perks.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index 50414bc5c..7308f6775 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -171,9 +171,9 @@ AutoPerks.displayGUI = function() { if (loadLastPreset != null) { //these four lines are temporary to migrate Custom Ratios to the new dropdown. Once everyone has the name in localStorage we can remove this. if (loadLastPreset == 15 && !localStorage.getItem('AutoperkSelectedRatioPresetName')) - loadLastPreset = 25; + loadLastPreset = 24; if (localStorage.getItem('AutoperkSelectedRatioPresetName')=="customPreset") - loadLastPreset = 25; + loadLastPreset = 24; setID = loadLastPreset; } else From 579b208eccb686f8b3c4d1df581d9f2bef7d7982 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 07:59:15 +0100 Subject: [PATCH 0541/3477] Update perks.js --- modules/perks.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index 7308f6775..c4959b99f 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -171,9 +171,9 @@ AutoPerks.displayGUI = function() { if (loadLastPreset != null) { //these four lines are temporary to migrate Custom Ratios to the new dropdown. Once everyone has the name in localStorage we can remove this. if (loadLastPreset == 15 && !localStorage.getItem('AutoperkSelectedRatioPresetName')) - loadLastPreset = 24; + loadLastPreset = 23; if (localStorage.getItem('AutoperkSelectedRatioPresetName')=="customPreset") - loadLastPreset = 24; + loadLastPreset = 23; setID = loadLastPreset; } else From f17e3cdaf8f33fd9cf2e3f4946fe4691b116fcbd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:06:32 +0100 Subject: [PATCH 0542/3477] Update utils.js --- modules/utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/utils.js b/modules/utils.js index f2673b22a..d3dd46d4d 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -114,6 +114,7 @@ function serializeSettings() { case 'boolean': return v[k] = el.enabled, v; case 'value': + case 'multiValue': case 'valueNegative': case 'multitoggle': return v[k] = el.value, v; From 5b4d9c10f156cf968cfd59139d02ad5263715351 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:10:47 +0100 Subject: [PATCH 0543/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index fae860a3e..7ca7dd3ef 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -951,7 +951,7 @@ function updateCustomButtons() { //since this is a loop, make sure the Text contents of our buttons are set accurately. (after any setPageSetting) for (var setting in autoTrimpSettings) { var item = autoTrimpSettings[setting]; - if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle') { + if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle' || item.type == 'multiValue') { var elem = document.getElementById(item.id); if (elem != null) { if (item.type == 'multitoggle') From 18ac60f68e60636a877482ef41e435aa4f602044 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:15:45 +0100 Subject: [PATCH 0544/3477] Update utils.js --- modules/utils.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/utils.js b/modules/utils.js index d3dd46d4d..f2673b22a 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -114,7 +114,6 @@ function serializeSettings() { case 'boolean': return v[k] = el.enabled, v; case 'value': - case 'multiValue': case 'valueNegative': case 'multitoggle': return v[k] = el.value, v; From 1bbb1ba89772b121d43b0a7b5ec047630693d808 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:17:11 +0100 Subject: [PATCH 0545/3477] Update utils.js --- modules/utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/utils.js b/modules/utils.js index f2673b22a..d3dd46d4d 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -114,6 +114,7 @@ function serializeSettings() { case 'boolean': return v[k] = el.enabled, v; case 'value': + case 'multiValue': case 'valueNegative': case 'multitoggle': return v[k] = el.value, v; From 51963a8cbe9d5f657f257ef0bdb5f88954b217a9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:18:56 +0100 Subject: [PATCH 0546/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 7ca7dd3ef..fae860a3e 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -951,7 +951,7 @@ function updateCustomButtons() { //since this is a loop, make sure the Text contents of our buttons are set accurately. (after any setPageSetting) for (var setting in autoTrimpSettings) { var item = autoTrimpSettings[setting]; - if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle' || item.type == 'multiValue') { + if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle') { var elem = document.getElementById(item.id); if (elem != null) { if (item.type == 'multitoggle') From 71f396f4f3b153a57e537c90cbdae060b0905bf3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:29:45 +0100 Subject: [PATCH 0547/3477] Update SettingsGUI.js --- SettingsGUI.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index fae860a3e..fb17a43f8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -949,15 +949,17 @@ function updateCustomButtons() { setPageSetting("AutoMaps",1); } //since this is a loop, make sure the Text contents of our buttons are set accurately. (after any setPageSetting) - for (var setting in autoTrimpSettings) { +for (var setting in autoTrimpSettings) { var item = autoTrimpSettings[setting]; if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle') { var elem = document.getElementById(item.id); if (elem != null) { - if (item.type == 'multitoggle') - elem.textContent = item.name[item.value]; - else if (item.value > -1 || item.type == 'valueNegative') - elem.textContent = item.name + ': ' + prettify(item.value); + if (item.type == 'multitoggle') { + elem.textContent = item.name[item.value];} + else if (item.value > -1 || item.type == 'valueNegative'){ + elem.textContent = item.name + ': ' + prettify(item.value);} + else if (item.includes(",")){ + elem.textContent = item.name[item.value];} else elem.innerHTML = item.name + ': ' + ""; } From 59ac72fa62dfa7349975b9ada73597534aa875d6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:32:46 +0100 Subject: [PATCH 0548/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index fb17a43f8..66a84c6d8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -958,7 +958,7 @@ for (var setting in autoTrimpSettings) { elem.textContent = item.name[item.value];} else if (item.value > -1 || item.type == 'valueNegative'){ elem.textContent = item.name + ': ' + prettify(item.value);} - else if (item.includes(",")){ + else if (item.indexOf(',') !== -1){ elem.textContent = item.name[item.value];} else elem.innerHTML = item.name + ': ' + ""; From cae5bea1ce4a8835affd2ce71013adf1954395c4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:35:14 +0100 Subject: [PATCH 0549/3477] Update SettingsGUI.js --- SettingsGUI.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 66a84c6d8..2b86272fc 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -954,12 +954,10 @@ for (var setting in autoTrimpSettings) { if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle') { var elem = document.getElementById(item.id); if (elem != null) { - if (item.type == 'multitoggle') { - elem.textContent = item.name[item.value];} - else if (item.value > -1 || item.type == 'valueNegative'){ - elem.textContent = item.name + ': ' + prettify(item.value);} - else if (item.indexOf(',') !== -1){ - elem.textContent = item.name[item.value];} + if (item.type == 'multitoggle') + elem.textContent = item.name[item.value]; + else if (item.value > -1 || item.type == 'valueNegative') + elem.textContent = item.name + ': ' + prettify(item.value); else elem.innerHTML = item.name + ': ' + ""; } From 56ffecba0704ccc50ce8d8fb7da9060484fe49cd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:38:24 +0100 Subject: [PATCH 0550/3477] Update utils.js --- modules/utils.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/utils.js b/modules/utils.js index d3dd46d4d..f2673b22a 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -114,7 +114,6 @@ function serializeSettings() { case 'boolean': return v[k] = el.enabled, v; case 'value': - case 'multiValue': case 'valueNegative': case 'multitoggle': return v[k] = el.value, v; From 11b99df5643689d3d9696e3df43c9c8e716afe07 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:43:21 +0100 Subject: [PATCH 0551/3477] Revert "Update utils.js" This reverts commit 56ffecba0704ccc50ce8d8fb7da9060484fe49cd. --- modules/utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/utils.js b/modules/utils.js index f2673b22a..d3dd46d4d 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -114,6 +114,7 @@ function serializeSettings() { case 'boolean': return v[k] = el.enabled, v; case 'value': + case 'multiValue': case 'valueNegative': case 'multitoggle': return v[k] = el.value, v; From b0971ff43495cb2d02953c7ebe06a01b17f6b28a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:43:30 +0100 Subject: [PATCH 0552/3477] Revert "Update SettingsGUI.js" This reverts commit cae5bea1ce4a8835affd2ce71013adf1954395c4. --- SettingsGUI.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 2b86272fc..66a84c6d8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -954,10 +954,12 @@ for (var setting in autoTrimpSettings) { if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle') { var elem = document.getElementById(item.id); if (elem != null) { - if (item.type == 'multitoggle') - elem.textContent = item.name[item.value]; - else if (item.value > -1 || item.type == 'valueNegative') - elem.textContent = item.name + ': ' + prettify(item.value); + if (item.type == 'multitoggle') { + elem.textContent = item.name[item.value];} + else if (item.value > -1 || item.type == 'valueNegative'){ + elem.textContent = item.name + ': ' + prettify(item.value);} + else if (item.indexOf(',') !== -1){ + elem.textContent = item.name[item.value];} else elem.innerHTML = item.name + ': ' + ""; } From 3c637191131443e570def652ae32682eb860b63f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:43:33 +0100 Subject: [PATCH 0553/3477] Revert "Update SettingsGUI.js" This reverts commit 59ac72fa62dfa7349975b9ada73597534aa875d6. --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 66a84c6d8..fb17a43f8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -958,7 +958,7 @@ for (var setting in autoTrimpSettings) { elem.textContent = item.name[item.value];} else if (item.value > -1 || item.type == 'valueNegative'){ elem.textContent = item.name + ': ' + prettify(item.value);} - else if (item.indexOf(',') !== -1){ + else if (item.includes(",")){ elem.textContent = item.name[item.value];} else elem.innerHTML = item.name + ': ' + ""; From 88e3eb4d222767b13587d17445926f5a56b450e8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:43:37 +0100 Subject: [PATCH 0554/3477] Revert "Update SettingsGUI.js" This reverts commit 71f396f4f3b153a57e537c90cbdae060b0905bf3. --- SettingsGUI.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index fb17a43f8..fae860a3e 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -949,17 +949,15 @@ function updateCustomButtons() { setPageSetting("AutoMaps",1); } //since this is a loop, make sure the Text contents of our buttons are set accurately. (after any setPageSetting) -for (var setting in autoTrimpSettings) { + for (var setting in autoTrimpSettings) { var item = autoTrimpSettings[setting]; if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle') { var elem = document.getElementById(item.id); if (elem != null) { - if (item.type == 'multitoggle') { - elem.textContent = item.name[item.value];} - else if (item.value > -1 || item.type == 'valueNegative'){ - elem.textContent = item.name + ': ' + prettify(item.value);} - else if (item.includes(",")){ - elem.textContent = item.name[item.value];} + if (item.type == 'multitoggle') + elem.textContent = item.name[item.value]; + else if (item.value > -1 || item.type == 'valueNegative') + elem.textContent = item.name + ': ' + prettify(item.value); else elem.innerHTML = item.name + ': ' + ""; } From 5280cd2c3c8e9694b3fd7be1016861579520bffe Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:43:49 +0100 Subject: [PATCH 0555/3477] Revert "Update SettingsGUI.js" This reverts commit 51963a8cbe9d5f657f257ef0bdb5f88954b217a9. --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index fae860a3e..7ca7dd3ef 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -951,7 +951,7 @@ function updateCustomButtons() { //since this is a loop, make sure the Text contents of our buttons are set accurately. (after any setPageSetting) for (var setting in autoTrimpSettings) { var item = autoTrimpSettings[setting]; - if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle') { + if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle' || item.type == 'multiValue') { var elem = document.getElementById(item.id); if (elem != null) { if (item.type == 'multitoggle') From cfe127eb0e29c8fe59836d345f32ff0431e02c7b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:43:53 +0100 Subject: [PATCH 0556/3477] Revert "Update utils.js" This reverts commit 1bbb1ba89772b121d43b0a7b5ec047630693d808. --- modules/utils.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/utils.js b/modules/utils.js index d3dd46d4d..f2673b22a 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -114,7 +114,6 @@ function serializeSettings() { case 'boolean': return v[k] = el.enabled, v; case 'value': - case 'multiValue': case 'valueNegative': case 'multitoggle': return v[k] = el.value, v; From 648841b65a03d333379bbdb06ded3b1644d51704 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:43:54 +0100 Subject: [PATCH 0557/3477] Revert "Update utils.js" This reverts commit 18ac60f68e60636a877482ef41e435aa4f602044. --- modules/utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/utils.js b/modules/utils.js index f2673b22a..d3dd46d4d 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -114,6 +114,7 @@ function serializeSettings() { case 'boolean': return v[k] = el.enabled, v; case 'value': + case 'multiValue': case 'valueNegative': case 'multitoggle': return v[k] = el.value, v; From 125b6301cd7c746eb0657de50f068277e67d4b3a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:44:01 +0100 Subject: [PATCH 0558/3477] Revert "Update SettingsGUI.js" This reverts commit 5b4d9c10f156cf968cfd59139d02ad5263715351. --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 7ca7dd3ef..fae860a3e 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -951,7 +951,7 @@ function updateCustomButtons() { //since this is a loop, make sure the Text contents of our buttons are set accurately. (after any setPageSetting) for (var setting in autoTrimpSettings) { var item = autoTrimpSettings[setting]; - if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle' || item.type == 'multiValue') { + if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle') { var elem = document.getElementById(item.id); if (elem != null) { if (item.type == 'multitoggle') From 7c49621e97a4758ba96609cde072c0661df60620 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 08:44:03 +0100 Subject: [PATCH 0559/3477] Revert "Update utils.js" This reverts commit f17e3cdaf8f33fd9cf2e3f4946fe4691b116fcbd. --- modules/utils.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/utils.js b/modules/utils.js index d3dd46d4d..f2673b22a 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -114,7 +114,6 @@ function serializeSettings() { case 'boolean': return v[k] = el.enabled, v; case 'value': - case 'multiValue': case 'valueNegative': case 'multitoggle': return v[k] = el.value, v; From 5a3f5bb26e415afd88358815b4fb25a3cc75a2df Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 29 Jun 2018 21:48:24 +0100 Subject: [PATCH 0560/3477] Update other.js --- modules/other.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/other.js b/modules/other.js index 21f3884f7..f6c4654c6 100644 --- a/modules/other.js +++ b/modules/other.js @@ -452,6 +452,7 @@ function buyArms() { } function trimpcide() { +if (game.portal.Anticipation.level >= 1) { var antistacklimit = 45; if (!game.talents.patience.purchased) { antistacklimit = 30; @@ -464,6 +465,7 @@ function trimpcide() { abandonVoidMap(); } } + } } function ATspirebreed() { From 836fffb631d4d8be9dd3a5a9031bee65e026161b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 11:28:05 +0100 Subject: [PATCH 0561/3477] Update SettingsGUI.js --- SettingsGUI.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index fae860a3e..6ce13c6c0 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -178,7 +178,8 @@ function initializeAllTabs() { createTabs("Jobs", "Jobs - Worker Settings"); createTabs("Gear", "Gear - Equipment Settings"); createTabs("Maps", "Maps - AutoMaps & VoidMaps Settings"); - createTabs("Spire", "Spire - Settings for Spires"); + createTabs("Spire", "Spire - Settings for Spires & Raiding"); + createTabs("Daily", "Settings for Dailys"); createTabs("Combat", "Combat & Stance Settings"); createTabs("Scryer", "Scryer Settings"); createTabs("Magma", "Dimensional Generator & Magmite Settings"); @@ -246,16 +247,14 @@ function initializeAllSettings() { createSetting('fastallocate', 'Fast Allocate', 'Turn on if your helium is above 500Qa. Not recommended for low amounts of helium. ', 'boolean', false, null, 'Core'); createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Core'); - createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will dump 1000 helium into looting II until you can no longer afford to.', 'value', -1, null, 'Core'); + createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will purchase 1000 levels of looting II until you can no longer afford to.', 'value', -1, null, 'Core'); //Line2 - createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Core'); - createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Core'); createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); document.getElementById('FinishC2').parentNode.insertAdjacentHTML('afterend','
    '); - //NewLine3 For Autoportal, it would be nice to add a 5s countdown, like with magma spending. + //NewLine3 createSetting('AutoPortal', 'AutoPortal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); createSetting('HeliumHourChallenge', 'Portal Challenge', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. Do not choose a challenge if you havent unlocked it. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); document.getElementById("HeliumHourChallengeLabel").innerHTML = "Portal Challenge:"; //fit it on 1 line. @@ -270,7 +269,12 @@ function initializeAllSettings() { $pauseScript.parentNode.style.setProperty('margin-left','0'); - +//Daily + createSetting('ToggleDaily', 'Toggle Daily Settings', 'Toggle Daily settings on and off. ', 'boolean', false, null, 'Daily'); + createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Daily'); + createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Daily'); + createSetting('DailyVoidMod', 'Daily Void Zone Mod', 'If this is on, your daily autoportal mod (Core) will also apply to Void maps on dailies. For example, if you have void maps and autoportal set to 200 on normal runs, and your daily mod is 15, you will do voids and portal 15 zones later on a daily.', 'boolean', true, null, 'Daily'); + //Buildings createSetting('BuyBuildingsNew', ['Buy Neither','Buy Buildings & Storage', 'Buy Buildings', 'Buy Storage'], 'AutoBuys Storage when it is almost full (it even anticipates Jestimp) and Non-Storage Buildings (As soon as they are available). Takes cost efficiency into account before buying Non-Storage Buildings.', 'multitoggle', 1, null, "Buildings"); //This should replace the two below @@ -354,7 +358,6 @@ function initializeAllSettings() { createSetting('RunNewVoidsUntilNew', 'New Voids Mod', '0 to disable. Positive numbers are added to your Void Map zone. -1 for no cap. This allows you to run new Void Maps obtained after your Void Map zone by adding this number to your Void Map zone.
    Example Void map zone=185.75 and This setting=10. New Voids run until 197.75).
    This means that any new void maps gained until Z197, cell 75 will be run. CAUTION: May severely slow you down by trying to do too-high level void maps. Default 0 (OFF).', 'value', '0', null, 'Maps'); //Should replace the two below //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); //-1 Autograbs your Finish Daily Z Mod
    0 Disables this setting
    Positive Numbers add to your normal void zone on a daily
    Possible number input? - createSetting('DailyVoidMod', 'Daily Void Zone Mod', 'If this is on, your daily autoportal mod (Core) will also apply to Void maps on dailies. For example, if you have void maps and autoportal set to 200 on normal runs, and your daily mod is 15, you will do voids and portal 15 zones later on a daily.', 'boolean', true, null, 'Maps'); createSetting('VoidPraid', 'Plus Maps for Voids', 'Raid Prestiges before running Void Maps. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS PRAIDING. ', 'boolean', 'false', null, 'Maps'); createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. And I cba cause its a meh setting anyway. Advancing 2 zones more than doubles your income. Only useful for spire I, and IMO you may aswell actually play the game manually at SOME point. From fbc40bd9625eb271f72a391b42fe39cab3a99f0f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 11:35:04 +0100 Subject: [PATCH 0562/3477] Update SettingsGUI.js --- SettingsGUI.js | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 6ce13c6c0..c0e48c361 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -861,38 +861,42 @@ function updateCustomButtons() { function turnOn(elem) { toggleElem(elem, true); } - //automaps button in GUI + + //Hide settings + + //Portal document.getElementById("autoMapBtn").setAttribute("class", "noselect settingsBtn settingBtn" + autoTrimpSettings.AutoMaps.value); - //auto portal setting, hide until player has unlocked the balance challenge (game.challenges.Balance.filter()) ? turnOn("AutoPortal") : turnOff("AutoPortal"); - //auto Daily settings, hide until player has unlocked the Daily challenges - var doDaily = game.challenges.Daily.filter(); - (doDaily) ? turnOn("AutoStartDaily") : turnOff("AutoStartDaily"); - (doDaily) ? turnOn("AutoFinishDaily") : turnOff("AutoFinishDaily"); - //if custom auto portal is not selected, remove the custom value settingsbox (autoTrimpSettings.AutoPortal.selected == "Custom") ? turnOn("CustomAutoPortal") : turnOff("CustomAutoPortal"); - //if HeHr is not selected, remove HeliumHourChallenge settingsbox var heHr = (autoTrimpSettings.AutoPortal.selected == "Helium Per Hour"); (heHr || autoTrimpSettings.AutoPortal.selected == "Custom") ? turnOn("HeliumHourChallenge") : turnOff("HeliumHourChallenge"); - //if HeHr is not selected, remove HeHrDontPortalBefore settingsbox (heHr) ? turnOn("HeHrDontPortalBefore") : turnOff("HeHrDontPortalBefore"); - //if HeHr is not selected, remove HeHr buffer settingsbox (heHr) ? turnOn("HeliumHrBuffer") : turnOff("HeliumHrBuffer"); - //if ShieldBlock is for sure, remove ShieldBlock from settingsbox (achievement=12 means z100). - //(game.achievements.zones.finished < 12) ? turnOn("BuyShieldblock") : function(){turnOff("BuyShieldblock");setPageSetting("BuyShieldblock",false);}(); - //if AS3 is not selected, remove Windstack settingsbox + + //AutoStance getPageSetting('AutoStance')==3 ? turnOn("WindStackingMin"): turnOff("WindStackingMin"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinPoison"): turnOff("ScryUseinPoison"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinWind"): turnOff("ScryUseinWind"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinIce"): turnOff("ScryUseinIce"); getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); + + //Loot Dump getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpa"): turnOff("lootdumpa"); getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpz"): turnOff("lootdumpz"); + + //Raid getPageSetting('BWraid')==true ? turnOn("BWraidingz"): turnOff("BWraidingz"); getPageSetting('BWraid')==true ? turnOn("BWraidingmax"): turnOff("BWraidingmax"); - /*//Make Scryer settings a little more user friendly - if (getPageSetting('ScryerUseinVoidMaps2') !=0) { setPageSetting("ScryerUseinMaps2", "2"); } - if (getPageSetting('ScryerUseinSpire2') !=1 && isActiveSpireAT()) { setPageSetting("ScryerSkipCorrupteds2", "2"); } */ + + //Daily + var doDaily = game.challenges.Daily.filter(); + (doDaily) ? turnOn("AutoStartDaily") : turnOff("AutoStartDaily"); + (doDaily) ? turnOn("AutoFinishDaily") : turnOff("AutoFinishDaily"); + getPageSetting('ToggleDaily')==true ? turnOn("AutoStartDaily"): turnOff("AutoStartDaily"); + getPageSetting('ToggleDaily')==true ? turnOn("AutoFinishDailyNew"): turnOff("AutoFinishDailyNew"); + getPageSetting('ToggleDaily')==true ? turnOn("DailyVoidMod"): turnOff("DailyVoidMod"); + + //Show and Hide useless settings to reduce UI clutter var turnonofflist = [ "ManualGather2","BuyUpgradesNew","TrapTrimps","UsePatience", From 482e2af4b770adb329b2fbae46206493022fa811 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 11:40:34 +0100 Subject: [PATCH 0563/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 346a10539..b4add447d 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,10 +62,11 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: true}); +changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation is coming. Check combat for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: true}); +changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: false}); changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: false}); changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: false}); -changelogList.push({date: "13/06/2018", version: "v2.2.3", description: "Plus maps for voids has been changed. It now works the same as Prestige raiding. Check tooltip for more details. Ratios will be out soon, including the new z500. ", isNew: false}); +//changelogList.push({date: "13/06/2018", version: "v2.2.3", description: "Plus maps for voids has been changed. It now works the same as Prestige raiding. Check tooltip for more details. Ratios will be out soon, including the new z500. ", isNew: false}); //changelogList.push({date: "05/06/2018", version: "v2.2.2", description: "Fixed map at zone. Updated calcs. Praiding should work for everyone now. BW raiding still being tested, but should work. Ratios being tested, finding optimum coord and carp. Any bugs, please let me know, thanks. ", isNew: false}); //changelogList.push({date: "05/06/2018", version: "v2.2.1", description: "Updated Heirloom calc, should be 4.8 ready. Ratios will be updated soon. ", isNew: false}); //changelogList.push({date: "28/05/2018", version: "v2.2", description: "Welcome to the Zek fork. Added single use prestige raiding, BW raiding, looting II dump, amals are now calcd properly. ", isNew: false}); @@ -84,7 +85,7 @@ function printChangelog() { }; var footer = 'ZӘK Fork - Report any bugs/problems please!\ -
    Talk with the dev: < ZӘK >#2509 @ AutoTrimps Discord Channel\ +
    Talk with the dev: ZӘK#2509 @ AutoTrimps Discord Channel\
    See ReadMe Or check the commit history (if you want).' , action = 'cancelTooltip()' , title = 'Script Update Notice
    ' + ATversion From 98b94271533b2ff58f6793672e708cb53f887f97 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 11:41:47 +0100 Subject: [PATCH 0564/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index b4add447d..4254e55da 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,7 +62,7 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation is coming. Check combat for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: true}); +changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation is coming. Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: true}); changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: false}); changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: false}); changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: false}); From 01599493dc7a01cc32c9a5cebeba06f6fe97c9be Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 18:09:20 +0100 Subject: [PATCH 0565/3477] Update SettingsGUI.js --- SettingsGUI.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index c0e48c361..5432b38d8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -273,8 +273,16 @@ function initializeAllSettings() { createSetting('ToggleDaily', 'Toggle Daily Settings', 'Toggle Daily settings on and off. ', 'boolean', false, null, 'Daily'); createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Daily'); createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Daily'); - createSetting('DailyVoidMod', 'Daily Void Zone Mod', 'If this is on, your daily autoportal mod (Core) will also apply to Void maps on dailies. For example, if you have void maps and autoportal set to 200 on normal runs, and your daily mod is 15, you will do voids and portal 15 zones later on a daily.', 'boolean', true, null, 'Daily'); - + createSetting('DailyVoidMod', 'Daily Void Zone', 'What zone to do void maps in dailys. ', 'value', -1, null, 'Daily'); + /*createSetting('Dailypraidz', 'Daily P Raid Z', 'Zones to Prestige Raid in Dailys. ', 'multiValue', -1, null, 'Daily'); + createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); + createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); +//Line 2 + createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); + createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); + createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); + createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); + createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily');*/ //Buildings createSetting('BuyBuildingsNew', ['Buy Neither','Buy Buildings & Storage', 'Buy Buildings', 'Buy Storage'], 'AutoBuys Storage when it is almost full (it even anticipates Jestimp) and Non-Storage Buildings (As soon as they are available). Takes cost efficiency into account before buying Non-Storage Buildings.', 'multitoggle', 1, null, "Buildings"); //This should replace the two below From d3929472cfafee0c34948329929327a2b6228868 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 18:09:50 +0100 Subject: [PATCH 0566/3477] Update maps.js --- modules/maps.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index c38a7d788..2aa513810 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -81,9 +81,9 @@ function autoMap() { //FIND VOID MAPS LEVEL: var voidMapLevelSetting = getPageSetting('VoidMaps'); //Add your daily zone mod onto the void maps level - var dailyVoidMod = getPageSetting('AutoFinishDailyNew'); - if ((game.global.challengeActive == "Daily") && (getPageSetting('AutoFinishDailyNew') != 999) && (getPageSetting('DailyVoidMod'))) { - (voidMapLevelSetting += dailyVoidMod); + var dailyVoidMod = getPageSetting('DailyVoidMod'); + if ((game.global.challengeActive == "Daily") && (getPageSetting('DailyVoidMod') >= 1)) { + (voidMapLevelSetting = dailyVoidMod); } //decimal void maps are possible, using string function to avoid false float precision (0.29999999992). javascript can compare ints to strings anyway. var voidMapLevelSettingZone = (voidMapLevelSetting + "").split(".")[0]; From 2142d811c705167519c2e2f8fe7078e93be627ff Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 18:15:21 +0100 Subject: [PATCH 0567/3477] Update SettingsGUI.js --- SettingsGUI.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 5432b38d8..de59b1f7b 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -270,15 +270,14 @@ function initializeAllSettings() { //Daily - createSetting('ToggleDaily', 'Toggle Daily Settings', 'Toggle Daily settings on and off. ', 'boolean', false, null, 'Daily'); createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Daily'); createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Daily'); - createSetting('DailyVoidMod', 'Daily Void Zone', 'What zone to do void maps in dailys. ', 'value', -1, null, 'Daily'); + createSetting('DailyVoidMod', 'Daily Void Zone', 'What zone to do void maps in dailys. Disable with -1', 'value', -1, null, 'Daily'); /*createSetting('Dailypraidz', 'Daily P Raid Z', 'Zones to Prestige Raid in Dailys. ', 'multiValue', -1, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); -//Line 2 createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); +//Line 2 createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); @@ -900,9 +899,6 @@ function updateCustomButtons() { var doDaily = game.challenges.Daily.filter(); (doDaily) ? turnOn("AutoStartDaily") : turnOff("AutoStartDaily"); (doDaily) ? turnOn("AutoFinishDaily") : turnOff("AutoFinishDaily"); - getPageSetting('ToggleDaily')==true ? turnOn("AutoStartDaily"): turnOff("AutoStartDaily"); - getPageSetting('ToggleDaily')==true ? turnOn("AutoFinishDailyNew"): turnOff("AutoFinishDailyNew"); - getPageSetting('ToggleDaily')==true ? turnOn("DailyVoidMod"): turnOff("DailyVoidMod"); //Show and Hide useless settings to reduce UI clutter From c4a65202feea9545791763bd417103fd3bbaf86b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 19:29:53 +0100 Subject: [PATCH 0568/3477] Update other.js --- modules/other.js | 208 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 205 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index f6c4654c6..a33cadd80 100644 --- a/modules/other.js +++ b/modules/other.js @@ -1,16 +1,24 @@ MODULES["other"] = {}; MODULES["other"].enableRoboTrimpSpam = true; //set this to false to stop Spam of "Activated Robotrimp MagnetoShriek Ability" var prestraid = false; +var dprestraid = false; var failpraid = false; +var dfailpraid = false; var bwraided = false; +var dbwraided = false; var failbwraid = false; +var dfailbwraid = false; var perked = false; var prestraidon = false; +var dprestraidon = false; var mapbought = false; +var dmapbought = false; var failpvoidraid = false; +var dfailpvoidraid = false; var prestvoid = false; +var dprestvoid = false; var mapboughtvoid = false; -var bwraidon = false; +var dmapboughtvoid = false; var prebreedtimer = game.global.GeneticistassistSetting; //Activate Robo Trimp (will activate on the first zone after liquification) @@ -239,7 +247,7 @@ function Praiding() { } if (getPageSetting('Praidingzone').every(isBelowThreshold)) { prestraid = false; - failpraid = false + failpraid = false; prestraidon = false; mapbought = false; } @@ -315,7 +323,6 @@ function BWraiding() { } //VoidPraid -//Prest before voids function Praidingvoid() { var dailyvoidpraid = getPageSetting('DailyVoidMod'); var VMzone = getPageSetting('VoidMaps'); @@ -485,3 +492,198 @@ function helptrimpsnotdie () { buyArms(); } } + +//Daily stuff couldnt be bothered to add it to original + +function dailyPraiding() { + if (getPageSetting('dPraidingzone').length) { + if (getPageSetting('dPraidingzone').includes(game.global.world) && !dprestraid && !dfailpraid) { + debug('World Zone matches a Daily Praiding Zone!'); + dprestraidon = true; + + if (getPageSetting('AutoMaps') == 1 && !dprestraid && !dfailpraid) { + autoTrimpSettings["AutoMaps"].value = 0; + } + if (!game.global.preMapsActive && !game.global.mapsActive && !dprestraid && !dfailpraid) { + mapsClicked(); + if (!game.global.preMapsActive) { + mapsClicked(); + } + debug("Beginning Daily Prestige Raiding..."); + } + if (game.options.menu.repeatUntil.enabled!=2 && !dprestraid && !dfailpraid) { + game.options.menu.repeatUntil.enabled = 2; + } + if (game.global.preMapsActive && !dprestraid && !dfailpraid) { + plusPres(); + if ((updateMapCost(true) <= game.resources.fragments.owned)) { + buyMap(); + dfailpraid = false; + dmapbought = true; + } + else if ((updateMapCost(true) > game.resources.fragments.owned)) { + if (getPageSetting('AutoMaps') == 0 && !dprestraid) { + autoTrimpSettings["AutoMaps"].value = 1; + dfailpraid = true; + dprestraidon = false; + dmapbought = false; + debug("Failed to Daily Prestige Raid. Looks like you can't afford to.."); + } + return; + + } + } + if (mapbought == true) { + selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); + runMap(); + } + if (!dprestraid && !dfailpraid && !game.global.repeatMap) { + repeatClicked(); + + } + dprestraid = true; + dfailpraid = false; + dprestraidon = false; + dmapbought = false; + } + } + + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dprestraid && !dfailpraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Daily Prestige Raiding successfull!"); + debug("Turning AutoMaps back on"); + } + if (getPageSetting('dPraidingzone').every(isBelowThreshold)) { + dprestraid = false; + dfailpraid = false + dprestraidon = false; + dmapbought = false; + } +} + +function dailyBWraiding() { + + if (!dprestraidon && game.global.world == getPageSetting('dBWraidingz') && !dbwraided && !dfailbwraid && getPageSetting('Dailybwraid')) { + + if (getPageSetting('AutoMaps') == 1 && !dbwraided && !dfailbwraid) { + autoTrimpSettings["AutoMaps"].value = 0; + } + + if (!game.global.preMapsActive && !game.global.mapsActive && !dbwraided && !dfailbwraid) { + mapsClicked(); + + if (!game.global.preMapsActive) { + mapsClicked(); + } + } + + if (game.options.menu.repeatUntil.enabled != 2 && !dbwraided && !dfailbwraid) { + game.options.menu.repeatUntil.enabled = 2; + } + + if (game.global.preMapsActive && !dbwraided && !dfailbwraid) { + selectMap(findLastBionic().id); + dfailbwraid = false; + debug("Beginning Daily BW Raiding..."); + } + + else if (game.global.preMapsActive && !dbwraided && !dfailbwraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('BWraidingz') && !dbwraided) { + autoTrimpSettings["AutoMaps"].value = 1; + dfailbwraid = true; + debug("Failed to Daily BW raid. Looks like you don't have a BW to raid..."); + } + + } + + if (findLastBionic().level <= getPageSetting('dBWraidingmax') && !dbwraided && !dfailbwraid && game.global.preMapsActive) { + runMap(); + } + + if (!game.global.repeatMap && !dbwraided && !dfailbwraid && game.global.mapsActive) { + repeatClicked(); + } + + if (findLastBionic().level > getPageSetting('dBWraidingmax') && !dbwraided && !dfailbwraid) { + dbwraided = true; + dfailbwraid = false; + debug("...Successfully Daily BW raided!"); + } + + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('dBWraidingz') && dbwraided && !dfailbwraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); + } + + } + + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dbwraided && !dfailbwraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); + } + + if (dbwraided && !dfailbwraid && game.global.world !== getPageSetting('dBWraidingz')) { + dbwraided = false; + dfailbwraid = false; + } + +} + +//dVoidPraid + function dailyPraidingvoid() { + var dVMzone = getPageSetting('dVoidMaps'); + if (game.global.world == dVMzone && getPageSetting('dVoidPraid') == true && !dprestvoid && !dfailpvoidraid) { + if (getPageSetting('AutoMaps') == 1 && !dprestvoid && !dfailpvoidraid) { + autoTrimpSettings["AutoMaps"].value = 0; + } + if (!game.global.preMapsActive && !game.global.mapsActive && !dprestvoid && !dfailpvoidraid) { + mapsClicked(); + if (!game.global.preMapsActive) { + mapsClicked(); + } + debug("Beginning Daily Prestige Raiding for Voids..."); + } + if (game.options.menu.repeatUntil.enabled!=2 && !dprestvoid && !dfailpvoidraid) { + game.options.menu.repeatUntil.enabled = 2; + } + if (game.global.preMapsActive && !dprestvoid && !dfailpvoidraid) { + plusPres(); + if ((updateMapCost(true) <= game.resources.fragments.owned)) { + buyMap(); + dfailpvoidraid = false; + dmapboughtvoid = true; + } + else if ((updateMapCost(true) > game.resources.fragments.owned)) { + if (getPageSetting('AutoMaps') == 0 && !dprestvoid) { + autoTrimpSettings["AutoMaps"].value = 1; + dfailpvoidraid = true; + dmapboughtvoid = false; + debug("Failed to Daily Prestige Raid for Voids. Looks like you can't afford to.."); + } + return; + + } + } + if (dmapboughtvoid == true) { + selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); + runMap(); + } + if (!dprestvoid && !dfailpvoidraid && !game.global.repeatMap) { + repeatClicked(); + debug("...Successfully Daily Void Prestiged!"); + } + dprestvoid = true; + dfailpvoidraid = false; + dmapboughtvoid = false; + } + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dprestvoid && !dfailpvoidraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); + } + if (dprestvoid == true && game.global.world !== dVMzone) { + dprestvoid = false; + dfailpvoidraid = false; + dmapboughtvoid = false; + } + +} From 3c7deb42696c0efecc9b7d8bf5a305af357ceb56 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 19:30:03 +0100 Subject: [PATCH 0569/3477] Update portal.js --- modules/portal.js | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 3b63a5851..5c85a1824 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -12,17 +12,12 @@ var zonePostpone = 0; //additional postponement of the zone above. //Decide When to Portal function autoPortal() { if(!game.global.portalActive) return; - var autoFinishDaily = (game.global.challengeActive == "Daily" && getPageSetting('AutoFinishDailyNew') != 999); - var autoFinishDailyZone = getPageSetting('AutoFinishDailyNew'); - if (!autoFinishDaily) - autoFinishDailyZone = 0; //dont use stale disabled values switch (autoTrimpSettings.AutoPortal.selected) { //portal if we have lower He/hr than the previous zone (or buffer) case "Helium Per Hour": var OKtoPortal = false; - if (!game.global.challengeActive || autoFinishDaily) { + if (!game.global.challengeActive) { var minZone = getPageSetting('HeHrDontPortalBefore'); - minZone += autoFinishDailyZone; game.stats.bestHeliumHourThisRun.evaluate(); //normally, evaluate() is only called once per second, but the script runs at 10x a second. var bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; var bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; @@ -53,11 +48,6 @@ function autoPortal() { setTimeout(function(){ if (zonePostpone >= 2) return; //do nothing if we postponed. - if (autoFinishDaily){ - abandonDaily(); - document.getElementById('finishDailyBtnContainer').style.display = 'none'; - } - // if (autoTrimpSettings.HeliumHourChallenge.selected != 'None') doPortal(autoTrimpSettings.HeliumHourChallenge.selected); else @@ -67,13 +57,11 @@ function autoPortal() { } break; case "Custom": - if ((game.global.world > getPageSetting('CustomAutoPortal')+autoFinishDailyZone) && - (!game.global.challengeActive || autoFinishDaily)) { - if (autoFinishDaily) { - abandonDaily(); - document.getElementById('finishDailyBtnContainer').style.display = 'none'; + var portalzone = getPageSetting('CustomAutoPortal'); + if (getPageSetting('Dailyportal') >= 1) { + portalzone = getPageSetting('Dailyportal'); } - // + if (game.global.world > portalzone) { if (autoTrimpSettings.HeliumHourChallenge.selected != 'None') doPortal(autoTrimpSettings.HeliumHourChallenge.selected); else @@ -181,6 +169,9 @@ function findOutCurrentPortalLevel() { break; case "Custom": portalLevel = getPageSetting('CustomAutoPortal') + 1; + if (getPageSetting('Dailyportal') >= 1) { + portalLevel = getPageSetting('Dailyportal') + 1; + } leadCheck = getPageSetting('HeliumHourChallenge') == "Lead" ? true : false; break; default: From b0bf3ff40a47b052b514ed3238ce0b3337eef053 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 19:30:59 +0100 Subject: [PATCH 0570/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 4254e55da..38945f160 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -203,21 +203,30 @@ function mainLoop() { } if (getPageSetting('AutoEggs')) easterEggClicked(); - setTitle(); // Set the browser title + setTitle(); } - setScienceNeeded(); //determine how much science is needed + setScienceNeeded(); + +//EXECUTE CORE LOGIC + +//Extra - //EXECUTE CORE LOGIC if (getPageSetting('ExitSpireCell') > 0) exitSpireCell(); //"Exit Spire After Cell" (other.js) - if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); - if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); - //if (getPageSetting('loomprotect') == true) protectloom(); //"Exit Spire After Cell" (other.js) - if (getPageSetting('Praidingzone').length) Praiding(); //Prestige Raiding (other.js) - if (getPageSetting('BWraid')==true){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) - if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); - if (getPageSetting('VoidPraid')==true) Praidingvoid(); - if (getPageSetting('ForceAbandon')==true) trimpcide(); + if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //breedtimer.js + if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); //other.js + if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) + if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) + if (getPageSetting('BWraid')==true && game.global.challengeActive != "Daily"){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) + if (getPageSetting('Dailybwraid')==true && game.global.challengeActive == "Daily"){setTimeout(dailyBWraiding(), 3000);} //BW Raiding (other.js) + if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); //other.js + if (getPageSetting('DailyBWraid')==true && dbwraidon) buyWeps(); //other.js + if (getPageSetting('VoidPraid')==true && game.global.challengeActive != "Daily") Praidingvoid(); //other.js + if (getPageSetting('dVoidPraid')==true && game.global.challengeActive == "Daily") dailyPraidingvoid(); //other.js + if (getPageSetting('ForceAbandon')==true) trimpcide(); //other.js if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) + +//Original + if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); if (agu && agu!='Off') autoGoldenUpgradesAT(agu); //"Golden Upgrades" (other.js) From ee990ae8eb67a5b94faa5333d570b59940257768 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 19:33:30 +0100 Subject: [PATCH 0571/3477] Update other.js --- modules/other.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/other.js b/modules/other.js index a33cadd80..c8a9f5490 100644 --- a/modules/other.js +++ b/modules/other.js @@ -19,6 +19,8 @@ var prestvoid = false; var dprestvoid = false; var mapboughtvoid = false; var dmapboughtvoid = false; +var bwraidon = false; +var dbwraidon = false; var prebreedtimer = game.global.GeneticistassistSetting; //Activate Robo Trimp (will activate on the first zone after liquification) @@ -291,6 +293,7 @@ function BWraiding() { if (findLastBionic().level <= getPageSetting('BWraidingmax') && !bwraided && !failbwraid && game.global.preMapsActive) { runMap(); + bwraidon = true; } if (!game.global.repeatMap && !bwraided && !failbwraid && game.global.mapsActive) { @@ -300,6 +303,7 @@ function BWraiding() { if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { bwraided = true; failbwraid = false; + bwraidon = false; debug("...Successfully BW raided!"); } @@ -318,6 +322,7 @@ function BWraiding() { if (bwraided && !failbwraid && game.global.world !== getPageSetting('BWraidingz')) { bwraided = false; failbwraid = false; + bwraidon = false; } } @@ -598,6 +603,7 @@ function dailyBWraiding() { if (findLastBionic().level <= getPageSetting('dBWraidingmax') && !dbwraided && !dfailbwraid && game.global.preMapsActive) { runMap(); + dbwraidon = true; } if (!game.global.repeatMap && !dbwraided && !dfailbwraid && game.global.mapsActive) { @@ -607,6 +613,7 @@ function dailyBWraiding() { if (findLastBionic().level > getPageSetting('dBWraidingmax') && !dbwraided && !dfailbwraid) { dbwraided = true; dfailbwraid = false; + dbwraidon = false; debug("...Successfully Daily BW raided!"); } @@ -625,6 +632,7 @@ function dailyBWraiding() { if (dbwraided && !dfailbwraid && game.global.world !== getPageSetting('dBWraidingz')) { dbwraided = false; dfailbwraid = false; + dbwraidon = false; } } From e75bb5626e90c762cabb31852981294d69dcdff2 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 19:34:10 +0100 Subject: [PATCH 0572/3477] Update SettingsGUI.js --- SettingsGUI.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index de59b1f7b..0ef4a632e 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -269,20 +269,24 @@ function initializeAllSettings() { $pauseScript.parentNode.style.setProperty('margin-left','0'); + //Daily createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Daily'); - createSetting('AutoFinishDailyNew', 'Finish Daily Z Mod', 'The Helium Don\'t Portal Before and Custom AutoPortal settings will Auto-Finish the daily whenever they trigger and then portal you. This allows you to modify this # of zones ealier/later than your regular zone. Negative numbers mean you will portal EARLIER than normal. Positive numbers will DELAY portalling until a later zone. 0 does not mod your normal AutoPortal setting. When used with the He/Hr AutoPortal, this does not FORCE it to end early, only ALLOW it to if your He/Hr drops. To disable AutoPortal during a Daily, turn off the AutoPortal option or set this to 999!', 'valueNegative', 999, null, 'Daily'); + createSetting('Dailyportal', 'Daily Autoportal', 'Portals at this zone in a Daily. ', 'value', -1, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone', 'What zone to do void maps in dailys. Disable with -1', 'value', -1, null, 'Daily'); - /*createSetting('Dailypraidz', 'Daily P Raid Z', 'Zones to Prestige Raid in Dailys. ', 'multiValue', -1, null, 'Daily'); - createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); - createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); - createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); + createSetting('dVoidPraid', 'Daily Plus Maps for Voids', 'Raid Prestiges before running Void Maps in dailys. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS DAILY PRAIDING. ', 'boolean', 'false', null, 'Daily'); + createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Daily'); + //Line 2 - createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); - createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); + createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); + createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); + createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); + /*createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily');*/ + + //Buildings createSetting('BuyBuildingsNew', ['Buy Neither','Buy Buildings & Storage', 'Buy Buildings', 'Buy Storage'], 'AutoBuys Storage when it is almost full (it even anticipates Jestimp) and Non-Storage Buildings (As soon as they are available). Takes cost efficiency into account before buying Non-Storage Buildings.', 'multitoggle', 1, null, "Buildings"); //This should replace the two below createSetting('WarpstationCap', 'Warpstation Cap', 'Do not level Warpstations past Basewarp+DeltaGiga **. Without this, if a Giga wasnt available, it would level infinitely (wastes metal better spent on prestiges instead.) **The script bypasses this cap each time a new giga is bought, when it insta-buys as many as it can afford (since AT keeps available metal/gems to a low, overbuying beyond the cap to what is affordable at that first moment is not a bad thing). ', 'boolean', true, null, 'Buildings'); @@ -899,6 +903,8 @@ function updateCustomButtons() { var doDaily = game.challenges.Daily.filter(); (doDaily) ? turnOn("AutoStartDaily") : turnOff("AutoStartDaily"); (doDaily) ? turnOn("AutoFinishDaily") : turnOff("AutoFinishDaily"); + getPageSetting('Dailybwraid')==true ? turnOn("dBWraidingz"): turnOff("dBWraidingz"); + getPageSetting('Dailybwraid')==true ? turnOn("dBWraidingmax"): turnOff("dBWraidingmax"); //Show and Hide useless settings to reduce UI clutter From 80eccf288de598888746bd45759c26a9e1f34437 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 19:41:50 +0100 Subject: [PATCH 0573/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index c8a9f5490..a2b3bcc11 100644 --- a/modules/other.js +++ b/modules/other.js @@ -538,7 +538,7 @@ function dailyPraiding() { } } - if (mapbought == true) { + if (dmapbought == true) { selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); runMap(); } From e055bbc08615a72159879dddb4fddcc331a13c8a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 19:48:32 +0100 Subject: [PATCH 0574/3477] Update maps.js --- modules/maps.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/maps.js b/modules/maps.js index 2aa513810..f804f3a13 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -79,7 +79,10 @@ function autoMap() { //advanced "Extra Zones" dropdown var extraMapLevels = getPageSetting('AdvMapSpecialModifier') ? getExtraMapLevels() : 0; //FIND VOID MAPS LEVEL: - var voidMapLevelSetting = getPageSetting('VoidMaps'); + var voidMapLevelSetting = 0; + if (game.global.challengeActive != "Daily") { + voidMapLevelSetting = getPageSetting('VoidMaps'); + } //Add your daily zone mod onto the void maps level var dailyVoidMod = getPageSetting('DailyVoidMod'); if ((game.global.challengeActive == "Daily") && (getPageSetting('DailyVoidMod') >= 1)) { From 1ddf58fc02281ee93139d8d42ac1c6dd2a768d66 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 19:50:44 +0100 Subject: [PATCH 0575/3477] Update SettingsGUI.js --- SettingsGUI.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 0ef4a632e..f7fe612e0 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -989,7 +989,13 @@ function checkPortalSettings() { var leadCheck = result.lead; if (portalLevel == -1) return portalLevel; - var voidmaps = getPageSetting('VoidMaps'); + var voidmaps = 0; + if (game.global.challengeActive != "Daily") { + voidmaps = getPageSetting('VoidMaps'); + } + if (game.global.challengeActive == "Daily") { + voidmaps = getPageSetting('dVoidMaps'); + } if (voidmaps >= portalLevel) tooltip('confirm', null, 'update', 'WARNING: Your void maps are set to complete after your autoPortal, and therefore will not be done at all! Please Change Your Settings Now. This Box Will Not Go away Until You do. Remember you can choose \'Custom\' autoPortal along with challenges for complete control over when you portal.

    Estimated autoPortal level: ' + portalLevel, 'cancelTooltip()', 'Void Maps Conflict'); if ((leadCheck || game.global.challengeActive == 'Lead') && (voidmaps % 2 == 0 && portalLevel <= 181)) From c5d3da0f60bdb603a6394e25f36b1eb8c29d280d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 19:52:54 +0100 Subject: [PATCH 0576/3477] Update portal.js --- modules/portal.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 5c85a1824..017828f36 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -168,8 +168,10 @@ function findOutCurrentPortalLevel() { case "Off": break; case "Custom": + if (game.global.challengeActive != "Daily") { portalLevel = getPageSetting('CustomAutoPortal') + 1; - if (getPageSetting('Dailyportal') >= 1) { + } + if (game.global.challengeActive == "Daily") { portalLevel = getPageSetting('Dailyportal') + 1; } leadCheck = getPageSetting('HeliumHourChallenge') == "Lead" ? true : false; From 040919da3bbe7633f44088cef415351376b80579 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 19:56:43 +0100 Subject: [PATCH 0577/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 38945f160..08b6805df 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,7 +62,7 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation is coming. Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: true}); +changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation has arrived. Make sure to set your daily autoportal and voids! Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: true}); changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: false}); changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: false}); changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: false}); From 511bd490a9c2181b96e02ee95262a14080c2d050 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 20:04:53 +0100 Subject: [PATCH 0578/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index f7fe612e0..e9648966c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -272,7 +272,7 @@ function initializeAllSettings() { //Daily createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Daily'); - createSetting('Dailyportal', 'Daily Autoportal', 'Portals at this zone in a Daily. ', 'value', -1, null, 'Daily'); + createSetting('Dailyportal', 'Daily Autoportal', 'Portals when this zone is finished in a Daily. ', 'value', -1, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone', 'What zone to do void maps in dailys. Disable with -1', 'value', -1, null, 'Daily'); createSetting('dVoidPraid', 'Daily Plus Maps for Voids', 'Raid Prestiges before running Void Maps in dailys. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS DAILY PRAIDING. ', 'boolean', 'false', null, 'Daily'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Daily'); From 180774fb49d8fae9d1000829f093d6025e5c556d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 20:41:16 +0100 Subject: [PATCH 0579/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index e9648966c..14793839f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -276,7 +276,8 @@ function initializeAllSettings() { createSetting('DailyVoidMod', 'Daily Void Zone', 'What zone to do void maps in dailys. Disable with -1', 'value', -1, null, 'Daily'); createSetting('dVoidPraid', 'Daily Plus Maps for Voids', 'Raid Prestiges before running Void Maps in dailys. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS DAILY PRAIDING. ', 'boolean', 'false', null, 'Daily'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Daily'); - + createSetting('dexitspirecell', 'Daily Exit Spire Cell', 'What cell to exit spire in dailys. ', 'value', -1, null, 'Daily'); + //Line 2 createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); From 1d81a2591840266f4c13ec3005a1f2e1067ba443 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 20:42:15 +0100 Subject: [PATCH 0580/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 08b6805df..6fc33a043 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -212,6 +212,7 @@ function mainLoop() { //Extra if (getPageSetting('ExitSpireCell') > 0) exitSpireCell(); //"Exit Spire After Cell" (other.js) + if (getPageSetting('dexitspirecell') >= 1) dailyexitSpireCell(); if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //breedtimer.js if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); //other.js if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) From 7b0804ec89fa96f63746e68ec9a0876182756fd5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 20:43:36 +0100 Subject: [PATCH 0581/3477] Update other.js --- modules/other.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/other.js b/modules/other.js index a2b3bcc11..09b16fe77 100644 --- a/modules/other.js +++ b/modules/other.js @@ -158,6 +158,11 @@ function exitSpireCell() { endSpire(); } +dailyexitSpireCell() { + if(isActiveSpireAT() && game.global.lastClearedCell >= getPageSetting('dExitSpireCell')-1) + endSpire(); +} + function plusPres() { document.getElementById("biomeAdvMapsSelect").value = "Random"; document.getElementById('advExtraLevelSelect').value = plusMapToRun(game.global.world); From be300ad0d3b02b3c0420375025fe4dc95168296c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 20:45:16 +0100 Subject: [PATCH 0582/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 09b16fe77..6fd372c50 100644 --- a/modules/other.js +++ b/modules/other.js @@ -159,7 +159,7 @@ function exitSpireCell() { } dailyexitSpireCell() { - if(isActiveSpireAT() && game.global.lastClearedCell >= getPageSetting('dExitSpireCell')-1) + if(isActiveSpireAT() && game.global.lastClearedCell >= getPageSetting('dexitspirecell')-1) endSpire(); } From 14e1b5d1f2e0d096b140a99810610d7c845bc68b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 20:46:03 +0100 Subject: [PATCH 0583/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 6fc33a043..4e8787edc 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -211,8 +211,8 @@ function mainLoop() { //Extra - if (getPageSetting('ExitSpireCell') > 0) exitSpireCell(); //"Exit Spire After Cell" (other.js) - if (getPageSetting('dexitspirecell') >= 1) dailyexitSpireCell(); + if (getPageSetting('ExitSpireCell') > 0 && game.global.challengeActive != "Daily") exitSpireCell(); //"Exit Spire After Cell" (other.js) + if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily") dailyexitSpireCell(); if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //breedtimer.js if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); //other.js if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) From 7cf0cf190b77b4868c4dc9a3dcaaea18514690d0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 20:51:09 +0100 Subject: [PATCH 0584/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 6fd372c50..172421a54 100644 --- a/modules/other.js +++ b/modules/other.js @@ -158,7 +158,7 @@ function exitSpireCell() { endSpire(); } -dailyexitSpireCell() { +function dailyexitSpireCell() { if(isActiveSpireAT() && game.global.lastClearedCell >= getPageSetting('dexitspirecell')-1) endSpire(); } From 19a05cc5f58bb5af5b5ae211397da14124815842 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 30 Jun 2018 21:37:50 +0100 Subject: [PATCH 0585/3477] Update portal.js --- modules/portal.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 017828f36..75a459981 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -2,6 +2,7 @@ MODULES["portal"] = {}; //These can be changed (in the console) if you know what you're doing: MODULES["portal"].timeout = 10000; //time to delay before autoportaling in milliseconds MODULES["portal"].bufferExceedFactor = 5; //amount for: allows portaling midzone if we exceed (5x) the buffer +var portalzone = getPageSetting('CustomAutoPortal'); ///////////////////////////////////////////////////// //Portal Related Code)/////////////////////////////// @@ -58,7 +59,7 @@ function autoPortal() { break; case "Custom": var portalzone = getPageSetting('CustomAutoPortal'); - if (getPageSetting('Dailyportal') >= 1) { + if (getPageSetting('Dailyportal') >= 1 && game.global.challengeActive == "Daily") { portalzone = getPageSetting('Dailyportal'); } if (game.global.world > portalzone) { From c74a5baede091c4ffe0a7dff4b33c9c46c8b43dd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 1 Jul 2018 00:26:38 +0100 Subject: [PATCH 0586/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 172421a54..d869e46b6 100644 --- a/modules/other.js +++ b/modules/other.js @@ -474,7 +474,7 @@ if (game.portal.Anticipation.level >= 1) { if (!game.talents.patience.purchased) { antistacklimit = 30; } - if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit) { + if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit && !game.global.spireActive) { forceAbandonTrimps(); } if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit && game.global.mapsActive) { From 524f62fff024a1e5f1cf848e69615c31b1f01730 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 07:46:27 +0100 Subject: [PATCH 0587/3477] Update portal.js --- modules/portal.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/portal.js b/modules/portal.js index 75a459981..5a611cf86 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -19,6 +19,9 @@ function autoPortal() { var OKtoPortal = false; if (!game.global.challengeActive) { var minZone = getPageSetting('HeHrDontPortalBefore'); + if (getPageSetting('Dailyportal') >= 1 && game.global.challengeActive == "Daily") { + minZone = getPageSetting('Dailyportal'); + } game.stats.bestHeliumHourThisRun.evaluate(); //normally, evaluate() is only called once per second, but the script runs at 10x a second. var bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; var bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; From 79376cdbaad51afecfd29de80d409f30a76210e1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 08:52:43 +0100 Subject: [PATCH 0588/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 14793839f..712516ba3 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -999,8 +999,6 @@ function checkPortalSettings() { } if (voidmaps >= portalLevel) tooltip('confirm', null, 'update', 'WARNING: Your void maps are set to complete after your autoPortal, and therefore will not be done at all! Please Change Your Settings Now. This Box Will Not Go away Until You do. Remember you can choose \'Custom\' autoPortal along with challenges for complete control over when you portal.

    Estimated autoPortal level: ' + portalLevel, 'cancelTooltip()', 'Void Maps Conflict'); - if ((leadCheck || game.global.challengeActive == 'Lead') && (voidmaps % 2 == 0 && portalLevel <= 181)) - tooltip('confirm', null, 'update', 'WARNING: Voidmaps run during Lead on an Even zone do not receive the 2x Helium Bonus for Odd zones, and are also tougher. You should probably fix this.', 'cancelTooltip()', 'Lead Challenge Void Maps'); return portalLevel; } From 737d83dbef14d69fdba8929178a72133613301be Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 09:05:12 +0100 Subject: [PATCH 0589/3477] Update stance.js --- modules/stance.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index 1837e318b..abc168c30 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -537,8 +537,9 @@ function autoStance3() { if (game.global.world <= 70) return; var windstackzone = getPageSetting('WindStackingMin'); + var windstackmax = getPageSetting('WindStackingMax'); - if (getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower==200 || (windstackzone < 0) || (windstackzone >= game.global.world) || game.global.spireActive) { + if (getEmpowerment() != "Wind" || game.global.mapsActive || (game.empowerments.Wind.currentDebuffPower > windstackmax) || (windstackzone < 0) || (windstackzone >= game.global.world) || game.global.spireActive) { if (!(game.global.mapsActive && game.global.mapsOwnedArray[getMapIndex(game.global.currentMapId)].bonus === "lmc")) { setFormation(2); return; From 61210b88863bf8241ccd6fcdb994b93261e221d0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 09:05:24 +0100 Subject: [PATCH 0590/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 712516ba3..ddedd6e65 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -401,7 +401,8 @@ function initializeAllSettings() { //Subsection1Line1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
    BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
    BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
    BAF3 = Uses vanilla autofight, and force fights when dead except in VM and Spire.
    WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. AutoStance 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); - createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get 200 windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have 200 stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); + createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); + createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks aren\'t maxed, force abandon and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); @@ -887,6 +888,7 @@ function updateCustomButtons() { //AutoStance getPageSetting('AutoStance')==3 ? turnOn("WindStackingMin"): turnOff("WindStackingMin"); + getPageSetting('AutoStance')==3 ? turnOn("WindStackingMax"): turnOff("WindStackingMax"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinPoison"): turnOff("ScryUseinPoison"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinWind"): turnOff("ScryUseinWind"); getPageSetting('AutoStance')==3 ? turnOn("ScryUseinIce"): turnOff("ScryUseinIce"); From 8bff52820f53650a0757ff06008063e901756478 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 09:08:17 +0100 Subject: [PATCH 0591/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 4e8787edc..d8036b75a 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,10 +62,11 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation has arrived. Make sure to set your daily autoportal and voids! Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: true}); +changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). ", isNew: true}); +changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation has arrived. Make sure to set your daily autoportal and voids! Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: false}); changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: false}); changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: false}); -changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: false}); +//changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: false}); //changelogList.push({date: "13/06/2018", version: "v2.2.3", description: "Plus maps for voids has been changed. It now works the same as Prestige raiding. Check tooltip for more details. Ratios will be out soon, including the new z500. ", isNew: false}); //changelogList.push({date: "05/06/2018", version: "v2.2.2", description: "Fixed map at zone. Updated calcs. Praiding should work for everyone now. BW raiding still being tested, but should work. Ratios being tested, finding optimum coord and carp. Any bugs, please let me know, thanks. ", isNew: false}); //changelogList.push({date: "05/06/2018", version: "v2.2.1", description: "Updated Heirloom calc, should be 4.8 ready. Ratios will be updated soon. ", isNew: false}); From 59db15816a65856fea0fb861f9d5b8d1da796608 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 09:11:12 +0100 Subject: [PATCH 0592/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index ddedd6e65..122123b17 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -402,7 +402,7 @@ function initializeAllSettings() { createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
    BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
    BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
    BAF3 = Uses vanilla autofight, and force fights when dead except in VM and Spire.
    WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. AutoStance 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); - createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '-1', null, 'Combat'); + createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks aren\'t maxed, force abandon and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); From e4d4ee16058357e14012c48ff9218c7476f60a1b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 09:12:59 +0100 Subject: [PATCH 0593/3477] Update stance.js --- modules/stance.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index abc168c30..18ddfb8b0 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -537,7 +537,10 @@ function autoStance3() { if (game.global.world <= 70) return; var windstackzone = getPageSetting('WindStackingMin'); - var windstackmax = getPageSetting('WindStackingMax'); + var windstackmax = 200; + if (getPageSetting('WindStackingMax') > 1) { + windstackmax = getPageSetting('WindStackingMax'); + } if (getEmpowerment() != "Wind" || game.global.mapsActive || (game.empowerments.Wind.currentDebuffPower > windstackmax) || (windstackzone < 0) || (windstackzone >= game.global.world) || game.global.spireActive) { if (!(game.global.mapsActive && game.global.mapsOwnedArray[getMapIndex(game.global.currentMapId)].bonus === "lmc")) { From 1539f3f52bfb842f4baab8cef9b156d2d9400c73 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 11:56:32 +0100 Subject: [PATCH 0594/3477] Update portal.js --- modules/portal.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/portal.js b/modules/portal.js index 5a611cf86..8f0942237 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -96,6 +96,10 @@ function autoPortal() { //Actually Portal. function doPortal(challenge) { if(!game.global.portalActive) return; + if (getPageSetting('Dailyportal') >= 1 && game.global.challengeActive == "Daily" && game.global.world > getPageSetting('Dailyportal')) { + abandonDaily(); + document.getElementById('finishDailyBtnContainer').style.display = 'none'; + } if (getPageSetting('AutoMagmiteSpender2')==1) autoMagmiteSpender(); // From mainLoop if (getPageSetting('AutoHeirloomsNew')==0); //"AutoHeirlooms OFF" (Heirlooms.js) From f020becf99733ced232259be677084f30dfabefe Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 18:00:06 +0100 Subject: [PATCH 0595/3477] Update portal.js --- modules/portal.js | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/portal.js b/modules/portal.js index 8f0942237..f32454a56 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -192,3 +192,29 @@ function findOutCurrentPortalLevel() { } return {level:portalLevel, lead:leadCheck}; } + + +//beware massive idiot coding here + +function c2runner() { + + if (pagesettinghere == true) { + + + + } + + +} + +//c2 stuff + +/*var c2list { + + 'Discipline': { + number: '1', + percent: 'WHERE IS THIS', + zone: 'game.c2.Discipline', + }, + +}*/ From 855de01911b588e098bb40f7ba94dd04a908cda9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 18:12:12 +0100 Subject: [PATCH 0596/3477] Update portal.js --- modules/portal.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index f32454a56..ab0a7052a 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -209,12 +209,12 @@ function c2runner() { //c2 stuff -/*var c2list { +=var c2list { 'Discipline': { number: '1', - percent: 'WHERE IS THIS', + percent: 'getIndividualSquaredReward("Balance")', zone: 'game.c2.Discipline', - }, + } -}*/ +} From 2e69e913fb8b4bfa68cfaf6facdc30890294152e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 18:12:22 +0100 Subject: [PATCH 0597/3477] Update portal.js --- modules/portal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index ab0a7052a..35c0aa455 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -209,7 +209,7 @@ function c2runner() { //c2 stuff -=var c2list { +var c2list { 'Discipline': { number: '1', From 328b6fdb5198327ea96876428cd6ee0ecb2e8b1a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 18:14:44 +0100 Subject: [PATCH 0598/3477] Update portal.js --- modules/portal.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 35c0aa455..011f87d28 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -196,7 +196,7 @@ function findOutCurrentPortalLevel() { //beware massive idiot coding here -function c2runner() { +/*function c2runner() { if (pagesettinghere == true) { @@ -205,7 +205,7 @@ function c2runner() { } -} +}*/ //c2 stuff From 6f8cbe918ecaa6c8d4969c7da530f44918ae6fef Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 18:16:05 +0100 Subject: [PATCH 0599/3477] Update portal.js --- modules/portal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 011f87d28..49730999b 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -209,7 +209,7 @@ function findOutCurrentPortalLevel() { //c2 stuff -var c2list { +var c2list = { 'Discipline': { number: '1', From e5e5728c69573fa4f357119b9f79ec2af2dc0414 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 18:16:27 +0100 Subject: [PATCH 0600/3477] Update portal.js --- modules/portal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 49730999b..25ea2d58d 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -217,4 +217,4 @@ var c2list = { zone: 'game.c2.Discipline', } -} +}; From 1d0d627dfd1cdce443f89a8ec04a1a1a7e9b614e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 19:59:05 +0100 Subject: [PATCH 0601/3477] Update portal.js --- modules/portal.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 25ea2d58d..6f1b3c124 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -210,11 +210,14 @@ function findOutCurrentPortalLevel() { //c2 stuff var c2list = { - - 'Discipline': { - number: '1', - percent: 'getIndividualSquaredReward("Balance")', - zone: 'game.c2.Discipline', + Discipline: { + number: 1, + percent: getIndividualSquaredReward("Discipline"), + zone: game.c2.Discipline, + }, + Size: { + number: 2, + percent: getIndividualSquaredReward("Size"), + zone: game.c2.Size, } - }; From a64faaed6961d5c6b4fcb544f11c4a9a0b015921 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 20:16:32 +0100 Subject: [PATCH 0602/3477] Update portal.js --- modules/portal.js | 79 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 15 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 6f1b3c124..41f371780 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -194,6 +194,70 @@ function findOutCurrentPortalLevel() { } + +//c2 stuff + +var c2list = { + + Size: { + number: 1, + percent: getIndividualSquaredReward("Size"), + zone: game.c2.Size, + }, + Slow: { + number: 2, + percent: getIndividualSquaredReward("Slow"), + zone: game.c2.Slow, + }, + Watch: { + number: 3, + percent: getIndividualSquaredReward("Slow"), + zone: game.c2.Slow, + }, + Discipline: { + number: 4, + percent: getIndividualSquaredReward("Discipline"), + zone: game.c2.Discipline, + }, + Balance: { + number: 5, + percent: getIndividualSquaredReward("Balance"), + zone: game.c2.Balance, + }, + Meditate: { + number: 6, + percent: getIndividualSquaredReward("Meditate"), + zone: game.c2.Meditate, + }, + Metal: { + number: 7, + percent: getIndividualSquaredReward("Metal"), + zone: game.c2.Metal, + }, + Lead: { + number: 8, + percent: getIndividualSquaredReward("Lead"), + zone: game.c2.Lead, + }, + Nom: { + number: 9, + percent: getIndividualSquaredReward("Nom"), + zone: game.c2.Nom, + }, + Electricity: { + number: 10, + percent: getIndividualSquaredReward("Electricity"), + zone: game.c2.Electricity, + }, + Toxicity: { + number: 11, + percent: getIndividualSquaredReward("Toxicity"), + zone: game.c2.Toxicity, + } + +}; + + //beware massive idiot coding here /*function c2runner() { @@ -206,18 +270,3 @@ function findOutCurrentPortalLevel() { }*/ - -//c2 stuff - -var c2list = { - Discipline: { - number: 1, - percent: getIndividualSquaredReward("Discipline"), - zone: game.c2.Discipline, - }, - Size: { - number: 2, - percent: getIndividualSquaredReward("Size"), - zone: game.c2.Size, - } -}; From a17c1256018fb58144d5c2fb8c632c3699ca4778 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 20:26:22 +0100 Subject: [PATCH 0603/3477] Update portal.js --- modules/portal.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 41f371780..380e78f81 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -262,10 +262,26 @@ var c2list = { /*function c2runner() { - if (pagesettinghere == true) { + if (c2runnersetting == true) { + if (c2list.challenge.zone < targetc2zone) { + + A: portal with game.c2.challenge active + + } + B: pause and wait for challenge to hit target zone ... + if (c2list.challenge.currentzone >= game.global.world) { + + C: cancel challenge and portal into next challenge ... + } + + if (c2list.challenge.zone >= targetc2zone) { + D: Select next c2list.challenge.number and run it + + } + return to A } From 6376d21eea111601de6c89d533d50c11e6194619 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 22:00:43 +0100 Subject: [PATCH 0604/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 122123b17..d988766b3 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -274,7 +274,7 @@ function initializeAllSettings() { createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Daily'); createSetting('Dailyportal', 'Daily Autoportal', 'Portals when this zone is finished in a Daily. ', 'value', -1, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone', 'What zone to do void maps in dailys. Disable with -1', 'value', -1, null, 'Daily'); - createSetting('dVoidPraid', 'Daily Plus Maps for Voids', 'Raid Prestiges before running Void Maps in dailys. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS DAILY PRAIDING. ', 'boolean', 'false', null, 'Daily'); + //createSetting('dVoidPraid', 'Daily Plus Maps for Voids', 'Raid Prestiges before running Void Maps in dailys. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS DAILY PRAIDING. ', 'boolean', 'false', null, 'Daily'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Daily'); createSetting('dexitspirecell', 'Daily Exit Spire Cell', 'What cell to exit spire in dailys. ', 'value', -1, null, 'Daily'); @@ -370,7 +370,7 @@ function initializeAllSettings() { createSetting('RunNewVoidsUntilNew', 'New Voids Mod', '0 to disable. Positive numbers are added to your Void Map zone. -1 for no cap. This allows you to run new Void Maps obtained after your Void Map zone by adding this number to your Void Map zone.
    Example Void map zone=185.75 and This setting=10. New Voids run until 197.75).
    This means that any new void maps gained until Z197, cell 75 will be run. CAUTION: May severely slow you down by trying to do too-high level void maps. Default 0 (OFF).', 'value', '0', null, 'Maps'); //Should replace the two below //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); //-1 Autograbs your Finish Daily Z Mod
    0 Disables this setting
    Positive Numbers add to your normal void zone on a daily
    Possible number input? - createSetting('VoidPraid', 'Plus Maps for Voids', 'Raid Prestiges before running Void Maps. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS PRAIDING. ', 'boolean', 'false', null, 'Maps'); + //createSetting('VoidPraid', 'Plus Maps for Voids', 'Raid Prestiges before running Void Maps. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS PRAIDING. ', 'boolean', 'false', null, 'Maps'); createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. And I cba cause its a meh setting anyway. Advancing 2 zones more than doubles your income. Only useful for spire I, and IMO you may aswell actually play the game manually at SOME point. createSetting('AdvMapSpecialModifier', 'Map Special Modifier', 'EXPERIMENTAL. Attempt to select the BEST map special attacks mod. With this on, this will replace the normal behavior. If bugs, please report as this will become more default soon.', 'boolean', false, null, 'Maps'); From d5596cad7332e5ba5cd1cac4b1f1a09044db4f54 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 22:01:49 +0100 Subject: [PATCH 0605/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index d8036b75a..5beb06fab 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,7 +62,7 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). ", isNew: true}); +changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). Oh, and one more thing, I removed Void praiding (and daily) due to multiple Praiding now. So if you want to raid before voids, make sure you set it!", isNew: true}); changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation has arrived. Make sure to set your daily autoportal and voids! Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: false}); changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: false}); changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: false}); From f49cb25e51b4f6d16a547de79fc626d34bf2fc8e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 22:02:35 +0100 Subject: [PATCH 0606/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 5beb06fab..40f35455c 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -222,8 +222,8 @@ function mainLoop() { if (getPageSetting('Dailybwraid')==true && game.global.challengeActive == "Daily"){setTimeout(dailyBWraiding(), 3000);} //BW Raiding (other.js) if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); //other.js if (getPageSetting('DailyBWraid')==true && dbwraidon) buyWeps(); //other.js - if (getPageSetting('VoidPraid')==true && game.global.challengeActive != "Daily") Praidingvoid(); //other.js - if (getPageSetting('dVoidPraid')==true && game.global.challengeActive == "Daily") dailyPraidingvoid(); //other.js + //if (getPageSetting('VoidPraid')==true && game.global.challengeActive != "Daily") Praidingvoid(); //other.js + //if (getPageSetting('dVoidPraid')==true && game.global.challengeActive == "Daily") dailyPraidingvoid(); //other.js if (getPageSetting('ForceAbandon')==true) trimpcide(); //other.js if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) From 557d363c7f9128f6fc290923e16bac0a045ab1ad Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 2 Jul 2018 22:04:12 +0100 Subject: [PATCH 0607/3477] Update other.js --- modules/other.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index d869e46b6..3e2f625ac 100644 --- a/modules/other.js +++ b/modules/other.js @@ -333,7 +333,7 @@ function BWraiding() { } //VoidPraid - function Praidingvoid() { + /*function Praidingvoid() { var dailyvoidpraid = getPageSetting('DailyVoidMod'); var VMzone = getPageSetting('VoidMaps'); if ((game.global.challengeActive == "Daily") && (getPageSetting('AutoFinishDailyNew') != 999) && (getPageSetting('DailyVoidMod'))) { @@ -393,7 +393,8 @@ function BWraiding() { mapboughtvoid = false; } -} +}*/ + //AutoAllocate Looting II function lootdump() { if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { @@ -643,7 +644,7 @@ function dailyBWraiding() { } //dVoidPraid - function dailyPraidingvoid() { + /* function dailyPraidingvoid() { var dVMzone = getPageSetting('dVoidMaps'); if (game.global.world == dVMzone && getPageSetting('dVoidPraid') == true && !dprestvoid && !dfailpvoidraid) { if (getPageSetting('AutoMaps') == 1 && !dprestvoid && !dfailpvoidraid) { @@ -699,4 +700,4 @@ function dailyBWraiding() { dmapboughtvoid = false; } -} +}*/ From 4878383f63f46158839825c1336da4c064b7f12f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 3 Jul 2018 07:58:53 +0100 Subject: [PATCH 0608/3477] Update stance.js --- modules/stance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 18ddfb8b0..176d284a3 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -538,11 +538,11 @@ function autoStance3() { var windstackzone = getPageSetting('WindStackingMin'); var windstackmax = 200; - if (getPageSetting('WindStackingMax') > 1) { + if (getPageSetting('WindStackingMax') >= 1) { windstackmax = getPageSetting('WindStackingMax'); } - if (getEmpowerment() != "Wind" || game.global.mapsActive || (game.empowerments.Wind.currentDebuffPower > windstackmax) || (windstackzone < 0) || (windstackzone >= game.global.world) || game.global.spireActive) { + if (getEmpowerment() != "Wind" || game.global.mapsActive || (game.empowerments.Wind.currentDebuffPower >= windstackmax) || (windstackzone < 0) || (windstackzone >= game.global.world) || game.global.spireActive) { if (!(game.global.mapsActive && game.global.mapsOwnedArray[getMapIndex(game.global.currentMapId)].bonus === "lmc")) { setFormation(2); return; From d0db58dcfbc9ae781d2cdfd3e64dc5f9c4f2fe0c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 4 Jul 2018 17:25:30 +0100 Subject: [PATCH 0609/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index d988766b3..855088c6c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -333,7 +333,7 @@ function initializeAllSettings() { createSetting('BuyArmorNew', ['Armor: Buy Neither','Armor: Buy Both', 'Armor: Prestiges', 'Armor: Levels'], 'AutoBuys Prestiges and Levels up the most cost efficient Armor available. Gymystic buying is controlled under this setting\'s prestige option', 'multitoggle', 1, null, "Gear"); //This should replace the two below createSetting('BuyWeaponsNew', ['Weapons: Buy Neither','Weapons: Buy Both', 'Weapons: Prestiges', 'Weapons: Levels'], 'AutoBuys Prestiges and Levels up the most cost efficient Weapon available.', 'multitoggle', 1, null, "Gear"); //This should replace the two below createSetting('CapEquip2', 'Cap Equip to', 'Do not level equipment past this number. Helps stop wasting metal when the script levels-up equip High, only to prestige right after. Recommended value: earlygame 10, lategame: 100. Disable with -1 or 0. NEW: Also sub-caps to 10% of your number during liquified or overkilled(under 25sec) zones. This does not mean the script always hits the cap. Your Equip will now always be leveled to at least 2 since its the most effective level. It will only be leveled however if you dont have enoughHealth or enoughDamage. But During Spire, everything will be leveled up to the cap.
    Hidden var: MODULES[\\"equipment\\"].capDivisor = 10; //number to divide your normal cap by.', 'value', 10, null, 'Gear'); - createSetting('DynamicPrestige2', 'Dynamic Prestige z', 'Dynamic Prestige: Set Target Zone number: Z #. (disable with 0 or -1)
    Skip getting prestiges at first, and Gradually work up to the desired Prestige setting you have set (set the Prestige dropdown to the highest weapon you want to end up on at the target zone you set here). Runs with Dagger to save a significant amount of time until we need better gear, then starts increasing the prestige setting near the end of the run. Examines which prestiges you have, how many missing ones youd need to achieve the desired target and starts running maps every zone (more maps for higher settings), Until the target prestige is reached. ', 'value', -1, null, 'Gear'); + createSetting('DynamicPrestige2', 'Dynamic Prestige z', 'Dynamic Prestige: Set Target Zone number: Z #. (disable with 0 or -1)
    Skip getting prestiges at first, and Gradually work up to the desired Prestige setting you have set (set the Prestige dropdown to the highest weapon you want to end up on at the target zone you set here). Runs with Dagger to save a significant amount of time until we need better gear, then starts increasing the prestige setting near the end of the run. Examines which prestiges you have, how many missing ones youd need to achieve the desired target and starts running maps every zone (more maps for higher settings), Until the target prestige is reached. Use Dagger or else', 'value', -1, null, 'Gear'); createSetting('Prestige', 'Prestige', 'Acquire prestiges through the selected item (inclusive) as soon as they are available in maps. Forces equip first mode. Automap must be enabled. THIS IS AN IMPORTANT SETTING related to speed climbing and should probably always be on something. If you find the script getting stuck somewhere, particularly where you should easily be able to kill stuff, setting this to an option lower down in the list will help ensure you are more powerful at all times, but will spend more time acquiring the prestiges in maps.', 'dropdown', 'Polierarm', ['Off', 'Supershield', 'Dagadder', 'Bootboost', 'Megamace', 'Hellishmet', 'Polierarm', 'Pantastic', 'Axeidic', 'Smoldershoulder', 'Greatersword', 'Bestplate', 'Harmbalest', 'GambesOP'], "Gear"); //Make a backup of the prestige setting: backup setting grabs the actual value of the primary setting any time it is changed, (line 784 of the function settingChanged()) var lastSetting = autoTrimpSettings["PrestigeBackup"]; From bf3d89f76597a6597105de98c253ac2cc9e28687 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 4 Jul 2018 22:39:49 +0100 Subject: [PATCH 0610/3477] Update SettingsGUI.js --- SettingsGUI.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 855088c6c..c37e7c1bb 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -275,9 +275,10 @@ function initializeAllSettings() { createSetting('Dailyportal', 'Daily Autoportal', 'Portals when this zone is finished in a Daily. ', 'value', -1, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone', 'What zone to do void maps in dailys. Disable with -1', 'value', -1, null, 'Daily'); //createSetting('dVoidPraid', 'Daily Plus Maps for Voids', 'Raid Prestiges before running Void Maps in dailys. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS DAILY PRAIDING. ', 'boolean', 'false', null, 'Daily'); - createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Daily'); createSetting('dexitspirecell', 'Daily Exit Spire Cell', 'What cell to exit spire in dailys. ', 'value', -1, null, 'Daily'); - + createSetting('buyheliumy', 'Buy Heliumy', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above 475%. Will not buy if you cant afford to. ', 'boolean', false, null, 'Daily'); + createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Daily'); + //Line 2 createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); From fda9b387372369dfcde90cebc459209e4f4fa70f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 4 Jul 2018 22:39:55 +0100 Subject: [PATCH 0611/3477] Update other.js --- modules/other.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/other.js b/modules/other.js index 3e2f625ac..877f5f432 100644 --- a/modules/other.js +++ b/modules/other.js @@ -701,3 +701,13 @@ function dailyBWraiding() { } }*/ + + +function heliumydaily() { + + if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') && getDailyHeliumValue(countDailyWeight()) >= 475 && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) { + + purchaseSingleRunBonus('heliumy'); + + } +} From 055358ee4c1760659670b697c88e74d5e8b57b2a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 4 Jul 2018 22:40:00 +0100 Subject: [PATCH 0612/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 40f35455c..13fd2f20c 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -226,6 +226,7 @@ function mainLoop() { //if (getPageSetting('dVoidPraid')==true && game.global.challengeActive == "Daily") dailyPraidingvoid(); //other.js if (getPageSetting('ForceAbandon')==true) trimpcide(); //other.js if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) + if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy')) heliumydaily(); //Original From 6d9410ef3c3e1b5d56d9d1ea717887ae7174eb3a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 5 Jul 2018 18:09:04 +0100 Subject: [PATCH 0613/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index c37e7c1bb..c9f181de2 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -349,7 +349,7 @@ function initializeAllSettings() { createSetting('DelayArmorWhenNeeded', 'Delay Armor Prestige', 'Delays buying armor prestige-upgrades during Want More Damage or Farming automap-modes, Although if you need health AND damage, it WILL buy armor prestiges tho. NOTE: Applies to Prestiges only', 'boolean', false, null, 'Gear'); createSetting('BuyShieldblock', 'Buy Shield Block', 'Will buy the shield block upgrade. CAUTION: If you are progressing past zone 60, you probably don\'t want this :)', 'boolean', false, null, "Gear"); createSetting('trimpsnotdie', 'Buy Armor on Death', 'Buys 10 levels of Armor when Trimps die. Useful when your trimps die frequentely. ', 'boolean', false, null, "Gear"); - createSetting('gearamounttobuy', 'Gear Levels to Buy', 'Set the amount of Gear Levels to buy for AT. I.e if set to 1 will buy 1 level at a time. Recommended value 1. MUST ALWAYS HAVE A VALUE GREATER THAN 1! ', 'value', 1, null, "Gear"); + createSetting('gearamounttobuy', 'Gear Levels to Buy', 'Set the amount of Gear Levels to buy for AT. I.e if set to 1 will buy 1 level at a time. Recommended value 1. MUST ALWAYS HAVE A VALUE GREATER THAN 0! ', 'value', 1, null, "Gear"); From 621dc067ad2360bb298d46d144759e84feeda74c Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 5 Jul 2018 19:18:06 +0100 Subject: [PATCH 0614/3477] Fix automaps bug Stops automaps from getting stuck in a map buying loop under certain circumstances on spire farming when plus maps have been created. Also changed recycle behaviour to try recycling the lowest level map if the recycleBelow() call doesn't work (might also happen because of plus maps). --- modules/maps.js | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index f804f3a13..bf04579ec 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -410,9 +410,11 @@ function autoMap() { }); //if there are no non-unique maps, there will be nothing in keysSorted, so set to create a map var highestMap; - if (keysSorted[0]) + var lowestMap; + if (keysSorted[0]) { highestMap = keysSorted[0]; - else + lowestMap = keysSorted[keysSorted.length - 1]; + } else selectedMap = "create"; //Look through all the maps we have and figure out, find and Run Uniques if we need to @@ -577,10 +579,14 @@ function autoMap() { //if preSpireFarming x minutes is true, switch over from wood maps to metal maps. if (preSpireFarming) { var spiremaplvl = (game.talents.mapLoot.purchased && MODULES["maps"].SpireFarm199Maps) ? game.global.world - 1 : game.global.world; - if (game.global.mapsOwnedArray[highestMap].level >= spiremaplvl && game.global.mapsOwnedArray[highestMap].location == ((customVars.preferGardens && game.global.decayDone) ? 'Plentiful' : 'Mountain')) - selectedMap = game.global.mapsOwnedArray[highestMap].id; - else - selectedMap = "create"; + selectedMap = "create"; + for (var i = 0; i < keysSorted.length; i++) { + if (game.global.mapsOwnedArray[keysSorted[i]].level >= spiremaplvl && + game.global.mapsOwnedArray[keysSorted[i]].location == ((customVars.preferGardens && game.global.decayDone) ? 'Plentiful' : 'Mountain')) { + selectedMap = game.global.mapsOwnedArray[i].id; + break; + } + } //if needPrestige, TRY to find current level map as the highest level map we own. } else if (needPrestige || (extraMapLevels > 0)) { if ((game.global.world + extraMapLevels) == game.global.mapsOwnedArray[highestMap].level) @@ -783,7 +789,14 @@ function autoMap() { debug("Too many maps, recycling now: ", "maps", 'th-large'); recycleBelow(true); debug("Retrying, Buying a Map, level: #" + maplvlpicked, "maps", 'th-large'); - buyMap(); + result = buyMap(); + if (result == -2) { + recycleMap(lowestMap); + result = buyMap(); + if (result == -2) debug("AutoMaps unable to recycle to buy map!") + else + debug("Retrying map buy after recycling lowest level map"); + } } } //if we already have a map picked, run it From 00c0130dff276b7caa64ff77f29f16d70f97c290 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 5 Jul 2018 19:32:43 +0100 Subject: [PATCH 0615/3477] fix dumb error --- modules/maps.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maps.js b/modules/maps.js index bf04579ec..98775c8e3 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -583,7 +583,7 @@ function autoMap() { for (var i = 0; i < keysSorted.length; i++) { if (game.global.mapsOwnedArray[keysSorted[i]].level >= spiremaplvl && game.global.mapsOwnedArray[keysSorted[i]].location == ((customVars.preferGardens && game.global.decayDone) ? 'Plentiful' : 'Mountain')) { - selectedMap = game.global.mapsOwnedArray[i].id; + selectedMap = game.global.mapsOwnedArray[keysSorted[i]].id; break; } } From 42a15f7b6b3e55dbdf941e187e2645a6522f3cb4 Mon Sep 17 00:00:00 2001 From: spikenskab <36603307+spikenskab@users.noreply.github.com> Date: Thu, 5 Jul 2018 20:20:44 +0100 Subject: [PATCH 0616/3477] Delete Praid maps when done Delete maps created for Praiding when done to stop AT from trying to use them for farming/mapbonus later instead of buying a more suitable map. --- modules/other.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index 877f5f432..ec9d748b5 100644 --- a/modules/other.js +++ b/modules/other.js @@ -195,6 +195,7 @@ function findLastBionic() { //Praiding function Praiding() { + var pMap; if (getPageSetting('Praidingzone').length) { if (getPageSetting('Praidingzone').includes(game.global.world) && !prestraid && !failpraid) { debug('World Zone matches a Praiding Zone!'); @@ -233,7 +234,8 @@ function Praiding() { } } if (mapbought == true) { - selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); + pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; + selectMap(pMap); runMap(); } if (!prestraid && !failpraid && !game.global.repeatMap) { @@ -249,7 +251,8 @@ function Praiding() { if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; - debug("Prestige raiding successfull!"); + debug("Prestige raiding successfull! - recycling Praid map"); + recycleMap(pMap); debug("Turning AutoMaps back on"); } if (getPageSetting('Praidingzone').every(isBelowThreshold)) { @@ -507,6 +510,7 @@ function helptrimpsnotdie () { //Daily stuff couldnt be bothered to add it to original function dailyPraiding() { + var dpMap; if (getPageSetting('dPraidingzone').length) { if (getPageSetting('dPraidingzone').includes(game.global.world) && !dprestraid && !dfailpraid) { debug('World Zone matches a Daily Praiding Zone!'); @@ -545,7 +549,8 @@ function dailyPraiding() { } } if (dmapbought == true) { - selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); + dpMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; + selectMap(dpMap); runMap(); } if (!dprestraid && !dfailpraid && !game.global.repeatMap) { @@ -561,7 +566,8 @@ function dailyPraiding() { if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dprestraid && !dfailpraid) { autoTrimpSettings["AutoMaps"].value = 1; - debug("Daily Prestige Raiding successfull!"); + debug("Daily Prestige Raiding successfull! - recycling Praid map"); + recycleMap(dpMap); debug("Turning AutoMaps back on"); } if (getPageSetting('dPraidingzone').every(isBelowThreshold)) { From 21b6b954d07e5725ede88caaaa97dc081835bb08 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 9 Jul 2018 12:14:38 +0100 Subject: [PATCH 0617/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index c9f181de2..eb9d9461c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -276,7 +276,7 @@ function initializeAllSettings() { createSetting('DailyVoidMod', 'Daily Void Zone', 'What zone to do void maps in dailys. Disable with -1', 'value', -1, null, 'Daily'); //createSetting('dVoidPraid', 'Daily Plus Maps for Voids', 'Raid Prestiges before running Void Maps in dailys. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS DAILY PRAIDING. ', 'boolean', 'false', null, 'Daily'); createSetting('dexitspirecell', 'Daily Exit Spire Cell', 'What cell to exit spire in dailys. ', 'value', -1, null, 'Daily'); - createSetting('buyheliumy', 'Buy Heliumy', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above 475%. Will not buy if you cant afford to. ', 'boolean', false, null, 'Daily'); + createSetting('buyheliumy', 'Buy Heliumy %', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above the value set in this setting. Recommend anything above 475. Will not buy if you cant afford to, or value is -1. ', 'value', -1, null, 'Daily'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Daily'); //Line 2 From 1370486fd7d7ad941062fa2dbc0b2b88ff8b1e95 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 9 Jul 2018 12:14:53 +0100 Subject: [PATCH 0618/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index ec9d748b5..2ffdadb8e 100644 --- a/modules/other.js +++ b/modules/other.js @@ -711,7 +711,7 @@ function dailyBWraiding() { function heliumydaily() { - if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') && getDailyHeliumValue(countDailyWeight()) >= 475 && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) { + if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1 && getDailyHeliumValue(countDailyWeight()) >= getPageSetting('buyheliumy') && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) { purchaseSingleRunBonus('heliumy'); From 2bf79255bd69bfe457389866748e41ef40738c57 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 9 Jul 2018 12:17:16 +0100 Subject: [PATCH 0619/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 13fd2f20c..f484e7d18 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,10 +62,11 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). Oh, and one more thing, I removed Void praiding (and daily) due to multiple Praiding now. So if you want to raid before voids, make sure you set it!", isNew: true}); +changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised, many thanks to Spikenslab once again. Might be some more stuff over next few days, enjoy. ", isNew: true}); +changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). Oh, and one more thing, I removed Void praiding (and daily) due to multiple Praiding now. So if you want to raid before voids, make sure you set it!", isNew: false}); changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation has arrived. Make sure to set your daily autoportal and voids! Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: false}); changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: false}); -changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: false}); +//changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: false}); //changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: false}); //changelogList.push({date: "13/06/2018", version: "v2.2.3", description: "Plus maps for voids has been changed. It now works the same as Prestige raiding. Check tooltip for more details. Ratios will be out soon, including the new z500. ", isNew: false}); //changelogList.push({date: "05/06/2018", version: "v2.2.2", description: "Fixed map at zone. Updated calcs. Praiding should work for everyone now. BW raiding still being tested, but should work. Ratios being tested, finding optimum coord and carp. Any bugs, please let me know, thanks. ", isNew: false}); @@ -226,7 +227,7 @@ function mainLoop() { //if (getPageSetting('dVoidPraid')==true && game.global.challengeActive == "Daily") dailyPraidingvoid(); //other.js if (getPageSetting('ForceAbandon')==true) trimpcide(); //other.js if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) - if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy')) heliumydaily(); + if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); //Original From f93ffd4546de6bc96f55ad6af530cc6e0987b316 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 10 Jul 2018 14:23:40 +0100 Subject: [PATCH 0620/3477] Update other.js --- modules/other.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index 2ffdadb8e..28ccbb26c 100644 --- a/modules/other.js +++ b/modules/other.js @@ -21,7 +21,6 @@ var mapboughtvoid = false; var dmapboughtvoid = false; var bwraidon = false; var dbwraidon = false; -var prebreedtimer = game.global.GeneticistassistSetting; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { @@ -492,11 +491,16 @@ if (game.portal.Anticipation.level >= 1) { function ATspirebreed() { if (getPageSetting('SpireBreedTimer') >= 1 && getPageSetting('IgnoreSpiresUntil') <= game.global.world) { + var presteps = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); + var prebreedtimer = game.global.GeneticistassistSteps[presteps]; if (prebreedtimer != getPageSetting('SpireBreedTimer') && game.global.Geneticistassist && prebreedtimer >= 1 && game.global.spireActive) { - game.global.GeneticistassistSetting = getPageSetting('SpireBreedTimer'); + game.global.GeneticistassistSteps[presteps] = getPageSetting('SpireBreedTimer'); + toggleGeneticistassist(); + toggleGeneticistassist(); + toggleGeneticistassist(); } - else if (!game.global.spireActive && prebreedtimer != game.global.GeneticistassistSetting) { - game.global.GeneticistassistSetting = prebreedtimer; + else if (!game.global.spireActive && prebreedtimer != game.global.GeneticistassistSteps[presteps]) { + game.global.GeneticistassistSteps[presteps] = prebreedtimer; } } } From 44a751b3021c94ff930cc25008fe1d3b10403224 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 10 Jul 2018 14:29:52 +0100 Subject: [PATCH 0621/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 28ccbb26c..74e2af534 100644 --- a/modules/other.js +++ b/modules/other.js @@ -21,6 +21,8 @@ var mapboughtvoid = false; var dmapboughtvoid = false; var bwraidon = false; var dbwraidon = false; +var presteps = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); +var prebreedtimer = game.global.GeneticistassistSteps[presteps]; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { @@ -491,8 +493,6 @@ if (game.portal.Anticipation.level >= 1) { function ATspirebreed() { if (getPageSetting('SpireBreedTimer') >= 1 && getPageSetting('IgnoreSpiresUntil') <= game.global.world) { - var presteps = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); - var prebreedtimer = game.global.GeneticistassistSteps[presteps]; if (prebreedtimer != getPageSetting('SpireBreedTimer') && game.global.Geneticistassist && prebreedtimer >= 1 && game.global.spireActive) { game.global.GeneticistassistSteps[presteps] = getPageSetting('SpireBreedTimer'); toggleGeneticistassist(); From 01496c24a8dfa6224c1fc898c73f8dde69b2434c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 10 Jul 2018 14:34:28 +0100 Subject: [PATCH 0622/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index eb9d9461c..794421c6c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -386,7 +386,7 @@ function initializeAllSettings() { createSetting('IgnoreSpiresUntil', 'Ignore Spires Until', 'Spire specific settings like end-at-cell are ignored until at least this zone is reached (0 to disable).
    Does not work with Run Bionic Before Spire.', 'value', '200', null, 'Spire'); createSetting('RunBionicBeforeSpire', 'Run Bionic Before Spire', 'CAUTION: Runs Bionic Wonderlands and repeatedly farms Bionic VI @ level 200 before attempting Spire, for the purpose of resource farming. Then it attempts the spire. The Minutes-Before-Spire timer runs concurrently to this, and needs to be set. If not set, it will exit without doing any Bionics... You can un-toggle it on the fly.
    NOTE: Turning this on also mandates that Run Unique Maps be on.
    WARNING: These 100 square maps take ~3x longer than normal maps.
    WARNING: If you dont have Bionic Magnet mastery, this will run the 5 pre-requisites and take longer.
    NOTE: In fact, it may not be what you want at all.', 'boolean', false, null, 'Spire'); //OUTDATED! createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Spire'); - createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Spire'); + //createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Spire'); createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 From 70e458c7b351f86ba0b39f132dee040d98358a72 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 10 Jul 2018 14:35:06 +0100 Subject: [PATCH 0623/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index f484e7d18..c168a0e07 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -215,7 +215,7 @@ function mainLoop() { if (getPageSetting('ExitSpireCell') > 0 && game.global.challengeActive != "Daily") exitSpireCell(); //"Exit Spire After Cell" (other.js) if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily") dailyexitSpireCell(); - if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //breedtimer.js + //if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //breedtimer.js if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); //other.js if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) From 43bdba3ba1243cac110b86f142f9e0683fa366e2 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Wed, 11 Jul 2018 23:30:04 +0100 Subject: [PATCH 0624/3477] Fix for spire breed timer --- modules/other.js | 147 +++++++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 68 deletions(-) diff --git a/modules/other.js b/modules/other.js index 74e2af534..e1845216e 100644 --- a/modules/other.js +++ b/modules/other.js @@ -21,8 +21,9 @@ var mapboughtvoid = false; var dmapboughtvoid = false; var bwraidon = false; var dbwraidon = false; -var presteps = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); -var prebreedtimer = game.global.GeneticistassistSteps[presteps]; +// var presteps = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); +// var prebreedtimer = game.global.GeneticistassistSteps[presteps]; +var presteps = null; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { @@ -52,7 +53,7 @@ function autoGoldenUpgradesAT(setting) { var challSQ = game.global.runningChallengeSquared; //Default: True = Always get 60% void by skipping the 12% upgrade then buying 14%/16% var goldStrat = getPageSetting('goldStrat'); - //Try to achieve 60% Void + //Try to achieve 60% Void if (setting == "Void" && goldStrat == "Max then Helium") { var nextVoidAmt = game.goldenUpgrades.Void.nextAmt().toFixed(2); if (nextVoidAmt == 0.12) //skip the 6th void upgrade @@ -175,8 +176,8 @@ function plusPres() { document.getElementById("mapLevelInput").value = game.global.world; updateMapCost(); } - -function plusMapToRun(zone) { + +function plusMapToRun(zone) { if (zone % 10 == 9) return 6; else if (zone % 10 <5) @@ -205,7 +206,7 @@ function Praiding() { if (getPageSetting('AutoMaps') == 1 && !prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 0; } - if (!game.global.preMapsActive && !game.global.mapsActive && !prestraid && !failpraid) { + if (!game.global.preMapsActive && !game.global.mapsActive && !prestraid && !failpraid) { mapsClicked(); if (!game.global.preMapsActive) { mapsClicked(); @@ -215,7 +216,7 @@ function Praiding() { if (game.options.menu.repeatUntil.enabled!=2 && !prestraid && !failpraid) { game.options.menu.repeatUntil.enabled = 2; } - if (game.global.preMapsActive && !prestraid && !failpraid) { + if (game.global.preMapsActive && !prestraid && !failpraid) { plusPres(); if ((updateMapCost(true) <= game.resources.fragments.owned)) { buyMap(); @@ -241,7 +242,7 @@ function Praiding() { } if (!prestraid && !failpraid && !game.global.repeatMap) { repeatClicked(); - + } prestraid = true; failpraid = false @@ -249,7 +250,7 @@ function Praiding() { mapbought = false; } } - + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Prestige raiding successfull! - recycling Praid map"); @@ -263,77 +264,77 @@ function Praiding() { mapbought = false; } } - + function BWraiding() { - + if (!prestraidon && game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { - + if (getPageSetting('AutoMaps') == 1 && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } - - if (!game.global.preMapsActive && !game.global.mapsActive && !bwraided && !failbwraid) { + + if (!game.global.preMapsActive && !game.global.mapsActive && !bwraided && !failbwraid) { mapsClicked(); - + if (!game.global.preMapsActive) { mapsClicked(); } } - + if (game.options.menu.repeatUntil.enabled != 2 && !bwraided && !failbwraid) { game.options.menu.repeatUntil.enabled = 2; } - + if (game.global.preMapsActive && !bwraided && !failbwraid) { selectMap(findLastBionic().id); failbwraid = false; debug("Beginning BW Raiding..."); } - + else if (game.global.preMapsActive && !bwraided && !failbwraid) { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('BWraidingz') && !bwraided) { autoTrimpSettings["AutoMaps"].value = 1; failbwraid = true; debug("Failed to BW raid. Looks like you don't have a BW to raid..."); } - + } - + if (findLastBionic().level <= getPageSetting('BWraidingmax') && !bwraided && !failbwraid && game.global.preMapsActive) { runMap(); bwraidon = true; } - + if (!game.global.repeatMap && !bwraided && !failbwraid && game.global.mapsActive) { repeatClicked(); } - + if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { bwraided = true; failbwraid = false; bwraidon = false; debug("...Successfully BW raided!"); } - + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('BWraidingz') && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } - + } - + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } - + if (bwraided && !failbwraid && game.global.world !== getPageSetting('BWraidingz')) { bwraided = false; failbwraid = false; bwraidon = false; } - + } //VoidPraid @@ -347,7 +348,7 @@ function BWraiding() { if (getPageSetting('AutoMaps') == 1 && !prestvoid && !failpvoidraid) { autoTrimpSettings["AutoMaps"].value = 0; } - if (!game.global.preMapsActive && !game.global.mapsActive && !prestvoid && !failpvoidraid) { + if (!game.global.preMapsActive && !game.global.mapsActive && !prestvoid && !failpvoidraid) { mapsClicked(); if (!game.global.preMapsActive) { mapsClicked(); @@ -357,7 +358,7 @@ function BWraiding() { if (game.options.menu.repeatUntil.enabled!=2 && !prestvoid && !failpvoidraid) { game.options.menu.repeatUntil.enabled = 2; } - if (game.global.preMapsActive && !prestvoid && !failpvoidraid) { + if (game.global.preMapsActive && !prestvoid && !failpvoidraid) { plusPres(); if ((updateMapCost(true) <= game.resources.fragments.owned)) { buyMap(); @@ -396,7 +397,7 @@ function BWraiding() { failpvoidraid = false; mapboughtvoid = false; } - + }*/ //AutoAllocate Looting II @@ -491,18 +492,28 @@ if (game.portal.Anticipation.level >= 1) { } function ATspirebreed() { - - if (getPageSetting('SpireBreedTimer') >= 1 && getPageSetting('IgnoreSpiresUntil') <= game.global.world) { - if (prebreedtimer != getPageSetting('SpireBreedTimer') && game.global.Geneticistassist && prebreedtimer >= 1 && game.global.spireActive) { - game.global.GeneticistassistSteps[presteps] = getPageSetting('SpireBreedTimer'); - toggleGeneticistassist(); - toggleGeneticistassist(); - toggleGeneticistassist(); - } - else if (!game.global.spireActive && prebreedtimer != game.global.GeneticistassistSteps[presteps]) { - game.global.GeneticistassistSteps[presteps] = prebreedtimer; - } - } + // Get current geneticist setting + var currStep = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); + // Check we are in a valid spire, have a valid timer setting, have not already made a copy of the old settings and set a new timer etc. + if (getPageSetting('SpireBreedTimer') >= 1 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive && !presteps && currStep > 0) { + // Make a copy by value of the old gene assist timers + presteps = game.global.GeneticistassistSteps.slice(); + // Set the current timer to the spire breed timer + game.global.GeneticistassistSteps[currStep] = getPageSetting('SpireBreedTimer'); + game.global.GeneticistassistSetting = getPageSetting('SpireBreedTimer'); + // Update gene assistant settings + toggleGeneticistassist(true); + } + // If we are not in a spire and have saved geneticist assistant timers... + else if (!game.global.spireActive && presteps) { + // Set the gene timers back to the saved array of old values and update the current timer setting + game.global.GeneticistassistSteps = presteps; + game.global.GeneticistassistSetting = presteps[currStep]; + // Update geneticist assistant settings + toggleGeneticistassist(true); + // Null the saved reference to the timer array so that we do not execute this branch again and are ready for the next spire + presteps = null; + } } function helptrimpsnotdie () { @@ -523,7 +534,7 @@ function dailyPraiding() { if (getPageSetting('AutoMaps') == 1 && !dprestraid && !dfailpraid) { autoTrimpSettings["AutoMaps"].value = 0; } - if (!game.global.preMapsActive && !game.global.mapsActive && !dprestraid && !dfailpraid) { + if (!game.global.preMapsActive && !game.global.mapsActive && !dprestraid && !dfailpraid) { mapsClicked(); if (!game.global.preMapsActive) { mapsClicked(); @@ -533,7 +544,7 @@ function dailyPraiding() { if (game.options.menu.repeatUntil.enabled!=2 && !dprestraid && !dfailpraid) { game.options.menu.repeatUntil.enabled = 2; } - if (game.global.preMapsActive && !dprestraid && !dfailpraid) { + if (game.global.preMapsActive && !dprestraid && !dfailpraid) { plusPres(); if ((updateMapCost(true) <= game.resources.fragments.owned)) { buyMap(); @@ -559,7 +570,7 @@ function dailyPraiding() { } if (!dprestraid && !dfailpraid && !game.global.repeatMap) { repeatClicked(); - + } dprestraid = true; dfailpraid = false; @@ -567,7 +578,7 @@ function dailyPraiding() { dmapbought = false; } } - + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dprestraid && !dfailpraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Daily Prestige Raiding successfull! - recycling Praid map"); @@ -583,74 +594,74 @@ function dailyPraiding() { } function dailyBWraiding() { - + if (!dprestraidon && game.global.world == getPageSetting('dBWraidingz') && !dbwraided && !dfailbwraid && getPageSetting('Dailybwraid')) { - + if (getPageSetting('AutoMaps') == 1 && !dbwraided && !dfailbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } - - if (!game.global.preMapsActive && !game.global.mapsActive && !dbwraided && !dfailbwraid) { + + if (!game.global.preMapsActive && !game.global.mapsActive && !dbwraided && !dfailbwraid) { mapsClicked(); - + if (!game.global.preMapsActive) { mapsClicked(); } } - + if (game.options.menu.repeatUntil.enabled != 2 && !dbwraided && !dfailbwraid) { game.options.menu.repeatUntil.enabled = 2; } - + if (game.global.preMapsActive && !dbwraided && !dfailbwraid) { selectMap(findLastBionic().id); dfailbwraid = false; debug("Beginning Daily BW Raiding..."); } - + else if (game.global.preMapsActive && !dbwraided && !dfailbwraid) { if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('BWraidingz') && !dbwraided) { autoTrimpSettings["AutoMaps"].value = 1; dfailbwraid = true; debug("Failed to Daily BW raid. Looks like you don't have a BW to raid..."); } - + } - + if (findLastBionic().level <= getPageSetting('dBWraidingmax') && !dbwraided && !dfailbwraid && game.global.preMapsActive) { runMap(); dbwraidon = true; } - + if (!game.global.repeatMap && !dbwraided && !dfailbwraid && game.global.mapsActive) { repeatClicked(); } - + if (findLastBionic().level > getPageSetting('dBWraidingmax') && !dbwraided && !dfailbwraid) { dbwraided = true; dfailbwraid = false; dbwraidon = false; debug("...Successfully Daily BW raided!"); } - + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('dBWraidingz') && dbwraided && !dfailbwraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } - + } - + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dbwraided && !dfailbwraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Turning AutoMaps back on"); } - + if (dbwraided && !dfailbwraid && game.global.world !== getPageSetting('dBWraidingz')) { dbwraided = false; dfailbwraid = false; dbwraidon = false; } - + } //dVoidPraid @@ -660,7 +671,7 @@ function dailyBWraiding() { if (getPageSetting('AutoMaps') == 1 && !dprestvoid && !dfailpvoidraid) { autoTrimpSettings["AutoMaps"].value = 0; } - if (!game.global.preMapsActive && !game.global.mapsActive && !dprestvoid && !dfailpvoidraid) { + if (!game.global.preMapsActive && !game.global.mapsActive && !dprestvoid && !dfailpvoidraid) { mapsClicked(); if (!game.global.preMapsActive) { mapsClicked(); @@ -670,7 +681,7 @@ function dailyBWraiding() { if (game.options.menu.repeatUntil.enabled!=2 && !dprestvoid && !dfailpvoidraid) { game.options.menu.repeatUntil.enabled = 2; } - if (game.global.preMapsActive && !dprestvoid && !dfailpvoidraid) { + if (game.global.preMapsActive && !dprestvoid && !dfailpvoidraid) { plusPres(); if ((updateMapCost(true) <= game.resources.fragments.owned)) { buyMap(); @@ -709,15 +720,15 @@ function dailyBWraiding() { dfailpvoidraid = false; dmapboughtvoid = false; } - + }*/ function heliumydaily() { if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1 && getDailyHeliumValue(countDailyWeight()) >= getPageSetting('buyheliumy') && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) { - + purchaseSingleRunBonus('heliumy'); - + } } From c7551d670ab93a5bbf2e8c9d88144f9c2d2820f7 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Wed, 11 Jul 2018 23:37:54 +0100 Subject: [PATCH 0625/3477] Change script paths for testing --- .user.js | 12 ++++++------ AutoTrimps2.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.user.js b/.user.js index 2a7663279..814ce6487 100644 --- a/.user.js +++ b/.user.js @@ -1,22 +1,22 @@ // ==UserScript== -// @name AutoTrimps-Zek +// @name AutoTrimps-Zek-test // @version 1.0-Zek -// @namespace https://Zorn192.github.io/AutoTrimps -// @updateURL https://Zorn192.github.io/AutoTrimps/.user.js +// @namespace https://spikenskab.github.io/AutoTrimps +// @updateURL https://spikenskab.github.io/AutoTrimps/.user.js // @description Automate all the trimps! // @author zininzinin, spindrjr, Ishkaru, genBTC, Zeker0 // @include *trimps.github.io* // @include *kongregate.com/games/GreenSatellite/trimps -// @connect *Zorn192.github.io/AutoTrimps* +// @connect *spikenskab.github.io/AutoTrimps* // @connect *trimps.github.io* // @connect self // @grant none // ==/UserScript== var script = document.createElement('script'); -script.id = 'AutoTrimps-Zek'; +script.id = 'AutoTrimps-Zek-test'; //This can be edited to point to your own Github Repository URL. -script.src = 'https://Zorn192.github.io/AutoTrimps/AutoTrimps2.js'; +script.src = 'https://spikenskab.github.io/AutoTrimps/AutoTrimps2.js'; //script.setAttribute('crossorigin',"use-credentials"); script.setAttribute('crossorigin',"anonymous"); document.head.appendChild(script); diff --git a/AutoTrimps2.js b/AutoTrimps2.js index c168a0e07..422c44e8d 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -15,7 +15,7 @@ var ATversion = '2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0'; //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////// var atscript = document.getElementById('AutoTrimps-script') - , basepath = 'https://Zorn192.github.io/AutoTrimps/' + , basepath = 'https://spikenskab.github.io/AutoTrimps/' , modulepath = 'modules/' ; //This should redirect the script to wherever its being mirrored from. From c42d781e0c4a49dcc93ecd2643e9b97d9690d1f8 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 12 Jul 2018 00:00:19 +0100 Subject: [PATCH 0626/3477] Re-enable spire breed timer --- AutoTrimps2.js | 2 +- SettingsGUI.js | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index c168a0e07..f484e7d18 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -215,7 +215,7 @@ function mainLoop() { if (getPageSetting('ExitSpireCell') > 0 && game.global.challengeActive != "Daily") exitSpireCell(); //"Exit Spire After Cell" (other.js) if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily") dailyexitSpireCell(); - //if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //breedtimer.js + if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //breedtimer.js if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); //other.js if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) diff --git a/SettingsGUI.js b/SettingsGUI.js index 794421c6c..5cc750475 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -248,11 +248,11 @@ function initializeAllSettings() { createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Core'); createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will purchase 1000 levels of looting II until you can no longer afford to.', 'value', -1, null, 'Core'); - + //Line2 createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); document.getElementById('FinishC2').parentNode.insertAdjacentHTML('afterend','
    '); - + //NewLine3 createSetting('AutoPortal', 'AutoPortal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); @@ -278,7 +278,7 @@ function initializeAllSettings() { createSetting('dexitspirecell', 'Daily Exit Spire Cell', 'What cell to exit spire in dailys. ', 'value', -1, null, 'Daily'); createSetting('buyheliumy', 'Buy Heliumy %', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above the value set in this setting. Recommend anything above 475. Will not buy if you cant afford to, or value is -1. ', 'value', -1, null, 'Daily'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Daily'); - + //Line 2 createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); @@ -386,7 +386,7 @@ function initializeAllSettings() { createSetting('IgnoreSpiresUntil', 'Ignore Spires Until', 'Spire specific settings like end-at-cell are ignored until at least this zone is reached (0 to disable).
    Does not work with Run Bionic Before Spire.', 'value', '200', null, 'Spire'); createSetting('RunBionicBeforeSpire', 'Run Bionic Before Spire', 'CAUTION: Runs Bionic Wonderlands and repeatedly farms Bionic VI @ level 200 before attempting Spire, for the purpose of resource farming. Then it attempts the spire. The Minutes-Before-Spire timer runs concurrently to this, and needs to be set. If not set, it will exit without doing any Bionics... You can un-toggle it on the fly.
    NOTE: Turning this on also mandates that Run Unique Maps be on.
    WARNING: These 100 square maps take ~3x longer than normal maps.
    WARNING: If you dont have Bionic Magnet mastery, this will run the 5 pre-requisites and take longer.
    NOTE: In fact, it may not be what you want at all.', 'boolean', false, null, 'Spire'); //OUTDATED! createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Spire'); - //createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Spire'); + createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Spire'); createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 @@ -394,8 +394,8 @@ function initializeAllSettings() { createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); - - + + //Combat @@ -468,7 +468,7 @@ function initializeAllSettings() { createSetting('AutoIce', 'Ice', 'Spend/convert Ice tokens', 'dropdown', 'Off', ['Off', 'Empowerment', 'Transfer', 'Convert to Poison', 'Convert to Wind', 'Convert to Both'], 'Nature'); if (!game.worldUnlocks.easterEgg.locked) { createSetting('AutoEggs', 'AutoEggs', 'Click easter egg if it exists, upon entering a new zone. Warning: Quite overpowered. Please solemnly swear that you are up to no good.', 'boolean', false, null, 'Core');} - + //Display settings: @@ -875,7 +875,7 @@ function updateCustomButtons() { function turnOn(elem) { toggleElem(elem, true); } - + //Hide settings //Portal @@ -909,7 +909,7 @@ function updateCustomButtons() { (doDaily) ? turnOn("AutoFinishDaily") : turnOff("AutoFinishDaily"); getPageSetting('Dailybwraid')==true ? turnOn("dBWraidingz"): turnOff("dBWraidingz"); getPageSetting('Dailybwraid')==true ? turnOn("dBWraidingmax"): turnOff("dBWraidingmax"); - + //Show and Hide useless settings to reduce UI clutter var turnonofflist = [ @@ -999,7 +999,7 @@ function checkPortalSettings() { } if (game.global.challengeActive == "Daily") { voidmaps = getPageSetting('dVoidMaps'); - } + } if (voidmaps >= portalLevel) tooltip('confirm', null, 'update', 'WARNING: Your void maps are set to complete after your autoPortal, and therefore will not be done at all! Please Change Your Settings Now. This Box Will Not Go away Until You do. Remember you can choose \'Custom\' autoPortal along with challenges for complete control over when you portal.

    Estimated autoPortal level: ' + portalLevel, 'cancelTooltip()', 'Void Maps Conflict'); return portalLevel; From 9f766aebd7a10bacc88abf4355b133ca013e08ad Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 12 Jul 2018 12:54:26 +0100 Subject: [PATCH 0627/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index f484e7d18..e82690c79 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -62,7 +62,7 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised, many thanks to Spikenslab once again. Might be some more stuff over next few days, enjoy. ", isNew: true}); +changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised and Spire breed timer fixed, many thanks to Spikenslab once again. Might be some more stuff over next few days, enjoy. ", isNew: true}); changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). Oh, and one more thing, I removed Void praiding (and daily) due to multiple Praiding now. So if you want to raid before voids, make sure you set it!", isNew: false}); changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation has arrived. Make sure to set your daily autoportal and voids! Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: false}); changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: false}); From cbbce409b0bca48c6a245951cbcc19b8b0a01dad Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:01:59 +0100 Subject: [PATCH 0628/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 5cc750475..daa9a086c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -326,7 +326,7 @@ function initializeAllSettings() { createSetting('MaxExplorers', 'Max Explorers', 'Advanced. Cap your explorers (This is an absolute number not a ratio). recommend: -1', 'value', '-1', null, "Jobs"); //Explorers are important now! outdated setting tbh createSetting('MaxTrainers', 'Max Trainers', 'Advanced. Cap your trainers (This is an absolute number not a ratio). recommend: -1', 'value', '-1', null, "Jobs"); //by the time that you stop needing block, food is abundant createSetting('TrainerCaptoTributes', 'Cap Trainers %', 'Only Buy a Trainer when its cost is LESS than X% of cost of a tribute. This setting can work in combination with the other one, or set the other one to -1 and this will take full control. Default: -1 (Disabled). 50% is close to the point where the cap does nothing. You can go as low as you want but recommended is 10% to 1%. (example: Trainer cost of 5001, Tribute cost of 100000, @ 5%, it would NOT buy the trainer.)', 'value', '-1', null, 'Jobs'); //this is a bit unnecessary, resource management by the script is already sufficient. - + createSetting('buynojobsc', 'No F/L/M in C2', 'Buys No Farmers, Lumberjacks or Miners in the C2 challenges Watch and Trapper. ', 'boolean', 'false', null, "Jobs"); From 14005e4825c2d31a2dc89e760c6038ccfc020184 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:02:13 +0100 Subject: [PATCH 0629/3477] Update other.js --- modules/other.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/other.js b/modules/other.js index e1845216e..1c50ff25b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -24,6 +24,7 @@ var dbwraidon = false; // var presteps = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); // var prebreedtimer = game.global.GeneticistassistSteps[presteps]; var presteps = null; +var buyjobbies = true; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { @@ -732,3 +733,15 @@ function heliumydaily() { } } + +function buynojobs() { + + if (getPageSetting('buynojobsc') && buyjobbies && game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper') { + buyjobbies = false; + } + + else if (!getPageSetting('buynojobsc') && !buyjobbies) { + buyjobbies = true; + } + +} From cc053de26a545652c2712fb7b755da1c41ddd5e3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:02:19 +0100 Subject: [PATCH 0630/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index e82690c79..70c1ee2fc 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -228,6 +228,7 @@ function mainLoop() { if (getPageSetting('ForceAbandon')==true) trimpcide(); //other.js if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); + if (getPageSetting('buynojobsc')==true) buynojobs(); //Original From 88a9eec84a1a216aae3e27631f7797e41391fca3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:02:24 +0100 Subject: [PATCH 0631/3477] Update jobs.js --- modules/jobs.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/jobs.js b/modules/jobs.js index 73cee637a..e97ee0f9f 100644 --- a/modules/jobs.js +++ b/modules/jobs.js @@ -11,6 +11,7 @@ MODULES["jobs"].autoRatio3 = [3,1,4]; MODULES["jobs"].autoRatio2 = [3,3,5]; MODULES["jobs"].autoRatio1 = [1,1,1]; MODULES["jobs"].customRatio; //set this like above and it will Auto use it. +var buyjobbies = true; function safeBuyJob(jobTitle, amount) { if (!Number.isFinite(amount) || amount === 0 || typeof amount === 'undefined' || Number.isNaN(amount)) { @@ -91,20 +92,20 @@ function buyJobs() { if (game.global.world == 1 && game.global.totalHeliumEarned<=5000){ if (game.resources.trimps.owned < game.resources.trimps.realMax() * 0.9){ if (game.resources.food.owned > 5 && freeWorkers > 0){ - if (game.jobs.Farmer.owned == game.jobs.Lumberjack.owned) + if (game.jobs.Farmer.owned == game.jobs.Lumberjack.owned && buyjobbies) safeBuyJob('Farmer', 1); - else if (game.jobs.Farmer.owned > game.jobs.Lumberjack.owned && !game.jobs.Lumberjack.locked) + else if (game.jobs.Farmer.owned > game.jobs.Lumberjack.owned && !game.jobs.Lumberjack.locked && buyjobbies) safeBuyJob('Lumberjack', 1); } freeWorkers = Math.ceil(game.resources.trimps.realMax() / 2) - game.resources.trimps.employed; if (game.resources.food.owned > 20 && freeWorkers > 0){ - if (game.jobs.Farmer.owned == game.jobs.Lumberjack.owned && !game.jobs.Miner.locked) + if (game.jobs.Farmer.owned == game.jobs.Lumberjack.owned && !game.jobs.Miner.locked && buyjobbies) safeBuyJob('Miner', 1); } } return; //make sure the game always buys at least 1 farmer, so we can unlock lumberjacks. - } else if (game.jobs.Farmer.owned == 0 && game.jobs.Lumberjack.locked && freeWorkers > 0) { + } else if (game.jobs.Farmer.owned == 0 && game.jobs.Lumberjack.locked && freeWorkers > 0 && buyjobbies) { safeBuyJob('Farmer', 1); //make sure the game always buys 10 scientists. } else if (getPageSetting('MaxScientists')!=0 && game.jobs.Scientist.owned < 10 && scienceNeeded > 100 && freeWorkers > 0 && game.jobs.Farmer.owned >= 10) { @@ -134,11 +135,13 @@ function buyJobs() { if (breeding > game.resources.trimps.realMax() * 0.33) { freeWorkers = Math.ceil(game.resources.trimps.realMax() / 2) - game.resources.trimps.employed; //only hire if we have less than 300k trimps (dont spam up the late game with meaningless 1's) - if (freeWorkers > 0 && game.resources.trimps.realMax() <= 3e5) { + if (freeWorkers > 0 && game.resources.trimps.realMax() <= 3e5 && buyjobbies) { //do Something tiny, so earlygame isnt stuck on 0 (down to 33% trimps. stops getting stuck from too low.) + safeBuyJob('Miner', 1); safeBuyJob('Farmer', 1); safeBuyJob('Lumberjack', 1); + } } //standard quit routine if <90% breed: @@ -205,7 +208,7 @@ function buyJobs() { var toBuy = Math.floor((jobratio / totalRatio) * totalDistributableWorkers) - game.jobs[job].owned - subtract; var canBuy = Math.floor(game.resources.trimps.owned - game.resources.trimps.employed); var amount = toBuy <= canBuy ? toBuy : canBuy; - if (amount != 0) { + if (amount != 0 && buyjobbies) { safeBuyJob(job, amount); //debug("Ratio Buying Job: " + job + " " + amount + " " + jobratio, "jobs"); } @@ -215,9 +218,9 @@ function buyJobs() { return false; } ratiobuy('Farmer', farmerRatio); - if (!ratiobuy('Miner', minerRatio) && breedFire && game.global.turkimpTimer === 0) + if (!ratiobuy('Miner', minerRatio) && breedFire && game.global.turkimpTimer === 0 && buyjobbies) safeBuyJob('Miner', game.jobs.Miner.owned * -1); - if (!ratiobuy('Lumberjack', lumberjackRatio) && breedFire) + if (!ratiobuy('Lumberjack', lumberjackRatio) && breedFire && buyjobbies) safeBuyJob('Lumberjack', game.jobs.Lumberjack.owned * -1); //Magmamancers code: From c4eaf1d22bf9084bf46131d01731c05dd0314dcd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:05:45 +0100 Subject: [PATCH 0632/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index daa9a086c..66f9c2ac3 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -406,7 +406,7 @@ function initializeAllSettings() { createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); - createSetting('ForceAbandon', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks aren\'t maxed, force abandon and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); + createSetting('Trimpicide', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); From ce7662b493859b5aa96bce51c1c240cce0b9bf77 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:17:11 +0100 Subject: [PATCH 0633/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 1c50ff25b..fa9832fb2 100644 --- a/modules/other.js +++ b/modules/other.js @@ -736,11 +736,11 @@ function heliumydaily() { function buynojobs() { - if (getPageSetting('buynojobsc') && buyjobbies && game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper') { + if (buyjobbies && game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper') { buyjobbies = false; } - else if (!getPageSetting('buynojobsc') && !buyjobbies) { + else if (!buyjobbies) { buyjobbies = true; } From 05e16ae47a068605d16b3ed2d048b7387f60f28e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:24:48 +0100 Subject: [PATCH 0634/3477] Update other.js --- modules/other.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/modules/other.js b/modules/other.js index fa9832fb2..e1845216e 100644 --- a/modules/other.js +++ b/modules/other.js @@ -24,7 +24,6 @@ var dbwraidon = false; // var presteps = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); // var prebreedtimer = game.global.GeneticistassistSteps[presteps]; var presteps = null; -var buyjobbies = true; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { @@ -733,15 +732,3 @@ function heliumydaily() { } } - -function buynojobs() { - - if (buyjobbies && game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper') { - buyjobbies = false; - } - - else if (!buyjobbies) { - buyjobbies = true; - } - -} From e0d7545f0bb47db6ea37a0b50ce69e068a603aae Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:25:01 +0100 Subject: [PATCH 0635/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 - 1 file changed, 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 70c1ee2fc..e82690c79 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -228,7 +228,6 @@ function mainLoop() { if (getPageSetting('ForceAbandon')==true) trimpcide(); //other.js if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); - if (getPageSetting('buynojobsc')==true) buynojobs(); //Original From 094ccebb60da1ce1ecb3e1c3ab1efde5bcb0d22f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:27:09 +0100 Subject: [PATCH 0636/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index e82690c79..70c1ee2fc 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -228,6 +228,7 @@ function mainLoop() { if (getPageSetting('ForceAbandon')==true) trimpcide(); //other.js if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); + if (getPageSetting('buynojobsc')==true) buynojobs(); //Original From 46648f196575007ca8f5057b009e19acda43e597 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:29:07 +0100 Subject: [PATCH 0637/3477] Update other.js --- modules/other.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/other.js b/modules/other.js index e1845216e..dd2bc17d2 100644 --- a/modules/other.js +++ b/modules/other.js @@ -732,3 +732,15 @@ function heliumydaily() { } } + +function buynojobs() { + + if (buyjobbies && game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper') { + buyjobbies = false; + } + + else if (!buyjobbies && game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper') { + buyjobbies = true; + } + +} From bbd2cc3d79ab996ee61bbe28f2f744e7f801f72a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:32:19 +0100 Subject: [PATCH 0638/3477] Update jobs.js --- modules/jobs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jobs.js b/modules/jobs.js index e97ee0f9f..109ece186 100644 --- a/modules/jobs.js +++ b/modules/jobs.js @@ -156,7 +156,7 @@ function buyJobs() { if (amount == null) amount = 1; if (canAffordJob(job, false, amount) && !game.jobs[job].locked) { - if (freeWorkers < amount) + if (freeWorkers < amount && buyjobbies) subtract = safeFireJob('Farmer'); safeBuyJob(job, amount); } From 7f52868ae0f26c82a34729fe88141edd6784591c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:33:40 +0100 Subject: [PATCH 0639/3477] Update fight.js --- modules/fight.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/fight.js b/modules/fight.js index 2fc9d839a..b338040a7 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -94,12 +94,8 @@ function betterAutoFight2() { //NEW:: 3rd algorithm for Better Auto Fight (Basically brute force fight unless in spire or VM) function betterAutoFight3() { var customVars = MODULES["fight"]; - if (game.global.autoBattle && game.global.pauseFight) //check autofight available, and if it is off + if (game.global.autoBattle && game.global.pauseFight && !game.global.spireActive) //check autofight available, and if it is off pauseFight(); //activates autofight if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive) return; //sanity check. - - if (!game.global.fighting) { - fightManual(); - } } From 9ef228935e516c552be45075e91e66e49bf2cef9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:42:10 +0100 Subject: [PATCH 0640/3477] Update jobs.js --- modules/jobs.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jobs.js b/modules/jobs.js index 109ece186..4d4a93661 100644 --- a/modules/jobs.js +++ b/modules/jobs.js @@ -92,20 +92,20 @@ function buyJobs() { if (game.global.world == 1 && game.global.totalHeliumEarned<=5000){ if (game.resources.trimps.owned < game.resources.trimps.realMax() * 0.9){ if (game.resources.food.owned > 5 && freeWorkers > 0){ - if (game.jobs.Farmer.owned == game.jobs.Lumberjack.owned && buyjobbies) + if (game.jobs.Farmer.owned == game.jobs.Lumberjack.owned) safeBuyJob('Farmer', 1); - else if (game.jobs.Farmer.owned > game.jobs.Lumberjack.owned && !game.jobs.Lumberjack.locked && buyjobbies) + else if (game.jobs.Farmer.owned > game.jobs.Lumberjack.owned && !game.jobs.Lumberjack.locked) safeBuyJob('Lumberjack', 1); } freeWorkers = Math.ceil(game.resources.trimps.realMax() / 2) - game.resources.trimps.employed; if (game.resources.food.owned > 20 && freeWorkers > 0){ - if (game.jobs.Farmer.owned == game.jobs.Lumberjack.owned && !game.jobs.Miner.locked && buyjobbies) + if (game.jobs.Farmer.owned == game.jobs.Lumberjack.owned && !game.jobs.Miner.locked) safeBuyJob('Miner', 1); } } return; //make sure the game always buys at least 1 farmer, so we can unlock lumberjacks. - } else if (game.jobs.Farmer.owned == 0 && game.jobs.Lumberjack.locked && freeWorkers > 0 && buyjobbies) { + } else if (game.jobs.Farmer.owned == 0 && game.jobs.Lumberjack.locked && freeWorkers > 0) { safeBuyJob('Farmer', 1); //make sure the game always buys 10 scientists. } else if (getPageSetting('MaxScientists')!=0 && game.jobs.Scientist.owned < 10 && scienceNeeded > 100 && freeWorkers > 0 && game.jobs.Farmer.owned >= 10) { From 522236b6abd278081aa13a0fbeeaddfda2b53c9c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:46:05 +0100 Subject: [PATCH 0641/3477] Update fight.js --- modules/fight.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/fight.js b/modules/fight.js index b338040a7..77e9978bd 100644 --- a/modules/fight.js +++ b/modules/fight.js @@ -98,4 +98,7 @@ function betterAutoFight3() { pauseFight(); //activates autofight if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive) return; //sanity check. + if (game.global.world == 1 && !game.global.fighting) { + fightManual(); + } } From 072c11069e9f82284dc60ba2c590e3d2669fee37 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:47:21 +0100 Subject: [PATCH 0642/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 70c1ee2fc..1dfd2f9a6 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -228,7 +228,7 @@ function mainLoop() { if (getPageSetting('ForceAbandon')==true) trimpcide(); //other.js if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); - if (getPageSetting('buynojobsc')==true) buynojobs(); + if (getPageSetting('buynojobsc')==true || getPageSetting('buynojobsc')==false) buynojobs(); //Original From ab794f903cd6d84fcde176e504b24d3efb499fb9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:48:39 +0100 Subject: [PATCH 0643/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index dd2bc17d2..820cae2dc 100644 --- a/modules/other.js +++ b/modules/other.js @@ -735,11 +735,11 @@ function heliumydaily() { function buynojobs() { - if (buyjobbies && game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper') { + if (getPageSetting('buynojobsc')==true && game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper') { buyjobbies = false; } - else if (!buyjobbies && game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper') { + else if (getPageSetting('buynojobsc')==false && game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper') { buyjobbies = true; } From 1fe1f6391050640f59b0171a0209a08a03c89449 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:52:04 +0100 Subject: [PATCH 0644/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 66f9c2ac3..065ae4e95 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -406,7 +406,7 @@ function initializeAllSettings() { createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); - createSetting('Trimpicide', 'Auto Force-Abandon', '(Trimpicide). If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); + createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); From 2d3aa5f43682e85faec10d42ad0fdf271aa567e7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:54:37 +0100 Subject: [PATCH 0645/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 820cae2dc..9ccc6b599 100644 --- a/modules/other.js +++ b/modules/other.js @@ -739,7 +739,7 @@ function buynojobs() { buyjobbies = false; } - else if (getPageSetting('buynojobsc')==false && game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper') { + else if (getPageSetting('buynojobsc')==false) { buyjobbies = true; } From 3198fb1b75243797a767b140869d6bd2266c3d95 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 15:56:33 +0100 Subject: [PATCH 0646/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 9ccc6b599..f99ad0dda 100644 --- a/modules/other.js +++ b/modules/other.js @@ -739,7 +739,7 @@ function buynojobs() { buyjobbies = false; } - else if (getPageSetting('buynojobsc')==false) { + if (getPageSetting('buynojobsc')==false) { buyjobbies = true; } From 67b111071afd712a33d51523d93c2cc825d6be09 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 22:56:03 +0100 Subject: [PATCH 0647/3477] Update other.js --- modules/other.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/other.js b/modules/other.js index f99ad0dda..b41b2eb1a 100644 --- a/modules/other.js +++ b/modules/other.js @@ -734,13 +734,18 @@ function heliumydaily() { } function buynojobs() { - if (getPageSetting('buynojobsc')==true && game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper') { - buyjobbies = false; + buyjobbies = false; } - if (getPageSetting('buynojobsc')==false) { - buyjobbies = true; + buyjobbies = true; } - +} + +function fightalways() { + if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive) + return; + if (getPageSetting('fightforever')==true && !game.global.fighting) { + fightManual(); + } } From 0b9d7f1ade5cd033da73d3e122d6a5a1ea11dc3e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 22:56:06 +0100 Subject: [PATCH 0648/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 065ae4e95..fabb5334e 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -400,7 +400,7 @@ function initializeAllSettings() { //Combat //Subsection1Line1 - createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
    BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
    BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
    BAF3 = Uses vanilla autofight, and force fights when dead except in VM and Spire.
    WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); + createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
    BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
    BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
    BAF3 = Uses vanilla autofight.
    WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. AutoStance 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); @@ -409,7 +409,7 @@ function initializeAllSettings() { createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); - + createSetting('fightforever', 'Fight Always', 'Sends trimps to fight if they\'re not fighting, regardless of BAF.', 'boolean', 'false', null, 'Combat'); From 20221e2e1f27954b10d99ff1ed4ac82480b92e18 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 13 Jul 2018 22:56:12 +0100 Subject: [PATCH 0649/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 1dfd2f9a6..be9e2d012 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -229,6 +229,7 @@ function mainLoop() { if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); if (getPageSetting('buynojobsc')==true || getPageSetting('buynojobsc')==false) buynojobs(); + if (getPageSetting('fightforever')==true) fightalways(); //Original From c6cd39c25f766385d8cf517783b42834743c1bd6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 12:45:23 +0100 Subject: [PATCH 0650/3477] Update other.js --- modules/other.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/other.js b/modules/other.js index b41b2eb1a..c7b285855 100644 --- a/modules/other.js +++ b/modules/other.js @@ -749,3 +749,15 @@ function fightalways() { fightManual(); } } + +function usedaily3() { + if (getPageSetting('use3daily') == true && game.global.challengeActive == "Daily" && !daily3) { + daily3 = true; + } + if (getPageSetting('use3daily') == false && game.global.challengeActive != "Daily" && daily3) { + daily3 = false; + } + if (getPageSetting('use3daily') == true && game.global.challengeActive != "Daily" && daily3) { + daily 3 = false; + } +} From 80584afd8f569dd0982261013656de7c423ada3d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 12:49:07 +0100 Subject: [PATCH 0651/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index fabb5334e..585efc9a4 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -283,8 +283,8 @@ function initializeAllSettings() { createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); - /*createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); - createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); + createSetting('use3daily', 'Use AS3 for Daily', 'Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); + /*createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily');*/ From a9a771dadd000bcd517501533e7b14cf473ceaa9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 12:50:11 +0100 Subject: [PATCH 0652/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index be9e2d012..a69fe4694 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -168,6 +168,7 @@ var needGymystic = true; //used in setScienceNeeded, buildings.js, equipment. var heirloomFlag = false; var heirloomCache = game.global.heirloomsExtra.length; var magmiteSpenderChanged = false; +var daily3 = false; //////////////////////////////////////// //Main LOGIC Loop/////////////////////// @@ -253,9 +254,9 @@ function mainLoop() { 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('UseScryerStance')) useScryerStance(); //"Use Scryer Stance" (scryer.js) - else if (getPageSetting('AutoStance')<=1) autoStance(); //"Auto Stance" (stance.js) - else if (getPageSetting('AutoStance')==2) autoStance2(); //"Auto Stance #2" (") - else if (getPageSetting('AutoStance')==3) autoStance3(); //"Auto Stance #3" (") + else if (getPageSetting('AutoStance')<=1 && !daily3) autoStance(); //"Auto Stance" (stance.js) + else if (getPageSetting('AutoStance')==2 && !daily3) autoStance2(); //"Auto Stance #2" (") + else if (getPageSetting('AutoStance')==3 || daily3) autoStance3(); //"Auto Stance #3" (") if (getPageSetting('UseAutoGen')) autoGenerator(); //"Auto Generator ON" (magmite.js) if (getPageSetting('BetterAutoFight')==1) betterAutoFight(); //"Better Auto Fight" if (getPageSetting('BetterAutoFight')==2) betterAutoFight2(); //"Better Auto Fight2" From f410be8314443e779cf2b964da6849f22958b8f5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 12:51:56 +0100 Subject: [PATCH 0653/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index c7b285855..eb2454f28 100644 --- a/modules/other.js +++ b/modules/other.js @@ -758,6 +758,6 @@ function usedaily3() { daily3 = false; } if (getPageSetting('use3daily') == true && game.global.challengeActive != "Daily" && daily3) { - daily 3 = false; + daily3 = false; } } From 4d79863a2689cb1a580fe9b73b080ca8ed4f8e93 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 12:55:41 +0100 Subject: [PATCH 0654/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index a69fe4694..973229b22 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -231,6 +231,7 @@ function mainLoop() { if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); if (getPageSetting('buynojobsc')==true || getPageSetting('buynojobsc')==false) buynojobs(); if (getPageSetting('fightforever')==true) fightalways(); + if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); //Original From ed4c6d5d4ffc61f4b1df5b06309379473a739576 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 13:03:43 +0100 Subject: [PATCH 0655/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 973229b22..27e0b3afc 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,11 +61,11 @@ function initializeAutoTrimps() { } var changelogList = []; -//changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised and Spire breed timer fixed, many thanks to Spikenslab once again. Might be some more stuff over next few days, enjoy. ", isNew: true}); +changelogList.push({date: "14/07/2018", version: "v2.3.5", description: "Tinkered with BAF3 to better respect your fight settings. Added Always fight option. AS3 only in Dailys option. Option for workers in Watch and Trapper. Fixed some UI bugs. New z550+ Ratio soon (No one apart from me will probably use it but whatever) ", isNew: true}); +changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised and Spire breed timer fixed, many thanks to Spikenslab once again. ", isNew: false}); changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). Oh, and one more thing, I removed Void praiding (and daily) due to multiple Praiding now. So if you want to raid before voids, make sure you set it!", isNew: false}); changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation has arrived. Make sure to set your daily autoportal and voids! Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: false}); -changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: false}); +//changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: false}); //changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: false}); //changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: false}); //changelogList.push({date: "13/06/2018", version: "v2.2.3", description: "Plus maps for voids has been changed. It now works the same as Prestige raiding. Check tooltip for more details. Ratios will be out soon, including the new z500. ", isNew: false}); From 52272d2bffe6693c693c876fa326caf37a46aa15 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 21:32:22 +0100 Subject: [PATCH 0656/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 + 1 file changed, 1 insertion(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 585efc9a4..98f357538 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -404,6 +404,7 @@ function initializeAllSettings() { createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. AutoStance 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); + createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work with AS3, but not recommended. AT normally uses 4. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. ', 'value', '4', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); From 3362e6aac2d0954c5df2800726f6f27c29b52f9b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 21:34:08 +0100 Subject: [PATCH 0657/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 98f357538..356be95ef 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -404,7 +404,7 @@ function initializeAllSettings() { createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. AutoStance 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); - createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work with AS3, but not recommended. AT normally uses 4. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. ', 'value', '4', null, 'Combat'); + createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work with AS3, but not recommended. AT normally uses 4. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); From d62e5119ade2530f36ca8d141301fccac7db3c85 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 21:34:53 +0100 Subject: [PATCH 0658/3477] Update other.js --- modules/other.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/other.js b/modules/other.js index eb2454f28..016dce01b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -761,3 +761,19 @@ function usedaily3() { daily3 = false; } } + +function cutoffwind() { + if (getPageSetting('windcutoff') < 1 || getEmpowerment() != "Wind") { + MODULES["equipment"].enoughDamageCutoff = 4; + MODULES["maps"].enoughDamageCutoff = 4; + } + if (getPageSetting('windcutoff') < 1 && getEmpowerment() == "Wind") { + MODULES["equipment"].enoughDamageCutoff = 4; + MODULES["maps"].enoughDamageCutoff = 4; + } + if (getPageSetting('windcutoff') >= 1 && getEmpowerment() == "Wind") { + MODULES["equipment"].enoughDamageCutoff = getPageSetting('windcutoff'); + MODULES["maps"].enoughDamageCutoff = getPageSetting('windcutoff'); + } +} + From b69b0a43ea56860ac33c6ca36b47ae8a85919d80 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 21:37:15 +0100 Subject: [PATCH 0659/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 27e0b3afc..9e10d4252 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -232,6 +232,7 @@ function mainLoop() { if (getPageSetting('buynojobsc')==true || getPageSetting('buynojobsc')==false) buynojobs(); if (getPageSetting('fightforever')==true) fightalways(); if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); + if (getPageSetting('windcutoff')>=1) cutoffwind(); //Original From e358ced6ecdfe7cd4129ae518e59010072935205 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 21:39:35 +0100 Subject: [PATCH 0660/3477] Update other.js --- modules/other.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index 016dce01b..9a4415fb3 100644 --- a/modules/other.js +++ b/modules/other.js @@ -763,15 +763,15 @@ function usedaily3() { } function cutoffwind() { - if (getPageSetting('windcutoff') < 1 || getEmpowerment() != "Wind") { + if (getPageSetting('windcutoff') < 1 || getEmpowerment() != "Wind" && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4) { MODULES["equipment"].enoughDamageCutoff = 4; MODULES["maps"].enoughDamageCutoff = 4; } - if (getPageSetting('windcutoff') < 1 && getEmpowerment() == "Wind") { + if (getPageSetting('windcutoff') < 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4) { MODULES["equipment"].enoughDamageCutoff = 4; MODULES["maps"].enoughDamageCutoff = 4; } - if (getPageSetting('windcutoff') >= 1 && getEmpowerment() == "Wind") { + if (getPageSetting('windcutoff') >= 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != getPageSetting('windcutoff') && MODULES["maps"].enoughDamageCutoff != getPageSetting('windcutoff')) { MODULES["equipment"].enoughDamageCutoff = getPageSetting('windcutoff'); MODULES["maps"].enoughDamageCutoff = getPageSetting('windcutoff'); } From 07654e9104ee1586e1e7be17085ea3052e37d00a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 21:45:38 +0100 Subject: [PATCH 0661/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 9a4415fb3..9db2957f0 100644 --- a/modules/other.js +++ b/modules/other.js @@ -771,7 +771,7 @@ function cutoffwind() { MODULES["equipment"].enoughDamageCutoff = 4; MODULES["maps"].enoughDamageCutoff = 4; } - if (getPageSetting('windcutoff') >= 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != getPageSetting('windcutoff') && MODULES["maps"].enoughDamageCutoff != getPageSetting('windcutoff')) { + if (getPageSetting('windcutoff') >= 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != getPageSetting('windcutoff') && MODULES["maps"].enoughDamageCutoff != getPageSetting('windcutoff') && game.global.world >= getPageSetting('WindStackingMin')) { MODULES["equipment"].enoughDamageCutoff = getPageSetting('windcutoff'); MODULES["maps"].enoughDamageCutoff = getPageSetting('windcutoff'); } From 6b941677e33ae6a98a0d2d0b2ee361bc9679913f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 21:48:50 +0100 Subject: [PATCH 0662/3477] Update other.js --- modules/other.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index 9db2957f0..3ed440ab3 100644 --- a/modules/other.js +++ b/modules/other.js @@ -763,15 +763,15 @@ function usedaily3() { } function cutoffwind() { - if (getPageSetting('windcutoff') < 1 || getEmpowerment() != "Wind" && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4) { + if (getPageSetting('windcutoff') < 1 || getEmpowerment() != "Wind" && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world != getPageSetting('WindStackingMin')) { MODULES["equipment"].enoughDamageCutoff = 4; MODULES["maps"].enoughDamageCutoff = 4; } - if (getPageSetting('windcutoff') < 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4) { + if (getPageSetting('windcutoff') < 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world != getPageSetting('WindStackingMin')) { MODULES["equipment"].enoughDamageCutoff = 4; MODULES["maps"].enoughDamageCutoff = 4; } - if (getPageSetting('windcutoff') >= 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != getPageSetting('windcutoff') && MODULES["maps"].enoughDamageCutoff != getPageSetting('windcutoff') && game.global.world >= getPageSetting('WindStackingMin')) { + if (getPageSetting('windcutoff') >= 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != getPageSetting('windcutoff') && MODULES["maps"].enoughDamageCutoff != getPageSetting('windcutoff') && game.global.world >= getPageSetting('WindStackingMin')) { MODULES["equipment"].enoughDamageCutoff = getPageSetting('windcutoff'); MODULES["maps"].enoughDamageCutoff = getPageSetting('windcutoff'); } From 0c3b9f5408615eb0ab85460206ecc52c6549c4a4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 21:55:12 +0100 Subject: [PATCH 0663/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 3ed440ab3..7aaeb34b1 100644 --- a/modules/other.js +++ b/modules/other.js @@ -763,11 +763,11 @@ function usedaily3() { } function cutoffwind() { - if (getPageSetting('windcutoff') < 1 || getEmpowerment() != "Wind" && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world != getPageSetting('WindStackingMin')) { + if (getPageSetting('windcutoff') < 1 && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world != getPageSetting('WindStackingMin')) { MODULES["equipment"].enoughDamageCutoff = 4; MODULES["maps"].enoughDamageCutoff = 4; } - if (getPageSetting('windcutoff') < 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world != getPageSetting('WindStackingMin')) { + if (getPageSetting('windcutoff') >= 1 && getEmpowerment() != "Wind" && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world != getPageSetting('WindStackingMin')) { MODULES["equipment"].enoughDamageCutoff = 4; MODULES["maps"].enoughDamageCutoff = 4; } From f18e824d5ee8adc8f459a2804fa5822f178aa8ff Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 21:57:57 +0100 Subject: [PATCH 0664/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 7aaeb34b1..41fca4a3f 100644 --- a/modules/other.js +++ b/modules/other.js @@ -767,7 +767,7 @@ function cutoffwind() { MODULES["equipment"].enoughDamageCutoff = 4; MODULES["maps"].enoughDamageCutoff = 4; } - if (getPageSetting('windcutoff') >= 1 && getEmpowerment() != "Wind" && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world != getPageSetting('WindStackingMin')) { + if (getPageSetting('windcutoff') >= 1 && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world < getPageSetting('WindStackingMin')) { MODULES["equipment"].enoughDamageCutoff = 4; MODULES["maps"].enoughDamageCutoff = 4; } From a24feb058c58abdf205087d74a8f91016deaa844 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 14 Jul 2018 22:20:17 +0100 Subject: [PATCH 0665/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 356be95ef..4b5f16392 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -404,7 +404,7 @@ function initializeAllSettings() { createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. AutoStance 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); - createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work with AS3, but not recommended. AT normally uses 4. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. ', 'value', '-1', null, 'Combat'); + createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); From 9b941c5f5d46dcd5fce8cb5f005d59a311b755e2 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 00:03:34 +0100 Subject: [PATCH 0666/3477] Buy best affordable map in Praid Buys the best plus map we can afford up to +10 when Praiding --- AutoTrimps2.js | 5 +- modules/other.js | 204 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 144 insertions(+), 65 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index d0ceba0ca..85c92437b 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -218,8 +218,9 @@ function mainLoop() { if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily") dailyexitSpireCell(); if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //breedtimer.js if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); //other.js - if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) - if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) + if (getPageSetting('Praidingzone').length || getPageSetting('dPraidingzone').length) PraidHarder(); +// if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) +// if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) if (getPageSetting('BWraid')==true && game.global.challengeActive != "Daily"){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) if (getPageSetting('Dailybwraid')==true && game.global.challengeActive == "Daily"){setTimeout(dailyBWraiding(), 3000);} //BW Raiding (other.js) if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); //other.js diff --git a/modules/other.js b/modules/other.js index eb2454f28..9e4d4cd06 100644 --- a/modules/other.js +++ b/modules/other.js @@ -197,77 +197,155 @@ function findLastBionic() { //Praiding function Praiding() { - var pMap; - if (getPageSetting('Praidingzone').length) { - if (getPageSetting('Praidingzone').includes(game.global.world) && !prestraid && !failpraid) { - debug('World Zone matches a Praiding Zone!'); + var pMap; + if (getPageSetting('Praidingzone').length) { + if (getPageSetting('Praidingzone').includes(game.global.world) && !prestraid && !failpraid) { + debug('World Zone matches a Praiding Zone!'); prestraidon = true; - if (getPageSetting('AutoMaps') == 1 && !prestraid && !failpraid) { - autoTrimpSettings["AutoMaps"].value = 0; - } - if (!game.global.preMapsActive && !game.global.mapsActive && !prestraid && !failpraid) { - mapsClicked(); - if (!game.global.preMapsActive) { - mapsClicked(); - } - debug("Beginning Prestige Raiding..."); - } - if (game.options.menu.repeatUntil.enabled!=2 && !prestraid && !failpraid) { - game.options.menu.repeatUntil.enabled = 2; - } - if (game.global.preMapsActive && !prestraid && !failpraid) { - plusPres(); - if ((updateMapCost(true) <= game.resources.fragments.owned)) { - buyMap(); - failpraid = false; - mapbought = true; - } - else if ((updateMapCost(true) > game.resources.fragments.owned)) { - if (getPageSetting('AutoMaps') == 0 && !prestraid) { - autoTrimpSettings["AutoMaps"].value = 1; - failpraid = true; - prestraidon = false; - mapbought = false; - debug("Failed to prestige raid. Looks like you can't afford to.."); - } - return; - - } + if (getPageSetting('AutoMaps') == 1 && !prestraid && !failpraid) { + autoTrimpSettings["AutoMaps"].value = 0; + } + if (!game.global.preMapsActive && !game.global.mapsActive && !prestraid && !failpraid) { + mapsClicked(); + if (!game.global.preMapsActive) { + mapsClicked(); + } + debug("Beginning Prestige Raiding..."); + } + if (game.options.menu.repeatUntil.enabled!=2 && !prestraid && !failpraid) { + game.options.menu.repeatUntil.enabled = 2; + } + if (game.global.preMapsActive && !prestraid && !failpraid) { + plusPres(); + if ((updateMapCost(true) <= game.resources.fragments.owned)) { + buyMap(); + failpraid = false; + mapbought = true; + } + else if ((updateMapCost(true) > game.resources.fragments.owned)) { + if (getPageSetting('AutoMaps') == 0 && !prestraid) { + autoTrimpSettings["AutoMaps"].value = 1; + failpraid = true; + prestraidon = false; + mapbought = false; + debug("Failed to prestige raid. Looks like you can't afford to.."); + } + return; + } } if (mapbought == true) { - pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; - selectMap(pMap); - runMap(); - } - if (!prestraid && !failpraid && !game.global.repeatMap) { - repeatClicked(); - - } + pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; + selectMap(pMap); + runMap(); + } + if (!prestraid && !failpraid && !game.global.repeatMap) { + repeatClicked(); + } prestraid = true; failpraid = false prestraidon = false; mapbought = false; - } } + } - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { - autoTrimpSettings["AutoMaps"].value = 1; - debug("Prestige raiding successfull! - recycling Praid map"); - recycleMap(pMap); - debug("Turning AutoMaps back on"); - } - if (getPageSetting('Praidingzone').every(isBelowThreshold)) { - prestraid = false; - failpraid = false; - prestraidon = false; - mapbought = false; + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Prestige raiding successfull! - recycling Praid map"); + recycleMap(pMap); + debug("Turning AutoMaps back on"); + } + if (getPageSetting('Praidingzone').every(isBelowThreshold)) { + prestraid = false; + failpraid = false; + prestraidon = false; + mapbought = false; + } +} + +function PraidHarder() { + var pMap; + var maxPlusZones = 10; + var mapModifiers = ["p","fa","0"]; + var farmFragments = false; + + if ((game.global.world + maxPlusZones) % 10 > 5) + maxPlusZones = max(maxPlusZones + (5 - (game.global.world + maxPlusZones) % 10),0); + else if ((game.global.world + maxPlusZones) % 10 == 0) + maxPlusZones = min(5,maxPlusZones); + + if (game.global.challengeActive == "Daily") praidSetting = 'dPraidingzone'; + else praidSetting = 'Praidingzone'; + + if (getPageSetting(praidSetting).length) { + if (getPageSetting(praidSetting).includes(game.global.world) && !prestraid && !failpraid) { + debug('Beginning Praiding'); + prestraidon = true; + autoTrimpSettings["AutoMaps"].value = 0; + if (!game.global.preMapsActive && !game.global.mapsActive && !prestraid) { + mapsClicked(); + if (!game.global.preMapsActive) mapsClicked(); + } + game.options.menu.repeatUntil.enabled = 2; + plusPres(); + document.getElementById('advExtraLevelSelect').value = maxPlusZones; + for (var curPlusZones = maxPlusZones; curPlusZones >= 0; curPlusZones--) { + if ((game.global.world + curPlusZones) % 10 == 0 || (game.global.world + curPlusZones) % 10 > 5) continue; + document.getElementById('advExtraLevelSelect').value = curPlusZones; + if (relaxMapReqs(mapModifiers)) break; + else if (farmFragments) mapModifiers = ["0"]; // conserve fragments if going to farm + } + if (curPlusZones >= 0) { + buyMap(); + pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; + selectMap(pMap); + maxPlusBought = curPlusZones; + runMap(); + if (!game.global.repeatMap) repeatClicked(); + prestraid = true; + prestraidon = false; + failpraid = false; + } + else { + failpraid = true; + prestraidon = false; + debug("Failed to prestige raid. Looks like you can't afford to.."); + autoTrimpSettings['AutoMaps'].value = 1; + return; + } } + } + if (game.global.preMapsActive && prestraid && !failpraid) { + autoTrimpSettings['AutoMaps'].value = 1; + debug("Prestige raiding successfull! - recycling Praid map"); + recycleMap(pMap); + debug("Turning AutoMaps back on"); + } + if (!getPageSetting(praidSetting).includes(game.global.world)) { + prestraid = false; + failpraid = false; + prestraidon = false; + } } +function relaxMapReqs(mapModifiers) { + for (var j = 0; j < mapModifiers.length; j++) { + document.getElementById('sizeAdvMapsRange') = 9; + document.getElementById('advSpecialSelect') = mapModifiers[j]; + for (var i = 9; i >= 0; i--) { + document.getElementById('difficultyAdvMapsRange') = i; + if (updateMapCost(true) <= game.resources.fragments.owned) return true; + } + for (i = 9; i >= 0; i--) { + document.getElementById('sizeAdvMapsRange') = i; + if (updateMapCost(true) <= game.resources.fragments.owned) return true; + } + } + return false; +} function BWraiding() { - + PraidHarder(); // To make sure we try to Praid first before BWraiding if (!prestraidon && game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { if (getPageSetting('AutoMaps') == 1 && !bwraided && !failbwraid) { @@ -733,13 +811,13 @@ function heliumydaily() { } } -function buynojobs() { - if (getPageSetting('buynojobsc')==true && game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper') { - buyjobbies = false; - } - if (getPageSetting('buynojobsc')==false) { - buyjobbies = true; - } +function buynojobs() { + if (getPageSetting('buynojobsc')==true && game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper') { + buyjobbies = false; + } + if (getPageSetting('buynojobsc')==false) { + buyjobbies = true; + } } function fightalways() { From 4d27eaa2be7d01b15bc9af8d61d70437ffd02072 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 00:14:21 +0100 Subject: [PATCH 0667/3477] PraidHarder bugfix min() -> Math.min(), max -> Math.max() --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 9e4d4cd06..5ae883988 100644 --- a/modules/other.js +++ b/modules/other.js @@ -270,9 +270,9 @@ function PraidHarder() { var farmFragments = false; if ((game.global.world + maxPlusZones) % 10 > 5) - maxPlusZones = max(maxPlusZones + (5 - (game.global.world + maxPlusZones) % 10),0); + maxPlusZones = Math.max(maxPlusZones + (5 - (game.global.world + maxPlusZones) % 10),0); else if ((game.global.world + maxPlusZones) % 10 == 0) - maxPlusZones = min(5,maxPlusZones); + maxPlusZones = Math.min(5,maxPlusZones); if (game.global.challengeActive == "Daily") praidSetting = 'dPraidingzone'; else praidSetting = 'Praidingzone'; From c38d7b316ca99389e425e2c4cf4e7d3d4b53b028 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 01:24:22 +0100 Subject: [PATCH 0668/3477] derp --- modules/other.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index 5ae883988..a00e43d9d 100644 --- a/modules/other.js +++ b/modules/other.js @@ -330,14 +330,14 @@ function PraidHarder() { function relaxMapReqs(mapModifiers) { for (var j = 0; j < mapModifiers.length; j++) { - document.getElementById('sizeAdvMapsRange') = 9; - document.getElementById('advSpecialSelect') = mapModifiers[j]; + document.getElementById('sizeAdvMapsRange').value = 9; + document.getElementById('advSpecialSelect').value = mapModifiers[j]; for (var i = 9; i >= 0; i--) { - document.getElementById('difficultyAdvMapsRange') = i; + document.getElementById('difficultyAdvMapsRange').value = i; if (updateMapCost(true) <= game.resources.fragments.owned) return true; } for (i = 9; i >= 0; i--) { - document.getElementById('sizeAdvMapsRange') = i; + document.getElementById('sizeAdvMapsRange').value = i; if (updateMapCost(true) <= game.resources.fragments.owned) return true; } } From 75752d2479c2b430bb7b0bdb3897a93352c954a7 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 03:03:27 +0100 Subject: [PATCH 0669/3477] Praid fragment farming First attempt, doubtless full of bugs --- modules/other.js | 111 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 83 insertions(+), 28 deletions(-) diff --git a/modules/other.js b/modules/other.js index a00e43d9d..63fc0f974 100644 --- a/modules/other.js +++ b/modules/other.js @@ -24,6 +24,7 @@ var dbwraidon = false; // var presteps = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); // var prebreedtimer = game.global.GeneticistassistSteps[presteps]; var presteps = null; +var minMaxMapCost; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { @@ -166,33 +167,33 @@ function dailyexitSpireCell() { } function plusPres() { - document.getElementById("biomeAdvMapsSelect").value = "Random"; - document.getElementById('advExtraLevelSelect').value = plusMapToRun(game.global.world); - document.getElementById('advSpecialSelect').value = "p"; - document.getElementById("lootAdvMapsRange").value = 0; - document.getElementById("difficultyAdvMapsRange").value = 9; - document.getElementById("sizeAdvMapsRange").value = 9; - document.getElementById('advPerfectCheckbox').checked = false; + document.getElementById("biomeAdvMapsSelect").value = "Random"; + document.getElementById('advExtraLevelSelect').value = plusMapToRun(game.global.world); + document.getElementById('advSpecialSelect').value = "p"; + document.getElementById("lootAdvMapsRange").value = 0; + document.getElementById("difficultyAdvMapsRange").value = 9; + document.getElementById("sizeAdvMapsRange").value = 9; + document.getElementById('advPerfectCheckbox').checked = false; document.getElementById("mapLevelInput").value = game.global.world; - updateMapCost(); - } + updateMapCost(); +} function plusMapToRun(zone) { - if (zone % 10 == 9) - return 6; - else if (zone % 10 <5) - return 5 - zone % 10; - else - return 11 - zone % 10; - } + if (zone % 10 == 9) + return 6; + else if (zone % 10 <5) + return 5 - zone % 10; + else + return 11 - zone % 10; +} function findLastBionic() { - for (var i = game.global.mapsOwnedArray.length -1; i>=0; i--) { - if (game.global.mapsOwnedArray[i].location === "Bionic") { - return game.global.mapsOwnedArray[i]; - } - } - } + for (var i = game.global.mapsOwnedArray.length -1; i>=0; i--) { + if (game.global.mapsOwnedArray[i].location === "Bionic") { + return game.global.mapsOwnedArray[i]; + } + } +} //Praiding @@ -265,9 +266,10 @@ function Praiding() { function PraidHarder() { var pMap; + var fMap; var maxPlusZones = 10; var mapModifiers = ["p","fa","0"]; - var farmFragments = false; + var farmFragments = true; if ((game.global.world + maxPlusZones) % 10 > 5) maxPlusZones = Math.max(maxPlusZones + (5 - (game.global.world + maxPlusZones) % 10),0); @@ -287,6 +289,14 @@ function PraidHarder() { if (!game.global.preMapsActive) mapsClicked(); } game.options.menu.repeatUntil.enabled = 2; + if (farmFragments) { + plusPres(); + document.getElementById('advExtraLevelSelect').value = maxPlusZones; + document.getElementById('sizeAdvMapsRange').value = 0; + document.getElementById('difficultyAdvMapsRange').value = 0; + document.getElementById('advSpecialSelect').value = "0"; + minMaxMapCost = updateMapCost(true); + } plusPres(); document.getElementById('advExtraLevelSelect').value = maxPlusZones; for (var curPlusZones = maxPlusZones; curPlusZones >= 0; curPlusZones--) { @@ -299,25 +309,70 @@ function PraidHarder() { buyMap(); pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; selectMap(pMap); - maxPlusBought = curPlusZones; + if (maxPlusZones == curPlusZones) minMaxMapCost = null; runMap(); if (!game.global.repeatMap) repeatClicked(); prestraid = true; prestraidon = false; failpraid = false; } - else { + else if (!farmFragments || !minMaxMapCost){ failpraid = true; prestraidon = false; - debug("Failed to prestige raid. Looks like you can't afford to.."); + debug("Failed to prestige raid. Looks like you can't afford to."); autoTrimpSettings['AutoMaps'].value = 1; return; } } } - if (game.global.preMapsActive && prestraid && !failpraid) { + if (farmFragments && minMaxMapCost && game.global.preMapsActive && prestraid && !fMap) { + document.getElementById("biomeAdvMapsSelect").value = "Depths"; + document.getElementById('advExtraLevelSelect').value = 0; + document.getElementById('advSpecialSelect').value = "fa"; + document.getElementById("lootAdvMapsRange").value = 9; + document.getElementById("difficultyAdvMapsRange").value = 9; + document.getElementById("sizeAdvMapsRange").value = 9; + document.getElementById('advPerfectCheckbox').checked = true; + document.getElementById("mapLevelInput").value = game.global.world - 1; + game.options.menu.repeatUntil.enabled = 0; + if (updateMapCost(true) <= game.global.fragments.owned) { + debug("Buying perfect sliders fragment farming map"); + buyMap(); + fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; + selectMap(fMap); + runMap(); + if (!game.global.repeatClicked) { + repeatClicked(); + } + } + else { + document.getElementById('advPerfectCheckbox').checked = false; + if (updateMapCost(true) <= game.global.fragments.owned) { + debug("Buying imperfect sliders fragment farming map"); + buyMap(); + fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; + selectMap(fMap); + runMap(); + if (!game.global.repeatClicked) { + repeatClicked(); + } + } + else debug("Can't afford fragment farming map yet"); + } + } + if (game.global.mapsActive && minMaxMapCost <= game.global.fragments.owned && fMap) { + mapsClicked(); + if (!game.global.preMapsActive) mapsClicked(); + prestraid = false; + failpraid = false; + prestraidon = false; + minMaxMapCost = null; + recycleMap(fMap); + fMap = null; + } + if (game.global.preMapsActive && prestraid && !failpraid && !minMaxMapCost) { autoTrimpSettings['AutoMaps'].value = 1; - debug("Prestige raiding successfull! - recycling Praid map"); + debug("Prestige raiding successful! - recycling Praid map"); recycleMap(pMap); debug("Turning AutoMaps back on"); } From 96cf863f6f98b4214f19a2d67f6d3689ae84e3a7 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 03:09:13 +0100 Subject: [PATCH 0670/3477] Fix property name reference --- modules/other.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index 63fc0f974..d7f5b208b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -335,7 +335,7 @@ function PraidHarder() { document.getElementById('advPerfectCheckbox').checked = true; document.getElementById("mapLevelInput").value = game.global.world - 1; game.options.menu.repeatUntil.enabled = 0; - if (updateMapCost(true) <= game.global.fragments.owned) { + if (updateMapCost(true) <= game.resources.fragments.owned) { debug("Buying perfect sliders fragment farming map"); buyMap(); fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; @@ -347,7 +347,7 @@ function PraidHarder() { } else { document.getElementById('advPerfectCheckbox').checked = false; - if (updateMapCost(true) <= game.global.fragments.owned) { + if (updateMapCost(true) <= game.resources.fragments.owned) { debug("Buying imperfect sliders fragment farming map"); buyMap(); fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; @@ -360,7 +360,7 @@ function PraidHarder() { else debug("Can't afford fragment farming map yet"); } } - if (game.global.mapsActive && minMaxMapCost <= game.global.fragments.owned && fMap) { + if (game.global.mapsActive && minMaxMapCost <= game.resources.fragments.owned && fMap) { mapsClicked(); if (!game.global.preMapsActive) mapsClicked(); prestraid = false; From d1c8687c5109471a9c6ef08f8b81bb7e675be38c Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 03:42:34 +0100 Subject: [PATCH 0671/3477] Make pMap and fMap global --- modules/other.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index d7f5b208b..b5e488d1a 100644 --- a/modules/other.js +++ b/modules/other.js @@ -25,6 +25,8 @@ var dbwraidon = false; // var prebreedtimer = game.global.GeneticistassistSteps[presteps]; var presteps = null; var minMaxMapCost; +var fMap; +var pMap; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { @@ -265,8 +267,8 @@ function Praiding() { } function PraidHarder() { - var pMap; - var fMap; +// var pMap; +// var fMap; var maxPlusZones = 10; var mapModifiers = ["p","fa","0"]; var farmFragments = true; From a11ef849793b33de06cecb767650eb538d792e66 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 03:47:58 +0100 Subject: [PATCH 0672/3477] Use toggleSetting to change repeatUntil --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index b5e488d1a..e8edc8b6a 100644 --- a/modules/other.js +++ b/modules/other.js @@ -290,7 +290,7 @@ function PraidHarder() { mapsClicked(); if (!game.global.preMapsActive) mapsClicked(); } - game.options.menu.repeatUntil.enabled = 2; + while (game.options.menu.repeatUntil.enabled != 2) toggleSetting("repeatUntil", null, false, true); if (farmFragments) { plusPres(); document.getElementById('advExtraLevelSelect').value = maxPlusZones; @@ -336,7 +336,7 @@ function PraidHarder() { document.getElementById("sizeAdvMapsRange").value = 9; document.getElementById('advPerfectCheckbox').checked = true; document.getElementById("mapLevelInput").value = game.global.world - 1; - game.options.menu.repeatUntil.enabled = 0; + while (game.options.menu.repeatUntil.enabled != 0) toggleSetting("repeatUntil", null, false, true); if (updateMapCost(true) <= game.resources.fragments.owned) { debug("Buying perfect sliders fragment farming map"); buyMap(); From 1e3b0dfec45458fa87aabe46f58c8c4d7124250d Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 04:08:46 +0100 Subject: [PATCH 0673/3477] Fix infinite loop --- modules/other.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index e8edc8b6a..5606426ee 100644 --- a/modules/other.js +++ b/modules/other.js @@ -290,7 +290,8 @@ function PraidHarder() { mapsClicked(); if (!game.global.preMapsActive) mapsClicked(); } - while (game.options.menu.repeatUntil.enabled != 2) toggleSetting("repeatUntil", null, false, true); + game.options.menu.repeatUntil.enabled = 2; + toggleSetting("repeatUntil", null, false, true); if (farmFragments) { plusPres(); document.getElementById('advExtraLevelSelect').value = maxPlusZones; @@ -336,7 +337,8 @@ function PraidHarder() { document.getElementById("sizeAdvMapsRange").value = 9; document.getElementById('advPerfectCheckbox').checked = true; document.getElementById("mapLevelInput").value = game.global.world - 1; - while (game.options.menu.repeatUntil.enabled != 0) toggleSetting("repeatUntil", null, false, true); + game.options.menu.repeatUntil.enabled = 0; + toggleSetting("repeatUntil", null, false, true); if (updateMapCost(true) <= game.resources.fragments.owned) { debug("Buying perfect sliders fragment farming map"); buyMap(); From 9fd9de80e04da2c6cb8d09b7ef75819dd3f62a6c Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 04:19:22 +0100 Subject: [PATCH 0674/3477] Change fMap exit handling --- modules/other.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 5606426ee..609c495b8 100644 --- a/modules/other.js +++ b/modules/other.js @@ -365,8 +365,9 @@ function PraidHarder() { } } if (game.global.mapsActive && minMaxMapCost <= game.resources.fragments.owned && fMap) { - mapsClicked(); - if (!game.global.preMapsActive) mapsClicked(); + if (game.global.repeatClicked) { + repeatClicked(); + } prestraid = false; failpraid = false; prestraidon = false; From 3fe8a6d4448b63aa487f5871a0f33e8223076cc4 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 04:50:22 +0100 Subject: [PATCH 0675/3477] Tweaks to PraidHarder loop --- modules/other.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index 609c495b8..1787f9437 100644 --- a/modules/other.js +++ b/modules/other.js @@ -316,7 +316,7 @@ function PraidHarder() { runMap(); if (!game.global.repeatMap) repeatClicked(); prestraid = true; - prestraidon = false; + // prestraidon = false; failpraid = false; } else if (!farmFragments || !minMaxMapCost){ @@ -370,15 +370,16 @@ function PraidHarder() { } prestraid = false; failpraid = false; - prestraidon = false; + // prestraidon = false; minMaxMapCost = null; - recycleMap(fMap); + if (fMap) recycleMap(fMap); fMap = null; } if (game.global.preMapsActive && prestraid && !failpraid && !minMaxMapCost) { + prestraidon = false; autoTrimpSettings['AutoMaps'].value = 1; debug("Prestige raiding successful! - recycling Praid map"); - recycleMap(pMap); + if (pMap) recycleMap(pMap); debug("Turning AutoMaps back on"); } if (!getPageSetting(praidSetting).includes(game.global.world)) { From 79de8e1e518801257e8b6211a9668822df0b02e1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 15 Jul 2018 10:01:35 +0100 Subject: [PATCH 0676/3477] Update SettingsGUI.js --- SettingsGUI.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 4b5f16392..1c9f36dd9 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -235,9 +235,10 @@ initializeAllTabs(); //Actually Make the Settings Buttons function initializeAllSettings() { - //START MAKING BUTTONS IN THE TABS: +//START MAKING BUTTONS IN THE TABS: + //CORE: //Line1: @@ -274,12 +275,11 @@ function initializeAllSettings() { createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Daily'); createSetting('Dailyportal', 'Daily Autoportal', 'Portals when this zone is finished in a Daily. ', 'value', -1, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone', 'What zone to do void maps in dailys. Disable with -1', 'value', -1, null, 'Daily'); - //createSetting('dVoidPraid', 'Daily Plus Maps for Voids', 'Raid Prestiges before running Void Maps in dailys. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS DAILY PRAIDING. ', 'boolean', 'false', null, 'Daily'); createSetting('dexitspirecell', 'Daily Exit Spire Cell', 'What cell to exit spire in dailys. ', 'value', -1, null, 'Daily'); createSetting('buyheliumy', 'Buy Heliumy %', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above the value set in this setting. Recommend anything above 475. Will not buy if you cant afford to, or value is -1. ', 'value', -1, null, 'Daily'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Daily'); - -//Line 2 + //extra slot here + //Line 2 createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); @@ -320,7 +320,6 @@ function initializeAllSettings() { createSetting('FarmerRatio', 'Farmer Ratio', '', 'value', '1', null, "Jobs"); //realistically gems are not that useful by the time you have magmamancers... maybe just set it to only spend 50% of your gems at a time and leave it at that? 10% is kinda low anyway createSetting('LumberjackRatio', 'Lumberjack Ratio', '', 'value', '1', null, "Jobs"); createSetting('MinerRatio', 'Miner Ratio', '', 'value', '1', null, "Jobs"); - //createSetting('ScientistRatio', 'Scientist Ratio', 'Advanced. This will allow you to cap your scientist to worker ratio, as well as disable the hiring of scientists.
    -1 Allows the ratio to be set automatically (Recommended)
    0 Turns off Scientist hiring
    \>0 Set a custom ratio.', 'value', '-1', null, "Jobs"); createSetting('MaxScientists', 'Max Scientists', 'Advanced. Cap your scientists (This is an absolute number not a ratio). recommend: -1 (infinite still controls itself)', 'value', '-1', null, "Jobs"); //Line2 createSetting('MaxExplorers', 'Max Explorers', 'Advanced. Cap your explorers (This is an absolute number not a ratio). recommend: -1', 'value', '-1', null, "Jobs"); //Explorers are important now! outdated setting tbh @@ -365,20 +364,14 @@ function initializeAllSettings() { //Line2 createSetting('CorruptionCalc', 'Corruption Farm Mode', 'Recommended. Enabling this will cause the Automaps routine to take amount of corruption in a zone into account, to decide whether it should do maps first for map bonus. ONLY in Zone 181+ (or Headstart 1,2,3 zone: 176,166,151) ', 'boolean', true, null, 'Maps'); createSetting('MaxTox', 'Max Toxicity Stacks', 'Get maximum toxicity stacks before killing the improbability in each zone 60 and above. Generally only recommended for 1 run to maximize bone portal value. This setting will revert to disabled after a successful Max-Tox run + Toxicity Autoportal.', 'boolean', false, null, 'Maps'); - - //Line3 createSetting('VoidMaps', 'Void Maps', '0 to disable The zone at which you want all your void maps to be cleared inclusive of the zone you type. Runs them at Cell 93 by default, unless you set a decimal value indicating the cell (example: 187.75). Use odd zones on Lead.
    If Daily Void Zone Mod is active, your Finish Daily Z Mod will apply to this number when a Daily is active.', 'value', '0', null, "Maps"); createSetting('RunNewVoidsUntilNew', 'New Voids Mod', '0 to disable. Positive numbers are added to your Void Map zone. -1 for no cap. This allows you to run new Void Maps obtained after your Void Map zone by adding this number to your Void Map zone.
    Example Void map zone=185.75 and This setting=10. New Voids run until 197.75).
    This means that any new void maps gained until Z197, cell 75 will be run. CAUTION: May severely slow you down by trying to do too-high level void maps. Default 0 (OFF).', 'value', '0', null, 'Maps'); //Should replace the two below - //createSetting('VoidsPerZone', 'Voids per Zone', 'Run a max of this many Voids per zone, if you have a lot of Voids saved up. Then moves onto the next zone and does more voids.', 'value', '-1', null, 'Maps'); - //-1 Autograbs your Finish Daily Z Mod
    0 Disables this setting
    Positive Numbers add to your normal void zone on a daily
    Possible number input? - //createSetting('VoidPraid', 'Plus Maps for Voids', 'Raid Prestiges before running Void Maps. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS PRAIDING. ', 'boolean', 'false', null, 'Maps'); createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. And I cba cause its a meh setting anyway. Advancing 2 zones more than doubles your income. Only useful for spire I, and IMO you may aswell actually play the game manually at SOME point. createSetting('AdvMapSpecialModifier', 'Map Special Modifier', 'EXPERIMENTAL. Attempt to select the BEST map special attacks mod. With this on, this will replace the normal behavior. If bugs, please report as this will become more default soon.', 'boolean', false, null, 'Maps'); - //Spire //Line 1 createSetting('MaxStacksForSpire', 'Max Map Bonus for Spire', 'Get max map bonus before running the Spire.', 'boolean', false, null, 'Spire'); //Does farm before spire not cover this fairly well anyway? grabbing +1 equips would make way more difference anyway @@ -394,12 +387,13 @@ function initializeAllSettings() { createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); + createSetting('spireshitbuy', 'Buy Gear in Spire', 'Will buy Weapons and Armor in Spire regardless of your H:D ratio. Respects your max gear level and ignore spires setting. ', 'boolean', false, null, 'Spire'); //Combat - //Subsection1Line1 + //Line 1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
    BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
    BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
    BAF3 = Uses vanilla autofight.
    WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. AutoStance 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); @@ -407,6 +401,7 @@ function initializeAllSettings() { createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); + //Line 2 createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); @@ -448,11 +443,12 @@ function initializeAllSettings() { - //Heirloom Settings createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'Use Autoheirlooms 2. It will keep heirlooms on portal. ', 'multitoggle', 0, null, 'Heirlooms'); createSetting('AutoUpgradeHeirlooms', 'Auto Upgrade Heirlooms', 'Automatically buys the upgrades the script advises for the Equipped shield and staff, until we are out of nullifium.', 'boolean', false, null, 'Heirlooms'); + + //Golden Upgrade Strategies: createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections. Make sure vanilla setting Locking is off. ', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void"], 'Golden'); createSetting('goldStrat', 'Strategy', 'VOID ONLY: After max Void golden upgrades, alternate between buying helium and battle upgrades. Or Choose a Zone to switch over completely at (zones lower than X will buy only battle, and zones higher than X only helium). Battle can be disabled completely with the goldNoBattle button. MAX THEN HELIUM setting so you can get the perfect 60% Voids then Helium', 'dropdown', 'Max then Helium', ["Off", "Alternating", "Zone", "Max then Helium"], 'Golden'); @@ -482,6 +478,8 @@ function initializeAllSettings() { createSetting('ShowSettings', 'Show Extra Settings', 'Show/Hide settings that in my personal opinion, are rarely useful (HZE 470)', 'boolean', true, null, 'Display') document.getElementById('Display').lastChild.insertAdjacentHTML('afterend','
    '); + + //SPAM settings: //Subsection2Line1 createSetting('SpamGeneral', 'General Spam', 'General Spam = Notification Messages, Auto He/Hr', 'boolean', true, null, 'Display'); From 2a766177241e7606b9c033b765a89bd26609b1c5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 15 Jul 2018 10:04:42 +0100 Subject: [PATCH 0677/3477] Update other.js --- modules/other.js | 67 +++++------------------------------------------- 1 file changed, 7 insertions(+), 60 deletions(-) diff --git a/modules/other.js b/modules/other.js index 41fca4a3f..c418a85bb 100644 --- a/modules/other.js +++ b/modules/other.js @@ -664,66 +664,6 @@ function dailyBWraiding() { } -//dVoidPraid - /* function dailyPraidingvoid() { - var dVMzone = getPageSetting('dVoidMaps'); - if (game.global.world == dVMzone && getPageSetting('dVoidPraid') == true && !dprestvoid && !dfailpvoidraid) { - if (getPageSetting('AutoMaps') == 1 && !dprestvoid && !dfailpvoidraid) { - autoTrimpSettings["AutoMaps"].value = 0; - } - if (!game.global.preMapsActive && !game.global.mapsActive && !dprestvoid && !dfailpvoidraid) { - mapsClicked(); - if (!game.global.preMapsActive) { - mapsClicked(); - } - debug("Beginning Daily Prestige Raiding for Voids..."); - } - if (game.options.menu.repeatUntil.enabled!=2 && !dprestvoid && !dfailpvoidraid) { - game.options.menu.repeatUntil.enabled = 2; - } - if (game.global.preMapsActive && !dprestvoid && !dfailpvoidraid) { - plusPres(); - if ((updateMapCost(true) <= game.resources.fragments.owned)) { - buyMap(); - dfailpvoidraid = false; - dmapboughtvoid = true; - } - else if ((updateMapCost(true) > game.resources.fragments.owned)) { - if (getPageSetting('AutoMaps') == 0 && !dprestvoid) { - autoTrimpSettings["AutoMaps"].value = 1; - dfailpvoidraid = true; - dmapboughtvoid = false; - debug("Failed to Daily Prestige Raid for Voids. Looks like you can't afford to.."); - } - return; - - } - } - if (dmapboughtvoid == true) { - selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); - runMap(); - } - if (!dprestvoid && !dfailpvoidraid && !game.global.repeatMap) { - repeatClicked(); - debug("...Successfully Daily Void Prestiged!"); - } - dprestvoid = true; - dfailpvoidraid = false; - dmapboughtvoid = false; - } - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dprestvoid && !dfailpvoidraid) { - autoTrimpSettings["AutoMaps"].value = 1; - debug("Turning AutoMaps back on"); - } - if (dprestvoid == true && game.global.world !== dVMzone) { - dprestvoid = false; - dfailpvoidraid = false; - dmapboughtvoid = false; - } - -}*/ - - function heliumydaily() { if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1 && getDailyHeliumValue(countDailyWeight()) >= getPageSetting('buyheliumy') && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) { @@ -777,3 +717,10 @@ function cutoffwind() { } } +function buyshitspire() { + if (getPageSetting('spireshitbuy') == true && game.global.spireActive && game.global.world >= getPageSetting('IgnoreSpiresUntil')) { + buyWeps(); + buyArms(); + } +} + From 0eed766394505702da7da43ea31177b9a5030d15 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 15 Jul 2018 10:07:50 +0100 Subject: [PATCH 0678/3477] Update other.js --- modules/other.js | 72 ------------------------------------------------ 1 file changed, 72 deletions(-) diff --git a/modules/other.js b/modules/other.js index c418a85bb..b0bc832d0 100644 --- a/modules/other.js +++ b/modules/other.js @@ -13,16 +13,8 @@ var prestraidon = false; var dprestraidon = false; var mapbought = false; var dmapbought = false; -var failpvoidraid = false; -var dfailpvoidraid = false; -var prestvoid = false; -var dprestvoid = false; -var mapboughtvoid = false; -var dmapboughtvoid = false; var bwraidon = false; var dbwraidon = false; -// var presteps = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); -// var prebreedtimer = game.global.GeneticistassistSteps[presteps]; var presteps = null; //Activate Robo Trimp (will activate on the first zone after liquification) @@ -337,69 +329,6 @@ function BWraiding() { } -//VoidPraid - /*function Praidingvoid() { - var dailyvoidpraid = getPageSetting('DailyVoidMod'); - var VMzone = getPageSetting('VoidMaps'); - if ((game.global.challengeActive == "Daily") && (getPageSetting('AutoFinishDailyNew') != 999) && (getPageSetting('DailyVoidMod'))) { - (VMzone += dailyvoidpraid); - } - if (game.global.world == VMzone && getPageSetting('VoidPraid') == true && !prestvoid && !failpvoidraid) { - if (getPageSetting('AutoMaps') == 1 && !prestvoid && !failpvoidraid) { - autoTrimpSettings["AutoMaps"].value = 0; - } - if (!game.global.preMapsActive && !game.global.mapsActive && !prestvoid && !failpvoidraid) { - mapsClicked(); - if (!game.global.preMapsActive) { - mapsClicked(); - } - debug("Beginning Prestige Raiding for Voids..."); - } - if (game.options.menu.repeatUntil.enabled!=2 && !prestvoid && !failpvoidraid) { - game.options.menu.repeatUntil.enabled = 2; - } - if (game.global.preMapsActive && !prestvoid && !failpvoidraid) { - plusPres(); - if ((updateMapCost(true) <= game.resources.fragments.owned)) { - buyMap(); - failpvoidraid = false; - mapboughtvoid = true; - } - else if ((updateMapCost(true) > game.resources.fragments.owned)) { - if (getPageSetting('AutoMaps') == 0 && !prestvoid) { - autoTrimpSettings["AutoMaps"].value = 1; - failpvoidraid = true; - mapboughtvoid = false; - debug("Failed to prestige raid for Voids. Looks like you can't afford to.."); - } - return; - - } - } - if (mapboughtvoid == true) { - selectMap(game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id); - runMap(); - } - if (!prestvoid && !failpvoidraid && !game.global.repeatMap) { - repeatClicked(); - debug("...Successfully prestiged!"); - } - prestvoid = true; - failpvoidraid = false; - mapboughtvoid = false; - } - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestvoid && !failpvoidraid) { - autoTrimpSettings["AutoMaps"].value = 1; - debug("Turning AutoMaps back on"); - } - if (prestvoid == true && game.global.world !== VMzone) { - prestvoid = false; - failpvoidraid = false; - mapboughtvoid = false; - } - -}*/ - //AutoAllocate Looting II function lootdump() { if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { @@ -723,4 +652,3 @@ function buyshitspire() { buyArms(); } } - From 9735b2d1933d9357e97da3216a6ca21d363cec8b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 15 Jul 2018 10:07:56 +0100 Subject: [PATCH 0679/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 9e10d4252..98c6e762e 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -233,6 +233,7 @@ function mainLoop() { if (getPageSetting('fightforever')==true) fightalways(); if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); if (getPageSetting('windcutoff')>=1) cutoffwind(); + if (getPageSetting('spireshitbuy')==true) buyshitspire(); //Original From 5801f6614dfac5501fdab6b47e98f6fea6fb5a00 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 14:54:59 +0100 Subject: [PATCH 0680/3477] Combine daily+normal BWraiding Use BWraiding() for both normal and daily runs. --- AutoTrimps2.js | 7 +-- modules/other.js | 131 +++++++++++++++++++++++++---------------------- 2 files changed, 75 insertions(+), 63 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 85c92437b..5b3bb46a0 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -218,11 +218,12 @@ function mainLoop() { if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily") dailyexitSpireCell(); if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //breedtimer.js if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); //other.js - if (getPageSetting('Praidingzone').length || getPageSetting('dPraidingzone').length) PraidHarder(); + if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily" || getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") PraidHarder(); // if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) // if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) - if (getPageSetting('BWraid')==true && game.global.challengeActive != "Daily"){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) - if (getPageSetting('Dailybwraid')==true && game.global.challengeActive == "Daily"){setTimeout(dailyBWraiding(), 3000);} //BW Raiding (other.js) + if (getPageSetting('BWraid').length && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid').length && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);}; +// if (getPageSetting('BWraid')==true && game.global.challengeActive != "Daily"){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) +// if (getPageSetting('Dailybwraid')==true && game.global.challengeActive == "Daily"){setTimeout(dailyBWraiding(), 3000);} //BW Raiding (other.js) if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); //other.js if (getPageSetting('DailyBWraid')==true && dbwraidon) buyWeps(); //other.js //if (getPageSetting('VoidPraid')==true && game.global.challengeActive != "Daily") Praidingvoid(); //other.js diff --git a/modules/other.js b/modules/other.js index 1787f9437..e4b763241 100644 --- a/modules/other.js +++ b/modules/other.js @@ -319,7 +319,7 @@ function PraidHarder() { // prestraidon = false; failpraid = false; } - else if (!farmFragments || !minMaxMapCost){ + else if (!farmFragments){ failpraid = true; prestraidon = false; debug("Failed to prestige raid. Looks like you can't afford to."); @@ -365,13 +365,13 @@ function PraidHarder() { } } if (game.global.mapsActive && minMaxMapCost <= game.resources.fragments.owned && fMap) { - if (game.global.repeatClicked) { - repeatClicked(); - } prestraid = false; failpraid = false; // prestraidon = false; minMaxMapCost = null; + if (game.global.repeatClicked) { + repeatClicked(); + } if (fMap) recycleMap(fMap); fMap = null; } @@ -406,74 +406,85 @@ function relaxMapReqs(mapModifiers) { } function BWraiding() { - PraidHarder(); // To make sure we try to Praid first before BWraiding - if (!prestraidon && game.global.world == getPageSetting('BWraidingz') && !bwraided && !failbwraid && getPageSetting('BWraid')) { + var bwraidZ; + var bwraidSetting; + var bwraidMax; - if (getPageSetting('AutoMaps') == 1 && !bwraided && !failbwraid) { - autoTrimpSettings["AutoMaps"].value = 0; - } - - if (!game.global.preMapsActive && !game.global.mapsActive && !bwraided && !failbwraid) { - mapsClicked(); - - if (!game.global.preMapsActive) { - mapsClicked(); - } - } +// PraidHarder(); // To make sure we try to Praid first before BWraiding - if (game.options.menu.repeatUntil.enabled != 2 && !bwraided && !failbwraid) { - game.options.menu.repeatUntil.enabled = 2; - } + if (game.global.challengeActive == "Daily") { + bwraidZ = 'dBWraidingz'; + bwraidSetting = 'Dailybwraid'; + bwraidMax = 'dBWraidingmax'; + } + else { + bwraidZ = 'BWraidingz'; + bwraidSetting = 'BWraid'; + bwraidMax = 'BWraidingmax'; + } - if (game.global.preMapsActive && !bwraided && !failbwraid) { - selectMap(findLastBionic().id); - failbwraid = false; - debug("Beginning BW Raiding..."); - } + if (!prestraidon && game.global.world == getPageSetting(bwraidZ) && !bwraided && !failbwraid && getPageSetting(bwraidSetting)) { + if (getPageSetting('AutoMaps') == 1 && !bwraided && !failbwraid) { + autoTrimpSettings["AutoMaps"].value = 0; + } - else if (game.global.preMapsActive && !bwraided && !failbwraid) { - if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('BWraidingz') && !bwraided) { - autoTrimpSettings["AutoMaps"].value = 1; - failbwraid = true; - debug("Failed to BW raid. Looks like you don't have a BW to raid..."); - } + if (!game.global.preMapsActive && !game.global.mapsActive && !bwraided && !failbwraid) { + mapsClicked(); + if (!game.global.preMapsActive) { + mapsClicked(); + } + } - } + if (game.options.menu.repeatUntil.enabled != 2 && !bwraided && !failbwraid) { + game.options.menu.repeatUntil.enabled = 2; + } - if (findLastBionic().level <= getPageSetting('BWraidingmax') && !bwraided && !failbwraid && game.global.preMapsActive) { - runMap(); - bwraidon = true; - } + if (game.global.preMapsActive && !bwraided && !failbwraid) { + selectMap(findLastBionic().id); + failbwraid = false; + debug("Beginning BW Raiding..."); + } - if (!game.global.repeatMap && !bwraided && !failbwraid && game.global.mapsActive) { - repeatClicked(); - } + else if (game.global.preMapsActive && !bwraided && !failbwraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting(bwraidZ) && !bwraided) { + autoTrimpSettings["AutoMaps"].value = 1; + failbwraid = true; + debug("Failed to BW raid. Looks like you don't have a BW to raid..."); + } + } - if (findLastBionic().level > getPageSetting('BWraidingmax') && !bwraided && !failbwraid) { - bwraided = true; - failbwraid = false; - bwraidon = false; - debug("...Successfully BW raided!"); - } + if (findLastBionic().level <= getPageSetting(bwraidMax) && !bwraided && !failbwraid && game.global.preMapsActive) { + runMap(); + bwraidon = true; + } - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('BWraidingz') && bwraided && !failbwraid) { - autoTrimpSettings["AutoMaps"].value = 1; - debug("Turning AutoMaps back on"); - } + if (!game.global.repeatMap && !bwraided && !failbwraid && game.global.mapsActive) { + repeatClicked(); + } - } + if (findLastBionic().level > getPageSetting(bwraidMax) && !bwraided && !failbwraid) { + bwraided = true; + failbwraid = false; + bwraidon = false; + debug("...Successfully BW raided!"); + } - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && bwraided && !failbwraid) { - autoTrimpSettings["AutoMaps"].value = 1; - debug("Turning AutoMaps back on"); - } + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting(bwraidZ) && bwraided && !failbwraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); + } + } - if (bwraided && !failbwraid && game.global.world !== getPageSetting('BWraidingz')) { - bwraided = false; - failbwraid = false; - bwraidon = false; - } + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && bwraided && !failbwraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); + } + if (bwraided && !failbwraid && game.global.world !== getPageSetting(bwraidZ)) { + bwraided = false; + failbwraid = false; + bwraidon = false; + } } //VoidPraid @@ -759,7 +770,7 @@ function dailyBWraiding() { } else if (game.global.preMapsActive && !dbwraided && !dfailbwraid) { - if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('BWraidingz') && !dbwraided) { + if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('dBWraidingz') && !dbwraided) { autoTrimpSettings["AutoMaps"].value = 1; dfailbwraid = true; debug("Failed to Daily BW raid. Looks like you don't have a BW to raid..."); From ec9b6320ee92c4066530a92fbf424175352fa684 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 14:58:34 +0100 Subject: [PATCH 0681/3477] BWraiding tweak --- AutoTrimps2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 5b3bb46a0..95ee6fe54 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -224,8 +224,8 @@ function mainLoop() { if (getPageSetting('BWraid').length && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid').length && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);}; // if (getPageSetting('BWraid')==true && game.global.challengeActive != "Daily"){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) // if (getPageSetting('Dailybwraid')==true && game.global.challengeActive == "Daily"){setTimeout(dailyBWraiding(), 3000);} //BW Raiding (other.js) - if (getPageSetting('BWraid')==true && bwraidon) buyWeps(); //other.js - if (getPageSetting('DailyBWraid')==true && dbwraidon) buyWeps(); //other.js + if ((getPageSetting('BWraid') || getPageSetting('DailyBWraid'))&& bwraidon) buyWeps(); //other.js +// if (getPageSetting('DailyBWraid')==true && bwraidon) buyWeps(); //other.js //if (getPageSetting('VoidPraid')==true && game.global.challengeActive != "Daily") Praidingvoid(); //other.js //if (getPageSetting('dVoidPraid')==true && game.global.challengeActive == "Daily") dailyPraidingvoid(); //other.js if (getPageSetting('ForceAbandon')==true) trimpcide(); //other.js From 278553dc7d82adebbdb9779553600407dd699198 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 15:18:24 +0100 Subject: [PATCH 0682/3477] PraidHarder fixing --- modules/other.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index e4b763241..cb3e4f5b3 100644 --- a/modules/other.js +++ b/modules/other.js @@ -375,11 +375,14 @@ function PraidHarder() { if (fMap) recycleMap(fMap); fMap = null; } - if (game.global.preMapsActive && prestraid && !failpraid && !minMaxMapCost) { + if (game.global.preMapsActive && prestraid && !failpraid && !minMaxMapCost && pMap) { prestraidon = false; autoTrimpSettings['AutoMaps'].value = 1; debug("Prestige raiding successful! - recycling Praid map"); - if (pMap) recycleMap(pMap); + if (pMap) { + recycleMap(pMap); + pMap = null; + } debug("Turning AutoMaps back on"); } if (!getPageSetting(praidSetting).includes(game.global.world)) { From ef8b877c6de5daee3166274f8a4c54d098e737dc Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 15:36:57 +0100 Subject: [PATCH 0683/3477] Check pMap exists before recycling --- modules/other.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index cb3e4f5b3..233c3abd3 100644 --- a/modules/other.js +++ b/modules/other.js @@ -375,14 +375,14 @@ function PraidHarder() { if (fMap) recycleMap(fMap); fMap = null; } - if (game.global.preMapsActive && prestraid && !failpraid && !minMaxMapCost && pMap) { + if (game.global.preMapsActive && prestraid && !failpraid && !minMaxMapCost && pMap && game.global.mapsOwnedArray[pMap]) { prestraidon = false; autoTrimpSettings['AutoMaps'].value = 1; debug("Prestige raiding successful! - recycling Praid map"); - if (pMap) { +// if (pMap && game.global.mapsOwnedArray[pMap]) { recycleMap(pMap); pMap = null; - } +// } debug("Turning AutoMaps back on"); } if (!getPageSetting(praidSetting).includes(game.global.world)) { From f340d0f7ea79bcbfa9fe9b6a5a7ae383a2036fda Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 20:18:15 +0100 Subject: [PATCH 0684/3477] Rework fragment farming Fragment farming now uses a shouldFarmFrags flag. --- modules/other.js | 83 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 26 deletions(-) diff --git a/modules/other.js b/modules/other.js index 233c3abd3..3292f66dc 100644 --- a/modules/other.js +++ b/modules/other.js @@ -27,6 +27,7 @@ var presteps = null; var minMaxMapCost; var fMap; var pMap; +var shouldFarmFrags = false; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { @@ -272,26 +273,36 @@ function PraidHarder() { var maxPlusZones = 10; var mapModifiers = ["p","fa","0"]; var farmFragments = true; + // var farmAfter = true; + // Work out the max number of +map zones it's worth farming for prestige. if ((game.global.world + maxPlusZones) % 10 > 5) maxPlusZones = Math.max(maxPlusZones + (5 - (game.global.world + maxPlusZones) % 10),0); else if ((game.global.world + maxPlusZones) % 10 == 0) maxPlusZones = Math.min(5,maxPlusZones); + // Determine whether to use daily or normal run settings if (game.global.challengeActive == "Daily") praidSetting = 'dPraidingzone'; else praidSetting = 'Praidingzone'; + // If we have any Praiding zones defined... if (getPageSetting(praidSetting).length) { - if (getPageSetting(praidSetting).includes(game.global.world) && !prestraid && !failpraid) { + if (getPageSetting(praidSetting).includes(game.global.world) && !prestraid && !failpraid && !shouldFarmFrags) { debug('Beginning Praiding'); + // Initialise shouldFarmFrags to true + shouldFarmFrags = true; + // Mark that we are pretige raidingand turn off automaps to stop it interfering prestraidon = true; autoTrimpSettings["AutoMaps"].value = 0; + // Get into the preMaps screen if (!game.global.preMapsActive && !game.global.mapsActive && !prestraid) { mapsClicked(); if (!game.global.preMapsActive) mapsClicked(); } + // Set repeat for items game.options.menu.repeatUntil.enabled = 2; toggleSetting("repeatUntil", null, false, true); + // if we can farm for fragments, work out the minimum number we need to get all available prestiges if (farmFragments) { plusPres(); document.getElementById('advExtraLevelSelect').value = maxPlusZones; @@ -300,25 +311,39 @@ function PraidHarder() { document.getElementById('advSpecialSelect').value = "0"; minMaxMapCost = updateMapCost(true); } + // Set map settings to the best map for Praiding (even if we can't afford it) plusPres(); document.getElementById('advExtraLevelSelect').value = maxPlusZones; + // Iterate down through plusMaps setting until we find one we can afford for (var curPlusZones = maxPlusZones; curPlusZones >= 0; curPlusZones--) { + // If the current targeted zone has no prestiges, decrement the number of plusZones and continue if ((game.global.world + curPlusZones) % 10 == 0 || (game.global.world + curPlusZones) % 10 > 5) continue; + // Otherwise check to see if we can afford a map at the current plusZones setting document.getElementById('advExtraLevelSelect').value = curPlusZones; + // If we find a map we can afford, break out of the loop if (relaxMapReqs(mapModifiers)) break; - else if (farmFragments) mapModifiers = ["0"]; // conserve fragments if going to farm + // conserve fragments if going to farm after by selecting only maps with no special modifier + else if (farmFragments) mapModifiers = ["0"]; } + + // If we found a suitable map... if (curPlusZones >= 0) { + // ...buy it buyMap(); pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; selectMap(pMap); - if (maxPlusZones == curPlusZones) minMaxMapCost = null; - runMap(); - if (!game.global.repeatMap) repeatClicked(); + // If the map is already at the highest level with prestiges possible, set shouldFarmFrags to false + if (maxPlusZones == curPlusZones) shouldFarmFrags = false; + // Set flags to avoid rerunning this step prestraid = true; // prestraidon = false; failpraid = false; + // Set repeat on and run the map + game.global.repeatMap = true; + runMap(); + repeatClicked(true); } + // If we can't afford a map, and can't farm fragments, fail and turn automaps back on else if (!farmFragments){ failpraid = true; prestraidon = false; @@ -328,7 +353,9 @@ function PraidHarder() { } } } - if (farmFragments && minMaxMapCost && game.global.preMapsActive && prestraid && !fMap) { + // If we are in preMaps and should farm fragments... + if (farmFragments && shouldFarmFrags && game.global.preMapsActive && prestraid && !fMap) { + // Choose a fragment farming map document.getElementById("biomeAdvMapsSelect").value = "Depths"; document.getElementById('advExtraLevelSelect').value = 0; document.getElementById('advSpecialSelect').value = "fa"; @@ -337,18 +364,21 @@ function PraidHarder() { document.getElementById("sizeAdvMapsRange").value = 9; document.getElementById('advPerfectCheckbox').checked = true; document.getElementById("mapLevelInput").value = game.global.world - 1; + // Set repeat forever game.options.menu.repeatUntil.enabled = 0; toggleSetting("repeatUntil", null, false, true); + // If we can afford a pefect sliders map... if (updateMapCost(true) <= game.resources.fragments.owned) { debug("Buying perfect sliders fragment farming map"); + // ...buy the map and run it buyMap(); fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; selectMap(fMap); + game.global.repeatClicked = true; runMap(); - if (!game.global.repeatClicked) { - repeatClicked(); - } + repeatClicked(true); } + // Otherwise try to buy a map without perfect sliders else { document.getElementById('advPerfectCheckbox').checked = false; if (updateMapCost(true) <= game.resources.fragments.owned) { @@ -356,39 +386,40 @@ function PraidHarder() { buyMap(); fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; selectMap(fMap); + game.global.repeatClicked = true; runMap(); - if (!game.global.repeatClicked) { - repeatClicked(); - } + repeatClicked(true); } + // if we can't buy a map, wait until the next main loop iteration and try again else debug("Can't afford fragment farming map yet"); } } - if (game.global.mapsActive && minMaxMapCost <= game.resources.fragments.owned && fMap) { - prestraid = false; - failpraid = false; + + if (game.global.mapsActive && minMaxMapCost <= game.resources.fragments.owned && shouldFarmFrags) { // prestraidon = false; minMaxMapCost = null; - if (game.global.repeatClicked) { - repeatClicked(); - } - if (fMap) recycleMap(fMap); - fMap = null; + game.global.repeatClicked = false; + repeatClicked(true); + shouldFarmFrags = false; + prestraid = false; + failpraid = false; } - if (game.global.preMapsActive && prestraid && !failpraid && !minMaxMapCost && pMap && game.global.mapsOwnedArray[pMap]) { + if (game.global.preMapsActive && prestraid && !failpraid && !shouldFarmFrags) { prestraidon = false; - autoTrimpSettings['AutoMaps'].value = 1; debug("Prestige raiding successful! - recycling Praid map"); -// if (pMap && game.global.mapsOwnedArray[pMap]) { - recycleMap(pMap); - pMap = null; -// } + if (pMap && game.global.mapsOwnedArray[pMap]) recycleMap(pMap); + if (fMap && game.global.mapsOwnedArray[fMap]) recycleMap(fMap); + pMap = null; + fMap = null; debug("Turning AutoMaps back on"); + autoTrimpSettings['AutoMaps'].value = 1; } + if (!getPageSetting(praidSetting).includes(game.global.world)) { prestraid = false; failpraid = false; prestraidon = false; + shouldFarmFrags = false; } } From 25af57644d5b97d4a4f50017fb3cf0664a0c4300 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 20:44:01 +0100 Subject: [PATCH 0685/3477] Follow on BWraiding after Praiding --- modules/other.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/other.js b/modules/other.js index 3292f66dc..3afdce267 100644 --- a/modules/other.js +++ b/modules/other.js @@ -413,6 +413,7 @@ function PraidHarder() { fMap = null; debug("Turning AutoMaps back on"); autoTrimpSettings['AutoMaps'].value = 1; + BWraiding(); // Make sure we try to BWraid } if (!getPageSetting(praidSetting).includes(game.global.world)) { @@ -458,6 +459,7 @@ function BWraiding() { } if (!prestraidon && game.global.world == getPageSetting(bwraidZ) && !bwraided && !failbwraid && getPageSetting(bwraidSetting)) { + debug("Startig BWraiding"); if (getPageSetting('AutoMaps') == 1 && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } From 83c29722100c8a1b48d524c6c7556798ca882dd1 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 21:38:25 +0100 Subject: [PATCH 0686/3477] Wait to finish fMap before resetting flags --- modules/other.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/other.js b/modules/other.js index 3afdce267..6dde26972 100644 --- a/modules/other.js +++ b/modules/other.js @@ -295,10 +295,7 @@ function PraidHarder() { prestraidon = true; autoTrimpSettings["AutoMaps"].value = 0; // Get into the preMaps screen - if (!game.global.preMapsActive && !game.global.mapsActive && !prestraid) { - mapsClicked(); - if (!game.global.preMapsActive) mapsClicked(); - } + while (!game.global.preMapsActive) mapsClicked(); // Set repeat for items game.options.menu.repeatUntil.enabled = 2; toggleSetting("repeatUntil", null, false, true); @@ -400,9 +397,11 @@ function PraidHarder() { minMaxMapCost = null; game.global.repeatClicked = false; repeatClicked(true); - shouldFarmFrags = false; - prestraid = false; - failpraid = false; + if (game.global.preMapsActive) { + shouldFarmFrags = false; + prestraid = false; + failpraid = false; + } } if (game.global.preMapsActive && prestraid && !failpraid && !shouldFarmFrags) { prestraidon = false; @@ -464,12 +463,14 @@ function BWraiding() { autoTrimpSettings["AutoMaps"].value = 0; } - if (!game.global.preMapsActive && !game.global.mapsActive && !bwraided && !failbwraid) { - mapsClicked(); - if (!game.global.preMapsActive) { - mapsClicked(); - } - } +// if (!game.global.preMapsActive && !game.global.mapsActive && !bwraided && !failbwraid) { +// mapsClicked(); +// if (!game.global.preMapsActive) { +// mapsClicked(); +// } +// } + + while (!game.global.preMapsActive) mapsClicked(); if (game.options.menu.repeatUntil.enabled != 2 && !bwraided && !failbwraid) { game.options.menu.repeatUntil.enabled = 2; From 62fb4f3de21dd0c0ec1aaf2dc8778e14daed0d3a Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 22:11:36 +0100 Subject: [PATCH 0687/3477] PraidHarder fix --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 6dde26972..14d8005a6 100644 --- a/modules/other.js +++ b/modules/other.js @@ -394,10 +394,10 @@ function PraidHarder() { if (game.global.mapsActive && minMaxMapCost <= game.resources.fragments.owned && shouldFarmFrags) { // prestraidon = false; - minMaxMapCost = null; game.global.repeatClicked = false; repeatClicked(true); if (game.global.preMapsActive) { + minMaxMapCost = null; shouldFarmFrags = false; prestraid = false; failpraid = false; From c99d7e208f56820f9ded51eabdfbb073d5455769 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 22:48:40 +0100 Subject: [PATCH 0688/3477] Correct repeatMap property name --- modules/other.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index 14d8005a6..5755dc16d 100644 --- a/modules/other.js +++ b/modules/other.js @@ -371,7 +371,7 @@ function PraidHarder() { buyMap(); fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; selectMap(fMap); - game.global.repeatClicked = true; + game.global.repeatMap = true; runMap(); repeatClicked(true); } @@ -383,7 +383,7 @@ function PraidHarder() { buyMap(); fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; selectMap(fMap); - game.global.repeatClicked = true; + game.global.repeatMap = true; runMap(); repeatClicked(true); } @@ -394,7 +394,7 @@ function PraidHarder() { if (game.global.mapsActive && minMaxMapCost <= game.resources.fragments.owned && shouldFarmFrags) { // prestraidon = false; - game.global.repeatClicked = false; + game.global.repeatMap = false; repeatClicked(true); if (game.global.preMapsActive) { minMaxMapCost = null; From b7d6de2567e56f3a65e8f95ddb3e5fdd3081ca9a Mon Sep 17 00:00:00 2001 From: spikenslab Date: Sun, 15 Jul 2018 23:37:41 +0100 Subject: [PATCH 0689/3477] Change exit conditions for fragment farming --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 5755dc16d..36fd19294 100644 --- a/modules/other.js +++ b/modules/other.js @@ -392,7 +392,7 @@ function PraidHarder() { } } - if (game.global.mapsActive && minMaxMapCost <= game.resources.fragments.owned && shouldFarmFrags) { + if ((game.global.mapsActive || game.global.preMapsActive) && minMaxMapCost <= game.resources.fragments.owned && shouldFarmFrags) { // prestraidon = false; game.global.repeatMap = false; repeatClicked(true); From 5b1d14462452ed5184b1efce2b6b44945197a707 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 16 Jul 2018 21:44:14 +0100 Subject: [PATCH 0690/3477] Update SettingsGUI.js --- SettingsGUI.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 1c9f36dd9..ba8d8a061 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -399,14 +399,15 @@ function initializeAllSettings() { createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); + createSetting('hardcorewind', 'Hardcore Windstacking', '!!! ONLY USE IF YOU ARE A BADASS WIND FARMING PYSCHOPATH !!!Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value the zone you want to hardcore windstack. Hardcore windstacking disables buying upgrades and coords in wind. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it untill you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); - createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); //Line 2 + createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); createSetting('fightforever', 'Fight Always', 'Sends trimps to fight if they\'re not fighting, regardless of BAF.', 'boolean', 'false', null, 'Combat'); - + //Scryer From 17e3cc58746eaab88aad398bb5ca40c021837f6e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 16 Jul 2018 21:50:52 +0100 Subject: [PATCH 0691/3477] Update upgrades.js --- modules/upgrades.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/upgrades.js b/modules/upgrades.js index 25833a4e1..5ac419ee4 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -8,6 +8,7 @@ function buyUpgrades() { var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps())) continue; + if (upgrade == 'Coordination' && getPageSetting('hardcorewind') >= 1 && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= game.global.world) continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; //skip bloodlust during scientist challenges and while we have autofight enabled. From cd98e0c4c4c619a377571cced1c140317567b4ef Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 16 Jul 2018 21:54:01 +0100 Subject: [PATCH 0692/3477] Update equipment.js --- modules/equipment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/equipment.js b/modules/equipment.js index 856a9fb49..371dc974e 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -377,7 +377,7 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; - if (upgrade != "Gymystic") + if (upgrade != "Gymystic" && getPageSetting('hardcorewind') >= 1 && getPageSetting('hardcorewind') >= game.global.world && getEmpowerment() == "Wind") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); else debug('Upgrading ' + upgrade + " # " + game.upgrades[upgrade].allowed, "equips", '*upload'); From b2b2c922f4acd21bb2d11e2f0db0b39f78b9c6b7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 16 Jul 2018 22:02:25 +0100 Subject: [PATCH 0693/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 5ac419ee4..7a4ea1249 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -8,7 +8,7 @@ function buyUpgrades() { var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps())) continue; - if (upgrade == 'Coordination' && getPageSetting('hardcorewind') >= 1 && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= game.global.world) continue; + if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= game.global.world) continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; //skip bloodlust during scientist challenges and while we have autofight enabled. From fca43bb992f9417c3c6e37ad4d388da6ac0a3e72 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 16 Jul 2018 22:04:49 +0100 Subject: [PATCH 0694/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 7a4ea1249..6dc467368 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -8,7 +8,7 @@ function buyUpgrades() { var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps())) continue; - if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= game.global.world) continue; + if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; //skip bloodlust during scientist challenges and while we have autofight enabled. From 4b99f31a5c4bf258cdb3cd5d708640aac077246b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 16 Jul 2018 22:07:35 +0100 Subject: [PATCH 0695/3477] Update equipment.js --- modules/equipment.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/equipment.js b/modules/equipment.js index 371dc974e..d22ceaf6e 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -377,7 +377,8 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; - if (upgrade != "Gymystic" && getPageSetting('hardcorewind') >= 1 && getPageSetting('hardcorewind') >= game.global.world && getEmpowerment() == "Wind") + if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) return; + if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); else debug('Upgrading ' + upgrade + " # " + game.upgrades[upgrade].allowed, "equips", '*upload'); From ef59d2b2c541124c1b5c3938cb6f97faf9887ea1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 16 Jul 2018 22:10:30 +0100 Subject: [PATCH 0696/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index ba8d8a061..5f114e014 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -399,7 +399,7 @@ function initializeAllSettings() { createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); - createSetting('hardcorewind', 'Hardcore Windstacking', '!!! ONLY USE IF YOU ARE A BADASS WIND FARMING PYSCHOPATH !!!Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value the zone you want to hardcore windstack. Hardcore windstacking disables buying upgrades and coords in wind. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it untill you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); + createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PYSCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value the zone you want to hardcore windstack. Hardcore windstacking disables buying upgrades and coords in wind. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it untill you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); //Line 2 createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); From 50e168c951db1a5336bc9f67bfd93a136fb1126a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 16 Jul 2018 22:12:55 +0100 Subject: [PATCH 0697/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 98c6e762e..3ee54cc83 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,10 +61,11 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "14/07/2018", version: "v2.3.5", description: "Tinkered with BAF3 to better respect your fight settings. Added Always fight option. AS3 only in Dailys option. Option for workers in Watch and Trapper. Fixed some UI bugs. New z550+ Ratio soon (No one apart from me will probably use it but whatever) ", isNew: true}); +changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: true}); +changelogList.push({date: "14/07/2018", version: "v2.3.5", description: "Tinkered with BAF3 to better respect your fight settings. Added Always fight option. AS3 only in Dailys option. Option for workers in Watch and Trapper. Fixed some UI bugs. New z550+ Ratio soon (No one apart from me will probably use it but whatever) ", isNew: false}); changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised and Spire breed timer fixed, many thanks to Spikenslab once again. ", isNew: false}); changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). Oh, and one more thing, I removed Void praiding (and daily) due to multiple Praiding now. So if you want to raid before voids, make sure you set it!", isNew: false}); -changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation has arrived. Make sure to set your daily autoportal and voids! Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: false}); +//changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation has arrived. Make sure to set your daily autoportal and voids! Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: false}); //changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: false}); //changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: false}); //changelogList.push({date: "15/06/2018", version: "v2.2.4", description: "Ratios updated for 4.8. New z500 Ratio added, may need some fine tuning but it should work well. Multiple Prestige Raiding in works. BW Raiding now buys equipment up to your cap. Potency should now be bought correctly. ", isNew: false}); From 3f9d4f6668328f8401b4a1a1f9026684b4e2faf4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 16 Jul 2018 22:14:43 +0100 Subject: [PATCH 0698/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 5f114e014..9fa62a5e0 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -399,7 +399,7 @@ function initializeAllSettings() { createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); - createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PYSCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value the zone you want to hardcore windstack. Hardcore windstacking disables buying upgrades and coords in wind. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it untill you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); + createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PYSCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value the zone you want to hardcore windstack. Hardcore windstacking disables buying upgrades and coords in wind. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); //Line 2 createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); From dfd32018c3c914c9dcb20989b3611b135afdae49 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 16 Jul 2018 22:38:12 +0100 Subject: [PATCH 0699/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 9fa62a5e0..9a6d95553 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -399,7 +399,7 @@ function initializeAllSettings() { createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); - createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PYSCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value the zone you want to hardcore windstack. Hardcore windstacking disables buying upgrades and coords in wind. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); + createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value the zone you want to hardcore windstack. Hardcore windstacking disables buying upgrades and coords in wind. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); //Line 2 createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); From 92925745ff00355fef6206bcc687102c1349f5d9 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 09:46:18 +0100 Subject: [PATCH 0700/3477] Frag farming option, fix recycle Adds option to praid before fragment farming, fixes to pMap and fMap recycling. --- modules/other.js | 52 +++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/modules/other.js b/modules/other.js index 36fd19294..46be7bf56 100644 --- a/modules/other.js +++ b/modules/other.js @@ -1,5 +1,5 @@ MODULES["other"] = {}; -MODULES["other"].enableRoboTrimpSpam = true; //set this to false to stop Spam of "Activated Robotrimp MagnetoShriek Ability" +MODULES["other"].enableRoboTrimpSpam = true; //set this to false to stop Spam of "Activated Robotrimp MagnetoShriek Ability". var prestraid = false; var dprestraid = false; var failpraid = false; @@ -239,8 +239,8 @@ function Praiding() { } } if (mapbought == true) { - pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; - selectMap(pMap); + pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1]; + selectMap(pMap.id); runMap(); } if (!prestraid && !failpraid && !game.global.repeatMap) { @@ -273,6 +273,7 @@ function PraidHarder() { var maxPlusZones = 10; var mapModifiers = ["p","fa","0"]; var farmFragments = true; + var praidBeforeFarm = false; // var farmAfter = true; // Work out the max number of +map zones it's worth farming for prestige. @@ -289,8 +290,8 @@ function PraidHarder() { if (getPageSetting(praidSetting).length) { if (getPageSetting(praidSetting).includes(game.global.world) && !prestraid && !failpraid && !shouldFarmFrags) { debug('Beginning Praiding'); - // Initialise shouldFarmFrags to true - shouldFarmFrags = true; + // Initialise shouldFarmFrags to false + shouldFarmFrags = false; // Mark that we are pretige raidingand turn off automaps to stop it interfering prestraidon = true; autoTrimpSettings["AutoMaps"].value = 0; @@ -307,6 +308,18 @@ function PraidHarder() { document.getElementById('difficultyAdvMapsRange').value = 0; document.getElementById('advSpecialSelect').value = "0"; minMaxMapCost = updateMapCost(true); + // If we are not Praiding before farming, and cannot afford a max plus map, set flags for farming + if (!praidBeforeFarm && game.resources.fragments.owned < minMaxMapCost) { + prestraid = true; + failpraid = false; + shouldFarmFrags = true; + } + } + // If we are not Praiding before farming, set flags to start farming + //if (farmFragments && !praidBeforeFarm && minMaxMapCost > game.resources.fragments.owned) { + // prestraid = true; + // failpraid = false; + // shouldFarmFrags = true; } // Set map settings to the best map for Praiding (even if we can't afford it) plusPres(); @@ -322,15 +335,15 @@ function PraidHarder() { // conserve fragments if going to farm after by selecting only maps with no special modifier else if (farmFragments) mapModifiers = ["0"]; } + // If the map is not at the highest level with prestiges possible, set shouldFarmFrags to true + if (maxPlusZones > curPlusZones) shouldFarmFrags = true; // If we found a suitable map... - if (curPlusZones >= 0) { + if (curPlusZones >= 0 && (praidBeforeFarm || shouldFarmFrags == false)) { // ...buy it buyMap(); - pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; - selectMap(pMap); - // If the map is already at the highest level with prestiges possible, set shouldFarmFrags to false - if (maxPlusZones == curPlusZones) shouldFarmFrags = false; + pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1]; + selectMap(pMap.id); // Set flags to avoid rerunning this step prestraid = true; // prestraidon = false; @@ -352,6 +365,9 @@ function PraidHarder() { } // If we are in preMaps and should farm fragments... if (farmFragments && shouldFarmFrags && game.global.preMapsActive && prestraid && !fMap) { + // Recycle any pMaps + if (pMap) recycleMap(pMap); + pMap = null; // Choose a fragment farming map document.getElementById("biomeAdvMapsSelect").value = "Depths"; document.getElementById('advExtraLevelSelect').value = 0; @@ -369,8 +385,8 @@ function PraidHarder() { debug("Buying perfect sliders fragment farming map"); // ...buy the map and run it buyMap(); - fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; - selectMap(fMap); + fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1]; + selectMap(fMap.id); game.global.repeatMap = true; runMap(); repeatClicked(true); @@ -381,8 +397,8 @@ function PraidHarder() { if (updateMapCost(true) <= game.resources.fragments.owned) { debug("Buying imperfect sliders fragment farming map"); buyMap(); - fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; - selectMap(fMap); + fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1]; + selectMap(fMap.id); game.global.repeatMap = true; runMap(); repeatClicked(true); @@ -406,8 +422,8 @@ function PraidHarder() { if (game.global.preMapsActive && prestraid && !failpraid && !shouldFarmFrags) { prestraidon = false; debug("Prestige raiding successful! - recycling Praid map"); - if (pMap && game.global.mapsOwnedArray[pMap]) recycleMap(pMap); - if (fMap && game.global.mapsOwnedArray[fMap]) recycleMap(fMap); + if (pMap) recycleMap(pMap); + if (fMap) recycleMap(fMap); pMap = null; fMap = null; debug("Turning AutoMaps back on"); @@ -751,8 +767,8 @@ function dailyPraiding() { } } if (dmapbought == true) { - dpMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; - selectMap(dpMap); + dpMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1]; + selectMap(dpMap.id); runMap(); } if (!dprestraid && !dfailpraid && !game.global.repeatMap) { From d8591afc73c845138de31c12240c7e5f8d0ccd97 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 09:50:23 +0100 Subject: [PATCH 0701/3477] Remove rogue closing brace --- modules/other.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/other.js b/modules/other.js index 46be7bf56..d2463455b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -315,12 +315,6 @@ function PraidHarder() { shouldFarmFrags = true; } } - // If we are not Praiding before farming, set flags to start farming - //if (farmFragments && !praidBeforeFarm && minMaxMapCost > game.resources.fragments.owned) { - // prestraid = true; - // failpraid = false; - // shouldFarmFrags = true; - } // Set map settings to the best map for Praiding (even if we can't afford it) plusPres(); document.getElementById('advExtraLevelSelect').value = maxPlusZones; From 286248b3d13019969837af2d273ed4f5c4f6b1fb Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 10:01:01 +0100 Subject: [PATCH 0702/3477] Further map recycle fix --- modules/other.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/other.js b/modules/other.js index d2463455b..3ceb34230 100644 --- a/modules/other.js +++ b/modules/other.js @@ -239,8 +239,8 @@ function Praiding() { } } if (mapbought == true) { - pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1]; - selectMap(pMap.id); + pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; + selectMap(pMap); runMap(); } if (!prestraid && !failpraid && !game.global.repeatMap) { @@ -256,7 +256,7 @@ function Praiding() { if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Prestige raiding successfull! - recycling Praid map"); - recycleMap(pMap); + recycleMap(getMapIndex(pMap)); debug("Turning AutoMaps back on"); } if (getPageSetting('Praidingzone').every(isBelowThreshold)) { @@ -336,8 +336,8 @@ function PraidHarder() { if (curPlusZones >= 0 && (praidBeforeFarm || shouldFarmFrags == false)) { // ...buy it buyMap(); - pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1]; - selectMap(pMap.id); + pMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; + selectMap(pMap); // Set flags to avoid rerunning this step prestraid = true; // prestraidon = false; @@ -360,7 +360,7 @@ function PraidHarder() { // If we are in preMaps and should farm fragments... if (farmFragments && shouldFarmFrags && game.global.preMapsActive && prestraid && !fMap) { // Recycle any pMaps - if (pMap) recycleMap(pMap); + if (pMap) recycleMap(getMapIndex(pMap)); pMap = null; // Choose a fragment farming map document.getElementById("biomeAdvMapsSelect").value = "Depths"; @@ -379,8 +379,8 @@ function PraidHarder() { debug("Buying perfect sliders fragment farming map"); // ...buy the map and run it buyMap(); - fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1]; - selectMap(fMap.id); + fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; + selectMap(fMap); game.global.repeatMap = true; runMap(); repeatClicked(true); @@ -391,8 +391,8 @@ function PraidHarder() { if (updateMapCost(true) <= game.resources.fragments.owned) { debug("Buying imperfect sliders fragment farming map"); buyMap(); - fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1]; - selectMap(fMap.id); + fMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; + selectMap(fMap); game.global.repeatMap = true; runMap(); repeatClicked(true); @@ -416,8 +416,8 @@ function PraidHarder() { if (game.global.preMapsActive && prestraid && !failpraid && !shouldFarmFrags) { prestraidon = false; debug("Prestige raiding successful! - recycling Praid map"); - if (pMap) recycleMap(pMap); - if (fMap) recycleMap(fMap); + if (pMap) recycleMap(getMapIndex(pMap)); + if (fMap) recycleMap(getMapIndex(fMap)); pMap = null; fMap = null; debug("Turning AutoMaps back on"); @@ -761,8 +761,8 @@ function dailyPraiding() { } } if (dmapbought == true) { - dpMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1]; - selectMap(dpMap.id); + dpMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; + selectMap(dpMap); runMap(); } if (!dprestraid && !dfailpraid && !game.global.repeatMap) { @@ -779,7 +779,7 @@ function dailyPraiding() { if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dprestraid && !dfailpraid) { autoTrimpSettings["AutoMaps"].value = 1; debug("Daily Prestige Raiding successfull! - recycling Praid map"); - recycleMap(dpMap); + recycleMap(getMapIndex(dpMap)); debug("Turning AutoMaps back on"); } if (getPageSetting('dPraidingzone').every(isBelowThreshold)) { From 28738a818739ac88887df0bc83c813ed97cd3838 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 11:34:00 +0100 Subject: [PATCH 0703/3477] Create settings for PraidHarder --- SettingsGUI.js | 6 ++++++ modules/other.js | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 585efc9a4..587888265 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -391,6 +391,9 @@ function initializeAllSettings() { //Line 2 createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Spire'); + createSetting('PraidHarder', 'P Raiding 2', '(EXPERIMENTAL) PRaid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Spire'); + createSetting('PraidFarmFrags', 'Farm Fragments', 'Farm fragments until we can afford the highest prestige map for P raiding','boolean',true,null,'Spire'); + createSetting('PraidBeforeFarm', 'Raid before farming', 'P Raid as far as we can afford before trying to farm fragments to Praid the highest prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Will probably be switched to a multivalue setting at some point after testing.','boolean', false, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); @@ -910,6 +913,9 @@ function updateCustomButtons() { getPageSetting('Dailybwraid')==true ? turnOn("dBWraidingz"): turnOff("dBWraidingz"); getPageSetting('Dailybwraid')==true ? turnOn("dBWraidingmax"): turnOff("dBWraidingmax"); + // Praid harder + getPageSetting('PraidHarder') ? turnOn('PraidFarmFrags') : turnOff('PraidFarmFrags'); + getPageSetting('PraidHarder') ? turnOn('PraidBeforeFarm') : turnOff('PraidBeforeFarm'); //Show and Hide useless settings to reduce UI clutter var turnonofflist = [ diff --git a/modules/other.js b/modules/other.js index 3ceb34230..24b88aaf5 100644 --- a/modules/other.js +++ b/modules/other.js @@ -272,9 +272,8 @@ function PraidHarder() { // var fMap; var maxPlusZones = 10; var mapModifiers = ["p","fa","0"]; - var farmFragments = true; - var praidBeforeFarm = false; - // var farmAfter = true; + var farmFragments = getPageSetting('PraidFarmFrags'); + var praidBeforeFarm = getPageSetting('PraidBeforeFarm'); // Work out the max number of +map zones it's worth farming for prestige. if ((game.global.world + maxPlusZones) % 10 > 5) @@ -468,7 +467,7 @@ function BWraiding() { } if (!prestraidon && game.global.world == getPageSetting(bwraidZ) && !bwraided && !failbwraid && getPageSetting(bwraidSetting)) { - debug("Startig BWraiding"); + debug("Starting BWraiding"); if (getPageSetting('AutoMaps') == 1 && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } @@ -527,7 +526,7 @@ function BWraiding() { debug("Turning AutoMaps back on"); } - if (bwraided && !failbwraid && game.global.world !== getPageSetting(bwraidZ)) { + if (bwraided && !failbwraid && game.global.world != getPageSetting(bwraidZ)) { bwraided = false; failbwraid = false; bwraidon = false; From e2840573a99fd26980f66e84ee0f82ae8e95e1ed Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 11:46:19 +0100 Subject: [PATCH 0704/3477] PraidHarder settings fix --- AutoTrimps2.js | 10 +++++++--- SettingsGUI.js | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 95ee6fe54..cef87e076 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -218,9 +218,13 @@ function mainLoop() { if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily") dailyexitSpireCell(); if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //breedtimer.js if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); //other.js - if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily" || getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") PraidHarder(); -// if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) -// if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) + if (getPageSetting('PraidHarder')) { + if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily" || getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") PraidHarder(); + } + else { + if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) + if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) + } if (getPageSetting('BWraid').length && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid').length && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);}; // if (getPageSetting('BWraid')==true && game.global.challengeActive != "Daily"){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) // if (getPageSetting('Dailybwraid')==true && game.global.challengeActive == "Daily"){setTimeout(dailyBWraiding(), 3000);} //BW Raiding (other.js) diff --git a/SettingsGUI.js b/SettingsGUI.js index 587888265..2fbc5b6b0 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -391,9 +391,9 @@ function initializeAllSettings() { //Line 2 createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Spire'); - createSetting('PraidHarder', 'P Raiding 2', '(EXPERIMENTAL) PRaid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Spire'); - createSetting('PraidFarmFrags', 'Farm Fragments', 'Farm fragments until we can afford the highest prestige map for P raiding','boolean',true,null,'Spire'); - createSetting('PraidBeforeFarm', 'Raid before farming', 'P Raid as far as we can afford before trying to farm fragments to Praid the highest prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Will probably be switched to a multivalue setting at some point after testing.','boolean', false, 'Spire'); + createSetting('PraidHarder', 'P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Spire'); + createSetting('PraidFarmFrags', 'Farm Fragments', 'P Raiding 2: Farm fragments until we can afford the highest prestige map for P raiding','boolean',true,null,'Spire'); + createSetting('PraidBeforeFarm', 'Raid before farming', 'P Raiding 2: P Raid as far as we can afford before trying to farm fragments to Praid the highest prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Will probably be switched to a multivalue setting at some point after testing.','boolean', false, null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); From 953aed59190d669d8147fcec4e5fbeb59c1f5681 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 11:58:20 +0100 Subject: [PATCH 0705/3477] Revert "Merge pull request #1 from spikenskab/testconfig" This reverts commit 0693e2306b0c4aeacc308ce5d77261cc72f683a2, reversing changes made to 70e458c7b351f86ba0b39f132dee040d98358a72. --- .user.js | 12 ++++++------ AutoTrimps2.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.user.js b/.user.js index 814ce6487..2a7663279 100644 --- a/.user.js +++ b/.user.js @@ -1,22 +1,22 @@ // ==UserScript== -// @name AutoTrimps-Zek-test +// @name AutoTrimps-Zek // @version 1.0-Zek -// @namespace https://spikenskab.github.io/AutoTrimps -// @updateURL https://spikenskab.github.io/AutoTrimps/.user.js +// @namespace https://Zorn192.github.io/AutoTrimps +// @updateURL https://Zorn192.github.io/AutoTrimps/.user.js // @description Automate all the trimps! // @author zininzinin, spindrjr, Ishkaru, genBTC, Zeker0 // @include *trimps.github.io* // @include *kongregate.com/games/GreenSatellite/trimps -// @connect *spikenskab.github.io/AutoTrimps* +// @connect *Zorn192.github.io/AutoTrimps* // @connect *trimps.github.io* // @connect self // @grant none // ==/UserScript== var script = document.createElement('script'); -script.id = 'AutoTrimps-Zek-test'; +script.id = 'AutoTrimps-Zek'; //This can be edited to point to your own Github Repository URL. -script.src = 'https://spikenskab.github.io/AutoTrimps/AutoTrimps2.js'; +script.src = 'https://Zorn192.github.io/AutoTrimps/AutoTrimps2.js'; //script.setAttribute('crossorigin',"use-credentials"); script.setAttribute('crossorigin',"anonymous"); document.head.appendChild(script); diff --git a/AutoTrimps2.js b/AutoTrimps2.js index cef87e076..dc8a01912 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -15,7 +15,7 @@ var ATversion = '2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0'; //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////// var atscript = document.getElementById('AutoTrimps-script') - , basepath = 'https://spikenskab.github.io/AutoTrimps/' + , basepath = 'https://Zorn192.github.io/AutoTrimps/' , modulepath = 'modules/' ; //This should redirect the script to wherever its being mirrored from. From f7061a261a0f4823cd602a1b15cf19f67467b859 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 17 Jul 2018 13:13:45 +0100 Subject: [PATCH 0706/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index cf02aeac3..91e31c14c 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,7 +61,7 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: true}); +changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Spike came through again with some hardcore Praiding Options, check em out while they fresh son. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: true}); changelogList.push({date: "14/07/2018", version: "v2.3.5", description: "Tinkered with BAF3 to better respect your fight settings. Added Always fight option. AS3 only in Dailys option. Option for workers in Watch and Trapper. Fixed some UI bugs. New z550+ Ratio soon (No one apart from me will probably use it but whatever) ", isNew: false}); changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised and Spire breed timer fixed, many thanks to Spikenslab once again. ", isNew: false}); changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). Oh, and one more thing, I removed Void praiding (and daily) due to multiple Praiding now. So if you want to raid before voids, make sure you set it!", isNew: false}); From 2c0eb67990c92c3949d7bd7a66cf24ccdd781e7c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 17 Jul 2018 13:17:55 +0100 Subject: [PATCH 0707/3477] Update equipment.js --- modules/equipment.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/equipment.js b/modules/equipment.js index d22ceaf6e..ec276849e 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -415,6 +415,7 @@ function autoLevelEquipment() { //If we're considering an attack item, we want to buy weapons if we don't have enough damage, or if we don't need health (so we default to buying some damage) if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { + if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) return; debug('Leveling equipment ' + eqName, "equips", '*upload3'); buyEquipment(eqName, null, true); } From 44dae3bc6c4129933c5c3af7225450ebd25c0b71 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 17 Jul 2018 13:32:22 +0100 Subject: [PATCH 0708/3477] Update SettingsGUI.js --- SettingsGUI.js | 96 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 64 insertions(+), 32 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 2b90633b2..a4d0dbc05 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -241,7 +241,8 @@ function initializeAllSettings() { //CORE: - //Line1: + + //Line 1: createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Auto Gather/Build #2', 'Science Research OFF'], 'Controls what YOU do. Manual does nothing
    The Decision between AutoGather 1 or 2 is up to you, and they should be similar. Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
    You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All Upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); @@ -250,12 +251,11 @@ function initializeAllSettings() { createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Core'); createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will purchase 1000 levels of looting II until you can no longer afford to.', 'value', -1, null, 'Core'); - //Line2 + //Line 2 createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); document.getElementById('FinishC2').parentNode.insertAdjacentHTML('afterend','
    '); - - //NewLine3 + //New Line 3 createSetting('AutoPortal', 'AutoPortal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); createSetting('HeliumHourChallenge', 'Portal Challenge', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. Do not choose a challenge if you havent unlocked it. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); document.getElementById("HeliumHourChallengeLabel").innerHTML = "Portal Challenge:"; //fit it on 1 line. @@ -272,15 +272,17 @@ function initializeAllSettings() { //Daily + + //Line 1 createSetting('AutoStartDaily', 'Auto Start Daily', 'With this on, the Auto Portal options will portal you into and auto-start the daily whenever available. Starts from the oldest available, and works forwards. Falls back to selected challenge when there are no more dailies available.', 'boolean', false, null, 'Daily'); createSetting('Dailyportal', 'Daily Autoportal', 'Portals when this zone is finished in a Daily. ', 'value', -1, null, 'Daily'); createSetting('DailyVoidMod', 'Daily Void Zone', 'What zone to do void maps in dailys. Disable with -1', 'value', -1, null, 'Daily'); createSetting('dexitspirecell', 'Daily Exit Spire Cell', 'What cell to exit spire in dailys. ', 'value', -1, null, 'Daily'); createSetting('buyheliumy', 'Buy Heliumy %', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above the value set in this setting. Recommend anything above 475. Will not buy if you cant afford to, or value is -1. ', 'value', -1, null, 'Daily'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Daily'); - //extra slot here - //Line 2 createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); + + //Line 2 createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); createSetting('use3daily', 'Use AS3 for Daily', 'Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); @@ -290,6 +292,8 @@ function initializeAllSettings() { //Buildings + + //Line 1 createSetting('BuyBuildingsNew', ['Buy Neither','Buy Buildings & Storage', 'Buy Buildings', 'Buy Storage'], 'AutoBuys Storage when it is almost full (it even anticipates Jestimp) and Non-Storage Buildings (As soon as they are available). Takes cost efficiency into account before buying Non-Storage Buildings.', 'multitoggle', 1, null, "Buildings"); //This should replace the two below createSetting('WarpstationCap', 'Warpstation Cap', 'Do not level Warpstations past Basewarp+DeltaGiga **. Without this, if a Giga wasnt available, it would level infinitely (wastes metal better spent on prestiges instead.) **The script bypasses this cap each time a new giga is bought, when it insta-buys as many as it can afford (since AT keeps available metal/gems to a low, overbuying beyond the cap to what is affordable at that first moment is not a bad thing). ', 'boolean', true, null, 'Buildings'); createSetting('WarpstationCoordBuy', 'Buy Warp to Hit Coord', 'If we are very close to hitting the next coordination, and we can afford the warpstations it takes to do it, Do it! (even if we are over the Cap/Wall). Recommended with WarpCap/WarpWall. (has no point otherwise) ', 'boolean', true, null, 'Buildings'); //Can this just be removed? if it happens, its a good thing. @@ -297,7 +301,8 @@ function initializeAllSettings() { createSetting('MaxHouse', 'Max Houses', 'Houses', 'value', '100', null, "Buildings"); createSetting('MaxMansion', 'Max Mansions', 'Mansions', 'value', '100', null, "Buildings"); createSetting('MaxHotel', 'Max Hotels', 'Hotels', 'value', '100', null, "Buildings"); - //Line2 + + //Line 2 createSetting('MaxResort', 'Max Resorts', 'Resorts', 'value', '100', null, "Buildings"); createSetting('MaxGateway', 'Max Gateways', 'WARNING: Not recommended to raise above 25', 'value', '25', null, "Buildings"); createSetting('MaxWormhole', 'Max Wormholes', 'WARNING: Wormholes cost helium! Values below 0 do nothing.', 'value', '0', null, "Buildings"); @@ -305,7 +310,8 @@ function initializeAllSettings() { createSetting('MaxGym', 'Max Gyms', 'Advanced. recommend: -1', 'value', '-1', null, "Buildings"); //Remove? createSetting('MaxTribute', 'Max Tributes', 'Advanced. recommend: -1 ', 'value', '-1', null, "Buildings"); //Remove? (More gems is never a bad thing...) createSetting('GymWall', 'Gym Wall', 'Conserves Wood. Only buys 1 Gym when you can afford X gyms wood cost (at the first one\'s price, simple math). -1 or 0 to disable. In other words, only allows gyms that cost less than 1/nth your currently owned wood. (to save wood for nurseries for new z230+ Magma nursery strategy). Takes decimal numbers. (Identical to the Warpstation wall setting which is why its called that). Setting to 1 does nothing besides stopping gyms from being bought 2 at a time due to the mastery.', 'value', -1, null, 'Buildings'); //remove? - //Line3 + + //Line 3 createSetting('FirstGigastation', 'First Gigastation', 'How many warpstations to buy before your first gigastation', 'value', '20', null, "Buildings"); createSetting('DeltaGigastation', 'Delta Gigastation', 'How many extra warpstations to buy for each gigastation. Supports decimal values. For example 2.5 will buy +2/+3/+2/+3...', 'value', '2', null, "Buildings"); createSetting('WarpstationWall3', 'Warpstation Wall', 'Conserves Metal. Only buys 1 Warpstation when you can afford X warpstations metal cost (at the first one\'s price, simple math). -1, 0, 1 = disable. In other words, only allows warps that cost less than 1/nth your currently owned metal. (to save metal for prestiges)', 'value', -1, null, 'Buildings'); @@ -315,14 +321,17 @@ function initializeAllSettings() { //Jobs + + //Line 1 createSetting('BuyJobsNew', ['Don\'t Buy Jobs','Auto Worker Ratios', 'Manual Worker Ratios'], 'Manual Worker Ratios buys jobs for your trimps according to the ratios below. Auto Worker ratios automatically changes these ratios based on current progress, overriding your ratio settings.
    AutoRatios: 1/1/1 up to 300k trimps, 3/3/5 up to 3mil trimps, then 3/1/4 above 3 mil trimps, then 1/1/10 above 1000 tributes, then 1/2/22 above 1500 tributes, then 1/12/12 above 3000 tributes.
    CAUTION: You cannot manually assign jobs with this, turn it off if you have to', 'multitoggle', 1, null, "Jobs"); createSetting('AutoMagmamancers', 'Auto Magmamancers', 'Auto Magmamancer Management. Hires Magmamancers when the Current Zone time goes over 10 minutes. Does a one-time spend of at most 10% of your gem resources. Every increment of 10 minutes after that repeats the 10% hiring process. Magmamancery mastery is accounted for, with that it hires them at 5 minutes instead of 10. Disclaimer: May negatively impact Gem count.', 'boolean', true, null, 'Jobs'); createSetting('FarmerRatio', 'Farmer Ratio', '', 'value', '1', null, "Jobs"); //realistically gems are not that useful by the time you have magmamancers... maybe just set it to only spend 50% of your gems at a time and leave it at that? 10% is kinda low anyway createSetting('LumberjackRatio', 'Lumberjack Ratio', '', 'value', '1', null, "Jobs"); createSetting('MinerRatio', 'Miner Ratio', '', 'value', '1', null, "Jobs"); createSetting('MaxScientists', 'Max Scientists', 'Advanced. Cap your scientists (This is an absolute number not a ratio). recommend: -1 (infinite still controls itself)', 'value', '-1', null, "Jobs"); - //Line2 createSetting('MaxExplorers', 'Max Explorers', 'Advanced. Cap your explorers (This is an absolute number not a ratio). recommend: -1', 'value', '-1', null, "Jobs"); //Explorers are important now! outdated setting tbh + + //Line 2 createSetting('MaxTrainers', 'Max Trainers', 'Advanced. Cap your trainers (This is an absolute number not a ratio). recommend: -1', 'value', '-1', null, "Jobs"); //by the time that you stop needing block, food is abundant createSetting('TrainerCaptoTributes', 'Cap Trainers %', 'Only Buy a Trainer when its cost is LESS than X% of cost of a tribute. This setting can work in combination with the other one, or set the other one to -1 and this will take full control. Default: -1 (Disabled). 50% is close to the point where the cap does nothing. You can go as low as you want but recommended is 10% to 1%. (example: Trainer cost of 5001, Tribute cost of 100000, @ 5%, it would NOT buy the trainer.)', 'value', '-1', null, 'Jobs'); //this is a bit unnecessary, resource management by the script is already sufficient. createSetting('buynojobsc', 'No F/L/M in C2', 'Buys No Farmers, Lumberjacks or Miners in the C2 challenges Watch and Trapper. ', 'boolean', 'false', null, "Jobs"); @@ -330,6 +339,8 @@ function initializeAllSettings() { //GEAR: + + //Line 1 createSetting('BuyArmorNew', ['Armor: Buy Neither','Armor: Buy Both', 'Armor: Prestiges', 'Armor: Levels'], 'AutoBuys Prestiges and Levels up the most cost efficient Armor available. Gymystic buying is controlled under this setting\'s prestige option', 'multitoggle', 1, null, "Gear"); //This should replace the two below createSetting('BuyWeaponsNew', ['Weapons: Buy Neither','Weapons: Buy Both', 'Weapons: Prestiges', 'Weapons: Levels'], 'AutoBuys Prestiges and Levels up the most cost efficient Weapon available.', 'multitoggle', 1, null, "Gear"); //This should replace the two below createSetting('CapEquip2', 'Cap Equip to', 'Do not level equipment past this number. Helps stop wasting metal when the script levels-up equip High, only to prestige right after. Recommended value: earlygame 10, lategame: 100. Disable with -1 or 0. NEW: Also sub-caps to 10% of your number during liquified or overkilled(under 25sec) zones. This does not mean the script always hits the cap. Your Equip will now always be leveled to at least 2 since its the most effective level. It will only be leveled however if you dont have enoughHealth or enoughDamage. But During Spire, everything will be leveled up to the cap.
    Hidden var: MODULES[\\"equipment\\"].capDivisor = 10; //number to divide your normal cap by.', 'value', 10, null, 'Gear'); @@ -342,7 +353,8 @@ function initializeAllSettings() { id: "PrestigeBackup", name: "PrestigeBackup" }; - //Line2: + + //Line 2 createSetting('ForcePresZ', 'Force Prestige Z', 'On and after this zone is reached, always try to prestige for everything immediately, ignoring Dynamic Prestige settings and overriding that of Linear Prestige. Prestige Skip mode will exit this. Disable with -1.', 'value', -1, null, 'Gear'); createSetting('PrestigeSkip1_2', ['Prestige Skip Off','Prestige Skip 1 & 2', 'Prestige Skip 1', 'Prestige Skip 2'], 'Prestige Skip 1: If there are more than 2 Unbought Prestiges (besides Shield), ie: sitting in your upgrades window but you cant afford them, AutoMaps will not enter Prestige Mode, and/or will exit from it. The amount of unboughts can be configured with this variable MODULES[\\"maps\\"].SkipNumUnboughtPrestiges = 2;
    Prestige Skip 2: If there are 2 or fewer Unobtained Weapon Prestiges in maps, ie: there are less than 2 types to run for, AutoMaps will not enter Prestige Mode, and/or will exit from it. For users who tends to not need the last few prestiges due to resource gain not keeping up. The amount of unboughts can be configured with MODULES.maps.UnearnedPrestigesRequired. If PrestigeSkipMode is enabled, both conditions need to be reached before exiting.', 'multitoggle', 0, null, "Gear"); createSetting('DelayArmorWhenNeeded', 'Delay Armor Prestige', 'Delays buying armor prestige-upgrades during Want More Damage or Farming automap-modes, Although if you need health AND damage, it WILL buy armor prestiges tho. NOTE: Applies to Prestiges only', 'boolean', false, null, 'Gear'); @@ -352,7 +364,9 @@ function initializeAllSettings() { -//AutoMaps + VoidMaps settings: +//Maps + + //Line 1 createSetting('AutoMaps', ["Auto Maps Off","Auto Maps On","Auto Maps No Unique"], 'Automaps. The no unique setting will not run unique maps such as dimensions of anger. Recommended ON. ', 'multitoggle', 1, null, "Maps"); createSetting('DynamicSiphonology', 'Dynamic Siphonology', 'Recommended Always ON. Use the right level of siphonology based on your damage output. IE: Only uses siphonology if you are weak. With this OFF it means it ALWAYS uses the lowest siphonology map you can create. Siphonology is a perk you get at level 115-125ish, and means you receive map bonus stacks for running maps below your current zone - Up to 3 zones below (1 per perk level).', 'boolean', true, null, 'Maps'); //Should always be on? createSetting('PreferMetal', 'Prefer Metal Maps', 'Always prefer metal maps, intended for manual use, such as pre-spire farming. Remember to turn it back off after you\'re done farming!', 'boolean', false, null, 'Maps'); //rarely better tbh @@ -361,7 +375,7 @@ function initializeAllSettings() { createSetting('LowerFarmingZone', 'Lower Farming Zone', 'Lowers the zone used during Farming mode. Uses the dynamic siphonology code, to Find the minimum map level you can successfully one-shot, and uses this level for any maps done after the first 10 map stacks. The difference being it goes LOWER than what Siphonology gives you map-bonus for, but after 10 stacks you dont need bonus, you just want to do maps that you can one-shot. Goes as low as 10 below current zone if your damage is that bad, but this is extreme and indicates you should probably portal.', 'boolean', true, null, 'Maps'); createSetting('FarmWhenNomStacks7', 'Farm on >7 NOMstacks', 'Optional. If Improbability already has 5 NOMstacks, stack 30 Anticipation. If the Improbability has >7 NOMstacks on it, get +200% dmg from MapBonus. If we still cant kill it, enter Farming mode at 30 stacks, Even with DisableFarming On! (exits when we get under 10x). Farms if we hit 100 stacks in the world. If we ever hit (100) nomstacks in a map (likely a voidmap), farm, (exit the voidmap) and (prevent void from running, until situation is clear). Restarts any voidmaps if we hit 100 stacks. ', 'boolean', false, null, 'Maps'); - //Line2 + //Line 2 createSetting('CorruptionCalc', 'Corruption Farm Mode', 'Recommended. Enabling this will cause the Automaps routine to take amount of corruption in a zone into account, to decide whether it should do maps first for map bonus. ONLY in Zone 181+ (or Headstart 1,2,3 zone: 176,166,151) ', 'boolean', true, null, 'Maps'); createSetting('MaxTox', 'Max Toxicity Stacks', 'Get maximum toxicity stacks before killing the improbability in each zone 60 and above. Generally only recommended for 1 run to maximize bone portal value. This setting will revert to disabled after a successful Max-Tox run + Toxicity Autoportal.', 'boolean', false, null, 'Maps'); createSetting('VoidMaps', 'Void Maps', '0 to disable The zone at which you want all your void maps to be cleared inclusive of the zone you type. Runs them at Cell 93 by default, unless you set a decimal value indicating the cell (example: 187.75). Use odd zones on Lead.
    If Daily Void Zone Mod is active, your Finish Daily Z Mod will apply to this number when a Daily is active.', 'value', '0', null, "Maps"); @@ -373,6 +387,7 @@ function initializeAllSettings() { //Spire + //Line 1 createSetting('MaxStacksForSpire', 'Max Map Bonus for Spire', 'Get max map bonus before running the Spire.', 'boolean', false, null, 'Spire'); //Does farm before spire not cover this fairly well anyway? grabbing +1 equips would make way more difference anyway createSetting('MinutestoFarmBeforeSpire', 'Farm Before Spire', 'Farm level 200/199(or BW) maps for X minutes before continuing onto attempting Spire.
    NOTE: Set 0 to disable entirely (default).
    Setting to -1/Infinite does not work here, set a very high number instead.', 'value', '0', null, 'Spire'); @@ -381,28 +396,37 @@ function initializeAllSettings() { createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Spire'); createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Spire'); createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); - + //Line 2 - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Spire'); - createSetting('PraidHarder', 'P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Spire'); - createSetting('PraidFarmFrags', 'Farm Fragments', 'P Raiding 2: Farm fragments until we can afford the highest prestige map for P raiding','boolean',true,null,'Spire'); - createSetting('PraidBeforeFarm', 'Raid before farming', 'P Raiding 2: P Raid as far as we can afford before trying to farm fragments to Praid the highest prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Will probably be switched to a multivalue setting at some point after testing.','boolean', false, null, 'Spire'); - createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); - createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); - createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('spireshitbuy', 'Buy Gear in Spire', 'Will buy Weapons and Armor in Spire regardless of your H:D ratio. Respects your max gear level and ignore spires setting. ', 'boolean', false, null, 'Spire'); +//Raiding + + //Line 1 + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Raiding'); + createSetting('PraidHarder', 'Hardcore Praiding', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.', 'boolean', false, null, 'Raiding'); + createSetting('PraidFarmFrags', 'Farm Fragments', 'P Raiding harder: Farm fragments until we can afford the highest prestige map for P raiding', 'boolean', false, null, 'Raiding'); + createSetting('PraidBeforeFarm', 'Raid before farming', 'P Raiding harder: P Raid as far as we can afford before trying to farm fragments to Praid the highest prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Will probably be switched to a multivalue setting at some point after testing.', 'boolean', false, null, 'Raiding'); + createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Raiding'); + createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Raiding'); + createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Raiding'); + + //Line 2 + + + //Combat + //Line 1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
    BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
    BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
    BAF3 = Uses vanilla autofight.
    WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. AutoStance 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); - createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value the zone you want to hardcore windstack. Hardcore windstacking disables buying upgrades and coords in wind. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); + createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); //Line 2 createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); @@ -414,6 +438,8 @@ function initializeAllSettings() { //Scryer + + //Line 1 createSetting('UseScryerStance', 'Enable Scryer Stance', 'MASTER BUTTON Activates all other scrying settings, and overrides AutoStance when scryer conditions are met. Leave regular Autostance on while this is active. Scryer gives 2x Resources (Non-Helium/Nullifium) and a chance for Dark Essence. Once this is on, priority for Scryer decisions goes as such:
    NEVER USE, FORCE USE, OVERKILL, MIN/MAX ZONE

    NO OTHER BUTTONS WILL DO ANYTHING IF THIS IS OFF.', 'boolean', true, null, 'Scryer'); createSetting('ScryerUseWhenOverkill', 'Use When Overkill', 'Overrides the Min/Max zones. Does not override any NEVER settings. Toggles stance when we can Overkill in S, giving us double loot with no speed penalty! NOTE: This being on, and being able to overkill in S will override ALL other settings (Except never use in spire). This is a boolean logic shortcut that disregards all the other settings including Min and Max Zone. If you ONLY want to use S during Overkill, as a workaround: turn this on and Min zone: to 9999 and everything else off(red).

    This has not been optimised for double overkill, and does not always produce the intended results, if you have problems, it may be worth turning off until it can be adjusted.', 'boolean', true, null, 'Scryer'); createSetting('ScryerMinZone', 'Min Zone', 'Minimum zone to start using scryer in.(inclusive) Recommend:(60 or 181). Overkill ignores this. This needs to be On & Valid for the MAYBE option on all other Scryer settings to do anything if Overkill is off. Tip: Use 9999 to disable all Non-Overkill, Non-Force, scryer usage.', 'value', '181', null, 'Scryer'); @@ -421,7 +447,8 @@ function initializeAllSettings() { createSetting('ScryerUseinMaps2', ['Maps: NEVER','Maps: FORCE', 'Maps: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate in Void Maps
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use on Corrupteds to be on after corruption/magma.

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerUseinVoidMaps2', ['VoidMaps: NEVER','VoidMaps: FORCE', 'VoidMaps: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate in Void Maps
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use in Maps to be on, as well as use on Corrupteds (if above corruption/magma) to activate.

    Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerUseinSpire2', ['Spire: NEVER','Spire: FORCE','Spire: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate in the Spire
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use on Corrupteds to be on for corrupted enemies.

    Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); - //Line2 + + //Line 2 createSetting('ScryerSkipBoss2', ['Boss: NEVER (All Levels)','Boss: NEVER (Above VoidLevel)','Boss: MAYBE'], 'NEVER (All Levels) will NEVER use S in cell 100 of the world!!!
    NEVER (Above VoidLevel) will NEVER use S in cell 100 of the world ABOVE the zone that your void maps are set to run at (Maps).
    MAYBE treats the cell no differently to any other, Overkill and Min/Max Scryer is allowed.

    Recommend NEVER (There is little benefit to double NON-HELIUM resources and a small chance of DE).', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate against Corrupted enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Magma maps and Corrupted Voidmaps are currently classified as corrupted and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
    Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. NOTE: Use at your own risk.
    Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); @@ -431,7 +458,9 @@ function initializeAllSettings() { -// Dimensional Generator settings: +// Dimensional Generator + + //Line 1 createSetting('UseAutoGen', ['Auto Generator OFF', 'Auto Generator ON'], 'MASTER BUTTON Dynamically switch generator modes. Required for the following mode management configurations to work. The Dimensional Generator is a building unlocked in The Magma, from z230.', 'multitoggle', 0, null, 'Magma'); createSetting('AutoGen2', ['Default', 'Microtick', 'Max Cap', 'Overclock'], 'Before Z is reached, Microtick and Max Cap will switch between [Hybrid / Gain Fuel] to get EXACTLY one / FULL stacks of Capacity (not Storage) before using [Gain Mi]. Default will respect whatever you set it to and won\'t fiddle with it unless challenge overriding is on. Overclock will Gain Fuel until Z.', 'multitoggle', 2, null, 'Magma'); createSetting('AutoGen2End', 'End Early Mode Z', 'On and after Z, be done with the mode we start with and switch to the final mode. -1 to disable.', 'value', 300, null, 'Magma'); @@ -447,13 +476,13 @@ function initializeAllSettings() { -//Heirloom Settings +//Heirloom createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'Use Autoheirlooms 2. It will keep heirlooms on portal. ', 'multitoggle', 0, null, 'Heirlooms'); createSetting('AutoUpgradeHeirlooms', 'Auto Upgrade Heirlooms', 'Automatically buys the upgrades the script advises for the Equipped shield and staff, until we are out of nullifium.', 'boolean', false, null, 'Heirlooms'); -//Golden Upgrade Strategies: +//Golden createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections. Make sure vanilla setting Locking is off. ', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void"], 'Golden'); createSetting('goldStrat', 'Strategy', 'VOID ONLY: After max Void golden upgrades, alternate between buying helium and battle upgrades. Or Choose a Zone to switch over completely at (zones lower than X will buy only battle, and zones higher than X only helium). Battle can be disabled completely with the goldNoBattle button. MAX THEN HELIUM setting so you can get the perfect 60% Voids then Helium', 'dropdown', 'Max then Helium', ["Off", "Alternating", "Zone", "Max then Helium"], 'Golden'); createSetting('goldAlternating', 'GU VOID: Alternating', 'Buy a helium upgrade after X-1 battle upgrades have been purchased', 'value', '2', null, 'Golden'); @@ -462,7 +491,7 @@ function initializeAllSettings() { -// Nature settings: +//Nature createSetting('AutoNatureTokens', 'Spend Nature Tokens', 'MASTER BUTTON Automatically spend or convert nature tokens.', 'boolean', false, null, 'Nature'); createSetting('AutoPoison', 'Poison', 'Spend/convert Poison tokens', 'dropdown', 'Off', ['Off', 'Empowerment', 'Transfer', 'Convert to Wind', 'Convert to Ice', 'Convert to Both'], 'Nature'); createSetting('AutoWind', 'Wind', 'Spend/convert Wind tokens', 'dropdown', 'Off', ['Off', 'Empowerment', 'Transfer', 'Convert to Poison', 'Convert to Ice', 'Convert to Both'], 'Nature'); @@ -472,8 +501,9 @@ function initializeAllSettings() { -//Display settings: - //Subsection1Line1 +//Display + + //Line 1 createSetting('EnhanceGrids', 'Enhance Grids', 'Apply slight visual enhancements to world and map grids that highlights with drop shadow all the exotic, powerful, skeletimps and other special imps.', 'boolean', false, null, 'Display'); createSetting('EnableAFK', 'Go AFK Mode', '(Action Button). Go AFK uses a Black Screen, and suspends ALL the Trimps GUI visual update functions (updateLabels) to improve performance by not doing unnecessary stuff. This feature is primarily just a CPU and RAM saving mode. Everything will resume when you come back and press the Back button. Console debug output is also disabled. The blue color means this is not a settable setting, just a button. You can now also click the Zone # (World Info) area to go AFK now.', 'action', 'MODULES["performance"].EnableAFKMode()', null, 'Display'); document.getElementById('battleSideTitle').setAttribute('onclick','MODULES["performance"].EnableAFKMode()'); @@ -484,8 +514,9 @@ function initializeAllSettings() { -//SPAM settings: - //Subsection2Line1 +//SPAM + + //Line 1 createSetting('SpamGeneral', 'General Spam', 'General Spam = Notification Messages, Auto He/Hr', 'boolean', true, null, 'Display'); createSetting('SpamUpgrades', 'Upgrades Spam', 'Upgrades Spam', 'boolean', true, null, 'Display'); createSetting('SpamEquipment', 'Equipment Spam', 'Equipment Spam', 'boolean', true, null, 'Display'); @@ -493,14 +524,15 @@ function initializeAllSettings() { createSetting('SpamOther', 'Other Spam', 'Other Spam = mostly Better Auto Fight (disable with: MODULES[\\"fight\\"].enableDebug=false ), Trimpicide & AutoBreed/Gene Timer changes, AnalyticsID, etc - a catch all. ', 'boolean', true, null, 'Display'); createSetting('SpamBuilding', 'Building Spam', 'Building Spam = all buildings, even storage', 'boolean', false, null, 'Display'); createSetting('SpamJobs', 'Job Spam', 'Job Spam = All jobs, in scientific notation', 'boolean', false, null, 'Display'); - //Line2 + + //Line 2 createSetting('SpamGraphs', 'Starting Zone Spam', 'Disables \'Starting new Zone ###\' , RoboTrimp MagnetoShreik, and any future Graph Spam that comes from graph logs.', 'boolean', true, null, 'Display'); createSetting('SpamMagmite', 'Magmite/Magma Spam', 'Everything in Magmite Module and Buy Magmamancers', 'boolean', true, null, 'Display'); createSetting('SpamPerks', 'AutoPerks Spam', 'Everything in related to AutoPerks', 'boolean', true, null, 'Display'); -// Export/Import/Default settings +//Export/Import/Default createSetting('ImportAutoTrimps', 'Import AutoTrimps', 'Import your AutoTrimps Settings. Asks you to name it as a profile afterwards.', 'infoclick', 'ImportAutoTrimps', null, 'Import Export'); createSetting('ExportAutoTrimps', 'Export AutoTrimps', 'Export your AutoTrimps Settings as a output string text formatted in JSON.', 'infoclick', 'ExportAutoTrimps', null, 'Import Export'); createSetting('DefaultAutoTrimps', 'Reset to Default', 'Reset everything to the way it was when you first installed the script. ', 'infoclick', 'ResetDefaultSettingsProfiles', null, 'Import Export'); From 1280def325ed4f0571f36ab20a6b9915f4d69d89 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 17 Jul 2018 13:33:31 +0100 Subject: [PATCH 0709/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index a4d0dbc05..140be0de9 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -178,7 +178,8 @@ function initializeAllTabs() { createTabs("Jobs", "Jobs - Worker Settings"); createTabs("Gear", "Gear - Equipment Settings"); createTabs("Maps", "Maps - AutoMaps & VoidMaps Settings"); - createTabs("Spire", "Spire - Settings for Spires & Raiding"); + createTabs("Spire", "Spire - Settings for Spires"); + createTabs("Raiding", "Raiding - Settings for Raiding"); createTabs("Daily", "Settings for Dailys"); createTabs("Combat", "Combat & Stance Settings"); createTabs("Scryer", "Scryer Settings"); From d6a1079084bc0b3f0c65c8b7164471531f173f3a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 17 Jul 2018 13:33:53 +0100 Subject: [PATCH 0710/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 140be0de9..9d7016ba6 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -339,7 +339,7 @@ function initializeAllSettings() { -//GEAR: +//Gear //Line 1 createSetting('BuyArmorNew', ['Armor: Buy Neither','Armor: Buy Both', 'Armor: Prestiges', 'Armor: Levels'], 'AutoBuys Prestiges and Levels up the most cost efficient Armor available. Gymystic buying is controlled under this setting\'s prestige option', 'multitoggle', 1, null, "Gear"); //This should replace the two below From 4800048fa9a5d88452239fff6bce1653f7c13eb7 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 20:43:12 +0100 Subject: [PATCH 0711/3477] Initialise multiValue buttontext Sets multivalue button text on AT settings load --- SettingsGUI.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 2fbc5b6b0..c216a324a 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -983,6 +983,8 @@ function updateCustomButtons() { if (elem != null) { if (item.type == 'multitoggle') elem.textContent = item.name[item.value]; + else if (item.type == 'multiValue') + elem.textContent == item.name + ': ' + item.value.toString(); else if (item.value > -1 || item.type == 'valueNegative') elem.textContent = item.name + ': ' + prettify(item.value); else From 7431fef79d9c6dff0199a1c2b3f7f930e8bbea6f Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 20:50:06 +0100 Subject: [PATCH 0712/3477] multiValue fix --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index c216a324a..277707ce3 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -978,7 +978,7 @@ function updateCustomButtons() { //since this is a loop, make sure the Text contents of our buttons are set accurately. (after any setPageSetting) for (var setting in autoTrimpSettings) { var item = autoTrimpSettings[setting]; - if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle') { + if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle' || item.type == 'multiValue') { var elem = document.getElementById(item.id); if (elem != null) { if (item.type == 'multitoggle') From 4097c85ac2a79c69ca12402242bb640736680761 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 21:21:19 +0100 Subject: [PATCH 0713/3477] Fix typo Derp. --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 277707ce3..7febd98ca 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -984,7 +984,7 @@ function updateCustomButtons() { if (item.type == 'multitoggle') elem.textContent = item.name[item.value]; else if (item.type == 'multiValue') - elem.textContent == item.name + ': ' + item.value.toString(); + elem.textContent = item.name + ': ' + item.value.toString(); else if (item.value > -1 || item.type == 'valueNegative') elem.textContent = item.name + ': ' + prettify(item.value); else From e3f9c3e91930c8efd46e43e39e93520b22cfe72d Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 21:34:04 +0100 Subject: [PATCH 0714/3477] Prettify multiValues Use infinity symbol for -1 --- SettingsGUI.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 7febd98ca..af6e31079 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -983,8 +983,12 @@ function updateCustomButtons() { if (elem != null) { if (item.type == 'multitoggle') elem.textContent = item.name[item.value]; - else if (item.type == 'multiValue') - elem.textContent = item.name + ': ' + item.value.toString(); + else if (item.type == 'multiValue') { + if (item.value.isArray() && item.length = 1 && item[1] == -1) + elem.innerHTML = item.name + ': ' + ""; + else + elem.textContent = item.name + ': ' + item.value.toString(); + } else if (item.value > -1 || item.type == 'valueNegative') elem.textContent = item.name + ': ' + prettify(item.value); else From 05268edf1ea422a5f9079c3e00668a3e4e21a46a Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 21:38:01 +0100 Subject: [PATCH 0715/3477] Fix typo Derp again --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index af6e31079..b06333409 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -984,7 +984,7 @@ function updateCustomButtons() { if (item.type == 'multitoggle') elem.textContent = item.name[item.value]; else if (item.type == 'multiValue') { - if (item.value.isArray() && item.length = 1 && item[1] == -1) + if (item.value.isArray() && item.length == 1 && item[1] == -1) elem.innerHTML = item.name + ': ' + ""; else elem.textContent = item.name + ': ' + item.value.toString(); From 442e78027963db22cb49518c8782f68eb7f24783 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 21:41:59 +0100 Subject: [PATCH 0716/3477] Fix multiValues --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index b06333409..1a1b3a375 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -984,7 +984,7 @@ function updateCustomButtons() { if (item.type == 'multitoggle') elem.textContent = item.name[item.value]; else if (item.type == 'multiValue') { - if (item.value.isArray() && item.length == 1 && item[1] == -1) + if (Array.isArray(item.value) && item.length == 1 && item[1] == -1) elem.innerHTML = item.name + ': ' + ""; else elem.textContent = item.name + ': ' + item.value.toString(); From 4796d6bd7332bdb938e4a40a3a25afa42d5ecf5b Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 21:45:24 +0100 Subject: [PATCH 0717/3477] Fix own idiocy --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 1a1b3a375..64a73df99 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -984,7 +984,7 @@ function updateCustomButtons() { if (item.type == 'multitoggle') elem.textContent = item.name[item.value]; else if (item.type == 'multiValue') { - if (Array.isArray(item.value) && item.length == 1 && item[1] == -1) + if (Array.isArray(item.value) && item.length == 1 && item[0] == -1) elem.innerHTML = item.name + ': ' + ""; else elem.textContent = item.name + ': ' + item.value.toString(); From 38411402fe3652b5410c41c2c73708feeadac8d9 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 21:49:45 +0100 Subject: [PATCH 0718/3477] fix multivalues again --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 64a73df99..e870bb9cb 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -984,7 +984,7 @@ function updateCustomButtons() { if (item.type == 'multitoggle') elem.textContent = item.name[item.value]; else if (item.type == 'multiValue') { - if (Array.isArray(item.value) && item.length == 1 && item[0] == -1) + if (Array.isArray(item.value) && item.value.length == 1 && item.value[0] == -1) elem.innerHTML = item.name + ': ' + ""; else elem.textContent = item.name + ': ' + item.value.toString(); From f57bf1983c46be8ae75c835e2add429b8f0683d9 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 23:11:32 +0100 Subject: [PATCH 0719/3477] Finer control over PraidHarder Multivalue zone lists and separate daily controls --- AutoTrimps2.js | 4 +--- SettingsGUI.js | 22 ++++++++++++++++------ modules/other.js | 33 ++++++++++++++++++++++++++------- 3 files changed, 43 insertions(+), 16 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index cef87e076..84428e2b6 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -218,9 +218,7 @@ function mainLoop() { if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily") dailyexitSpireCell(); if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //breedtimer.js if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); //other.js - if (getPageSetting('PraidHarder')) { - if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily" || getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") PraidHarder(); - } + if (getPageSetting('PraidHarder') && getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily" || getPageSetting('PraidHarder') && getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") PraidHarder(); else { if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) diff --git a/SettingsGUI.js b/SettingsGUI.js index e870bb9cb..f52897025 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -277,7 +277,12 @@ function initializeAllSettings() { //createSetting('dVoidPraid', 'Daily Plus Maps for Voids', 'Raid Prestiges before running Void Maps in dailys. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS DAILY PRAIDING. ', 'boolean', 'false', null, 'Daily'); createSetting('dexitspirecell', 'Daily Exit Spire Cell', 'What cell to exit spire in dailys. ', 'value', -1, null, 'Daily'); createSetting('buyheliumy', 'Buy Heliumy %', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above the value set in this setting. Recommend anything above 475. Will not buy if you cant afford to, or value is -1. ', 'value', -1, null, 'Daily'); - createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Daily'); + createSetting('dPraidHarder', 'P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Spire'); + createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', [-1], null, 'Daily'); + createSetting('dMaxPraidZone', 'Daily Max P Raid Z', 'List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495','multiValue', [-1], null, 'Spire'); + createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding 2: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding','multiValue',[-1],null,'Spire'); + createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding 2: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage.','multiValue', [-1], null, 'Spire'); + //Line 2 createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); @@ -390,10 +395,11 @@ function initializeAllSettings() { createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Spire'); + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', [-1], null, 'Spire'); createSetting('PraidHarder', 'P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Spire'); - createSetting('PraidFarmFrags', 'Farm Fragments', 'P Raiding 2: Farm fragments until we can afford the highest prestige map for P raiding','boolean',true,null,'Spire'); - createSetting('PraidBeforeFarm', 'Raid before farming', 'P Raiding 2: P Raid as far as we can afford before trying to farm fragments to Praid the highest prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Will probably be switched to a multivalue setting at some point after testing.','boolean', false, null, 'Spire'); + createSetting('MaxPraidZone', 'Max P Raid Zones', 'List of maximum zones to Praid corresponding to the list specified in Praiding zones. e.g. if P raiding zones setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. If no corrsponding value, or value is invalid, defaults to 10','multiValue', [-1], null, 'Spire'); + createSetting('PraidFarmFragsZ', 'Farm Fragments Z', 'P Raiding 2: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding','multiValue',[-1],null,'Spire'); + createSetting('PraidBeforeFarmZ', 'Raid before farm Z', 'P Raiding 2: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage.','multiValue', [-1], null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); @@ -914,8 +920,12 @@ function updateCustomButtons() { getPageSetting('Dailybwraid')==true ? turnOn("dBWraidingmax"): turnOff("dBWraidingmax"); // Praid harder - getPageSetting('PraidHarder') ? turnOn('PraidFarmFrags') : turnOff('PraidFarmFrags'); - getPageSetting('PraidHarder') ? turnOn('PraidBeforeFarm') : turnOff('PraidBeforeFarm'); + getPageSetting('PraidHarder') ? turnOn('PraidFarmFragsZ') : turnOff('PraidFarmFragsZ'); + getPageSetting('PraidHarder') ? turnOn('PraidBeforeFarmZ') : turnOff('PraidBeforeFarmZ'); + getPageSetting('dPraidHarder') ? turnOn('dPraidFarmFragsZ') : turnOff('dPraidFarmFragsZ'); + getPageSetting('dPraidHarder') ? turnOn('dPraidBeforeFarmZ') : turnOff('dPraidBeforeFarmZ'); + getPageSetting('PraidHarder') ? turnOn('MaxPraidZones') : turnOff('MaxPraidZones'); + getPageSetting('dPraidHarder') ? turnOn('dMaxPraidZones') : turnOff('dMaxPraidZones'); //Show and Hide useless settings to reduce UI clutter var turnonofflist = [ diff --git a/modules/other.js b/modules/other.js index 24b88aaf5..3035387fc 100644 --- a/modules/other.js +++ b/modules/other.js @@ -270,10 +270,33 @@ function Praiding() { function PraidHarder() { // var pMap; // var fMap; - var maxPlusZones = 10; + var maxPlusZones; var mapModifiers = ["p","fa","0"]; - var farmFragments = getPageSetting('PraidFarmFrags'); - var praidBeforeFarm = getPageSetting('PraidBeforeFarm'); + var farmFragments; + var praidBeforeFarm; + var pRaidIndex; + var maxPraidZSetting; + + // Determine whether to use daily or normal run settings + if (game.global.challengeActive == "Daily") { + praidSetting = 'dPraidingzone'; + maxPraidZSetting = 'dMaxPraidZone'; + farmFragments = getPageSetting('dPraidFarmFragsZ').includes(game.global.world); + praidBeforeFarm = getPageSetting('dPraidBeforeFarmZ').includes(game.global.world); + } + else { + praidSetting = 'Praidingzone'; + maxPraidZSetting = 'MaxPraidZone'; + farmFragments = getPageSetting('PraidFarmFragsZ').includes(game.global.world); + praidBeforeFarm = getPageSetting('PraidBeforeFarmZ').includes(game.global.world); + } + + pRaidIndex = autoTrimpSettings[praidSetting].indexOf(game.global.world); + if (pRaidIndex == -1 || typeof(getSetting(maxPraidZSetting)[pRaidIndex]) === undefined) maxPlusZones = 10; + else maxPlusZones = getSetting(maxPraidZSetting)[pRaidIndex] - game.global.world; + + // Check we have a valid number for maxPlusZones + maxPlusZones = maxPlusZones > 10 ? 10 : (maxPlusZones < 0 ? 10 : maxPlusZones); // Work out the max number of +map zones it's worth farming for prestige. if ((game.global.world + maxPlusZones) % 10 > 5) @@ -281,10 +304,6 @@ function PraidHarder() { else if ((game.global.world + maxPlusZones) % 10 == 0) maxPlusZones = Math.min(5,maxPlusZones); - // Determine whether to use daily or normal run settings - if (game.global.challengeActive == "Daily") praidSetting = 'dPraidingzone'; - else praidSetting = 'Praidingzone'; - // If we have any Praiding zones defined... if (getPageSetting(praidSetting).length) { if (getPageSetting(praidSetting).includes(game.global.world) && !prestraid && !failpraid && !shouldFarmFrags) { From dbee9d5cfc419c15eac5583b38ef7fb482ebffdf Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 23:19:55 +0100 Subject: [PATCH 0720/3477] Praid multival fix --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 3035387fc..6d676920e 100644 --- a/modules/other.js +++ b/modules/other.js @@ -291,7 +291,7 @@ function PraidHarder() { praidBeforeFarm = getPageSetting('PraidBeforeFarmZ').includes(game.global.world); } - pRaidIndex = autoTrimpSettings[praidSetting].indexOf(game.global.world); + pRaidIndex = getSetting(praidSetting).indexOf(game.global.world); if (pRaidIndex == -1 || typeof(getSetting(maxPraidZSetting)[pRaidIndex]) === undefined) maxPlusZones = 10; else maxPlusZones = getSetting(maxPraidZSetting)[pRaidIndex] - game.global.world; From 9eefca0418aee671f978d362f8f27bef32f20674 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 23:23:36 +0100 Subject: [PATCH 0721/3477] Fix function name --- modules/other.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index 6d676920e..7005ee914 100644 --- a/modules/other.js +++ b/modules/other.js @@ -291,9 +291,9 @@ function PraidHarder() { praidBeforeFarm = getPageSetting('PraidBeforeFarmZ').includes(game.global.world); } - pRaidIndex = getSetting(praidSetting).indexOf(game.global.world); - if (pRaidIndex == -1 || typeof(getSetting(maxPraidZSetting)[pRaidIndex]) === undefined) maxPlusZones = 10; - else maxPlusZones = getSetting(maxPraidZSetting)[pRaidIndex] - game.global.world; + pRaidIndex = getPageSetting(praidSetting).indexOf(game.global.world); + if (pRaidIndex == -1 || typeof(getPageSetting(maxPraidZSetting)[pRaidIndex]) === undefined) maxPlusZones = 10; + else maxPlusZones = getPageSetting(maxPraidZSetting)[pRaidIndex] - game.global.world; // Check we have a valid number for maxPlusZones maxPlusZones = maxPlusZones > 10 ? 10 : (maxPlusZones < 0 ? 10 : maxPlusZones); From 87097a6ac2c5022d9f3e66a1db7c54edcd2239a9 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 23:31:46 +0100 Subject: [PATCH 0722/3477] Settings changes --- SettingsGUI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index f52897025..6189e6f4d 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -277,8 +277,8 @@ function initializeAllSettings() { //createSetting('dVoidPraid', 'Daily Plus Maps for Voids', 'Raid Prestiges before running Void Maps in dailys. I.e if voids are done at 495 this setting will prestige raid z501 equips before doing voids. DO NOT USE ON SAME ZONE AS DAILY PRAIDING. ', 'boolean', 'false', null, 'Daily'); createSetting('dexitspirecell', 'Daily Exit Spire Cell', 'What cell to exit spire in dailys. ', 'value', -1, null, 'Daily'); createSetting('buyheliumy', 'Buy Heliumy %', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above the value set in this setting. Recommend anything above 475. Will not buy if you cant afford to, or value is -1. ', 'value', -1, null, 'Daily'); - createSetting('dPraidHarder', 'P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Spire'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', [-1], null, 'Daily'); + createSetting('dPraidHarder', 'Daily P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Spire'); createSetting('dMaxPraidZone', 'Daily Max P Raid Z', 'List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495','multiValue', [-1], null, 'Spire'); createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding 2: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding','multiValue',[-1],null,'Spire'); createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding 2: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage.','multiValue', [-1], null, 'Spire'); @@ -924,8 +924,8 @@ function updateCustomButtons() { getPageSetting('PraidHarder') ? turnOn('PraidBeforeFarmZ') : turnOff('PraidBeforeFarmZ'); getPageSetting('dPraidHarder') ? turnOn('dPraidFarmFragsZ') : turnOff('dPraidFarmFragsZ'); getPageSetting('dPraidHarder') ? turnOn('dPraidBeforeFarmZ') : turnOff('dPraidBeforeFarmZ'); - getPageSetting('PraidHarder') ? turnOn('MaxPraidZones') : turnOff('MaxPraidZones'); - getPageSetting('dPraidHarder') ? turnOn('dMaxPraidZones') : turnOff('dMaxPraidZones'); + getPageSetting('PraidHarder') ? turnOn('MaxPraidZone') : turnOff('MaxPraidZone'); + getPageSetting('dPraidHarder') ? turnOn('dMaxPraidZone') : turnOff('dMaxPraidZonee'); //Show and Hide useless settings to reduce UI clutter var turnonofflist = [ From 0f7c4e34c7d6c544262c87383ded090f82777c57 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 23:50:54 +0100 Subject: [PATCH 0723/3477] Put daily Praid2 settings in the right place --- SettingsGUI.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 6189e6f4d..f6fcf42e1 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -278,10 +278,10 @@ function initializeAllSettings() { createSetting('dexitspirecell', 'Daily Exit Spire Cell', 'What cell to exit spire in dailys. ', 'value', -1, null, 'Daily'); createSetting('buyheliumy', 'Buy Heliumy %', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above the value set in this setting. Recommend anything above 475. Will not buy if you cant afford to, or value is -1. ', 'value', -1, null, 'Daily'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', [-1], null, 'Daily'); - createSetting('dPraidHarder', 'Daily P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Spire'); - createSetting('dMaxPraidZone', 'Daily Max P Raid Z', 'List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495','multiValue', [-1], null, 'Spire'); - createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding 2: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding','multiValue',[-1],null,'Spire'); - createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding 2: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage.','multiValue', [-1], null, 'Spire'); + createSetting('dPraidHarder', 'Daily P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Daily'); + createSetting('dMaxPraidZone', 'Daily Max P Raid Z', 'List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495','multiValue', [-1], null, 'Daily'); + createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding 2: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding','multiValue',[-1],null,'Daily'); + createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding 2: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage.','multiValue', [-1], null, 'Daily'); //Line 2 From aaec1237aa5214783469ca4fbb60fda1da7584d2 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Tue, 17 Jul 2018 23:54:27 +0100 Subject: [PATCH 0724/3477] Fix typo --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index f6fcf42e1..7c80aef5c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -925,7 +925,7 @@ function updateCustomButtons() { getPageSetting('dPraidHarder') ? turnOn('dPraidFarmFragsZ') : turnOff('dPraidFarmFragsZ'); getPageSetting('dPraidHarder') ? turnOn('dPraidBeforeFarmZ') : turnOff('dPraidBeforeFarmZ'); getPageSetting('PraidHarder') ? turnOn('MaxPraidZone') : turnOff('MaxPraidZone'); - getPageSetting('dPraidHarder') ? turnOn('dMaxPraidZone') : turnOff('dMaxPraidZonee'); + getPageSetting('dPraidHarder') ? turnOn('dMaxPraidZone') : turnOff('dMaxPraidZone'); //Show and Hide useless settings to reduce UI clutter var turnonofflist = [ From 2d0a08b34dab6065c9aa74471ea9a895b238a84b Mon Sep 17 00:00:00 2001 From: spikenslab Date: Wed, 18 Jul 2018 00:16:38 +0100 Subject: [PATCH 0725/3477] Expand Praid 2 settings text --- SettingsGUI.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 7c80aef5c..bf4c4bacc 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -279,9 +279,9 @@ function initializeAllSettings() { createSetting('buyheliumy', 'Buy Heliumy %', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above the value set in this setting. Recommend anything above 475. Will not buy if you cant afford to, or value is -1. ', 'value', -1, null, 'Daily'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', [-1], null, 'Daily'); createSetting('dPraidHarder', 'Daily P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Daily'); - createSetting('dMaxPraidZone', 'Daily Max P Raid Z', 'List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495','multiValue', [-1], null, 'Daily'); - createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding 2: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding','multiValue',[-1],null,'Daily'); - createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding 2: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage.','multiValue', [-1], null, 'Daily'); + createSetting('dMaxPraidZone', 'Daily Max P Raid Z', 'List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)','multiValue', [-1], null, 'Daily'); + createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding 2: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.','multiValue',[-1],null,'Daily'); + createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding 2: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Daily'); //Line 2 @@ -397,9 +397,9 @@ function initializeAllSettings() { //Line 2 createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', [-1], null, 'Spire'); createSetting('PraidHarder', 'P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Spire'); - createSetting('MaxPraidZone', 'Max P Raid Zones', 'List of maximum zones to Praid corresponding to the list specified in Praiding zones. e.g. if P raiding zones setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. If no corrsponding value, or value is invalid, defaults to 10','multiValue', [-1], null, 'Spire'); - createSetting('PraidFarmFragsZ', 'Farm Fragments Z', 'P Raiding 2: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding','multiValue',[-1],null,'Spire'); - createSetting('PraidBeforeFarmZ', 'Raid before farm Z', 'P Raiding 2: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage.','multiValue', [-1], null, 'Spire'); + createSetting('MaxPraidZone', 'Max P Raid Zones', 'List of maximum zones to Praid corresponding to the list specified in Praiding zones. e.g. if P raiding zones setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)','multiValue', [-1], null, 'Spire'); + createSetting('PraidFarmFragsZ', 'Farm Fragments Z', 'P Raiding 2: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.','multiValue',[-1],null,'Spire'); + createSetting('PraidBeforeFarmZ', 'Raid before farm Z', 'P Raiding 2: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Spire'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); From b3d3cad7705e29af489070a389c53cb1217ca5ae Mon Sep 17 00:00:00 2001 From: spikenslab Date: Wed, 18 Jul 2018 01:45:49 +0100 Subject: [PATCH 0726/3477] Fix type error --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 7005ee914..d77e31194 100644 --- a/modules/other.js +++ b/modules/other.js @@ -292,7 +292,7 @@ function PraidHarder() { } pRaidIndex = getPageSetting(praidSetting).indexOf(game.global.world); - if (pRaidIndex == -1 || typeof(getPageSetting(maxPraidZSetting)[pRaidIndex]) === undefined) maxPlusZones = 10; + if (pRaidIndex == -1 || typeof(getPageSetting(maxPraidZSetting)[pRaidIndex]) === "undefined") maxPlusZones = 10; else maxPlusZones = getPageSetting(maxPraidZSetting)[pRaidIndex] - game.global.world; // Check we have a valid number for maxPlusZones From 38d191908f0af2480cbc14931326d6284878089f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 12:38:48 +0100 Subject: [PATCH 0727/3477] Update SettingsGUI.js --- SettingsGUI.js | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index ec554239a..f7fc6b459 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -282,20 +282,15 @@ function initializeAllSettings() { createSetting('buyheliumy', 'Buy Heliumy %', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above the value set in this setting. Recommend anything above 475. Will not buy if you cant afford to, or value is -1. ', 'value', -1, null, 'Daily'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', [-1], null, 'Daily'); createSetting('dPraidHarder', 'Daily P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Daily'); + + //Line 2 createSetting('dMaxPraidZone', 'Daily Max P Raid Z', 'List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)','multiValue', [-1], null, 'Daily'); createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding 2: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.','multiValue',[-1],null,'Daily'); createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding 2: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Daily'); - - -//Line 2 createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); - - //Line 2 createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); createSetting('use3daily', 'Use AS3 for Daily', 'Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); - /*createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily'); - createSetting('DailyVoidMod', 'Daily Void Zone Mod', '', 'boolean', true, null, 'Daily');*/ @@ -407,30 +402,22 @@ function initializeAllSettings() { //Line 2 createSetting('spireshitbuy', 'Buy Gear in Spire', 'Will buy Weapons and Armor in Spire regardless of your H:D ratio. Respects your max gear level and ignore spires setting. ', 'boolean', false, null, 'Spire'); - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', [-1], null, 'Spire'); - createSetting('PraidHarder', 'P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Spire'); - createSetting('MaxPraidZone', 'Max P Raid Zones', 'List of maximum zones to Praid corresponding to the list specified in Praiding zones. e.g. if P raiding zones setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)','multiValue', [-1], null, 'Spire'); - createSetting('PraidFarmFragsZ', 'Farm Fragments Z', 'P Raiding 2: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.','multiValue',[-1],null,'Spire'); - createSetting('PraidBeforeFarmZ', 'Raid before farm Z', 'P Raiding 2: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Spire'); - createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Spire'); - createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); - createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Spire'); - + //Raiding //Line 1 - createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', -1, null, 'Raiding'); - createSetting('PraidHarder', 'Hardcore Praiding', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.', 'boolean', false, null, 'Raiding'); - createSetting('PraidFarmFrags', 'Farm Fragments', 'P Raiding harder: Farm fragments until we can afford the highest prestige map for P raiding', 'boolean', false, null, 'Raiding'); - createSetting('PraidBeforeFarm', 'Raid before farming', 'P Raiding harder: P Raid as far as we can afford before trying to farm fragments to Praid the highest prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Will probably be switched to a multivalue setting at some point after testing.', 'boolean', false, null, 'Raiding'); + createSetting('Praidingzone', 'P Raiding Z', 'Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', [-1], null, 'Raiding'); + createSetting('PraidHarder', 'Hardcore P Raiding', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.', 'boolean', false, null, 'Raiding'); + createSetting('MaxPraidZone', 'Max P Raid Zones', 'List of maximum zones to Praid corresponding to the list specified in Praiding zones. e.g. if P raiding zones setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)','multiValue', [-1], null, 'Raiding'); + createSetting('PraidFarmFragsZ', 'Farm Fragments Z', 'P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments. ', 'multiValue', [-1], null, 'Raiding'); + createSetting('PraidBeforeFarmZ', 'Raid before farm Z', 'P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Raiding'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Raiding'); - createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Raiding'); - createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Raiding'); + createSetting('BWraidingz', 'Zto BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Raiding'); //Line 2 - + createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Raiding'); @@ -445,6 +432,7 @@ function initializeAllSettings() { createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); //Line 2 + createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? From 65edd3d3aaa5118181cac8f356c246678e010097 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 12:41:26 +0100 Subject: [PATCH 0728/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index f7fc6b459..893d608ba 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -413,8 +413,8 @@ function initializeAllSettings() { createSetting('MaxPraidZone', 'Max P Raid Zones', 'List of maximum zones to Praid corresponding to the list specified in Praiding zones. e.g. if P raiding zones setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)','multiValue', [-1], null, 'Raiding'); createSetting('PraidFarmFragsZ', 'Farm Fragments Z', 'P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments. ', 'multiValue', [-1], null, 'Raiding'); createSetting('PraidBeforeFarmZ', 'Raid before farm Z', 'P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Raiding'); - createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding min/max.', 'boolean', false, null, 'Raiding'); - createSetting('BWraidingz', 'Zto BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Raiding'); + createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding Z/max.', 'boolean', false, null, 'Raiding'); + createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Raiding'); //Line 2 createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Raiding'); From 98500b883b79720332a13c4b0287d2f5ad621a2b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 12:41:52 +0100 Subject: [PATCH 0729/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 893d608ba..0794f8083 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -431,8 +431,8 @@ function initializeAllSettings() { createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); - //Line 2 + //Line 2 createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? From 753a761ca00aae51f123219f0de56979ced5ee6d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 12:47:00 +0100 Subject: [PATCH 0730/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 9389bc8ab..467105c78 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,10 +61,11 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Spike came through again with some hardcore Praiding Options, check em out while they fresh son. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: true}); +changelogList.push({date: "18/07/2018", version: "v2.4.1", description: "Updated Spikes Hardcore Praiding to include more user input. Hardcore windstacking buys equips if it lowers your attack. Ratio almost done. ", isNew: true}); +changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Spike came through again with some hardcore Praiding Options, check em out while they fresh son. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: false}); changelogList.push({date: "14/07/2018", version: "v2.3.5", description: "Tinkered with BAF3 to better respect your fight settings. Added Always fight option. AS3 only in Dailys option. Option for workers in Watch and Trapper. Fixed some UI bugs. New z550+ Ratio soon (No one apart from me will probably use it but whatever) ", isNew: false}); changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised and Spire breed timer fixed, many thanks to Spikenslab once again. ", isNew: false}); -changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). Oh, and one more thing, I removed Void praiding (and daily) due to multiple Praiding now. So if you want to raid before voids, make sure you set it!", isNew: false}); +//changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). Oh, and one more thing, I removed Void praiding (and daily) due to multiple Praiding now. So if you want to raid before voids, make sure you set it!", isNew: false}); //changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation has arrived. Make sure to set your daily autoportal and voids! Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: false}); //changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: false}); //changelogList.push({date: "15/06/2018", version: "v2.2.5", description: "After much time labouring, I have finally been able to remove the text shadow from plagued to make it more readable. Oh, and something about multi prestige raiding too. All credits go to Pinoy and Speedball. ", isNew: false}); From 5ea6e1738b1cc7034cb5e627b213f73f52f07554 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 12:56:14 +0100 Subject: [PATCH 0731/3477] Update equipment.js --- modules/equipment.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/equipment.js b/modules/equipment.js index ec276849e..1fc8adf04 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -454,3 +454,10 @@ function areWeAttackLevelCapped() { } return attack.every(evaluation => (evaluation.Factor == 0 && evaluation.Wall == true)); } + +function orangewindstack() { + if (evaluation.StatusBorder == 'orange') { + var orangeupgrade = equipmentList[equipName].Upgrade; + buyUpgrade(orangeupgrade, true, true); + } +} From 5a79965382f15791b9b570e0c4eee283091b49ff Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 13:08:00 +0100 Subject: [PATCH 0732/3477] Update equipment.js --- modules/equipment.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/equipment.js b/modules/equipment.js index 1fc8adf04..3967ede81 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -377,6 +377,11 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; + if (evaluation.StatusBorder == 'orange' && equipmentList[equipName].Stat == 'attack') { + if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { + buyUpgrade(upgrade, true, true); + } + } if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) return; if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); From 9cbdcec28493594976728ce352e12f684425dd41 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 13:17:05 +0100 Subject: [PATCH 0733/3477] Update equipment.js --- modules/equipment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/equipment.js b/modules/equipment.js index 3967ede81..02330dc6e 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -377,7 +377,7 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; - if (evaluation.StatusBorder == 'orange' && equipmentList[equipName].Stat == 'attack') { + if (game.equipment[name].level > 9 && equipmentList[equipName].Stat == 'attack') { if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { buyUpgrade(upgrade, true, true); } From 34f36763db78d8c0c042897296720a7722942beb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 13:29:26 +0100 Subject: [PATCH 0734/3477] Update equipment.js --- modules/equipment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/equipment.js b/modules/equipment.js index 02330dc6e..176776981 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -377,7 +377,7 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; - if (game.equipment[name].level > 9 && equipmentList[equipName].Stat == 'attack') { + if (game.equipment[equipName].level > 9 && equipmentList[equipName].Stat == 'attack') { if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { buyUpgrade(upgrade, true, true); } From 18256b28d2785d38ee8048da2118eab0f833e91f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 13:35:49 +0100 Subject: [PATCH 0735/3477] Update equipment.js --- modules/equipment.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 176776981..fadc0984c 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -350,6 +350,11 @@ function autoLevelEquipment() { //Code is Spaced This Way So You Can Read It: + if (game.equipment[equipName].level > 9 && equipmentList[equipName].Stat == 'attack') { + if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { + buyUpgrade(upgrade, true, true); + } + } if (evaluation.StatusBorder == 'red' && !(game.global.world < 60 && game.global.world >= 58 && MODULES["equipment"].waitTill60)) { var BuyWeaponUpgrades = ((getPageSetting('BuyWeaponsNew')==1) || (getPageSetting('BuyWeaponsNew')==2)); var BuyArmorUpgrades = ((getPageSetting('BuyArmorNew')==1) || (getPageSetting('BuyArmorNew')==2)); @@ -377,11 +382,6 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; - if (game.equipment[equipName].level > 9 && equipmentList[equipName].Stat == 'attack') { - if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { - buyUpgrade(upgrade, true, true); - } - } if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) return; if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); From 9978aa60ef03619c810102ad8fb94b58994126cc Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 13:39:23 +0100 Subject: [PATCH 0736/3477] Update equipment.js --- modules/equipment.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/equipment.js b/modules/equipment.js index fadc0984c..106e5e24f 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -352,6 +352,7 @@ function autoLevelEquipment() { //Code is Spaced This Way So You Can Read It: if (game.equipment[equipName].level > 9 && equipmentList[equipName].Stat == 'attack') { if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { + var upgrade = equipmentList[equipName].Upgrade; buyUpgrade(upgrade, true, true); } } From 931f42223f2c692eb3f5bd3e5d7fdf520c143e59 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 13:43:38 +0100 Subject: [PATCH 0737/3477] Update equipment.js --- modules/equipment.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 106e5e24f..432cc2ccd 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -350,12 +350,6 @@ function autoLevelEquipment() { //Code is Spaced This Way So You Can Read It: - if (game.equipment[equipName].level > 9 && equipmentList[equipName].Stat == 'attack') { - if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { - var upgrade = equipmentList[equipName].Upgrade; - buyUpgrade(upgrade, true, true); - } - } if (evaluation.StatusBorder == 'red' && !(game.global.world < 60 && game.global.world >= 58 && MODULES["equipment"].waitTill60)) { var BuyWeaponUpgrades = ((getPageSetting('BuyWeaponsNew')==1) || (getPageSetting('BuyWeaponsNew')==2)); var BuyArmorUpgrades = ((getPageSetting('BuyArmorNew')==1) || (getPageSetting('BuyArmorNew')==2)); @@ -383,6 +377,11 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; + if (game.equipment[equipName].level > 9 && equipmentList[equipName].Stat == 'attack') { + if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { + buyUpgrade(upgrade, true, true); + } + } if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) return; if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); From e70edb4aad568fb43cbe516efcf4b49e53e52f1a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 13:48:53 +0100 Subject: [PATCH 0738/3477] Update other.js --- modules/other.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/other.js b/modules/other.js index ec34ec8bd..e52f6d776 100644 --- a/modules/other.js +++ b/modules/other.js @@ -867,3 +867,9 @@ function buyshitspire() { buyArms(); } } + +function orangewindstack() { + if (game.equipment[equipName].level > 9 && equipmentList[equipName].Stat == 'attack' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { + buyUpgrade(upgrade, true, true); + } +} From b005f6fe7d32802f5292285a61c80cee487c0e8a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 13:51:11 +0100 Subject: [PATCH 0739/3477] Update equipment.js --- modules/equipment.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 432cc2ccd..1fc8adf04 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -377,11 +377,6 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; - if (game.equipment[equipName].level > 9 && equipmentList[equipName].Stat == 'attack') { - if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { - buyUpgrade(upgrade, true, true); - } - } if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) return; if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); From db7f4eeb12738cc9b5ab178aeb6c3adf327f57cb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 18 Jul 2018 13:51:41 +0100 Subject: [PATCH 0740/3477] Update other.js --- modules/other.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index e52f6d776..885a54087 100644 --- a/modules/other.js +++ b/modules/other.js @@ -870,6 +870,7 @@ function buyshitspire() { function orangewindstack() { if (game.equipment[equipName].level > 9 && equipmentList[equipName].Stat == 'attack' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { - buyUpgrade(upgrade, true, true); + var upgrade = equipmentList[equipName].Upgrade; + buyUpgrade(upgrade, true, true); } } From f782b10887b1698c041b1bc3312349cf2d25c954 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Wed, 18 Jul 2018 20:39:54 +0100 Subject: [PATCH 0741/3477] Robustify BWraiding handover from Praiding * Don't let Praiding or PraidHarder turn automaps back on if we are going to BWraid * Add vars to let Praid know if BWraid is going to be run and BWraid know if Praid has finished running (if it is going to). --- modules/other.js | 81 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 20 deletions(-) diff --git a/modules/other.js b/modules/other.js index 885a54087..0605588e1 100644 --- a/modules/other.js +++ b/modules/other.js @@ -20,6 +20,7 @@ var minMaxMapCost; var fMap; var pMap; var shouldFarmFrags = false; +var praidDone = false; //Activate Robo Trimp (will activate on the first zone after liquification) function autoRoboTrimp() { @@ -225,6 +226,7 @@ function Praiding() { failpraid = true; prestraidon = false; mapbought = false; + praidDone = true; debug("Failed to prestige raid. Looks like you can't afford to.."); } return; @@ -240,14 +242,16 @@ function Praiding() { } prestraid = true; failpraid = false - prestraidon = false; + // prestraidon = false; mapbought = false; } } - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && prestraid && !failpraid && prestraidon) { + praidDone = true; + prestraidon = false; autoTrimpSettings["AutoMaps"].value = 1; - debug("Prestige raiding successfull! - recycling Praid map"); + debug("Prestige raiding successful! - recycling Praid map"); recycleMap(getMapIndex(pMap)); debug("Turning AutoMaps back on"); } @@ -256,6 +260,7 @@ function Praiding() { failpraid = false; prestraidon = false; mapbought = false; + praidDone = false; } } @@ -268,17 +273,20 @@ function PraidHarder() { var praidBeforeFarm; var pRaidIndex; var maxPraidZSetting; + var isBWRaidZ; // Determine whether to use daily or normal run settings if (game.global.challengeActive == "Daily") { praidSetting = 'dPraidingzone'; maxPraidZSetting = 'dMaxPraidZone'; + isBWRaidZ = getPageSetting('dBWraidingz')==game.global.world && getPageSetting('Dailybwraid'); farmFragments = getPageSetting('dPraidFarmFragsZ').includes(game.global.world); praidBeforeFarm = getPageSetting('dPraidBeforeFarmZ').includes(game.global.world); } else { praidSetting = 'Praidingzone'; maxPraidZSetting = 'MaxPraidZone'; + isBWRaidZ = getPageSetting('BWraidingz')==game.global.world && getPageSetting('BWraid'); farmFragments = getPageSetting('PraidFarmFragsZ').includes(game.global.world); praidBeforeFarm = getPageSetting('PraidBeforeFarmZ').includes(game.global.world); } @@ -302,7 +310,7 @@ function PraidHarder() { debug('Beginning Praiding'); // Initialise shouldFarmFrags to false shouldFarmFrags = false; - // Mark that we are pretige raidingand turn off automaps to stop it interfering + // Mark that we are prestige raiding and turn off automaps to stop it interfering prestraidon = true; autoTrimpSettings["AutoMaps"].value = 0; // Get into the preMaps screen @@ -361,8 +369,20 @@ function PraidHarder() { else if (!farmFragments){ failpraid = true; prestraidon = false; + praidDone = true; debug("Failed to prestige raid. Looks like you can't afford to."); - autoTrimpSettings['AutoMaps'].value = 1; + if (isBWRaidZ) { + // resetting these out of an abundance of caution + bwraided = false; + failbwraid = false; + dbwraided = false; + dfailbwraid = false; + BWraiding(); + } + else { + debug("Turning AutoMaps back on"); + autoTrimpSettings['AutoMaps'].value = 1; + } return; } } @@ -423,16 +443,26 @@ function PraidHarder() { failpraid = false; } } - if (game.global.preMapsActive && prestraid && !failpraid && !shouldFarmFrags) { + if (game.global.preMapsActive && prestraid && !failpraid && !shouldFarmFrags && prestraidon) { prestraidon = false; + praidDone = true; debug("Prestige raiding successful! - recycling Praid map"); if (pMap) recycleMap(getMapIndex(pMap)); if (fMap) recycleMap(getMapIndex(fMap)); pMap = null; fMap = null; - debug("Turning AutoMaps back on"); - autoTrimpSettings['AutoMaps'].value = 1; - BWraiding(); // Make sure we try to BWraid + if (isBWRaidZ) { + // resetting these out of an abundance of caution + bwraided = false; + failbwraid = false; + dbwraided = false; + dfailbwraid = false; + BWraiding(); // Make sure we try to BWraid + } + else { + debug("Turning AutoMaps back on"); + autoTrimpSettings['AutoMaps'].value = 1; + } } if (!getPageSetting(praidSetting).includes(game.global.world)) { @@ -440,6 +470,7 @@ function PraidHarder() { failpraid = false; prestraidon = false; shouldFarmFrags = false; + praidDone = false; } } @@ -463,6 +494,8 @@ function BWraiding() { var bwraidZ; var bwraidSetting; var bwraidMax; + var isPraidZ; + var ispraidon; // PraidHarder(); // To make sure we try to Praid first before BWraiding @@ -470,14 +503,18 @@ function BWraiding() { bwraidZ = 'dBWraidingz'; bwraidSetting = 'Dailybwraid'; bwraidMax = 'dBWraidingmax'; + isPraidZ = getPageSetting('dPraidingzone').includes(game.global.world); + ispraidon = dprestraidon; } else { bwraidZ = 'BWraidingz'; bwraidSetting = 'BWraid'; bwraidMax = 'BWraidingmax'; + isPraidZ = getPageSetting('Praidingzone').includes(game.global.world); + ispraidon = prestraidon; } - if (!prestraidon && game.global.world == getPageSetting(bwraidZ) && !bwraided && !failbwraid && getPageSetting(bwraidSetting)) { + if ((!isPraidZ || praidDone) && !ispraidon && game.global.world == getPageSetting(bwraidZ) && !bwraided && !failbwraid && getPageSetting(bwraidSetting)) { debug("Starting BWraiding"); if (getPageSetting('AutoMaps') == 1 && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; @@ -699,8 +736,9 @@ function dailyPraiding() { if (getPageSetting('AutoMaps') == 0 && !dprestraid) { autoTrimpSettings["AutoMaps"].value = 1; dfailpraid = true; - dprestraidon = false; - dmapbought = false; + dprestraidon = false; + dmapbought = false; + praidDone = true; debug("Failed to Daily Prestige Raid. Looks like you can't afford to.."); } return; @@ -718,22 +756,25 @@ function dailyPraiding() { } dprestraid = true; dfailpraid = false; - dprestraidon = false; + // dprestraidon = false; dmapbought = false; } } - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dprestraid && !dfailpraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dprestraid && !dfailpraid && dprestraidon) { + praidDone = true; + dprestraidon = false; autoTrimpSettings["AutoMaps"].value = 1; - debug("Daily Prestige Raiding successfull! - recycling Praid map"); - recycleMap(getMapIndex(dpMap)); - debug("Turning AutoMaps back on"); + debug("Daily Prestige Raiding successful! - recycling Praid map"); + recycleMap(getMapIndex(dpMap)); + debug("Turning AutoMaps back on"); } if (getPageSetting('dPraidingzone').every(isBelowThreshold)) { dprestraid = false; - dfailpraid = false - dprestraidon = false; + dfailpraid = false + dprestraidon = false; dmapbought = false; + praidDone = false; } } @@ -871,6 +912,6 @@ function buyshitspire() { function orangewindstack() { if (game.equipment[equipName].level > 9 && equipmentList[equipName].Stat == 'attack' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { var upgrade = equipmentList[equipName].Upgrade; - buyUpgrade(upgrade, true, true); + buyUpgrade(upgrade, true, true); } } From e14aeabbae51070667512ac999a7726cb89814ad Mon Sep 17 00:00:00 2001 From: spikenslab Date: Wed, 18 Jul 2018 20:43:25 +0100 Subject: [PATCH 0742/3477] Change config files for testing --- .user.js | 8 ++++---- AutoTrimps2.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.user.js b/.user.js index 2a7663279..5da4e3d6f 100644 --- a/.user.js +++ b/.user.js @@ -1,13 +1,13 @@ // ==UserScript== // @name AutoTrimps-Zek // @version 1.0-Zek -// @namespace https://Zorn192.github.io/AutoTrimps -// @updateURL https://Zorn192.github.io/AutoTrimps/.user.js +// @namespace https://spikenskab.github.io/AutoTrimps +// @updateURL https://spikenskab.github.io/AutoTrimps/.user.js // @description Automate all the trimps! // @author zininzinin, spindrjr, Ishkaru, genBTC, Zeker0 // @include *trimps.github.io* // @include *kongregate.com/games/GreenSatellite/trimps -// @connect *Zorn192.github.io/AutoTrimps* +// @connect *spikenskab.github.io/AutoTrimps* // @connect *trimps.github.io* // @connect self // @grant none @@ -16,7 +16,7 @@ var script = document.createElement('script'); script.id = 'AutoTrimps-Zek'; //This can be edited to point to your own Github Repository URL. -script.src = 'https://Zorn192.github.io/AutoTrimps/AutoTrimps2.js'; +script.src = 'https://spikenskab.github.io/AutoTrimps/AutoTrimps2.js'; //script.setAttribute('crossorigin',"use-credentials"); script.setAttribute('crossorigin',"anonymous"); document.head.appendChild(script); diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 467105c78..b311ffe91 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -15,7 +15,7 @@ var ATversion = '2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0'; //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////// var atscript = document.getElementById('AutoTrimps-script') - , basepath = 'https://Zorn192.github.io/AutoTrimps/' + , basepath = 'https://spikenskab.github.io/AutoTrimps/' , modulepath = 'modules/' ; //This should redirect the script to wherever its being mirrored from. @@ -90,7 +90,7 @@ function printChangelog() { var footer = 'ZӘK Fork - Report any bugs/problems please!\
    Talk with the dev: ZӘK#2509 @ AutoTrimps Discord Channel\ -
    See ReadMe Or check the commit history (if you want).' +
    See ReadMe Or check the commit history (if you want).' , action = 'cancelTooltip()' , title = 'Script Update Notice
    ' + ATversion , acceptBtnText = "Thank you for playing AutoTrimps. Accept and Continue." From b636d9ee72f16be84697e40528c6efa6e1cac8df Mon Sep 17 00:00:00 2001 From: spikenslab Date: Wed, 18 Jul 2018 22:01:41 +0100 Subject: [PATCH 0743/3477] Fix my dumb BWraiding error booleans are not arrays. --- AutoTrimps2.js | 2 +- modules/other.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index b311ffe91..bb040ab45 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -225,7 +225,7 @@ function mainLoop() { if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) } - if (getPageSetting('BWraid').length && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid').length && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);}; + if (getPageSetting('BWraid') && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid') && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);}; // if (getPageSetting('BWraid')==true && game.global.challengeActive != "Daily"){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) // if (getPageSetting('Dailybwraid')==true && game.global.challengeActive == "Daily"){setTimeout(dailyBWraiding(), 3000);} //BW Raiding (other.js) if ((getPageSetting('BWraid') || getPageSetting('DailyBWraid'))&& bwraidon) buyWeps(); //other.js diff --git a/modules/other.js b/modules/other.js index 0605588e1..8ef87a777 100644 --- a/modules/other.js +++ b/modules/other.js @@ -377,7 +377,7 @@ function PraidHarder() { failbwraid = false; dbwraided = false; dfailbwraid = false; - BWraiding(); + // BWraiding(); } else { debug("Turning AutoMaps back on"); @@ -457,7 +457,7 @@ function PraidHarder() { failbwraid = false; dbwraided = false; dfailbwraid = false; - BWraiding(); // Make sure we try to BWraid + // BWraiding(); // Make sure we try to BWraid } else { debug("Turning AutoMaps back on"); From 729f03c0cf419d778e4c85fc298c6a3dbf914151 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Wed, 18 Jul 2018 22:07:38 +0100 Subject: [PATCH 0744/3477] Fix my dumb bug booleans are not arrays --- AutoTrimps2.js | 2 +- modules/other.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 467105c78..6c083d170 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -225,7 +225,7 @@ function mainLoop() { if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) } - if (getPageSetting('BWraid').length && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid').length && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);}; + if (getPageSetting('BWraid') && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid') && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);}; // if (getPageSetting('BWraid')==true && game.global.challengeActive != "Daily"){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) // if (getPageSetting('Dailybwraid')==true && game.global.challengeActive == "Daily"){setTimeout(dailyBWraiding(), 3000);} //BW Raiding (other.js) if ((getPageSetting('BWraid') || getPageSetting('DailyBWraid'))&& bwraidon) buyWeps(); //other.js diff --git a/modules/other.js b/modules/other.js index 0605588e1..8ef87a777 100644 --- a/modules/other.js +++ b/modules/other.js @@ -377,7 +377,7 @@ function PraidHarder() { failbwraid = false; dbwraided = false; dfailbwraid = false; - BWraiding(); + // BWraiding(); } else { debug("Turning AutoMaps back on"); @@ -457,7 +457,7 @@ function PraidHarder() { failbwraid = false; dbwraided = false; dfailbwraid = false; - BWraiding(); // Make sure we try to BWraid + // BWraiding(); // Make sure we try to BWraid } else { debug("Turning AutoMaps back on"); From a89124e2c0c9499f6b4c4761462b34375f8edb09 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Wed, 18 Jul 2018 22:43:56 +0100 Subject: [PATCH 0745/3477] Fix BWraiding --- modules/other.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/other.js b/modules/other.js index 8ef87a777..7915f9428 100644 --- a/modules/other.js +++ b/modules/other.js @@ -527,13 +527,13 @@ function BWraiding() { // } // } - while (!game.global.preMapsActive) mapsClicked(); + while (!game.global.preMapsActive && !bwraidon) mapsClicked(); if (game.options.menu.repeatUntil.enabled != 2 && !bwraided && !failbwraid) { game.options.menu.repeatUntil.enabled = 2; } - if (game.global.preMapsActive && !bwraided && !failbwraid) { + if (game.global.preMapsActive && !bwraided && !failbwraid && findLastBionic()) { selectMap(findLastBionic().id); failbwraid = false; debug("Beginning BW Raiding..."); @@ -563,10 +563,10 @@ function BWraiding() { debug("...Successfully BW raided!"); } - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting(bwraidZ) && bwraided && !failbwraid) { - autoTrimpSettings["AutoMaps"].value = 1; - debug("Turning AutoMaps back on"); - } + //if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting(bwraidZ) && bwraided && !failbwraid) { + // autoTrimpSettings["AutoMaps"].value = 1; + // debug("Turning AutoMaps back on"); + //} } if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && bwraided && !failbwraid) { @@ -574,7 +574,7 @@ function BWraiding() { debug("Turning AutoMaps back on"); } - if (bwraided && !failbwraid && game.global.world != getPageSetting(bwraidZ)) { + if (game.global.world != getPageSetting(bwraidZ)) { bwraided = false; failbwraid = false; bwraidon = false; From f2210aede683a39cf868bbeaf46e2ddc29bca519 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Wed, 18 Jul 2018 23:03:21 +0100 Subject: [PATCH 0746/3477] Silence BWraiding spam --- modules/other.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 7915f9428..d13a256ba 100644 --- a/modules/other.js +++ b/modules/other.js @@ -515,7 +515,6 @@ function BWraiding() { } if ((!isPraidZ || praidDone) && !ispraidon && game.global.world == getPageSetting(bwraidZ) && !bwraided && !failbwraid && getPageSetting(bwraidSetting)) { - debug("Starting BWraiding"); if (getPageSetting('AutoMaps') == 1 && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } From 04dd5d54e7cb136d14c50bd8b2ab5f183018bdc7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 10:01:21 +0100 Subject: [PATCH 0747/3477] Update SettingsGUI.js --- SettingsGUI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 0794f8083..9078a04f0 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -281,12 +281,12 @@ function initializeAllSettings() { createSetting('dexitspirecell', 'Daily Exit Spire Cell', 'What cell to exit spire in dailys. ', 'value', -1, null, 'Daily'); createSetting('buyheliumy', 'Buy Heliumy %', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above the value set in this setting. Recommend anything above 475. Will not buy if you cant afford to, or value is -1. ', 'value', -1, null, 'Daily'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', [-1], null, 'Daily'); - createSetting('dPraidHarder', 'Daily P Raiding 2', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Daily'); + createSetting('dPraidHarder', 'Daily Hardcore P Raiding', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Daily'); //Line 2 createSetting('dMaxPraidZone', 'Daily Max P Raid Z', 'List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)','multiValue', [-1], null, 'Daily'); - createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding 2: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.','multiValue',[-1],null,'Daily'); - createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding 2: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Daily'); + createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.','multiValue',[-1],null,'Daily'); + createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Daily'); createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); From 2b027afa92e2869bf9d59cfd84c32793e071cb90 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 12:06:24 +0100 Subject: [PATCH 0748/3477] Update other.js --- modules/other.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index d13a256ba..0cff5342b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -909,8 +909,18 @@ function buyshitspire() { } function orangewindstack() { - if (game.equipment[equipName].level > 9 && equipmentList[equipName].Stat == 'attack' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { - var upgrade = equipmentList[equipName].Upgrade; - buyUpgrade(upgrade, true, true); + if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { + if (game.equipment.Dagger.level > 9 && game.upgrades.Dagadder.locked == 0) + buyUpgrade('Dagadder', true, true); + if (game.equipment.Mace.level > 9 && game.upgrades.Megamace.locked == 0) + buyUpgrade('Megamace', true, true); + if (game.equipment.Polearm.level > 9 && game.upgrades.Polierarm.locked == 0) + buyUpgrade('Polierarm', true, true); + if (game.equipment.Battleaxe.level > 9 && game.upgrades.Axeidic.locked == 0) + buyUpgrade('Axeidic', true, true); + if (game.equipment.Greatsword.level > 9 && game.upgrades.Greatersword.locked == 0) + buyUpgrade('Greatersword', true, true); + if (game.equipment.Arbalest.level > 9 && game.upgrades.Harmbalest.locked == 0) + buyUpgrade('Harmbalest', true, true); } } From b0cf75115085155795a807f5444b2c004f9eedc4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 12:07:35 +0100 Subject: [PATCH 0749/3477] Update equipment.js --- modules/equipment.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 1fc8adf04..ec276849e 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -454,10 +454,3 @@ function areWeAttackLevelCapped() { } return attack.every(evaluation => (evaluation.Factor == 0 && evaluation.Wall == true)); } - -function orangewindstack() { - if (evaluation.StatusBorder == 'orange') { - var orangeupgrade = equipmentList[equipName].Upgrade; - buyUpgrade(orangeupgrade, true, true); - } -} From 7677aadb2aa1245d4f1ad441616fb1f0b6d69eae Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 12:12:39 +0100 Subject: [PATCH 0750/3477] Update other.js --- modules/other.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0cff5342b..c7c38eabb 100644 --- a/modules/other.js +++ b/modules/other.js @@ -910,17 +910,17 @@ function buyshitspire() { function orangewindstack() { if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { - if (game.equipment.Dagger.level > 9 && game.upgrades.Dagadder.locked == 0) + if (game.equipment.Dagger.level > 24 && game.upgrades.Dagadder.locked == 0) buyUpgrade('Dagadder', true, true); - if (game.equipment.Mace.level > 9 && game.upgrades.Megamace.locked == 0) + if (game.equipment.Mace.level > 24 && game.upgrades.Megamace.locked == 0) buyUpgrade('Megamace', true, true); - if (game.equipment.Polearm.level > 9 && game.upgrades.Polierarm.locked == 0) + if (game.equipment.Polearm.level > 24 && game.upgrades.Polierarm.locked == 0) buyUpgrade('Polierarm', true, true); - if (game.equipment.Battleaxe.level > 9 && game.upgrades.Axeidic.locked == 0) + if (game.equipment.Battleaxe.level > 24 && game.upgrades.Axeidic.locked == 0) buyUpgrade('Axeidic', true, true); - if (game.equipment.Greatsword.level > 9 && game.upgrades.Greatersword.locked == 0) + if (game.equipment.Greatsword.level > 24 && game.upgrades.Greatersword.locked == 0) buyUpgrade('Greatersword', true, true); - if (game.equipment.Arbalest.level > 9 && game.upgrades.Harmbalest.locked == 0) + if (game.equipment.Arbalest.level > 24 && game.upgrades.Harmbalest.locked == 0) buyUpgrade('Harmbalest', true, true); } } From 0673d5fdb13629c32cf4b82eeedb8f2a58990f69 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 12:20:10 +0100 Subject: [PATCH 0751/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 6c083d170..a87efcb86 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -226,12 +226,7 @@ function mainLoop() { if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) } if (getPageSetting('BWraid') && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid') && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);}; -// if (getPageSetting('BWraid')==true && game.global.challengeActive != "Daily"){setTimeout(BWraiding(), 3000);} //BW Raiding (other.js) -// if (getPageSetting('Dailybwraid')==true && game.global.challengeActive == "Daily"){setTimeout(dailyBWraiding(), 3000);} //BW Raiding (other.js) if ((getPageSetting('BWraid') || getPageSetting('DailyBWraid'))&& bwraidon) buyWeps(); //other.js -// if (getPageSetting('DailyBWraid')==true && bwraidon) buyWeps(); //other.js - //if (getPageSetting('VoidPraid')==true && game.global.challengeActive != "Daily") Praidingvoid(); //other.js - //if (getPageSetting('dVoidPraid')==true && game.global.challengeActive == "Daily") dailyPraidingvoid(); //other.js if (getPageSetting('ForceAbandon')==true) trimpcide(); //other.js if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); @@ -240,6 +235,7 @@ function mainLoop() { if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); if (getPageSetting('windcutoff')>=1) cutoffwind(); if (getPageSetting('spireshitbuy')==true) buyshitspire(); + if (getPageSetting('hardcorewind')==true) orangewindstack(); //Original From 902c66af273cf3fdb1715025490e6baafcc69b4d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 12:21:12 +0100 Subject: [PATCH 0752/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 9078a04f0..7b1810b12 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -429,7 +429,7 @@ function initializeAllSettings() { createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); - createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); + createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); //Line 2 From 2a4ab3c6e3d6358e4019f84dbff06c9a26d8c10e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 12:21:43 +0100 Subject: [PATCH 0753/3477] Update other.js --- modules/other.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/other.js b/modules/other.js index c7c38eabb..0cff5342b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -910,17 +910,17 @@ function buyshitspire() { function orangewindstack() { if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { - if (game.equipment.Dagger.level > 24 && game.upgrades.Dagadder.locked == 0) + if (game.equipment.Dagger.level > 9 && game.upgrades.Dagadder.locked == 0) buyUpgrade('Dagadder', true, true); - if (game.equipment.Mace.level > 24 && game.upgrades.Megamace.locked == 0) + if (game.equipment.Mace.level > 9 && game.upgrades.Megamace.locked == 0) buyUpgrade('Megamace', true, true); - if (game.equipment.Polearm.level > 24 && game.upgrades.Polierarm.locked == 0) + if (game.equipment.Polearm.level > 9 && game.upgrades.Polierarm.locked == 0) buyUpgrade('Polierarm', true, true); - if (game.equipment.Battleaxe.level > 24 && game.upgrades.Axeidic.locked == 0) + if (game.equipment.Battleaxe.level > 9 && game.upgrades.Axeidic.locked == 0) buyUpgrade('Axeidic', true, true); - if (game.equipment.Greatsword.level > 24 && game.upgrades.Greatersword.locked == 0) + if (game.equipment.Greatsword.level > 9 && game.upgrades.Greatersword.locked == 0) buyUpgrade('Greatersword', true, true); - if (game.equipment.Arbalest.level > 24 && game.upgrades.Harmbalest.locked == 0) + if (game.equipment.Arbalest.level > 9 && game.upgrades.Harmbalest.locked == 0) buyUpgrade('Harmbalest', true, true); } } From 4038aa14f4eb24775030aad648f55c66cb2f316a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 13:06:24 +0100 Subject: [PATCH 0754/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 7b1810b12..4f416c40e 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -472,10 +472,13 @@ function initializeAllSettings() { createSetting('AutoGen3', ['Gain Mi', 'Gain Fuel', 'Hybrid'], 'Mode to use after Z / SupplyEnd.', 'multitoggle', 1, null, 'Magma'); createSetting('AutoGenDC', ['Daily: Normal', 'Daily: Fuel', 'Daily: Hybrid'], 'Use a special mode in dailies to make the most out of it. Overrides AutoGen3 unless Strong Override is on.', 'multitoggle', 1, null, 'Magma'); createSetting('AutoGenC2', ['c2: Normal', 'c2: Fuel', 'c2: Hybrid'], 'Use a special mode when running challenge2s to make the most out of it. Overrides AutoGen3 unless Strong Override is on.', 'multitoggle', 1, null, 'Magma'); + + //Line 2 createSetting('AutoGen2Override', ['Override Final Only', 'Strong Override'], 'Overrides apply to the final mode (always use early mode), or also to early mode (will stop microtick etc). Normal will not change anything.', 'multitoggle', 1, null, 'Magma'); createSetting('AutoMagmiteSpender2', ['Spend Magmite OFF', 'Spend Magmite (Portal)', 'Spend Magmite Always'], 'Auto Spends any unspent Magmite immediately before portaling. (Or Always, if toggled). Part 1 buys any permanent one-and-done upgrades in order from most expensive to least. Part 2 then analyzes Efficiency vs Capacity for cost/benefit, and buys Efficiency if its BETTER than Capacity. If not, if the PRICE of Capacity is less than the price of Supply, it buys Capacity. If not, it buys Supply. And then it repeats itself until you run out of Magmite and cant buy anymore. For Magma z230+ purposes.', 'multitoggle', 1, null, 'Magma'); createSetting('SupplyWall', 'Throttle Supply (or Capacity)', 'Positive number NOT 1 e.g. 2.5: Consider Supply when its cost * 2.5 is < Capacity, instead of immediately when < Cap. Effectively throttles supply for when you don\'t need too many.

    Negative number (-1 is ok) e.g. -2.5: Consider Supply if it costs < Capacity * 2.5, buy more supplys! Effectively throttling capacity instead.

    Set to 1: DISABLE SUPPLY only spend magmite on Efficiency, Capacity and Overclocker. (For some end game players, supply is worth probably figuratively nothing.)
    Set to 0: IGNORE SETTING and use old behaviour (will still try to buy overclocker)    ', 'valueNegative', 2, null, 'Magma'); createSetting('BuyOneTimeOC', ['Buy OneTime Only (No OC)', 'Maybe Buy OneTime & OC', 'Maybe Buy OneTime (No OC)', 'Buy OneTime & OC Only'], 'Buy OneTime Only (No OC) = ONLY BUYS ONE TIME UPGRADES, NOTHING ELSE.
    Maybe Buy OneTime & OC = Normal spending, will consider Overclocker and One Time Upgrades
    Maybe Buy OneTime (No OC) = Normal Spending, but will NOT Buy Overclocker (Will still buy the first level if you don\'t have it).
    Buy OneTime & OC Only = Will Force spend magmite on these two only, ignoring Efficiency, Capacity and Supply.
    Recommend Default (Maybe Buy OneTime & OC)', 'multitoggle', 1, null, 'Magma'); + createSetting('fuellater', 'Start Fuel Z', 'Start fueling at thiz zone instead of 230. I would suggest you have a value lower than your max, for obvious reasons. Recommend starting at 300 and end fueling at 350. ', 'value', -1, null, 'Magma'); createSetting('MagmiteExplain', 'Magmite spending behaviour', '1. Buy one-and-done upgrades, expensive first, then consider 1st level of Overclocker;
    2. Buy Overclocker IF AND ONLY IF we can afford it;
    2.5. Exit if OneTimeOnly
    3. Buy Efficiency if it is better than capacity;
    4. Buy Capacity or Supply depending on which is cheaper, or based on SupplyWall', 'infoclick', 'MagmiteExplain', null, 'Magma'); From 80474965812ae71ea2884cf485ded98a9388ad6f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 13:07:40 +0100 Subject: [PATCH 0755/3477] Update magmite.js --- modules/magmite.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index 179f3c896..06e1284c4 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -145,6 +145,10 @@ function autoGenerator() { const world = game.global.world; if (world < 230) return; // Magma only + if (getPageSetting('fuellater') >= 1 && game.global.world >= getPageSetting('fuellater') && game.global.generatorMode > 0) { + changeGeneratorState(0); + return; + } const endZ = getPageSetting('AutoGen2End'); const endS = getPageSetting('AutoGen2SupplyEnd'); @@ -183,10 +187,6 @@ function autoGenerator2() { changeGeneratorState(MI); } -/** - * Apply the necessary tweaks the user wants. - * @return false or 0 if unnecessary; 1 fuel; 2 hybrid - */ function autoGenOverrides() { const overriden = (game.global.runningChallengeSquared && getPageSetting('AutoGenC2')) || (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC')); if (overriden && (game.global.generatorMode != overriden)) From 997ca0c5b004181251bec5bc1f066170d149bfb9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 13:10:25 +0100 Subject: [PATCH 0756/3477] Update magmite.js --- modules/magmite.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/magmite.js b/modules/magmite.js index 06e1284c4..b1ff0830b 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -145,7 +145,7 @@ function autoGenerator() { const world = game.global.world; if (world < 230) return; // Magma only - if (getPageSetting('fuellater') >= 1 && game.global.world >= getPageSetting('fuellater') && game.global.generatorMode > 0) { + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) { changeGeneratorState(0); return; } From 822bde36dfd1d3c2867896573c392be043cd9479 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 13:30:54 +0100 Subject: [PATCH 0757/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index a87efcb86..e1eac6953 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -235,7 +235,7 @@ function mainLoop() { if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); if (getPageSetting('windcutoff')>=1) cutoffwind(); if (getPageSetting('spireshitbuy')==true) buyshitspire(); - if (getPageSetting('hardcorewind')==true) orangewindstack(); + if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) orangewindstack(); //Original From 01505db89587490fb87a1200bc347fdcfd135c46 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 13:35:10 +0100 Subject: [PATCH 0758/3477] Update other.js --- modules/other.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/other.js b/modules/other.js index 0cff5342b..264dfecd0 100644 --- a/modules/other.js +++ b/modules/other.js @@ -922,5 +922,19 @@ function orangewindstack() { buyUpgrade('Greatersword', true, true); if (game.equipment.Arbalest.level > 9 && game.upgrades.Harmbalest.locked == 0) buyUpgrade('Harmbalest', true, true); + if (game.upgrades.Bootboost.locked == 0) + buyUpgrade('Bootboost', true, true); + if (game.upgrades.Hellishmet.locked == 0) + buyUpgrade('Hellishmet', true, true); + if (game.upgrades.Pantastic.locked == 0) + buyUpgrade('Pantastic', true, true); + if (game.upgrades.Smoldershoulder.locked == 0) + buyUpgrade('Smoldershoulder', true, true); + if (game.upgrades.Bestplate.locked == 0) + buyUpgrade('Bestplate', true, true); + if (game.upgrades.Gambeson.locked == 0) + buyUpgrade('Gambeson', true, true); + if (game.upgrades.Supershield.locked == 0) + buyUpgrade('Supershield', true, true); } } From 9850cc2719d37a65a42a871484b6f018d4f58d5c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 13:37:49 +0100 Subject: [PATCH 0759/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 264dfecd0..c7d13a025 100644 --- a/modules/other.js +++ b/modules/other.js @@ -932,8 +932,8 @@ function orangewindstack() { buyUpgrade('Smoldershoulder', true, true); if (game.upgrades.Bestplate.locked == 0) buyUpgrade('Bestplate', true, true); - if (game.upgrades.Gambeson.locked == 0) - buyUpgrade('Gambeson', true, true); + if (game.upgrades.GambesOP.locked == 0) + buyUpgrade('GambesOP', true, true); if (game.upgrades.Supershield.locked == 0) buyUpgrade('Supershield', true, true); } From 4f2de9952ab2a844eb5effcb17414eb3a9191ae1 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 19 Jul 2018 16:34:55 +0100 Subject: [PATCH 0760/3477] Add multi BWraiding --- SettingsGUI.js | 36 ++++++++++++++++++------------------ modules/other.js | 28 +++++++++++++++++++++------- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 4f416c40e..715d13359 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -282,20 +282,20 @@ function initializeAllSettings() { createSetting('buyheliumy', 'Buy Heliumy %', 'Buys the Heliumy bonus for 100 bones when Daily bonus is above the value set in this setting. Recommend anything above 475. Will not buy if you cant afford to, or value is -1. ', 'value', -1, null, 'Daily'); createSetting('dPraidingzone', 'Daily P Raiding Z', 'Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ', 'multiValue', [-1], null, 'Daily'); createSetting('dPraidHarder', 'Daily Hardcore P Raiding', '(EXPERIMENTAL) P Raid Harder: When enabled, always buys the highest prestige map we can afford when P raiding, with option to farm fragments for highest available prestige level.','boolean',false,null,'Daily'); - + //Line 2 createSetting('dMaxPraidZone', 'Daily Max P Raid Z', 'List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)','multiValue', [-1], null, 'Daily'); createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.','multiValue',[-1],null,'Daily'); createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Daily'); createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); - createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); - createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Daily'); + createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the "Max BW to raid" setting. So if this is set to "480,495" and "Daily Max BW to Raid" is set to "500,515" AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Daily'); + createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of "Daily Z to BW raid" setting for details.', 'multiValue', [-1], null, 'Daily'); createSetting('use3daily', 'Use AS3 for Daily', 'Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); //Buildings - + //Line 1 createSetting('BuyBuildingsNew', ['Buy Neither','Buy Buildings & Storage', 'Buy Buildings', 'Buy Storage'], 'AutoBuys Storage when it is almost full (it even anticipates Jestimp) and Non-Storage Buildings (As soon as they are available). Takes cost efficiency into account before buying Non-Storage Buildings.', 'multitoggle', 1, null, "Buildings"); //This should replace the two below createSetting('WarpstationCap', 'Warpstation Cap', 'Do not level Warpstations past Basewarp+DeltaGiga **. Without this, if a Giga wasnt available, it would level infinitely (wastes metal better spent on prestiges instead.) **The script bypasses this cap each time a new giga is bought, when it insta-buys as many as it can afford (since AT keeps available metal/gems to a low, overbuying beyond the cap to what is affordable at that first moment is not a bad thing). ', 'boolean', true, null, 'Buildings'); @@ -304,7 +304,7 @@ function initializeAllSettings() { createSetting('MaxHouse', 'Max Houses', 'Houses', 'value', '100', null, "Buildings"); createSetting('MaxMansion', 'Max Mansions', 'Mansions', 'value', '100', null, "Buildings"); createSetting('MaxHotel', 'Max Hotels', 'Hotels', 'value', '100', null, "Buildings"); - + //Line 2 createSetting('MaxResort', 'Max Resorts', 'Resorts', 'value', '100', null, "Buildings"); createSetting('MaxGateway', 'Max Gateways', 'WARNING: Not recommended to raise above 25', 'value', '25', null, "Buildings"); @@ -313,7 +313,7 @@ function initializeAllSettings() { createSetting('MaxGym', 'Max Gyms', 'Advanced. recommend: -1', 'value', '-1', null, "Buildings"); //Remove? createSetting('MaxTribute', 'Max Tributes', 'Advanced. recommend: -1 ', 'value', '-1', null, "Buildings"); //Remove? (More gems is never a bad thing...) createSetting('GymWall', 'Gym Wall', 'Conserves Wood. Only buys 1 Gym when you can afford X gyms wood cost (at the first one\'s price, simple math). -1 or 0 to disable. In other words, only allows gyms that cost less than 1/nth your currently owned wood. (to save wood for nurseries for new z230+ Magma nursery strategy). Takes decimal numbers. (Identical to the Warpstation wall setting which is why its called that). Setting to 1 does nothing besides stopping gyms from being bought 2 at a time due to the mastery.', 'value', -1, null, 'Buildings'); //remove? - + //Line 3 createSetting('FirstGigastation', 'First Gigastation', 'How many warpstations to buy before your first gigastation', 'value', '20', null, "Buildings"); createSetting('DeltaGigastation', 'Delta Gigastation', 'How many extra warpstations to buy for each gigastation. Supports decimal values. For example 2.5 will buy +2/+3/+2/+3...', 'value', '2', null, "Buildings"); @@ -333,7 +333,7 @@ function initializeAllSettings() { createSetting('MinerRatio', 'Miner Ratio', '', 'value', '1', null, "Jobs"); createSetting('MaxScientists', 'Max Scientists', 'Advanced. Cap your scientists (This is an absolute number not a ratio). recommend: -1 (infinite still controls itself)', 'value', '-1', null, "Jobs"); createSetting('MaxExplorers', 'Max Explorers', 'Advanced. Cap your explorers (This is an absolute number not a ratio). recommend: -1', 'value', '-1', null, "Jobs"); //Explorers are important now! outdated setting tbh - + //Line 2 createSetting('MaxTrainers', 'Max Trainers', 'Advanced. Cap your trainers (This is an absolute number not a ratio). recommend: -1', 'value', '-1', null, "Jobs"); //by the time that you stop needing block, food is abundant createSetting('TrainerCaptoTributes', 'Cap Trainers %', 'Only Buy a Trainer when its cost is LESS than X% of cost of a tribute. This setting can work in combination with the other one, or set the other one to -1 and this will take full control. Default: -1 (Disabled). 50% is close to the point where the cap does nothing. You can go as low as you want but recommended is 10% to 1%. (example: Trainer cost of 5001, Tribute cost of 100000, @ 5%, it would NOT buy the trainer.)', 'value', '-1', null, 'Jobs'); //this is a bit unnecessary, resource management by the script is already sufficient. @@ -356,7 +356,7 @@ function initializeAllSettings() { id: "PrestigeBackup", name: "PrestigeBackup" }; - + //Line 2 createSetting('ForcePresZ', 'Force Prestige Z', 'On and after this zone is reached, always try to prestige for everything immediately, ignoring Dynamic Prestige settings and overriding that of Linear Prestige. Prestige Skip mode will exit this. Disable with -1.', 'value', -1, null, 'Gear'); createSetting('PrestigeSkip1_2', ['Prestige Skip Off','Prestige Skip 1 & 2', 'Prestige Skip 1', 'Prestige Skip 2'], 'Prestige Skip 1: If there are more than 2 Unbought Prestiges (besides Shield), ie: sitting in your upgrades window but you cant afford them, AutoMaps will not enter Prestige Mode, and/or will exit from it. The amount of unboughts can be configured with this variable MODULES[\\"maps\\"].SkipNumUnboughtPrestiges = 2;
    Prestige Skip 2: If there are 2 or fewer Unobtained Weapon Prestiges in maps, ie: there are less than 2 types to run for, AutoMaps will not enter Prestige Mode, and/or will exit from it. For users who tends to not need the last few prestiges due to resource gain not keeping up. The amount of unboughts can be configured with MODULES.maps.UnearnedPrestigesRequired. If PrestigeSkipMode is enabled, both conditions need to be reached before exiting.', 'multitoggle', 0, null, "Gear"); @@ -399,10 +399,10 @@ function initializeAllSettings() { createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Spire'); createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Spire'); createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); - + //Line 2 createSetting('spireshitbuy', 'Buy Gear in Spire', 'Will buy Weapons and Armor in Spire regardless of your H:D ratio. Respects your max gear level and ignore spires setting. ', 'boolean', false, null, 'Spire'); - + //Raiding @@ -414,10 +414,10 @@ function initializeAllSettings() { createSetting('PraidFarmFragsZ', 'Farm Fragments Z', 'P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments. ', 'multiValue', [-1], null, 'Raiding'); createSetting('PraidBeforeFarmZ', 'Raid before farm Z', 'P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Raiding'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding Z/max.', 'boolean', false, null, 'Raiding'); - createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Raiding'); - + createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the "Max BW to raid" setting. So if this is set to "480,495" and "Max BW to Raid" is set to "500,515" AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Raiding'); + //Line 2 - createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming.', 'value', -1, null, 'Raiding'); + createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of "Z to BW raid" setting for details.', 'value', [-1], null, 'Raiding'); @@ -431,14 +431,14 @@ function initializeAllSettings() { createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); - + //Line 2 createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); createSetting('fightforever', 'Fight Always', 'Sends trimps to fight if they\'re not fighting, regardless of BAF.', 'boolean', 'false', null, 'Combat'); - + //Scryer @@ -451,7 +451,7 @@ function initializeAllSettings() { createSetting('ScryerUseinMaps2', ['Maps: NEVER','Maps: FORCE', 'Maps: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate in Void Maps
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use on Corrupteds to be on after corruption/magma.

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerUseinVoidMaps2', ['VoidMaps: NEVER','VoidMaps: FORCE', 'VoidMaps: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate in Void Maps
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use in Maps to be on, as well as use on Corrupteds (if above corruption/magma) to activate.

    Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerUseinSpire2', ['Spire: NEVER','Spire: FORCE','Spire: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate in the Spire
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use on Corrupteds to be on for corrupted enemies.

    Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); - + //Line 2 createSetting('ScryerSkipBoss2', ['Boss: NEVER (All Levels)','Boss: NEVER (Above VoidLevel)','Boss: MAYBE'], 'NEVER (All Levels) will NEVER use S in cell 100 of the world!!!
    NEVER (Above VoidLevel) will NEVER use S in cell 100 of the world ABOVE the zone that your void maps are set to run at (Maps).
    MAYBE treats the cell no differently to any other, Overkill and Min/Max Scryer is allowed.

    Recommend NEVER (There is little benefit to double NON-HELIUM resources and a small chance of DE).', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate against Corrupted enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Magma maps and Corrupted Voidmaps are currently classified as corrupted and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); @@ -472,7 +472,7 @@ function initializeAllSettings() { createSetting('AutoGen3', ['Gain Mi', 'Gain Fuel', 'Hybrid'], 'Mode to use after Z / SupplyEnd.', 'multitoggle', 1, null, 'Magma'); createSetting('AutoGenDC', ['Daily: Normal', 'Daily: Fuel', 'Daily: Hybrid'], 'Use a special mode in dailies to make the most out of it. Overrides AutoGen3 unless Strong Override is on.', 'multitoggle', 1, null, 'Magma'); createSetting('AutoGenC2', ['c2: Normal', 'c2: Fuel', 'c2: Hybrid'], 'Use a special mode when running challenge2s to make the most out of it. Overrides AutoGen3 unless Strong Override is on.', 'multitoggle', 1, null, 'Magma'); - + //Line 2 createSetting('AutoGen2Override', ['Override Final Only', 'Strong Override'], 'Overrides apply to the final mode (always use early mode), or also to early mode (will stop microtick etc). Normal will not change anything.', 'multitoggle', 1, null, 'Magma'); createSetting('AutoMagmiteSpender2', ['Spend Magmite OFF', 'Spend Magmite (Portal)', 'Spend Magmite Always'], 'Auto Spends any unspent Magmite immediately before portaling. (Or Always, if toggled). Part 1 buys any permanent one-and-done upgrades in order from most expensive to least. Part 2 then analyzes Efficiency vs Capacity for cost/benefit, and buys Efficiency if its BETTER than Capacity. If not, if the PRICE of Capacity is less than the price of Supply, it buys Capacity. If not, it buys Supply. And then it repeats itself until you run out of Magmite and cant buy anymore. For Magma z230+ purposes.', 'multitoggle', 1, null, 'Magma'); @@ -531,7 +531,7 @@ function initializeAllSettings() { createSetting('SpamOther', 'Other Spam', 'Other Spam = mostly Better Auto Fight (disable with: MODULES[\\"fight\\"].enableDebug=false ), Trimpicide & AutoBreed/Gene Timer changes, AnalyticsID, etc - a catch all. ', 'boolean', true, null, 'Display'); createSetting('SpamBuilding', 'Building Spam', 'Building Spam = all buildings, even storage', 'boolean', false, null, 'Display'); createSetting('SpamJobs', 'Job Spam', 'Job Spam = All jobs, in scientific notation', 'boolean', false, null, 'Display'); - + //Line 2 createSetting('SpamGraphs', 'Starting Zone Spam', 'Disables \'Starting new Zone ###\' , RoboTrimp MagnetoShreik, and any future Graph Spam that comes from graph logs.', 'boolean', true, null, 'Display'); createSetting('SpamMagmite', 'Magmite/Magma Spam', 'Everything in Magmite Module and Buy Magmamancers', 'boolean', true, null, 'Display'); diff --git a/modules/other.js b/modules/other.js index c7d13a025..b518f6151 100644 --- a/modules/other.js +++ b/modules/other.js @@ -279,14 +279,14 @@ function PraidHarder() { if (game.global.challengeActive == "Daily") { praidSetting = 'dPraidingzone'; maxPraidZSetting = 'dMaxPraidZone'; - isBWRaidZ = getPageSetting('dBWraidingz')==game.global.world && getPageSetting('Dailybwraid'); + isBWRaidZ = getPageSetting('dBWraidingz').includes(game.global.world) && getPageSetting('Dailybwraid'); farmFragments = getPageSetting('dPraidFarmFragsZ').includes(game.global.world); praidBeforeFarm = getPageSetting('dPraidBeforeFarmZ').includes(game.global.world); } else { praidSetting = 'Praidingzone'; maxPraidZSetting = 'MaxPraidZone'; - isBWRaidZ = getPageSetting('BWraidingz')==game.global.world && getPageSetting('BWraid'); + isBWRaidZ = getPageSetting('BWraidingz').includes(game.global.world) && getPageSetting('BWraid'); farmFragments = getPageSetting('PraidFarmFragsZ').includes(game.global.world); praidBeforeFarm = getPageSetting('PraidBeforeFarmZ').includes(game.global.world); } @@ -496,6 +496,9 @@ function BWraiding() { var bwraidMax; var isPraidZ; var ispraidon; + var isBWRaidZ; + var targetBW; + var bwIndex; // PraidHarder(); // To make sure we try to Praid first before BWraiding @@ -514,7 +517,18 @@ function BWraiding() { ispraidon = prestraidon; } - if ((!isPraidZ || praidDone) && !ispraidon && game.global.world == getPageSetting(bwraidZ) && !bwraided && !failbwraid && getPageSetting(bwraidSetting)) { + // Convert old BWraid settings to multivalue + if (typeof(getPageSetting(bwraidZ)) == "number") + setPageSetting(bwraidZ, [getPageSetting(bwraidZ)]); + if (typeof(getPageSetting(bwraidMax)) == "number") + setPageSetting(bwraidMax, [getPageSetting(bwraidMax)]); + + isBWRaidZ = getPageSetting(bwraidZ).includes(game.global.world); + bwIndex = getPageSetting(bwraidZ).indexOf(game.global.world); + if (bwIndex == -1 || typeof(getPageSetting(bwraidMax)[bwIndex]) === "undefined") targetBW = -1; + else targetBW = getPageSetting(bwraidMax)[bwIndex]; + + if ((!isPraidZ || praidDone) && !ispraidon && isBWRaidZ && !bwraided && !failbwraid && getPageSetting(bwraidSetting)) { if (getPageSetting('AutoMaps') == 1 && !bwraided && !failbwraid) { autoTrimpSettings["AutoMaps"].value = 0; } @@ -539,14 +553,14 @@ function BWraiding() { } else if (game.global.preMapsActive && !bwraided && !failbwraid) { - if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting(bwraidZ) && !bwraided) { + if (getPageSetting('AutoMaps') == 0 && isBWRaidZ && !bwraided) { autoTrimpSettings["AutoMaps"].value = 1; failbwraid = true; debug("Failed to BW raid. Looks like you don't have a BW to raid..."); } } - if (findLastBionic().level <= getPageSetting(bwraidMax) && !bwraided && !failbwraid && game.global.preMapsActive) { + if (findLastBionic().level <= targetBW && !bwraided && !failbwraid && game.global.preMapsActive) { runMap(); bwraidon = true; } @@ -555,7 +569,7 @@ function BWraiding() { repeatClicked(); } - if (findLastBionic().level > getPageSetting(bwraidMax) && !bwraided && !failbwraid) { + if (findLastBionic().level > targetBW && !bwraided && !failbwraid) { bwraided = true; failbwraid = false; bwraidon = false; @@ -573,7 +587,7 @@ function BWraiding() { debug("Turning AutoMaps back on"); } - if (game.global.world != getPageSetting(bwraidZ)) { + if (!isBWRaidZ) { bwraided = false; failbwraid = false; bwraidon = false; From ff87ccb693953ac3d7ee71c2aa0daad4ec5c2122 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 17:12:43 +0100 Subject: [PATCH 0761/3477] Update magmite.js --- modules/magmite.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/magmite.js b/modules/magmite.js index b1ff0830b..f177565ff 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -169,6 +169,10 @@ function autoGenerator2() { // Respect overrides first. if (getPageSetting('AutoGen2Override') && autoGenOverrides()) return; + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) { + changeGeneratorState(0); + return; + } const mode = getPageSetting('AutoGen2'); // None : Microtick : Cap if (!mode) // Default: move on @@ -189,6 +193,10 @@ function autoGenerator2() { function autoGenOverrides() { const overriden = (game.global.runningChallengeSquared && getPageSetting('AutoGenC2')) || (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC')); + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) { + changeGeneratorState(0); + return; + } if (overriden && (game.global.generatorMode != overriden)) changeGeneratorState(overriden); return overriden; From ad8ea503976c0c9758afbd8c8c86a8a9fee1c0df Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 17:21:33 +0100 Subject: [PATCH 0762/3477] Update magmite.js --- modules/magmite.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index f177565ff..d03d18319 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -157,7 +157,7 @@ function autoGenerator() { //if (autoGenerator3); if (!autoGenOverrides()) { const lateMode = getPageSetting('AutoGen3'); - if (game.global.generatorMode != lateMode) + if (game.global.generatorMode != lateMode && getPageSetting('fuellater') < 1 || game.global.world >= getPageSetting('fuellater')) changeGeneratorState(lateMode); } } else autoGenerator2(); @@ -177,7 +177,7 @@ function autoGenerator2() { const mode = getPageSetting('AutoGen2'); // None : Microtick : Cap if (!mode) // Default: move on return; - else if (mode == 3 && game.generatorUpgrades["Overclocker"].upgrades > 0) { // Only trigger overclock if we have Overclocker upgrades. + else if (mode == 3 && game.generatorUpgrades["Overclocker"].upgrades > 0 && getPageSetting('fuellater') < 1 || game.global.world >= getPageSetting('fuellater')) { // Only trigger overclock if we have Overclocker upgrades. changeGeneratorState(FUEL); return; } From 1d29034ddf0b57b951febed7436d786c17479fe2 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 19 Jul 2018 17:37:26 +0100 Subject: [PATCH 0763/3477] Update magmite.js --- modules/magmite.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index d03d18319..41a0d298c 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -145,10 +145,10 @@ function autoGenerator() { const world = game.global.world; if (world < 230) return; // Magma only - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) { + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) changeGeneratorState(0); + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) return; - } const endZ = getPageSetting('AutoGen2End'); const endS = getPageSetting('AutoGen2SupplyEnd'); @@ -157,7 +157,7 @@ function autoGenerator() { //if (autoGenerator3); if (!autoGenOverrides()) { const lateMode = getPageSetting('AutoGen3'); - if (game.global.generatorMode != lateMode && getPageSetting('fuellater') < 1 || game.global.world >= getPageSetting('fuellater')) + if (game.global.generatorMode != lateMode) changeGeneratorState(lateMode); } } else autoGenerator2(); @@ -169,15 +169,14 @@ function autoGenerator2() { // Respect overrides first. if (getPageSetting('AutoGen2Override') && autoGenOverrides()) return; - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) { + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) changeGeneratorState(0); + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) return; - } - const mode = getPageSetting('AutoGen2'); // None : Microtick : Cap if (!mode) // Default: move on return; - else if (mode == 3 && game.generatorUpgrades["Overclocker"].upgrades > 0 && getPageSetting('fuellater') < 1 || game.global.world >= getPageSetting('fuellater')) { // Only trigger overclock if we have Overclocker upgrades. + else if (mode == 3 && game.generatorUpgrades["Overclocker"].upgrades > 0) { // Only trigger overclock if we have Overclocker upgrades. changeGeneratorState(FUEL); return; } @@ -193,10 +192,10 @@ function autoGenerator2() { function autoGenOverrides() { const overriden = (game.global.runningChallengeSquared && getPageSetting('AutoGenC2')) || (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC')); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) { + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) changeGeneratorState(0); + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) return; - } if (overriden && (game.global.generatorMode != overriden)) changeGeneratorState(overriden); return overriden; From 23090183af8a5fca7d80bea45bc2650e9b9fd987 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 19 Jul 2018 17:53:49 +0100 Subject: [PATCH 0764/3477] Get rid of quotes to fix tooltip error --- SettingsGUI.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 715d13359..05cf43181 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -288,8 +288,8 @@ function initializeAllSettings() { createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.','multiValue',[-1],null,'Daily'); createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Daily'); createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); - createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the "Max BW to raid" setting. So if this is set to "480,495" and "Daily Max BW to Raid" is set to "500,515" AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Daily'); - createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of "Daily Z to BW raid" setting for details.', 'multiValue', [-1], null, 'Daily'); + createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the "Max BW to raid" setting. So if this is set to 480,495 and Daily Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Daily'); + createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Daily Z to BW raid setting for details.', 'multiValue', [-1], null, 'Daily'); createSetting('use3daily', 'Use AS3 for Daily', 'Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); @@ -414,10 +414,10 @@ function initializeAllSettings() { createSetting('PraidFarmFragsZ', 'Farm Fragments Z', 'P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments. ', 'multiValue', [-1], null, 'Raiding'); createSetting('PraidBeforeFarmZ', 'Raid before farm Z', 'P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Raiding'); createSetting('BWraid', 'BW Raiding', 'Raids BW at zone specified in BW Raiding Z/max.', 'boolean', false, null, 'Raiding'); - createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the "Max BW to raid" setting. So if this is set to "480,495" and "Max BW to Raid" is set to "500,515" AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Raiding'); + createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Raiding'); //Line 2 - createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of "Z to BW raid" setting for details.', 'value', [-1], null, 'Raiding'); + createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Z to BW raid setting for details.', 'value', [-1], null, 'Raiding'); From e18ac29d83bf6f8bd2a58f04458da719521ff7ff Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 19 Jul 2018 18:09:58 +0100 Subject: [PATCH 0765/3477] Attempt to preserve existing BWraid settings --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index b518f6151..e8390e6c4 100644 --- a/modules/other.js +++ b/modules/other.js @@ -519,9 +519,9 @@ function BWraiding() { // Convert old BWraid settings to multivalue if (typeof(getPageSetting(bwraidZ)) == "number") - setPageSetting(bwraidZ, [getPageSetting(bwraidZ)]); + setPageSetting(bwraidZ, Array.of(getPageSetting(bwraidZ))); if (typeof(getPageSetting(bwraidMax)) == "number") - setPageSetting(bwraidMax, [getPageSetting(bwraidMax)]); + setPageSetting(bwraidMax, Array.of(getPageSetting(bwraidZ))); isBWRaidZ = getPageSetting(bwraidZ).includes(game.global.world); bwIndex = getPageSetting(bwraidZ).indexOf(game.global.world); From 1830b23dda9dfc38cfbfaf5b2ef9e1e17dfdf424 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 19 Jul 2018 18:28:34 +0100 Subject: [PATCH 0766/3477] Keep old BWraid settings --- modules/other.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index e8390e6c4..e1954f406 100644 --- a/modules/other.js +++ b/modules/other.js @@ -518,10 +518,10 @@ function BWraiding() { } // Convert old BWraid settings to multivalue - if (typeof(getPageSetting(bwraidZ)) == "number") - setPageSetting(bwraidZ, Array.of(getPageSetting(bwraidZ))); - if (typeof(getPageSetting(bwraidMax)) == "number") - setPageSetting(bwraidMax, Array.of(getPageSetting(bwraidZ))); + if (typeof(autoTrimpSettings[bwraidZ].value) == "number") + setPageSetting(bwraidZ, Array.of(autoTrimpSettings[bwraidZ].value)); + if (typeof(autoTrimpSettings[bwraidMax].value) == "number") + setPageSetting(bwraidMax, Array.of(autoTrimpSettings[bwraidMax].value)); isBWRaidZ = getPageSetting(bwraidZ).includes(game.global.world); bwIndex = getPageSetting(bwraidZ).indexOf(game.global.world); From 9c41796bdb80ba9be726b707fc312f2f0c5440b3 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 19 Jul 2018 18:38:40 +0100 Subject: [PATCH 0767/3477] Fix BWraidingmax setting type --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 05cf43181..a30f17b65 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -417,7 +417,7 @@ function initializeAllSettings() { createSetting('BWraidingz', 'Z to BW Raid', 'Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Raiding'); //Line 2 - createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Z to BW raid setting for details.', 'value', [-1], null, 'Raiding'); + createSetting('BWraidingmax', 'Max BW to raid', 'Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Z to BW raid setting for details.', 'multiValue', [-1], null, 'Raiding'); From 3ab77cfb0e6130165eb2c76174bcde9111bcc6e9 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 19 Jul 2018 18:44:36 +0100 Subject: [PATCH 0768/3477] Convert all old BWraid settings at once --- modules/other.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index e1954f406..fe32cddf0 100644 --- a/modules/other.js +++ b/modules/other.js @@ -518,10 +518,15 @@ function BWraiding() { } // Convert old BWraid settings to multivalue - if (typeof(autoTrimpSettings[bwraidZ].value) == "number") - setPageSetting(bwraidZ, Array.of(autoTrimpSettings[bwraidZ].value)); - if (typeof(autoTrimpSettings[bwraidMax].value) == "number") - setPageSetting(bwraidMax, Array.of(autoTrimpSettings[bwraidMax].value)); + if (typeof(autoTrimpSettings['BWraidingz'].value) == "number") + setPageSetting('BWraidingz', Array.of(autoTrimpSettings['BWraidingz'].value)); + if (typeof(autoTrimpSettings['BWraidingmax'].value) == "number") + setPageSetting('BWraidingmax', Array.of(autoTrimpSettings['BWraidingmax'].value)); + if (typeof(autoTrimpSettings['dBWraidingz'].value) == "number") + setPageSetting('dBWraidingz', Array.of(autoTrimpSettings['dBWraidingz'].value)); + if (typeof(autoTrimpSettings['dBWraidingmax'].value) == "number") + setPageSetting('dBWraidingmax', Array.of(autoTrimpSettings['dBWraidingmax'].value)); + isBWRaidZ = getPageSetting(bwraidZ).includes(game.global.world); bwIndex = getPageSetting(bwraidZ).indexOf(game.global.world); From eeb669e1781f8367d2bcd20a63c3ad1774f58a7d Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 19 Jul 2018 19:00:35 +0100 Subject: [PATCH 0769/3477] Fix quotes in settings AT's inconsistent quote usage strikes again --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index a30f17b65..8f6f1ed3a 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -288,7 +288,7 @@ function initializeAllSettings() { createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.','multiValue',[-1],null,'Daily'); createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Daily'); createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); - createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the "Max BW to raid" setting. So if this is set to 480,495 and Daily Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Daily'); + createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Daily Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Daily'); createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Daily Z to BW raid setting for details.', 'multiValue', [-1], null, 'Daily'); createSetting('use3daily', 'Use AS3 for Daily', 'Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); From 00f44554f04374ebc20581e81304c00ffc022111 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 19 Jul 2018 19:01:59 +0100 Subject: [PATCH 0770/3477] Remove quotes from description Breaks tooltips which use "" otherwise --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index a30f17b65..8f6f1ed3a 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -288,7 +288,7 @@ function initializeAllSettings() { createSetting('dPraidFarmFragsZ', 'Daily Farm Frags Z', 'P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.','multiValue',[-1],null,'Daily'); createSetting('dPraidBeforeFarmZ', 'Dy Raid bef farm Z', 'P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.','multiValue', [-1], null, 'Daily'); createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); - createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the "Max BW to raid" setting. So if this is set to 480,495 and Daily Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Daily'); + createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Daily Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Daily'); createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Daily Z to BW raid setting for details.', 'multiValue', [-1], null, 'Daily'); createSetting('use3daily', 'Use AS3 for Daily', 'Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); From 0969be18c342217ac0c17d8c01695492d98f561d Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 19 Jul 2018 19:05:29 +0100 Subject: [PATCH 0771/3477] Revert "Change config files for testing" This reverts commit e14aeabbae51070667512ac999a7726cb89814ad. --- .user.js | 8 ++++---- AutoTrimps2.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.user.js b/.user.js index 5da4e3d6f..2a7663279 100644 --- a/.user.js +++ b/.user.js @@ -1,13 +1,13 @@ // ==UserScript== // @name AutoTrimps-Zek // @version 1.0-Zek -// @namespace https://spikenskab.github.io/AutoTrimps -// @updateURL https://spikenskab.github.io/AutoTrimps/.user.js +// @namespace https://Zorn192.github.io/AutoTrimps +// @updateURL https://Zorn192.github.io/AutoTrimps/.user.js // @description Automate all the trimps! // @author zininzinin, spindrjr, Ishkaru, genBTC, Zeker0 // @include *trimps.github.io* // @include *kongregate.com/games/GreenSatellite/trimps -// @connect *spikenskab.github.io/AutoTrimps* +// @connect *Zorn192.github.io/AutoTrimps* // @connect *trimps.github.io* // @connect self // @grant none @@ -16,7 +16,7 @@ var script = document.createElement('script'); script.id = 'AutoTrimps-Zek'; //This can be edited to point to your own Github Repository URL. -script.src = 'https://spikenskab.github.io/AutoTrimps/AutoTrimps2.js'; +script.src = 'https://Zorn192.github.io/AutoTrimps/AutoTrimps2.js'; //script.setAttribute('crossorigin',"use-credentials"); script.setAttribute('crossorigin',"anonymous"); document.head.appendChild(script); diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 92d453df4..e1eac6953 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -15,7 +15,7 @@ var ATversion = '2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0'; //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////// var atscript = document.getElementById('AutoTrimps-script') - , basepath = 'https://spikenskab.github.io/AutoTrimps/' + , basepath = 'https://Zorn192.github.io/AutoTrimps/' , modulepath = 'modules/' ; //This should redirect the script to wherever its being mirrored from. @@ -90,7 +90,7 @@ function printChangelog() { var footer = 'ZӘK Fork - Report any bugs/problems please!\
    Talk with the dev: ZӘK#2509 @ AutoTrimps Discord Channel\ -
    See ReadMe Or check the commit history (if you want).' +
    See ReadMe Or check the commit history (if you want).' , action = 'cancelTooltip()' , title = 'Script Update Notice
    ' + ATversion , acceptBtnText = "Thank you for playing AutoTrimps. Accept and Continue." From 736dec6b0de3bf1988329d17c01ba43be9926006 Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 19 Jul 2018 19:55:41 +0100 Subject: [PATCH 0772/3477] AS2 fixes --- modules/stance.js | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 176d284a3..5819ec06c 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -245,17 +245,18 @@ function autoStance2() { var isCrushed = false; var isCritVoidMap = false; var isCritDaily = false; - if (ignoreCrits == 2) { // Ignore all! + if (ignoreCrits != 2) { // skip if ignore all! (isCrushed = (game.global.challengeActive == "Crushed") && game.global.soldierHealth > game.global.soldierCurrentBlock) && (critMulti *= 5); (isCritVoidMap = (!ignoreCrits && game.global.voidBuff == 'getCrit') || (enemy.corrupted == 'corruptCrit')) && (critMulti *= 5); + if (enemy.corrupted == 'healthyCrit') critMulti *= 7; (isCritDaily = (game.global.challengeActive == "Daily") && (typeof game.global.dailyChallenge.crits !== 'undefined')) && (critMulti *= dailyModifiers.crits.getMult(game.global.dailyChallenge.crits.strength)); enemyDamage *= critMulti; } //double attacks - var isDoubleAttack = game.global.voidBuff == 'doubleAttack' || (enemy.corrupted == 'corruptDbl'); + var isDoubleAttack = game.global.voidBuff == 'doubleAttack' || (enemy.corrupted == 'corruptDbl') || enemy.corrupted == 'healthyDbl'; //fast var enemyFast = (game.global.challengeActive == "Slow" || ((game.badGuys[enemy.name].fast || enemy.mutation == "Corruption") && game.global.challengeActive != "Coordinate" && game.global.challengeActive != "Nom")) || isDoubleAttack; // @@ -263,6 +264,11 @@ function autoStance2() { enemyDamage *= 2; if (enemy.corrupted == 'corruptTough') enemyHealth *= 5; + if (enemy.corrupted == 'healthyStrong') + enemyDamage *= 2.5; + if (enemy.corrupted == 'healthyTough') + enemyHealth *= 7.5; + //calc X,D,B: var xDamage = (enemyDamage - baseBlock); @@ -326,9 +332,9 @@ function autoStance2() { bDamage += added; } //^dont attach^. - if (game.global.voidBuff == "bleed" || (enemy.corrupted == 'corruptBleed')) { + if (game.global.voidBuff == "bleed" || (enemy.corrupted == 'corruptBleed') || enemy.corrupted == 'healthyBleed') { //20% of CURRENT health; - var added = game.global.soldierHealth * 0.20; + var added = game.global.soldierHealth * (enemy.corrupted == 'healthyBleed' ? 0.30 : 0.20); dDamage += added; xDamage += added; bDamage += added; @@ -444,24 +450,29 @@ function autoStanceCheck(enemyCrit) { var isCrushed = false; var isCritVoidMap = false; var isCritDaily = false; - if (ignoreCrits == 2) { // Ignored all! + if (ignoreCrits != 2) { // skip if ignore all! (isCrushed = game.global.challengeActive == "Crushed" && game.global.soldierHealth > game.global.soldierCurrentBlock) && enemyCrit && (critMulti *= 5); - (isCritVoidMap = game.global.voidBuff == 'getCrit' || enemy.corrupted == 'corruptCrit') + (!ignoreCrits && isCritVoidMap = game.global.voidBuff == 'getCrit' || enemy.corrupted == 'corruptCrit') && enemyCrit && (critMulti *= 5); + if (enemy.corrupted == 'healthyCrit') critMulti *= 7; (isCritDaily = game.global.challengeActive == "Daily" && typeof game.global.dailyChallenge.crits !== 'undefined') && enemyCrit && (critMulti *= dailyModifiers.crits.getMult(game.global.dailyChallenge.crits.strength)); if (enemyCrit) enemyDamage *= critMulti; } //double attacks - var isDoubleAttack = game.global.voidBuff == 'doubleAttack' || (enemy.corrupted == 'corruptDbl'); + var isDoubleAttack = game.global.voidBuff == 'doubleAttack' || (enemy.corrupted == 'corruptDbl') || (enemy.corrupted == 'healthyDbl'); //fast var enemyFast = (game.global.challengeActive == "Slow" || ((game.badGuys[enemy.name].fast || enemy.mutation == "Corruption") && game.global.challengeActive != "Coordinate" && game.global.challengeActive != "Nom")) || isDoubleAttack; if (enemy.corrupted == 'corruptStrong') enemyDamage *= 2; if (enemy.corrupted == 'corruptTough') enemyHealth *= 5; + if (enemy.corrupted == 'healthyStrong') + enemyDamage *= 2.5; + if (enemy.corrupted == 'healthyTough') + enemyHealth *= 7.5; //calc X,D,B: enemyDamage -= ourBlock; var pierce = 0; @@ -494,9 +505,10 @@ function autoStanceCheck(enemyCrit) { var leadDamage = game.challenges.Lead.stacks * 0.0003; enemyDamage += game.global.soldierHealthMax * leadDamage; } + //^dont attach^. - if (game.global.voidBuff == "bleed" || (enemy.corrupted == 'corruptBleed')) { - enemyDamage += game.global.soldierHealth * 0.2; + if (game.global.voidBuff == "bleed" || (enemy.corrupted == 'corruptBleed') || enemy.corrupted == 'healthyBleed') { + enemyDamage += game.global.soldierHealth * (enemy.corrupted == 'healthyBleed' ? 0.30 : 0.20); } ourDamage *= (game.global.titimpLeft > 0 ? 2 : 1); //consider titimp ourDamage *= (!game.global.mapsActive && game.global.mapBonus > 0) ? ((game.global.mapBonus * .2) + 1) : 1; //consider mapbonus From e65f5a7065d6e7c918c6be78c115a1cc096f7d0f Mon Sep 17 00:00:00 2001 From: spikenslab Date: Thu, 19 Jul 2018 20:19:10 +0100 Subject: [PATCH 0773/3477] AS fixes --- modules/stance.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 5819ec06c..2f71bc19e 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -248,9 +248,8 @@ function autoStance2() { if (ignoreCrits != 2) { // skip if ignore all! (isCrushed = (game.global.challengeActive == "Crushed") && game.global.soldierHealth > game.global.soldierCurrentBlock) && (critMulti *= 5); - (isCritVoidMap = (!ignoreCrits && game.global.voidBuff == 'getCrit') || (enemy.corrupted == 'corruptCrit')) - && (critMulti *= 5); - if (enemy.corrupted == 'healthyCrit') critMulti *= 7; + (isCritVoidMap = (!ignoreCrits && game.global.voidBuff == 'getCrit') || (enemy.corrupted == 'corruptCrit') || (enemy.corrupted == 'healthyCrit')) + && (critMulti *= (enemy.corrupted == 'healthyCrit' ? 7 : 5)); (isCritDaily = (game.global.challengeActive == "Daily") && (typeof game.global.dailyChallenge.crits !== 'undefined')) && (critMulti *= dailyModifiers.crits.getMult(game.global.dailyChallenge.crits.strength)); enemyDamage *= critMulti; @@ -453,9 +452,8 @@ function autoStanceCheck(enemyCrit) { if (ignoreCrits != 2) { // skip if ignore all! (isCrushed = game.global.challengeActive == "Crushed" && game.global.soldierHealth > game.global.soldierCurrentBlock) && enemyCrit && (critMulti *= 5); - (!ignoreCrits && isCritVoidMap = game.global.voidBuff == 'getCrit' || enemy.corrupted == 'corruptCrit') - && enemyCrit && (critMulti *= 5); - if (enemy.corrupted == 'healthyCrit') critMulti *= 7; + (isCritVoidMap = (!ignoreCrits && game.global.voidBuff == 'getCrit') || (enemy.corrupted == 'corruptCrit') || (enemy.corrupted == 'healthyCrit')) + && enemyCrit && (critMulti *= (enemy.corrupted == 'healthyCrit' ? 7 : 5)); (isCritDaily = game.global.challengeActive == "Daily" && typeof game.global.dailyChallenge.crits !== 'undefined') && enemyCrit && (critMulti *= dailyModifiers.crits.getMult(game.global.dailyChallenge.crits.strength)); if (enemyCrit) From 1bc3e1b2f790208a9ea82c973142c05d374ef98a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:01:09 +0100 Subject: [PATCH 0774/3477] Update SettingsGUI.js --- SettingsGUI.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 8f6f1ed3a..868b43c7e 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -291,7 +291,12 @@ function initializeAllSettings() { createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Daily Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Daily'); createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Daily Z to BW raid setting for details.', 'multiValue', [-1], null, 'Daily'); createSetting('use3daily', 'Use AS3 for Daily', 'Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); - + + //Line 3 + createSetting('dWindStackingMin', 'Daily Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set for dailys. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); + createSetting('dWindStackingMax', 'Daily Windstack Max', 'For use with AutoStance 3 in dailys. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); + createSetting('dwindcutoff', 'Daily Wind Damage Cutoff', 'Set this value to optimise your windstacking in dailys. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); + createSetting('dhardcorewind', 'Daily Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack in dailys. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); //Buildings From 384cf5fef438a0edade1f52a25d004e77e1096eb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:03:23 +0100 Subject: [PATCH 0775/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index e1eac6953..f62bbb913 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -233,9 +233,10 @@ function mainLoop() { if (getPageSetting('buynojobsc')==true || getPageSetting('buynojobsc')==false) buynojobs(); if (getPageSetting('fightforever')==true) fightalways(); if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); - if (getPageSetting('windcutoff')>=1) cutoffwind(); + if (getPageSetting('windcutoff')>=1 || getPageSetting('dwindcutoff')>=1) cutoffwind(); if (getPageSetting('spireshitbuy')==true) buyshitspire(); if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) orangewindstack(); + if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind')) orangewindstack(); //Original From 967b0676a1915482b0a38e135e24e1a0e34f9f87 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:09:33 +0100 Subject: [PATCH 0776/3477] Update stance.js --- modules/stance.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 2f71bc19e..220756b00 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -546,11 +546,16 @@ function autoStance3() { if (!game.upgrades.Formations.done) return; if (game.global.world <= 70) return; - var windstackzone = getPageSetting('WindStackingMin'); + var windstackzone = 0; + if (getPageSetting('WindStackingMin') >= 1 && game.global.challengeActive != "Daily") + windstackzone = getPageSetting('WindStackingMin'); + if (getPageSetting('dWindStackingMin') >= 1 && game.global.challengeActive == "Daily") + windstackzone = getPageSetting('dWindStackingMin'); var windstackmax = 200; - if (getPageSetting('WindStackingMax') >= 1) { - windstackmax = getPageSetting('WindStackingMax'); - } + if (getPageSetting('WindStackingMax') >= 1 && game.global.challengeActive != "Daily") + windstackmax = getPageSetting('WindStackingMax'); + if (getPageSetting('dWindStackingMax') >= 1 && game.global.challengeActive == "Daily") + windstackmax = getPageSetting('dWindStackingMax'); if (getEmpowerment() != "Wind" || game.global.mapsActive || (game.empowerments.Wind.currentDebuffPower >= windstackmax) || (windstackzone < 0) || (windstackzone >= game.global.world) || game.global.spireActive) { if (!(game.global.mapsActive && game.global.mapsOwnedArray[getMapIndex(game.global.currentMapId)].bonus === "lmc")) { From 432f554094722e64ff5225956a373d01f2507da7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:11:14 +0100 Subject: [PATCH 0777/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index fe32cddf0..28cf485df 100644 --- a/modules/other.js +++ b/modules/other.js @@ -928,7 +928,7 @@ function buyshitspire() { } function orangewindstack() { - if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { + if (getEmpowerment() == "Wind" && (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) || (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind'))) { if (game.equipment.Dagger.level > 9 && game.upgrades.Dagadder.locked == 0) buyUpgrade('Dagadder', true, true); if (game.equipment.Mace.level > 9 && game.upgrades.Megamace.locked == 0) From 142c432165aafd583eda1ebc9fef142b28fc4d24 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:16:55 +0100 Subject: [PATCH 0778/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index f62bbb913..dac996337 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -233,10 +233,11 @@ function mainLoop() { if (getPageSetting('buynojobsc')==true || getPageSetting('buynojobsc')==false) buynojobs(); if (getPageSetting('fightforever')==true) fightalways(); if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); - if (getPageSetting('windcutoff')>=1 || getPageSetting('dwindcutoff')>=1) cutoffwind(); + if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); + if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily")) dcutoffwind(); if (getPageSetting('spireshitbuy')==true) buyshitspire(); if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) orangewindstack(); - if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind')) orangewindstack(); + if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind')) dorangewindstack(); //Original From a09484142b3b204d991e7efa9228f55f288668c5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:16:58 +0100 Subject: [PATCH 0779/3477] Update other.js --- modules/other.js | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 28cf485df..4524556c0 100644 --- a/modules/other.js +++ b/modules/other.js @@ -920,6 +920,21 @@ function cutoffwind() { } } +function dcutoffwind() { + if (getPageSetting('windcutoff') < 1 && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world != getPageSetting('WindStackingMin')) { + MODULES["equipment"].enoughDamageCutoff = 4; + MODULES["maps"].enoughDamageCutoff = 4; + } + if (getPageSetting('windcutoff') >= 1 && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world < getPageSetting('WindStackingMin')) { + MODULES["equipment"].enoughDamageCutoff = 4; + MODULES["maps"].enoughDamageCutoff = 4; + } + if (getPageSetting('windcutoff') >= 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != getPageSetting('windcutoff') && MODULES["maps"].enoughDamageCutoff != getPageSetting('windcutoff') && game.global.world >= getPageSetting('WindStackingMin')) { + MODULES["equipment"].enoughDamageCutoff = getPageSetting('windcutoff'); + MODULES["maps"].enoughDamageCutoff = getPageSetting('windcutoff'); + } +} + function buyshitspire() { if (getPageSetting('spireshitbuy') == true && game.global.spireActive && game.global.world >= getPageSetting('IgnoreSpiresUntil')) { buyWeps(); @@ -928,7 +943,38 @@ function buyshitspire() { } function orangewindstack() { - if (getEmpowerment() == "Wind" && (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) || (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind'))) { + if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { + if (game.equipment.Dagger.level > 9 && game.upgrades.Dagadder.locked == 0) + buyUpgrade('Dagadder', true, true); + if (game.equipment.Mace.level > 9 && game.upgrades.Megamace.locked == 0) + buyUpgrade('Megamace', true, true); + if (game.equipment.Polearm.level > 9 && game.upgrades.Polierarm.locked == 0) + buyUpgrade('Polierarm', true, true); + if (game.equipment.Battleaxe.level > 9 && game.upgrades.Axeidic.locked == 0) + buyUpgrade('Axeidic', true, true); + if (game.equipment.Greatsword.level > 9 && game.upgrades.Greatersword.locked == 0) + buyUpgrade('Greatersword', true, true); + if (game.equipment.Arbalest.level > 9 && game.upgrades.Harmbalest.locked == 0) + buyUpgrade('Harmbalest', true, true); + if (game.upgrades.Bootboost.locked == 0) + buyUpgrade('Bootboost', true, true); + if (game.upgrades.Hellishmet.locked == 0) + buyUpgrade('Hellishmet', true, true); + if (game.upgrades.Pantastic.locked == 0) + buyUpgrade('Pantastic', true, true); + if (game.upgrades.Smoldershoulder.locked == 0) + buyUpgrade('Smoldershoulder', true, true); + if (game.upgrades.Bestplate.locked == 0) + buyUpgrade('Bestplate', true, true); + if (game.upgrades.GambesOP.locked == 0) + buyUpgrade('GambesOP', true, true); + if (game.upgrades.Supershield.locked == 0) + buyUpgrade('Supershield', true, true); + } +} + +function dorangewindstack() { + if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind')) { if (game.equipment.Dagger.level > 9 && game.upgrades.Dagadder.locked == 0) buyUpgrade('Dagadder', true, true); if (game.equipment.Mace.level > 9 && game.upgrades.Megamace.locked == 0) From a41e80c40e1bcfd95a655008e848c908d86a0f65 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:18:17 +0100 Subject: [PATCH 0780/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index dac996337..8312bc3ad 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -236,8 +236,8 @@ function mainLoop() { if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily")) dcutoffwind(); if (getPageSetting('spireshitbuy')==true) buyshitspire(); - if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) orangewindstack(); - if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind')) dorangewindstack(); + if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") orangewindstack(); + if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") dorangewindstack(); //Original From 83bbe5fb03399cae0f715db3b32b0181f52e3fa7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:18:58 +0100 Subject: [PATCH 0781/3477] Update upgrades.js --- modules/upgrades.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 6dc467368..945fc1333 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -8,7 +8,8 @@ function buyUpgrades() { var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps())) continue; - if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) continue; + if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") continue; + if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; //skip bloodlust during scientist challenges and while we have autofight enabled. From 88abc34635fabe13b95f04cd6aacf587a5476a27 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:22:22 +0100 Subject: [PATCH 0782/3477] Update equipment.js --- modules/equipment.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index ec276849e..282bb26c3 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -377,7 +377,8 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; - if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) return; + if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") return; + if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") return; if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); else @@ -415,7 +416,8 @@ function autoLevelEquipment() { //If we're considering an attack item, we want to buy weapons if we don't have enough damage, or if we don't need health (so we default to buying some damage) if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { - if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) return; + if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") return; + if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") return; debug('Leveling equipment ' + eqName, "equips", '*upload3'); buyEquipment(eqName, null, true); } From cc0672442236865af07d4430c3f92cf237550b50 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:26:27 +0100 Subject: [PATCH 0783/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 868b43c7e..2fefbb325 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -956,8 +956,10 @@ function updateCustomButtons() { (doDaily) ? turnOn("AutoFinishDaily") : turnOff("AutoFinishDaily"); getPageSetting('Dailybwraid')==true ? turnOn("dBWraidingz"): turnOff("dBWraidingz"); getPageSetting('Dailybwraid')==true ? turnOn("dBWraidingmax"): turnOff("dBWraidingmax"); + getPageSetting('use3daily')==true ? turnOn("dWindStackingMax"): turnOff("dWindStackingMax"); + getPageSetting('use3daily')==true ? turnOn("dWindStackingMax"): turnOff("dWindStackingMax"); - // Praid harder + //Praid harder getPageSetting('PraidHarder') ? turnOn('PraidFarmFragsZ') : turnOff('PraidFarmFragsZ'); getPageSetting('PraidHarder') ? turnOn('PraidBeforeFarmZ') : turnOff('PraidBeforeFarmZ'); getPageSetting('dPraidHarder') ? turnOn('dPraidFarmFragsZ') : turnOff('dPraidFarmFragsZ'); From 7962b1f7235f9eee728618eb5f369c9416632a99 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:27:11 +0100 Subject: [PATCH 0784/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 2fefbb325..12d27d0d8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -290,7 +290,7 @@ function initializeAllSettings() { createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Daily Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Daily'); createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Daily Z to BW raid setting for details.', 'multiValue', [-1], null, 'Daily'); - createSetting('use3daily', 'Use AS3 for Daily', 'Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); + createSetting('use3daily', 'Use AS3 for Daily', ' This must be on for Daily windstacking settings to appear! Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); //Line 3 createSetting('dWindStackingMin', 'Daily Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set for dailys. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); From 7bf17cc97d8a59a6fc415ebe8403551c98d0c8a4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:30:45 +0100 Subject: [PATCH 0785/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 8312bc3ad..3980104f5 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -234,7 +234,7 @@ function mainLoop() { if (getPageSetting('fightforever')==true) fightalways(); if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); - if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily")) dcutoffwind(); + if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); if (getPageSetting('spireshitbuy')==true) buyshitspire(); if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") orangewindstack(); if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") dorangewindstack(); From c962a3d042b40a2da53243bf00549b553c5e9298 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:32:29 +0100 Subject: [PATCH 0786/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 12d27d0d8..af80f04dc 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -290,7 +290,7 @@ function initializeAllSettings() { createSetting('Dailybwraid', 'Daily BW Raid', 'Toggle for Daily BW Raid settings. ', 'boolean', false, null, 'Daily'); createSetting('dBWraidingz', 'Daily Z to BW Raid', 'Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Daily Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.', 'multiValue', [-1], null, 'Daily'); createSetting('dBWraidingmax', 'Daily Max BW to raid', 'Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Daily Z to BW raid setting for details.', 'multiValue', [-1], null, 'Daily'); - createSetting('use3daily', 'Use AS3 for Daily', ' This must be on for Daily windstacking settings to appear! Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); + createSetting('use3daily', 'Use AS3 for Daily', ' This must be on for Daily windstacking settings to appear! Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); //Line 3 createSetting('dWindStackingMin', 'Daily Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set for dailys. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); From 5fb6358871cce847a0d43299020f8ac7a827eded Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:34:08 +0100 Subject: [PATCH 0787/3477] Update SettingsGUI.js --- SettingsGUI.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index af80f04dc..7c40ff3dd 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -293,10 +293,10 @@ function initializeAllSettings() { createSetting('use3daily', 'Use AS3 for Daily', ' This must be on for Daily windstacking settings to appear! Overrides your Autostance settings to use AS3 on Dailys. Make sure to set your windstacking settings in Combat! (AS3 needs to be selected for them to appear, once selected you can switch back)', 'boolean', false, null, 'Daily'); //Line 3 - createSetting('dWindStackingMin', 'Daily Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set for dailys. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); - createSetting('dWindStackingMax', 'Daily Windstack Max', 'For use with AutoStance 3 in dailys. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); - createSetting('dwindcutoff', 'Daily Wind Damage Cutoff', 'Set this value to optimise your windstacking in dailys. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); - createSetting('dhardcorewind', 'Daily Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack in dailys. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); + createSetting('dWindStackingMin', 'Daily Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set for dailys. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Daily'); + createSetting('dWindStackingMax', 'Daily Windstack Max', 'For use with AutoStance 3 in dailys. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Daily'); + createSetting('dwindcutoff', 'Daily Wind Damage Cutoff', 'Set this value to optimise your windstacking in dailys. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Daily'); + createSetting('dhardcorewind', 'Daily Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack in dailys. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Daily'); //Buildings From e1a20157d4462c8c1b9cd536769fbcbddfec19e4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:35:28 +0100 Subject: [PATCH 0788/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 7c40ff3dd..042dc9211 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -956,7 +956,7 @@ function updateCustomButtons() { (doDaily) ? turnOn("AutoFinishDaily") : turnOff("AutoFinishDaily"); getPageSetting('Dailybwraid')==true ? turnOn("dBWraidingz"): turnOff("dBWraidingz"); getPageSetting('Dailybwraid')==true ? turnOn("dBWraidingmax"): turnOff("dBWraidingmax"); - getPageSetting('use3daily')==true ? turnOn("dWindStackingMax"): turnOff("dWindStackingMax"); + getPageSetting('use3daily')==true ? turnOn("dWindStackingMin"): turnOff("dWindStackingMin"); getPageSetting('use3daily')==true ? turnOn("dWindStackingMax"): turnOff("dWindStackingMax"); //Praid harder From 9a4c81567d13e87ca648791db98ebbb840b331c1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:41:52 +0100 Subject: [PATCH 0789/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 3980104f5..eaa6d766f 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,10 +61,11 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "18/07/2018", version: "v2.4.1", description: "Updated Spikes Hardcore Praiding to include more user input. Hardcore windstacking buys equips if it lowers your attack. Ratio almost done. ", isNew: true}); +changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a min fuel zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added Multi BW raiding! ", isNew: true}); +changelogList.push({date: "18/07/2018", version: "v2.4.1", description: "Updated Spikes Hardcore Praiding to include more user input. Hardcore windstacking buys equips if it lowers your attack. Ratio almost done. ", isNew: false}); changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Spike came through again with some hardcore Praiding Options, check em out while they fresh son. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: false}); changelogList.push({date: "14/07/2018", version: "v2.3.5", description: "Tinkered with BAF3 to better respect your fight settings. Added Always fight option. AS3 only in Dailys option. Option for workers in Watch and Trapper. Fixed some UI bugs. New z550+ Ratio soon (No one apart from me will probably use it but whatever) ", isNew: false}); -changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised and Spire breed timer fixed, many thanks to Spikenslab once again. ", isNew: false}); +//changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised and Spire breed timer fixed, many thanks to Spikenslab once again. ", isNew: false}); //changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). Oh, and one more thing, I removed Void praiding (and daily) due to multiple Praiding now. So if you want to raid before voids, make sure you set it!", isNew: false}); //changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation has arrived. Make sure to set your daily autoportal and voids! Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: false}); //changelogList.push({date: "26/06/2018", version: "v2.3.1", description: "Internal calc and scryer reworked by Spikenslab, massive thanks to him. Other small tweaks such as spire breed timer and trimpicide are now working again. Heirloom animations fixed by Th3Legendary, other small tweaks to Praiding and BWraiding. Various other tiny tweaks. More to come in following days! ", isNew: false}); From 3c26cbf0d3e537ce502cec3c64136b17a0c953e3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:43:49 +0100 Subject: [PATCH 0790/3477] Update SettingsGUI.js --- SettingsGUI.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 042dc9211..5bca27818 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -472,13 +472,14 @@ function initializeAllSettings() { //Line 1 createSetting('UseAutoGen', ['Auto Generator OFF', 'Auto Generator ON'], 'MASTER BUTTON Dynamically switch generator modes. Required for the following mode management configurations to work. The Dimensional Generator is a building unlocked in The Magma, from z230.', 'multitoggle', 0, null, 'Magma'); createSetting('AutoGen2', ['Default', 'Microtick', 'Max Cap', 'Overclock'], 'Before Z is reached, Microtick and Max Cap will switch between [Hybrid / Gain Fuel] to get EXACTLY one / FULL stacks of Capacity (not Storage) before using [Gain Mi]. Default will respect whatever you set it to and won\'t fiddle with it unless challenge overriding is on. Overclock will Gain Fuel until Z.', 'multitoggle', 2, null, 'Magma'); + createSetting('fuellater', 'Start Fuel Z', 'Start fueling at thiz zone instead of 230. I would suggest you have a value lower than your max, for obvious reasons. Recommend starting at 300 and end fueling at 350. ', 'value', -1, null, 'Magma'); createSetting('AutoGen2End', 'End Early Mode Z', 'On and after Z, be done with the mode we start with and switch to the final mode. -1 to disable.', 'value', 300, null, 'Magma'); createSetting('AutoGen2SupplyEnd', 'End at Supply', 'On and after the zone for gathering the most magma by Supply, end Early Mode. Works alongside AutoGen2End and will end when either condition is met.', 'boolean', false, null, 'Magma'); createSetting('AutoGen3', ['Gain Mi', 'Gain Fuel', 'Hybrid'], 'Mode to use after Z / SupplyEnd.', 'multitoggle', 1, null, 'Magma'); createSetting('AutoGenDC', ['Daily: Normal', 'Daily: Fuel', 'Daily: Hybrid'], 'Use a special mode in dailies to make the most out of it. Overrides AutoGen3 unless Strong Override is on.', 'multitoggle', 1, null, 'Magma'); - createSetting('AutoGenC2', ['c2: Normal', 'c2: Fuel', 'c2: Hybrid'], 'Use a special mode when running challenge2s to make the most out of it. Overrides AutoGen3 unless Strong Override is on.', 'multitoggle', 1, null, 'Magma'); - + //Line 2 + createSetting('AutoGenC2', ['c2: Normal', 'c2: Fuel', 'c2: Hybrid'], 'Use a special mode when running challenge2s to make the most out of it. Overrides AutoGen3 unless Strong Override is on.', 'multitoggle', 1, null, 'Magma'); createSetting('AutoGen2Override', ['Override Final Only', 'Strong Override'], 'Overrides apply to the final mode (always use early mode), or also to early mode (will stop microtick etc). Normal will not change anything.', 'multitoggle', 1, null, 'Magma'); createSetting('AutoMagmiteSpender2', ['Spend Magmite OFF', 'Spend Magmite (Portal)', 'Spend Magmite Always'], 'Auto Spends any unspent Magmite immediately before portaling. (Or Always, if toggled). Part 1 buys any permanent one-and-done upgrades in order from most expensive to least. Part 2 then analyzes Efficiency vs Capacity for cost/benefit, and buys Efficiency if its BETTER than Capacity. If not, if the PRICE of Capacity is less than the price of Supply, it buys Capacity. If not, it buys Supply. And then it repeats itself until you run out of Magmite and cant buy anymore. For Magma z230+ purposes.', 'multitoggle', 1, null, 'Magma'); createSetting('SupplyWall', 'Throttle Supply (or Capacity)', 'Positive number NOT 1 e.g. 2.5: Consider Supply when its cost * 2.5 is < Capacity, instead of immediately when < Cap. Effectively throttles supply for when you don\'t need too many.

    Negative number (-1 is ok) e.g. -2.5: Consider Supply if it costs < Capacity * 2.5, buy more supplys! Effectively throttling capacity instead.

    Set to 1: DISABLE SUPPLY only spend magmite on Efficiency, Capacity and Overclocker. (For some end game players, supply is worth probably figuratively nothing.)
    Set to 0: IGNORE SETTING and use old behaviour (will still try to buy overclocker)    ', 'valueNegative', 2, null, 'Magma'); From 5575a75df21706e8e315cc9dc53ec9937fcc7d22 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:44:16 +0100 Subject: [PATCH 0791/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 - 1 file changed, 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 5bca27818..b482fd95a 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -484,7 +484,6 @@ function initializeAllSettings() { createSetting('AutoMagmiteSpender2', ['Spend Magmite OFF', 'Spend Magmite (Portal)', 'Spend Magmite Always'], 'Auto Spends any unspent Magmite immediately before portaling. (Or Always, if toggled). Part 1 buys any permanent one-and-done upgrades in order from most expensive to least. Part 2 then analyzes Efficiency vs Capacity for cost/benefit, and buys Efficiency if its BETTER than Capacity. If not, if the PRICE of Capacity is less than the price of Supply, it buys Capacity. If not, it buys Supply. And then it repeats itself until you run out of Magmite and cant buy anymore. For Magma z230+ purposes.', 'multitoggle', 1, null, 'Magma'); createSetting('SupplyWall', 'Throttle Supply (or Capacity)', 'Positive number NOT 1 e.g. 2.5: Consider Supply when its cost * 2.5 is < Capacity, instead of immediately when < Cap. Effectively throttles supply for when you don\'t need too many.

    Negative number (-1 is ok) e.g. -2.5: Consider Supply if it costs < Capacity * 2.5, buy more supplys! Effectively throttling capacity instead.

    Set to 1: DISABLE SUPPLY only spend magmite on Efficiency, Capacity and Overclocker. (For some end game players, supply is worth probably figuratively nothing.)
    Set to 0: IGNORE SETTING and use old behaviour (will still try to buy overclocker)    ', 'valueNegative', 2, null, 'Magma'); createSetting('BuyOneTimeOC', ['Buy OneTime Only (No OC)', 'Maybe Buy OneTime & OC', 'Maybe Buy OneTime (No OC)', 'Buy OneTime & OC Only'], 'Buy OneTime Only (No OC) = ONLY BUYS ONE TIME UPGRADES, NOTHING ELSE.
    Maybe Buy OneTime & OC = Normal spending, will consider Overclocker and One Time Upgrades
    Maybe Buy OneTime (No OC) = Normal Spending, but will NOT Buy Overclocker (Will still buy the first level if you don\'t have it).
    Buy OneTime & OC Only = Will Force spend magmite on these two only, ignoring Efficiency, Capacity and Supply.
    Recommend Default (Maybe Buy OneTime & OC)', 'multitoggle', 1, null, 'Magma'); - createSetting('fuellater', 'Start Fuel Z', 'Start fueling at thiz zone instead of 230. I would suggest you have a value lower than your max, for obvious reasons. Recommend starting at 300 and end fueling at 350. ', 'value', -1, null, 'Magma'); createSetting('MagmiteExplain', 'Magmite spending behaviour', '1. Buy one-and-done upgrades, expensive first, then consider 1st level of Overclocker;
    2. Buy Overclocker IF AND ONLY IF we can afford it;
    2.5. Exit if OneTimeOnly
    3. Buy Efficiency if it is better than capacity;
    4. Buy Capacity or Supply depending on which is cheaper, or based on SupplyWall', 'infoclick', 'MagmiteExplain', null, 'Magma'); From 6e71e9418ef321df3637d26d11c107564ce3cc00 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:47:22 +0100 Subject: [PATCH 0792/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index eaa6d766f..c995d3822 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,7 +61,7 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a min fuel zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added Multi BW raiding! ", isNew: true}); +changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a Min Fuel Zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added MULTI BW RAIDING! ", isNew: true}); changelogList.push({date: "18/07/2018", version: "v2.4.1", description: "Updated Spikes Hardcore Praiding to include more user input. Hardcore windstacking buys equips if it lowers your attack. Ratio almost done. ", isNew: false}); changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Spike came through again with some hardcore Praiding Options, check em out while they fresh son. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: false}); changelogList.push({date: "14/07/2018", version: "v2.3.5", description: "Tinkered with BAF3 to better respect your fight settings. Added Always fight option. AS3 only in Dailys option. Option for workers in Watch and Trapper. Fixed some UI bugs. New z550+ Ratio soon (No one apart from me will probably use it but whatever) ", isNew: false}); From 7f63c7c3f9c4acc823b323dec613b14eacd8c305 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 09:55:40 +0100 Subject: [PATCH 0793/3477] Update magmite.js --- modules/magmite.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index 41a0d298c..b7af607d6 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -145,9 +145,9 @@ function autoGenerator() { const world = game.global.world; if (world < 230) return; // Magma only - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) return; const endZ = getPageSetting('AutoGen2End'); @@ -169,9 +169,9 @@ function autoGenerator2() { // Respect overrides first. if (getPageSetting('AutoGen2Override') && autoGenOverrides()) return; - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) return; const mode = getPageSetting('AutoGen2'); // None : Microtick : Cap if (!mode) // Default: move on @@ -192,9 +192,9 @@ function autoGenerator2() { function autoGenOverrides() { const overriden = (game.global.runningChallengeSquared && getPageSetting('AutoGenC2')) || (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC')); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) return; if (overriden && (game.global.generatorMode != overriden)) changeGeneratorState(overriden); From 78869c869f5a67f28dc422db2f13d753aaeb626d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 21 Jul 2018 10:01:01 +0100 Subject: [PATCH 0794/3477] Update magmite.js --- modules/magmite.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index b7af607d6..c0bf01116 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -145,9 +145,9 @@ function autoGenerator() { const world = game.global.world; if (world < 230) return; // Magma only - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) return; const endZ = getPageSetting('AutoGen2End'); @@ -169,9 +169,9 @@ function autoGenerator2() { // Respect overrides first. if (getPageSetting('AutoGen2Override') && autoGenOverrides()) return; - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) return; const mode = getPageSetting('AutoGen2'); // None : Microtick : Cap if (!mode) // Default: move on @@ -192,9 +192,9 @@ function autoGenerator2() { function autoGenOverrides() { const overriden = (game.global.runningChallengeSquared && getPageSetting('AutoGenC2')) || (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC')); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) return; if (overriden && (game.global.generatorMode != overriden)) changeGeneratorState(overriden); From 73516a8ce65947d3eb7272f2ca87456880e22815 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 22 Jul 2018 21:23:04 +0100 Subject: [PATCH 0795/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 + 1 file changed, 1 insertion(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index b482fd95a..3a958a597 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -460,6 +460,7 @@ function initializeAllSettings() { //Line 2 createSetting('ScryerSkipBoss2', ['Boss: NEVER (All Levels)','Boss: NEVER (Above VoidLevel)','Boss: MAYBE'], 'NEVER (All Levels) will NEVER use S in cell 100 of the world!!!
    NEVER (Above VoidLevel) will NEVER use S in cell 100 of the world ABOVE the zone that your void maps are set to run at (Maps).
    MAYBE treats the cell no differently to any other, Overkill and Min/Max Scryer is allowed.

    Recommend NEVER (There is little benefit to double NON-HELIUM resources and a small chance of DE).', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate against Corrupted enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Magma maps and Corrupted Voidmaps are currently classified as corrupted and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); + createSetting('ScryerSkipHealthy', ['Healthy: NEVER', 'Healthy: FORCE','Healthy: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate against Healthy enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Magma maps and Corrupted Voidmaps are currently classified as Healthy (same as corrupted) and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
    Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. NOTE: Use at your own risk.
    Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); createSetting('ScryUseinPoison', 'Scry in Poison','-1 to disable, any other number (including 0) sets a minimum zone to use S in Poison', 'value', -1, null, 'Scryer'); createSetting('ScryUseinWind', 'Scry in Wind','-1 to disable, any other number (including 0) sets a minimum zone to use S in Wind', 'value', -1, null, 'Scryer'); From 9ff7251ecd89c89e35825a598c29dbac28f44797 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 22 Jul 2018 21:24:40 +0100 Subject: [PATCH 0796/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 3a958a597..b1a875805 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -460,7 +460,7 @@ function initializeAllSettings() { //Line 2 createSetting('ScryerSkipBoss2', ['Boss: NEVER (All Levels)','Boss: NEVER (Above VoidLevel)','Boss: MAYBE'], 'NEVER (All Levels) will NEVER use S in cell 100 of the world!!!
    NEVER (Above VoidLevel) will NEVER use S in cell 100 of the world ABOVE the zone that your void maps are set to run at (Maps).
    MAYBE treats the cell no differently to any other, Overkill and Min/Max Scryer is allowed.

    Recommend NEVER (There is little benefit to double NON-HELIUM resources and a small chance of DE).', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate against Corrupted enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Magma maps and Corrupted Voidmaps are currently classified as corrupted and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); - createSetting('ScryerSkipHealthy', ['Healthy: NEVER', 'Healthy: FORCE','Healthy: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate against Healthy enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Magma maps and Corrupted Voidmaps are currently classified as Healthy (same as corrupted) and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); + createSetting('ScryerSkipHealthy', ['Healthy: NEVER', 'Healthy: FORCE','Healthy: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate against Healthy enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Corrupted Voidmaps are currently classified as Healthy (same as corrupted) and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
    Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. NOTE: Use at your own risk.
    Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); createSetting('ScryUseinPoison', 'Scry in Poison','-1 to disable, any other number (including 0) sets a minimum zone to use S in Poison', 'value', -1, null, 'Scryer'); createSetting('ScryUseinWind', 'Scry in Wind','-1 to disable, any other number (including 0) sets a minimum zone to use S in Wind', 'value', -1, null, 'Scryer'); From 288d50e37f99bfadc1b9b4e6c9cbdce746283f3a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 22 Jul 2018 21:26:52 +0100 Subject: [PATCH 0797/3477] Update scryer.js --- modules/scryer.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 6c04ec17c..e73b103d9 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -28,7 +28,7 @@ function useScryerStance() { || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never var curEnemy = getCurrentEnemy(1); - var iscorrupt = curEnemy && (curEnemy.mutation == "Corruption" || curEnemy.mutation == "Healthy"); + var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Magma.active()); iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_auto))) { @@ -36,6 +36,15 @@ function useScryerStance() { wantToScry = false; return; } + // heck Healthy never + var curEnemyhealth = getCurrentEnemy(1); + var ishealthy = curEnemyhealth && curEnemyhealth.mutation == "Healthy"; + ishealthy = ishealthy || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); + if ((ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (use_auto))) { + autostancefunction(); + wantToScry = false; + return; + } //check Force (This overrides overkill settings) //check map Force @@ -54,6 +63,11 @@ function useScryerStance() { wantToScry = true; return; } + if ((ishealthy && getPageSetting('ScryerSkipHealthy') == 1) || (use_scryer)) { + setFormation(4); + wantToScry = true; + return; + } //If neither NEVER or FORCE, move on to assessing whether to MAYBE From 21ed9866b321d44dcde820d48bf6512d1013625f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 23 Jul 2018 12:37:31 +0100 Subject: [PATCH 0798/3477] Update other.js --- modules/other.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/other.js b/modules/other.js index 4524556c0..14402b261 100644 --- a/modules/other.js +++ b/modules/other.js @@ -921,17 +921,17 @@ function cutoffwind() { } function dcutoffwind() { - if (getPageSetting('windcutoff') < 1 && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world != getPageSetting('WindStackingMin')) { + if (getPageSetting('dwindcutoff') < 1 && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world != getPageSetting('dWindStackingMin')) { MODULES["equipment"].enoughDamageCutoff = 4; MODULES["maps"].enoughDamageCutoff = 4; } - if (getPageSetting('windcutoff') >= 1 && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world < getPageSetting('WindStackingMin')) { + if (getPageSetting('dwindcutoff') >= 1 && MODULES["equipment"].enoughDamageCutoff != 4 && MODULES["maps"].enoughDamageCutoff != 4 && game.global.world < getPageSetting('dWindStackingMin')) { MODULES["equipment"].enoughDamageCutoff = 4; MODULES["maps"].enoughDamageCutoff = 4; } - if (getPageSetting('windcutoff') >= 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != getPageSetting('windcutoff') && MODULES["maps"].enoughDamageCutoff != getPageSetting('windcutoff') && game.global.world >= getPageSetting('WindStackingMin')) { - MODULES["equipment"].enoughDamageCutoff = getPageSetting('windcutoff'); - MODULES["maps"].enoughDamageCutoff = getPageSetting('windcutoff'); + if (getPageSetting('dwindcutoff') >= 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != getPageSetting('windcutoff') && MODULES["maps"].enoughDamageCutoff != getPageSetting('dwindcutoff') && game.global.world >= getPageSetting('dWindStackingMin')) { + MODULES["equipment"].enoughDamageCutoff = getPageSetting('dwindcutoff'); + MODULES["maps"].enoughDamageCutoff = getPageSetting('dwindcutoff'); } } From 92154a2d0bfc18a886e3aadf18d39889a97f5593 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 23 Jul 2018 15:04:11 +0100 Subject: [PATCH 0799/3477] Update other.js --- modules/other.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/other.js b/modules/other.js index 14402b261..0b8eeef80 100644 --- a/modules/other.js +++ b/modules/other.js @@ -1003,3 +1003,9 @@ function dorangewindstack() { buyUpgrade('Supershield', true, true); } } + +function amalwatch() { + var amalcount = game.jobs.Amalgamator.owned + if (amalcount != game.jobs.Amalgamator.owned) + manualFight(); +} From e19900bbffa0bf1972a9131c9630ffbd219dd4de Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 23 Jul 2018 15:21:03 +0100 Subject: [PATCH 0800/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index b1a875805..68668ec19 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -443,7 +443,7 @@ function initializeAllSettings() { createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); createSetting('fightforever', 'Fight Always', 'Sends trimps to fight if they\'re not fighting, regardless of BAF.', 'boolean', 'false', null, 'Combat'); - + createSetting('addpoison', 'Poison Calc', 'Experimental. Adds poison to the battlecalc. May improve your poison zone speed. ', 'boolean', 'false', null, 'Combat'); //Scryer From 9ae6b303088b1160904c9a69ede9ee8b9db1f941 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 23 Jul 2018 15:22:44 +0100 Subject: [PATCH 0801/3477] Update battlecalc.js --- modules/battlecalc.js | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 94f7f6925..5cb493ee9 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -8,30 +8,7 @@ function getBattleStats(what,form,crit) { // var minFluct = 0.2; if (what == "health" || what == "attack"){ currentCalc += (what == "health") ? 50 : 6; -/* if (what == "attack"){ - //Discipline - if (game.global.challengeActive == "Discipline"){ - minFluct = 0.995; - maxFluct = 0.995; - } - else { - //Range - if (game.portal.Range.level > 0){ - minFluct -= (0.02 * game.portal.Range.level); - } - //MinDamageDaily - if (typeof game.global.dailyChallenge.minDamage !== 'undefined'){ - var addMin = dailyModifiers.minDamage.getMult(game.global.dailyChallenge.minDamage.strength); - minFluct += addMin; - if (minFluct > 1) minFluct = 1; - } - //MaxDamageDaily - if (typeof game.global.dailyChallenge.maxDamage !== 'undefined'){ - var addMax = dailyModifiers.maxDamage.getMult(game.global.dailyChallenge.maxDamage.strength); - maxFluct += addMax; - } - } - } */ + for (var equip in game.equipment){ var temp = game.equipment[equip]; if (typeof temp[what] === 'undefined' || temp.level <= 0 || temp.blockNow) continue; @@ -231,6 +208,10 @@ function getBattleStats(what,form,crit) { if (game.jobs.Magmamancer.owend > 0) { currentCalc *= game.jobs.Magmamancer.getBonusPercent(); } + if (what == "attack" && getEmpowerment() == "Poison" && getPageSetting('addpoison') == true){ + var amt = game.empowerments.Poison.getModifier(); + currentCalc *= (1 + amt); + } if (crit) { var critChance = getPlayerCritChance(); if (what == "attack" && critChance){ From d2b2fa6a0d52916f09dc0163fd572d5347205c23 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 24 Jul 2018 10:36:43 +0100 Subject: [PATCH 0802/3477] Update magmite.js --- modules/magmite.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index c0bf01116..f03085267 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -192,10 +192,10 @@ function autoGenerator2() { function autoGenOverrides() { const overriden = (game.global.runningChallengeSquared && getPageSetting('AutoGenC2')) || (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC')); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) + /*if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) changeGeneratorState(0); if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) - return; + return;*/ if (overriden && (game.global.generatorMode != overriden)) changeGeneratorState(overriden); return overriden; From 72fff9a3eaa90f2c39d4f58458fb51e3f20e8b4d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 24 Jul 2018 10:40:18 +0100 Subject: [PATCH 0803/3477] Update magmite.js --- modules/magmite.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index f03085267..169c3590b 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -145,9 +145,9 @@ function autoGenerator() { const world = game.global.world; if (world < 230) return; // Magma only - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) return; const endZ = getPageSetting('AutoGen2End'); @@ -169,9 +169,9 @@ function autoGenerator2() { // Respect overrides first. if (getPageSetting('AutoGen2Override') && autoGenOverrides()) return; - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) return; const mode = getPageSetting('AutoGen2'); // None : Microtick : Cap if (!mode) // Default: move on From dba21ef450d00e34beb1421648462751be3445c9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 24 Jul 2018 10:42:53 +0100 Subject: [PATCH 0804/3477] Update magmite.js --- modules/magmite.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index 169c3590b..980693cd3 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -192,10 +192,10 @@ function autoGenerator2() { function autoGenOverrides() { const overriden = (game.global.runningChallengeSquared && getPageSetting('AutoGenC2')) || (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC')); - /*if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) +if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) changeGeneratorState(0); if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) - return;*/ + return; if (overriden && (game.global.generatorMode != overriden)) changeGeneratorState(overriden); return overriden; From e94b58e340e617b8c923cc51b117dc080e7cb4e1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 24 Jul 2018 10:54:08 +0100 Subject: [PATCH 0805/3477] Update magmite.js --- modules/magmite.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index 980693cd3..874d3367a 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -145,9 +145,9 @@ function autoGenerator() { const world = game.global.world; if (world < 230) return; // Magma only - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && ((getPageSetting('AutoGenDC') == 0 && game.global.challengeActive != "Daily") || (getPageSetting('AutoGenC2') != 0 && !game.global.runningChallengeSquared))) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && ((getPageSetting('AutoGenDC') == 0 && game.global.challengeActive != "Daily") || (getPageSetting('AutoGenC2') != 0 && !game.global.runningChallengeSquared))) return; const endZ = getPageSetting('AutoGen2End'); @@ -169,9 +169,9 @@ function autoGenerator2() { // Respect overrides first. if (getPageSetting('AutoGen2Override') && autoGenOverrides()) return; - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && ((getPageSetting('AutoGenDC') == 0 && game.global.challengeActive != "Daily") || (getPageSetting('AutoGenC2') != 0 && !game.global.runningChallengeSquared))) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && ((getPageSetting('AutoGenDC') == 0 && game.global.challengeActive != "Daily") || (getPageSetting('AutoGenC2') != 0 && !game.global.runningChallengeSquared))) return; const mode = getPageSetting('AutoGen2'); // None : Microtick : Cap if (!mode) // Default: move on @@ -192,10 +192,6 @@ function autoGenerator2() { function autoGenOverrides() { const overriden = (game.global.runningChallengeSquared && getPageSetting('AutoGenC2')) || (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC')); -if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) - changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && !(game.global.runningChallengeSquared || game.global.challengeActive == "Daily")) - return; if (overriden && (game.global.generatorMode != overriden)) changeGeneratorState(overriden); return overriden; From 2ca09b9600a68168f9dcc84d598a41a8f7fd7596 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 24 Jul 2018 10:58:01 +0100 Subject: [PATCH 0806/3477] Update magmite.js --- modules/magmite.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index 874d3367a..fb3c46ae3 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -145,10 +145,12 @@ function autoGenerator() { const world = game.global.world; if (world < 230) return; // Magma only - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && ((getPageSetting('AutoGenDC') == 0 && game.global.challengeActive != "Daily") || (getPageSetting('AutoGenC2') != 0 && !game.global.runningChallengeSquared))) + if (getPageSetting('AutoGen2Override') && autoGenOverrides()) + return; + /* if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && ((getPageSetting('AutoGenDC') == 0 && game.global.challengeActive != "Daily") || (getPageSetting('AutoGenC2') == 0 && !game.global.runningChallengeSquared))) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && ((getPageSetting('AutoGenDC') == 0 && game.global.challengeActive != "Daily") || (getPageSetting('AutoGenC2') != 0 && !game.global.runningChallengeSquared))) - return; + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && ((getPageSetting('AutoGenDC') == 0 && game.global.challengeActive != "Daily") || (getPageSetting('AutoGenC2') == 0 && !game.global.runningChallengeSquared))) + return;*/ const endZ = getPageSetting('AutoGen2End'); const endS = getPageSetting('AutoGen2SupplyEnd'); @@ -169,9 +171,9 @@ function autoGenerator2() { // Respect overrides first. if (getPageSetting('AutoGen2Override') && autoGenOverrides()) return; - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && ((getPageSetting('AutoGenDC') == 0 && game.global.challengeActive != "Daily") || (getPageSetting('AutoGenC2') != 0 && !game.global.runningChallengeSquared))) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && ((getPageSetting('AutoGenDC') == 0 && game.global.challengeActive != "Daily") || (getPageSetting('AutoGenC2') != 0 && !game.global.runningChallengeSquared))) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) return; const mode = getPageSetting('AutoGen2'); // None : Microtick : Cap if (!mode) // Default: move on From 9a27a0e18c77e84b2f2d5e92b7f869f7043da82e Mon Sep 17 00:00:00 2001 From: spikenskab <36603307+spikenskab@users.noreply.github.com> Date: Tue, 24 Jul 2018 16:08:01 +0100 Subject: [PATCH 0807/3477] Fix typo for daily PraidHarder setting --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index c995d3822..c57893b80 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -221,7 +221,7 @@ function mainLoop() { if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily") dailyexitSpireCell(); if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); //breedtimer.js if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); //other.js - if (getPageSetting('PraidHarder') && getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily" || getPageSetting('PraidHarder') && getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") PraidHarder(); + if (getPageSetting('PraidHarder') && getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily" || getPageSetting('dPraidHarder') && getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") PraidHarder(); else { if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); //Prestige Raiding (other.js) if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); //Prestige Raiding (other.js) From 0c0195cc185aa90f8329f00df960a39c72b45417 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 25 Jul 2018 16:42:49 +0100 Subject: [PATCH 0808/3477] Update equipment.js --- modules/equipment.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/equipment.js b/modules/equipment.js index 282bb26c3..407feeb19 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -395,7 +395,7 @@ function autoLevelEquipment() { //(same function) //LEVELING EQUIPMENT SECTION: preBuy(); - game.global.buyAmt = getPageSetting('gearamounttobuy'); //needed for buyEquipment() + game.global.buyAmt = 1 var BuyWeaponLevels = ((getPageSetting('BuyWeaponsNew')==1) || (getPageSetting('BuyWeaponsNew')==3)); var BuyArmorLevels = ((getPageSetting('BuyArmorNew')==1) || (getPageSetting('BuyArmorNew')==3)); for (var stat in Best) { @@ -419,6 +419,7 @@ function autoLevelEquipment() { if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") return; if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") return; debug('Leveling equipment ' + eqName, "equips", '*upload3'); + game.global.buyAmt = getPageSetting('gearamounttobuy'); buyEquipment(eqName, null, true); } } @@ -426,6 +427,7 @@ function autoLevelEquipment() { if (BuyArmorLevels && (DaThing.Stat == 'health' || DaThing.Stat == 'block') && (!enoughHealthE || maxmap || spirecheck)) { if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); + game.global.buyAmt = getPageSetting('gearamounttobuy'); buyEquipment(eqName, null, true); } } @@ -433,6 +435,7 @@ function autoLevelEquipment() { var aalvl2 = MODULES["equipment"].alwaysLvl2; //was getPageSetting('AlwaysArmorLvl2'); if (BuyArmorLevels && (DaThing.Stat == 'health') && aalvl2 && game.equipment[eqName].level < 2){ if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { + game.global.buyAmt = 1 debug('Leveling equipment ' + eqName + " (AlwaysLvl2)", "equips", '*upload3'); buyEquipment(eqName, null, true); } From a7ba429c7e05279dfd4f1c1f429dd471eb2beaf1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 25 Jul 2018 17:30:20 +0100 Subject: [PATCH 0809/3477] Update equipment.js --- modules/equipment.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 407feeb19..86acd4f1f 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -415,9 +415,9 @@ function autoLevelEquipment() { var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; //If we're considering an attack item, we want to buy weapons if we don't have enough damage, or if we don't need health (so we default to buying some damage) if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { + if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") return; + if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") return; if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { - if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") return; - if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") return; debug('Leveling equipment ' + eqName, "equips", '*upload3'); game.global.buyAmt = getPageSetting('gearamounttobuy'); buyEquipment(eqName, null, true); From b5729d35df07e1590e5f6f20c61b18e7f7162bb8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 31 Jul 2018 11:21:11 +0100 Subject: [PATCH 0810/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index c57893b80..2646ede55 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -190,8 +190,8 @@ function mainLoop() { || (!heirloomsShown && heirloomFlag) // closed heirlooms screen || (heirloomCache != game.global.heirloomsExtra.length)) { // inventory size changed (a drop appeared) // also pre-portal: portal.js:111 - if (getPageSetting('AutoHeirlooms2')) autoHeirlooms2(); //"Auto Heirlooms 2" (heirlooms.js) - else if (getPageSetting('AutoHeirlooms')) autoHeirlooms();//"Auto Heirlooms" (") + if (getPageSetting('AutoHeirloomsNew')==2) autoHeirlooms2(); //"Auto Heirlooms 2" (heirlooms.js) + else if (getPageSetting('AutoHeirloomsNew')==1) autoHeirlooms();//"Auto Heirlooms" (") if (getPageSetting('AutoUpgradeHeirlooms') && !heirloomsShown) autoNull(); //"Auto Upgrade Heirlooms" (heirlooms.js) heirloomCache = game.global.heirloomsExtra.length; From 3206b7a3cbcc1e4ab7255f09cc67fc705302c8d0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 5 Aug 2018 22:53:21 +0100 Subject: [PATCH 0811/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 0b8eeef80..e9de3245c 100644 --- a/modules/other.js +++ b/modules/other.js @@ -877,7 +877,7 @@ function heliumydaily() { } function buynojobs() { - if (getPageSetting('buynojobsc')==true && game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper') { + if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) { buyjobbies = false; } if (getPageSetting('buynojobsc')==false) { From 2906ba663208b10ac2d7dde14e7c158d2f436443 Mon Sep 17 00:00:00 2001 From: spikenskab <36603307+spikenskab@users.noreply.github.com> Date: Tue, 7 Aug 2018 02:17:28 +0100 Subject: [PATCH 0812/3477] Fix infinite map loop --- modules/maps.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maps.js b/modules/maps.js index 98775c8e3..82158e222 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -589,7 +589,7 @@ function autoMap() { } //if needPrestige, TRY to find current level map as the highest level map we own. } else if (needPrestige || (extraMapLevels > 0)) { - if ((game.global.world + extraMapLevels) == game.global.mapsOwnedArray[highestMap].level) + if ((game.global.world + extraMapLevels) <= game.global.mapsOwnedArray[highestMap].level) selectedMap = game.global.mapsOwnedArray[highestMap].id; else selectedMap = "create"; From 63e8d6bc184512454ef1b095344f29b05010bea8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 7 Aug 2018 19:50:53 +0100 Subject: [PATCH 0813/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 + 1 file changed, 1 insertion(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 68668ec19..440a6ada1 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -246,6 +246,7 @@ function initializeAllSettings() { //Line 1: createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Auto Gather/Build #2', 'Science Research OFF'], 'Controls what YOU do. Manual does nothing
    The Decision between AutoGather 1 or 2 is up to you, and they should be similar. Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
    You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All Upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); + createSetting('amalcoord', 'Amal Boost', 'Boost your Amal count for more Mi. Will not buy coords until your H:D ratio is below a certain value. This means that you will get amals quicker. Will not activate higher than your end fueling zone! ', 'boolean', false, null, "Core"); createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); createSetting('fastallocate', 'Fast Allocate', 'Turn on if your helium is above 500Qa. Not recommended for low amounts of helium. ', 'boolean', false, null, 'Core'); createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); From 6941ac6a1d1e19df6ac26ba74f100f6fbc531949 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 7 Aug 2018 19:53:49 +0100 Subject: [PATCH 0814/3477] Update maps.js --- modules/maps.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/maps.js b/modules/maps.js index 82158e222..920009bc9 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -948,3 +948,7 @@ function mapTimeEstimater() { mapTimeEstimate = 0; return mapTimeEstimate; } + +function HDratioy() { + return HDratio; +} From d9383fddcc4cfe7d56e851ad9237195eb9a7b33e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 7 Aug 2018 19:55:18 +0100 Subject: [PATCH 0815/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 945fc1333..8204be191 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -7,7 +7,7 @@ function buyUpgrades() { upgrade = upgradeList[upgrade]; var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); - if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps())) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && game.global.world < getPageSetting('AutoGen2End') && HDratioy() < .00000025))) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; From 93c1b859f341f1f999b55192f11173025c3d5c47 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 8 Aug 2018 10:39:45 +0100 Subject: [PATCH 0816/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 2646ede55..295059834 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -244,7 +244,11 @@ function mainLoop() { if (getPageSetting('BuyUpgradesNew') != 0) buyUpgrades(); //"Buy Upgrades" (upgrades.js) var agu = getPageSetting('AutoGoldenUpgrades'); - if (agu && agu!='Off') autoGoldenUpgradesAT(agu); //"Golden Upgrades" (other.js) + var dagu = getPageSetting('dAutoGoldenUpgrades'); + var cagu = getPageSetting('cAutoGoldenUpgrades'); + if (agu && agu!='Off' && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) autoGoldenUpgradesAT(agu); //"Golden Upgrades" (other.js) + if (dagu && dagu!='Off' && game.global.challengeActive == "Daily") autoGoldenUpgradesAT(dagu); + if (cagu && cagu!='Off' && game.global.runningChallengeSquared) autoGoldenUpgradesAT(cagu); if (getPageSetting('BuyBuildingsNew')===0); //"Buy Neither" (Buildings.js) else if (getPageSetting('BuyBuildingsNew')==1) { buyBuildings(); buyStorage(); } //"Buy Buildings & Storage" (") else if (getPageSetting('BuyBuildingsNew')==2) buyBuildings(); //"Buy Buildings" (") From 5b6302aea8f09271da0535ac45c57dd80aef7d2e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 8 Aug 2018 10:39:47 +0100 Subject: [PATCH 0817/3477] Update SettingsGUI.js --- SettingsGUI.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 440a6ada1..3b88b5874 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -497,11 +497,9 @@ function initializeAllSettings() { //Golden - createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections. Make sure vanilla setting Locking is off. ', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void"], 'Golden'); - createSetting('goldStrat', 'Strategy', 'VOID ONLY: After max Void golden upgrades, alternate between buying helium and battle upgrades. Or Choose a Zone to switch over completely at (zones lower than X will buy only battle, and zones higher than X only helium). Battle can be disabled completely with the goldNoBattle button. MAX THEN HELIUM setting so you can get the perfect 60% Voids then Helium', 'dropdown', 'Max then Helium', ["Off", "Alternating", "Zone", "Max then Helium"], 'Golden'); - createSetting('goldAlternating', 'GU VOID: Alternating', 'Buy a helium upgrade after X-1 battle upgrades have been purchased', 'value', '2', null, 'Golden'); - createSetting('goldZone', 'GU VOID: Zone', 'Buy a helium upgrade until zone X, then buy battle upgrades.', 'value', '200', null, 'Golden'); - createSetting('goldNoBattle', 'GU VOID: No Battle', 'Green = Do NOT buy Battle Upgrades
    Red = Buy Battle Upgrades.', 'boolean', true, null, 'Golden'); + createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections. Make sure vanilla setting Locking is off. ', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); + createSetting('dAutoGoldenUpgrades', 'Daily AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades for dailies as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections. Make sure vanilla setting Locking is off. ', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); + createSetting('cAutoGoldenUpgrades', 'C2 AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades for C2s as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections. Make sure vanilla setting Locking is off. ', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); From ac4170864a78373c774f195aec22f5f38ac088a6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 8 Aug 2018 10:40:15 +0100 Subject: [PATCH 0818/3477] Update other.js --- modules/other.js | 45 +++++++++------------------------------------ 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/modules/other.js b/modules/other.js index e9de3245c..7d445dda8 100644 --- a/modules/other.js +++ b/modules/other.js @@ -41,52 +41,25 @@ function isBelowThreshold(currentValue) { return currentValue != game.global.world; } -//Version 3.6 Golden Upgrades - //setting param : get the numerical value of the selected index of the dropdown box 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; - //Default: True = Always get 60% void by skipping the 12% upgrade then buying 14%/16% - var goldStrat = getPageSetting('goldStrat'); - //Try to achieve 60% Void - if (setting == "Void" && goldStrat == "Max then Helium") { + if (num == 0) return; + + if (setting == "Void 60") { var nextVoidAmt = game.goldenUpgrades.Void.nextAmt().toFixed(2); - if (nextVoidAmt == 0.12) //skip the 6th void upgrade + if (nextVoidAmt == 0.12) setting = "Helium"; - if (challSQ) //always buy battle during max then helium mode. - setting = "Battle"; } - //buy one upgrade per loop. + var success = buyGoldenUpgrade(setting); - var doDerskaggChallSQ = false; - if (setting == ("Helium" || "Void") && challSQ) - {doDerskaggChallSQ = true; setting = (challSQ) ? "Battle" : "Helium"} - // DZUGAVILI MOD - SMART VOID GUs - // Assumption: buyGoldenUpgrades is not an asynchronous operation and resolves completely in function execution. - // Assumption: "Locking" game option is not set or does not prevent buying Golden Void - var noBat = getPageSetting('goldNoBattle'); //true = no battle = buy helium - //In 'Alternating' mode : instead of alternating between buying Helium and Battle, with this on it will only buy Helium. - if (!success && setting == "Void" || doDerskaggChallSQ) { - num = getAvailableGoldenUpgrades(); //recheck availables. + + if (!success && (setting == "Void 56" || setting == "Void 60")) { + num = getAvailableGoldenUpgrades(); if (num == 0) return; - // DerSkagg Mod - Instead of Voids, For every Helium upgrade buy X-1 battle upgrades to maintain speed runs - if (goldStrat == "Alternating") { - var goldAlternating = getPageSetting('goldAlternating'); - setting = (game.global.goldenUpgrades%goldAlternating == 0 || noBat) ? "Helium" : "Battle"; - } 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); } - // END OF DerSkagg & DZUGAVILI MOD -//} catch(err) { debug("Error in autoGoldenUpgrades: " + err.message, "general"); } + } //auto spend nature tokens From cdddd44dd21f98fe0245b9f87e48058b222e8134 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 8 Aug 2018 10:43:45 +0100 Subject: [PATCH 0819/3477] Update SettingsGUI.js --- SettingsGUI.js | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 3b88b5874..8e54eb1fc 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -990,23 +990,7 @@ function updateCustomButtons() { document.getElementById('AutoPoison').value = autoTrimpSettings.AutoPoison.selected; document.getElementById('AutoWind').value = autoTrimpSettings.AutoWind.selected; document.getElementById('AutoIce').value = autoTrimpSettings.AutoIce.selected; - //DerSkagg Mod: Golden Upgrade Settings. (Toggles relevant ones on/off) - if (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void") { - turnOn("goldStrat"); - document.getElementById('goldStrat').value = autoTrimpSettings.goldStrat.selected; - if (autoTrimpSettings.goldStrat.selected == "Alternating") { - document.getElementById('goldAlternating').value = autoTrimpSettings.goldAlternating.selected; - turnOn("goldAlternating") - } else - turnOff("goldAlternating"); - (autoTrimpSettings.goldStrat.selected == "Zone") ? turnOn("goldZone") : turnOff("goldZone"); - (autoTrimpSettings.goldStrat.selected != "Off") ? turnOn("goldNoBattle") : turnOn("goldNoBattle"); - } else { - turnOff("goldStrat"); - turnOff("goldAlternating"); - turnOff("goldZone"); - turnOff("goldNoBattle"); - } + //document.getElementById('Prestige').value = autoTrimpSettings.Prestige.selected; //dont update this, dynamic prestige takes it over and is handled elsewhere. //stop disable farming from needing a refresh From 68197565345706d1367d419656a100372b95f5b4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 8 Aug 2018 10:48:02 +0100 Subject: [PATCH 0820/3477] Update other.js --- modules/other.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/other.js b/modules/other.js index 7d445dda8..4c3a0705d 100644 --- a/modules/other.js +++ b/modules/other.js @@ -44,17 +44,18 @@ function isBelowThreshold(currentValue) { function autoGoldenUpgradesAT(setting) { var num = getAvailableGoldenUpgrades(); if (num == 0) return; - + if (setting == "Void 56") + setting = "Void"; if (setting == "Void 60") { - var nextVoidAmt = game.goldenUpgrades.Void.nextAmt().toFixed(2); - if (nextVoidAmt == 0.12) - setting = "Helium"; + setting = "Void"; + var nextVoidAmt = game.goldenUpgrades.Void.nextAmt().toFixed(2); + if (nextVoidAmt == 0.12) + setting = "Helium"; } var success = buyGoldenUpgrade(setting); - - if (!success && (setting == "Void 56" || setting == "Void 60")) { + if (!success && setting == "Void") { num = getAvailableGoldenUpgrades(); if (num == 0) return; buyGoldenUpgrade(setting); From 7d7da582adc07e1d6367fdbe513301b47cfb1724 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 8 Aug 2018 10:51:02 +0100 Subject: [PATCH 0821/3477] Update other.js --- modules/other.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/other.js b/modules/other.js index 4c3a0705d..59cef5df7 100644 --- a/modules/other.js +++ b/modules/other.js @@ -58,6 +58,7 @@ function autoGoldenUpgradesAT(setting) { if (!success && setting == "Void") { num = getAvailableGoldenUpgrades(); if (num == 0) return; + setting = "Helium"; buyGoldenUpgrade(setting); } From b1dc1457f9b28136dd62dffa5993de4d905ecb62 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 8 Aug 2018 10:55:35 +0100 Subject: [PATCH 0822/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 8e54eb1fc..bfb9cf8e7 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -987,6 +987,8 @@ function updateCustomButtons() { document.getElementById('AutoPortal').value = autoTrimpSettings.AutoPortal.selected; document.getElementById('HeliumHourChallenge').value = autoTrimpSettings.HeliumHourChallenge.selected; document.getElementById('AutoGoldenUpgrades').value = autoTrimpSettings.AutoGoldenUpgrades.selected; + document.getElementById('dAutoGoldenUpgrades').value = autoTrimpSettings.dAutoGoldenUpgrades.selected; + document.getElementById('cAutoGoldenUpgrades').value = autoTrimpSettings.cAutoGoldenUpgrades.selected; document.getElementById('AutoPoison').value = autoTrimpSettings.AutoPoison.selected; document.getElementById('AutoWind').value = autoTrimpSettings.AutoWind.selected; document.getElementById('AutoIce').value = autoTrimpSettings.AutoIce.selected; From 28a761e44daf0d598e948c3285a688166ae8cc2e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 8 Aug 2018 11:00:19 +0100 Subject: [PATCH 0823/3477] Update other.js --- modules/other.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/other.js b/modules/other.js index 59cef5df7..f8bd4fbc0 100644 --- a/modules/other.js +++ b/modules/other.js @@ -46,6 +46,8 @@ function autoGoldenUpgradesAT(setting) { if (num == 0) return; if (setting == "Void 56") setting = "Void"; + if (setting == "Battle") + setting = "Battle"; if (setting == "Void 60") { setting = "Void"; var nextVoidAmt = game.goldenUpgrades.Void.nextAmt().toFixed(2); From c17407c94d48aea39c4f794c221aa58c466fa89e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 8 Aug 2018 11:02:42 +0100 Subject: [PATCH 0824/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 295059834..5d82e56e1 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -246,7 +246,7 @@ function mainLoop() { var agu = getPageSetting('AutoGoldenUpgrades'); var dagu = getPageSetting('dAutoGoldenUpgrades'); var cagu = getPageSetting('cAutoGoldenUpgrades'); - if (agu && agu!='Off' && (!game.global.runningChallengeSquared || game.global.challengeActive != "Daily")) autoGoldenUpgradesAT(agu); //"Golden Upgrades" (other.js) + if (agu && agu!='Off' && (!game.global.runningChallengeSquared && game.global.challengeActive != "Daily")) autoGoldenUpgradesAT(agu); //"Golden Upgrades" (other.js) if (dagu && dagu!='Off' && game.global.challengeActive == "Daily") autoGoldenUpgradesAT(dagu); if (cagu && cagu!='Off' && game.global.runningChallengeSquared) autoGoldenUpgradesAT(cagu); if (getPageSetting('BuyBuildingsNew')===0); //"Buy Neither" (Buildings.js) From f3ab2893f624e9ed792ee255a1d2d2a5c2e8eb2e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 8 Aug 2018 11:09:01 +0100 Subject: [PATCH 0825/3477] Update SettingsGUI.js --- SettingsGUI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index bfb9cf8e7..3c28f82a3 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -497,9 +497,9 @@ function initializeAllSettings() { //Golden - createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections. Make sure vanilla setting Locking is off. ', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); - createSetting('dAutoGoldenUpgrades', 'Daily AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades for dailies as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections. Make sure vanilla setting Locking is off. ', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); - createSetting('cAutoGoldenUpgrades', 'C2 AutoGoldenUpgrades', 'IMPORTANT SETTING. Automatically Buy the specified Golden Upgrades for C2s as they become available. Faster than vanilla. NOTE: Void setting unlocks more settings: goldStrat, goldAlternating, goldZone and goldNoBattle. New: Void also has a \\"Max then Helium\\" setting so you can get the perfect 60% Voids then Helium. More buttons will become visible when you make selections. Make sure vanilla setting Locking is off. ', 'dropdown', 'Void', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); + createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'Buys Golden Upgrades. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); + createSetting('dAutoGoldenUpgrades', 'Daily AutoGoldenUpgrades', 'Buys Golden Upgrades for Dailys. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); + createSetting('cAutoGoldenUpgrades', 'C2 AutoGoldenUpgrades', 'Buys Golden Upgrades for C2s. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); From 21d4ee1aa605cc6eef07b9c1c3ee1b906a1a7fc3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 8 Aug 2018 11:12:59 +0100 Subject: [PATCH 0826/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 5d82e56e1..c2ae3b9c4 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,10 +61,11 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a Min Fuel Zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added MULTI BW RAIDING! ", isNew: true}); +changelogList.push({date: "08/08/2018", version: "v2.5.1", description: "It\'s been a while. Added Amal boost and reconfigured golden upgrades, i think you\'ll like it. 550+ Ratio is still being worked on (not that any of you will use it anyway lol) There\' probably some other fixes and stuff aswell. More C2 specific stuff on its way, see you till next update! ", isNew: true}); +changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a Min Fuel Zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added MULTI BW RAIDING! ", isNew: false}); changelogList.push({date: "18/07/2018", version: "v2.4.1", description: "Updated Spikes Hardcore Praiding to include more user input. Hardcore windstacking buys equips if it lowers your attack. Ratio almost done. ", isNew: false}); changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Spike came through again with some hardcore Praiding Options, check em out while they fresh son. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: false}); -changelogList.push({date: "14/07/2018", version: "v2.3.5", description: "Tinkered with BAF3 to better respect your fight settings. Added Always fight option. AS3 only in Dailys option. Option for workers in Watch and Trapper. Fixed some UI bugs. New z550+ Ratio soon (No one apart from me will probably use it but whatever) ", isNew: false}); +//changelogList.push({date: "14/07/2018", version: "v2.3.5", description: "Tinkered with BAF3 to better respect your fight settings. Added Always fight option. AS3 only in Dailys option. Option for workers in Watch and Trapper. Fixed some UI bugs. New z550+ Ratio soon (No one apart from me will probably use it but whatever) ", isNew: false}); //changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised and Spire breed timer fixed, many thanks to Spikenslab once again. ", isNew: false}); //changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). Oh, and one more thing, I removed Void praiding (and daily) due to multiple Praiding now. So if you want to raid before voids, make sure you set it!", isNew: false}); //changelogList.push({date: "30/06/2018", version: "v2.3.2", description: "Daily settings moved to its own tab. More daily settings for better automation has arrived. Make sure to set your daily autoportal and voids! Check the Gear tab for the new buy armor on death and the amount of levels AT buys. This feature was originally in Autofight3, but was moved to a standalone. ", isNew: false}); From 8a329eec11844be969fe8a628d0fb82adb0c16e8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 8 Aug 2018 11:14:47 +0100 Subject: [PATCH 0827/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index c2ae3b9c4..a9b95136f 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,7 +61,7 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "08/08/2018", version: "v2.5.1", description: "It\'s been a while. Added Amal boost and reconfigured golden upgrades, i think you\'ll like it. 550+ Ratio is still being worked on (not that any of you will use it anyway lol) There\' probably some other fixes and stuff aswell. More C2 specific stuff on its way, see you till next update! ", isNew: true}); +changelogList.push({date: "08/08/2018", version: "v2.5.1", description: "It\'s been a while. Added Amal boost and reconfigured golden upgrades, i think you\'ll like it. 550+ Ratio is still being worked on (not that any of you will use it anyway lol) There\'s probably some other fixes and stuff aswell. More C2 specific stuff on its way, see you till next update! ", isNew: true}); changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a Min Fuel Zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added MULTI BW RAIDING! ", isNew: false}); changelogList.push({date: "18/07/2018", version: "v2.4.1", description: "Updated Spikes Hardcore Praiding to include more user input. Hardcore windstacking buys equips if it lowers your attack. Ratio almost done. ", isNew: false}); changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Spike came through again with some hardcore Praiding Options, check em out while they fresh son. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: false}); From f524c37069ded609e4653d873fc1be1883ea5966 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:11:23 +0100 Subject: [PATCH 0828/3477] Update SettingsGUI.js --- SettingsGUI.js | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 3c28f82a3..a813a512f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -180,7 +180,8 @@ function initializeAllTabs() { createTabs("Maps", "Maps - AutoMaps & VoidMaps Settings"); createTabs("Spire", "Spire - Settings for Spires"); createTabs("Raiding", "Raiding - Settings for Raiding"); - createTabs("Daily", "Settings for Dailys"); + createTabs("Daily", "Dailys - Settings for Dailys"); + createTabs("C2", "C2 - Settings for C2s"); createTabs("Combat", "Combat & Stance Settings"); createTabs("Scryer", "Scryer Settings"); createTabs("Magma", "Dimensional Generator & Magmite Settings"); @@ -247,15 +248,14 @@ function initializeAllSettings() { createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Auto Gather/Build #2', 'Science Research OFF'], 'Controls what YOU do. Manual does nothing
    The Decision between AutoGather 1 or 2 is up to you, and they should be similar. Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
    You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All Upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); createSetting('amalcoord', 'Amal Boost', 'Boost your Amal count for more Mi. Will not buy coords until your H:D ratio is below a certain value. This means that you will get amals quicker. Will not activate higher than your end fueling zone! ', 'boolean', false, null, "Core"); - createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); createSetting('fastallocate', 'Fast Allocate', 'Turn on if your helium is above 500Qa. Not recommended for low amounts of helium. ', 'boolean', false, null, 'Core'); createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Core'); createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will purchase 1000 levels of looting II until you can no longer afford to.', 'value', -1, null, 'Core'); - + //Line 2 - createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'Core'); - document.getElementById('FinishC2').parentNode.insertAdjacentHTML('afterend','
    '); + createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); + document.getElementById('TrapTrimps').parentNode.insertAdjacentHTML('afterend','
    '); //New Line 3 createSetting('AutoPortal', 'AutoPortal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); @@ -300,6 +300,18 @@ function initializeAllSettings() { createSetting('dhardcorewind', 'Daily Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack in dailys. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Daily'); + +//C2 + + //Line 1 + createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'C2'); + createSetting('buynojobsc', 'No F/L/M in C2', 'Buys No Farmers, Lumberjacks or Miners in the C2 challenges Watch and Trapper. ', 'boolean', 'false', null, "C2"); + createSetting('work', 'Work', 'WILL DO MANY THINGS', 'boolean', 'false', null, "C2"); + createSetting('in', 'In', 'SECRET', 'boolean', 'false', null, "C2"); + createSetting('progress', 'Progress', 'STOP LOOKING NOW, OK?', 'boolean', 'false', null, "C2"); + + + //Buildings //Line 1 @@ -343,8 +355,7 @@ function initializeAllSettings() { //Line 2 createSetting('MaxTrainers', 'Max Trainers', 'Advanced. Cap your trainers (This is an absolute number not a ratio). recommend: -1', 'value', '-1', null, "Jobs"); //by the time that you stop needing block, food is abundant createSetting('TrainerCaptoTributes', 'Cap Trainers %', 'Only Buy a Trainer when its cost is LESS than X% of cost of a tribute. This setting can work in combination with the other one, or set the other one to -1 and this will take full control. Default: -1 (Disabled). 50% is close to the point where the cap does nothing. You can go as low as you want but recommended is 10% to 1%. (example: Trainer cost of 5001, Tribute cost of 100000, @ 5%, it would NOT buy the trainer.)', 'value', '-1', null, 'Jobs'); //this is a bit unnecessary, resource management by the script is already sufficient. - createSetting('buynojobsc', 'No F/L/M in C2', 'Buys No Farmers, Lumberjacks or Miners in the C2 challenges Watch and Trapper. ', 'boolean', 'false', null, "Jobs"); - + //Gear From 3e58e5ca35a81e45bb016b16169d682827b59f8c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:15:54 +0100 Subject: [PATCH 0829/3477] Update perks.js --- modules/perks.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index c4959b99f..badc2d6a3 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -1,9 +1,9 @@ // ==UserScript== // @name AutoPerks // @namespace http://tampermonkey.net/ -// @version 1.1.3-4-7-2018+genBTC +// @version 1.1.3-4-7-2018+genBTC+Zek // @description Trimps Automatic Perk Calculator -// @author zxv, genBTC +// @author zxv, genBTC, Zek // @include *trimps.github.io* // @include *kongregate.com/games/GreenSatellite/trimps // @grant none @@ -49,8 +49,9 @@ var preset_Zek399 = [135, 6.1, 18.5, 6.5, 2.5, 6, 17, 6.1, 28, 0.08, 1, 0, 0]; var preset_Zek449 = [245, 5.85, 29, 1.95, 2.8, 6, 6.1, 5.85, 18, 0.05, 1, 57, 0]; var preset_Zek450 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 10, 0.03, 1, 120, 175]; var preset_Zek500 = [600, 2.4, 60, 2, 1, 2.5, 8, 2.4, 8, 0.02, 1, 145, 180]; +var preset_Zek550 = [700, 2.8, 70, 1.4, 1, 2.2, 7.5, 2.8, 8, 0.003, 1, 50, 80]; //gather these into an array of objects. this is one important object. -var presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2,preset_space,preset_Zek059,preset_Zek100,preset_Zek180,preset_Zek229,preset_Zek299,preset_Zek399,preset_Zek449,preset_Zek450,preset_Zek500,preset_space]; +var presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2,preset_space,preset_Zek059,preset_Zek100,preset_Zek180,preset_Zek229,preset_Zek299,preset_Zek399,preset_Zek449,preset_Zek450,preset_Zek500,preset_Zek550,preset_space]; //Specific ratios labeled above must be given the matching ID below. //Ratio preset dropdown list var presetListHtml = "\ @@ -75,7 +76,8 @@ var presetListHtml = "\ \ \ \ -\ +\ +\ \ "; //Custom Creation for all perk customRatio boxes in Trimps Perk Window From aa69a96fb166a0dd05a9811dcf3aba6da0548470 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:27:00 +0100 Subject: [PATCH 0830/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 + 1 file changed, 1 insertion(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index a813a512f..d446b4fec 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -306,6 +306,7 @@ function initializeAllSettings() { //Line 1 createSetting('FinishC2', 'Finish Challenge2', 'Finish / Abandon Challenge2 (any) when this zone is reached, if you are running one. For manual use. Recommended: Zones ending with 0 for most Challenge2. Disable with -1. Does not affect Non-Challenge2 runs.', 'value', -1, null, 'C2'); createSetting('buynojobsc', 'No F/L/M in C2', 'Buys No Farmers, Lumberjacks or Miners in the C2 challenges Watch and Trapper. ', 'boolean', 'false', null, "C2"); + createSetting('cfightforever', 'Tox/Nom Fight Always', 'Sends trimps to fight if they\'re not fighting in the Toxicity and Nom Challenges, regardless of BAF. Essenitally the same as the one in combat, can use either if you wish, except this will only activate in these challenges (duh) ', 'boolean', 'false', null, 'C2'); createSetting('work', 'Work', 'WILL DO MANY THINGS', 'boolean', 'false', null, "C2"); createSetting('in', 'In', 'SECRET', 'boolean', 'false', null, "C2"); createSetting('progress', 'Progress', 'STOP LOOKING NOW, OK?', 'boolean', 'false', null, "C2"); From 3a64a20a869c3d6c0966fb51158ad7153501d532 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:27:35 +0100 Subject: [PATCH 0831/3477] Update other.js --- modules/other.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index f8bd4fbc0..a82f65691 100644 --- a/modules/other.js +++ b/modules/other.js @@ -865,11 +865,11 @@ function buynojobs() { function fightalways() { if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive) return; - if (getPageSetting('fightforever')==true && !game.global.fighting) { - fightManual(); - } + if ((getPageSetting('fightforever')==true || getPageSetting('cfightforever')==true) && !game.global.fighting) + fightManual(); } + function usedaily3() { if (getPageSetting('use3daily') == true && game.global.challengeActive == "Daily" && !daily3) { daily3 = true; From e3c2380d8d0e91e6149908fc0a8e5f1fc186235c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:27:58 +0100 Subject: [PATCH 0832/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index a9b95136f..301a5c6f3 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -233,7 +233,7 @@ function mainLoop() { if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); if (getPageSetting('buynojobsc')==true || getPageSetting('buynojobsc')==false) buynojobs(); - if (getPageSetting('fightforever')==true) fightalways(); + if (getPageSetting('fightforever')==true || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom'))) fightalways(); if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); From 32f94b11b58bf349db78e495eef4de6fe4cc48ef Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:31:59 +0100 Subject: [PATCH 0833/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 301a5c6f3..ff0c84065 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,10 +61,11 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "08/08/2018", version: "v2.5.1", description: "It\'s been a while. Added Amal boost and reconfigured golden upgrades, i think you\'ll like it. 550+ Ratio is still being worked on (not that any of you will use it anyway lol) There\'s probably some other fixes and stuff aswell. More C2 specific stuff on its way, see you till next update! ", isNew: true}); +changelogList.push({date: "10/08/2018", version: "v2.5.2", description: "New C2 Tab added, work in progress though so don\'t expect much. Added the 550 ratio. You may see the really old ratios also being removed, not that you should be using them anyway *cough* ", isNew: true}); +changelogList.push({date: "08/08/2018", version: "v2.5.1", description: "It\'s been a while. Added Amal Boost and reconfigured golden upgrades, i think you\'ll like it. 550+ Ratio is still being worked on (not that any of you will use it anyway lol) There\'s probably some other fixes and stuff aswell. More C2 specific stuff on its way, see you till next update! ", isNew: false}); changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a Min Fuel Zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added MULTI BW RAIDING! ", isNew: false}); changelogList.push({date: "18/07/2018", version: "v2.4.1", description: "Updated Spikes Hardcore Praiding to include more user input. Hardcore windstacking buys equips if it lowers your attack. Ratio almost done. ", isNew: false}); -changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Spike came through again with some hardcore Praiding Options, check em out while they fresh son. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: false}); +//changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Spike came through again with some hardcore Praiding Options, check em out while they fresh son. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: false}); //changelogList.push({date: "14/07/2018", version: "v2.3.5", description: "Tinkered with BAF3 to better respect your fight settings. Added Always fight option. AS3 only in Dailys option. Option for workers in Watch and Trapper. Fixed some UI bugs. New z550+ Ratio soon (No one apart from me will probably use it but whatever) ", isNew: false}); //changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised and Spire breed timer fixed, many thanks to Spikenslab once again. ", isNew: false}); //changelogList.push({date: "02/07/2018", version: "v2.3.3", description: "Daily settings may have some bugs, so please report them to me. Using h/hr% autoportal is not recommended (because it sucks). Added a max windstack setting for yah, enjoy. There might be some other things but I forgot (I do too many updates honestly). Oh, and one more thing, I removed Void praiding (and daily) due to multiple Praiding now. So if you want to raid before voids, make sure you set it!", isNew: false}); From adf7b4cd075482249d46852f981b467982a99141 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:37:30 +0100 Subject: [PATCH 0834/3477] Update perks.js --- modules/perks.js | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index badc2d6a3..11dc856ac 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -19,25 +19,12 @@ var head = document.getElementsByTagName('head')[0]; var queuescript = document.createElement('script'); queuescript.type = 'text/javascript'; //This does not need to be changed to your own repo. Its a 3rd party file. -queuescript.src = 'https://genbtc.github.io/AutoTrimps/FastPriorityQueue.js'; +queuescript.src = 'https://Zorn192.github.io/AutoTrimps/FastPriorityQueue.js'; head.appendChild(queuescript); //-------------------------------------- //Ratio Presets - Perk proportions: // (in perk order): [looting,toughness,power,motivation,pheromones,artisanistry,carpentry,resilience,coordinated,resourceful,overkill,cunning,curious]; -var preset_ZXV = [20, 0.5, 1, 1.5, 0.5, 1.5, 8, 1, 25, 2, 3, 1, 1]; -var preset_ZXVnew = [50, 0.75, 1, 3, 0.75, 3, 10, 1.5, 60, 2, 5, 1, 1]; -var preset_ZXV3 = [100, 1, 3, 3, 1, 3, 40, 2, 100, 1, 3, 1, 1]; -var preset_TruthEarly = [30, 4, 4, 4, 4, 2, 24, 8, 60, 2, 3, 1, 1]; -var preset_TruthLate = [120, 4, 4, 4, 4, 2, 24, 8, 60, 2, 3, 1, 1]; -var preset_nsheetz = [42, 1.75, 5, 4, 1.5, 5, 29, 3.5, 100, 1, 5, 1, 1]; -var preset_nsheetzNew= [160, 1.5, 5, 2.5, 1.5, 3.5, 18, 3, 100, 1, 10, 1, 1]; -var preset_HiderHehr = [90, 4, 12, 10, 1, 8, 8, 1, 20, 0.1, 3, 1, 1]; -var preset_HiderBalance = [75, 4, 8, 4, 1, 4, 24, 1, 75, 0.5, 3, 1, 1]; -var preset_HiderMore = [20, 4, 10, 12, 1, 8, 8, 1, 40, 0.1, 0.5, 1, 1]; -var preset_genBTC = [100, 8, 8, 4, 4, 5, 18, 8, 14, 1, 1, 1, 1]; -var preset_genBTC2 = [96, 19, 15.4, 8, 8, 7, 14, 19, 11, 1, 1, 1, 1]; -// var preset_space = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; // var preset_Zek059 = [7, 0.6, 3, 0.8, 0.3, 3, 25, 0.6, 0, 0, 0, 0, 0]; @@ -51,23 +38,10 @@ var preset_Zek450 = [450, 0.9, 48, 3.35, 1, 2.8, 7.8, 1.95, 10, 0.03, 1, 120, 17 var preset_Zek500 = [600, 2.4, 60, 2, 1, 2.5, 8, 2.4, 8, 0.02, 1, 145, 180]; var preset_Zek550 = [700, 2.8, 70, 1.4, 1, 2.2, 7.5, 2.8, 8, 0.003, 1, 50, 80]; //gather these into an array of objects. this is one important object. -var presetList = [preset_ZXV,preset_ZXVnew,preset_ZXV3,preset_TruthEarly,preset_TruthLate,preset_nsheetz,preset_nsheetzNew,preset_HiderHehr,preset_HiderBalance,preset_HiderMore,preset_genBTC,preset_genBTC2,preset_space,preset_Zek059,preset_Zek100,preset_Zek180,preset_Zek229,preset_Zek299,preset_Zek399,preset_Zek449,preset_Zek450,preset_Zek500,preset_Zek550,preset_space]; +var presetList = [preset_Zek059,preset_Zek100,preset_Zek180,preset_Zek229,preset_Zek299,preset_Zek399,preset_Zek449,preset_Zek450,preset_Zek500,preset_Zek550,preset_space]; //Specific ratios labeled above must be given the matching ID below. //Ratio preset dropdown list var presetListHtml = "\ -\ -\ -\ -\ -\ -\ -\ -\ -\ -\ -\ -\ -\ \ \ \ @@ -173,9 +147,9 @@ AutoPerks.displayGUI = function() { if (loadLastPreset != null) { //these four lines are temporary to migrate Custom Ratios to the new dropdown. Once everyone has the name in localStorage we can remove this. if (loadLastPreset == 15 && !localStorage.getItem('AutoperkSelectedRatioPresetName')) - loadLastPreset = 23; + loadLastPreset = 11; if (localStorage.getItem('AutoperkSelectedRatioPresetName')=="customPreset") - loadLastPreset = 23; + loadLastPreset = 11; setID = loadLastPreset; } else From a37cd7e479abb078280d01b9c187d972741628da Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:46:57 +0100 Subject: [PATCH 0835/3477] Update SettingsGUI.js --- SettingsGUI.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index d446b4fec..dbe761e2b 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -297,8 +297,9 @@ function initializeAllSettings() { createSetting('dWindStackingMin', 'Daily Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set for dailys. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Daily'); createSetting('dWindStackingMax', 'Daily Windstack Max', 'For use with AutoStance 3 in dailys. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Daily'); createSetting('dwindcutoff', 'Daily Wind Damage Cutoff', 'Set this value to optimise your windstacking in dailys. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Daily'); - createSetting('dhardcorewind', 'Daily Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack in dailys. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Daily'); - + createSetting('dhardcorewind', 'Daily Hardcore Windstacking Z', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack in dailys. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Daily'); + createSetting('dhardcorewindmax', 'Daily Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking in Dailys. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. ', 'value', '-1', null, 'Daily'); + //C2 @@ -448,6 +449,7 @@ function initializeAllSettings() { createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); + createSetting('hardcorewindmax', 'Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); //Line 2 @@ -970,6 +972,8 @@ function updateCustomButtons() { getPageSetting('Dailybwraid')==true ? turnOn("dBWraidingmax"): turnOff("dBWraidingmax"); getPageSetting('use3daily')==true ? turnOn("dWindStackingMin"): turnOff("dWindStackingMin"); getPageSetting('use3daily')==true ? turnOn("dWindStackingMax"): turnOff("dWindStackingMax"); + getPageSetting('hardcorewind')>=1 ? turnOn("hardcorewindmax"): turnOff("hardcorewindmax"); + getPageSetting('dhardcorewind')>=1 ? turnOn("dhardcorewindmax"): turnOff("dhardcorewindmax"); //Praid harder getPageSetting('PraidHarder') ? turnOn('PraidFarmFragsZ') : turnOff('PraidFarmFragsZ'); From 7952f4b492d2bfc42a8d1b1aeae533b7199ff9f1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:53:54 +0100 Subject: [PATCH 0836/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index ff0c84065..927f12491 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -239,8 +239,8 @@ function mainLoop() { if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); if (getPageSetting('spireshitbuy')==true) buyshitspire(); - if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") orangewindstack(); - if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") dorangewindstack(); + if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") orangewindstack(); + if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive == "Daily") dorangewindstack(); //Original From 73e54227c2373dbca03ab424359bf7a70eed8e52 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:54:45 +0100 Subject: [PATCH 0837/3477] Update upgrades.js --- modules/upgrades.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 8204be191..01083f725 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -8,8 +8,8 @@ function buyUpgrades() { var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && game.global.world < getPageSetting('AutoGen2End') && HDratioy() < .00000025))) continue; - if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") continue; - if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") continue; + if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; + if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; //skip bloodlust during scientist challenges and while we have autofight enabled. From f3cb52886e4b76108c35d87f0b6e2524b9954c9d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:57:35 +0100 Subject: [PATCH 0838/3477] Update equipment.js --- modules/equipment.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 86acd4f1f..a02397ea8 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -377,8 +377,8 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; - if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") return; - if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") return; + if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") return; + if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") return; if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); else @@ -415,8 +415,8 @@ function autoLevelEquipment() { var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; //If we're considering an attack item, we want to buy weapons if we don't have enough damage, or if we don't need health (so we default to buying some damage) if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { - if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && game.global.challengeActive != "Daily") return; - if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && game.global.challengeActive == "Daily") return; + if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") return; + if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") return; if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); game.global.buyAmt = getPageSetting('gearamounttobuy'); From 95dcb8e8f2adea908f85537abb24b998f48982df Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:57:49 +0100 Subject: [PATCH 0839/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 01083f725..a3e37ed3c 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -9,7 +9,7 @@ function buyUpgrades() { var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && game.global.world < getPageSetting('AutoGen2End') && HDratioy() < .00000025))) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; - if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; + if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; //skip bloodlust during scientist challenges and while we have autofight enabled. From 4381c2b364dce37f78aad9e290b9c30e1fcdcb06 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 20:59:06 +0100 Subject: [PATCH 0840/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index dbe761e2b..055fbf288 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -298,7 +298,7 @@ function initializeAllSettings() { createSetting('dWindStackingMax', 'Daily Windstack Max', 'For use with AutoStance 3 in dailys. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Daily'); createSetting('dwindcutoff', 'Daily Wind Damage Cutoff', 'Set this value to optimise your windstacking in dailys. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Daily'); createSetting('dhardcorewind', 'Daily Hardcore Windstacking Z', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack in dailys. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Daily'); - createSetting('dhardcorewindmax', 'Daily Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking in Dailys. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. ', 'value', '-1', null, 'Daily'); + createSetting('dhardcorewindmax', 'Daily Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking in Dailys. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. Use -1 or a really high value to hardcore windstack endlessly. ', 'value', '-1', null, 'Daily'); @@ -449,7 +449,7 @@ function initializeAllSettings() { createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); - createSetting('hardcorewindmax', 'Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. ', 'value', '-1', null, 'Combat'); + createSetting('hardcorewindmax', 'Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. Use -1 or a really high value to hardcore windstack endlessly. ', 'value', '-1', null, 'Combat'); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); //Line 2 From 6174fdc391ea49111012cbefa48c3baf24cf5047 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 10 Aug 2018 21:01:33 +0100 Subject: [PATCH 0841/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 927f12491..996876933 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,7 +61,7 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "10/08/2018", version: "v2.5.2", description: "New C2 Tab added, work in progress though so don\'t expect much. Added the 550 ratio. You may see the really old ratios also being removed, not that you should be using them anyway *cough* ", isNew: true}); +changelogList.push({date: "10/08/2018", version: "v2.5.2", description: "New C2 Tab added, work in progress though so don\'t expect much. Added a Hardcore Windstacking Max zone. Added the 550 ratio. You may see the really old ratios also being removed, not that you should be using them anyway *cough* IF YOU WERE USING AUTOPERKS MAKE SURE TO SET YOUR RATIO AGAIN", isNew: true}); changelogList.push({date: "08/08/2018", version: "v2.5.1", description: "It\'s been a while. Added Amal Boost and reconfigured golden upgrades, i think you\'ll like it. 550+ Ratio is still being worked on (not that any of you will use it anyway lol) There\'s probably some other fixes and stuff aswell. More C2 specific stuff on its way, see you till next update! ", isNew: false}); changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a Min Fuel Zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added MULTI BW RAIDING! ", isNew: false}); changelogList.push({date: "18/07/2018", version: "v2.4.1", description: "Updated Spikes Hardcore Praiding to include more user input. Hardcore windstacking buys equips if it lowers your attack. Ratio almost done. ", isNew: false}); From d9f31ef414c8514d71d939ea1048c49c7e2c400d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 11 Aug 2018 14:19:10 +0100 Subject: [PATCH 0842/3477] Update SettingsGUI.js --- SettingsGUI.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 055fbf288..301fe725f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -299,7 +299,8 @@ function initializeAllSettings() { createSetting('dwindcutoff', 'Daily Wind Damage Cutoff', 'Set this value to optimise your windstacking in dailys. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Daily'); createSetting('dhardcorewind', 'Daily Hardcore Windstacking Z', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack in dailys. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Daily'); createSetting('dhardcorewindmax', 'Daily Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking in Dailys. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. Use -1 or a really high value to hardcore windstack endlessly. ', 'value', '-1', null, 'Daily'); - + createSetting('dfightforever', 'Daily Fight Always', 'Sends trimps to fight if they\'re not fighting in Daily challenges similar to Toxicity/Nom, regardless of BAF. Essenitally the same as the one in combat, can use either if you wish, except this will only activate in these daily challenges (duh) ', 'boolean', 'false', null, 'Daily'); + //C2 @@ -513,7 +514,7 @@ function initializeAllSettings() { //Golden createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'Buys Golden Upgrades. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); createSetting('dAutoGoldenUpgrades', 'Daily AutoGoldenUpgrades', 'Buys Golden Upgrades for Dailys. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); - createSetting('cAutoGoldenUpgrades', 'C2 AutoGoldenUpgrades', 'Buys Golden Upgrades for C2s. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); + createSetting('cAutoGoldenUpgrades', 'C2 AutoGoldenUpgrades', 'Buys Golden Upgrades for C2s. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Battle", "Void 56", "Void 60"], 'Golden'); From 6d6b1bc15a57647a2661bdd1df3b363f1d1976b1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 11 Aug 2018 14:32:22 +0100 Subject: [PATCH 0843/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 996876933..2cea6368f 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -234,7 +234,7 @@ function mainLoop() { if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); if (getPageSetting('buynojobsc')==true || getPageSetting('buynojobsc')==false) buynojobs(); - if (getPageSetting('fightforever')==true || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom'))) fightalways(); + if (getPageSetting('fightforever')==true || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) || (getPageSetting('dfightforever')==true && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined'))) fightalways(); if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); From 12aea9ac0464f9ffe343eefd263229be99007cfb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 11 Aug 2018 14:40:14 +0100 Subject: [PATCH 0844/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index a82f65691..432bbf0e7 100644 --- a/modules/other.js +++ b/modules/other.js @@ -865,8 +865,8 @@ function buynojobs() { function fightalways() { if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive) return; - if ((getPageSetting('fightforever')==true || getPageSetting('cfightforever')==true) && !game.global.fighting) - fightManual(); + if (!game.global.fighting) + fightManual(); } From d1df625516bcad5a4e9afba47604bc06afa2f28b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 11 Aug 2018 14:45:02 +0100 Subject: [PATCH 0845/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 2cea6368f..e4460d230 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -234,7 +234,7 @@ function mainLoop() { if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); if (getPageSetting('buynojobsc')==true || getPageSetting('buynojobsc')==false) buynojobs(); - if (getPageSetting('fightforever')==true || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) || (getPageSetting('dfightforever')==true && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined'))) fightalways(); + if (getPageSetting('fightforever')==true || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) || (getPageSetting('dfightforever')==true && typeof game.global.dailyChallenge.empower == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined'))) fightalways(); if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); From c6712ea83b7ad57d43ae9ac3a95194f9d25561d6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 11 Aug 2018 14:47:26 +0100 Subject: [PATCH 0846/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 301fe725f..34f1a0c15 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -299,7 +299,7 @@ function initializeAllSettings() { createSetting('dwindcutoff', 'Daily Wind Damage Cutoff', 'Set this value to optimise your windstacking in dailys. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Daily'); createSetting('dhardcorewind', 'Daily Hardcore Windstacking Z', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack in dailys. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Daily'); createSetting('dhardcorewindmax', 'Daily Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking in Dailys. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. Use -1 or a really high value to hardcore windstack endlessly. ', 'value', '-1', null, 'Daily'); - createSetting('dfightforever', 'Daily Fight Always', 'Sends trimps to fight if they\'re not fighting in Daily challenges similar to Toxicity/Nom, regardless of BAF. Essenitally the same as the one in combat, can use either if you wish, except this will only activate in these daily challenges (duh) ', 'boolean', 'false', null, 'Daily'); + createSetting('dfightforever', 'Daily Fight Always', 'Sends trimps to fight if they\'re not fighting in Daily challenges similar to Toxicity/Nom but not on Empower Dailys, regardless of BAF. Essenitally the same as the one in combat, can use either if you wish, except this will only activate in these daily challenges (duh) ', 'boolean', 'false', null, 'Daily'); From 8c05aeac63f7903217f311a6be64ceb8e06c143e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 11 Aug 2018 14:52:32 +0100 Subject: [PATCH 0847/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 34f1a0c15..804ab728d 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -299,7 +299,7 @@ function initializeAllSettings() { createSetting('dwindcutoff', 'Daily Wind Damage Cutoff', 'Set this value to optimise your windstacking in dailys. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Daily'); createSetting('dhardcorewind', 'Daily Hardcore Windstacking Z', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack in dailys. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Daily'); createSetting('dhardcorewindmax', 'Daily Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking in Dailys. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. Use -1 or a really high value to hardcore windstack endlessly. ', 'value', '-1', null, 'Daily'); - createSetting('dfightforever', 'Daily Fight Always', 'Sends trimps to fight if they\'re not fighting in Daily challenges similar to Toxicity/Nom but not on Empower Dailys, regardless of BAF. Essenitally the same as the one in combat, can use either if you wish, except this will only activate in these daily challenges (duh) ', 'boolean', 'false', null, 'Daily'); + createSetting('dfightforever', 'Daily Fight Always', 'Sends trimps to fight if they\'re not fighting in Daily challenges similar to Toxicity/Nom but not on Empower/Bloodthirst Dailys, regardless of BAF. Essenitally the same as the one in combat, can use either if you wish, except this will only activate in these daily challenges (duh) ', 'boolean', 'false', null, 'Daily'); From c96b1f2ae47f46214d658b12ec15579f84cd620c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 11 Aug 2018 14:54:42 +0100 Subject: [PATCH 0848/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index e4460d230..e919cc8bd 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -234,7 +234,7 @@ function mainLoop() { if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); if (getPageSetting('buynojobsc')==true || getPageSetting('buynojobsc')==false) buynojobs(); - if (getPageSetting('fightforever')==true || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) || (getPageSetting('dfightforever')==true && typeof game.global.dailyChallenge.empower == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined'))) fightalways(); + if (getPageSetting('fightforever')==true || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) || (getPageSetting('dfightforever')==true && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined'))) fightalways(); if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); From bc8cd52af422827031ea7c3bacc5d129a1ab2508 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 12 Aug 2018 11:11:21 +0100 Subject: [PATCH 0849/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 432bbf0e7..139a0837f 100644 --- a/modules/other.js +++ b/modules/other.js @@ -906,7 +906,7 @@ function dcutoffwind() { MODULES["equipment"].enoughDamageCutoff = 4; MODULES["maps"].enoughDamageCutoff = 4; } - if (getPageSetting('dwindcutoff') >= 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != getPageSetting('windcutoff') && MODULES["maps"].enoughDamageCutoff != getPageSetting('dwindcutoff') && game.global.world >= getPageSetting('dWindStackingMin')) { + if (getPageSetting('dwindcutoff') >= 1 && getEmpowerment() == "Wind" && MODULES["equipment"].enoughDamageCutoff != getPageSetting('dwindcutoff') && MODULES["maps"].enoughDamageCutoff != getPageSetting('dwindcutoff') && game.global.world >= getPageSetting('dWindStackingMin')) { MODULES["equipment"].enoughDamageCutoff = getPageSetting('dwindcutoff'); MODULES["maps"].enoughDamageCutoff = getPageSetting('dwindcutoff'); } From 6fbad78ce4143154505c4c7c6fd4a8281ec1fc3d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 12 Aug 2018 20:29:06 +0100 Subject: [PATCH 0850/3477] Create windstacking.js --- modules/windstacking.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 modules/windstacking.js diff --git a/modules/windstacking.js b/modules/windstacking.js new file mode 100644 index 000000000..c51463336 --- /dev/null +++ b/modules/windstacking.js @@ -0,0 +1 @@ +//yes From 880f4faff99da1116d4fc75a697bb6f142e59b08 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 12 Aug 2018 20:29:40 +0100 Subject: [PATCH 0851/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index e919cc8bd..ca884d2e4 100644 --- a/AutoTrimps2.js +++ b/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', 'perks', 'fight-info', 'performance']; + ATmoduleList = ['query', 'portal', 'upgrades', 'heirlooms', 'buildings', 'jobs', 'equipment', 'gather', 'stance', 'battlecalc', 'maps', 'breedtimer', 'dynprestige', 'fight', 'scryer', 'magmite', 'other', 'import-export', 'perks', 'fight-info', 'performance', 'windstacking']; for (var m in ATmoduleList) { ATscriptLoad(modulepath, ATmoduleList[m]); } From bb5643b7c2cd56fe3cb4021e6ca98cb7f821406c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 12 Aug 2018 20:44:14 +0100 Subject: [PATCH 0852/3477] Update windstacking.js --- modules/windstacking.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/windstacking.js b/modules/windstacking.js index c51463336..e108fbc68 100644 --- a/modules/windstacking.js +++ b/modules/windstacking.js @@ -1 +1,19 @@ -//yes +MODULES["windstacking"] = {}; + +function windstacking() { + var windstackzone = getPageSetting('ultwindstackzone'); + var HD = HDratioy(); + var needequipwind = false; + var needcoordwind = false; + var needmapwind = false; + var world = game.global.world + if (HD < 0.00025 && world >= (windstackzone - 5) { + MODULES["equipment"].enoughDamageCutoff = 90 + MODULES["maps"].enoughDamageCutoff = 90 + } + if (HD > 0.00025 && world >= (windstackzone - 5) { + MODULES["equipment"].enoughDamageCutoff = 4 + MODULES["maps"].enoughDamageCutoff = 4 + } + if (meh cant be bothered) dontdothis(); +} From d2ec0c4842a756c74237c0a7422e2e9dd90b384a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 13 Aug 2018 14:24:28 +0100 Subject: [PATCH 0853/3477] Update jobs.js --- modules/jobs.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/jobs.js b/modules/jobs.js index 4d4a93661..0c0dd3300 100644 --- a/modules/jobs.js +++ b/modules/jobs.js @@ -11,7 +11,6 @@ MODULES["jobs"].autoRatio3 = [3,1,4]; MODULES["jobs"].autoRatio2 = [3,3,5]; MODULES["jobs"].autoRatio1 = [1,1,1]; MODULES["jobs"].customRatio; //set this like above and it will Auto use it. -var buyjobbies = true; function safeBuyJob(jobTitle, amount) { if (!Number.isFinite(amount) || amount === 0 || typeof amount === 'undefined' || Number.isNaN(amount)) { @@ -135,7 +134,7 @@ function buyJobs() { if (breeding > game.resources.trimps.realMax() * 0.33) { freeWorkers = Math.ceil(game.resources.trimps.realMax() / 2) - game.resources.trimps.employed; //only hire if we have less than 300k trimps (dont spam up the late game with meaningless 1's) - if (freeWorkers > 0 && game.resources.trimps.realMax() <= 3e5 && buyjobbies) { + if (freeWorkers > 0 && game.resources.trimps.realMax() <= 3e5 && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper'))) { //do Something tiny, so earlygame isnt stuck on 0 (down to 33% trimps. stops getting stuck from too low.) safeBuyJob('Miner', 1); @@ -156,7 +155,7 @@ function buyJobs() { if (amount == null) amount = 1; if (canAffordJob(job, false, amount) && !game.jobs[job].locked) { - if (freeWorkers < amount && buyjobbies) + if (freeWorkers < amount && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper'))) subtract = safeFireJob('Farmer'); safeBuyJob(job, amount); } @@ -208,7 +207,7 @@ function buyJobs() { var toBuy = Math.floor((jobratio / totalRatio) * totalDistributableWorkers) - game.jobs[job].owned - subtract; var canBuy = Math.floor(game.resources.trimps.owned - game.resources.trimps.employed); var amount = toBuy <= canBuy ? toBuy : canBuy; - if (amount != 0 && buyjobbies) { + if (amount != 0 && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper'))) { safeBuyJob(job, amount); //debug("Ratio Buying Job: " + job + " " + amount + " " + jobratio, "jobs"); } @@ -218,9 +217,9 @@ function buyJobs() { return false; } ratiobuy('Farmer', farmerRatio); - if (!ratiobuy('Miner', minerRatio) && breedFire && game.global.turkimpTimer === 0 && buyjobbies) + if (!ratiobuy('Miner', minerRatio) && breedFire && game.global.turkimpTimer === 0 && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper')) safeBuyJob('Miner', game.jobs.Miner.owned * -1); - if (!ratiobuy('Lumberjack', lumberjackRatio) && breedFire && buyjobbies) + if (!ratiobuy('Lumberjack', lumberjackRatio) && breedFire && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper'))) safeBuyJob('Lumberjack', game.jobs.Lumberjack.owned * -1); //Magmamancers code: From bc2fc2bec27fc24d00409ce14bbcf30b1cf78c50 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 13 Aug 2018 14:24:46 +0100 Subject: [PATCH 0854/3477] Update other.js --- modules/other.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/modules/other.js b/modules/other.js index 139a0837f..a2dcb0e9d 100644 --- a/modules/other.js +++ b/modules/other.js @@ -853,15 +853,6 @@ function heliumydaily() { } } -function buynojobs() { - if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) { - buyjobbies = false; - } - if (getPageSetting('buynojobsc')==false) { - buyjobbies = true; - } -} - function fightalways() { if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive) return; From 53b8b8f2b2918c11c72952b7dda2c6aab480977b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 13 Aug 2018 14:25:28 +0100 Subject: [PATCH 0855/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 - 1 file changed, 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index ca884d2e4..275a792ef 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -233,7 +233,6 @@ function mainLoop() { if (getPageSetting('ForceAbandon')==true) trimpcide(); //other.js if (getPageSetting('AutoAllocatePerks')==2) lootdump(); //Loot Dumping (other.js) if (!game.singleRunBonuses.heliumy.owned && game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1) heliumydaily(); - if (getPageSetting('buynojobsc')==true || getPageSetting('buynojobsc')==false) buynojobs(); if (getPageSetting('fightforever')==true || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) || (getPageSetting('dfightforever')==true && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined'))) fightalways(); if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); From 7b924d7fb4ab115d2573ffa2ad651d4cf8952d26 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 13 Aug 2018 14:27:56 +0100 Subject: [PATCH 0856/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 275a792ef..d7064d1da 100644 --- a/AutoTrimps2.js +++ b/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', 'perks', 'fight-info', 'performance', 'windstacking']; + ATmoduleList = ['query', 'portal', 'upgrades', 'heirlooms', 'buildings', 'jobs', 'equipment', 'gather', 'stance', 'battlecalc', 'maps', 'breedtimer', 'dynprestige', 'fight', 'scryer', 'magmite', 'other', 'import-export', 'perks', 'fight-info', 'performance']; for (var m in ATmoduleList) { ATscriptLoad(modulepath, ATmoduleList[m]); } From b789a5cfdc6647d65d2dfd1dc28f918959987946 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 13 Aug 2018 14:31:24 +0100 Subject: [PATCH 0857/3477] Update jobs.js --- modules/jobs.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/jobs.js b/modules/jobs.js index 0c0dd3300..cbed1d230 100644 --- a/modules/jobs.js +++ b/modules/jobs.js @@ -217,7 +217,7 @@ function buyJobs() { return false; } ratiobuy('Farmer', farmerRatio); - if (!ratiobuy('Miner', minerRatio) && breedFire && game.global.turkimpTimer === 0 && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper')) + if (!ratiobuy('Miner', minerRatio) && breedFire && game.global.turkimpTimer === 0 && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper'))) safeBuyJob('Miner', game.jobs.Miner.owned * -1); if (!ratiobuy('Lumberjack', lumberjackRatio) && breedFire && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper'))) safeBuyJob('Lumberjack', game.jobs.Lumberjack.owned * -1); @@ -261,13 +261,13 @@ function buyJobs() { //Some kind of Protection or error checking. not needed much? if ((game.resources.trimps.owned - game.resources.trimps.employed) < 2) { - var a = (game.jobs.Farmer.owned > 2) + var a = (game.jobs.Farmer.owned > 2); if (a) safeFireJob('Farmer', 2); - var b = (game.jobs.Lumberjack.owned > 2) + var b = (game.jobs.Lumberjack.owned > 2); if (b) safeFireJob('Lumberjack', 2); - var c = (game.jobs.Miner.owned > 2) + var c = (game.jobs.Miner.owned > 2); if (c) safeFireJob('Miner', 2); if (a || b || c) From e6a04d1fd8d18c60076c002ff54f3da882285f8a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 13 Aug 2018 14:38:07 +0100 Subject: [PATCH 0858/3477] Update jobs.js --- modules/jobs.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/jobs.js b/modules/jobs.js index cbed1d230..bcf529c00 100644 --- a/modules/jobs.js +++ b/modules/jobs.js @@ -134,7 +134,8 @@ function buyJobs() { if (breeding > game.resources.trimps.realMax() * 0.33) { freeWorkers = Math.ceil(game.resources.trimps.realMax() / 2) - game.resources.trimps.employed; //only hire if we have less than 300k trimps (dont spam up the late game with meaningless 1's) - if (freeWorkers > 0 && game.resources.trimps.realMax() <= 3e5 && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper'))) { + if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; + if (freeWorkers > 0 && game.resources.trimps.realMax() <= 3e5) { //do Something tiny, so earlygame isnt stuck on 0 (down to 33% trimps. stops getting stuck from too low.) safeBuyJob('Miner', 1); @@ -155,7 +156,8 @@ function buyJobs() { if (amount == null) amount = 1; if (canAffordJob(job, false, amount) && !game.jobs[job].locked) { - if (freeWorkers < amount && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper'))) + if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; + if (freeWorkers < amount) subtract = safeFireJob('Farmer'); safeBuyJob(job, amount); } @@ -207,7 +209,8 @@ function buyJobs() { var toBuy = Math.floor((jobratio / totalRatio) * totalDistributableWorkers) - game.jobs[job].owned - subtract; var canBuy = Math.floor(game.resources.trimps.owned - game.resources.trimps.employed); var amount = toBuy <= canBuy ? toBuy : canBuy; - if (amount != 0 && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper'))) { + if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; + if (amount != 0) { safeBuyJob(job, amount); //debug("Ratio Buying Job: " + job + " " + amount + " " + jobratio, "jobs"); } @@ -217,9 +220,11 @@ function buyJobs() { return false; } ratiobuy('Farmer', farmerRatio); - if (!ratiobuy('Miner', minerRatio) && breedFire && game.global.turkimpTimer === 0 && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper'))) + if (!ratiobuy('Miner', minerRatio) && breedFire && game.global.turkimpTimer === 0) + if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; safeBuyJob('Miner', game.jobs.Miner.owned * -1); - if (!ratiobuy('Lumberjack', lumberjackRatio) && breedFire && (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' && game.global.challengeActive != 'Trapper'))) + if (!ratiobuy('Lumberjack', lumberjackRatio) && breedFire) + if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; safeBuyJob('Lumberjack', game.jobs.Lumberjack.owned * -1); //Magmamancers code: From dce951c3c29b1a73f04ad71c66a04f5e7099f820 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 13 Aug 2018 14:44:50 +0100 Subject: [PATCH 0859/3477] Update jobs.js --- modules/jobs.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/jobs.js b/modules/jobs.js index bcf529c00..d09da326b 100644 --- a/modules/jobs.js +++ b/modules/jobs.js @@ -134,10 +134,9 @@ function buyJobs() { if (breeding > game.resources.trimps.realMax() * 0.33) { freeWorkers = Math.ceil(game.resources.trimps.realMax() / 2) - game.resources.trimps.employed; //only hire if we have less than 300k trimps (dont spam up the late game with meaningless 1's) - if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; if (freeWorkers > 0 && game.resources.trimps.realMax() <= 3e5) { //do Something tiny, so earlygame isnt stuck on 0 (down to 33% trimps. stops getting stuck from too low.) - + if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; safeBuyJob('Miner', 1); safeBuyJob('Farmer', 1); safeBuyJob('Lumberjack', 1); @@ -156,7 +155,6 @@ function buyJobs() { if (amount == null) amount = 1; if (canAffordJob(job, false, amount) && !game.jobs[job].locked) { - if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; if (freeWorkers < amount) subtract = safeFireJob('Farmer'); safeBuyJob(job, amount); @@ -209,8 +207,8 @@ function buyJobs() { var toBuy = Math.floor((jobratio / totalRatio) * totalDistributableWorkers) - game.jobs[job].owned - subtract; var canBuy = Math.floor(game.resources.trimps.owned - game.resources.trimps.employed); var amount = toBuy <= canBuy ? toBuy : canBuy; - if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; if (amount != 0) { + if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; safeBuyJob(job, amount); //debug("Ratio Buying Job: " + job + " " + amount + " " + jobratio, "jobs"); } From c4309a8a56b642cabb79c44cd27122afcfb2b9f9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 13 Aug 2018 14:52:28 +0100 Subject: [PATCH 0860/3477] Update jobs.js --- modules/jobs.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/jobs.js b/modules/jobs.js index d09da326b..47893bf33 100644 --- a/modules/jobs.js +++ b/modules/jobs.js @@ -136,11 +136,11 @@ function buyJobs() { //only hire if we have less than 300k trimps (dont spam up the late game with meaningless 1's) if (freeWorkers > 0 && game.resources.trimps.realMax() <= 3e5) { //do Something tiny, so earlygame isnt stuck on 0 (down to 33% trimps. stops getting stuck from too low.) - if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; + if ((getPageSetting('buynojobsc')==true && (game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper')) || (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper')) || (getPageSetting('buynojobsc')==false && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper'))) { safeBuyJob('Miner', 1); safeBuyJob('Farmer', 1); safeBuyJob('Lumberjack', 1); - + } } } //standard quit routine if <90% breed: @@ -218,12 +218,12 @@ function buyJobs() { return false; } ratiobuy('Farmer', farmerRatio); - if (!ratiobuy('Miner', minerRatio) && breedFire && game.global.turkimpTimer === 0) - if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; - safeBuyJob('Miner', game.jobs.Miner.owned * -1); - if (!ratiobuy('Lumberjack', lumberjackRatio) && breedFire) - if (getPageSetting('buynojobsc')==true && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper')) return; - safeBuyJob('Lumberjack', game.jobs.Lumberjack.owned * -1); + if (!ratiobuy('Miner', minerRatio) && breedFire && game.global.turkimpTimer === 0) { + if ((getPageSetting('buynojobsc')==true && (game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper')) || (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper')) || (getPageSetting('buynojobsc')==false && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper'))) { + safeBuyJob('Miner', game.jobs.Miner.owned * -1);}} + if (!ratiobuy('Lumberjack', lumberjackRatio) && breedFire){ + if ((getPageSetting('buynojobsc')==true && (game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper')) || (getPageSetting('buynojobsc')==false && (game.global.challengeActive != 'Watch' || game.global.challengeActive != 'Trapper')) || (getPageSetting('buynojobsc')==false && (game.global.challengeActive == 'Watch' || game.global.challengeActive == 'Trapper'))) { + safeBuyJob('Lumberjack', game.jobs.Lumberjack.owned * -1);}} //Magmamancers code: if (game.jobs.Magmamancer.locked) return; From a1edcc1073ca1b68f8e8604cf851269299a62b61 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 14 Aug 2018 17:17:34 +0100 Subject: [PATCH 0861/3477] Update Graphs.js --- Graphs.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Graphs.js b/Graphs.js index 1269ac81b..adffa5d43 100644 --- a/Graphs.js +++ b/Graphs.js @@ -30,7 +30,7 @@ document.getElementById("graphParent").innerHTML += '
    Date: Tue, 14 Aug 2018 17:19:23 +0100 Subject: [PATCH 0862/3477] Update Graphs.js --- Graphs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Graphs.js b/Graphs.js index adffa5d43..f46a07309 100644 --- a/Graphs.js +++ b/Graphs.js @@ -1009,9 +1009,10 @@ function setGraphData(graph) { case 'Wind Stacks': graphData = allPurposeGraph('windstacks',true,"number"); title = 'Wind Stacks (Highest)'; - xTitle = 'Zone'; + xTitle = 'Zone (starts at 236)'; yTitle = 'Windstacks'; yType = 'Linear'; + xminFloor = 236 // if (getPageSetting('NoNurseriesUntil')) // xminFloor = getPageSetting('NoNurseriesUntil'); break; From 646d5288de48510b4ccdf355ee257dce6cadbb8c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 13:28:29 +0100 Subject: [PATCH 0863/3477] Update upgrades.js --- modules/upgrades.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index a3e37ed3c..c9d535ef0 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -8,8 +8,8 @@ function buyUpgrades() { var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && game.global.world < getPageSetting('AutoGen2End') && HDratioy() < .00000025))) continue; - if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; - if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; + if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; + if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; //skip bloodlust during scientist challenges and while we have autofight enabled. From 791e697956b02c666aa3bc7ce0a5152decf70de6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 13:32:11 +0100 Subject: [PATCH 0864/3477] Update equipment.js --- modules/equipment.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index a02397ea8..4d8e0ac35 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -377,8 +377,8 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; - if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") return; - if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") return; if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); else @@ -415,8 +415,8 @@ function autoLevelEquipment() { var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; //If we're considering an attack item, we want to buy weapons if we don't have enough damage, or if we don't need health (so we default to buying some damage) if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { - if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") return; - if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") return; if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); game.global.buyAmt = getPageSetting('gearamounttobuy'); From 0f4316bdaa1a24f92aaa9b402faf61d06b4b22ad Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 13:33:31 +0100 Subject: [PATCH 0865/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index a2dcb0e9d..eacf56e25 100644 --- a/modules/other.js +++ b/modules/other.js @@ -911,7 +911,7 @@ function buyshitspire() { } function orangewindstack() { - if (getEmpowerment() == "Wind" && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind')) { if (game.equipment.Dagger.level > 9 && game.upgrades.Dagadder.locked == 0) buyUpgrade('Dagadder', true, true); if (game.equipment.Mace.level > 9 && game.upgrades.Megamace.locked == 0) @@ -942,7 +942,7 @@ function orangewindstack() { } function dorangewindstack() { - if (getEmpowerment() == "Wind" && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind')) { + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind')) { if (game.equipment.Dagger.level > 9 && game.upgrades.Dagadder.locked == 0) buyUpgrade('Dagadder', true, true); if (game.equipment.Mace.level > 9 && game.upgrades.Megamace.locked == 0) From dbe73ca5b4f7f7e46c78ef9955e1911ccb81a927 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 13:34:13 +0100 Subject: [PATCH 0866/3477] Update equipment.js --- modules/equipment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/equipment.js b/modules/equipment.js index 4d8e0ac35..fde023adc 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -377,7 +377,7 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") return; if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); From ba61e383982f1edfe30e64d45ed2e199b48036f2 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 13:51:02 +0100 Subject: [PATCH 0867/3477] Update import-export.js --- modules/import-export.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/modules/import-export.js b/modules/import-export.js index ba64e18dc..41a4d958c 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -189,6 +189,28 @@ function ImportExportTooltip(what, event) { }; } costText += "
    "; + } else if (what == "Export550") { + tooltipText = "This is your AUTOTRIMPS z550+ save string. use this string to import the settings.

    "; + costText = "
    Got it
    "; + if (document.queryCommandSupported('copy')) { + costText += "
    Copy to Clipboard
    "; + ondisplay = function() { + document.getElementById('exportArea').select(); + document.getElementById('clipBoardBtn').addEventListener('click', function(event) { + document.getElementById('exportArea').select(); + try { + document.execCommand('copy'); + } catch (err) { + document.getElementById('clipBoardBtn').innerHTML = "Error, not copied"; + } + }); + }; + } else { + ondisplay = function() { + document.getElementById('exportArea').select(); + }; + } + costText += "
    "; } else if (what == "ImportAutoTrimps") { //runs the loadAutoTrimps() function. tooltipText = "Import your AUTOTRIMPS save string! It'll be fine, I promise.

    "; @@ -422,4 +444,4 @@ function resetModuleVars(imported) { } settingsProfileMakeGUI(); //runs at the bottom now: -initializeSettingsProfiles(); //populate dropdown. \ No newline at end of file +initializeSettingsProfiles(); //populate dropdown. From fd72fe4514b93ba0f94ade8db77acc0af90122aa Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 13:51:06 +0100 Subject: [PATCH 0868/3477] Update SettingsGUI.js --- SettingsGUI.js | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 804ab728d..1ca84c6d3 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -563,23 +563,9 @@ function initializeAllSettings() { createSetting('ImportAutoTrimps', 'Import AutoTrimps', 'Import your AutoTrimps Settings. Asks you to name it as a profile afterwards.', 'infoclick', 'ImportAutoTrimps', null, 'Import Export'); createSetting('ExportAutoTrimps', 'Export AutoTrimps', 'Export your AutoTrimps Settings as a output string text formatted in JSON.', 'infoclick', 'ExportAutoTrimps', null, 'Import Export'); createSetting('DefaultAutoTrimps', 'Reset to Default', 'Reset everything to the way it was when you first installed the script. ', 'infoclick', 'ResetDefaultSettingsProfiles', null, 'Import Export'); + createSetting('Export550', '550+ AT Settings', 'Gives you an AT settings String that you can use to import. Use if you are z550+ ', 'infoclick', 'Export550', null, 'Import Export'); createSetting('CleanupAutoTrimps', 'Cleanup Saved Settings ', 'Deletes old values from previous versions of the script from your AutoTrimps Settings file.', 'infoclick', 'CleanupAutoTrimps', null, 'Import Export'); settingsProfileMakeGUI(); //Settings Profile dropdown and Delete button. (this always shows up first - can be here last) - //createSetting('ExportModuleVars', 'Export Custom Variables', 'Export your custom MODULES variables.', 'infoclick', 'ExportModuleVars', null, 'Import Export'); - //createSetting('ImportModuleVars', 'Import Custom Variables', 'Import your custom MODULES variables (and save).', 'infoclick', 'ImportModuleVars', null, 'Import Export'); - //createSetting('ResetModuleVars', 'Reset Custom Variables', 'Reset(Delete) your custom MODULES variables, and return the script to normal. ', 'infoclick', 'ResetModuleVars', null, 'Import Export'); - - //createSetting('PlayerLevel', 'PlayerLevel', 'PlayerLevel: Indicate around what level you are. noob, low, medium, high, spire, magma, expert, z450+, z500+, endgame and so on. Might be used to control which settings are visible in the future. ', 'dropdown', "Medium", ["Noob","Low","Medium","High","Spire","Magma","Expert","z450+","z500+","EndGame"], 'Display'); - /* - createSetting('ATModuleListDropdown', 'Modules', 'AT Module List Dropdown: Lists all the individual modules (.js files) that have been auto-loaded. It might be possible to unload these or something in the future.', 'dropdown', ATmoduleList[0], ATmoduleList, 'Import Export'); - document.getElementById('ATModuleListDropdown').multiple = true; //allow 4 multiple selections - document.getElementById('ATModuleListDropdown').size = 4; - document.getElementById('ATModuleListDropdown').height = '5vw'; - document.getElementById('ATModuleListDropdownLabel').style.verticalAlign = 'top'; - document.getElementById('ATModuleListDropdownLabel').parentNode.style.width = null; //make the next stuff fit on 1 line. - createSetting('ATModuleUnload', 'Unload Module', 'UnLoads a running module file this session', 'infoclick', 'ATModuleUnload', null, 'Import Export'); - createSetting('ATModuleLoad', 'ReLoad Module', 'Load/Reloads a module file (.js) and runs it.', 'infoclick', 'ATModuleLoad', null, 'Import Export'); - */ } initializeAllSettings(); //EXECUTE From a2797031fda8ebf21a94bc1e037d78c9816f74af Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 13:59:17 +0100 Subject: [PATCH 0869/3477] Update utils.js --- modules/utils.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/utils.js b/modules/utils.js index f2673b22a..f9abc1a36 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -124,6 +124,10 @@ function serializeSettings() { }, {})); } +function serializeSettings550() { + return {"ManualGather2":2,"ATversion":"2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0","BetterAutoFight":3,"AutoStance":3,"BuyStorage":true,"BuyBuildings":true,"BuyUpgrades":true,"BuyJobs":true,"TrapTrimps":false,"AutoHeirlooms":true,"HireScientists":true,"WorkerRatios":false,"ManageBreedtimer":false,"AutoPortal":"Custom","HeliumHourChallenge":"Corrupted","CustomAutoPortal":559,"HeHrDontPortalBefore":496,"HeliumHrBuffer":3,"AutoFinishDaily":true,"AutoFinishDailyZone":0,"AutoStartDaily":false,"PauseScript":false,"BuyArmor":true,"BuyArmorUpgrades":true,"BuyWeapons":true,"BuyWeaponUpgrades":true,"BuyShieldblock":false,"Prestige":"Dagadder","PrestigeBackup":{"selected":"Dagadder","id":"PrestigeBackup","name":"PrestigeBackup"},"DynamicPrestige2":-1,"PrestigeSkipMode":false,"AlwaysArmorLvl2":true,"WaitTill60":true,"DelayArmorWhenNeeded":false,"CapEquip2":125,"AutoMaps":1,"DynamicSiphonology":true,"LowerFarmingZone":true,"MinutestoFarmBeforeSpire":0,"RunBionicBeforeSpire":false,"ExitSpireCell":90,"CorruptionCalc":true,"FarmWhenNomStacks7":true,"VoidMaps":555,"RunNewVoids":false,"RunNewVoidsUntil":600,"VoidCheck":1,"MaxTox":false,"DisableFarm":true,"FarmerRatio":20,"LumberjackRatio":10,"MinerRatio":1000,"MaxScientists":"-1","MaxExplorers":3000,"MaxTrainers":-1,"MaxHut":100,"MaxHouse":0,"MaxMansion":0,"MaxHotel":0,"MaxResort":0,"MaxGateway":0,"MaxWormhole":0,"MaxCollector":0,"FirstGigastation":1,"DeltaGigastation":1,"MaxGym":"-1","MaxTribute":"-1","MaxNursery":-1,"BreedFire":false,"AutoMagmamancers":true,"WarpstationCap":true,"WarpstationWall3":-1,"WarpstationCoordBuy":true,"AutoRoboTrimp":230,"AutoGoldenUpgrades":"Void 60","AutoHeirlooms2":false,"AutoUpgradeHeirlooms":false,"TrainerCaptoTributes":"-1","NoNurseriesUntil":485,"AutoMagmiteSpender2":2,"ForceAbandon":true,"GymWall":-1,"DynamicGyms":true,"AutoAllocatePerks":1,"SpireBreedTimer":-1,"UseScryerStance":false,"ScryerUseWhenOverkill":false,"ScryerMinZone":481,"ScryerMaxZone":-1,"ScryerUseinMaps2":2,"ScryerUseinVoidMaps2":0,"ScryerUseinSpire2":0,"ScryerSkipBoss2":2,"ScryerSkipCorrupteds2":2,"ScryerDieToUseS":true,"SpamGeneral":true,"SpamUpgrades":false,"SpamEquipment":false,"SpamMaps":false,"SpamOther":false,"SpamBuilding":false,"SpamJobs":false,"ManualCoords":false,"TrimpleZ":0,"ScryerDieZ":230.6,"IgnoreCrits":2,"ForcePresZ":-1,"PreferMetal":false,"PreSpireNurseries":7000,"FinishC2":-1,"PowerSaving":0,"PrestigeSkip2":false,"AutoEggs":false,"UseAutoGen":1,"AutoGen2":3,"AutoGen2End":320,"AutoGen2SupplyEnd":false,"AutoGen3":0,"AutoGenDC":1,"AutoGenC2":1,"AutoGen2Override":1,"SupplyWall":1,"OneTimeOnly":false,"BuyOvclock":false,"IgnoreSpiresUntil":500,"goldStrat":"Max then Helium","goldAlternating":2,"goldZone":600,"MaxStacksForSpire":true,"UsePatience":false,"AutoNatureTokens":true,"AutoPoison":"Convert to Wind","AutoWind":"Empowerment","AutoIce":"Convert to Wind","MaxMapBonusAfterZone":-1,"SpamGraphs":false,"allowSettingsUpload":false,"EnhanceGrids":false,"EnableAFK":{"id":"EnableAFK","name":"Enable AFK","description":"Enables CPU and RAM saving AFK-mode","type":"action","value":1},"SpamMagmite":false,"SpamPerks":true,"analyticsID":"7f11701e-adc9-477c-a08d-2b66fe3ec2a2","ChangeLog":{"id":"ChangeLog","name":"Show Changelog","description":"Shows the changelog popup message that AT loads on startup in case you missed it.","type":"action","value":1},"AdvMapSpecialModifier":false,"GeneticistTimer":-1,"goldNoBattle":true,"BuyUpgradesNew":1,"AutoFinishDailyNew":0,"BuyBuildingsNew":1,"BuyJobsNew":2,"BuyArmorNew":1,"BuyWeaponsNew":1,"PrestigeSkip1_2":0,"RunNewVoidsUntilNew":0,"DailyVoidMod":570,"PlusMapVoidToggle":0,"Praidingzone":{"id":"Praidingzone","name":"P Raiding Z","description":"Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ","type":"multiValue","value":[495,531,540,545,551,555]},"BWraid":false,"BWraidingmin":-1,"BWraidingmax":{"id":"BWraidingmax","name":"Max BW to raid","description":"Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Z to BW raid setting for details.","type":"multiValue","value":[615]},"lootdumpz":232,"lootdumpa":10000,"WindStackingMin":526,"ScryUseinPoison":-1,"ScryUseinWind":-1,"ScryUseinIce":-1,"BuyOneTimeOC":2,"AutoHeirloomsNew":2,"ShowSettings":true,"BWraidingz":{"id":"BWraidingz","name":"Z to BW Raid","description":"Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.","type":"multiValue","value":[595]},"fastallocate":true,"VoidPraid":true,"trimpsnotdie":true,"gearamounttobuy":5,"Dailyportal":575,"dVoidPraid":true,"dPraidingzone":{"id":"dPraidingzone","name":"Daily P Raiding Z","description":"Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ","type":"multiValue","value":[480,491,495,510,525,531,540,546,551,555,566,570]},"Dailybwraid":false,"dBWraidingz":{"id":"dBWraidingz","name":"Daily Z to BW Raid","description":"Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Daily Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.","type":"multiValue","value":[495]},"dBWraidingmax":{"id":"dBWraidingmax","name":"Daily Max BW to raid","description":"Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Daily Z to BW raid setting for details.","type":"multiValue","value":[515]},"dexitspirecell":-1,"WindStackingMax":195,"buyheliumy":-1,"buynojobsc":true,"Trimpicide":true,"fightforever":false,"use3daily":true,"windcutoff":90,"spireshitbuy":true,"hardcorewind":541,"PraidHarder":false,"PraidFarmFrags":false,"PraidBeforeFarm":false,"dPraidHarder":false,"dMaxPraidZone":{"id":"dMaxPraidZone","name":"Daily Max P Raid Z","description":"List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)","type":"multiValue","value":[-1]},"dPraidFarmFragsZ":{"id":"dPraidFarmFragsZ","name":"Daily Farm Frags Z","description":"P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.","type":"multiValue","value":[-1]},"dPraidBeforeFarmZ":{"id":"dPraidBeforeFarmZ","name":"Dy Raid bef farm Z","description":"P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.","type":"multiValue","value":[-1]},"MaxPraidZone":{"id":"MaxPraidZone","name":"Max P Raid Zones","description":"List of maximum zones to Praid corresponding to the list specified in Praiding zones. e.g. if P raiding zones setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)","type":"multiValue","value":[505,535,545,555,561]},"PraidFarmFragsZ":{"id":"PraidFarmFragsZ","name":"Farm Fragments Z","description":"P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments. ","type":"multiValue","value":[-1]},"PraidBeforeFarmZ":{"id":"PraidBeforeFarmZ","name":"Raid before farm Z","description":"P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.","type":"multiValue","value":[-1]},"fuellater":300,"dWindStackingMin":511,"dWindStackingMax":190,"dwindcutoff":80,"dhardcorewind":526,"ScryerSkipHealthy":2,"addpoison":true,"amalcoord":true,"dAutoGoldenUpgrades":"Void 60","cAutoGoldenUpgrades":"Battle","dhardcorewindmax":"-1","cfightforever":true,"work":false,"in":false,"progress":false,"hardcorewindmax":"-1","dfightforever":true}; +} + //Saves autoTrimpSettings to browser cache function saveSettings() { safeSetItems('autoTrimpSettings', serializeSettings()); From 134f8196f64528ac242d6a37e537c591c9d358a9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 13:59:38 +0100 Subject: [PATCH 0870/3477] Update import-export.js --- modules/import-export.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/import-export.js b/modules/import-export.js index 41a4d958c..10909368a 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -190,7 +190,7 @@ function ImportExportTooltip(what, event) { } costText += ""; } else if (what == "Export550") { - tooltipText = "This is your AUTOTRIMPS z550+ save string. use this string to import the settings.

    "; + tooltipText = "This is your AUTOTRIMPS z550+ save string. Use this string to import the settings.

    "; costText = "
    Got it
    "; if (document.queryCommandSupported('copy')) { costText += "
    Copy to Clipboard
    "; From 01e4139f0dcc0e10e9142f4f7b6edd3259581b7a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 14:05:58 +0100 Subject: [PATCH 0871/3477] Update utils.js --- modules/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/utils.js b/modules/utils.js index f9abc1a36..5fcbe99c8 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -125,7 +125,7 @@ function serializeSettings() { } function serializeSettings550() { - return {"ManualGather2":2,"ATversion":"2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0","BetterAutoFight":3,"AutoStance":3,"BuyStorage":true,"BuyBuildings":true,"BuyUpgrades":true,"BuyJobs":true,"TrapTrimps":false,"AutoHeirlooms":true,"HireScientists":true,"WorkerRatios":false,"ManageBreedtimer":false,"AutoPortal":"Custom","HeliumHourChallenge":"Corrupted","CustomAutoPortal":559,"HeHrDontPortalBefore":496,"HeliumHrBuffer":3,"AutoFinishDaily":true,"AutoFinishDailyZone":0,"AutoStartDaily":false,"PauseScript":false,"BuyArmor":true,"BuyArmorUpgrades":true,"BuyWeapons":true,"BuyWeaponUpgrades":true,"BuyShieldblock":false,"Prestige":"Dagadder","PrestigeBackup":{"selected":"Dagadder","id":"PrestigeBackup","name":"PrestigeBackup"},"DynamicPrestige2":-1,"PrestigeSkipMode":false,"AlwaysArmorLvl2":true,"WaitTill60":true,"DelayArmorWhenNeeded":false,"CapEquip2":125,"AutoMaps":1,"DynamicSiphonology":true,"LowerFarmingZone":true,"MinutestoFarmBeforeSpire":0,"RunBionicBeforeSpire":false,"ExitSpireCell":90,"CorruptionCalc":true,"FarmWhenNomStacks7":true,"VoidMaps":555,"RunNewVoids":false,"RunNewVoidsUntil":600,"VoidCheck":1,"MaxTox":false,"DisableFarm":true,"FarmerRatio":20,"LumberjackRatio":10,"MinerRatio":1000,"MaxScientists":"-1","MaxExplorers":3000,"MaxTrainers":-1,"MaxHut":100,"MaxHouse":0,"MaxMansion":0,"MaxHotel":0,"MaxResort":0,"MaxGateway":0,"MaxWormhole":0,"MaxCollector":0,"FirstGigastation":1,"DeltaGigastation":1,"MaxGym":"-1","MaxTribute":"-1","MaxNursery":-1,"BreedFire":false,"AutoMagmamancers":true,"WarpstationCap":true,"WarpstationWall3":-1,"WarpstationCoordBuy":true,"AutoRoboTrimp":230,"AutoGoldenUpgrades":"Void 60","AutoHeirlooms2":false,"AutoUpgradeHeirlooms":false,"TrainerCaptoTributes":"-1","NoNurseriesUntil":485,"AutoMagmiteSpender2":2,"ForceAbandon":true,"GymWall":-1,"DynamicGyms":true,"AutoAllocatePerks":1,"SpireBreedTimer":-1,"UseScryerStance":false,"ScryerUseWhenOverkill":false,"ScryerMinZone":481,"ScryerMaxZone":-1,"ScryerUseinMaps2":2,"ScryerUseinVoidMaps2":0,"ScryerUseinSpire2":0,"ScryerSkipBoss2":2,"ScryerSkipCorrupteds2":2,"ScryerDieToUseS":true,"SpamGeneral":true,"SpamUpgrades":false,"SpamEquipment":false,"SpamMaps":false,"SpamOther":false,"SpamBuilding":false,"SpamJobs":false,"ManualCoords":false,"TrimpleZ":0,"ScryerDieZ":230.6,"IgnoreCrits":2,"ForcePresZ":-1,"PreferMetal":false,"PreSpireNurseries":7000,"FinishC2":-1,"PowerSaving":0,"PrestigeSkip2":false,"AutoEggs":false,"UseAutoGen":1,"AutoGen2":3,"AutoGen2End":320,"AutoGen2SupplyEnd":false,"AutoGen3":0,"AutoGenDC":1,"AutoGenC2":1,"AutoGen2Override":1,"SupplyWall":1,"OneTimeOnly":false,"BuyOvclock":false,"IgnoreSpiresUntil":500,"goldStrat":"Max then Helium","goldAlternating":2,"goldZone":600,"MaxStacksForSpire":true,"UsePatience":false,"AutoNatureTokens":true,"AutoPoison":"Convert to Wind","AutoWind":"Empowerment","AutoIce":"Convert to Wind","MaxMapBonusAfterZone":-1,"SpamGraphs":false,"allowSettingsUpload":false,"EnhanceGrids":false,"EnableAFK":{"id":"EnableAFK","name":"Enable AFK","description":"Enables CPU and RAM saving AFK-mode","type":"action","value":1},"SpamMagmite":false,"SpamPerks":true,"analyticsID":"7f11701e-adc9-477c-a08d-2b66fe3ec2a2","ChangeLog":{"id":"ChangeLog","name":"Show Changelog","description":"Shows the changelog popup message that AT loads on startup in case you missed it.","type":"action","value":1},"AdvMapSpecialModifier":false,"GeneticistTimer":-1,"goldNoBattle":true,"BuyUpgradesNew":1,"AutoFinishDailyNew":0,"BuyBuildingsNew":1,"BuyJobsNew":2,"BuyArmorNew":1,"BuyWeaponsNew":1,"PrestigeSkip1_2":0,"RunNewVoidsUntilNew":0,"DailyVoidMod":570,"PlusMapVoidToggle":0,"Praidingzone":{"id":"Praidingzone","name":"P Raiding Z","description":"Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ","type":"multiValue","value":[495,531,540,545,551,555]},"BWraid":false,"BWraidingmin":-1,"BWraidingmax":{"id":"BWraidingmax","name":"Max BW to raid","description":"Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Z to BW raid setting for details.","type":"multiValue","value":[615]},"lootdumpz":232,"lootdumpa":10000,"WindStackingMin":526,"ScryUseinPoison":-1,"ScryUseinWind":-1,"ScryUseinIce":-1,"BuyOneTimeOC":2,"AutoHeirloomsNew":2,"ShowSettings":true,"BWraidingz":{"id":"BWraidingz","name":"Z to BW Raid","description":"Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.","type":"multiValue","value":[595]},"fastallocate":true,"VoidPraid":true,"trimpsnotdie":true,"gearamounttobuy":5,"Dailyportal":575,"dVoidPraid":true,"dPraidingzone":{"id":"dPraidingzone","name":"Daily P Raiding Z","description":"Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ","type":"multiValue","value":[480,491,495,510,525,531,540,546,551,555,566,570]},"Dailybwraid":false,"dBWraidingz":{"id":"dBWraidingz","name":"Daily Z to BW Raid","description":"Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Daily Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.","type":"multiValue","value":[495]},"dBWraidingmax":{"id":"dBWraidingmax","name":"Daily Max BW to raid","description":"Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Daily Z to BW raid setting for details.","type":"multiValue","value":[515]},"dexitspirecell":-1,"WindStackingMax":195,"buyheliumy":-1,"buynojobsc":true,"Trimpicide":true,"fightforever":false,"use3daily":true,"windcutoff":90,"spireshitbuy":true,"hardcorewind":541,"PraidHarder":false,"PraidFarmFrags":false,"PraidBeforeFarm":false,"dPraidHarder":false,"dMaxPraidZone":{"id":"dMaxPraidZone","name":"Daily Max P Raid Z","description":"List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)","type":"multiValue","value":[-1]},"dPraidFarmFragsZ":{"id":"dPraidFarmFragsZ","name":"Daily Farm Frags Z","description":"P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.","type":"multiValue","value":[-1]},"dPraidBeforeFarmZ":{"id":"dPraidBeforeFarmZ","name":"Dy Raid bef farm Z","description":"P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.","type":"multiValue","value":[-1]},"MaxPraidZone":{"id":"MaxPraidZone","name":"Max P Raid Zones","description":"List of maximum zones to Praid corresponding to the list specified in Praiding zones. e.g. if P raiding zones setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)","type":"multiValue","value":[505,535,545,555,561]},"PraidFarmFragsZ":{"id":"PraidFarmFragsZ","name":"Farm Fragments Z","description":"P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments. ","type":"multiValue","value":[-1]},"PraidBeforeFarmZ":{"id":"PraidBeforeFarmZ","name":"Raid before farm Z","description":"P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.","type":"multiValue","value":[-1]},"fuellater":300,"dWindStackingMin":511,"dWindStackingMax":190,"dwindcutoff":80,"dhardcorewind":526,"ScryerSkipHealthy":2,"addpoison":true,"amalcoord":true,"dAutoGoldenUpgrades":"Void 60","cAutoGoldenUpgrades":"Battle","dhardcorewindmax":"-1","cfightforever":true,"work":false,"in":false,"progress":false,"hardcorewindmax":"-1","dfightforever":true}; + return '{"ManualGather2":2,"ATversion":"2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0","BetterAutoFight":3,"AutoStance":3,"BuyStorage":true,"BuyBuildings":true,"BuyUpgrades":true,"BuyJobs":true,"TrapTrimps":false,"AutoHeirlooms":true,"HireScientists":true,"WorkerRatios":false,"ManageBreedtimer":false,"AutoPortal":"Custom","HeliumHourChallenge":"Corrupted","CustomAutoPortal":559,"HeHrDontPortalBefore":496,"HeliumHrBuffer":3,"AutoFinishDaily":true,"AutoFinishDailyZone":0,"AutoStartDaily":false,"PauseScript":false,"BuyArmor":true,"BuyArmorUpgrades":true,"BuyWeapons":true,"BuyWeaponUpgrades":true,"BuyShieldblock":false,"Prestige":"Dagadder","PrestigeBackup":{"selected":"Dagadder","id":"PrestigeBackup","name":"PrestigeBackup"},"DynamicPrestige2":-1,"PrestigeSkipMode":false,"AlwaysArmorLvl2":true,"WaitTill60":true,"DelayArmorWhenNeeded":false,"CapEquip2":125,"AutoMaps":1,"DynamicSiphonology":true,"LowerFarmingZone":true,"MinutestoFarmBeforeSpire":0,"RunBionicBeforeSpire":false,"ExitSpireCell":90,"CorruptionCalc":true,"FarmWhenNomStacks7":true,"VoidMaps":555,"RunNewVoids":false,"RunNewVoidsUntil":600,"VoidCheck":1,"MaxTox":false,"DisableFarm":true,"FarmerRatio":20,"LumberjackRatio":10,"MinerRatio":1000,"MaxScientists":"-1","MaxExplorers":3000,"MaxTrainers":-1,"MaxHut":100,"MaxHouse":0,"MaxMansion":0,"MaxHotel":0,"MaxResort":0,"MaxGateway":0,"MaxWormhole":0,"MaxCollector":0,"FirstGigastation":1,"DeltaGigastation":1,"MaxGym":"-1","MaxTribute":"-1","MaxNursery":-1,"BreedFire":false,"AutoMagmamancers":true,"WarpstationCap":true,"WarpstationWall3":-1,"WarpstationCoordBuy":true,"AutoRoboTrimp":230,"AutoGoldenUpgrades":"Void 60","AutoHeirlooms2":false,"AutoUpgradeHeirlooms":false,"TrainerCaptoTributes":"-1","NoNurseriesUntil":485,"AutoMagmiteSpender2":2,"ForceAbandon":true,"GymWall":-1,"DynamicGyms":true,"AutoAllocatePerks":1,"SpireBreedTimer":-1,"UseScryerStance":false,"ScryerUseWhenOverkill":false,"ScryerMinZone":481,"ScryerMaxZone":-1,"ScryerUseinMaps2":2,"ScryerUseinVoidMaps2":0,"ScryerUseinSpire2":0,"ScryerSkipBoss2":2,"ScryerSkipCorrupteds2":2,"ScryerDieToUseS":true,"SpamGeneral":true,"SpamUpgrades":false,"SpamEquipment":false,"SpamMaps":false,"SpamOther":false,"SpamBuilding":false,"SpamJobs":false,"ManualCoords":false,"TrimpleZ":0,"ScryerDieZ":230.6,"IgnoreCrits":2,"ForcePresZ":-1,"PreferMetal":false,"PreSpireNurseries":7000,"FinishC2":-1,"PowerSaving":0,"PrestigeSkip2":false,"AutoEggs":false,"UseAutoGen":1,"AutoGen2":3,"AutoGen2End":320,"AutoGen2SupplyEnd":false,"AutoGen3":0,"AutoGenDC":1,"AutoGenC2":1,"AutoGen2Override":1,"SupplyWall":1,"OneTimeOnly":false,"BuyOvclock":false,"IgnoreSpiresUntil":500,"goldStrat":"Max then Helium","goldAlternating":2,"goldZone":600,"MaxStacksForSpire":true,"UsePatience":false,"AutoNatureTokens":true,"AutoPoison":"Convert to Wind","AutoWind":"Empowerment","AutoIce":"Convert to Wind","MaxMapBonusAfterZone":-1,"SpamGraphs":false,"allowSettingsUpload":false,"EnhanceGrids":false,"EnableAFK":{"id":"EnableAFK","name":"Enable AFK","description":"Enables CPU and RAM saving AFK-mode","type":"action","value":1},"SpamMagmite":false,"SpamPerks":true,"analyticsID":"7f11701e-adc9-477c-a08d-2b66fe3ec2a2","ChangeLog":{"id":"ChangeLog","name":"Show Changelog","description":"Shows the changelog popup message that AT loads on startup in case you missed it.","type":"action","value":1},"AdvMapSpecialModifier":false,"GeneticistTimer":-1,"goldNoBattle":true,"BuyUpgradesNew":1,"AutoFinishDailyNew":0,"BuyBuildingsNew":1,"BuyJobsNew":2,"BuyArmorNew":1,"BuyWeaponsNew":1,"PrestigeSkip1_2":0,"RunNewVoidsUntilNew":0,"DailyVoidMod":570,"PlusMapVoidToggle":0,"Praidingzone":{"id":"Praidingzone","name":"P Raiding Z","description":"Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ","type":"multiValue","value":[495,531,540,545,551,555]},"BWraid":false,"BWraidingmin":-1,"BWraidingmax":{"id":"BWraidingmax","name":"Max BW to raid","description":"Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Z to BW raid setting for details.","type":"multiValue","value":[615]},"lootdumpz":232,"lootdumpa":10000,"WindStackingMin":526,"ScryUseinPoison":-1,"ScryUseinWind":-1,"ScryUseinIce":-1,"BuyOneTimeOC":2,"AutoHeirloomsNew":2,"ShowSettings":true,"BWraidingz":{"id":"BWraidingz","name":"Z to BW Raid","description":"Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.","type":"multiValue","value":[595]},"fastallocate":true,"VoidPraid":true,"trimpsnotdie":true,"gearamounttobuy":5,"Dailyportal":575,"dVoidPraid":true,"dPraidingzone":{"id":"dPraidingzone","name":"Daily P Raiding Z","description":"Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ","type":"multiValue","value":[480,491,495,510,525,531,540,546,551,555,566,570]},"Dailybwraid":false,"dBWraidingz":{"id":"dBWraidingz","name":"Daily Z to BW Raid","description":"Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Daily Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.","type":"multiValue","value":[495]},"dBWraidingmax":{"id":"dBWraidingmax","name":"Daily Max BW to raid","description":"Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Daily Z to BW raid setting for details.","type":"multiValue","value":[515]},"dexitspirecell":-1,"WindStackingMax":195,"buyheliumy":-1,"buynojobsc":true,"Trimpicide":true,"fightforever":false,"use3daily":true,"windcutoff":90,"spireshitbuy":true,"hardcorewind":541,"PraidHarder":false,"PraidFarmFrags":false,"PraidBeforeFarm":false,"dPraidHarder":false,"dMaxPraidZone":{"id":"dMaxPraidZone","name":"Daily Max P Raid Z","description":"List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)","type":"multiValue","value":[-1]},"dPraidFarmFragsZ":{"id":"dPraidFarmFragsZ","name":"Daily Farm Frags Z","description":"P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.","type":"multiValue","value":[-1]},"dPraidBeforeFarmZ":{"id":"dPraidBeforeFarmZ","name":"Dy Raid bef farm Z","description":"P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.","type":"multiValue","value":[-1]},"MaxPraidZone":{"id":"MaxPraidZone","name":"Max P Raid Zones","description":"List of maximum zones to Praid corresponding to the list specified in Praiding zones. e.g. if P raiding zones setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)","type":"multiValue","value":[505,535,545,555,561]},"PraidFarmFragsZ":{"id":"PraidFarmFragsZ","name":"Farm Fragments Z","description":"P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments. ","type":"multiValue","value":[-1]},"PraidBeforeFarmZ":{"id":"PraidBeforeFarmZ","name":"Raid before farm Z","description":"P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.","type":"multiValue","value":[-1]},"fuellater":300,"dWindStackingMin":511,"dWindStackingMax":190,"dwindcutoff":80,"dhardcorewind":526,"ScryerSkipHealthy":2,"addpoison":true,"amalcoord":true,"dAutoGoldenUpgrades":"Void 60","cAutoGoldenUpgrades":"Battle","dhardcorewindmax":"-1","cfightforever":true,"work":false,"in":false,"progress":false,"hardcorewindmax":"-1","dfightforever":true}'; } //Saves autoTrimpSettings to browser cache From f1bd671b431e0792e4dfd1d1f9db01825e85bccc Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 14:17:37 +0100 Subject: [PATCH 0872/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 1ca84c6d3..440a63f1a 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -564,6 +564,7 @@ function initializeAllSettings() { createSetting('ExportAutoTrimps', 'Export AutoTrimps', 'Export your AutoTrimps Settings as a output string text formatted in JSON.', 'infoclick', 'ExportAutoTrimps', null, 'Import Export'); createSetting('DefaultAutoTrimps', 'Reset to Default', 'Reset everything to the way it was when you first installed the script. ', 'infoclick', 'ResetDefaultSettingsProfiles', null, 'Import Export'); createSetting('Export550', '550+ AT Settings', 'Gives you an AT settings String that you can use to import. Use if you are z550+ ', 'infoclick', 'Export550', null, 'Import Export'); + createSetting('ExportPresets', 'AT Settings Presets', 'These presets are designed for the stage of play intended. Select a Preset from the list, and click Export Preset, this will give you a string for you to import. Feel free to change your VM zone or any other settings you\'re not happy with though. ', 'dropdown', '---', ["---", "Give me a 1-59 setting", "Now give me all the settings", "z550+"], 'Import Export'); createSetting('CleanupAutoTrimps', 'Cleanup Saved Settings ', 'Deletes old values from previous versions of the script from your AutoTrimps Settings file.', 'infoclick', 'CleanupAutoTrimps', null, 'Import Export'); settingsProfileMakeGUI(); //Settings Profile dropdown and Delete button. (this always shows up first - can be here last) } @@ -995,6 +996,7 @@ function updateCustomButtons() { document.getElementById('AutoPoison').value = autoTrimpSettings.AutoPoison.selected; document.getElementById('AutoWind').value = autoTrimpSettings.AutoWind.selected; document.getElementById('AutoIce').value = autoTrimpSettings.AutoIce.selected; + document.getElementById('ExportPresets').value = autoTrimpSettings.ExportPresets.selected; //document.getElementById('Prestige').value = autoTrimpSettings.Prestige.selected; //dont update this, dynamic prestige takes it over and is handled elsewhere. From bf6da206c2d0ec4b4e2e6d913b7c4ef0a3b91a91 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 14:22:38 +0100 Subject: [PATCH 0873/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 440a63f1a..6f8995e9a 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -564,7 +564,8 @@ function initializeAllSettings() { createSetting('ExportAutoTrimps', 'Export AutoTrimps', 'Export your AutoTrimps Settings as a output string text formatted in JSON.', 'infoclick', 'ExportAutoTrimps', null, 'Import Export'); createSetting('DefaultAutoTrimps', 'Reset to Default', 'Reset everything to the way it was when you first installed the script. ', 'infoclick', 'ResetDefaultSettingsProfiles', null, 'Import Export'); createSetting('Export550', '550+ AT Settings', 'Gives you an AT settings String that you can use to import. Use if you are z550+ ', 'infoclick', 'Export550', null, 'Import Export'); - createSetting('ExportPresets', 'AT Settings Presets', 'These presets are designed for the stage of play intended. Select a Preset from the list, and click Export Preset, this will give you a string for you to import. Feel free to change your VM zone or any other settings you\'re not happy with though. ', 'dropdown', '---', ["---", "Give me a 1-59 setting", "Now give me all the settings", "z550+"], 'Import Export'); + createSetting('ExportPresets', 'AT Settings Preset Export', 'Gives you an AT settings String that you can use to import. Use with The Export Settings Dropdown. ', 'infoclick', 'ExportPresets', null, 'Import Export'); + createSetting('ExportPresetsList', 'AT Settings Presets', 'These presets are designed for the stage of play intended. Select a Preset from the list, and click Export Preset, this will give you a string for you to import. Feel free to change your VM zone or any other settings you\'re not happy with though. ', 'dropdown', '---', ["---", "Give me a 1-59 setting", "Now give me all the settings", "z550+"], 'Import Export'); createSetting('CleanupAutoTrimps', 'Cleanup Saved Settings ', 'Deletes old values from previous versions of the script from your AutoTrimps Settings file.', 'infoclick', 'CleanupAutoTrimps', null, 'Import Export'); settingsProfileMakeGUI(); //Settings Profile dropdown and Delete button. (this always shows up first - can be here last) } From edada9bf5211b63ea615be45aadb304d772cdd0a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 14:23:10 +0100 Subject: [PATCH 0874/3477] Update import-export.js --- modules/import-export.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/import-export.js b/modules/import-export.js index 10909368a..0124e6a37 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -205,6 +205,22 @@ function ImportExportTooltip(what, event) { } }); }; + } else if (what == "ExportPresets) { + tooltipText = "This is your AUTOTRIMPS List save string. Use this string to import the settings.

    "; + costText = "
    Got it
    "; + if (document.queryCommandSupported('copy')) { + costText += "
    Copy to Clipboard
    "; + ondisplay = function() { + document.getElementById('exportArea').select(); + document.getElementById('clipBoardBtn').addEventListener('click', function(event) { + document.getElementById('exportArea').select(); + try { + document.execCommand('copy'); + } catch (err) { + document.getElementById('clipBoardBtn').innerHTML = "Error, not copied"; + } + }); + }; } else { ondisplay = function() { document.getElementById('exportArea').select(); From fa51d87c9a18dcf076cffaf0a2186ec1515d73c6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 14:26:47 +0100 Subject: [PATCH 0875/3477] Update SettingsGUI.js --- SettingsGUI.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 6f8995e9a..2caad902c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -564,9 +564,9 @@ function initializeAllSettings() { createSetting('ExportAutoTrimps', 'Export AutoTrimps', 'Export your AutoTrimps Settings as a output string text formatted in JSON.', 'infoclick', 'ExportAutoTrimps', null, 'Import Export'); createSetting('DefaultAutoTrimps', 'Reset to Default', 'Reset everything to the way it was when you first installed the script. ', 'infoclick', 'ResetDefaultSettingsProfiles', null, 'Import Export'); createSetting('Export550', '550+ AT Settings', 'Gives you an AT settings String that you can use to import. Use if you are z550+ ', 'infoclick', 'Export550', null, 'Import Export'); + /*createSetting('ExportPresetsList', 'AT Settings Presets', 'These presets are designed for the stage of play intended. Select a Preset from the list, and click Export Preset, this will give you a string for you to import. Feel free to change your VM zone or any other settings you\'re not happy with though. ', 'dropdown', '---', ["---", "Give me a 1-59 setting", "Now give me all the settings", "z550+"], 'Import Export'); createSetting('ExportPresets', 'AT Settings Preset Export', 'Gives you an AT settings String that you can use to import. Use with The Export Settings Dropdown. ', 'infoclick', 'ExportPresets', null, 'Import Export'); - createSetting('ExportPresetsList', 'AT Settings Presets', 'These presets are designed for the stage of play intended. Select a Preset from the list, and click Export Preset, this will give you a string for you to import. Feel free to change your VM zone or any other settings you\'re not happy with though. ', 'dropdown', '---', ["---", "Give me a 1-59 setting", "Now give me all the settings", "z550+"], 'Import Export'); - createSetting('CleanupAutoTrimps', 'Cleanup Saved Settings ', 'Deletes old values from previous versions of the script from your AutoTrimps Settings file.', 'infoclick', 'CleanupAutoTrimps', null, 'Import Export'); + */createSetting('CleanupAutoTrimps', 'Cleanup Saved Settings ', 'Deletes old values from previous versions of the script from your AutoTrimps Settings file.', 'infoclick', 'CleanupAutoTrimps', null, 'Import Export'); settingsProfileMakeGUI(); //Settings Profile dropdown and Delete button. (this always shows up first - can be here last) } initializeAllSettings(); //EXECUTE @@ -997,9 +997,7 @@ function updateCustomButtons() { document.getElementById('AutoPoison').value = autoTrimpSettings.AutoPoison.selected; document.getElementById('AutoWind').value = autoTrimpSettings.AutoWind.selected; document.getElementById('AutoIce').value = autoTrimpSettings.AutoIce.selected; - document.getElementById('ExportPresets').value = autoTrimpSettings.ExportPresets.selected; - - //document.getElementById('Prestige').value = autoTrimpSettings.Prestige.selected; //dont update this, dynamic prestige takes it over and is handled elsewhere. + //document.getElementById('ExportPresets').value = autoTrimpSettings.ExportPresets.selected; //stop disable farming from needing a refresh if (getPageSetting('DisableFarm')) From 71f43b473628761cec67388e1fb13f05cace939d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 14:28:01 +0100 Subject: [PATCH 0876/3477] Update import-export.js --- modules/import-export.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/import-export.js b/modules/import-export.js index 0124e6a37..9fdaa2d21 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -205,7 +205,7 @@ function ImportExportTooltip(what, event) { } }); }; - } else if (what == "ExportPresets) { + /*} else if (what == "ExportPresets) { tooltipText = "This is your AUTOTRIMPS List save string. Use this string to import the settings.

    "; costText = "
    Got it
    "; if (document.queryCommandSupported('copy')) { @@ -221,7 +221,7 @@ function ImportExportTooltip(what, event) { } }); }; - } else { + */} else { ondisplay = function() { document.getElementById('exportArea').select(); }; From 751e91314e58583b8f9c581d27b2a7afd97d7cd8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 15 Aug 2018 19:29:34 +0100 Subject: [PATCH 0877/3477] Update battlecalc.js --- modules/battlecalc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 5cb493ee9..65572d30c 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -209,7 +209,7 @@ function getBattleStats(what,form,crit) { currentCalc *= game.jobs.Magmamancer.getBonusPercent(); } if (what == "attack" && getEmpowerment() == "Poison" && getPageSetting('addpoison') == true){ - var amt = game.empowerments.Poison.getModifier(); + var amt = game.empowerments.Poison.getModifier() * 2; currentCalc *= (1 + amt); } if (crit) { From dde05b4c74d4c4a66c67f6fb86d757853886d1b4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 09:46:22 +0100 Subject: [PATCH 0878/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 2caad902c..c4498ec5e 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -469,7 +469,7 @@ function initializeAllSettings() { createSetting('ScryerUseWhenOverkill', 'Use When Overkill', 'Overrides the Min/Max zones. Does not override any NEVER settings. Toggles stance when we can Overkill in S, giving us double loot with no speed penalty! NOTE: This being on, and being able to overkill in S will override ALL other settings (Except never use in spire). This is a boolean logic shortcut that disregards all the other settings including Min and Max Zone. If you ONLY want to use S during Overkill, as a workaround: turn this on and Min zone: to 9999 and everything else off(red).

    This has not been optimised for double overkill, and does not always produce the intended results, if you have problems, it may be worth turning off until it can be adjusted.', 'boolean', true, null, 'Scryer'); createSetting('ScryerMinZone', 'Min Zone', 'Minimum zone to start using scryer in.(inclusive) Recommend:(60 or 181). Overkill ignores this. This needs to be On & Valid for the MAYBE option on all other Scryer settings to do anything if Overkill is off. Tip: Use 9999 to disable all Non-Overkill, Non-Force, scryer usage.', 'value', '181', null, 'Scryer'); createSetting('ScryerMaxZone', 'Max Zone', '0 or -1 to disable (Recommended)
    Overkill ignores this. Zone to STOP using scryer at (not inclusive). Turning this ON with a positive number stops MAYBE use of all other Scryer settings.', 'value', '230', null, 'Scryer'); - createSetting('ScryerUseinMaps2', ['Maps: NEVER','Maps: FORCE', 'Maps: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate in Void Maps
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use on Corrupteds to be on after corruption/magma.

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); + createSetting('ScryerUseinMaps2', ['Maps: NEVER','Maps: FORCE', 'Maps: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate in Maps
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use on Corrupteds to be on after corruption/magma.

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerUseinVoidMaps2', ['VoidMaps: NEVER','VoidMaps: FORCE', 'VoidMaps: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate in Void Maps
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use in Maps to be on, as well as use on Corrupteds (if above corruption/magma) to activate.

    Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerUseinSpire2', ['Spire: NEVER','Spire: FORCE','Spire: MAYBE'], 'NEVER means what it says!!!
    FORCE means Scryer will ALWAYS activate in the Spire
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use on Corrupteds to be on for corrupted enemies.

    Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); From 0e8ead9ed3651f7d08870609ebd10921141cecd5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 09:52:47 +0100 Subject: [PATCH 0879/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index eacf56e25..d1013c085 100644 --- a/modules/other.js +++ b/modules/other.js @@ -854,7 +854,7 @@ function heliumydaily() { } function fightalways() { - if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || game.global.spireActive) + if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || (game.global.spireActive && game.global.world >= getPageSetting('IgnoreSpiresUntil')) return; if (!game.global.fighting) fightManual(); From c0660d3df8d18dbe496e5281908d56c9750e8c8e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 10:28:27 +0100 Subject: [PATCH 0880/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index d1013c085..bd5ea1939 100644 --- a/modules/other.js +++ b/modules/other.js @@ -854,7 +854,7 @@ function heliumydaily() { } function fightalways() { - if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || (game.global.spireActive && game.global.world >= getPageSetting('IgnoreSpiresUntil')) + if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || (game.global.spireActive && game.global.world >= getPageSetting('IgnoreSpiresUntil'))) return; if (!game.global.fighting) fightManual(); From 738f42cce0e758f7285dc0f36650c53449e45ae5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 11:09:28 +0100 Subject: [PATCH 0881/3477] Update portal.js --- modules/portal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 380e78f81..59b444773 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -17,7 +17,7 @@ function autoPortal() { //portal if we have lower He/hr than the previous zone (or buffer) case "Helium Per Hour": var OKtoPortal = false; - if (!game.global.challengeActive) { + if (!game.global.runningChallengeSquared) { var minZone = getPageSetting('HeHrDontPortalBefore'); if (getPageSetting('Dailyportal') >= 1 && game.global.challengeActive == "Daily") { minZone = getPageSetting('Dailyportal'); From 542d857dea3784a28bab7aac7ffbac99e9345493 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 17:37:45 +0100 Subject: [PATCH 0882/3477] Update magmite.js --- modules/magmite.js | 96 ++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 54 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index fb3c46ae3..eb71a0fe0 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -8,7 +8,7 @@ function autoMagmiteSpender() { var didSpend = false; //Part #1: //list of available permanent one-and-done upgrades - var permanames = ["Slowburn", "Shielding", "Storage", "Hybridization"]; + var permanames = ["Slowburn", "Shielding", "Storage", "Hybridization", "Supervision", "Simulacrum"]; //cycle through: for (var i=0; i < permanames.length; i++) { var item = permanames[i]; @@ -29,13 +29,13 @@ function autoMagmiteSpender() { // then consider overclocker if we can afford it var hasOv = game.permanentGeneratorUpgrades.Hybridization.owned && game.permanentGeneratorUpgrades.Storage.owned; var ovclock = game.generatorUpgrades.Overclocker; - if (hasOv && ((getPageSetting('BuyOneTimeOC')==1 || getPageSetting('BuyOneTimeOC')==3) || !ovclock.upgrades) && (game.global.magmite >= ovclock.cost())) { + if (hasOv && ((getPageSetting('spendmagmitesetting')==0 || getPageSetting('spendmagmitesetting')==3) || !ovclock.upgrades) && (game.global.magmite >= ovclock.cost())) { debug("Auto Spending " + ovclock.cost() + " Magmite on: Overclocker" + (ovclock.upgrades ? " #" + (ovclock.upgrades + 1) : ""), "magmite"); buyGeneratorUpgrade('Overclocker'); } //Part #2 - var repeat = (getPageSetting('BuyOneTimeOC')==1 || getPageSetting('BuyOneTimeOC')==2); + var repeat = (getPageSetting('spendmagmitesetting')==0 || getPageSetting('spendmagmitesetting')==1); while (repeat) { if (MODULES["magmite"].algorithm == 2) { //Method 2: @@ -135,66 +135,54 @@ function autoMagmiteSpender() { debug("Leftover magmite: " + game.global.magmite,"magmite"); } -/** - * Auto Generator: - * [Early Mode (autogen2)] - * -> (Reach Z / optimal fuel from Supply) -> - * [Late Mode (for now: switch to primary mode)] // soon: autogen3 - */ function autoGenerator() { - const world = game.global.world; - if (world < 230) - return; // Magma only - if (getPageSetting('AutoGen2Override') && autoGenOverrides()) - return; - /* if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0 && ((getPageSetting('AutoGenDC') == 0 && game.global.challengeActive != "Daily") || (getPageSetting('AutoGenC2') == 0 && !game.global.runningChallengeSquared))) - changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0 && ((getPageSetting('AutoGenDC') == 0 && game.global.challengeActive != "Daily") || (getPageSetting('AutoGenC2') == 0 && !game.global.runningChallengeSquared))) - return;*/ - - const endZ = getPageSetting('AutoGen2End'); - const endS = getPageSetting('AutoGen2SupplyEnd'); - var endEarly = (endZ > 0 && world >= endZ) || (endS && world >= (230 + 2 * game.generatorUpgrades.Supply.upgrades)); - if (endEarly) { - //if (autoGenerator3); - if (!autoGenOverrides()) { - const lateMode = getPageSetting('AutoGen3'); - if (game.global.generatorMode != lateMode) - changeGeneratorState(lateMode); - } - } else autoGenerator2(); -} - -/** Early Mode */ -function autoGenerator2() { const MI = 0, FUEL = 1, HYBRID = 2; - // Respect overrides first. - if (getPageSetting('AutoGen2Override') && autoGenOverrides()) - return; + var defaultgen = 1; + if (getPageSetting('defaultgen') == 0) + defaultgen = 0; + if (getPageSetting('defaultgen') == 1) + defaultgen = 1; + if (getPageSetting('defaultgen') == 2) + defaultgen = 2; + /*if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode != defaultgen) + changeGeneratorState(defaultgen); + if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode == defaultgen) + return;*/ + if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 1 && game.global.generatorMode != 1) + changeGeneratorState(defaultgen); + if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 1 && game.global.generatorMode == 1) + return; + if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 2 && game.global.generatorMode != 2) + changeGeneratorState(defaultgen); + if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 2 && game.global.generatorMode == 2) + return; + /*if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode != defaultgen) + changeGeneratorState(defaultgen); + if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode == defaultgen) + return;*/ + if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode != 1) + changeGeneratorState(1); + if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode == 1) + return; + if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode != 2) + changeGeneratorState(2); + if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode == 2) + return; + if (getPageSetting('fuellater') < 1 && (game.global.world >= 230) + changeGeneratorState(defaultgen); if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) changeGeneratorState(0); if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) return; - const mode = getPageSetting('AutoGen2'); // None : Microtick : Cap - if (!mode) // Default: move on - return; - else if (mode == 3 && game.generatorUpgrades["Overclocker"].upgrades > 0) { // Only trigger overclock if we have Overclocker upgrades. - changeGeneratorState(FUEL); - return; + if (getPageSetting('fuelend') >= 1 && game.global.world >= getPageSetting('fuelend') && game.global.generatorMode != defaultgen) + changeGeneratorState(defaultgen); + if (getPageSetting('fuelend') >= 1 && game.global.world >= getPageSetting('fuelend') && game.global.generatorMode == defaultgen) + return; } - const fuel = game.global.magmaFuel; - const want = mode == 1 ? getFuelBurnRate() : getGeneratorFuelCap(); - if (!game.global.generatorMode) { // Currently: Gain Mi - if (fuel < want) - changeGeneratorState(game.permanentGeneratorUpgrades.Hybridization.owned ? HYBRID : FUEL); - } else if (fuel >= want) // Not gaining Mi when we should - changeGeneratorState(MI); -} - -function autoGenOverrides() { +/*function autoGenOverrides() { const overriden = (game.global.runningChallengeSquared && getPageSetting('AutoGenC2')) || (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC')); if (overriden && (game.global.generatorMode != overriden)) changeGeneratorState(overriden); return overriden; -} +}*/ From cb430a061053ee11944b8b5a37145a44112a744b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 17:37:49 +0100 Subject: [PATCH 0883/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index d7064d1da..58bb9b059 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -260,7 +260,6 @@ function mainLoop() { if (getPageSetting('ManualGather2')<=1) manualLabor(); //"Auto Gather/Build" (gather.js) else if (getPageSetting('ManualGather2')==2) manualLabor2(); //"Auto Gather/Build #2" (") 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" if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); //"AutoRoboTrimp" (other.js) @@ -270,7 +269,7 @@ function mainLoop() { else if (getPageSetting('AutoStance')<=1 && !daily3) autoStance(); //"Auto Stance" (stance.js) else if (getPageSetting('AutoStance')==2 && !daily3) autoStance2(); //"Auto Stance #2" (") else if (getPageSetting('AutoStance')==3 || daily3) autoStance3(); //"Auto Stance #3" (") - if (getPageSetting('UseAutoGen')) autoGenerator(); //"Auto Generator ON" (magmite.js) + if (getPageSetting('UseAutoGen')==true) autoGenerator(); //"Auto Generator ON" (magmite.js) if (getPageSetting('BetterAutoFight')==1) betterAutoFight(); //"Better Auto Fight" if (getPageSetting('BetterAutoFight')==2) betterAutoFight2(); //"Better Auto Fight2" if (getPageSetting('BetterAutoFight')==3) betterAutoFight3(); //"Better Auto Fight3" From fa55f9361a5469a24b36548791d1a600110eac90 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 17:38:09 +0100 Subject: [PATCH 0884/3477] Update SettingsGUI.js --- SettingsGUI.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index c4498ec5e..ec0f0f2bc 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -484,7 +484,7 @@ function initializeAllSettings() { -// Dimensional Generator +/*//Magma //Line 1 createSetting('UseAutoGen', ['Auto Generator OFF', 'Auto Generator ON'], 'MASTER BUTTON Dynamically switch generator modes. Required for the following mode management configurations to work. The Dimensional Generator is a building unlocked in The Magma, from z230.', 'multitoggle', 0, null, 'Magma'); @@ -502,7 +502,21 @@ function initializeAllSettings() { createSetting('SupplyWall', 'Throttle Supply (or Capacity)', 'Positive number NOT 1 e.g. 2.5: Consider Supply when its cost * 2.5 is < Capacity, instead of immediately when < Cap. Effectively throttles supply for when you don\'t need too many.

    Negative number (-1 is ok) e.g. -2.5: Consider Supply if it costs < Capacity * 2.5, buy more supplys! Effectively throttling capacity instead.

    Set to 1: DISABLE SUPPLY only spend magmite on Efficiency, Capacity and Overclocker. (For some end game players, supply is worth probably figuratively nothing.)
    Set to 0: IGNORE SETTING and use old behaviour (will still try to buy overclocker)    ', 'valueNegative', 2, null, 'Magma'); createSetting('BuyOneTimeOC', ['Buy OneTime Only (No OC)', 'Maybe Buy OneTime & OC', 'Maybe Buy OneTime (No OC)', 'Buy OneTime & OC Only'], 'Buy OneTime Only (No OC) = ONLY BUYS ONE TIME UPGRADES, NOTHING ELSE.
    Maybe Buy OneTime & OC = Normal spending, will consider Overclocker and One Time Upgrades
    Maybe Buy OneTime (No OC) = Normal Spending, but will NOT Buy Overclocker (Will still buy the first level if you don\'t have it).
    Buy OneTime & OC Only = Will Force spend magmite on these two only, ignoring Efficiency, Capacity and Supply.
    Recommend Default (Maybe Buy OneTime & OC)', 'multitoggle', 1, null, 'Magma'); createSetting('MagmiteExplain', 'Magmite spending behaviour', '1. Buy one-and-done upgrades, expensive first, then consider 1st level of Overclocker;
    2. Buy Overclocker IF AND ONLY IF we can afford it;
    2.5. Exit if OneTimeOnly
    3. Buy Efficiency if it is better than capacity;
    4. Buy Capacity or Supply depending on which is cheaper, or based on SupplyWall', 'infoclick', 'MagmiteExplain', null, 'Magma'); - + */ +//new + createSetting('UseAutoGen', 'Auto Generator', 'Turn this on to reveal magma settings and allow them to work. ', 'boolean', false, null, 'Magma'); + createSetting('fuellater', 'Start Fuel Z', 'Start fueling at this zone instead of 230. I would suggest you have a value lower than your max, for obvious reasons. Recommend starting at a value close-ish to your max supply. -1 to start at 230 or use default setting for entire run. ', 'value', -1, null, 'Magma'); + createSetting('fuelend', 'End Fuel Z', 'End fueling at this zone. After this zone is reached, will follow your preference. -1 to fuel infinitely. ', 'value', -1, null, 'Magma'); + createSetting('defaultgen', ['Gain Mi', 'Gain Fuel', 'Hybrid'], 'DEFAULT Which mode to use after fueling. This is your default setting for the Auto Generator. ', 'multitoggle', 1, null, 'Magma'); + createSetting('AutoGenDC', ['Daily: Normal', 'Daily: Fuel', 'Daily: Hybrid'], 'Normal: Uses the AutoGen settings. Fuel: Fuels the entire Daily. Hybrid: Uses Hybrid for the entire Daily. ', 'multitoggle', 1, null, 'Magma'); + createSetting('AutoGenC2', ['C2: Normal', 'C2: Fuel', 'C2: Hybrid'], 'Normal: Uses the AutoGen settings. Fuel: Fuels the entire C2. Hybrid: Uses Hybrid for the entire C2. ', 'multitoggle', 1, null, 'Magma'); + createSetting('spendmagmite', ['Spend Magmite OFF', 'Spend Magmite (Portal)', 'Spend Magmite Always'], 'Auto Spends any unspent Magmite immediately before portaling. (Or Always, if toggled). Part 1 buys any permanent one-and-done upgrades in order from most expensive to least. Part 2 then analyzes Efficiency vs Capacity for cost/benefit, and buys Efficiency if its BETTER than Capacity. If not, if the PRICE of Capacity is less than the price of Supply, it buys Capacity. If not, it buys Supply. And then it repeats itself until you run out of Magmite and cant buy anymore. ', 'multitoggle', 1, null, 'Magma'); + + //Line 2 + createSetting('SupplyWall', 'Throttle Supply (or Capacity)', 'Positive number NOT 1 e.g. 2.5: Consider Supply when its cost * 2.5 is < Capacity, instead of immediately when < Cap. Effectively throttles supply for when you don\'t need too many.

    Negative number (-1 is ok) e.g. -2.5: Consider Supply if it costs < Capacity * 2.5, buy more supplys! Effectively throttling capacity instead.

    Set to 1: DISABLE SUPPLY only spend magmite on Efficiency, Capacity and Overclocker. Always try to get supply close to your HZE.
    Set to 0: IGNORE SETTING and use old behaviour (will still try to buy overclocker)    ', 'valueNegative', 2, null, 'Magma'); + createSetting('spendmagmitesetting', ['Normal', 'Normal/No OC', 'OneTime/No OC', 'OneTime/OC'], 'Normal: Spends Magmite Normally as Explained in \"Magmite spending behaviour\". Normal/No OC: Same as normal, except skips OC afterbuying 1 OC upgrade. OneTime Only: Only Buys the One off upgrades except skips OC afterbuying 1 OC upgrade. OneTime/OC: Buys all One off upgrades, then buys OC only. ', 'multitoggle', 1, null, 'Magma'); + createSetting('MagmiteExplain', 'Magmite spending behaviour', '1. Buy one-and-done upgrades, expensive first, then consider 1st level of Overclocker;
    2. Buy Overclocker IF AND ONLY IF we can afford it;
    2.5. Exit if OneTimeOnly
    3. Buy Efficiency if it is better than capacity;
    4. Buy Capacity or Supply depending on which is cheaper, or based on SupplyWall', 'infoclick', 'MagmiteExplain', null, 'Magma'); + //Heirloom From b3c08e5ec612dce5fca1c8ff16bf131f713cd3d5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 17:41:44 +0100 Subject: [PATCH 0885/3477] Update magmite.js --- modules/magmite.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index eb71a0fe0..90fc3d05c 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -137,13 +137,13 @@ function autoMagmiteSpender() { function autoGenerator() { const MI = 0, FUEL = 1, HYBRID = 2; - var defaultgen = 1; + var defaultgenstate = 1; if (getPageSetting('defaultgen') == 0) - defaultgen = 0; + defaultgenstate = 0; if (getPageSetting('defaultgen') == 1) - defaultgen = 1; + defaultgenstate = 1; if (getPageSetting('defaultgen') == 2) - defaultgen = 2; + defaultgenstate = 2; /*if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode != defaultgen) changeGeneratorState(defaultgen); if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode == defaultgen) @@ -169,14 +169,14 @@ function autoGenerator() { if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode == 2) return; if (getPageSetting('fuellater') < 1 && (game.global.world >= 230) - changeGeneratorState(defaultgen); + changeGeneratorState(defaultgenstate); if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) changeGeneratorState(0); if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) return; - if (getPageSetting('fuelend') >= 1 && game.global.world >= getPageSetting('fuelend') && game.global.generatorMode != defaultgen) - changeGeneratorState(defaultgen); - if (getPageSetting('fuelend') >= 1 && game.global.world >= getPageSetting('fuelend') && game.global.generatorMode == defaultgen) + if (getPageSetting('fuelend') >= 1 && game.global.world >= getPageSetting('fuelend') && game.global.generatorMode != defaultgenstate) + changeGeneratorState(defaultgenstate); + if (getPageSetting('fuelend') >= 1 && game.global.world >= getPageSetting('fuelend') && game.global.generatorMode == defaultgenstate) return; } From ba95fb2485ac8da4118dbde5262fe9953fde5df5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 17:45:08 +0100 Subject: [PATCH 0886/3477] Update magmite.js --- modules/magmite.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index 90fc3d05c..f4f094d66 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -137,23 +137,23 @@ function autoMagmiteSpender() { function autoGenerator() { const MI = 0, FUEL = 1, HYBRID = 2; - var defaultgenstate = 1; + var defaultgenstate = FUEL; if (getPageSetting('defaultgen') == 0) - defaultgenstate = 0; + defaultgenstate = MI; if (getPageSetting('defaultgen') == 1) - defaultgenstate = 1; + defaultgenstate = FUEL; if (getPageSetting('defaultgen') == 2) - defaultgenstate = 2; + defaultgenstate = HYBRID; /*if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode != defaultgen) changeGeneratorState(defaultgen); if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode == defaultgen) return;*/ if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 1 && game.global.generatorMode != 1) - changeGeneratorState(defaultgen); + changeGeneratorState(1); if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 1 && game.global.generatorMode == 1) return; if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 2 && game.global.generatorMode != 2) - changeGeneratorState(defaultgen); + changeGeneratorState(2); if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 2 && game.global.generatorMode == 2) return; /*if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode != defaultgen) From bc3adbce141b7b4a62444bfb793320e7cf8958b6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 17:49:46 +0100 Subject: [PATCH 0887/3477] Update magmite.js --- modules/magmite.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index f4f094d66..179d81e88 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -137,13 +137,13 @@ function autoMagmiteSpender() { function autoGenerator() { const MI = 0, FUEL = 1, HYBRID = 2; - var defaultgenstate = FUEL; - if (getPageSetting('defaultgen') == 0) - defaultgenstate = MI; + const defaultgenstate = (getPageSetting('defaultgen') == 0) || getPageSetting('defaultgen') == 1) || getPageSetting('defaultgen') == 2); + /*if (getPageSetting('defaultgen') == 0) + defaultgenstate = 0; if (getPageSetting('defaultgen') == 1) - defaultgenstate = FUEL; + defaultgenstate = 1; if (getPageSetting('defaultgen') == 2) - defaultgenstate = HYBRID; + defaultgenstate = 2;*/ /*if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode != defaultgen) changeGeneratorState(defaultgen); if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode == defaultgen) From c6b662a37c7d46b82c71c0776f16e9afe4f60e3c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 17:51:17 +0100 Subject: [PATCH 0888/3477] Update magmite.js --- modules/magmite.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/magmite.js b/modules/magmite.js index 179d81e88..67a6196a1 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -137,7 +137,7 @@ function autoMagmiteSpender() { function autoGenerator() { const MI = 0, FUEL = 1, HYBRID = 2; - const defaultgenstate = (getPageSetting('defaultgen') == 0) || getPageSetting('defaultgen') == 1) || getPageSetting('defaultgen') == 2); + const defaultgenstate = (getPageSetting('defaultgen') == 0 || getPageSetting('defaultgen') == 1 || getPageSetting('defaultgen') == 2); /*if (getPageSetting('defaultgen') == 0) defaultgenstate = 0; if (getPageSetting('defaultgen') == 1) From 15a9e046a97fdd9d1bc32d7006e1e2e774c72b83 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 17:57:09 +0100 Subject: [PATCH 0889/3477] Update magmite.js --- modules/magmite.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/magmite.js b/modules/magmite.js index 67a6196a1..1db97c318 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -137,7 +137,7 @@ function autoMagmiteSpender() { function autoGenerator() { const MI = 0, FUEL = 1, HYBRID = 2; - const defaultgenstate = (getPageSetting('defaultgen') == 0 || getPageSetting('defaultgen') == 1 || getPageSetting('defaultgen') == 2); + const defaultgenstate = getPageSetting('defaultgen'); /*if (getPageSetting('defaultgen') == 0) defaultgenstate = 0; if (getPageSetting('defaultgen') == 1) From d85fe089928d589f7976910c87549cf696293852 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 17:59:24 +0100 Subject: [PATCH 0890/3477] Update magmite.js --- modules/magmite.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index 1db97c318..65a08dcb5 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -136,8 +136,7 @@ function autoMagmiteSpender() { } function autoGenerator() { - const MI = 0, FUEL = 1, HYBRID = 2; - const defaultgenstate = getPageSetting('defaultgen'); +var defaultgenstate = getPageSetting('defaultgen'); /*if (getPageSetting('defaultgen') == 0) defaultgenstate = 0; if (getPageSetting('defaultgen') == 1) @@ -168,7 +167,7 @@ function autoGenerator() { changeGeneratorState(2); if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode == 2) return; - if (getPageSetting('fuellater') < 1 && (game.global.world >= 230) + if (getPageSetting('fuellater') < 1 && game.global.world >= 230) changeGeneratorState(defaultgenstate); if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) changeGeneratorState(0); From d71fac53934f64c80450ea08faca4c6440f54932 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 18:04:30 +0100 Subject: [PATCH 0891/3477] Update SettingsGUI.js --- SettingsGUI.js | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index ec0f0f2bc..76e8d896f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -484,26 +484,8 @@ function initializeAllSettings() { -/*//Magma +//Magma - //Line 1 - createSetting('UseAutoGen', ['Auto Generator OFF', 'Auto Generator ON'], 'MASTER BUTTON Dynamically switch generator modes. Required for the following mode management configurations to work. The Dimensional Generator is a building unlocked in The Magma, from z230.', 'multitoggle', 0, null, 'Magma'); - createSetting('AutoGen2', ['Default', 'Microtick', 'Max Cap', 'Overclock'], 'Before Z is reached, Microtick and Max Cap will switch between [Hybrid / Gain Fuel] to get EXACTLY one / FULL stacks of Capacity (not Storage) before using [Gain Mi]. Default will respect whatever you set it to and won\'t fiddle with it unless challenge overriding is on. Overclock will Gain Fuel until Z.', 'multitoggle', 2, null, 'Magma'); - createSetting('fuellater', 'Start Fuel Z', 'Start fueling at thiz zone instead of 230. I would suggest you have a value lower than your max, for obvious reasons. Recommend starting at 300 and end fueling at 350. ', 'value', -1, null, 'Magma'); - createSetting('AutoGen2End', 'End Early Mode Z', 'On and after Z, be done with the mode we start with and switch to the final mode. -1 to disable.', 'value', 300, null, 'Magma'); - createSetting('AutoGen2SupplyEnd', 'End at Supply', 'On and after the zone for gathering the most magma by Supply, end Early Mode. Works alongside AutoGen2End and will end when either condition is met.', 'boolean', false, null, 'Magma'); - createSetting('AutoGen3', ['Gain Mi', 'Gain Fuel', 'Hybrid'], 'Mode to use after Z / SupplyEnd.', 'multitoggle', 1, null, 'Magma'); - createSetting('AutoGenDC', ['Daily: Normal', 'Daily: Fuel', 'Daily: Hybrid'], 'Use a special mode in dailies to make the most out of it. Overrides AutoGen3 unless Strong Override is on.', 'multitoggle', 1, null, 'Magma'); - - //Line 2 - createSetting('AutoGenC2', ['c2: Normal', 'c2: Fuel', 'c2: Hybrid'], 'Use a special mode when running challenge2s to make the most out of it. Overrides AutoGen3 unless Strong Override is on.', 'multitoggle', 1, null, 'Magma'); - createSetting('AutoGen2Override', ['Override Final Only', 'Strong Override'], 'Overrides apply to the final mode (always use early mode), or also to early mode (will stop microtick etc). Normal will not change anything.', 'multitoggle', 1, null, 'Magma'); - createSetting('AutoMagmiteSpender2', ['Spend Magmite OFF', 'Spend Magmite (Portal)', 'Spend Magmite Always'], 'Auto Spends any unspent Magmite immediately before portaling. (Or Always, if toggled). Part 1 buys any permanent one-and-done upgrades in order from most expensive to least. Part 2 then analyzes Efficiency vs Capacity for cost/benefit, and buys Efficiency if its BETTER than Capacity. If not, if the PRICE of Capacity is less than the price of Supply, it buys Capacity. If not, it buys Supply. And then it repeats itself until you run out of Magmite and cant buy anymore. For Magma z230+ purposes.', 'multitoggle', 1, null, 'Magma'); - createSetting('SupplyWall', 'Throttle Supply (or Capacity)', 'Positive number NOT 1 e.g. 2.5: Consider Supply when its cost * 2.5 is < Capacity, instead of immediately when < Cap. Effectively throttles supply for when you don\'t need too many.

    Negative number (-1 is ok) e.g. -2.5: Consider Supply if it costs < Capacity * 2.5, buy more supplys! Effectively throttling capacity instead.

    Set to 1: DISABLE SUPPLY only spend magmite on Efficiency, Capacity and Overclocker. (For some end game players, supply is worth probably figuratively nothing.)
    Set to 0: IGNORE SETTING and use old behaviour (will still try to buy overclocker)    ', 'valueNegative', 2, null, 'Magma'); - createSetting('BuyOneTimeOC', ['Buy OneTime Only (No OC)', 'Maybe Buy OneTime & OC', 'Maybe Buy OneTime (No OC)', 'Buy OneTime & OC Only'], 'Buy OneTime Only (No OC) = ONLY BUYS ONE TIME UPGRADES, NOTHING ELSE.
    Maybe Buy OneTime & OC = Normal spending, will consider Overclocker and One Time Upgrades
    Maybe Buy OneTime (No OC) = Normal Spending, but will NOT Buy Overclocker (Will still buy the first level if you don\'t have it).
    Buy OneTime & OC Only = Will Force spend magmite on these two only, ignoring Efficiency, Capacity and Supply.
    Recommend Default (Maybe Buy OneTime & OC)', 'multitoggle', 1, null, 'Magma'); - createSetting('MagmiteExplain', 'Magmite spending behaviour', '1. Buy one-and-done upgrades, expensive first, then consider 1st level of Overclocker;
    2. Buy Overclocker IF AND ONLY IF we can afford it;
    2.5. Exit if OneTimeOnly
    3. Buy Efficiency if it is better than capacity;
    4. Buy Capacity or Supply depending on which is cheaper, or based on SupplyWall', 'infoclick', 'MagmiteExplain', null, 'Magma'); - */ -//new createSetting('UseAutoGen', 'Auto Generator', 'Turn this on to reveal magma settings and allow them to work. ', 'boolean', false, null, 'Magma'); createSetting('fuellater', 'Start Fuel Z', 'Start fueling at this zone instead of 230. I would suggest you have a value lower than your max, for obvious reasons. Recommend starting at a value close-ish to your max supply. -1 to start at 230 or use default setting for entire run. ', 'value', -1, null, 'Magma'); createSetting('fuelend', 'End Fuel Z', 'End fueling at this zone. After this zone is reached, will follow your preference. -1 to fuel infinitely. ', 'value', -1, null, 'Magma'); @@ -514,7 +496,7 @@ function initializeAllSettings() { //Line 2 createSetting('SupplyWall', 'Throttle Supply (or Capacity)', 'Positive number NOT 1 e.g. 2.5: Consider Supply when its cost * 2.5 is < Capacity, instead of immediately when < Cap. Effectively throttles supply for when you don\'t need too many.

    Negative number (-1 is ok) e.g. -2.5: Consider Supply if it costs < Capacity * 2.5, buy more supplys! Effectively throttling capacity instead.

    Set to 1: DISABLE SUPPLY only spend magmite on Efficiency, Capacity and Overclocker. Always try to get supply close to your HZE.
    Set to 0: IGNORE SETTING and use old behaviour (will still try to buy overclocker)    ', 'valueNegative', 2, null, 'Magma'); - createSetting('spendmagmitesetting', ['Normal', 'Normal/No OC', 'OneTime/No OC', 'OneTime/OC'], 'Normal: Spends Magmite Normally as Explained in \"Magmite spending behaviour\". Normal/No OC: Same as normal, except skips OC afterbuying 1 OC upgrade. OneTime Only: Only Buys the One off upgrades except skips OC afterbuying 1 OC upgrade. OneTime/OC: Buys all One off upgrades, then buys OC only. ', 'multitoggle', 1, null, 'Magma'); + createSetting('spendmagmitesetting', ['Normal', 'Normal/No OC', 'OneTime/No OC', 'OneTime/OC'], 'Normal: Spends Magmite Normally as Explained in \"Magmite spending behaviour\".
    Normal/No OC: Same as normal, except skips OC afterbuying 1 OC upgrade.
    OneTime Only: Only Buys the One off upgrades except skips OC afterbuying 1 OC upgrade.
    OneTime/OC: Buys all One off upgrades, then buys OC only. ', 'multitoggle', 0, null, 'Magma'); createSetting('MagmiteExplain', 'Magmite spending behaviour', '1. Buy one-and-done upgrades, expensive first, then consider 1st level of Overclocker;
    2. Buy Overclocker IF AND ONLY IF we can afford it;
    2.5. Exit if OneTimeOnly
    3. Buy Efficiency if it is better than capacity;
    4. Buy Capacity or Supply depending on which is cheaper, or based on SupplyWall', 'infoclick', 'MagmiteExplain', null, 'Magma'); From 5052f85d2e840628e3fa322d1501d2a501f2a347 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 18:08:47 +0100 Subject: [PATCH 0892/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 76e8d896f..b12fb2feb 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -490,8 +490,8 @@ function initializeAllSettings() { createSetting('fuellater', 'Start Fuel Z', 'Start fueling at this zone instead of 230. I would suggest you have a value lower than your max, for obvious reasons. Recommend starting at a value close-ish to your max supply. -1 to start at 230 or use default setting for entire run. ', 'value', -1, null, 'Magma'); createSetting('fuelend', 'End Fuel Z', 'End fueling at this zone. After this zone is reached, will follow your preference. -1 to fuel infinitely. ', 'value', -1, null, 'Magma'); createSetting('defaultgen', ['Gain Mi', 'Gain Fuel', 'Hybrid'], 'DEFAULT Which mode to use after fueling. This is your default setting for the Auto Generator. ', 'multitoggle', 1, null, 'Magma'); - createSetting('AutoGenDC', ['Daily: Normal', 'Daily: Fuel', 'Daily: Hybrid'], 'Normal: Uses the AutoGen settings. Fuel: Fuels the entire Daily. Hybrid: Uses Hybrid for the entire Daily. ', 'multitoggle', 1, null, 'Magma'); - createSetting('AutoGenC2', ['C2: Normal', 'C2: Fuel', 'C2: Hybrid'], 'Normal: Uses the AutoGen settings. Fuel: Fuels the entire C2. Hybrid: Uses Hybrid for the entire C2. ', 'multitoggle', 1, null, 'Magma'); + createSetting('AutoGenDC', ['Daily: Normal', 'Daily: Fuel', 'Daily: Hybrid'], 'Normal: Uses the AutoGen settings.
    Fuel: Fuels the entire Daily.
    Hybrid: Uses Hybrid for the entire Daily. ', 'multitoggle', 1, null, 'Magma'); + createSetting('AutoGenC2', ['C2: Normal', 'C2: Fuel', 'C2: Hybrid'], 'Normal: Uses the AutoGen settings.
    Fuel: Fuels the entire C2.
    Hybrid: Uses Hybrid for the entire C2. ', 'multitoggle', 1, null, 'Magma'); createSetting('spendmagmite', ['Spend Magmite OFF', 'Spend Magmite (Portal)', 'Spend Magmite Always'], 'Auto Spends any unspent Magmite immediately before portaling. (Or Always, if toggled). Part 1 buys any permanent one-and-done upgrades in order from most expensive to least. Part 2 then analyzes Efficiency vs Capacity for cost/benefit, and buys Efficiency if its BETTER than Capacity. If not, if the PRICE of Capacity is less than the price of Supply, it buys Capacity. If not, it buys Supply. And then it repeats itself until you run out of Magmite and cant buy anymore. ', 'multitoggle', 1, null, 'Magma'); //Line 2 From 9a459eae3a88f8c3469a23a10531a88ae7ed6f61 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 18:10:21 +0100 Subject: [PATCH 0893/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index b12fb2feb..22702b384 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -496,7 +496,7 @@ function initializeAllSettings() { //Line 2 createSetting('SupplyWall', 'Throttle Supply (or Capacity)', 'Positive number NOT 1 e.g. 2.5: Consider Supply when its cost * 2.5 is < Capacity, instead of immediately when < Cap. Effectively throttles supply for when you don\'t need too many.

    Negative number (-1 is ok) e.g. -2.5: Consider Supply if it costs < Capacity * 2.5, buy more supplys! Effectively throttling capacity instead.

    Set to 1: DISABLE SUPPLY only spend magmite on Efficiency, Capacity and Overclocker. Always try to get supply close to your HZE.
    Set to 0: IGNORE SETTING and use old behaviour (will still try to buy overclocker)    ', 'valueNegative', 2, null, 'Magma'); - createSetting('spendmagmitesetting', ['Normal', 'Normal/No OC', 'OneTime/No OC', 'OneTime/OC'], 'Normal: Spends Magmite Normally as Explained in \"Magmite spending behaviour\".
    Normal/No OC: Same as normal, except skips OC afterbuying 1 OC upgrade.
    OneTime Only: Only Buys the One off upgrades except skips OC afterbuying 1 OC upgrade.
    OneTime/OC: Buys all One off upgrades, then buys OC only. ', 'multitoggle', 0, null, 'Magma'); + createSetting('spendmagmitesetting', ['Normal', 'Normal & No OC', 'OneTime & No OC', 'OneTime & OC'], 'Normal: Spends Magmite Normally as Explained in \"Magmite spending behaviour\".
    Normal/No OC: Same as normal, except skips OC afterbuying 1 OC upgrade.
    OneTime Only: Only Buys the One off upgrades except skips OC afterbuying 1 OC upgrade.
    OneTime/OC: Buys all One off upgrades, then buys OC only. ', 'multitoggle', 0, null, 'Magma'); createSetting('MagmiteExplain', 'Magmite spending behaviour', '1. Buy one-and-done upgrades, expensive first, then consider 1st level of Overclocker;
    2. Buy Overclocker IF AND ONLY IF we can afford it;
    2.5. Exit if OneTimeOnly
    3. Buy Efficiency if it is better than capacity;
    4. Buy Capacity or Supply depending on which is cheaper, or based on SupplyWall', 'infoclick', 'MagmiteExplain', null, 'Magma'); From 92619bd5efe258b3a0de01adec88b2adb91e4232 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 18:12:28 +0100 Subject: [PATCH 0894/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 22702b384..e5ffef620 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -496,7 +496,7 @@ function initializeAllSettings() { //Line 2 createSetting('SupplyWall', 'Throttle Supply (or Capacity)', 'Positive number NOT 1 e.g. 2.5: Consider Supply when its cost * 2.5 is < Capacity, instead of immediately when < Cap. Effectively throttles supply for when you don\'t need too many.

    Negative number (-1 is ok) e.g. -2.5: Consider Supply if it costs < Capacity * 2.5, buy more supplys! Effectively throttling capacity instead.

    Set to 1: DISABLE SUPPLY only spend magmite on Efficiency, Capacity and Overclocker. Always try to get supply close to your HZE.
    Set to 0: IGNORE SETTING and use old behaviour (will still try to buy overclocker)    ', 'valueNegative', 2, null, 'Magma'); - createSetting('spendmagmitesetting', ['Normal', 'Normal & No OC', 'OneTime & No OC', 'OneTime & OC'], 'Normal: Spends Magmite Normally as Explained in \"Magmite spending behaviour\".
    Normal/No OC: Same as normal, except skips OC afterbuying 1 OC upgrade.
    OneTime Only: Only Buys the One off upgrades except skips OC afterbuying 1 OC upgrade.
    OneTime/OC: Buys all One off upgrades, then buys OC only. ', 'multitoggle', 0, null, 'Magma'); + createSetting('spendmagmitesetting', ['Normal', 'Normal & No OC', 'OneTime Only', 'OneTime & OC'], 'Normal: Spends Magmite Normally as Explained in Magmite spending behaviour.
    Normal & No OC: Same as normal, except skips OC afterbuying 1 OC upgrade.
    OneTime Only: Only Buys the One off upgrades except skips OC afterbuying 1 OC upgrade.
    OneTime & OC: Buys all One off upgrades, then buys OC only. ', 'multitoggle', 0, null, 'Magma'); createSetting('MagmiteExplain', 'Magmite spending behaviour', '1. Buy one-and-done upgrades, expensive first, then consider 1st level of Overclocker;
    2. Buy Overclocker IF AND ONLY IF we can afford it;
    2.5. Exit if OneTimeOnly
    3. Buy Efficiency if it is better than capacity;
    4. Buy Capacity or Supply depending on which is cheaper, or based on SupplyWall', 'infoclick', 'MagmiteExplain', null, 'Magma'); From 101f9278c2743b87fc32f68d5a333b7657f929c7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 18:23:14 +0100 Subject: [PATCH 0895/3477] Update magmite.js --- modules/magmite.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index 65a08dcb5..d56739b32 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -143,9 +143,13 @@ var defaultgenstate = getPageSetting('defaultgen'); defaultgenstate = 1; if (getPageSetting('defaultgen') == 2) defaultgenstate = 2;*/ - /*if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode != defaultgen) - changeGeneratorState(defaultgen); - if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode == defaultgen) + if (getPageSetting('fuellater') < 1 && game.global.world >= 230 && game.global.generatorMode != defaultgenstate) + changeGeneratorState(defaultgenstate); + if (getPageSetting('fuellater') < 1 && game.global.world >= 230 && game.global.generatorMode == defaultgenstate) + return; + /*if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode != defaultgenstate) + changeGeneratorState(defaultgenstate); + if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode == defaultgenstate) return;*/ if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 1 && game.global.generatorMode != 1) changeGeneratorState(1); @@ -155,9 +159,9 @@ var defaultgenstate = getPageSetting('defaultgen'); changeGeneratorState(2); if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 2 && game.global.generatorMode == 2) return; - /*if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode != defaultgen) - changeGeneratorState(defaultgen); - if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode == defaultgen) + /*if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode != defaultgenstate) + changeGeneratorState(defaultgenstate); + if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode == defaultgenstate) return;*/ if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode != 1) changeGeneratorState(1); @@ -167,8 +171,6 @@ var defaultgenstate = getPageSetting('defaultgen'); changeGeneratorState(2); if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode == 2) return; - if (getPageSetting('fuellater') < 1 && game.global.world >= 230) - changeGeneratorState(defaultgenstate); if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) changeGeneratorState(0); if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) From 6347ff016ba22619c6213cc38b21d756c216d07e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 18:35:51 +0100 Subject: [PATCH 0896/3477] Update magmite.js --- modules/magmite.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index d56739b32..70f0af018 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -171,9 +171,9 @@ var defaultgenstate = getPageSetting('defaultgen'); changeGeneratorState(2); if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode == 2) return; - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode > 0) + if (getPageSetting('fuellater') >= 1 && game.global.world >= getPageSetting('fuellater') && game.global.world < getPageSetting('fuelend') && game.global.generatorMode != 0) changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == 0) + if (getPageSetting('fuellater') >= 1 && game.global.world >= getPageSetting('fuellater') && game.global.world < getPageSetting('fuelend') && game.global.generatorMode == 0) return; if (getPageSetting('fuelend') >= 1 && game.global.world >= getPageSetting('fuelend') && game.global.generatorMode != defaultgenstate) changeGeneratorState(defaultgenstate); From 3c13071553d4805b9ac77ed231942256ed2f4bed Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 18:38:24 +0100 Subject: [PATCH 0897/3477] Update magmite.js --- modules/magmite.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index 70f0af018..e22e0925a 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -163,17 +163,17 @@ var defaultgenstate = getPageSetting('defaultgen'); changeGeneratorState(defaultgenstate); if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode == defaultgenstate) return;*/ - if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode != 1) + if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 1 && game.global.generatorMode != 1) changeGeneratorState(1); - if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode == 1) + if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 1 && game.global.generatorMode == 1) return; - if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode != 2) + if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 2 && game.global.generatorMode != 2) changeGeneratorState(2); - if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 0 && game.global.generatorMode == 2) + if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 2 && game.global.generatorMode == 2) return; - if (getPageSetting('fuellater') >= 1 && game.global.world >= getPageSetting('fuellater') && game.global.world < getPageSetting('fuelend') && game.global.generatorMode != 0) - changeGeneratorState(0); - if (getPageSetting('fuellater') >= 1 && game.global.world >= getPageSetting('fuellater') && game.global.world < getPageSetting('fuelend') && game.global.generatorMode == 0) + if (getPageSetting('fuellater') >= 1 && game.global.world >= getPageSetting('fuellater') && game.global.world < getPageSetting('fuelend') && game.global.generatorMode != 1) + changeGeneratorState(1); + if (getPageSetting('fuellater') >= 1 && game.global.world >= getPageSetting('fuellater') && game.global.world < getPageSetting('fuelend') && game.global.generatorMode == 1) return; if (getPageSetting('fuelend') >= 1 && game.global.world >= getPageSetting('fuelend') && game.global.generatorMode != defaultgenstate) changeGeneratorState(defaultgenstate); From e06a65c6fb6757265cfe3df71b1c19c9405b8802 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 18:46:28 +0100 Subject: [PATCH 0898/3477] Update magmite.js --- modules/magmite.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/magmite.js b/modules/magmite.js index e22e0925a..5cdbb6940 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -171,6 +171,10 @@ var defaultgenstate = getPageSetting('defaultgen'); changeGeneratorState(2); if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 2 && game.global.generatorMode == 2) return; + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode != defaultgenstate) + changeGeneratorState(defaultgenstate); + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == defaultgenstate) + return; if (getPageSetting('fuellater') >= 1 && game.global.world >= getPageSetting('fuellater') && game.global.world < getPageSetting('fuelend') && game.global.generatorMode != 1) changeGeneratorState(1); if (getPageSetting('fuellater') >= 1 && game.global.world >= getPageSetting('fuellater') && game.global.world < getPageSetting('fuelend') && game.global.generatorMode == 1) From 52d4233319c013b46b2366d1d557eefc4639827e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 19:07:46 +0100 Subject: [PATCH 0899/3477] Update magmite.js --- modules/magmite.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index 5cdbb6940..57822f5fc 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -137,15 +137,10 @@ function autoMagmiteSpender() { function autoGenerator() { var defaultgenstate = getPageSetting('defaultgen'); - /*if (getPageSetting('defaultgen') == 0) - defaultgenstate = 0; - if (getPageSetting('defaultgen') == 1) - defaultgenstate = 1; - if (getPageSetting('defaultgen') == 2) - defaultgenstate = 2;*/ - if (getPageSetting('fuellater') < 1 && game.global.world >= 230 && game.global.generatorMode != defaultgenstate) + if (game.global.world < 230) return; + if (getPageSetting('fuellater') < 1 && game.global.generatorMode != defaultgenstate) changeGeneratorState(defaultgenstate); - if (getPageSetting('fuellater') < 1 && game.global.world >= 230 && game.global.generatorMode == defaultgenstate) + if (getPageSetting('fuellater') < 1 && game.global.generatorMode == defaultgenstate) return; /*if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 0 && game.global.generatorMode != defaultgenstate) changeGeneratorState(defaultgenstate); @@ -179,6 +174,10 @@ var defaultgenstate = getPageSetting('defaultgen'); changeGeneratorState(1); if (getPageSetting('fuellater') >= 1 && game.global.world >= getPageSetting('fuellater') && game.global.world < getPageSetting('fuelend') && game.global.generatorMode == 1) return; + if (getPageSetting('fuelend') < 1 && game.global.world >= getPageSetting('fuellater') && game.global.generatorMode != 1) + changeGeneratorState(1); + if (getPageSetting('fuelend') < 1 && game.global.world >= getPageSetting('fuellater') && game.global.generatorMode == 1) + return; if (getPageSetting('fuelend') >= 1 && game.global.world >= getPageSetting('fuelend') && game.global.generatorMode != defaultgenstate) changeGeneratorState(defaultgenstate); if (getPageSetting('fuelend') >= 1 && game.global.world >= getPageSetting('fuelend') && game.global.generatorMode == defaultgenstate) From 81b138a282670312ccafb2ca35e45d1bae3d9127 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 19:16:05 +0100 Subject: [PATCH 0900/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 58bb9b059..3f1d94ed5 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,10 +61,11 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "10/08/2018", version: "v2.5.2", description: "New C2 Tab added, work in progress though so don\'t expect much. Added a Hardcore Windstacking Max zone. Added the 550 ratio. You may see the really old ratios also being removed, not that you should be using them anyway *cough* IF YOU WERE USING AUTOPERKS MAKE SURE TO SET YOUR RATIO AGAIN", isNew: true}); +changelogList.push({date: "16/08/2018", version: "v2.5.3", description: "New Magma settings overhaul, it should be easier to understand now. Please let me know if something doesn\'t work with it. There\'s probably more stuff I've added or changed but I forgot lol. ", isNew: true}); +changelogList.push({date: "10/08/2018", version: "v2.5.2", description: "New C2 Tab added, work in progress though so don\'t expect much. Added a Hardcore Windstacking Max zone. Added the 550 ratio. You may see the really old ratios also being removed, not that you should be using them anyway *cough* IF YOU WERE USING AUTOPERKS MAKE SURE TO SET YOUR RATIO AGAIN", isNew: false}); changelogList.push({date: "08/08/2018", version: "v2.5.1", description: "It\'s been a while. Added Amal Boost and reconfigured golden upgrades, i think you\'ll like it. 550+ Ratio is still being worked on (not that any of you will use it anyway lol) There\'s probably some other fixes and stuff aswell. More C2 specific stuff on its way, see you till next update! ", isNew: false}); changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a Min Fuel Zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added MULTI BW RAIDING! ", isNew: false}); -changelogList.push({date: "18/07/2018", version: "v2.4.1", description: "Updated Spikes Hardcore Praiding to include more user input. Hardcore windstacking buys equips if it lowers your attack. Ratio almost done. ", isNew: false}); +//changelogList.push({date: "18/07/2018", version: "v2.4.1", description: "Updated Spikes Hardcore Praiding to include more user input. Hardcore windstacking buys equips if it lowers your attack. Ratio almost done. ", isNew: false}); //changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Spike came through again with some hardcore Praiding Options, check em out while they fresh son. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: false}); //changelogList.push({date: "14/07/2018", version: "v2.3.5", description: "Tinkered with BAF3 to better respect your fight settings. Added Always fight option. AS3 only in Dailys option. Option for workers in Watch and Trapper. Fixed some UI bugs. New z550+ Ratio soon (No one apart from me will probably use it but whatever) ", isNew: false}); //changelogList.push({date: "09/07/2018", version: "v2.3.4", description: "Added an automatic Heliumy option, Use at your own RISK! Bunch of other stuff was optimised and Spire breed timer fixed, many thanks to Spikenslab once again. ", isNew: false}); From 4e8f371d19eded0a4ad180d5e2630d98bd40b74c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 19:17:35 +0100 Subject: [PATCH 0901/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 3f1d94ed5..5d8758ee5 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,7 +61,7 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "16/08/2018", version: "v2.5.3", description: "New Magma settings overhaul, it should be easier to understand now. Please let me know if something doesn\'t work with it. There\'s probably more stuff I've added or changed but I forgot lol. ", isNew: true}); +changelogList.push({date: "16/08/2018", version: "v2.5.3", description: "New Magma settings overhaul, it should be easier to understand now. Please let me know if something doesn\'t work with it. There\'s probably more stuff I've added or changed but I forgot lol. ", isNew: true}); changelogList.push({date: "10/08/2018", version: "v2.5.2", description: "New C2 Tab added, work in progress though so don\'t expect much. Added a Hardcore Windstacking Max zone. Added the 550 ratio. You may see the really old ratios also being removed, not that you should be using them anyway *cough* IF YOU WERE USING AUTOPERKS MAKE SURE TO SET YOUR RATIO AGAIN", isNew: false}); changelogList.push({date: "08/08/2018", version: "v2.5.1", description: "It\'s been a while. Added Amal Boost and reconfigured golden upgrades, i think you\'ll like it. 550+ Ratio is still being worked on (not that any of you will use it anyway lol) There\'s probably some other fixes and stuff aswell. More C2 specific stuff on its way, see you till next update! ", isNew: false}); changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a Min Fuel Zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added MULTI BW RAIDING! ", isNew: false}); From d156c2c7eddc414450b01f9dbf50c40bd9f09636 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 19:18:18 +0100 Subject: [PATCH 0902/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 5d8758ee5..997fa4a66 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,7 +61,7 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "16/08/2018", version: "v2.5.3", description: "New Magma settings overhaul, it should be easier to understand now. Please let me know if something doesn\'t work with it. There\'s probably more stuff I've added or changed but I forgot lol. ", isNew: true}); +changelogList.push({date: "16/08/2018", version: "v2.5.3", description: "New Magma settings overhaul, it should be easier to understand now. Make sure they\'re set properly. Please let me know if something doesn\'t work with it. There\'s probably more stuff I've added or changed but I forgot lol. ", isNew: true}); changelogList.push({date: "10/08/2018", version: "v2.5.2", description: "New C2 Tab added, work in progress though so don\'t expect much. Added a Hardcore Windstacking Max zone. Added the 550 ratio. You may see the really old ratios also being removed, not that you should be using them anyway *cough* IF YOU WERE USING AUTOPERKS MAKE SURE TO SET YOUR RATIO AGAIN", isNew: false}); changelogList.push({date: "08/08/2018", version: "v2.5.1", description: "It\'s been a while. Added Amal Boost and reconfigured golden upgrades, i think you\'ll like it. 550+ Ratio is still being worked on (not that any of you will use it anyway lol) There\'s probably some other fixes and stuff aswell. More C2 specific stuff on its way, see you till next update! ", isNew: false}); changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a Min Fuel Zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added MULTI BW RAIDING! ", isNew: false}); From f77c7661aab53f83c726f3c04d711f37583b9566 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 19:56:39 +0100 Subject: [PATCH 0903/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index c9d535ef0..dd45b454f 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -7,7 +7,7 @@ function buyUpgrades() { upgrade = upgradeList[upgrade]; var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); - if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && game.global.world < getPageSetting('AutoGen2End') && HDratioy() < .00000025))) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && game.global.world < getPageSetting('fuelend') && HDratioy() < .00000025))) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; From 5b5770d07963cdbba6de7b74697e5640f85ce5db Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 20:42:09 +0100 Subject: [PATCH 0904/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 997fa4a66..66afee538 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -277,7 +277,7 @@ function mainLoop() { var forcePrecZ = (getPageSetting('ForcePresZ')<0) || (game.global.world0 && forcePrecZ) prestigeChanging2(); //"Dynamic Prestige" (dynprestige.js) 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('spendmagmite')==2 && !magmiteSpenderChanged) autoMagmiteSpender(); //Auto Magmite Spender (magmite.js) if (getPageSetting('AutoNatureTokens')) autoNatureTokens(); //Nature (other.js) if (game.global.mapsActive && getPageSetting('BWraid') == true && game.global.world == getPageSetting('BWraidingz') && getCurrentMapObject().level <= getPageSetting('BWraidingmax')) buyWeps(); // From f5649de518f14694b46b80c38aa5ce4d88391771 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 16 Aug 2018 20:42:34 +0100 Subject: [PATCH 0905/3477] Update portal.js --- modules/portal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 59b444773..bcd6221c1 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -100,7 +100,7 @@ function doPortal(challenge) { abandonDaily(); document.getElementById('finishDailyBtnContainer').style.display = 'none'; } - if (getPageSetting('AutoMagmiteSpender2')==1) autoMagmiteSpender(); + if (getPageSetting('spendmagmite')==1) autoMagmiteSpender(); // From mainLoop if (getPageSetting('AutoHeirloomsNew')==0); //"AutoHeirlooms OFF" (Heirlooms.js) else if (getPageSetting('AutoHeirloomsNew')==1) autoHeirlooms(); //"AH1" (") From c849fd07d697fdb9a74f4a51ed858752b9a379e7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 10:45:46 +0100 Subject: [PATCH 0906/3477] Update SettingsGUI.js --- SettingsGUI.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index e5ffef620..4a04a5972 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -576,7 +576,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe btn.id = id; var loaded = autoTrimpSettings[id]; if (type == 'boolean') { - if (!(loaded && id == loaded.id)) + if (!(loaded && id == loaded.id && loaded.type === type)) autoTrimpSettings[id] = { id: id, name: name, @@ -594,7 +594,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe if (container) document.getElementById(container).appendChild(btnParent); else document.getElementById("autoSettings").appendChild(btnParent); } else if (type == 'value' || type == 'valueNegative') { - if (!(loaded && id == loaded.id)) + if (!(loaded && id == loaded.id && loaded.type === type)) autoTrimpSettings[id] = { id: id, name: name, @@ -613,7 +613,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe else document.getElementById("autoSettings").appendChild(btnParent); //god help me } else if (type == 'multiValue' || type == 'valueNegative') { - if (!(loaded && id == loaded.id)) + if (!(loaded && id == loaded.id && loaded.type === type)) autoTrimpSettings[id] = { id: id, name: name, @@ -631,7 +631,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe if (container) document.getElementById(container).appendChild(btnParent); else document.getElementById("autoSettings").appendChild(btnParent); } else if (type == 'dropdown') { - if (!(loaded && id == loaded.id)) + if (!(loaded && id == loaded.id && loaded.type === type)) autoTrimpSettings[id] = { id: id, name: name, @@ -678,7 +678,7 @@ function createSetting(id, name, description, type, defaultValue, list, containe else document.getElementById("autoSettings").appendChild(btnParent); return; //return means don't store it in autoTrimpSettings at the bottom } else if (type == 'multitoggle') { - if (!(loaded && id == loaded.id)) + if (!(loaded && id == loaded.id && loaded.type === type)) autoTrimpSettings[id] = { id: id, name: name, From 408b3a4b4809fb69fadda0103811b62fac2e0fe7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 16:53:50 +0100 Subject: [PATCH 0907/3477] Update equipment.js --- modules/equipment.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/equipment.js b/modules/equipment.js index fde023adc..09cfb05bc 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -377,6 +377,7 @@ function autoLevelEquipment() { ) { var upgrade = equipmentList[equipName].Upgrade; + if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut')) return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") return; if (upgrade != "Gymystic") @@ -415,6 +416,7 @@ function autoLevelEquipment() { var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; //If we're considering an attack item, we want to buy weapons if we don't have enough damage, or if we don't need health (so we default to buying some damage) if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { + if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut')) return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") return; if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { From d5d9d544da023f044d81f74f155c98c25bd3e603 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 16:53:52 +0100 Subject: [PATCH 0908/3477] Update upgrades.js --- modules/upgrades.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index dd45b454f..1d0910b54 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -7,7 +7,8 @@ function buyUpgrades() { upgrade = upgradeList[upgrade]; var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); - if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && game.global.world < getPageSetting('fuelend') && HDratioy() < .00000025))) continue; + if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut')))) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && game.global.world < getPageSetting('fuelend') && HDratioy() < .0000025))) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; From 9d17970522792223e8934c425bc99811cc35e6ec Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 16:54:02 +0100 Subject: [PATCH 0909/3477] Update SettingsGUI.js --- SettingsGUI.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 4a04a5972..483f6c0d3 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -441,23 +441,30 @@ function initializeAllSettings() { -//Combat +//Windstacking //Line 1 - createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
    BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
    BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
    BAF3 = Uses vanilla autofight.
    WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); - createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. AutoStance 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); createSetting('hardcorewindmax', 'Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. Use -1 or a really high value to hardcore windstack endlessly. ', 'value', '-1', null, 'Combat'); - createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); + createSetting('ultwind', 'Ultimate Windstacking', 'Just when you thought things couldn\'t get any worse. Ultimate Windstacking withholds Coords, your Gear Upgrades and levels throughout. This means that unless you are over a certain H:D Value it will not purchase anything. This will still enable you to overkill things (OOOK) but only purchases the necessary upgrades required. It works very similar to Hardcore WS, but works throughout the run. Recommend starting quite early on, perhaps after your max fuel zone. Experiment with it to find your best result. ', 'value', '-1', null, 'Combat'); + createSetting('ultwindcut', 'UWS H:D', 'Fiddle with this to maximise your UWS settings. Default is 0.025. ', 'value', '0.025', null, 'Combat'); + - //Line 2 +//Combat + + //Line 1 + createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
    BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
    BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
    BAF3 = Uses vanilla autofight.
    WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); + createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Auto Stance 3'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. AutoStance 3 is new and experimental for use after nature (z230), and will keep you in D stance unless you are windstacking (only useful if transfer is maxed out and wind empowerment is high. This feature is currently only a tweak added on request.', 'multitoggle', 1, null, "Combat"); + createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); + + //Line 2 createSetting('fightforever', 'Fight Always', 'Sends trimps to fight if they\'re not fighting, regardless of BAF.', 'boolean', 'false', null, 'Combat'); createSetting('addpoison', 'Poison Calc', 'Experimental. Adds poison to the battlecalc. May improve your poison zone speed. ', 'boolean', 'false', null, 'Combat'); @@ -941,6 +948,9 @@ function updateCustomButtons() { getPageSetting('AutoStance')==3 ? turnOn("ScryUseinIce"): turnOff("ScryUseinIce"); getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); + //Windstack + getPageSetting('ultwind')>=1 ? turnOn("ultwindcut") : turnOff("ultwindcut"); + //Loot Dump getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpa"): turnOff("lootdumpa"); getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpz"): turnOff("lootdumpz"); From fd8643410cdc697429ec72ed33f0111f20951535 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 16:55:53 +0100 Subject: [PATCH 0910/3477] Update SettingsGUI.js --- SettingsGUI.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 483f6c0d3..3fca784a4 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -183,6 +183,7 @@ function initializeAllTabs() { createTabs("Daily", "Dailys - Settings for Dailys"); createTabs("C2", "C2 - Settings for C2s"); createTabs("Combat", "Combat & Stance Settings"); + createTabs("Windstacking", "Windstacking Settings"); createTabs("Scryer", "Scryer Settings"); createTabs("Magma", "Dimensional Generator & Magmite Settings"); createTabs("Heirlooms", "Heirloom Settings"); @@ -444,12 +445,12 @@ function initializeAllSettings() { //Windstacking //Line 1 - createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Combat'); - createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Combat'); - createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Combat'); - createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Combat'); - createSetting('hardcorewindmax', 'Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. Use -1 or a really high value to hardcore windstack endlessly. ', 'value', '-1', null, 'Combat'); - createSetting('ultwind', 'Ultimate Windstacking', 'Just when you thought things couldn\'t get any worse. Ultimate Windstacking withholds Coords, your Gear Upgrades and levels throughout. This means that unless you are over a certain H:D Value it will not purchase anything. This will still enable you to overkill things (OOOK) but only purchases the necessary upgrades required. It works very similar to Hardcore WS, but works throughout the run. Recommend starting quite early on, perhaps after your max fuel zone. Experiment with it to find your best result. ', 'value', '-1', null, 'Combat'); + createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Windstacking'); + createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Windstacking'); + createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Windstacking'); + createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Windstacking'); + createSetting('hardcorewindmax', 'Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. Use -1 or a really high value to hardcore windstack endlessly. ', 'value', '-1', null, 'Windstacking'); + createSetting('ultwind', 'Ultimate Windstacking', 'Just when you thought things couldn\'t get any worse. Ultimate Windstacking withholds Coords, your Gear Upgrades and levels throughout. This means that unless you are over a certain H:D Value you have defined in UWS H:D it will not purchase anything. This will still enable you to overkill things (OOOK) if you set it right, but only purchases the necessary upgrades required. It works very similar to Hardcore WS, but works throughout the run. Recommend starting quite early on, perhaps after your max fuel zone. Experiment with it to find your best result. ', 'value', '-1', null, 'Windstacking'); createSetting('ultwindcut', 'UWS H:D', 'Fiddle with this to maximise your UWS settings. Default is 0.025. ', 'value', '0.025', null, 'Combat'); From c6166f84f89221bfa65f1316db5b7305300c073c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 16:58:56 +0100 Subject: [PATCH 0911/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 3fca784a4..6297abbb6 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -950,7 +950,7 @@ function updateCustomButtons() { getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); //Windstack - getPageSetting('ultwind')>=1 ? turnOn("ultwindcut") : turnOff("ultwindcut"); + getPageSetting('ultwind')>=1 ? turnOn("ultwindcut"): turnOff("ultwindcut"); //Loot Dump getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpa"): turnOff("lootdumpa"); From d784742e993d09e9f7f62e1413ee055d49520fbc Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 16:59:41 +0100 Subject: [PATCH 0912/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 6297abbb6..30c701230 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -451,7 +451,7 @@ function initializeAllSettings() { createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Windstacking'); createSetting('hardcorewindmax', 'Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. Use -1 or a really high value to hardcore windstack endlessly. ', 'value', '-1', null, 'Windstacking'); createSetting('ultwind', 'Ultimate Windstacking', 'Just when you thought things couldn\'t get any worse. Ultimate Windstacking withholds Coords, your Gear Upgrades and levels throughout. This means that unless you are over a certain H:D Value you have defined in UWS H:D it will not purchase anything. This will still enable you to overkill things (OOOK) if you set it right, but only purchases the necessary upgrades required. It works very similar to Hardcore WS, but works throughout the run. Recommend starting quite early on, perhaps after your max fuel zone. Experiment with it to find your best result. ', 'value', '-1', null, 'Windstacking'); - createSetting('ultwindcut', 'UWS H:D', 'Fiddle with this to maximise your UWS settings. Default is 0.025. ', 'value', '0.025', null, 'Combat'); + createSetting('ultwindcut', 'UWS H:D', 'Fiddle with this to maximise your UWS settings. Default is 0.025. ', 'value', '0.025', null, 'Windstacking'); //Combat From ddd48433a21b9e09961ae1559d76b2a6b3f5a1e5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 17:08:24 +0100 Subject: [PATCH 0913/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 66afee538..b5876c934 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -61,10 +61,11 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "16/08/2018", version: "v2.5.3", description: "New Magma settings overhaul, it should be easier to understand now. Make sure they\'re set properly. Please let me know if something doesn\'t work with it. There\'s probably more stuff I've added or changed but I forgot lol. ", isNew: true}); +changelogList.push({date: "19/08/2018", version: "v2.6.1", description: "Windstacking now has its own tab. Added Ultimate Windstacking. There may be some other tweaks that I\'ve forgot about, but have fun experimenting! ", isNew: true}); +changelogList.push({date: "16/08/2018", version: "v2.5.3", description: "New Magma settings overhaul, it should be easier to understand now. Make sure they\'re set properly. Please let me know if something doesn\'t work with it. There\'s probably more stuff I've added or changed but I forgot lol. ", isNew: false}); changelogList.push({date: "10/08/2018", version: "v2.5.2", description: "New C2 Tab added, work in progress though so don\'t expect much. Added a Hardcore Windstacking Max zone. Added the 550 ratio. You may see the really old ratios also being removed, not that you should be using them anyway *cough* IF YOU WERE USING AUTOPERKS MAKE SURE TO SET YOUR RATIO AGAIN", isNew: false}); changelogList.push({date: "08/08/2018", version: "v2.5.1", description: "It\'s been a while. Added Amal Boost and reconfigured golden upgrades, i think you\'ll like it. 550+ Ratio is still being worked on (not that any of you will use it anyway lol) There\'s probably some other fixes and stuff aswell. More C2 specific stuff on its way, see you till next update! ", isNew: false}); -changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a Min Fuel Zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added MULTI BW RAIDING! ", isNew: false}); +//changelogList.push({date: "21/07/2018", version: "v2.4.2", description: "Added Daily windstacking. Make sure to set them or it wont windstack in dailys! Also added a Min Fuel Zone to magmite so now you can start fueling at any zone you like instead of 230. Spike also fixed a few bugs with AS2 and added MULTI BW RAIDING! ", isNew: false}); //changelogList.push({date: "18/07/2018", version: "v2.4.1", description: "Updated Spikes Hardcore Praiding to include more user input. Hardcore windstacking buys equips if it lowers your attack. Ratio almost done. ", isNew: false}); //changelogList.push({date: "16/07/2018", version: "v2.3.6", description: "Windstacking has some new options. Tool tips will explain them, as they are somewhat complicated. Spike came through again with some hardcore Praiding Options, check em out while they fresh son. Still working on the ratio. Looking for more ideas/suggestions so shove some down my throat kthx. ", isNew: false}); //changelogList.push({date: "14/07/2018", version: "v2.3.5", description: "Tinkered with BAF3 to better respect your fight settings. Added Always fight option. AS3 only in Dailys option. Option for workers in Watch and Trapper. Fixed some UI bugs. New z550+ Ratio soon (No one apart from me will probably use it but whatever) ", isNew: false}); From d0fc0182e85248e4222eb91bcc50621f16393394 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 18:13:18 +0100 Subject: [PATCH 0914/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 30c701230..cb5695807 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -451,7 +451,7 @@ function initializeAllSettings() { createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Windstacking'); createSetting('hardcorewindmax', 'Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. Use -1 or a really high value to hardcore windstack endlessly. ', 'value', '-1', null, 'Windstacking'); createSetting('ultwind', 'Ultimate Windstacking', 'Just when you thought things couldn\'t get any worse. Ultimate Windstacking withholds Coords, your Gear Upgrades and levels throughout. This means that unless you are over a certain H:D Value you have defined in UWS H:D it will not purchase anything. This will still enable you to overkill things (OOOK) if you set it right, but only purchases the necessary upgrades required. It works very similar to Hardcore WS, but works throughout the run. Recommend starting quite early on, perhaps after your max fuel zone. Experiment with it to find your best result. ', 'value', '-1', null, 'Windstacking'); - createSetting('ultwindcut', 'UWS H:D', 'Fiddle with this to maximise your UWS settings. Default is 0.025. ', 'value', '0.025', null, 'Windstacking'); + createSetting('ultwindcut', 'UWS H:D', 'Fiddle with this to maximise your UWS settings. Default is 0.00025. ', 'value', '0.00025', null, 'Windstacking'); //Combat From 29a34b37450e5692f5c0189e5740a6c880433998 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 18:58:45 +0100 Subject: [PATCH 0915/3477] Update GraphsOnly.user.js --- GraphsOnly.user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GraphsOnly.user.js b/GraphsOnly.user.js index 186d5f043..3edc1acdd 100644 --- a/GraphsOnly.user.js +++ b/GraphsOnly.user.js @@ -1,5 +1,5 @@ // ==UserScript== -// @name AutoTrimpsV2+genBTC-GraphsOnly +// @name AT-Zek-GraphsOnly // @namespace https://github.com/Zorn192/AutoTrimps // @version 2.1.6.9-genbtc-3-23-2018 // @updateURL https://github.com/genbtc/AutoTrimps/GraphsOnly.user.js From 6c8c340067de9f4a3e4e0bddfbdd57221a50908e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 19:00:44 +0100 Subject: [PATCH 0916/3477] Update GraphsOnly.user.js --- GraphsOnly.user.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/GraphsOnly.user.js b/GraphsOnly.user.js index 3edc1acdd..cfc74a6b2 100644 --- a/GraphsOnly.user.js +++ b/GraphsOnly.user.js @@ -1,15 +1,14 @@ // ==UserScript== // @name AT-Zek-GraphsOnly // @namespace https://github.com/Zorn192/AutoTrimps -// @version 2.1.6.9-genbtc-3-23-2018 -// @updateURL https://github.com/genbtc/AutoTrimps/GraphsOnly.user.js +// @version 2.6.1-Zek +// @updateURL https://github.com/Zorn192/AutoTrimps/GraphsOnly.user.js // @description Graphs Module (only) from AutoTrimps -// @author zininzinin, spindrjr, belaith, ishakaru, genBTC +// @author zininzinin, spindrjr, belaith, ishakaru, genBTC, Zek // @include *trimps.github.io* // @include *kongregate.com/games/GreenSatellite/trimps // @grant none // ==/UserScript== -//this comes from AutoTrimps/modules/utils.js , then we dont need to load everything from that file. function safeSetItems(name,data) { try { localStorage.setItem(name, data); @@ -20,11 +19,8 @@ function safeSetItems(name,data) { } } } -//This can be edited to point to your own Github Repository URL. -var basepath = 'https://Zorn192.github.io/AutoTrimps/'; var script = document.createElement('script'); script.id = 'AutoTrimps-Graphs'; -script.src = basepath + 'Graphs.js'; -//script.setAttribute('crossorigin',"use-credentials"); +script.src = 'https://Zorn192.github.io/AutoTrimps/Graphs.js'; script.setAttribute('crossorigin',"anonymous"); document.head.appendChild(script); From c7898a4b272d4b4f33fbb78fb92c3d58c86c82f4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 19:03:24 +0100 Subject: [PATCH 0917/3477] Update Graphs.js --- Graphs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Graphs.js b/Graphs.js index f46a07309..b5bfa1260 100644 --- a/Graphs.js +++ b/Graphs.js @@ -6,6 +6,7 @@ if (tmpGraphData !== null) { console.log('Graphs: Found allSaveData (portal runs data). Yay!'); allSaveData = tmpGraphData; } +var MODULES = {}; MODULES["graphs"] = {}; MODULES["graphs"].useDarkAlways = false; //set this to True to use Dark Graphs always. From deaffacf5266492314ea4fe701402616fc33e193 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 19:07:44 +0100 Subject: [PATCH 0918/3477] Update Graphs.js --- Graphs.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Graphs.js b/Graphs.js index b5bfa1260..a97d3bbdc 100644 --- a/Graphs.js +++ b/Graphs.js @@ -6,6 +6,14 @@ if (tmpGraphData !== null) { console.log('Graphs: Found allSaveData (portal runs data). Yay!'); allSaveData = tmpGraphData; } +var enableDebug2 = false; +function debug2(message, type, lootIcon) { + var output = true; + if (output) { + if (enableDebug2) + console.log(00:00 + ' ' + message); + } +} var MODULES = {}; MODULES["graphs"] = {}; MODULES["graphs"].useDarkAlways = false; //set this to True to use Dark Graphs always. @@ -88,13 +96,13 @@ function addDarkGraphs() { //basepath ref comes from the userscripts $link.href = basepath + 'dark-graph.css'; document.head.appendChild($link); - debug("Adding dark-graph.css file","graphs"); + debug2("Adding dark-graph.css file","graphs"); } function removeDarkGraphs() { var $link = document.getElementById("dark-graph.css"); if (!$link) return; document.head.removeChild($link); - debug("Removing dark-graph.css file","graphs"); + debug2("Removing dark-graph.css file","graphs"); } function toggleDarkGraphs() { if (game) { @@ -114,7 +122,7 @@ MODULES["graphs"].themeChanged = function() { if (game && game.options.menu.darkTheme.enabled != lastTheme) { //GRAPHS: toggleDarkGraphs(); - debug("Theme change - AutoTrimps styles updating..."); + debug2("Theme change - AutoTrimps styles updating..."); function color1(el,i,arr) { if(game.options.menu.darkTheme.enabled != 2) el.style.color = "black"; @@ -302,7 +310,7 @@ function deleteSpecific() { } function addGraphNoteLabel() { - debug("GOTCHA This feature is not actually written, yet..."); + debug2("GOTCHA This feature is not actually written, yet..."); } function autoToggleGraph() { @@ -353,7 +361,7 @@ function getTotalDarkEssenceCount() { } function pushData() { - debug('Starting Zone ' + game.global.world, "graphs"); + debug2('Starting Zone ' + game.global.world, "graphs"); //helium/hour % of totalHE, and currentRun/totalLifetime HE var getPercent = (game.stats.heliumHour.value() / (game.global.totalHeliumEarned - (game.global.heliumLeftover + game.resources.helium.owned)))*100; var lifetime = (game.resources.helium.owned / (game.global.totalHeliumEarned-game.resources.helium.owned))*100; From f55fcbb909be93de8eeda7b56bea47a48aaa75b5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 19:09:32 +0100 Subject: [PATCH 0919/3477] Update Graphs.js --- Graphs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Graphs.js b/Graphs.js index a97d3bbdc..3ac52b57e 100644 --- a/Graphs.js +++ b/Graphs.js @@ -11,7 +11,7 @@ function debug2(message, type, lootIcon) { var output = true; if (output) { if (enableDebug2) - console.log(00:00 + ' ' + message); + console.log(0 + ' ' + message); } } var MODULES = {}; From d7ec42806806b882727866d32ffbda6858ba9a51 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 19 Aug 2018 19:10:07 +0100 Subject: [PATCH 0920/3477] Create GraphsOnly.js --- GraphsOnly.js | 1373 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1373 insertions(+) create mode 100644 GraphsOnly.js diff --git a/GraphsOnly.js b/GraphsOnly.js new file mode 100644 index 000000000..3ac52b57e --- /dev/null +++ b/GraphsOnly.js @@ -0,0 +1,1373 @@ +//Initialize the saved data objects, and load data/grab from browser if found. +var allSaveData = []; +var graphData = []; +var tmpGraphData = JSON.parse(localStorage.getItem('allSaveData')); +if (tmpGraphData !== null) { + console.log('Graphs: Found allSaveData (portal runs data). Yay!'); + allSaveData = tmpGraphData; +} +var enableDebug2 = false; +function debug2(message, type, lootIcon) { + var output = true; + if (output) { + if (enableDebug2) + console.log(0 + ' ' + message); + } +} +var MODULES = {}; +MODULES["graphs"] = {}; +MODULES["graphs"].useDarkAlways = false; //set this to True to use Dark Graphs always. + +//Import the Chart Libraries +var head = document.getElementsByTagName('head')[0]; +var chartscript = document.createElement('script'); +chartscript.type = 'text/javascript'; +chartscript.src = 'https://code.highcharts.com/highcharts.js'; +head.appendChild(chartscript); + + +//Create the graph button and div +var newItem = document.createElement("TD"); +newItem.appendChild(document.createTextNode("Graphs")); +newItem.setAttribute("class", "btn btn-default"); +newItem.setAttribute("onclick", "autoToggleGraph(); drawGraph();"); +var settingbarRow = document.getElementById("settingsTable").firstElementChild.firstElementChild; +settingbarRow.insertBefore(newItem, settingbarRow.childNodes[10]); +document.getElementById("settingsRow").innerHTML += '    \' )`),document.getElementById('selectedHeirloom').childNodes[0].childNodes[c].setAttribute('onmouseout','tooltip(\'hide\')')}}} +function autoHeirlooms2(){if(!heirloomsShown&&0f;f++)if(g=c[f],b=evaluateHeirloomMods(0,g.type+"Equipped",!0),b.index){selectedMod=b.index;var h=getModUpgradeCost(g,selectedMod);if(game.global.nullifium Date: Wed, 5 Sep 2018 12:21:53 +0100 Subject: [PATCH 1172/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index e4e5c486e..90bc9004f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -510,9 +510,6 @@ function updateCustomButtons() { //AutoStance getPageSetting('AutoStance')==3 ? turnOn("WindStackingMin"): turnOff("WindStackingMin"); getPageSetting('AutoStance')==3 ? turnOn("WindStackingMax"): turnOff("WindStackingMax"); - getPageSetting('AutoStance')==3 ? turnOn("ScryUseinPoison"): turnOff("ScryUseinPoison"); - getPageSetting('AutoStance')==3 ? turnOn("ScryUseinWind"): turnOff("ScryUseinWind"); - getPageSetting('AutoStance')==3 ? turnOn("ScryUseinIce"): turnOff("ScryUseinIce"); getPageSetting('AutoStance')!=3 ? turnOn("IgnoreCrits") : turnOff("IgnoreCrits"); //Windstack From b084587a3673860bf7cc6cebe96ecefd0b9b1239 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 5 Sep 2018 12:56:01 +0100 Subject: [PATCH 1173/3477] Update battlecalc.js --- modules/battlecalc.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 706504175..872cd07a2 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -103,6 +103,9 @@ function getBattleStats(what,form,crit) { } if (game.global.challengeActive == "Daily"){ var mult = 0; + if (game.talents.daily.purchased && what == "attack"){ + currentCalc *= 1.5; + } if (typeof game.global.dailyChallenge.weakness !== 'undefined' && what == "attack"){ mult = dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); currentCalc *= mult; @@ -141,6 +144,9 @@ function getBattleStats(what,form,crit) { amt = (0.15 * cellCount); currentCalc *= (amt + 1); } + if (game.talents.scry.purchased && what == "attack" && game.global.formation == 4 && (mutations.Healthy.active() || mutations.Corruption.active())){ + currentCalc *= 2 + } if (game.global.sugarRush > 0 && what == "attack"){ currentCalc *= sugarRush.getAttackStrength(); textString += "Sugar Rush  x " + sugarRush.getAttackStrength() + "" + prettify(currentCalc) + "" + ((what == "attack") ? getFluctuation(currentCalc, minFluct, maxFluct) : "") + ""; @@ -259,6 +265,9 @@ function calcOurDmg(minMaxAvg, incStance, incFlucts) { if (game.singleRunBonuses.sharpTrimps.owned){ number *= 1.5; } + if (game.global.challengeActive == "Daily" && game.talents.daily.purchased){ + number *= 1.5; + } if (game.global.challengeActive == "Daily"){ if (typeof game.global.dailyChallenge.minDamage !== 'undefined'){ if (minFluct == -1) minFluct = fluctuation; @@ -289,7 +298,7 @@ function calcOurDmg(minMaxAvg, incStance, incFlucts) { number /= (game.global.formation == 2) ? 4 : 0.5; } - var min = number; + var min = number; var max = number; var avg = number; From 51d68c8c2327a20cebf7133aae7feb79b92561e3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 5 Sep 2018 13:00:30 +0100 Subject: [PATCH 1174/3477] Update SettingsGUI.js --- SettingsGUI.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 90bc9004f..e81b2ec32 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -168,7 +168,7 @@ function initializeAllSettings() { //Buildings //Line 1 - createSetting('hidebuildings', 'Hide Buildings', 'If you have unlocked Autostructure and Decabuild, this setting will appear and enable you to hide the now obsolete building settings, so please use AutoStructure instead. The settings will only disappear if you disable the buy buildings button and turn this on. It will not hide the Warpstation settings or Gyms as Autostructure does not allow you to customize how you buy them. ', 'boolean', false, null, "Buildings"); + createSetting('hidebuildings', 'Hide Buildings', 'If you have unlocked Autostructure and Decabuild, this setting will appear and enable you to hide the now obsolete building settings, so please use AutoStructure instead. The settings will only disappear if you disable the buy buildings button and turn this on. It will not hide the Gym settings as Autostructure does not allow you to customize how you buy them. ', 'boolean', false, null, "Buildings"); createSetting('BuyBuildingsNew', ['Buy Neither', 'Buy Buildings & Storage', 'Buy Buildings', 'Buy Storage'], 'AutoBuys Storage when it is almost full (it even anticipates Jestimp) and Non-Storage Buildings (As soon as they are available). Takes cost efficiency into account before buying Non-Storage Buildings.', 'multitoggle', 1, null, "Buildings"); createSetting('WarpstationCap', 'Warpstation Cap', 'Do not level Warpstations past Basewarp+DeltaGiga **. Without this, if a Giga wasnt available, it would level infinitely (wastes metal better spent on prestiges instead.) **The script bypasses this cap each time a new giga is bought, when it insta-buys as many as it can afford (since AT keeps available metal/gems to a low, overbuying beyond the cap to what is affordable at that first moment is not a bad thing). ', 'boolean', true, null, 'Buildings'); createSetting('WarpstationCoordBuy', 'Buy Warp to Hit Coord', 'If we are very close to hitting the next coordination, and we can afford the warpstations it takes to do it, Do it! (even if we are over the Cap/Wall). Recommended with WarpCap/WarpWall. (has no point otherwise) ', 'boolean', true, null, 'Buildings'); @@ -495,7 +495,12 @@ function updateCustomButtons() { (!fuckbuilding) ? turnOn("MaxCollector") : turnOff("MaxCollector"); (!fuckbuilding) ? turnOn("MaxTribute") : turnOff("MaxTribute"); (!fuckbuilding) ? turnOn("MaxNursery") : turnOff("MaxNursery"); - (!fuckbuilding) ? turnOn("NoNurseriesUntil") : turnOff("NoNurseriesUntil"); + (!fuckbuilding) ? turnOn("MaxNursery") : turnOff("MaxNursery"); + (!fuckbuilding) ? turnOn("WarpstationCap") : turnOff("WarpstationCap"); + (!fuckbuilding) ? turnOn("WarpstationCoordBuy") : turnOff("WarpstationCoordBuy"); + (!fuckbuilding) ? turnOn("FirstGigastation") : turnOff("FirstGigastation"); + (!fuckbuilding) ? turnOn("DeltaGigastation") : turnOff("DeltaGigastation"); + (!fuckbuilding) ? turnOn("WarpstationWall3") : turnOff("WarpstationWall3"); //Jobs var fuckjobbies = (game.talents.autoJobs.purchased && getPageSetting('fuckjobs')==true && getPageSetting('BuyJobsNew')==0); From 3749aa1ee739d0ec6c469a7baf963b76d6e26832 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 5 Sep 2018 13:03:37 +0100 Subject: [PATCH 1175/3477] Update upgrades.js --- modules/upgrades.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 9feadaddb..424cb672d 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -11,7 +11,8 @@ function buyUpgrades() { if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; - if (upgrade == 'Gigastation' && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; + var fuckbuildinggiga = (game.talents.autoStructure.purchased && game.talents.deciBuild.purchased && getPageSetting('hidebuildings')==true && getPageSetting('BuyBuildingsNew')==0); + if (upgrade == 'Gigastation' && !fuckbuildinggiga && (game.global.lastWarp ? game.buildings.Warpstation.owned < (Math.floor(game.upgrades.Gigastation.done * getPageSetting('DeltaGigastation')) + getPageSetting('FirstGigastation')) : game.buildings.Warpstation.owned < getPageSetting('FirstGigastation'))) continue; if (upgrade == 'Bloodlust' && game.global.challengeActive == 'Scientist' && getPageSetting('BetterAutoFight')) continue; if (!available) continue; From 1109bd42aaaabb6a66aeb7e9dba3209c3cb6a70b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 5 Sep 2018 13:47:33 +0100 Subject: [PATCH 1176/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index d799ca587..f842d9056 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -90,7 +90,7 @@ function mainLoop() { if (getPageSetting('ForceAbandon')==true || getPageSetting('fuckanti')) trimpcide(); if (getPageSetting('AutoAllocatePerks')==2) lootdump(); if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1 && getDailyHeliumValue(countDailyWeight()) >= getPageSetting('buyheliumy') && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) purchaseSingleRunBonus('heliumy'); - if (getPageSetting('fightforever')==true || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) || (getPageSetting('dfightforever') == 1 && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) || (getPageSetting('dfightforever') == 2 && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined'))) fightalways(); + if ((getPageSetting('fightforever')==0 || getPageSetting('fightforever') > 0 && HDratioy() <= getPageSetting('fightforever')) || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) || (getPageSetting('dfightforever') == 1 && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) || (getPageSetting('dfightforever') == 2 && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined'))) fightalways(); if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); From 382c5ff736439758fe3b0ec248ada6c70237bd57 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 5 Sep 2018 13:47:35 +0100 Subject: [PATCH 1177/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index e81b2ec32..9bb4ff8dd 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -325,7 +325,7 @@ function initializeAllSettings() { createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); //Line 2 - createSetting('fightforever', 'Fight Always', 'Sends trimps to fight if they\'re not fighting, regardless of BAF.', 'boolean', 'false', null, 'Combat'); + createSetting('fightforever', 'Fight Always', '-1 to disable. Sends trimps to fight if they\'re not fighting, regardless of BAF. Has 2 uses. Set to 0 to always send out trimps. Or set a number higher than 0 to enable the H:D function. If the H:D ratio is below this number it will send them out. I.e, this is set to 1, it will send out trimps regardless with the H:D ratio is below 1. ', 'value', '-1', null, 'Combat'); createSetting('addpoison', 'Poison Calc', 'Experimental. Adds poison to the battlecalc. May improve your poison zone speed. ', 'boolean', 'false', null, 'Combat'); From fbccf90fb78ebe58b8b571612dfa91e2486b5474 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 5 Sep 2018 18:23:42 +0100 Subject: [PATCH 1178/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index f842d9056..a565c5dbe 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -15,7 +15,7 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "05/06/2018", version: "v2.7.0", description: "4.9 Here we go! Added the new Classy perk to Autoperks, along with updated ratios. Added an option in Buildings & Jobs to hide obsolete settings once you have unlocked certain masteries. Fixed Scryer. Added an option to Scry VMs without having to enable scrying. Added B instead of S for WS. ", isNew: true}); +changelogList.push({date: "05/09/2018", version: "v2.7.0", description: "4.9 Here we go! Added the new Classy perk to Autoperks, along with updated ratios. Added an option in Buildings & Jobs to hide obsolete settings once you have unlocked certain masteries. Fixed Scryer. Added an option to Scry VMs without having to enable scrying. Added B instead of S for WS. ", isNew: true}); changelogList.push({date: "03/09/2018", version: "v2.6.5", description: "Pre-pre-4.9 update. Check out the C2 Tab! And theres some more tiny optimizations too. ", isNew: false}); changelogList.push({date: "02/09/2018", version: "v2.6.4", description: "Pre-4.9 update. Revamped the Daily Autoportal settings, so make sure to check it! And sust some small optimizations here and there. I have changed some settings names such as AS3, check em out. Also just a quick thank you to anyone who uses my fork, its nice to know something I have made is actually being used haha. Please report any problems to me! ", isNew: false}); changelogList.push({date: "22/08/2018", version: "v2.6.3", description: "Disable Farming is now controllable, so make sure to set it! Added Magic Armor option to Dailys/C2s. Changed the Daily Fight Always button, check it! The Daily tab is getting really fat now, oh well lol. ", isNew: false}); From b6435277141944b3ebcd6dcbdbbaf052b91a88cb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 5 Sep 2018 18:46:26 +0100 Subject: [PATCH 1179/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index a565c5dbe..fd8d29548 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -108,7 +108,7 @@ function mainLoop() { if (agu && agu!='Off' && (!game.global.runningChallengeSquared && game.global.challengeActive != "Daily")) autoGoldenUpgradesAT(agu); if (dagu && dagu!='Off' && game.global.challengeActive == "Daily") autoGoldenUpgradesAT(dagu); if (cagu && cagu!='Off' && game.global.runningChallengeSquared) autoGoldenUpgradesAT(cagu); - if (getPageSetting('BuyBuildingsNew')===0/* && getPageSetting('hidebuildings')==true*/) /*buyBuildings();*/ {} + if (getPageSetting('BuyBuildingsNew')===0 && getPageSetting('hidebuildings')==true) buyBuildings(); else if (getPageSetting('BuyBuildingsNew')==1) { buyBuildings(); buyStorage(); } else if (getPageSetting('BuyBuildingsNew')==2) buyBuildings(); else if (getPageSetting('BuyBuildingsNew')==3) buyStorage(); From 6141e6829753c885fa8322400d3a0aed1657ae90 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 5 Sep 2018 18:55:30 +0100 Subject: [PATCH 1180/3477] Update perks.js --- modules/perks.js | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/modules/perks.js b/modules/perks.js index cda0fef98..1de18c268 100644 --- a/modules/perks.js +++ b/modules/perks.js @@ -78,22 +78,16 @@ AutoPerks.displayGUI = function() { //Line 1 of the UI apGUI.$ratiosLine1 = document.createElement("DIV"); apGUI.$ratiosLine1.setAttribute('style', 'display: inline-block; text-align: left; width: 100%'); - var listratiosLine1 = ["Overkill","Resourceful","Coordinated","Resilience","Carpentry"]; + var listratiosLine1 = ["Overkill","Resourceful","Coordinated","Resilience","Carpentry","Pheromones","Motivation"]; for (var i in listratiosLine1) AutoPerks.createInput(listratiosLine1[i],apGUI.$ratiosLine1); apGUI.$customRatios.appendChild(apGUI.$ratiosLine1); //Line 2 of the UI apGUI.$ratiosLine2 = document.createElement("DIV"); apGUI.$ratiosLine2.setAttribute('style', 'display: inline-block; text-align: left; width: 100%'); - var listratiosLine2 = ["Pheromones","Motivation","Power","Looting","Artisanistry"]; + var listratiosLine2 = ["Power","Looting","Artisanistry","Cunning","Curious","Classy"]; for (var i in listratiosLine2) AutoPerks.createInput(listratiosLine2[i],apGUI.$ratiosLine2); - //Fluffy Line of the UI - apGUI.$ratiosLine3 = document.createElement("DIV"); - apGUI.$ratiosLine3.setAttribute('style', 'display: inline-block; text-align: left; width: 100%'); - var listratiosLine3 = ["Cunning","Curious","Classy"]; - for (var i in listratiosLine3) - AutoPerks.createInput(listratiosLine3[i],apGUI.$ratiosLine3); //Create dump perk dropdown apGUI.$dumpperklabel = document.createElement("Label"); apGUI.$dumpperklabel.id = 'DumpPerk Label'; @@ -105,7 +99,7 @@ AutoPerks.displayGUI = function() { var oldstyle = 'text-align: center; width: 8vw; font-size: 0.8vw; font-weight: lighter; '; if(game.options.menu.darkTheme.enabled != 2) apGUI.$dumpperk.setAttribute("style", oldstyle + " color: black;"); else apGUI.$dumpperk.setAttribute('style', oldstyle); - //Add the dump perk dropdown to UI Line 3 + //Add the dump perk dropdown to UI Line 2 apGUI.$ratiosLine2.appendChild(apGUI.$dumpperklabel); apGUI.$ratiosLine2.appendChild(apGUI.$dumpperk); apGUI.$ratioPresetLabel = document.createElement("Label"); @@ -134,7 +128,6 @@ AutoPerks.displayGUI = function() { apGUI.$ratiosLine1.appendChild(apGUI.$ratioPresetLabel); apGUI.$ratiosLine1.appendChild(apGUI.$ratioPreset); apGUI.$customRatios.appendChild(apGUI.$ratiosLine2); - apGUI.$customRatios.appendChild(apGUI.$ratiosLine3); var $portalWrapper = document.getElementById("portalWrapper") $portalWrapper.appendChild(apGUI.$customRatios); AutoPerks.initializePerks(); From ceff34070ddade8cbd69aa5b0daa1aef6604738a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 5 Sep 2018 19:05:03 +0100 Subject: [PATCH 1181/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 9271ace10..204923d35 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -11,7 +11,7 @@ function useScryerStance() { //Never var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; - use_scry = use_scry || game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0; + use_scry = use_scry || game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"; use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0 && (getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps') == false && game.global.challengeActive == "Daily")); use_scry = use_scry || !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0; use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); From 5caf5e2c522a9f844e398adf062aa9894acdeb24 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 5 Sep 2018 22:37:01 +0100 Subject: [PATCH 1182/3477] Update scryer.js --- modules/scryer.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 204923d35..a0b71acd8 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -83,9 +83,7 @@ if (useoverkill && game.portal.Overkill.level == 0) setPageSetting('ScryerUseWhenOverkill', false); if (useoverkill && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')==0) useoverkill = false; -if (useoverkill && ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce'))))) - useoverkill = false; -if (useoverkill && game.portal.Overkill.level > 0 && getPageSetting('UseScryerStance') == true && getPageSetting('UseScryerStance') == true) { +if (useoverkill && game.portal.Overkill.level > 0 && getPageSetting('UseScryerStance') == true) { var minDamage = calcOurDmg("min",false,true); var Sstance = 0.5; var ovkldmg = minDamage * Sstance * (game.portal.Overkill.level*0.005); From 287d0f74574736b08c9ad2eedff67dce94ac1184 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 09:04:38 +0100 Subject: [PATCH 1183/3477] Update scryer.js --- modules/scryer.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index a0b71acd8..eef8ebcec 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -11,12 +11,11 @@ function useScryerStance() { //Never var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; - use_scry = use_scry || game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"; - use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0 && (getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps') == false && game.global.challengeActive == "Daily")); - use_scry = use_scry || !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0; + use_scry = use_scry || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"); + use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0); + use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); use_scry = use_scry || ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); - use_scry = use_scry || (getPageSetting('UseScryerStance') == false && (getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps') == false && game.global.challengeActive == "Daily")); //check Corrupted Never var curEnemy = getCurrentEnemy(1); @@ -40,7 +39,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | //Force var use_scryer = use_scryer || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1 && getPageSetting('UseScryerStance') == true); - use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('ScryerUseinVoidMaps2') == 1 || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps') == true && game.global.challengeActive == "Daily"))); + use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 1); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world >= getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world >= getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce'))))); From 8d9c69a1f0be61477fe307eb5570b03c86e0a925 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 09:12:56 +0100 Subject: [PATCH 1184/3477] Update scryer.js --- modules/scryer.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index eef8ebcec..de1ffecc3 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -3,7 +3,8 @@ function useScryerStance() { var AutoStance = getPageSetting('AutoStance'); function autostancefunction() { - if (AutoStance==1) autoStance(); + if (game.global.formation != 4 && game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily")) setFormation(4); + else if (AutoStance==1) autoStance(); else if (AutoStance==2) autoStance2(); else if (AutoStance==3) autoStance3(); } @@ -12,7 +13,7 @@ function useScryerStance() { var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; use_scry = use_scry || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"); - use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0); + use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0 && (getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily")); use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); use_scry = use_scry || ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); @@ -39,7 +40,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | //Force var use_scryer = use_scryer || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1 && getPageSetting('UseScryerStance') == true); - use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 1); + use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('ScryerUseinVoidMaps2') == 1 || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world >= getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world >= getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce'))))); From 7299ac86b1c7696f7b32ad22bf286e8726eb937f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 09:13:29 +0100 Subject: [PATCH 1185/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index fd8d29548..14ccd99f6 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -124,7 +124,8 @@ function mainLoop() { if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); autoLevelEquipment(); - if (getPageSetting('UseScryerStance')== true || (getPageSetting('scryvoidmaps')== true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily")) useScryerStance(); + if (getPageSetting('UseScryerStance')== true) useScryerStance(); + else if (game.global.formation != 4 && game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily")) setFormation(4); else if (getPageSetting('AutoStance')<=1 && !daily3) autoStance(); else if (getPageSetting('AutoStance')==2 && !daily3) autoStance2(); else if (getPageSetting('AutoStance')==3 || daily3) autoStance3(); From 04f179b764e5a42a0216c72f2229bceb17af4974 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 09:21:04 +0100 Subject: [PATCH 1186/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 - 1 file changed, 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 14ccd99f6..47e9e8478 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -125,7 +125,6 @@ function mainLoop() { if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); autoLevelEquipment(); if (getPageSetting('UseScryerStance')== true) useScryerStance(); - else if (game.global.formation != 4 && game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily")) setFormation(4); else if (getPageSetting('AutoStance')<=1 && !daily3) autoStance(); else if (getPageSetting('AutoStance')==2 && !daily3) autoStance2(); else if (getPageSetting('AutoStance')==3 || daily3) autoStance3(); From 7e5b2c9ea30bd3a061e501953a0cb6b643048501 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 09:25:05 +0100 Subject: [PATCH 1187/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 47e9e8478..c00f339c8 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -124,7 +124,7 @@ function mainLoop() { if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); autoLevelEquipment(); - if (getPageSetting('UseScryerStance')== true) useScryerStance(); + if ((getPageSetting('UseScryerStance')== true) || (game.global.formation != 4 && game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily")) useScryerStance(); else if (getPageSetting('AutoStance')<=1 && !daily3) autoStance(); else if (getPageSetting('AutoStance')==2 && !daily3) autoStance2(); else if (getPageSetting('AutoStance')==3 || daily3) autoStance3(); From 22eaa512fcb3a2e7e0e04032f090aa1c29c33abb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 09:27:00 +0100 Subject: [PATCH 1188/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index c00f339c8..8574ad603 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -124,7 +124,7 @@ function mainLoop() { if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); autoLevelEquipment(); - if ((getPageSetting('UseScryerStance')== true) || (game.global.formation != 4 && game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily")) useScryerStance(); + if ((getPageSetting('UseScryerStance')== true) || (game.global.formation != 4 && game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))) useScryerStance(); else if (getPageSetting('AutoStance')<=1 && !daily3) autoStance(); else if (getPageSetting('AutoStance')==2 && !daily3) autoStance2(); else if (getPageSetting('AutoStance')==3 || daily3) autoStance3(); From 56fe5c2d2a1a05be06c967ba6f27f91be7a31092 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 09:29:22 +0100 Subject: [PATCH 1189/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 8574ad603..438e2ae8a 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -124,7 +124,7 @@ function mainLoop() { if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); autoLevelEquipment(); - if ((getPageSetting('UseScryerStance')== true) || (game.global.formation != 4 && game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))) useScryerStance(); + if ((getPageSetting('UseScryerStance')== true) || (game.global.formation != 4 && game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily")))) useScryerStance(); else if (getPageSetting('AutoStance')<=1 && !daily3) autoStance(); else if (getPageSetting('AutoStance')==2 && !daily3) autoStance2(); else if (getPageSetting('AutoStance')==3 || daily3) autoStance3(); From c1187484a78e156b21794fae6cc5c80a30cad57a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 09:35:33 +0100 Subject: [PATCH 1190/3477] Update scryer.js --- modules/scryer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index de1ffecc3..bf2dcae9c 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -12,8 +12,8 @@ function useScryerStance() { //Never var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; - use_scry = use_scry || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"); - use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0 && (getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily")); + use_scry = use_scry || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0); + use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0); use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); use_scry = use_scry || ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); From fe2195ea518a385492f101b3e7a39689bb04f9ae Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 09:40:43 +0100 Subject: [PATCH 1191/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index bf2dcae9c..d870c843d 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -3,7 +3,7 @@ function useScryerStance() { var AutoStance = getPageSetting('AutoStance'); function autostancefunction() { - if (game.global.formation != 4 && game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily")) setFormation(4); + if (game.global.formation != 4 && game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily")) setFormation(4);return; else if (AutoStance==1) autoStance(); else if (AutoStance==2) autoStance2(); else if (AutoStance==3) autoStance3(); From c97b116f6f5cecf55a84ba9ee88ba7c34a9140ab Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 09:46:28 +0100 Subject: [PATCH 1192/3477] Update scryer.js --- modules/scryer.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index d870c843d..eac1d796f 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -3,8 +3,7 @@ function useScryerStance() { var AutoStance = getPageSetting('AutoStance'); function autostancefunction() { - if (game.global.formation != 4 && game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily")) setFormation(4);return; - else if (AutoStance==1) autoStance(); + if (AutoStance==1) autoStance(); else if (AutoStance==2) autoStance2(); else if (AutoStance==3) autoStance3(); } @@ -13,7 +12,7 @@ function useScryerStance() { var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; use_scry = use_scry || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0); - use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0); + use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) || (getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); use_scry = use_scry || ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); @@ -40,7 +39,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | //Force var use_scryer = use_scryer || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1 && getPageSetting('UseScryerStance') == true); - use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && (getPageSetting('ScryerUseinVoidMaps2') == 1 || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))); + use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 1) || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world >= getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world >= getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce'))))); From 4c9cff571e605cf50b06e3e88333d8f4ae06999a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 09:51:06 +0100 Subject: [PATCH 1193/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 438e2ae8a..90fd93159 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -124,7 +124,7 @@ function mainLoop() { if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); autoLevelEquipment(); - if ((getPageSetting('UseScryerStance')== true) || (game.global.formation != 4 && game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily")))) useScryerStance(); + if ((getPageSetting('UseScryerStance')== true) || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps') == true && game.global.challengeActive == "Daily")))) useScryerStance(); else if (getPageSetting('AutoStance')<=1 && !daily3) autoStance(); else if (getPageSetting('AutoStance')==2 && !daily3) autoStance2(); else if (getPageSetting('AutoStance')==3 || daily3) autoStance3(); From 8ec74ba7a38b9588436e5fac8b6bcc2a16f912b1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 10:00:27 +0100 Subject: [PATCH 1194/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index eac1d796f..552868596 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -12,7 +12,7 @@ function useScryerStance() { var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; use_scry = use_scry || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0); - use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) || (getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); + use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) || (getPageSetting('UseScryerStance') == false && getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('UseScryerStance') == false && getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); use_scry = use_scry || ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); From eec3d141603849759218c6437e26e545a44443da Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 10:04:13 +0100 Subject: [PATCH 1195/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 90fd93159..5c603a164 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -124,7 +124,7 @@ function mainLoop() { if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); autoLevelEquipment(); - if ((getPageSetting('UseScryerStance')== true) || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps') == true && game.global.challengeActive == "Daily")))) useScryerStance(); + if ((getPageSetting('UseScryerStance')== true) || ((getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps') == true && game.global.challengeActive == "Daily"))) useScryerStance(); else if (getPageSetting('AutoStance')<=1 && !daily3) autoStance(); else if (getPageSetting('AutoStance')==2 && !daily3) autoStance2(); else if (getPageSetting('AutoStance')==3 || daily3) autoStance3(); From 3649ac757d015dddd61511ad6412ba2b249f0232 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 10:09:31 +0100 Subject: [PATCH 1196/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 552868596..96b81dc98 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -12,7 +12,7 @@ function useScryerStance() { var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; use_scry = use_scry || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0); - use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) || (getPageSetting('UseScryerStance') == false && getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('UseScryerStance') == false && getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); + use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) && (getPageSetting('UseScryerStance') == false && getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('UseScryerStance') == false && getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); use_scry = use_scry || ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); From 5e3c7368dc560876f6b794962dba152b01e48a7f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 10:12:01 +0100 Subject: [PATCH 1197/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 96b81dc98..6c5cc4835 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -38,7 +38,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | } //Force -var use_scryer = use_scryer || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1 && getPageSetting('UseScryerStance') == true); +var use_scryer = use_scryer || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1); use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 1) || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world >= getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world >= getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce'))))); From 73f6a4e65886e7ed012066a66935472464f23fc6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 10:14:23 +0100 Subject: [PATCH 1198/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 6c5cc4835..e00a6e497 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -38,7 +38,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | } //Force -var use_scryer = use_scryer || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1); +var use_scryer = use_scryer || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1); use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 1) || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world >= getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world >= getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce'))))); From a72ea7a4c6c8cd64491d9c2d3cc456f7ca4a4c45 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 10:16:03 +0100 Subject: [PATCH 1199/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index e00a6e497..3464f99b7 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -11,7 +11,7 @@ function useScryerStance() { //Never var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; - use_scry = use_scry || (game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0); + use_scry = use_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0); use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) && (getPageSetting('UseScryerStance') == false && getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('UseScryerStance') == false && getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); From 617a41cb78cc3ee6d2775e17d2d6c73f792f5567 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 10:19:12 +0100 Subject: [PATCH 1200/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 3464f99b7..60146238c 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -11,7 +11,7 @@ function useScryerStance() { //Never var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; - use_scry = use_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0); + use_scry = use_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"); use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) && (getPageSetting('UseScryerStance') == false && getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('UseScryerStance') == false && getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); From f44a99a5804e438b407e99274fe4fb34bdbf265d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 11:30:22 +0100 Subject: [PATCH 1201/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 60146238c..b98b75ead 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -99,7 +99,7 @@ var min_zone = getPageSetting('ScryerMinZone'); var max_zone = getPageSetting('ScryerMaxZone'); var valid_min = game.global.world >= min_zone && game.global.world > 60; var valid_max = max_zone <= 0 || game.global.world < max_zone; -if (getPageSetting('UseScryerStance') == true && valid_min && valid_max && !(getPageSetting('onlyminmaxworld') == true && game.global.mapsActive)) { +if (getPageSetting('UseScryerStance') == true && valid_min && valid_max && getCurrentMapObject().location != "Void" && !(getPageSetting('onlyminmaxworld') == true && game.global.mapsActive)) { if (oktoswitch) setFormation(4); wantToScry = true; From 614fb199039261d99693b395612b9cd8cd0399f6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 12:05:24 +0100 Subject: [PATCH 1202/3477] Update import-export.js --- modules/import-export.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/import-export.js b/modules/import-export.js index 5c3a6e96a..f3cceb47c 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -131,8 +131,8 @@ function ImportExportTooltip(what, event) { tooltipText = ""; costText = "
    Thats all the help you get.
    "; } else if (what == 'c2table') { - var c2list={Size:{number:1,percent:getIndividualSquaredReward('Size')+'%',zone:game.c2.Size,percentzone:(100*(game.c2.Size/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Slow:{number:2,percent:getIndividualSquaredReward('Slow')+'%',zone:game.c2.Slow,percentzone:(100*(game.c2.Slow/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Watch:{number:3,percent:getIndividualSquaredReward('Watch')+'%',zone:game.c2.Watch,percentzone:(100*(game.c2.Watch/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Discipline:{number:4,percent:getIndividualSquaredReward('Discipline')+'%',zone:game.c2.Discipline,percentzone:(100*(game.c2.Discipline/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Balance:{number:5,percent:getIndividualSquaredReward('Balance')+'%',zone:game.c2.Balance,percentzone:(100*(game.c2.Balance/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Meditate:{number:6,percent:getIndividualSquaredReward('Meditate')+'%',zone:game.c2.Meditate,percentzone:(100*(game.c2.Meditate/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Metal:{number:7,percent:getIndividualSquaredReward('Metal')+'%',zone:game.c2.Metal,percentzone:(100*(game.c2.Metal/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Lead:{number:8,percent:getIndividualSquaredReward('Lead')+'%',zone:game.c2.Lead,percentzone:(100*(game.c2.Lead/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Nom:{number:9,percent:getIndividualSquaredReward('Nom')+'%',zone:game.c2.Nom,percentzone:(100*(game.c2.Nom/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Electricity:{number:10,percent:getIndividualSquaredReward('Electricity')+'%',zone:game.c2.Electricity,percentzone:(100*(game.c2.Electricity/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Toxicity:{number:11,percent:getIndividualSquaredReward('Toxicity')+'%',zone:game.c2.Toxicity,percentzone:(100*(game.c2.Toxicity/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Coordinate:{number:12,percent:getIndividualSquaredReward('Coordinate')+'%',zone:game.c2.Coordinate,percentzone:(100*(game.c2.Coordinate/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Trimp:{number:13,percent:getIndividualSquaredReward('Trimp')+'%',zone:game.c2.Trimp,percentzone:(100*(game.c2.Trimp/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Obliterated:{number:14,percent:getIndividualSquaredReward('Obliterated')+'%',zone:game.c2.Obliterated,percentzone:(100*(game.c2.Obliterated/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Mapology:{number:15,percent:getIndividualSquaredReward('Mapology')+'%',zone:game.c2.Mapology,percentzone:(100*(game.c2.Mapology/game.global.highestLevelCleared)).toFixed(2)+'%',color:0},Trapper:{number:16,percent:getIndividualSquaredReward('Trapper')+'%',zone:game.c2.Trapper,percentzone:(100*(game.c2.Trapper/game.global.highestLevelCleared)).toFixed(2)+'%',color:0}}; - function c2listcolor(){function a(b,c,d){var e=100*(game.c2[b]/game.global.highestLevelCleared);c2list[b].color=e>=c?"LIMEGREEN":e=d?"GOLD":e=c?"LIMEGREEN":e=d?"GOLD":e" + c2list.Size.percent + "" + c2list.Size.zone + "" + c2list.Size.percentzone + "Slow" + c2list.Slow.number + "" + c2list.Slow.percent + "" + c2list.Slow.zone + "" + c2list.Slow.percentzone + "Watch" + c2list.Watch.number + "" + c2list.Watch.percent + "" + c2list.Watch.zone + "" + c2list.Watch.percentzone + "Discipline" + c2list.Discipline.number + "" + c2list.Discipline.percent + "" + c2list.Discipline.zone + "" + c2list.Discipline.percentzone + "Balance" + c2list.Balance.number + "" + c2list.Balance.percent + "" + c2list.Balance.zone + "" + c2list.Balance.percentzone + "Meditate" + c2list.Meditate.number + "" + c2list.Meditate.percent + "" + c2list.Meditate.zone + "" + c2list.Meditate.percentzone + "Metal" + c2list.Metal.number + "" + c2list.Metal.percent + "" + c2list.Metal.zone + "" + c2list.Metal.percentzone + "Lead" + c2list.Lead.number + "" + c2list.Lead.percent + "" + c2list.Lead.zone + "" + c2list.Lead.percentzone + "Nom" + c2list.Nom.number + "" + c2list.Nom.percent + "" + c2list.Nom.zone + "" + c2list.Nom.percentzone + "Electricity" + c2list.Electricity.number + "" + c2list.Electricity.percent + "" + c2list.Electricity.zone + "" + c2list.Electricity.percentzone + "Toxicity" + c2list.Toxicity.number + "" + c2list.Toxicity.percent + "" + c2list.Toxicity.zone + "" + c2list.Toxicity.percentzone + "Coordinate" + c2list.Coordinate.number + "" + c2list.Coordinate.percent + "" + c2list.Coordinate.zone + "" + c2list.Coordinate.percentzone + "Trimp" + c2list.Trimp.number + "" + c2list.Trimp.percent + "" + c2list.Trimp.zone + "" + c2list.Trimp.percentzone + "Obliterated" + c2list.Obliterated.number + "" + c2list.Obliterated.percent + "" + c2list.Obliterated.zone + "" + c2list.Obliterated.percentzone + "Mapology" + c2list.Mapology.number + "" + c2list.Mapology.percent + "" + c2list.Mapology.zone + "" + c2list.Mapology.percentzone + "Trapper" + c2list.Trapper.number + "" + c2list.Trapper.percent + "" + c2list.Trapper.zone + "" + c2list.Trapper.percentzone + " "; costText = "
    Close
    "; From 79c728e0bf241c178331a0dc9750cb4926237512 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 14:02:12 +0100 Subject: [PATCH 1203/3477] Update import-export.js --- modules/import-export.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/import-export.js b/modules/import-export.js index f3cceb47c..370f4de8a 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -134,7 +134,7 @@ function ImportExportTooltip(what, event) { var c2list={Size:{number:1,percent:getIndividualSquaredReward('Size')+'%',zone:game.c2.Size,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Slow:{number:2,percent:getIndividualSquaredReward('Slow')+'%',zone:game.c2.Slow,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Watch:{number:3,percent:getIndividualSquaredReward('Watch')+'%',zone:game.c2.Watch,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Discipline:{number:4,percent:getIndividualSquaredReward('Discipline')+'%',zone:game.c2.Discipline,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Balance:{number:5,percent:getIndividualSquaredReward('Balance')+'%',zone:game.c2.Balance,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Meditate:{number:6,percent:getIndividualSquaredReward('Meditate')+'%',zone:game.c2.Meditate,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Metal:{number:7,percent:getIndividualSquaredReward('Metal')+'%',zone:game.c2.Metal,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Lead:{number:8,percent:getIndividualSquaredReward('Lead')+'%',zone:game.c2.Lead,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Nom:{number:9,percent:getIndividualSquaredReward('Nom')+'%',zone:game.c2.Nom,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Electricity:{number:10,percent:getIndividualSquaredReward('Electricity')+'%',zone:game.c2.Electricity,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Toxicity:{number:11,percent:getIndividualSquaredReward('Toxicity')+'%',zone:game.c2.Toxicity,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Coordinate:{number:12,percent:getIndividualSquaredReward('Coordinate')+'%',zone:game.c2.Coordinate,percentzone:(100*(game.c2.Coordinate/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Trimp:{number:13,percent:getIndividualSquaredReward('Trimp')+'%',zone:game.c2.Trimp,percentzone:(100*(game.c2.Trimp/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Obliterated:{number:14,percent:getIndividualSquaredReward('Obliterated')+'%',zone:game.c2.Obliterated,percentzone:(100*(game.c2.Obliterated/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Mapology:{number:15,percent:getIndividualSquaredReward('Mapology')+'%',zone:game.c2.Mapology,percentzone:(100*(game.c2.Mapology/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Trapper:{number:16,percent:getIndividualSquaredReward('Trapper')+'%',zone:game.c2.Trapper,percentzone:(100*(game.c2.Trapper/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0}}; function c2listcolor(){function a(b,c,d){var e=100*(game.c2[b]/(game.global.highestLevelCleared+1));c2list[b].color=e>=c?"LIMEGREEN":e=d?"GOLD":e" + c2list.Size.percent + "" + c2list.Size.zone + "" + c2list.Size.percentzone + "Slow" + c2list.Slow.number + "" + c2list.Slow.percent + "" + c2list.Slow.zone + "" + c2list.Slow.percentzone + "Watch" + c2list.Watch.number + "" + c2list.Watch.percent + "" + c2list.Watch.zone + "" + c2list.Watch.percentzone + "Discipline" + c2list.Discipline.number + "" + c2list.Discipline.percent + "" + c2list.Discipline.zone + "" + c2list.Discipline.percentzone + "Balance" + c2list.Balance.number + "" + c2list.Balance.percent + "" + c2list.Balance.zone + "" + c2list.Balance.percentzone + "Meditate" + c2list.Meditate.number + "" + c2list.Meditate.percent + "" + c2list.Meditate.zone + "" + c2list.Meditate.percentzone + "Metal" + c2list.Metal.number + "" + c2list.Metal.percent + "" + c2list.Metal.zone + "" + c2list.Metal.percentzone + "Lead" + c2list.Lead.number + "" + c2list.Lead.percent + "" + c2list.Lead.zone + "" + c2list.Lead.percentzone + "Nom" + c2list.Nom.number + "" + c2list.Nom.percent + "" + c2list.Nom.zone + "" + c2list.Nom.percentzone + "Electricity" + c2list.Electricity.number + "" + c2list.Electricity.percent + "" + c2list.Electricity.zone + "" + c2list.Electricity.percentzone + "Toxicity" + c2list.Toxicity.number + "" + c2list.Toxicity.percent + "" + c2list.Toxicity.zone + "" + c2list.Toxicity.percentzone + "Coordinate" + c2list.Coordinate.number + "" + c2list.Coordinate.percent + "" + c2list.Coordinate.zone + "" + c2list.Coordinate.percentzone + "Trimp" + c2list.Trimp.number + "" + c2list.Trimp.percent + "" + c2list.Trimp.zone + "" + c2list.Trimp.percentzone + "Obliterated" + c2list.Obliterated.number + "" + c2list.Obliterated.percent + "" + c2list.Obliterated.zone + "" + c2list.Obliterated.percentzone + "Mapology" + c2list.Mapology.number + "" + c2list.Mapology.percent + "" + c2list.Mapology.zone + "" + c2list.Mapology.percentzone + "Trapper" + c2list.Trapper.number + "" + c2list.Trapper.percent + "" + c2list.Trapper.zone + "" + c2list.Trapper.percentzone + " "; + tooltipText = "
    NameDifficulty%C2Zone%HZE
    Size" + c2list.Size.number + "" + c2list.Size.percent + "" + c2list.Size.zone + "" + c2list.Size.percentzone + "
    Slow" + c2list.Slow.number + "" + c2list.Slow.percent + "" + c2list.Slow.zone + "" + c2list.Slow.percentzone + "
    Watch" + c2list.Watch.number + "" + c2list.Watch.percent + "" + c2list.Watch.zone + "" + c2list.Watch.percentzone + "
    Discipline" + c2list.Discipline.number + "" + c2list.Discipline.percent + "" + c2list.Discipline.zone + "" + c2list.Discipline.percentzone + "
    Balance" + c2list.Balance.number + "" + c2list.Balance.percent + "" + c2list.Balance.zone + "" + c2list.Balance.percentzone + "
    Meditate" + c2list.Meditate.number + "" + c2list.Meditate.percent + "" + c2list.Meditate.zone + "" + c2list.Meditate.percentzone + "
    Metal" + c2list.Metal.number + "" + c2list.Metal.percent + "" + c2list.Metal.zone + "" + c2list.Metal.percentzone + "
    Lead" + c2list.Lead.number + "" + c2list.Lead.percent + "" + c2list.Lead.zone + "" + c2list.Lead.percentzone + "
    Nom" + c2list.Nom.number + "" + c2list.Nom.percent + "" + c2list.Nom.zone + "" + c2list.Nom.percentzone + "
    Electricity" + c2list.Electricity.number + "" + c2list.Electricity.percent + "" + c2list.Electricity.zone + "" + c2list.Electricity.percentzone + "
    Toxicity" + c2list.Toxicity.number + "" + c2list.Toxicity.percent + "" + c2list.Toxicity.zone + "" + c2list.Toxicity.percentzone + "
    Coordinate" + c2list.Coordinate.number + "" + c2list.Coordinate.percent + "" + c2list.Coordinate.zone + "" + c2list.Coordinate.percentzone + "
    Trimp" + c2list.Trimp.number + "" + c2list.Trimp.percent + "" + c2list.Trimp.zone + "" + c2list.Trimp.percentzone + "
    Obliterated" + c2list.Obliterated.number + "" + c2list.Obliterated.percent + "" + c2list.Obliterated.zone + "" + c2list.Obliterated.percentzone + "
    Mapology" + c2list.Mapology.number + "" + c2list.Mapology.percent + "" + c2list.Mapology.zone + "" + c2list.Mapology.percentzone + "
    Trapper" + c2list.Trapper.number + "" + c2list.Trapper.percent + "" + c2list.Trapper.zone + "" + c2list.Trapper.percentzone + "
    Total " + game.global.totalSquaredReward + '%'"
    "; costText = "
    Close
    "; } else if (what == 'ReadSettingsProfiles') { titleText = 'Loading New AutoTrimps Profile...

    Current Settings will be lost'; From 37f19832a2f198ddef4485851e8f2fdee6d9490c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 14:05:24 +0100 Subject: [PATCH 1204/3477] Update import-export.js --- modules/import-export.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/import-export.js b/modules/import-export.js index 370f4de8a..b54a98e5e 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -134,7 +134,7 @@ function ImportExportTooltip(what, event) { var c2list={Size:{number:1,percent:getIndividualSquaredReward('Size')+'%',zone:game.c2.Size,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Slow:{number:2,percent:getIndividualSquaredReward('Slow')+'%',zone:game.c2.Slow,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Watch:{number:3,percent:getIndividualSquaredReward('Watch')+'%',zone:game.c2.Watch,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Discipline:{number:4,percent:getIndividualSquaredReward('Discipline')+'%',zone:game.c2.Discipline,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Balance:{number:5,percent:getIndividualSquaredReward('Balance')+'%',zone:game.c2.Balance,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Meditate:{number:6,percent:getIndividualSquaredReward('Meditate')+'%',zone:game.c2.Meditate,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Metal:{number:7,percent:getIndividualSquaredReward('Metal')+'%',zone:game.c2.Metal,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Lead:{number:8,percent:getIndividualSquaredReward('Lead')+'%',zone:game.c2.Lead,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Nom:{number:9,percent:getIndividualSquaredReward('Nom')+'%',zone:game.c2.Nom,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Electricity:{number:10,percent:getIndividualSquaredReward('Electricity')+'%',zone:game.c2.Electricity,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Toxicity:{number:11,percent:getIndividualSquaredReward('Toxicity')+'%',zone:game.c2.Toxicity,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Coordinate:{number:12,percent:getIndividualSquaredReward('Coordinate')+'%',zone:game.c2.Coordinate,percentzone:(100*(game.c2.Coordinate/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Trimp:{number:13,percent:getIndividualSquaredReward('Trimp')+'%',zone:game.c2.Trimp,percentzone:(100*(game.c2.Trimp/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Obliterated:{number:14,percent:getIndividualSquaredReward('Obliterated')+'%',zone:game.c2.Obliterated,percentzone:(100*(game.c2.Obliterated/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Mapology:{number:15,percent:getIndividualSquaredReward('Mapology')+'%',zone:game.c2.Mapology,percentzone:(100*(game.c2.Mapology/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0},Trapper:{number:16,percent:getIndividualSquaredReward('Trapper')+'%',zone:game.c2.Trapper,percentzone:(100*(game.c2.Trapper/(game.global.highestLevelCleared+1))).toFixed(2)+'%',color:0}}; function c2listcolor(){function a(b,c,d){var e=100*(game.c2[b]/(game.global.highestLevelCleared+1));c2list[b].color=e>=c?"LIMEGREEN":e=d?"GOLD":e" + c2list.Size.percent + "" + c2list.Size.zone + "" + c2list.Size.percentzone + "Slow" + c2list.Slow.number + "" + c2list.Slow.percent + "" + c2list.Slow.zone + "" + c2list.Slow.percentzone + "Watch" + c2list.Watch.number + "" + c2list.Watch.percent + "" + c2list.Watch.zone + "" + c2list.Watch.percentzone + "Discipline" + c2list.Discipline.number + "" + c2list.Discipline.percent + "" + c2list.Discipline.zone + "" + c2list.Discipline.percentzone + "Balance" + c2list.Balance.number + "" + c2list.Balance.percent + "" + c2list.Balance.zone + "" + c2list.Balance.percentzone + "Meditate" + c2list.Meditate.number + "" + c2list.Meditate.percent + "" + c2list.Meditate.zone + "" + c2list.Meditate.percentzone + "Metal" + c2list.Metal.number + "" + c2list.Metal.percent + "" + c2list.Metal.zone + "" + c2list.Metal.percentzone + "Lead" + c2list.Lead.number + "" + c2list.Lead.percent + "" + c2list.Lead.zone + "" + c2list.Lead.percentzone + "Nom" + c2list.Nom.number + "" + c2list.Nom.percent + "" + c2list.Nom.zone + "" + c2list.Nom.percentzone + "Electricity" + c2list.Electricity.number + "" + c2list.Electricity.percent + "" + c2list.Electricity.zone + "" + c2list.Electricity.percentzone + "Toxicity" + c2list.Toxicity.number + "" + c2list.Toxicity.percent + "" + c2list.Toxicity.zone + "" + c2list.Toxicity.percentzone + "Coordinate" + c2list.Coordinate.number + "" + c2list.Coordinate.percent + "" + c2list.Coordinate.zone + "" + c2list.Coordinate.percentzone + "Trimp" + c2list.Trimp.number + "" + c2list.Trimp.percent + "" + c2list.Trimp.zone + "" + c2list.Trimp.percentzone + "Obliterated" + c2list.Obliterated.number + "" + c2list.Obliterated.percent + "" + c2list.Obliterated.zone + "" + c2list.Obliterated.percentzone + "Mapology" + c2list.Mapology.number + "" + c2list.Mapology.percent + "" + c2list.Mapology.zone + "" + c2list.Mapology.percentzone + "Trapper" + c2list.Trapper.number + "" + c2list.Trapper.percent + "" + c2list.Trapper.zone + "" + c2list.Trapper.percentzone + "Total " + game.global.totalSquaredReward + '%'" "; + tooltipText = "
    NameDifficulty%C2Zone%HZE
    Size" + c2list.Size.number + "" + c2list.Size.percent + "" + c2list.Size.zone + "" + c2list.Size.percentzone + "
    Slow" + c2list.Slow.number + "" + c2list.Slow.percent + "" + c2list.Slow.zone + "" + c2list.Slow.percentzone + "
    Watch" + c2list.Watch.number + "" + c2list.Watch.percent + "" + c2list.Watch.zone + "" + c2list.Watch.percentzone + "
    Discipline" + c2list.Discipline.number + "" + c2list.Discipline.percent + "" + c2list.Discipline.zone + "" + c2list.Discipline.percentzone + "
    Balance" + c2list.Balance.number + "" + c2list.Balance.percent + "" + c2list.Balance.zone + "" + c2list.Balance.percentzone + "
    Meditate" + c2list.Meditate.number + "" + c2list.Meditate.percent + "" + c2list.Meditate.zone + "" + c2list.Meditate.percentzone + "
    Metal" + c2list.Metal.number + "" + c2list.Metal.percent + "" + c2list.Metal.zone + "" + c2list.Metal.percentzone + "
    Lead" + c2list.Lead.number + "" + c2list.Lead.percent + "" + c2list.Lead.zone + "" + c2list.Lead.percentzone + "
    Nom" + c2list.Nom.number + "" + c2list.Nom.percent + "" + c2list.Nom.zone + "" + c2list.Nom.percentzone + "
    Electricity" + c2list.Electricity.number + "" + c2list.Electricity.percent + "" + c2list.Electricity.zone + "" + c2list.Electricity.percentzone + "
    Toxicity" + c2list.Toxicity.number + "" + c2list.Toxicity.percent + "" + c2list.Toxicity.zone + "" + c2list.Toxicity.percentzone + "
    Coordinate" + c2list.Coordinate.number + "" + c2list.Coordinate.percent + "" + c2list.Coordinate.zone + "" + c2list.Coordinate.percentzone + "
    Trimp" + c2list.Trimp.number + "" + c2list.Trimp.percent + "" + c2list.Trimp.zone + "" + c2list.Trimp.percentzone + "
    Obliterated" + c2list.Obliterated.number + "" + c2list.Obliterated.percent + "" + c2list.Obliterated.zone + "" + c2list.Obliterated.percentzone + "
    Mapology" + c2list.Mapology.number + "" + c2list.Mapology.percent + "" + c2list.Mapology.zone + "" + c2list.Mapology.percentzone + "
    Trapper" + c2list.Trapper.number + "" + c2list.Trapper.percent + "" + c2list.Trapper.zone + "" + c2list.Trapper.percentzone + "
    Total " + game.global.totalSquaredReward + "%
    "; costText = "

    Close
    "; } else if (what == 'ReadSettingsProfiles') { titleText = 'Loading New AutoTrimps Profile...

    Current Settings will be lost'; From 1b1befbed1128b8985748ab10f17316511602c34 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 18:51:57 +0100 Subject: [PATCH 1205/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index b98b75ead..60146238c 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -99,7 +99,7 @@ var min_zone = getPageSetting('ScryerMinZone'); var max_zone = getPageSetting('ScryerMaxZone'); var valid_min = game.global.world >= min_zone && game.global.world > 60; var valid_max = max_zone <= 0 || game.global.world < max_zone; -if (getPageSetting('UseScryerStance') == true && valid_min && valid_max && getCurrentMapObject().location != "Void" && !(getPageSetting('onlyminmaxworld') == true && game.global.mapsActive)) { +if (getPageSetting('UseScryerStance') == true && valid_min && valid_max && !(getPageSetting('onlyminmaxworld') == true && game.global.mapsActive)) { if (oktoswitch) setFormation(4); wantToScry = true; From f580a5071e97a99c36f8129cf15ccecf5fd4497a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 19:33:47 +0100 Subject: [PATCH 1206/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 9bb4ff8dd..314fbfd22 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -80,7 +80,7 @@ function initializeAllSettings() { //CORE: //Line 1: - createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Auto Gather/Build #2', 'Science Research OFF'], 'Controls what YOU do. Manual does nothing
    The Decision between AutoGather 1 or 2 is up to you, and they should be similar. Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
    You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); + createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Mining/Building Only', 'Science Research OFF'], 'Controls what you gather/build do. Manual does nothing
    Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
    Mining/Building only does exactly what it says. Only use if you are passed the early stages of the game (No longer need to trap, food and wood are useless).
    You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All Upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); createSetting('amalcoord', 'Amal Boost', 'Boost your Amal count for more Mi. Will not buy coords until your H:D ratio is below a certain value. This means that you will get amals quicker. Will not activate higher than your Amal Boost End Zone Setting! ', 'boolean', false, null, "Core"); createSetting('amalcoordhd', 'Amal Boost H:D', 'Set your H:D for Amal Boost here. The higher it is the less coords AT will buy. 0.0000025 is the default. ', 'value', 0.0000025, null, "Core"); From 8d16f099b65c7639d6641b8676848566230763f3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 19:48:43 +0100 Subject: [PATCH 1207/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 5c603a164..34149fa95 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -115,8 +115,8 @@ function mainLoop() { if (getPageSetting('BuyJobsNew')===0); else if (getPageSetting('BuyJobsNew')==1) { workerRatios(); buyJobs(); } else if (getPageSetting('BuyJobsNew')==2) buyJobs(); - if (getPageSetting('ManualGather2')<=1) manualLabor(); - else if (getPageSetting('ManualGather2')==2) manualLabor2(); + if (getPageSetting('ManualGather2')==1) manualLabor2(); + else if (getPageSetting('ManualGather2')==2) autogather3(); getPageSetting('AutoMaps') > 0 ? autoMap() : updateAutoMapsStatus(); if (autoTrimpSettings.AutoPortal.selected != "Off" && game.global.challengeActive != "Daily") autoPortal(); if (getPageSetting('AutoPortalDaily') > 0 && game.global.challengeActive == "Daily") dautoPortal(); From c16945aab9bd9c2261fee10376d3312923b0a2cb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 19:48:56 +0100 Subject: [PATCH 1208/3477] Update gather.js --- modules/gather.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/gather.js b/modules/gather.js index 948f1b4b9..9584ceaab 100644 --- a/modules/gather.js +++ b/modules/gather.js @@ -1,3 +1,7 @@ MODULES.gather={},MODULES.gather.minTraps=100,MODULES.gather.minScienceAmount=100,MODULES.gather.minScienceSeconds=60; -function manualLabor(){if(0!=getPageSetting('ManualGather2')){var a=game.resources.trimps.owned-game.resources.trimps.employed,b=game.buildings.Trap.owned=game.global.world&&5e3>=game.global.totalHeliumEarned&&0==game.global.buildingsQueue.length&&('trimps'!=game.global.playerGathering||0==game.buildings.Trap.owned)&&(!game.triggers.wood.done||10>game.resources.food.owned||Math.floor(game.resources.food.owned)a||f)&&0==game.buildings.Trap.owned&&canAffordBuilding('Trap'))safeBuyBuilding('Trap')||setGather('buildings');else if(g||d&&(5>a||f)&&0game.buildings.Trap.owned&&canAffordBuilding('Trap')?(safeBuyBuilding('Trap'),setGather('buildings')):0game.global.turkimpTimer&&l?setGather('science'):h?setGather('metal'):setGather(j):d&&!0==game.global.trapBuildToggled&&b?setGather('buildings'):setGather(j):h?setGather('metal'):setGather(j)}}} function manualLabor2(){if(0!=getPageSetting('ManualGather2')){var a=game.resources.trimps.owned-game.resources.trimps.employed,b=game.buildings.Trap.owned=game.global.world&&5e3>=game.global.totalHeliumEarned&&0==game.global.buildingsQueue.length&&('trimps'!=game.global.playerGathering||0==game.buildings.Trap.owned))return!game.triggers.wood.done||10>game.resources.food.owned||Math.floor(game.resources.food.owned)a||f||g)&&0==game.buildings.Trap.owned&&canAffordBuilding('Trap'))return void(safeBuyBuilding('Trap')||setGather('buildings'));if(d&&(5>a||f||g)&&0game.global.turkimpTimer)&&3!=getPageSetting('ManualGather2'))return void setGather('science');if(game.resources.science.owned Date: Thu, 6 Sep 2018 19:53:38 +0100 Subject: [PATCH 1209/3477] Update gather.js --- modules/gather.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gather.js b/modules/gather.js index 9584ceaab..b3250165f 100644 --- a/modules/gather.js +++ b/modules/gather.js @@ -2,6 +2,6 @@ MODULES.gather={},MODULES.gather.minTraps=100,MODULES.gather.minScienceAmount=10 function manualLabor2(){if(0!=getPageSetting('ManualGather2')){var a=game.resources.trimps.owned-game.resources.trimps.employed,b=game.buildings.Trap.owned=game.global.world&&5e3>=game.global.totalHeliumEarned&&0==game.global.buildingsQueue.length&&('trimps'!=game.global.playerGathering||0==game.buildings.Trap.owned))return!game.triggers.wood.done||10>game.resources.food.owned||Math.floor(game.resources.food.owned)a||f||g)&&0==game.buildings.Trap.owned&&canAffordBuilding('Trap'))return void(safeBuyBuilding('Trap')||setGather('buildings'));if(d&&(5>a||f||g)&&0game.global.turkimpTimer)&&3!=getPageSetting('ManualGather2'))return void setGather('science');if(game.resources.science.owned 0 && game.global.playerGathering != 'buildings') setGather('buildings') else if (game.global.playerGathering != 'metal') setGather('metal'); } From 60d87fec6044dbde72309ed222d85329c3dd5ad6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 19:59:31 +0100 Subject: [PATCH 1210/3477] Update gather.js --- modules/gather.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gather.js b/modules/gather.js index b3250165f..b56656d61 100644 --- a/modules/gather.js +++ b/modules/gather.js @@ -2,6 +2,6 @@ MODULES.gather={},MODULES.gather.minTraps=100,MODULES.gather.minScienceAmount=10 function manualLabor2(){if(0!=getPageSetting('ManualGather2')){var a=game.resources.trimps.owned-game.resources.trimps.employed,b=game.buildings.Trap.owned=game.global.world&&5e3>=game.global.totalHeliumEarned&&0==game.global.buildingsQueue.length&&('trimps'!=game.global.playerGathering||0==game.buildings.Trap.owned))return!game.triggers.wood.done||10>game.resources.food.owned||Math.floor(game.resources.food.owned)a||f||g)&&0==game.buildings.Trap.owned&&canAffordBuilding('Trap'))return void(safeBuyBuilding('Trap')||setGather('buildings'));if(d&&(5>a||f||g)&&0game.global.turkimpTimer)&&3!=getPageSetting('ManualGather2'))return void setGather('science');if(game.resources.science.owned 0 && game.global.playerGathering != 'buildings') setGather('buildings') -else if (game.global.playerGathering != 'metal') setGather('metal'); +if (game.global.buildingsQueue.length == 0 && game.global.playerGathering != 'metal') setGather('metal'); +else if (game.global.playerGathering != 'buildings') setGather('buildings') } From edf10da82839befeb35ea89f2307915cf25be6ec Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 20:01:56 +0100 Subject: [PATCH 1211/3477] Update gather.js --- modules/gather.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gather.js b/modules/gather.js index b56656d61..c7f5da4b6 100644 --- a/modules/gather.js +++ b/modules/gather.js @@ -2,6 +2,6 @@ MODULES.gather={},MODULES.gather.minTraps=100,MODULES.gather.minScienceAmount=10 function manualLabor2(){if(0!=getPageSetting('ManualGather2')){var a=game.resources.trimps.owned-game.resources.trimps.employed,b=game.buildings.Trap.owned=game.global.world&&5e3>=game.global.totalHeliumEarned&&0==game.global.buildingsQueue.length&&('trimps'!=game.global.playerGathering||0==game.buildings.Trap.owned))return!game.triggers.wood.done||10>game.resources.food.owned||Math.floor(game.resources.food.owned)a||f||g)&&0==game.buildings.Trap.owned&&canAffordBuilding('Trap'))return void(safeBuyBuilding('Trap')||setGather('buildings'));if(d&&(5>a||f||g)&&0game.global.turkimpTimer)&&3!=getPageSetting('ManualGather2'))return void setGather('science');if(game.resources.science.owned Date: Thu, 6 Sep 2018 20:03:25 +0100 Subject: [PATCH 1212/3477] Update gather.js --- modules/gather.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gather.js b/modules/gather.js index c7f5da4b6..267852086 100644 --- a/modules/gather.js +++ b/modules/gather.js @@ -2,6 +2,6 @@ MODULES.gather={},MODULES.gather.minTraps=100,MODULES.gather.minScienceAmount=10 function manualLabor2(){if(0!=getPageSetting('ManualGather2')){var a=game.resources.trimps.owned-game.resources.trimps.employed,b=game.buildings.Trap.owned=game.global.world&&5e3>=game.global.totalHeliumEarned&&0==game.global.buildingsQueue.length&&('trimps'!=game.global.playerGathering||0==game.buildings.Trap.owned))return!game.triggers.wood.done||10>game.resources.food.owned||Math.floor(game.resources.food.owned)a||f||g)&&0==game.buildings.Trap.owned&&canAffordBuilding('Trap'))return void(safeBuyBuilding('Trap')||setGather('buildings'));if(d&&(5>a||f||g)&&0game.global.turkimpTimer)&&3!=getPageSetting('ManualGather2'))return void setGather('science');if(game.resources.science.owned Date: Thu, 6 Sep 2018 20:18:31 +0100 Subject: [PATCH 1213/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 60146238c..be3c264d5 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -15,7 +15,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) && (getPageSetting('UseScryerStance') == false && getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('UseScryerStance') == false && getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); - use_scry = use_scry || ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); + use_scry = use_scry || (!game.global.mapsActive && (getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never var curEnemy = getCurrentEnemy(1); From f91a625e6d20ccaa255adc38870e83bc1adacc87 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 6 Sep 2018 20:24:08 +0100 Subject: [PATCH 1214/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 34149fa95..431b22747 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -15,11 +15,12 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "05/09/2018", version: "v2.7.0", description: "4.9 Here we go! Added the new Classy perk to Autoperks, along with updated ratios. Added an option in Buildings & Jobs to hide obsolete settings once you have unlocked certain masteries. Fixed Scryer. Added an option to Scry VMs without having to enable scrying. Added B instead of S for WS. ", isNew: true}); +changelogList.push({date: "06/09/2018", version: "v2.7.1", description: "4.901 Scryer Stuff actually works now, neat. Replaced one of the autogather options with a new more efficient option for late game. Fight always got an upgrade. Thanks for using the fork in 4.9(01)! ", isNew: true}); +changelogList.push({date: "05/09/2018", version: "v2.7.0", description: "4.9 Here we go! Added the new Classy perk to Autoperks, along with updated ratios. Added an option in Buildings & Jobs to hide obsolete settings once you have unlocked certain masteries. Fixed Scryer. Added an option to Scry VMs without having to enable scrying. Added B instead of S for WS. ", isNew: false}); changelogList.push({date: "03/09/2018", version: "v2.6.5", description: "Pre-pre-4.9 update. Check out the C2 Tab! And theres some more tiny optimizations too. ", isNew: false}); changelogList.push({date: "02/09/2018", version: "v2.6.4", description: "Pre-4.9 update. Revamped the Daily Autoportal settings, so make sure to check it! And sust some small optimizations here and there. I have changed some settings names such as AS3, check em out. Also just a quick thank you to anyone who uses my fork, its nice to know something I have made is actually being used haha. Please report any problems to me! ", isNew: false}); changelogList.push({date: "22/08/2018", version: "v2.6.3", description: "Disable Farming is now controllable, so make sure to set it! Added Magic Armor option to Dailys/C2s. Changed the Daily Fight Always button, check it! The Daily tab is getting really fat now, oh well lol. ", isNew: false}); -changelogList.push({date: "21/08/2018", version: "v2.6.2", description: "Amal Boost can now be controlled. Disable Farming now has a more intuitive layout, so make sure to set it. You can also mess with Scryer Min/Max Zones better. Some new WS options to be added later. ", isNew: false}); +//changelogList.push({date: "21/08/2018", version: "v2.6.2", description: "Amal Boost can now be controlled. Disable Farming now has a more intuitive layout, so make sure to set it. You can also mess with Scryer Min/Max Zones better. Some new WS options to be added later. ", isNew: false}); //changelogList.push({date: "19/08/2018", version: "v2.6.1", description: "Windstacking now has its own tab. Added Ultimate Windstacking. There may be some other tweaks that I\'ve forgot about, but have fun experimenting! ", isNew: false}); function assembleChangelog(a,b,c,d){return d?`${a} ${b} New: ${c}
    `:`${a} ${b} ${c}
    `} From a1f299452df753511db1c894c9048a359c2942ab Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 7 Sep 2018 11:13:42 +0100 Subject: [PATCH 1215/3477] Update other.js --- modules/other.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0104bcb6e..24bc602f7 100644 --- a/modules/other.js +++ b/modules/other.js @@ -417,15 +417,14 @@ function BWraiding() { } function lootdump() { -if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpa') > 0 && getPageSetting('lootdumpz') > 0) { +if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpz') > 0) { viewPortalUpgrades(); - game.global.lastCustomAmt = getPageSetting('lootdumpa'); - numTab(5, true); - if (getPortalUpgradePrice("Looting_II")+game.resources.helium.totalSpentTemp <= game.resources.helium.respecMax) { + if (game.global.viewingUpgrades) { + numTab(6, true) buyPortalUpgrade('Looting_II'); activateClicked(); cancelPortal(); - debug('Bought ' + getPageSetting('lootdumpa') + ' Looting II'); + debug('Bought Max Looting II'); } else { perked = true; From 0d12ec7aac5bf3505fbb16ce60608f9c7db50c7d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 7 Sep 2018 11:32:17 +0100 Subject: [PATCH 1216/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 431b22747..3a2cf8ee0 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -91,7 +91,7 @@ function mainLoop() { if (getPageSetting('ForceAbandon')==true || getPageSetting('fuckanti')) trimpcide(); if (getPageSetting('AutoAllocatePerks')==2) lootdump(); if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1 && getDailyHeliumValue(countDailyWeight()) >= getPageSetting('buyheliumy') && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) purchaseSingleRunBonus('heliumy'); - if ((getPageSetting('fightforever')==0 || getPageSetting('fightforever') > 0 && HDratioy() <= getPageSetting('fightforever')) || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) || (getPageSetting('dfightforever') == 1 && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) || (getPageSetting('dfightforever') == 2 && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined'))) fightalways(); + if ((getPageSetting('fightforever')==0) || (getPageSetting('fightforever') > 0 && HDratioy() <= getPageSetting('fightforever')) || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) || (getPageSetting('dfightforever') == 1 && game.global.challengeActive == "Daily" && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) || (getPageSetting('dfightforever') == 2 && game.global.challengeActive == "Daily" && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined'))) fightalways(); if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); From 898c1985172fab52006a82142a3faebeb0a34d69 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 7 Sep 2018 11:33:20 +0100 Subject: [PATCH 1217/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 - 1 file changed, 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 314fbfd22..3bbbec4b5 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -88,7 +88,6 @@ function initializeAllSettings() { createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); createSetting('fastallocate', 'Fast Allocate', 'Turn on if your helium is above 500Qa. Not recommended for low amounts of helium. ', 'boolean', false, null, 'Core'); createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Core'); - createSetting('lootdumpa', 'Loot Dump Amount', 'What amount of helium to dump into Looting II. E.g; 1000, will purchase 1000 levels of looting II until you can no longer afford to.', 'value', -1, null, 'Core'); //Line 2 createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); From c2480cd71ba5ea01e9d62459354cbc73951cf68d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 7 Sep 2018 11:40:37 +0100 Subject: [PATCH 1218/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 24bc602f7..a03d83dc2 100644 --- a/modules/other.js +++ b/modules/other.js @@ -419,8 +419,8 @@ function BWraiding() { function lootdump() { if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpz') > 0) { viewPortalUpgrades(); - if (game.global.viewingUpgrades) { - numTab(6, true) + if (game.global.viewingUpgrades && getPortalUpgradePrice("Looting_II")+game.resources.helium.totalSpentTemp <= game.resources.helium.respecMax) { + numTab(6, true) buyPortalUpgrade('Looting_II'); activateClicked(); cancelPortal(); From 48623da8753b5adc79e0268e552bccdb1d7dd265 Mon Sep 17 00:00:00 2001 From: Will Davies Date: Fri, 7 Sep 2018 12:17:30 +0100 Subject: [PATCH 1219/3477] Tidying up scryer.js --- .gitignore | 1 + modules/scryer.js | 159 +++++++++++++++++++++++++++------------------- 2 files changed, 94 insertions(+), 66 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..9f11b755a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ diff --git a/modules/scryer.js b/modules/scryer.js index be3c264d5..62d7a0829 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,112 +1,139 @@ -var wantToScry = false; +let wantToScry = false; + function useScryerStance() { - - var AutoStance = getPageSetting('AutoStance'); - function autostancefunction() { - if (AutoStance==1) autoStance(); - else if (AutoStance==2) autoStance2(); - else if (AutoStance==3) autoStance3(); + + const AutoStance = getPageSetting('AutoStance'); + + function autostancefunction() { + if (AutoStance === 1) autoStance(); + else if (AutoStance === 2) autoStance2(); + else if (AutoStance === 3) autoStance3(); } //Never -var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; + let use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; - use_scry = use_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"); - use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) && (getPageSetting('UseScryerStance') == false && getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('UseScryerStance') == false && getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); - use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); - use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); - use_scry = use_scry || (!game.global.mapsActive && (getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); + let useScryerEnabled = getPageSetting('UseScryerStance') === true; + let onMapsScreen = game.global.mapsActive; + use_scry = use_scry || (useScryerEnabled && onMapsScreen && getPageSetting('ScryerUseinMaps2') === 0 && getCurrentMapObject().location !== "Void"); + let onVoidMap = getCurrentMapObject().location === "Void"; + let inDaily = game.global.challengeActive === "Daily"; + let scryInDaily = getPageSetting('dscryvoidmaps'); + use_scry = use_scry || (onMapsScreen && onVoidMap && ((getPageSetting('ScryerUseinVoidMaps2') === 0) && (getPageSetting('UseScryerStance') === false && getPageSetting('scryvoidmaps') === false && game.global.challengeActive !== "Daily") || (getPageSetting('UseScryerStance') === false && scryInDaily === false && inDaily))); + use_scry = use_scry || (!onMapsScreen && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') === 0); + use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') === 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell === 98) || (getPageSetting('ScryerSkipBoss2') === 0 && game.global.lastClearedCell === 98); + let isPoisonZone = getEmpowerment() === "Poison"; + let scryInPoisonEnabled = 0 <= getPageSetting('ScryUseinPoison'); + let isWindZone = getEmpowerment() === "Wind"; + let scryInWindEnabled = 0 <= getPageSetting('ScryUseinWind'); + let isIceZone = getEmpowerment() === "Ice"; + let scryInIceEnabled = 0 <= getPageSetting('ScryUseinIce'); + use_scry = use_scry || (!onMapsScreen && (isPoisonZone && scryInPoisonEnabled && (game.global.world < getPageSetting('ScryUseinPoison'))) || (isWindZone && scryInWindEnabled && (game.global.world < getPageSetting('ScryUseinWind'))) || (isIceZone && scryInIceEnabled && (game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never - var curEnemy = getCurrentEnemy(1); - var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; - iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Magma.active()); - iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); - if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_scry))) { + const curEnemy = getCurrentEnemy(1); + let iscorrupt = curEnemy && curEnemy.mutation === "Corruption"; + iscorrupt = iscorrupt || (onMapsScreen && mutations.Magma.active()); + iscorrupt = iscorrupt || (onMapsScreen && onVoidMap && game.global.world >= mutations.Corruption.start()); + if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') === 0 || (use_scry))) { autostancefunction(); wantToScry = false; return; } //check Healthy never - var curEnemyhealth = getCurrentEnemy(1); - var ishealthy = curEnemyhealth && curEnemyhealth.mutation == "Healthy"; - ishealthy = ishealthy || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); - if ((ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (use_scry))) { + const curEnemyhealth = getCurrentEnemy(1); + let ishealthy = curEnemyhealth && curEnemyhealth.mutation === "Healthy"; + ishealthy = ishealthy || (onMapsScreen && onVoidMap && game.global.world >= mutations.Corruption.start()); + let scryerDoHealthy = getPageSetting('ScryerSkipHealthy') === 0; + if ((ishealthy && scryerDoHealthy || (use_scry))) { autostancefunction(); wantToScry = false; return; } //Force -var use_scryer = use_scryer || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1); - use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 1) || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))); - use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); - use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world >= getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world >= getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce'))))); - + let scryInMapsForce = getPageSetting('ScryerUseinMaps2') === 1; + let vmScryerEnabled = getPageSetting('scryvoidmaps') === true; + let scryinVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; + let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; + + let aboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); + let aboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); + let aboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); + + let use_scryer = use_scryer || (useScryerEnabled && onMapsScreen && scryInMapsForce); + use_scryer = use_scryer || (onMapsScreen && onVoidMap && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (scryInDaily === true && inDaily))); + use_scryer = use_scryer || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); + + let willScryForNature = (!onMapsScreen && useScryerEnabled && ((isPoisonZone && scryInPoisonEnabled && (aboveScryInPoisonZone)) + || (isWindZone && scryInWindEnabled && (aboveScryInWindZone)) + || (isIceZone && scryInIceEnabled && (aboveScryInIceZone)))); + use_scryer = use_scryer || willScryForNature; + //check Corrupted Force - if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 1 && getPageSetting('UseScryerStance') == true) || (use_scryer)) { + if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') === 1 && useScryerEnabled) || (use_scryer)) { setFormation(4); wantToScry = true; return; } //check healthy force - if ((ishealthy && getPageSetting('ScryerSkipHealthy') == 1 && getPageSetting('UseScryerStance') == true) || (use_scryer)) { + if ((ishealthy && getPageSetting('ScryerSkipHealthy') === 1 && useScryerEnabled) || (use_scryer)) { setFormation(4); wantToScry = true; return; } //Calc Damage -if (AutoStance==1) - calcBaseDamageinX(); -else if (AutoStance>=2) - calcBaseDamageinX2(); + if (AutoStance === 1) + calcBaseDamageinX(); + else if (AutoStance >= 2) + calcBaseDamageinX2(); //Suicide to Scry -var missingHealth = game.global.soldierHealthMax - game.global.soldierHealth; -var newSquadRdy = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; -var oktoswitch = true; -var die = (getPageSetting('ScryerDieZ') != -1 && getPageSetting('ScryerDieZ') <= game.global.world) ; -var willSuicide = getPageSetting('ScryerDieZ'); + const missingHealth = game.global.soldierHealthMax - game.global.soldierHealth; + const newSquadRdy = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; + let oktoswitch = true; + let die = (getPageSetting('ScryerDieZ') !== -1 && getPageSetting('ScryerDieZ') <= game.global.world); + const willSuicide = getPageSetting('ScryerDieZ'); if (die && willSuicide >= 0) { var [dieZ, dieC] = willSuicide.toString().split("."); - if (dieC && dieC.length == 1) dieC = dieC + "0"; + if (dieC && dieC.length === 1) dieC = dieC + "0"; die = game.global.world >= dieZ && (!dieC || (game.global.lastClearedCell + 1 >= dieC)); } - if (game.global.formation == 0 || game.global.formation == 1) + if (game.global.formation === 0 || game.global.formation === 1) oktoswitch = die || newSquadRdy || (missingHealth < (baseHealth / 2)); //Overkill -var useoverkill = getPageSetting('ScryerUseWhenOverkill'); -if (useoverkill && game.portal.Overkill.level == 0) - setPageSetting('ScryerUseWhenOverkill', false); -if (useoverkill && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')==0) - useoverkill = false; -if (useoverkill && game.portal.Overkill.level > 0 && getPageSetting('UseScryerStance') == true) { - var minDamage = calcOurDmg("min",false,true); - var Sstance = 0.5; - var ovkldmg = minDamage * Sstance * (game.portal.Overkill.level*0.005); - var ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; - if (ovklHDratio < 2) { - if (oktoswitch) - setFormation(4); + let useoverkill = getPageSetting('ScryerUseWhenOverkill'); + if (useoverkill && game.portal.Overkill.level === 0) + setPageSetting('ScryerUseWhenOverkill', false); + if (useoverkill && !onMapsScreen && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') === 0) + useoverkill = false; + if (useoverkill && game.portal.Overkill.level > 0 && useScryerEnabled) { + const minDamage = calcOurDmg("min", false, true); + const Sstance = 0.5; + const ovkldmg = minDamage * Sstance * (game.portal.Overkill.level * 0.005); + const ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; + if (ovklHDratio < 2) { + if (oktoswitch) + setFormation(4); return; } } //Default -var min_zone = getPageSetting('ScryerMinZone'); -var max_zone = getPageSetting('ScryerMaxZone'); -var valid_min = game.global.world >= min_zone && game.global.world > 60; -var valid_max = max_zone <= 0 || game.global.world < max_zone; -if (getPageSetting('UseScryerStance') == true && valid_min && valid_max && !(getPageSetting('onlyminmaxworld') == true && game.global.mapsActive)) { - if (oktoswitch) - setFormation(4); - wantToScry = true; - } -else { - autostancefunction(); - wantToScry = false; - return; + const min_zone = getPageSetting('ScryerMinZone'); + const max_zone = getPageSetting('ScryerMaxZone'); + const valid_min = game.global.world >= min_zone && game.global.world > 60; + const valid_max = max_zone <= 0 || game.global.world < max_zone; + if (useScryerEnabled && valid_min && valid_max && !(getPageSetting('onlyminmaxworld') === true && onMapsScreen)) { + if (oktoswitch) + setFormation(4); + wantToScry = true; + } + else { + autostancefunction(); + wantToScry = false; + } } From 48b990f64973ce9170f7e6e87bd8c49ac675f22b Mon Sep 17 00:00:00 2001 From: Will Davies Date: Fri, 7 Sep 2018 12:32:54 +0100 Subject: [PATCH 1220/3477] Reorganised some assignments --- modules/scryer.js | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 62d7a0829..96ba6a96a 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -3,32 +3,31 @@ let wantToScry = false; function useScryerStance() { const AutoStance = getPageSetting('AutoStance'); + const useScryerEnabled = getPageSetting('UseScryerStance') === true; + const onMapsScreen = game.global.mapsActive; + const onVoidMap = getCurrentMapObject().location === "Void"; + const inDaily = game.global.challengeActive === "Daily"; + const scryInDaily = getPageSetting('dscryvoidmaps'); + const inPoisonZone = getEmpowerment() === "Poison"; + const inWindZone = getEmpowerment() === "Wind"; + const inIceZone = getEmpowerment() === "Ice"; + const scryInPoisonEnabled = 0 <= getPageSetting('ScryUseinPoison'); + const scryInWindEnabled = 0 <= getPageSetting('ScryUseinWind'); + const scryInIceEnabled = 0 <= getPageSetting('ScryUseinIce'); function autostancefunction() { if (AutoStance === 1) autoStance(); else if (AutoStance === 2) autoStance2(); else if (AutoStance === 3) autoStance3(); } - //Never let use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; - let useScryerEnabled = getPageSetting('UseScryerStance') === true; - let onMapsScreen = game.global.mapsActive; use_scry = use_scry || (useScryerEnabled && onMapsScreen && getPageSetting('ScryerUseinMaps2') === 0 && getCurrentMapObject().location !== "Void"); - let onVoidMap = getCurrentMapObject().location === "Void"; - let inDaily = game.global.challengeActive === "Daily"; - let scryInDaily = getPageSetting('dscryvoidmaps'); use_scry = use_scry || (onMapsScreen && onVoidMap && ((getPageSetting('ScryerUseinVoidMaps2') === 0) && (getPageSetting('UseScryerStance') === false && getPageSetting('scryvoidmaps') === false && game.global.challengeActive !== "Daily") || (getPageSetting('UseScryerStance') === false && scryInDaily === false && inDaily))); use_scry = use_scry || (!onMapsScreen && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') === 0); use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') === 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell === 98) || (getPageSetting('ScryerSkipBoss2') === 0 && game.global.lastClearedCell === 98); - let isPoisonZone = getEmpowerment() === "Poison"; - let scryInPoisonEnabled = 0 <= getPageSetting('ScryUseinPoison'); - let isWindZone = getEmpowerment() === "Wind"; - let scryInWindEnabled = 0 <= getPageSetting('ScryUseinWind'); - let isIceZone = getEmpowerment() === "Ice"; - let scryInIceEnabled = 0 <= getPageSetting('ScryUseinIce'); - use_scry = use_scry || (!onMapsScreen && (isPoisonZone && scryInPoisonEnabled && (game.global.world < getPageSetting('ScryUseinPoison'))) || (isWindZone && scryInWindEnabled && (game.global.world < getPageSetting('ScryUseinWind'))) || (isIceZone && scryInIceEnabled && (game.global.world < getPageSetting('ScryUseinIce')))); + use_scry = use_scry || (!onMapsScreen && (inPoisonZone && scryInPoisonEnabled && (game.global.world < getPageSetting('ScryUseinPoison'))) || (inWindZone && scryInWindEnabled && (game.global.world < getPageSetting('ScryUseinWind'))) || (inIceZone && scryInIceEnabled && (game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never const curEnemy = getCurrentEnemy(1); @@ -65,9 +64,9 @@ function useScryerStance() { use_scryer = use_scryer || (onMapsScreen && onVoidMap && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (scryInDaily === true && inDaily))); use_scryer = use_scryer || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); - let willScryForNature = (!onMapsScreen && useScryerEnabled && ((isPoisonZone && scryInPoisonEnabled && (aboveScryInPoisonZone)) - || (isWindZone && scryInWindEnabled && (aboveScryInWindZone)) - || (isIceZone && scryInIceEnabled && (aboveScryInIceZone)))); + let willScryForNature = (!onMapsScreen && useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (aboveScryInPoisonZone)) + || (inWindZone && scryInWindEnabled && (aboveScryInWindZone)) + || (inIceZone && scryInIceEnabled && (aboveScryInIceZone)))); use_scryer = use_scryer || willScryForNature; //check Corrupted Force From 804570f4b2e0de7113d7a9f5943cfbaf624ec0b2 Mon Sep 17 00:00:00 2001 From: Will Davies Date: Fri, 7 Sep 2018 13:33:43 +0100 Subject: [PATCH 1221/3477] More factoring in scryer.js --- modules/scryer.js | 52 +++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 96ba6a96a..3e2a5cbbf 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -7,33 +7,54 @@ function useScryerStance() { const onMapsScreen = game.global.mapsActive; const onVoidMap = getCurrentMapObject().location === "Void"; const inDaily = game.global.challengeActive === "Daily"; - const scryInDaily = getPageSetting('dscryvoidmaps'); + const dailyScryInVoid = getPageSetting('dscryvoidmaps') === true; const inPoisonZone = getEmpowerment() === "Poison"; const inWindZone = getEmpowerment() === "Wind"; const inIceZone = getEmpowerment() === "Ice"; + const scryInPoisonEnabled = 0 <= getPageSetting('ScryUseinPoison'); const scryInWindEnabled = 0 <= getPageSetting('ScryUseinWind'); const scryInIceEnabled = 0 <= getPageSetting('ScryUseinIce'); + const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); + const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); + const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); function autostancefunction() { if (AutoStance === 1) autoStance(); else if (AutoStance === 2) autoStance2(); else if (AutoStance === 3) autoStance3(); } + //Never let use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; - use_scry = use_scry || (useScryerEnabled && onMapsScreen && getPageSetting('ScryerUseinMaps2') === 0 && getCurrentMapObject().location !== "Void"); - use_scry = use_scry || (onMapsScreen && onVoidMap && ((getPageSetting('ScryerUseinVoidMaps2') === 0) && (getPageSetting('UseScryerStance') === false && getPageSetting('scryvoidmaps') === false && game.global.challengeActive !== "Daily") || (getPageSetting('UseScryerStance') === false && scryInDaily === false && inDaily))); - use_scry = use_scry || (!onMapsScreen && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') === 0); - use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') === 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell === 98) || (getPageSetting('ScryerSkipBoss2') === 0 && game.global.lastClearedCell === 98); - use_scry = use_scry || (!onMapsScreen && (inPoisonZone && scryInPoisonEnabled && (game.global.world < getPageSetting('ScryUseinPoison'))) || (inWindZone && scryInWindEnabled && (game.global.world < getPageSetting('ScryUseinWind'))) || (inIceZone && scryInIceEnabled && (game.global.world < getPageSetting('ScryUseinIce')))); + + let vmScryerEnabled = getPageSetting('scryvoidmaps') === true; + let scryInMapsNever = getPageSetting('ScryerUseinMaps2') === 0; + let scryInVoidNever = getPageSetting('ScryerUseinVoidMaps2') === 0; + let scryInSpireNever = getPageSetting('ScryerUseinSpire2') === 0; + + let inVoidOnMapsScreen = onMapsScreen && onVoidMap; + + use_scry = use_scry || (useScryerEnabled && onMapsScreen && scryInMapsNever && !onVoidMap); + use_scry = use_scry || (inVoidOnMapsScreen && (scryInVoidNever && (!useScryerEnabled && !vmScryerEnabled && !inDaily) || (!useScryerEnabled && !dailyScryInVoid && inDaily))); + use_scry = use_scry || (!onMapsScreen && isActiveSpireAT() && scryInSpireNever); + + let scryOnBossNeverAboveVoid = getPageSetting('ScryerSkipBoss2') === 1; + let currentZoneBelowVMZone = game.global.world < getPageSetting('VoidMaps'); + let scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; + let onBossCell = game.global.lastClearedCell === 98; + + use_scry = use_scry || (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); + use_scry = use_scry || (!onMapsScreen && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) + || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) + || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); //check Corrupted Never const curEnemy = getCurrentEnemy(1); let iscorrupt = curEnemy && curEnemy.mutation === "Corruption"; iscorrupt = iscorrupt || (onMapsScreen && mutations.Magma.active()); - iscorrupt = iscorrupt || (onMapsScreen && onVoidMap && game.global.world >= mutations.Corruption.start()); + iscorrupt = iscorrupt || (inVoidOnMapsScreen && game.global.world >= mutations.Corruption.start()); if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') === 0 || (use_scry))) { autostancefunction(); wantToScry = false; @@ -42,7 +63,7 @@ function useScryerStance() { //check Healthy never const curEnemyhealth = getCurrentEnemy(1); let ishealthy = curEnemyhealth && curEnemyhealth.mutation === "Healthy"; - ishealthy = ishealthy || (onMapsScreen && onVoidMap && game.global.world >= mutations.Corruption.start()); + ishealthy = ishealthy || (inVoidOnMapsScreen && game.global.world >= mutations.Corruption.start()); let scryerDoHealthy = getPageSetting('ScryerSkipHealthy') === 0; if ((ishealthy && scryerDoHealthy || (use_scry))) { autostancefunction(); @@ -52,21 +73,16 @@ function useScryerStance() { //Force let scryInMapsForce = getPageSetting('ScryerUseinMaps2') === 1; - let vmScryerEnabled = getPageSetting('scryvoidmaps') === true; let scryinVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; - let aboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); - let aboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); - let aboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); - let use_scryer = use_scryer || (useScryerEnabled && onMapsScreen && scryInMapsForce); - use_scryer = use_scryer || (onMapsScreen && onVoidMap && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (scryInDaily === true && inDaily))); + use_scryer = use_scryer || (inVoidOnMapsScreen && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); use_scryer = use_scryer || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); - let willScryForNature = (!onMapsScreen && useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (aboveScryInPoisonZone)) - || (inWindZone && scryInWindEnabled && (aboveScryInWindZone)) - || (inIceZone && scryInIceEnabled && (aboveScryInIceZone)))); + let willScryForNature = (!onMapsScreen && useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) + || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) + || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); use_scryer = use_scryer || willScryForNature; //check Corrupted Force @@ -106,7 +122,7 @@ function useScryerStance() { let useoverkill = getPageSetting('ScryerUseWhenOverkill'); if (useoverkill && game.portal.Overkill.level === 0) setPageSetting('ScryerUseWhenOverkill', false); - if (useoverkill && !onMapsScreen && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') === 0) + if (useoverkill && !onMapsScreen && isActiveSpireAT() && scryInSpireNever) useoverkill = false; if (useoverkill && game.portal.Overkill.level > 0 && useScryerEnabled) { const minDamage = calcOurDmg("min", false, true); From 7745c2cc9d2bd66cfd71fc86d755abbc71e8a86a Mon Sep 17 00:00:00 2001 From: Will Davies Date: Fri, 7 Sep 2018 14:27:52 +0100 Subject: [PATCH 1222/3477] Changed some lets to consts --- modules/scryer.js | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 3e2a5cbbf..4c1e6edfb 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -29,21 +29,21 @@ function useScryerStance() { let use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; - let vmScryerEnabled = getPageSetting('scryvoidmaps') === true; - let scryInMapsNever = getPageSetting('ScryerUseinMaps2') === 0; - let scryInVoidNever = getPageSetting('ScryerUseinVoidMaps2') === 0; - let scryInSpireNever = getPageSetting('ScryerUseinSpire2') === 0; + const vmScryerEnabled = getPageSetting('scryvoidmaps') === true; + const scryInMapsNever = getPageSetting('ScryerUseinMaps2') === 0; + const scryInVoidNever = getPageSetting('ScryerUseinVoidMaps2') === 0; + const scryInSpireNever = getPageSetting('ScryerUseinSpire2') === 0; - let inVoidOnMapsScreen = onMapsScreen && onVoidMap; + const inVoidOnMapsScreen = onMapsScreen && onVoidMap; use_scry = use_scry || (useScryerEnabled && onMapsScreen && scryInMapsNever && !onVoidMap); use_scry = use_scry || (inVoidOnMapsScreen && (scryInVoidNever && (!useScryerEnabled && !vmScryerEnabled && !inDaily) || (!useScryerEnabled && !dailyScryInVoid && inDaily))); use_scry = use_scry || (!onMapsScreen && isActiveSpireAT() && scryInSpireNever); - let scryOnBossNeverAboveVoid = getPageSetting('ScryerSkipBoss2') === 1; - let currentZoneBelowVMZone = game.global.world < getPageSetting('VoidMaps'); - let scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; - let onBossCell = game.global.lastClearedCell === 98; + const scryOnBossNeverAboveVoid = getPageSetting('ScryerSkipBoss2') === 1; + const currentZoneBelowVMZone = game.global.world < getPageSetting('VoidMaps'); + const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; + const onBossCell = game.global.lastClearedCell === 98; use_scry = use_scry || (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); use_scry = use_scry || (!onMapsScreen && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) @@ -51,11 +51,14 @@ function useScryerStance() { || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); //check Corrupted Never - const curEnemy = getCurrentEnemy(1); - let iscorrupt = curEnemy && curEnemy.mutation === "Corruption"; - iscorrupt = iscorrupt || (onMapsScreen && mutations.Magma.active()); - iscorrupt = iscorrupt || (inVoidOnMapsScreen && game.global.world >= mutations.Corruption.start()); - if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') === 0 || (use_scry))) { + const currentEnemy = getCurrentEnemy(1); + const isMagamaCell = mutations.Magma.active(); + const corruptionStartZone = mutations.Corruption.start(); + + let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; + isCorruptedCell = isCorruptedCell || (onMapsScreen && isMagamaCell); + isCorruptedCell = isCorruptedCell || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); + if ((isCorruptedCell && getPageSetting('ScryerSkipCorrupteds2') === 0 || (use_scry))) { autostancefunction(); wantToScry = false; return; @@ -63,7 +66,7 @@ function useScryerStance() { //check Healthy never const curEnemyhealth = getCurrentEnemy(1); let ishealthy = curEnemyhealth && curEnemyhealth.mutation === "Healthy"; - ishealthy = ishealthy || (inVoidOnMapsScreen && game.global.world >= mutations.Corruption.start()); + ishealthy = ishealthy || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); let scryerDoHealthy = getPageSetting('ScryerSkipHealthy') === 0; if ((ishealthy && scryerDoHealthy || (use_scry))) { autostancefunction(); @@ -86,7 +89,7 @@ function useScryerStance() { use_scryer = use_scryer || willScryForNature; //check Corrupted Force - if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') === 1 && useScryerEnabled) || (use_scryer)) { + if ((isCorruptedCell && getPageSetting('ScryerSkipCorrupteds2') === 1 && useScryerEnabled) || (use_scryer)) { setFormation(4); wantToScry = true; return; From c43fe2991136615ad8640b3bd640c20376ea2f0c Mon Sep 17 00:00:00 2001 From: Will Davies Date: Fri, 7 Sep 2018 14:47:03 +0100 Subject: [PATCH 1223/3477] First pass of refactoring done, ready to be merged in --- modules/scryer.js | 71 +++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 27 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 4c1e6edfb..906aa5959 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -12,9 +12,9 @@ function useScryerStance() { const inWindZone = getEmpowerment() === "Wind"; const inIceZone = getEmpowerment() === "Ice"; - const scryInPoisonEnabled = 0 <= getPageSetting('ScryUseinPoison'); - const scryInWindEnabled = 0 <= getPageSetting('ScryUseinWind'); - const scryInIceEnabled = 0 <= getPageSetting('ScryUseinIce'); + const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; + const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; + const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); @@ -54,21 +54,23 @@ function useScryerStance() { const currentEnemy = getCurrentEnemy(1); const isMagamaCell = mutations.Magma.active(); const corruptionStartZone = mutations.Corruption.start(); + const scryForCorruptedCellsNever = getPageSetting('ScryerSkipCorrupteds2') === 0; let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; isCorruptedCell = isCorruptedCell || (onMapsScreen && isMagamaCell); isCorruptedCell = isCorruptedCell || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((isCorruptedCell && getPageSetting('ScryerSkipCorrupteds2') === 0 || (use_scry))) { + if ((isCorruptedCell && scryForCorruptedCellsNever || (use_scry))) { autostancefunction(); wantToScry = false; return; } //check Healthy never - const curEnemyhealth = getCurrentEnemy(1); - let ishealthy = curEnemyhealth && curEnemyhealth.mutation === "Healthy"; + const currentEnemyHealth = getCurrentEnemy(1); + const scryForHealthyCellsNever = getPageSetting('ScryerSkipHealthy') === 0; + + let ishealthy = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; ishealthy = ishealthy || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - let scryerDoHealthy = getPageSetting('ScryerSkipHealthy') === 0; - if ((ishealthy && scryerDoHealthy || (use_scry))) { + if ((ishealthy && scryForHealthyCellsNever || (use_scry))) { autostancefunction(); wantToScry = false; return; @@ -89,13 +91,17 @@ function useScryerStance() { use_scryer = use_scryer || willScryForNature; //check Corrupted Force - if ((isCorruptedCell && getPageSetting('ScryerSkipCorrupteds2') === 1 && useScryerEnabled) || (use_scryer)) { + const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; + + if ((isCorruptedCell && scryForCorruptedCellsForce && useScryerEnabled) || (use_scryer)) { setFormation(4); wantToScry = true; return; } //check healthy force - if ((ishealthy && getPageSetting('ScryerSkipHealthy') === 1 && useScryerEnabled) || (use_scryer)) { + const scryForHealthyCellsForce = getPageSetting('ScryerSkipHealthy') === 1; + + if ((ishealthy && scryForHealthyCellsForce && useScryerEnabled) || (use_scryer)) { setFormation(4); wantToScry = true; return; @@ -109,31 +115,40 @@ function useScryerStance() { //Suicide to Scry const missingHealth = game.global.soldierHealthMax - game.global.soldierHealth; - const newSquadRdy = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; - let oktoswitch = true; - let die = (getPageSetting('ScryerDieZ') !== -1 && getPageSetting('ScryerDieZ') <= game.global.world); - const willSuicide = getPageSetting('ScryerDieZ'); - if (die && willSuicide >= 0) { - var [dieZ, dieC] = willSuicide.toString().split("."); + const isNewSquadReady = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; + const dieToScryZone = getPageSetting('ScryerDieZ'); + const dieToScryEnabled = dieToScryZone !== -1; + const aboveDieToScryZone = game.global.world >= dieToScryZone; + + let okToSwitchStance = true; + let isAllowedToDie = (dieToScryEnabled && aboveDieToScryZone); + if (isAllowedToDie && dieToScryZone >= 0) { + var [dieZ, dieC] = dieToScryZone.toString().split("."); if (dieC && dieC.length === 1) dieC = dieC + "0"; - die = game.global.world >= dieZ && (!dieC || (game.global.lastClearedCell + 1 >= dieC)); + isAllowedToDie = game.global.world >= dieZ && (!dieC || (game.global.lastClearedCell + 1 >= dieC)); } - if (game.global.formation === 0 || game.global.formation === 1) - oktoswitch = die || newSquadRdy || (missingHealth < (baseHealth / 2)); + const inXFormation = game.global.formation === 0; + const inHFormation = game.global.formation === 1; + + if (inXFormation || inHFormation) + okToSwitchStance = isAllowedToDie || isNewSquadReady || (missingHealth < (baseHealth / 2)); //Overkill - let useoverkill = getPageSetting('ScryerUseWhenOverkill'); - if (useoverkill && game.portal.Overkill.level === 0) + const noOverkillLevels = game.portal.Overkill.level === 0; + const hasOverkillLevels = game.portal.Overkill.level > 0; + + let scryForOverkill = getPageSetting('ScryerUseWhenOverkill'); + if (scryForOverkill && noOverkillLevels) setPageSetting('ScryerUseWhenOverkill', false); - if (useoverkill && !onMapsScreen && isActiveSpireAT() && scryInSpireNever) - useoverkill = false; - if (useoverkill && game.portal.Overkill.level > 0 && useScryerEnabled) { + if (scryForOverkill && !onMapsScreen && isActiveSpireAT() && scryInSpireNever) + scryForOverkill = false; + if (scryForOverkill && hasOverkillLevels && useScryerEnabled) { const minDamage = calcOurDmg("min", false, true); const Sstance = 0.5; const ovkldmg = minDamage * Sstance * (game.portal.Overkill.level * 0.005); const ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; if (ovklHDratio < 2) { - if (oktoswitch) + if (okToSwitchStance) setFormation(4); return; } @@ -144,8 +159,10 @@ function useScryerStance() { const max_zone = getPageSetting('ScryerMaxZone'); const valid_min = game.global.world >= min_zone && game.global.world > 60; const valid_max = max_zone <= 0 || game.global.world < max_zone; - if (useScryerEnabled && valid_min && valid_max && !(getPageSetting('onlyminmaxworld') === true && onMapsScreen)) { - if (oktoswitch) + const onlyScryForMinMaxEnabled = getPageSetting('onlyminmaxworld') === true; + + if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { + if (okToSwitchStance) setFormation(4); wantToScry = true; } From e7c88fa1387a6e8aaecd341548a58c71be2f652f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 7 Sep 2018 15:29:07 +0100 Subject: [PATCH 1224/3477] Revert "Merge pull request #23 from Novanet-/gh-pages" This reverts commit 0e577d4e6d897f6563efc14f3d909386b75e6d75, reversing changes made to c2480cd71ba5ea01e9d62459354cbc73951cf68d. --- .gitignore | 1 - modules/scryer.js | 202 ++++++++++++++++------------------------------ 2 files changed, 70 insertions(+), 133 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9f11b755a..000000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.idea/ diff --git a/modules/scryer.js b/modules/scryer.js index 906aa5959..be3c264d5 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,174 +1,112 @@ -let wantToScry = false; - +var wantToScry = false; function useScryerStance() { - - const AutoStance = getPageSetting('AutoStance'); - const useScryerEnabled = getPageSetting('UseScryerStance') === true; - const onMapsScreen = game.global.mapsActive; - const onVoidMap = getCurrentMapObject().location === "Void"; - const inDaily = game.global.challengeActive === "Daily"; - const dailyScryInVoid = getPageSetting('dscryvoidmaps') === true; - const inPoisonZone = getEmpowerment() === "Poison"; - const inWindZone = getEmpowerment() === "Wind"; - const inIceZone = getEmpowerment() === "Ice"; - - const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; - const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; - const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; - const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); - const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); - const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); - - function autostancefunction() { - if (AutoStance === 1) autoStance(); - else if (AutoStance === 2) autoStance2(); - else if (AutoStance === 3) autoStance3(); + + var AutoStance = getPageSetting('AutoStance'); + function autostancefunction() { + if (AutoStance==1) autoStance(); + else if (AutoStance==2) autoStance2(); + else if (AutoStance==3) autoStance3(); } //Never - let use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; +var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; - - const vmScryerEnabled = getPageSetting('scryvoidmaps') === true; - const scryInMapsNever = getPageSetting('ScryerUseinMaps2') === 0; - const scryInVoidNever = getPageSetting('ScryerUseinVoidMaps2') === 0; - const scryInSpireNever = getPageSetting('ScryerUseinSpire2') === 0; - - const inVoidOnMapsScreen = onMapsScreen && onVoidMap; - - use_scry = use_scry || (useScryerEnabled && onMapsScreen && scryInMapsNever && !onVoidMap); - use_scry = use_scry || (inVoidOnMapsScreen && (scryInVoidNever && (!useScryerEnabled && !vmScryerEnabled && !inDaily) || (!useScryerEnabled && !dailyScryInVoid && inDaily))); - use_scry = use_scry || (!onMapsScreen && isActiveSpireAT() && scryInSpireNever); - - const scryOnBossNeverAboveVoid = getPageSetting('ScryerSkipBoss2') === 1; - const currentZoneBelowVMZone = game.global.world < getPageSetting('VoidMaps'); - const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; - const onBossCell = game.global.lastClearedCell === 98; - - use_scry = use_scry || (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); - use_scry = use_scry || (!onMapsScreen && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) - || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) - || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); + use_scry = use_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"); + use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) && (getPageSetting('UseScryerStance') == false && getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('UseScryerStance') == false && getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); + use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); + use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); + use_scry = use_scry || (!game.global.mapsActive && (getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never - const currentEnemy = getCurrentEnemy(1); - const isMagamaCell = mutations.Magma.active(); - const corruptionStartZone = mutations.Corruption.start(); - const scryForCorruptedCellsNever = getPageSetting('ScryerSkipCorrupteds2') === 0; - - let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; - isCorruptedCell = isCorruptedCell || (onMapsScreen && isMagamaCell); - isCorruptedCell = isCorruptedCell || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((isCorruptedCell && scryForCorruptedCellsNever || (use_scry))) { + var curEnemy = getCurrentEnemy(1); + var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; + iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Magma.active()); + iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); + if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_scry))) { autostancefunction(); wantToScry = false; return; } //check Healthy never - const currentEnemyHealth = getCurrentEnemy(1); - const scryForHealthyCellsNever = getPageSetting('ScryerSkipHealthy') === 0; - - let ishealthy = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; - ishealthy = ishealthy || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((ishealthy && scryForHealthyCellsNever || (use_scry))) { + var curEnemyhealth = getCurrentEnemy(1); + var ishealthy = curEnemyhealth && curEnemyhealth.mutation == "Healthy"; + ishealthy = ishealthy || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); + if ((ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (use_scry))) { autostancefunction(); wantToScry = false; return; } //Force - let scryInMapsForce = getPageSetting('ScryerUseinMaps2') === 1; - let scryinVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; - let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; - - let use_scryer = use_scryer || (useScryerEnabled && onMapsScreen && scryInMapsForce); - use_scryer = use_scryer || (inVoidOnMapsScreen && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); - use_scryer = use_scryer || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); - - let willScryForNature = (!onMapsScreen && useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) - || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) - || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); - use_scryer = use_scryer || willScryForNature; - +var use_scryer = use_scryer || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1); + use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 1) || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))); + use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); + use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world >= getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world >= getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce'))))); + //check Corrupted Force - const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; - - if ((isCorruptedCell && scryForCorruptedCellsForce && useScryerEnabled) || (use_scryer)) { + if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 1 && getPageSetting('UseScryerStance') == true) || (use_scryer)) { setFormation(4); wantToScry = true; return; } //check healthy force - const scryForHealthyCellsForce = getPageSetting('ScryerSkipHealthy') === 1; - - if ((ishealthy && scryForHealthyCellsForce && useScryerEnabled) || (use_scryer)) { + if ((ishealthy && getPageSetting('ScryerSkipHealthy') == 1 && getPageSetting('UseScryerStance') == true) || (use_scryer)) { setFormation(4); wantToScry = true; return; } //Calc Damage - if (AutoStance === 1) - calcBaseDamageinX(); - else if (AutoStance >= 2) - calcBaseDamageinX2(); +if (AutoStance==1) + calcBaseDamageinX(); +else if (AutoStance>=2) + calcBaseDamageinX2(); //Suicide to Scry - const missingHealth = game.global.soldierHealthMax - game.global.soldierHealth; - const isNewSquadReady = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; - const dieToScryZone = getPageSetting('ScryerDieZ'); - const dieToScryEnabled = dieToScryZone !== -1; - const aboveDieToScryZone = game.global.world >= dieToScryZone; - - let okToSwitchStance = true; - let isAllowedToDie = (dieToScryEnabled && aboveDieToScryZone); - if (isAllowedToDie && dieToScryZone >= 0) { - var [dieZ, dieC] = dieToScryZone.toString().split("."); - if (dieC && dieC.length === 1) dieC = dieC + "0"; - isAllowedToDie = game.global.world >= dieZ && (!dieC || (game.global.lastClearedCell + 1 >= dieC)); +var missingHealth = game.global.soldierHealthMax - game.global.soldierHealth; +var newSquadRdy = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; +var oktoswitch = true; +var die = (getPageSetting('ScryerDieZ') != -1 && getPageSetting('ScryerDieZ') <= game.global.world) ; +var willSuicide = getPageSetting('ScryerDieZ'); + if (die && willSuicide >= 0) { + var [dieZ, dieC] = willSuicide.toString().split("."); + if (dieC && dieC.length == 1) dieC = dieC + "0"; + die = game.global.world >= dieZ && (!dieC || (game.global.lastClearedCell + 1 >= dieC)); } - const inXFormation = game.global.formation === 0; - const inHFormation = game.global.formation === 1; - - if (inXFormation || inHFormation) - okToSwitchStance = isAllowedToDie || isNewSquadReady || (missingHealth < (baseHealth / 2)); + if (game.global.formation == 0 || game.global.formation == 1) + oktoswitch = die || newSquadRdy || (missingHealth < (baseHealth / 2)); //Overkill - const noOverkillLevels = game.portal.Overkill.level === 0; - const hasOverkillLevels = game.portal.Overkill.level > 0; - - let scryForOverkill = getPageSetting('ScryerUseWhenOverkill'); - if (scryForOverkill && noOverkillLevels) - setPageSetting('ScryerUseWhenOverkill', false); - if (scryForOverkill && !onMapsScreen && isActiveSpireAT() && scryInSpireNever) - scryForOverkill = false; - if (scryForOverkill && hasOverkillLevels && useScryerEnabled) { - const minDamage = calcOurDmg("min", false, true); - const Sstance = 0.5; - const ovkldmg = minDamage * Sstance * (game.portal.Overkill.level * 0.005); - const ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; - if (ovklHDratio < 2) { - if (okToSwitchStance) - setFormation(4); +var useoverkill = getPageSetting('ScryerUseWhenOverkill'); +if (useoverkill && game.portal.Overkill.level == 0) + setPageSetting('ScryerUseWhenOverkill', false); +if (useoverkill && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')==0) + useoverkill = false; +if (useoverkill && game.portal.Overkill.level > 0 && getPageSetting('UseScryerStance') == true) { + var minDamage = calcOurDmg("min",false,true); + var Sstance = 0.5; + var ovkldmg = minDamage * Sstance * (game.portal.Overkill.level*0.005); + var ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; + if (ovklHDratio < 2) { + if (oktoswitch) + setFormation(4); return; } } //Default - const min_zone = getPageSetting('ScryerMinZone'); - const max_zone = getPageSetting('ScryerMaxZone'); - const valid_min = game.global.world >= min_zone && game.global.world > 60; - const valid_max = max_zone <= 0 || game.global.world < max_zone; - const onlyScryForMinMaxEnabled = getPageSetting('onlyminmaxworld') === true; - - if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { - if (okToSwitchStance) - setFormation(4); - wantToScry = true; - } - else { - autostancefunction(); - wantToScry = false; - +var min_zone = getPageSetting('ScryerMinZone'); +var max_zone = getPageSetting('ScryerMaxZone'); +var valid_min = game.global.world >= min_zone && game.global.world > 60; +var valid_max = max_zone <= 0 || game.global.world < max_zone; +if (getPageSetting('UseScryerStance') == true && valid_min && valid_max && !(getPageSetting('onlyminmaxworld') == true && game.global.mapsActive)) { + if (oktoswitch) + setFormation(4); + wantToScry = true; + } +else { + autostancefunction(); + wantToScry = false; + return; } } From e65689f5f7a7adb95e101c9a4a58b393c788d987 Mon Sep 17 00:00:00 2001 From: Will Davies Date: Fri, 7 Sep 2018 15:37:31 +0100 Subject: [PATCH 1225/3477] Switch to Novanet --- .user.js | 6 +++--- AutoTrimps2.js | 2 +- README.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.user.js b/.user.js index 2a7663279..414bd72b9 100644 --- a/.user.js +++ b/.user.js @@ -1,5 +1,5 @@ // ==UserScript== -// @name AutoTrimps-Zek +// @name AutoTrimps-Novanet // @version 1.0-Zek // @namespace https://Zorn192.github.io/AutoTrimps // @updateURL https://Zorn192.github.io/AutoTrimps/.user.js @@ -14,9 +14,9 @@ // ==/UserScript== var script = document.createElement('script'); -script.id = 'AutoTrimps-Zek'; +script.id = 'AutoTrimps-Novanet'; //This can be edited to point to your own Github Repository URL. -script.src = 'https://Zorn192.github.io/AutoTrimps/AutoTrimps2.js'; +script.src = 'https://Novanet-.github.io/AutoTrimps/AutoTrimps2.js'; //script.setAttribute('crossorigin',"use-credentials"); script.setAttribute('crossorigin',"anonymous"); document.head.appendChild(script); diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 3a2cf8ee0..0644bca22 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -1,4 +1,4 @@ -var ATversion='2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0',atscript=document.getElementById('AutoTrimps-script'),basepath='https://Zorn192.github.io/AutoTrimps/',modulepath='modules/';null!==atscript&&(basepath=atscript.src.replace(/AutoTrimps2\.js$/,'')); +var ATversion='2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0',atscript=document.getElementById('AutoTrimps-script'),basepath='https://Novanet-.github.io/AutoTrimps/',modulepath='modules/';null!==atscript&&(basepath=atscript.src.replace(/AutoTrimps2\.js$/,'')); function ATscriptLoad(a,b){null==b&&debug('Wrong Syntax. Script could not be loaded. Try ATscriptLoad(modulepath, \'example.js\'); ');var c=document.createElement('script');null==a&&(a=''),c.src=basepath+a+b+'.js',c.id=b+'_MODULE',document.head.appendChild(c)} function ATscriptUnload(a){var b=document.getElementById(a+"_MODULE");b&&(document.head.removeChild(b),debug("Removing "+a+"_MODULE","other"))} ATscriptLoad(modulepath, 'utils'); diff --git a/README.md b/README.md index f2e3e37fc..a861269f4 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ took a break ***Your only Option***: Install TamperMonkey (Chrome) or GreaseMonkey (Firefox) -**EASY INSTALL click here: https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js** (the Monkeys will detect this and prompt you to install it) +**EASY INSTALL click here: https://github.com/Novanet-/AutoTrimps/raw/gh-pages/.user.js** (the Monkeys will detect this and prompt you to install it) Overly detailed Chrome/TamperMonkey Instructions: - Open the TamperMonkey dashboard and go to utilities – in the URL box paste https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js and click IMPORT @@ -56,7 +56,7 @@ Overly detailed Chrome/TamperMonkey Instructions: FireFox/GreaseMonkey instructions: - GreaseMonkey identifies userscripts by visiting a URL that ends with ".user.js" in them: -- Visit this URL, and Agree to install the userscript: https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js +- Visit this URL, and Agree to install the userscript: https://github.com/Novanet-/AutoTrimps/raw/gh-pages/.user.js ***LowLevelPlayer Notes:*** From 14e7900d957b22425e775ecd2eaf74592cca8b4a Mon Sep 17 00:00:00 2001 From: Will Davies Date: Fri, 7 Sep 2018 15:59:56 +0100 Subject: [PATCH 1226/3477] Add maps active condition to onVoid value --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 906aa5959..c6241fc7f 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -5,7 +5,7 @@ function useScryerStance() { const AutoStance = getPageSetting('AutoStance'); const useScryerEnabled = getPageSetting('UseScryerStance') === true; const onMapsScreen = game.global.mapsActive; - const onVoidMap = getCurrentMapObject().location === "Void"; + const onVoidMap = game.global.mapsActive && getCurrentMapObject().location === "Void"; const inDaily = game.global.challengeActive === "Daily"; const dailyScryInVoid = getPageSetting('dscryvoidmaps') === true; const inPoisonZone = getEmpowerment() === "Poison"; From dd96ef808a76f7939245b8cd685e079eed49cc95 Mon Sep 17 00:00:00 2001 From: Will Davies Date: Fri, 7 Sep 2018 16:08:18 +0100 Subject: [PATCH 1227/3477] Removed null access to use_Scryer --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index c6241fc7f..3aa90f4f6 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -81,7 +81,7 @@ function useScryerStance() { let scryinVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; - let use_scryer = use_scryer || (useScryerEnabled && onMapsScreen && scryInMapsForce); + let use_scryer = useScryerEnabled && onMapsScreen && scryInMapsForce; use_scryer = use_scryer || (inVoidOnMapsScreen && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); use_scryer = use_scryer || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); From 6cd57fba96638671c88a576751eb9cedf4a4facf Mon Sep 17 00:00:00 2001 From: Will Davies Date: Fri, 7 Sep 2018 16:11:49 +0100 Subject: [PATCH 1228/3477] Revert "Switch to Novanet" This reverts commit e65689f5f7a7adb95e101c9a4a58b393c788d987. --- .user.js | 6 +++--- AutoTrimps2.js | 2 +- README.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.user.js b/.user.js index 414bd72b9..2a7663279 100644 --- a/.user.js +++ b/.user.js @@ -1,5 +1,5 @@ // ==UserScript== -// @name AutoTrimps-Novanet +// @name AutoTrimps-Zek // @version 1.0-Zek // @namespace https://Zorn192.github.io/AutoTrimps // @updateURL https://Zorn192.github.io/AutoTrimps/.user.js @@ -14,9 +14,9 @@ // ==/UserScript== var script = document.createElement('script'); -script.id = 'AutoTrimps-Novanet'; +script.id = 'AutoTrimps-Zek'; //This can be edited to point to your own Github Repository URL. -script.src = 'https://Novanet-.github.io/AutoTrimps/AutoTrimps2.js'; +script.src = 'https://Zorn192.github.io/AutoTrimps/AutoTrimps2.js'; //script.setAttribute('crossorigin',"use-credentials"); script.setAttribute('crossorigin',"anonymous"); document.head.appendChild(script); diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 0644bca22..3a2cf8ee0 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -1,4 +1,4 @@ -var ATversion='2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0',atscript=document.getElementById('AutoTrimps-script'),basepath='https://Novanet-.github.io/AutoTrimps/',modulepath='modules/';null!==atscript&&(basepath=atscript.src.replace(/AutoTrimps2\.js$/,'')); +var ATversion='2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0',atscript=document.getElementById('AutoTrimps-script'),basepath='https://Zorn192.github.io/AutoTrimps/',modulepath='modules/';null!==atscript&&(basepath=atscript.src.replace(/AutoTrimps2\.js$/,'')); function ATscriptLoad(a,b){null==b&&debug('Wrong Syntax. Script could not be loaded. Try ATscriptLoad(modulepath, \'example.js\'); ');var c=document.createElement('script');null==a&&(a=''),c.src=basepath+a+b+'.js',c.id=b+'_MODULE',document.head.appendChild(c)} function ATscriptUnload(a){var b=document.getElementById(a+"_MODULE");b&&(document.head.removeChild(b),debug("Removing "+a+"_MODULE","other"))} ATscriptLoad(modulepath, 'utils'); diff --git a/README.md b/README.md index a861269f4..f2e3e37fc 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ took a break ***Your only Option***: Install TamperMonkey (Chrome) or GreaseMonkey (Firefox) -**EASY INSTALL click here: https://github.com/Novanet-/AutoTrimps/raw/gh-pages/.user.js** (the Monkeys will detect this and prompt you to install it) +**EASY INSTALL click here: https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js** (the Monkeys will detect this and prompt you to install it) Overly detailed Chrome/TamperMonkey Instructions: - Open the TamperMonkey dashboard and go to utilities – in the URL box paste https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js and click IMPORT @@ -56,7 +56,7 @@ Overly detailed Chrome/TamperMonkey Instructions: FireFox/GreaseMonkey instructions: - GreaseMonkey identifies userscripts by visiting a URL that ends with ".user.js" in them: -- Visit this URL, and Agree to install the userscript: https://github.com/Novanet-/AutoTrimps/raw/gh-pages/.user.js +- Visit this URL, and Agree to install the userscript: https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js ***LowLevelPlayer Notes:*** From 836e199710df57401054ea7c83652cd9bdccf3d7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 7 Sep 2018 18:24:32 +0100 Subject: [PATCH 1229/3477] Update buildings.js --- modules/buildings.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/buildings.js b/modules/buildings.js index 145dd5918..aa7c7cfc0 100644 --- a/modules/buildings.js +++ b/modules/buildings.js @@ -11,6 +11,10 @@ function safeBuyBuilding(building) { if (game.buildings[building].locked) return false; var oldBuy = preBuy2(); + if (game.talents.deciBuild.purchased) { + game.global.buyAmt = 10; + if (!canAffordBuilding(building)) { + game.global.buyAmt = 2; if (game.talents.doubleBuild.purchased) { game.global.buyAmt = 2; if (!canAffordBuilding(building)) { @@ -18,8 +22,7 @@ function safeBuyBuilding(building) { if (!canAffordBuilding(building)) { postBuy2(oldBuy); return false; - } - } + }}}} } else { game.global.buyAmt = 1; if (!canAffordBuilding(building)) { From 02b9cae82069d9c75bf9ed0fdab6ac4b94499787 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 8 Sep 2018 08:36:38 +0100 Subject: [PATCH 1230/3477] Update portal.js --- modules/portal.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index b901dd055..c87b17c6e 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -103,6 +103,10 @@ function dautoPortal() { setTimeout(function() { if (zonePostpone >= 2) return; + if (OKtoPortal) { + abandonDaily(); + document.getElementById('finishDailyBtnContainer').style.display = 'none'; + } if (autoTrimpSettings.dHeliumHourChallenge.selected != 'None') doPortal(autoTrimpSettings.dHeliumHourChallenge.selected); else @@ -114,20 +118,19 @@ function dautoPortal() { } if (getPageSetting('AutoPortalDaily') == 2) { var portalzone = getPageSetting('dCustomAutoPortal'); - if (game.global.world > portalzone) + if (game.global.world > portalzone) { + abandonDaily(); + document.getElementById('finishDailyBtnContainer').style.display = 'none'; if (autoTrimpSettings.dHeliumHourChallenge.selected != 'None') doPortal(autoTrimpSettings.dHeliumHourChallenge.selected); else doPortal(); + } } } function doPortal(challenge) { if (!game.global.portalActive) return; - if (getPageSetting('AutoPortalDaily') > 0 && game.global.challengeActive == "Daily" && game.global.world > getPageSetting('Dailyportal')) { - abandonDaily(); - document.getElementById('finishDailyBtnContainer').style.display = 'none'; - } if (getPageSetting('spendmagmite') == 1) autoMagmiteSpender(); if (getPageSetting('AutoHeirloomsNew') == 0); else if (getPageSetting('AutoHeirloomsNew') == 1) autoHeirlooms(); From 39601c36df0771aa2baab39026bf515ec67f0f83 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 8 Sep 2018 09:49:19 +0100 Subject: [PATCH 1231/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 3a2cf8ee0..67cba4d45 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -144,8 +144,18 @@ function mainLoop() { } function guiLoop(){updateCustomButtons(),safeSetItems('storedMODULES',JSON.stringify(compareModuleVars())),getPageSetting('EnhanceGrids')&&MODULES.fightinfo.Update(),'undefined'!=typeof MODULES&&'undefined'!=typeof MODULES.performance&&MODULES.performance.isAFK&&MODULES.performance.UpdateAFKOverlay()} -function mainCleanup(){if(lastrunworld=currentworld,currentworld=game.global.world,aWholeNewWorld=lastrunworld!=currentworld,1==currentworld&&aWholeNewWorld)return lastHeliumZone=0,zonePostpone=0,1!=getPageSetting('AutoMaps')||game.upgrades.Battle.done||0!=getPageSetting('AutoMaps')||settingChanged('AutoMaps'),!0} - +function mainCleanup() { + lastrunworld = currentworld; + currentworld = game.global.world; + aWholeNewWorld = lastrunworld != currentworld; + if (currentworld == 1 && aWholeNewWorld) { + lastHeliumZone = 0; + zonePostpone = 0; + if (getPageSetting('AutoMaps')==0 && !game.upgrades.Battle.done) + autoTrimpSettings["AutoMaps"].value = 1; + return true; + } +} var userscriptOn = true; var globalvar0,globalvar1,globalvar2,globalvar3,globalvar4,globalvar5,globalvar6,globalvar7,globalvar8,globalvar9; function userscripts() From 8963ba14e116f8f168190e88f914acc3cc07080e Mon Sep 17 00:00:00 2001 From: Novanet Date: Sat, 8 Sep 2018 11:17:24 +0100 Subject: [PATCH 1232/3477] Refactored portal.js --- SettingsGUI.js | 4 +- modules/portal.js | 264 +++++++++++++++++++++++++++++----------------- 2 files changed, 167 insertions(+), 101 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 3bbbec4b5..6f8d2b86f 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -597,9 +597,7 @@ function updateCustomButtons() { } function checkPortalSettings() { - var result = findOutCurrentPortalLevel(); - var portalLevel = result.level; - var leadCheck = result.lead; + var portalLevel = findOutCurrentPortalLevel(); if (portalLevel == -1) return portalLevel; var voidmaps = 0; diff --git a/modules/portal.js b/modules/portal.js index c87b17c6e..849ac8989 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -1,113 +1,122 @@ MODULES["portal"] = {}; MODULES["portal"].timeout = 5000; MODULES["portal"].bufferExceedFactor = 5; -var portalzone = getPageSetting('CustomAutoPortal'); -var zonePostpone = 0; + +let zonePostpone = 0; function autoPortal() { if (!game.global.portalActive) return; - switch (autoTrimpSettings.AutoPortal.selected) { + + let selectedAutoPortalChallenge = autoTrimpSettings.AutoPortal.selected; + switch (selectedAutoPortalChallenge) { case "Helium Per Hour": - var OKtoPortal = false; - if (!game.global.runningChallengeSquared) { - var minZone = getPageSetting('HeHrDontPortalBefore'); - game.stats.bestHeliumHourThisRun.evaluate(); - var bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; - var bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; - var myHeliumHr = game.stats.heliumHour.value(); - var heliumHrBuffer = Math.abs(getPageSetting('HeliumHrBuffer')); - if (!aWholeNewWorld) - heliumHrBuffer *= MODULES["portal"].bufferExceedFactor; - var bufferExceeded = myHeliumHr < bestHeHr * (1 - (heliumHrBuffer / 100)); - if (bufferExceeded && game.global.world >= minZone) { - OKtoPortal = true; - if (aWholeNewWorld) - zonePostpone = 0; - } - if (heliumHrBuffer == 0 && !aWholeNewWorld) - OKtoPortal = false; - if (OKtoPortal && zonePostpone == 0) { - zonePostpone += 1; - debug("My HeliumHr was: " + myHeliumHr + " & the Best HeliumHr was: " + bestHeHr + " at zone: " + bestHeHrZone, "portal"); - cancelTooltip(); - tooltip('confirm', null, 'update', 'Auto Portaling NOW!

    Hit Delay Portal to WAIT 1 more zone.', 'zonePostpone+=1', 'NOTICE: Auto-Portaling in 5 seconds....', 'Delay Portal'); - setTimeout(cancelTooltip, MODULES["portal"].timeout); - setTimeout(function() { - if (zonePostpone >= 2) - return; - if (autoTrimpSettings.HeliumHourChallenge.selected != 'None') - doPortal(autoTrimpSettings.HeliumHourChallenge.selected); - else - doPortal(); - }, MODULES["portal"].timeout + 100); - } - } + heliumPerHourPortal(); break; case "Custom": - var portalzone = getPageSetting('CustomAutoPortal'); - if (game.global.world > portalzone) { - if (autoTrimpSettings.HeliumHourChallenge.selected != 'None') - doPortal(autoTrimpSettings.HeliumHourChallenge.selected); - else - doPortal(); - } + customZonePortal(); break; - case "Balance": - case "Decay": - case "Electricity": - case "Life": - case "Crushed": - case "Nom": case "Toxicity": if (getPageSetting('MaxTox')) settingChanged("MaxTox"); - case "Watch": - case "Lead": - case "Corrupted": + default: if (!game.global.challengeActive) { - doPortal(autoTrimpSettings.AutoPortal.selected); + doPortal(selectedAutoPortalChallenge); } break; - default: - break; + } +} + +function heliumPerHourPortal() { + let OKtoPortal = false; + if (!game.global.runningChallengeSquared) { + const minZone = getPageSetting('HeHrDontPortalBefore'); + + game.stats.bestHeliumHourThisRun.evaluate(); + const bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; + const bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; + const myHeliumHr = game.stats.heliumHour.value(); + + let heliumHrBuffer = Math.abs(getPageSetting('HeliumHrBuffer')); + if (!aWholeNewWorld) + heliumHrBuffer *= MODULES["portal"].bufferExceedFactor; + const bufferExceeded = myHeliumHr < bestHeHr * (1 - (heliumHrBuffer / 100)); + if (bufferExceeded && game.global.world >= minZone) { + OKtoPortal = true; + if (aWholeNewWorld) + zonePostpone = 0; + } + if (heliumHrBuffer === 0 && !aWholeNewWorld) + OKtoPortal = false; + + if (OKtoPortal && zonePostpone === 0) { + zonePostpone += 1; + debug("My HeliumHr was: " + myHeliumHr + " & the Best HeliumHr was: " + bestHeHr + " at zone: " + bestHeHrZone, "portal"); + cancelTooltip(); + tooltip('confirm', null, 'update', 'Auto Portaling NOW!

    Hit Delay Portal to WAIT 1 more zone.', 'zonePostpone+=1', 'NOTICE: Auto-Portaling in 5 seconds....', 'Delay Portal'); + setTimeout(cancelTooltip, MODULES["portal"].timeout); + setTimeout(function () { + if (zonePostpone >= 2) + return; + if (autoTrimpSettings.HeliumHourChallenge.selected !== 'None') + doPortal(autoTrimpSettings.HeliumHourChallenge.selected); + else + doPortal(); + }, MODULES["portal"].timeout + 100); + } + } +} + +function customZonePortal() { + const portalzone = getPageSetting('CustomAutoPortal'); + if (game.global.world > portalzone) { + if (autoTrimpSettings.HeliumHourChallenge.selected !== 'None') + doPortal(autoTrimpSettings.HeliumHourChallenge.selected); + else + doPortal(); } } function dautoPortal() { if (!game.global.portalActive) return; - if (getPageSetting('AutoPortalDaily') == 1) { - var OKtoPortal = false; + + let dailyPortalHeliumPerHour = getPageSetting('AutoPortalDaily') === 1; + if (dailyPortalHeliumPerHour) { + let OKtoPortal = false; if (!game.global.runningChallengeSquared) { - var minZone = getPageSetting('dHeHrDontPortalBefore'); + const minZone = getPageSetting('dHeHrDontPortalBefore'); + game.stats.bestHeliumHourThisRun.evaluate(); - var bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; - var bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; - var myHeliumHr = game.stats.heliumHour.value(); - var heliumHrBuffer = Math.abs(getPageSetting('dHeliumHrBuffer')); + const bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; + const bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; + const myHeliumHr = game.stats.heliumHour.value(); + + let heliumHrBuffer = Math.abs(getPageSetting('dHeliumHrBuffer')); if (!aWholeNewWorld) { + heliumHrBuffer *= MODULES["portal"].bufferExceedFactor; - var bufferExceeded = myHeliumHr < bestHeHr * (1 - (heliumHrBuffer / 100)); + const bufferExceeded = myHeliumHr < bestHeHr * (1 - (heliumHrBuffer / 100)); if (bufferExceeded && game.global.world >= minZone) { OKtoPortal = true; if (aWholeNewWorld) zonePostpone = 0; } - if (heliumHrBuffer == 0 && !aWholeNewWorld) + if (heliumHrBuffer === 0 && !aWholeNewWorld) OKtoPortal = false; - if (OKtoPortal && zonePostpone == 0) { + + if (OKtoPortal && zonePostpone === 0) { zonePostpone += 1; debug("My HeliumHr was: " + myHeliumHr + " & the Best HeliumHr was: " + bestHeHr + " at zone: " + bestHeHrZone, "portal"); cancelTooltip(); tooltip('confirm', null, 'update', 'Auto Portaling NOW!

    Hit Delay Portal to WAIT 1 more zone.', 'zonePostpone+=1', 'NOTICE: Auto-Portaling in 5 seconds....', 'Delay Portal'); setTimeout(cancelTooltip, MODULES["portal"].timeout); - setTimeout(function() { + setTimeout(function () { if (zonePostpone >= 2) return; if (OKtoPortal) { abandonDaily(); document.getElementById('finishDailyBtnContainer').style.display = 'none'; } - if (autoTrimpSettings.dHeliumHourChallenge.selected != 'None') + if (autoTrimpSettings.dHeliumHourChallenge.selected !== 'None') doPortal(autoTrimpSettings.dHeliumHourChallenge.selected); else doPortal(); @@ -116,12 +125,14 @@ function dautoPortal() { } } } - if (getPageSetting('AutoPortalDaily') == 2) { - var portalzone = getPageSetting('dCustomAutoPortal'); - if (game.global.world > portalzone) { + + let dailyPortalCustom = getPageSetting('AutoPortalDaily') === 2; + if (dailyPortalCustom) { + const customPortalZone = getPageSetting('dCustomAutoPortal'); + if (game.global.world > customPortalZone) { abandonDaily(); document.getElementById('finishDailyBtnContainer').style.display = 'none'; - if (autoTrimpSettings.dHeliumHourChallenge.selected != 'None') + if (autoTrimpSettings.dHeliumHourChallenge.selected !== 'None') doPortal(autoTrimpSettings.dHeliumHourChallenge.selected); else doPortal(); @@ -131,41 +142,98 @@ function dautoPortal() { function doPortal(challenge) { if (!game.global.portalActive) return; - if (getPageSetting('spendmagmite') == 1) autoMagmiteSpender(); - if (getPageSetting('AutoHeirloomsNew') == 0); - else if (getPageSetting('AutoHeirloomsNew') == 1) autoHeirlooms(); - else if (getPageSetting('AutoHeirloomsNew') == 2) autoHeirlooms2(); - if (getPageSetting('AutoUpgradeHeirlooms') && !heirloomsShown) autoNull(); + + manageMagmite(); + manageHeirlooms(); + portalClicked(); - if (getPageSetting('AutoAllocatePerks') == 1 && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) + let autoAllocateOn = getPageSetting('AutoAllocatePerks') === 1; + if (autoAllocateOn && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) AutoPerks.clickAllocate(); - if (getPageSetting('AutoStartDaily')) { - selectChallenge('Daily'); - checkCompleteDailies(); - - var lastUndone = -7; - while (++lastUndone <= 0) { - var done = (game.global.recentDailies.indexOf(getDailyTimeString(lastUndone)) != -1); - if (!done) - break; - } - if (lastUndone == 1) { - debug("All available Dailies already completed.", "portal"); - selectChallenge(challenge || 0); - } else { - getDailyChallenge(lastUndone); - debug("Portaling into Daily for: " + getDailyTimeString(lastUndone, true) + " now!", "portal"); - } + if (getPageSetting('AutoStartDaily')) { + dailyPortal(); } else if (challenge) { selectChallenge(challenge); } pushData(); activateClicked(); activatePortal(); - lastHeliumZone = 0; zonePostpone = 0; } +function manageMagmite() { + let spendMagmitePortal = getPageSetting('spendmagmite') === 1; + if (spendMagmitePortal) autoMagmiteSpender(); +} -function finishChallengeSquared(){var a=getPageSetting("FinishC2");game.global.world>=a&&(abandonChallenge(),debug("Finished challenge2 because we are on zone "+game.global.world,"other","oil"))} -function findOutCurrentPortalLevel(){var a=-1,b=!1,d=getPageSetting("AutoPortal");switch(d){case"Off":break;case"Custom":"Daily"!=game.global.challengeActive&&(a=getPageSetting("CustomAutoPortal")+1),"Daily"==game.global.challengeActive&&(a=getPageSetting("Dailyportal")+1),b=!("Lead"!=getPageSetting("HeliumHourChallenge"));break;default:var e={Balance:41,Decay:56,Electricity:82,Crushed:126,Nom:146,Toxicity:166,Lead:181,Watch:181,Corrupted:191}[d];e&&(a=e);}return{level:a,lead:b}} +function manageHeirlooms() { + if (getPageSetting('AutoHeirloomsNew') === 1) autoHeirlooms(); + else if (getPageSetting('AutoHeirloomsNew') === 2) autoHeirlooms2(); + if (getPageSetting('AutoUpgradeHeirlooms') && !heirloomsShown) autoNull(); +} + +function dailyPortal() { + selectChallenge('Daily'); + checkCompleteDailies(); + let lastUnattemptedDaily = selectDaily(); + + let noAvailableDailies = lastUnattemptedDaily === 1; + if (noAvailableDailies) { + debug("All available Dailies already completed.", "portal"); + selectChallenge(challenge || 0); + } else { + getDailyChallenge(lastUnattemptedDaily); + debug("Portaling into Daily for: " + getDailyTimeString(lastUnattemptedDaily, true) + " now!", "portal"); + } +} + +function selectDaily() { + let lastUndone = -7; + while (++lastUndone <= 0) { + let done = (game.global.recentDailies.indexOf(getDailyTimeString(lastUndone)) !== -1); + if (!done) + break; + } + return lastUndone; +} + +function finishChallengeSquared() { + const finishC2Zone = getPageSetting("FinishC2"); + + if (game.global.world >= finishC2Zone){ + abandonChallenge(); + debug("Finished challenge2 because we are on zone " + game.global.world, "other", "oil"); + } +} + +function findOutCurrentPortalLevel() { + const autoPortalSetting = getPageSetting("AutoPortal"); + + let zoneToPortalAt = -1; + switch (autoPortalSetting) { + case "Off": + break; + case "Custom": + if (game.global.challengeActive === "Daily"){ + zoneToPortalAt = getPageSetting("Dailyportal") + 1; + } + else{ + zoneToPortalAt = getPageSetting("CustomAutoPortal") + 1; + } + break; + default: + const challengeEndZone = { + Balance: 41, + Decay: 56, + Electricity: 82, + Crushed: 126, + Nom: 146, + Toxicity: 166, + Lead: 181, + Watch: 181, + Corrupted: 191 + }[autoPortalSetting]; + challengeEndZone && (zoneToPortalAt = challengeEndZone); + } + return zoneToPortalAt; +} From 101024c1dbe081fce1f5eea49ee14b3ac91a5fa4 Mon Sep 17 00:00:00 2001 From: Will Davies Date: Fri, 7 Sep 2018 15:37:31 +0100 Subject: [PATCH 1233/3477] Switch to Novanet --- .user.js | 6 +++--- AutoTrimps2.js | 2 +- README.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.user.js b/.user.js index 2a7663279..414bd72b9 100644 --- a/.user.js +++ b/.user.js @@ -1,5 +1,5 @@ // ==UserScript== -// @name AutoTrimps-Zek +// @name AutoTrimps-Novanet // @version 1.0-Zek // @namespace https://Zorn192.github.io/AutoTrimps // @updateURL https://Zorn192.github.io/AutoTrimps/.user.js @@ -14,9 +14,9 @@ // ==/UserScript== var script = document.createElement('script'); -script.id = 'AutoTrimps-Zek'; +script.id = 'AutoTrimps-Novanet'; //This can be edited to point to your own Github Repository URL. -script.src = 'https://Zorn192.github.io/AutoTrimps/AutoTrimps2.js'; +script.src = 'https://Novanet-.github.io/AutoTrimps/AutoTrimps2.js'; //script.setAttribute('crossorigin',"use-credentials"); script.setAttribute('crossorigin',"anonymous"); document.head.appendChild(script); diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 67cba4d45..3b396d839 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -1,4 +1,4 @@ -var ATversion='2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0',atscript=document.getElementById('AutoTrimps-script'),basepath='https://Zorn192.github.io/AutoTrimps/',modulepath='modules/';null!==atscript&&(basepath=atscript.src.replace(/AutoTrimps2\.js$/,'')); +var ATversion='2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0',atscript=document.getElementById('AutoTrimps-script'),basepath='https://Novanet-.github.io/AutoTrimps/',modulepath='modules/';null!==atscript&&(basepath=atscript.src.replace(/AutoTrimps2\.js$/,'')); function ATscriptLoad(a,b){null==b&&debug('Wrong Syntax. Script could not be loaded. Try ATscriptLoad(modulepath, \'example.js\'); ');var c=document.createElement('script');null==a&&(a=''),c.src=basepath+a+b+'.js',c.id=b+'_MODULE',document.head.appendChild(c)} function ATscriptUnload(a){var b=document.getElementById(a+"_MODULE");b&&(document.head.removeChild(b),debug("Removing "+a+"_MODULE","other"))} ATscriptLoad(modulepath, 'utils'); diff --git a/README.md b/README.md index f2e3e37fc..a861269f4 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ took a break ***Your only Option***: Install TamperMonkey (Chrome) or GreaseMonkey (Firefox) -**EASY INSTALL click here: https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js** (the Monkeys will detect this and prompt you to install it) +**EASY INSTALL click here: https://github.com/Novanet-/AutoTrimps/raw/gh-pages/.user.js** (the Monkeys will detect this and prompt you to install it) Overly detailed Chrome/TamperMonkey Instructions: - Open the TamperMonkey dashboard and go to utilities – in the URL box paste https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js and click IMPORT @@ -56,7 +56,7 @@ Overly detailed Chrome/TamperMonkey Instructions: FireFox/GreaseMonkey instructions: - GreaseMonkey identifies userscripts by visiting a URL that ends with ".user.js" in them: -- Visit this URL, and Agree to install the userscript: https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js +- Visit this URL, and Agree to install the userscript: https://github.com/Novanet-/AutoTrimps/raw/gh-pages/.user.js ***LowLevelPlayer Notes:*** From 9c7b5e040d19f51766605781fe1519e6f7f4aa64 Mon Sep 17 00:00:00 2001 From: Novanet Date: Sat, 8 Sep 2018 11:44:08 +0100 Subject: [PATCH 1234/3477] Fixed missing reference --- AutoTrimps2.js | 2 +- modules/portal.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 3b396d839..58e782bf4 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -120,7 +120,7 @@ function mainLoop() { else if (getPageSetting('ManualGather2')==2) autogather3(); getPageSetting('AutoMaps') > 0 ? autoMap() : updateAutoMapsStatus(); if (autoTrimpSettings.AutoPortal.selected != "Off" && game.global.challengeActive != "Daily") autoPortal(); - if (getPageSetting('AutoPortalDaily') > 0 && game.global.challengeActive == "Daily") dautoPortal(); + if (getPageSetting('AutoPortalDaily') > 0 && game.global.challengeActive == "Daily") dailyAutoPortal(); if (getPageSetting('TrapTrimps') && game.global.trapBuildAllowed && game.global.trapBuildToggled == false) toggleAutoTrap(); if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); diff --git a/modules/portal.js b/modules/portal.js index 849ac8989..1be493cbf 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -76,7 +76,7 @@ function customZonePortal() { } } -function dautoPortal() { +function dailyAutoPortal() { if (!game.global.portalActive) return; let dailyPortalHeliumPerHour = getPageSetting('AutoPortalDaily') === 1; @@ -152,7 +152,7 @@ function doPortal(challenge) { AutoPerks.clickAllocate(); if (getPageSetting('AutoStartDaily')) { - dailyPortal(); + runDaily(challenge); } else if (challenge) { selectChallenge(challenge); } @@ -172,7 +172,7 @@ function manageHeirlooms() { if (getPageSetting('AutoUpgradeHeirlooms') && !heirloomsShown) autoNull(); } -function dailyPortal() { +function runDaily(challenge) { selectChallenge('Daily'); checkCompleteDailies(); let lastUnattemptedDaily = selectDaily(); From 037524b1f35729d03c868b487f5d5f9782d6d2d1 Mon Sep 17 00:00:00 2001 From: Novanet Date: Sat, 8 Sep 2018 11:49:22 +0100 Subject: [PATCH 1235/3477] Revert "Switch to Novanet" This reverts commit 101024c1dbe081fce1f5eea49ee14b3ac91a5fa4. --- .user.js | 6 +++--- AutoTrimps2.js | 2 +- README.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.user.js b/.user.js index 414bd72b9..2a7663279 100644 --- a/.user.js +++ b/.user.js @@ -1,5 +1,5 @@ // ==UserScript== -// @name AutoTrimps-Novanet +// @name AutoTrimps-Zek // @version 1.0-Zek // @namespace https://Zorn192.github.io/AutoTrimps // @updateURL https://Zorn192.github.io/AutoTrimps/.user.js @@ -14,9 +14,9 @@ // ==/UserScript== var script = document.createElement('script'); -script.id = 'AutoTrimps-Novanet'; +script.id = 'AutoTrimps-Zek'; //This can be edited to point to your own Github Repository URL. -script.src = 'https://Novanet-.github.io/AutoTrimps/AutoTrimps2.js'; +script.src = 'https://Zorn192.github.io/AutoTrimps/AutoTrimps2.js'; //script.setAttribute('crossorigin',"use-credentials"); script.setAttribute('crossorigin',"anonymous"); document.head.appendChild(script); diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 58e782bf4..842aa0942 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -1,4 +1,4 @@ -var ATversion='2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0',atscript=document.getElementById('AutoTrimps-script'),basepath='https://Novanet-.github.io/AutoTrimps/',modulepath='modules/';null!==atscript&&(basepath=atscript.src.replace(/AutoTrimps2\.js$/,'')); +var ATversion='2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0',atscript=document.getElementById('AutoTrimps-script'),basepath='https://Zorn192.github.io/AutoTrimps/',modulepath='modules/';null!==atscript&&(basepath=atscript.src.replace(/AutoTrimps2\.js$/,'')); function ATscriptLoad(a,b){null==b&&debug('Wrong Syntax. Script could not be loaded. Try ATscriptLoad(modulepath, \'example.js\'); ');var c=document.createElement('script');null==a&&(a=''),c.src=basepath+a+b+'.js',c.id=b+'_MODULE',document.head.appendChild(c)} function ATscriptUnload(a){var b=document.getElementById(a+"_MODULE");b&&(document.head.removeChild(b),debug("Removing "+a+"_MODULE","other"))} ATscriptLoad(modulepath, 'utils'); diff --git a/README.md b/README.md index a861269f4..f2e3e37fc 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ took a break ***Your only Option***: Install TamperMonkey (Chrome) or GreaseMonkey (Firefox) -**EASY INSTALL click here: https://github.com/Novanet-/AutoTrimps/raw/gh-pages/.user.js** (the Monkeys will detect this and prompt you to install it) +**EASY INSTALL click here: https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js** (the Monkeys will detect this and prompt you to install it) Overly detailed Chrome/TamperMonkey Instructions: - Open the TamperMonkey dashboard and go to utilities – in the URL box paste https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js and click IMPORT @@ -56,7 +56,7 @@ Overly detailed Chrome/TamperMonkey Instructions: FireFox/GreaseMonkey instructions: - GreaseMonkey identifies userscripts by visiting a URL that ends with ".user.js" in them: -- Visit this URL, and Agree to install the userscript: https://github.com/Novanet-/AutoTrimps/raw/gh-pages/.user.js +- Visit this URL, and Agree to install the userscript: https://github.com/Zorn192/AutoTrimps/raw/gh-pages/.user.js ***LowLevelPlayer Notes:*** From da7e4f1fe162279a9d2936e98ebb0219ecda1e81 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 8 Sep 2018 13:52:35 +0100 Subject: [PATCH 1236/3477] Update portal.js --- modules/portal.js | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 1be493cbf..62fdc5643 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -6,7 +6,6 @@ let zonePostpone = 0; function autoPortal() { if (!game.global.portalActive) return; - let selectedAutoPortalChallenge = autoTrimpSettings.AutoPortal.selected; switch (selectedAutoPortalChallenge) { case "Helium Per Hour": @@ -18,6 +17,7 @@ function autoPortal() { case "Toxicity": if (getPageSetting('MaxTox')) settingChanged("MaxTox"); + break; default: if (!game.global.challengeActive) { doPortal(selectedAutoPortalChallenge); @@ -30,12 +30,10 @@ function heliumPerHourPortal() { let OKtoPortal = false; if (!game.global.runningChallengeSquared) { const minZone = getPageSetting('HeHrDontPortalBefore'); - game.stats.bestHeliumHourThisRun.evaluate(); const bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; const bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; const myHeliumHr = game.stats.heliumHour.value(); - let heliumHrBuffer = Math.abs(getPageSetting('HeliumHrBuffer')); if (!aWholeNewWorld) heliumHrBuffer *= MODULES["portal"].bufferExceedFactor; @@ -47,7 +45,6 @@ function heliumPerHourPortal() { } if (heliumHrBuffer === 0 && !aWholeNewWorld) OKtoPortal = false; - if (OKtoPortal && zonePostpone === 0) { zonePostpone += 1; debug("My HeliumHr was: " + myHeliumHr + " & the Best HeliumHr was: " + bestHeHr + " at zone: " + bestHeHrZone, "portal"); @@ -78,21 +75,17 @@ function customZonePortal() { function dailyAutoPortal() { if (!game.global.portalActive) return; - let dailyPortalHeliumPerHour = getPageSetting('AutoPortalDaily') === 1; if (dailyPortalHeliumPerHour) { let OKtoPortal = false; if (!game.global.runningChallengeSquared) { const minZone = getPageSetting('dHeHrDontPortalBefore'); - game.stats.bestHeliumHourThisRun.evaluate(); const bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; const bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; const myHeliumHr = game.stats.heliumHour.value(); - let heliumHrBuffer = Math.abs(getPageSetting('dHeliumHrBuffer')); if (!aWholeNewWorld) { - heliumHrBuffer *= MODULES["portal"].bufferExceedFactor; const bufferExceeded = myHeliumHr < bestHeHr * (1 - (heliumHrBuffer / 100)); if (bufferExceeded && game.global.world >= minZone) { @@ -102,7 +95,6 @@ function dailyAutoPortal() { } if (heliumHrBuffer === 0 && !aWholeNewWorld) OKtoPortal = false; - if (OKtoPortal && zonePostpone === 0) { zonePostpone += 1; debug("My HeliumHr was: " + myHeliumHr + " & the Best HeliumHr was: " + bestHeHr + " at zone: " + bestHeHrZone, "portal"); @@ -142,10 +134,8 @@ function dailyAutoPortal() { function doPortal(challenge) { if (!game.global.portalActive) return; - manageMagmite(); manageHeirlooms(); - portalClicked(); let autoAllocateOn = getPageSetting('AutoAllocatePerks') === 1; if (autoAllocateOn && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) @@ -161,6 +151,7 @@ function doPortal(challenge) { activatePortal(); zonePostpone = 0; } + function manageMagmite() { let spendMagmitePortal = getPageSetting('spendmagmite') === 1; if (spendMagmitePortal) autoMagmiteSpender(); @@ -176,7 +167,6 @@ function runDaily(challenge) { selectChallenge('Daily'); checkCompleteDailies(); let lastUnattemptedDaily = selectDaily(); - let noAvailableDailies = lastUnattemptedDaily === 1; if (noAvailableDailies) { debug("All available Dailies already completed.", "portal"); @@ -208,7 +198,6 @@ function finishChallengeSquared() { function findOutCurrentPortalLevel() { const autoPortalSetting = getPageSetting("AutoPortal"); - let zoneToPortalAt = -1; switch (autoPortalSetting) { case "Off": From c4197a5ba2a21fcedf90baa08e852888581f8c9d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 8 Sep 2018 14:12:43 +0100 Subject: [PATCH 1237/3477] Update portal.js --- modules/portal.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 62fdc5643..fa84312c3 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -17,7 +17,6 @@ function autoPortal() { case "Toxicity": if (getPageSetting('MaxTox')) settingChanged("MaxTox"); - break; default: if (!game.global.challengeActive) { doPortal(selectedAutoPortalChallenge); @@ -222,7 +221,7 @@ function findOutCurrentPortalLevel() { Watch: 181, Corrupted: 191 }[autoPortalSetting]; - challengeEndZone && (zoneToPortalAt = challengeEndZone); + zoneToPortalAt = challengeEndZone } return zoneToPortalAt; } From ce8001f2517791dd8259e35567fde1e5b8daba50 Mon Sep 17 00:00:00 2001 From: Novanet Date: Sat, 8 Sep 2018 14:57:06 +0100 Subject: [PATCH 1238/3477] Updated .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9f11b755a..29949d790 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .idea/ +*.diff From 638b3e064d521cb02d2544abaa74f12d684f8b3b Mon Sep 17 00:00:00 2001 From: Novanet Date: Sat, 8 Sep 2018 15:15:34 +0100 Subject: [PATCH 1239/3477] Update scryer.js Nature scrying will now obey void scrying settings --- modules/scryer.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 3aa90f4f6..18512d699 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -88,7 +88,9 @@ function useScryerStance() { let willScryForNature = (!onMapsScreen && useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); - use_scryer = use_scryer || willScryForNature; + if (!onVoidMap || (onVoidMap && !scryInVoidNever)) { + use_scryer = use_scryer || willScryForNature; + } //check Corrupted Force const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; From c0ffbe4467e8815793ea6481bb4b7c0b6554aad4 Mon Sep 17 00:00:00 2001 From: Novanet Date: Sat, 8 Sep 2018 15:36:46 +0100 Subject: [PATCH 1240/3477] Update scryer.js Fixed boolean logic that made no sense, scryer wasn't really working properly --- modules/scryer.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 18512d699..53af4f801 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -47,8 +47,8 @@ function useScryerStance() { use_scry = use_scry || (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); use_scry = use_scry || (!onMapsScreen && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) - || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) - || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); + || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) + || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); //check Corrupted Never const currentEnemy = getCurrentEnemy(1); @@ -85,9 +85,9 @@ function useScryerStance() { use_scryer = use_scryer || (inVoidOnMapsScreen && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); use_scryer = use_scryer || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); - let willScryForNature = (!onMapsScreen && useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) - || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) - || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); + let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) + || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) + || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); if (!onVoidMap || (onVoidMap && !scryInVoidNever)) { use_scryer = use_scryer || willScryForNature; } @@ -144,7 +144,7 @@ function useScryerStance() { setPageSetting('ScryerUseWhenOverkill', false); if (scryForOverkill && !onMapsScreen && isActiveSpireAT() && scryInSpireNever) scryForOverkill = false; - if (scryForOverkill && hasOverkillLevels && useScryerEnabled) { + if (scryForOverkill && hasOverkillLevels && useScryerEnabled && use_scryer) { const minDamage = calcOurDmg("min", false, true); const Sstance = 0.5; const ovkldmg = minDamage * Sstance * (game.portal.Overkill.level * 0.005); @@ -163,7 +163,7 @@ function useScryerStance() { const valid_max = max_zone <= 0 || game.global.world < max_zone; const onlyScryForMinMaxEnabled = getPageSetting('onlyminmaxworld') === true; - if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { + if (use_scryer && useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { if (okToSwitchStance) setFormation(4); wantToScry = true; From 874488fe6e6c72540aeeef4b1322fd79d1ea92c5 Mon Sep 17 00:00:00 2001 From: Novanet Date: Sat, 8 Sep 2018 16:51:36 +0100 Subject: [PATCH 1241/3477] Auto Tirmple is no longer restricted to meditate and trapper --- modules/maps.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index ff9862149..b793e3f94 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -280,15 +280,15 @@ function autoMap() { selectedMap = theMap.id; break; } - var dont = game.global.runningChallengeSquared; - if (theMap.name == 'The Block' && !game.upgrades.Shieldblock.allowed && ((game.global.challengeActive == "Scientist" || game.global.challengeActive == "Trimp") && !dont || getPageSetting('BuyShieldblock'))) { + var runningC2 = game.global.runningChallengeSquared; + if (theMap.name == 'The Block' && !game.upgrades.Shieldblock.allowed && ((game.global.challengeActive == "Scientist" || game.global.challengeActive == "Trimp") && !runningC2 || getPageSetting('BuyShieldblock'))) { var theMapDifficulty = Math.ceil(theMap.difficulty / 2); if (game.global.world < 11 + theMapDifficulty) continue; selectedMap = theMap.id; break; } var treasure = getPageSetting('TrimpleZ'); - if (theMap.name == 'Trimple Of Doom' && (!dont && (game.global.challengeActive == "Meditate" || game.global.challengeActive == "Trapper") && game.mapUnlocks.AncientTreasure.canRunOnce && game.global.world >= treasure)) { + if (theMap.name == 'Trimple Of Doom' && (!runningC2 && game.mapUnlocks.AncientTreasure.canRunOnce && game.global.world >= treasure)) { var theMapDifficulty = Math.ceil(theMap.difficulty / 2); if ((game.global.world < 33 + theMapDifficulty) || treasure > -33 && treasure < 33) continue; selectedMap = theMap.id; @@ -296,7 +296,7 @@ function autoMap() { setPageSetting('TrimpleZ', 0); break; } - if (!dont) { + if (!runningC2) { if (theMap.name == 'The Prison' && (game.global.challengeActive == "Electricity" || game.global.challengeActive == "Mapocalypse")) { var theMapDifficulty = Math.ceil(theMap.difficulty / 2); if (game.global.world < 80 + theMapDifficulty) continue; From 0d97aa9641e82071ede4c64aad4fe0dc00bdd143 Mon Sep 17 00:00:00 2001 From: Novanet Date: Sat, 8 Sep 2018 19:13:38 +0100 Subject: [PATCH 1242/3477] Updated scryer.js Removed fault use_scry checks --- modules/scryer.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 53af4f801..e078c08ab 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -59,7 +59,7 @@ function useScryerStance() { let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; isCorruptedCell = isCorruptedCell || (onMapsScreen && isMagamaCell); isCorruptedCell = isCorruptedCell || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((isCorruptedCell && scryForCorruptedCellsNever || (use_scry))) { + if ((isCorruptedCell && scryForCorruptedCellsNever)) { autostancefunction(); wantToScry = false; return; @@ -70,7 +70,7 @@ function useScryerStance() { let ishealthy = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; ishealthy = ishealthy || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((ishealthy && scryForHealthyCellsNever || (use_scry))) { + if ((ishealthy && scryForHealthyCellsNever)) { autostancefunction(); wantToScry = false; return; @@ -86,8 +86,8 @@ function useScryerStance() { use_scryer = use_scryer || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) - || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) - || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); + || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) + || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); if (!onVoidMap || (onVoidMap && !scryInVoidNever)) { use_scryer = use_scryer || willScryForNature; } @@ -163,7 +163,7 @@ function useScryerStance() { const valid_max = max_zone <= 0 || game.global.world < max_zone; const onlyScryForMinMaxEnabled = getPageSetting('onlyminmaxworld') === true; - if (use_scryer && useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { + if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { if (okToSwitchStance) setFormation(4); wantToScry = true; From 6c553c9630890b32fb4e2adf961bcdc87366271c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 10:00:48 +0100 Subject: [PATCH 1243/3477] Update scryer.js --- modules/scryer.js | 50 ++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index e078c08ab..f96bfe18a 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -11,7 +11,6 @@ function useScryerStance() { const inPoisonZone = getEmpowerment() === "Poison"; const inWindZone = getEmpowerment() === "Wind"; const inIceZone = getEmpowerment() === "Ice"; - const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; @@ -26,29 +25,25 @@ function useScryerStance() { } //Never - let use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; - use_scry = use_scry || game.global.world <= 60; - + let neverScry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; const vmScryerEnabled = getPageSetting('scryvoidmaps') === true; const scryInMapsNever = getPageSetting('ScryerUseinMaps2') === 0; const scryInVoidNever = getPageSetting('ScryerUseinVoidMaps2') === 0; const scryInSpireNever = getPageSetting('ScryerUseinSpire2') === 0; - const inVoidOnMapsScreen = onMapsScreen && onVoidMap; - - use_scry = use_scry || (useScryerEnabled && onMapsScreen && scryInMapsNever && !onVoidMap); - use_scry = use_scry || (inVoidOnMapsScreen && (scryInVoidNever && (!useScryerEnabled && !vmScryerEnabled && !inDaily) || (!useScryerEnabled && !dailyScryInVoid && inDaily))); - use_scry = use_scry || (!onMapsScreen && isActiveSpireAT() && scryInSpireNever); - const scryOnBossNeverAboveVoid = getPageSetting('ScryerSkipBoss2') === 1; - const currentZoneBelowVMZone = game.global.world < getPageSetting('VoidMaps'); + const currentZoneBelowVMZone = game.global.world >= getPageSetting('VoidMaps'); const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; - const onBossCell = game.global.lastClearedCell === 98; + const onBossCell = game.global.lastClearedCell >= 98; - use_scry = use_scry || (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); - use_scry = use_scry || (!onMapsScreen && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) - || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) - || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); + neverScry = neverScry || game.global.world <= 60; + neverScry = neverScry || (useScryerEnabled && onMapsScreen && scryInMapsNever && !onVoidMap); + neverScry = neverScry || (inVoidOnMapsScreen && (scryInVoidNever && (!useScryerEnabled && !vmScryerEnabled && !inDaily) || (!useScryerEnabled && !dailyScryInVoid && inDaily))); + neverScry = neverScry || (!onMapsScreen && isActiveSpireAT() && scryInSpireNever); + neverScry = neverScry || (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); + neverScry = neverScry || (!onMapsScreen && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) + || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) + || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); //check Corrupted Never const currentEnemy = getCurrentEnemy(1); @@ -59,18 +54,19 @@ function useScryerStance() { let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; isCorruptedCell = isCorruptedCell || (onMapsScreen && isMagamaCell); isCorruptedCell = isCorruptedCell || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((isCorruptedCell && scryForCorruptedCellsNever)) { + if ((isCorruptedCell && scryForCorruptedCellsNever) || neverScry) { autostancefunction(); wantToScry = false; return; } + //check Healthy never const currentEnemyHealth = getCurrentEnemy(1); const scryForHealthyCellsNever = getPageSetting('ScryerSkipHealthy') === 0; let ishealthy = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; ishealthy = ishealthy || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((ishealthy && scryForHealthyCellsNever)) { + if ((ishealthy && scryForHealthyCellsNever) || neverScry) { autostancefunction(); wantToScry = false; return; @@ -81,29 +77,30 @@ function useScryerStance() { let scryinVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; - let use_scryer = useScryerEnabled && onMapsScreen && scryInMapsForce; - use_scryer = use_scryer || (inVoidOnMapsScreen && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); - use_scryer = use_scryer || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); + let forceScry = useScryerEnabled && onMapsScreen && scryInMapsForce; + forceScry = forceScry || (inVoidOnMapsScreen && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); + forceScry = forceScry || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); if (!onVoidMap || (onVoidMap && !scryInVoidNever)) { - use_scryer = use_scryer || willScryForNature; + forceScry = forceScry || willScryForNature; } //check Corrupted Force const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; - if ((isCorruptedCell && scryForCorruptedCellsForce && useScryerEnabled) || (use_scryer)) { + if ((isCorruptedCell && scryForCorruptedCellsForce && useScryerEnabled) || (forceScry)) { setFormation(4); wantToScry = true; return; } - //check healthy force + + //check Healthy force const scryForHealthyCellsForce = getPageSetting('ScryerSkipHealthy') === 1; - if ((ishealthy && scryForHealthyCellsForce && useScryerEnabled) || (use_scryer)) { + if ((ishealthy && scryForHealthyCellsForce && useScryerEnabled) || (forceScry)) { setFormation(4); wantToScry = true; return; @@ -144,7 +141,7 @@ function useScryerStance() { setPageSetting('ScryerUseWhenOverkill', false); if (scryForOverkill && !onMapsScreen && isActiveSpireAT() && scryInSpireNever) scryForOverkill = false; - if (scryForOverkill && hasOverkillLevels && useScryerEnabled && use_scryer) { + if (scryForOverkill && hasOverkillLevels && useScryerEnabled && forceScry) { const minDamage = calcOurDmg("min", false, true); const Sstance = 0.5; const ovkldmg = minDamage * Sstance * (game.portal.Overkill.level * 0.005); @@ -171,6 +168,5 @@ function useScryerStance() { else { autostancefunction(); wantToScry = false; - } } From 14799e71936286eccc158bf679d68274a7cae082 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 10:28:13 +0100 Subject: [PATCH 1244/3477] Update other.js --- modules/other.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index a03d83dc2..2c971c7c1 100644 --- a/modules/other.js +++ b/modules/other.js @@ -7,22 +7,27 @@ function isBelowThreshold(a){return a!=game.global.world} function autoGoldenUpgradesAT(setting) { var num = getAvailableGoldenUpgrades(); if (num == 0) return; - if (setting == "Void 56") + if (setting == "Void 56" || "Void 56 + Battle") setting = "Void"; if (setting == "Battle") setting = "Battle"; - if (setting == "Void 60") { + if (setting == "Void 60" || "Void 60 + Battle") { setting = "Void"; var nextVoidAmt = game.goldenUpgrades.Void.nextAmt().toFixed(2); - if (nextVoidAmt == 0.12) + if (nextVoidAmt == 0.12 && (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60" && game.global.runningChallengeSquared)) setting = "Helium"; + if (nextVoidAmt == 0.12 && && (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.runningChallengeSquared)) + setting = "Battle"; } var success = buyGoldenUpgrade(setting); if (!success && setting == "Void") { num = getAvailableGoldenUpgrades(); if (num == 0) return; + if ((autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60" && game.global.runningChallengeSquared) || (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 56" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 56" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 56" && game.global.runningChallengeSquared)) setting = "Helium"; - buyGoldenUpgrade(setting); + if (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.runningChallengeSquared) + setting = "Battle"; + buyGoldenUpgrade(setting); } } From 5a06d9268c76b6eb589cfb3c80c73c85bd5dc6c3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 10:28:18 +0100 Subject: [PATCH 1245/3477] Update SettingsGUI.js --- SettingsGUI.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 6f8d2b86f..5c683f97a 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -93,7 +93,7 @@ function initializeAllSettings() { createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); document.getElementById('TrapTrimps').parentNode.insertAdjacentHTML('afterend','
    '); - //New Line 3 + //Portal Line + Pause createSetting('AutoPortal', 'AutoPortal', 'Automatically portal. Will NOT auto-portal if you have a challenge active, the challenge setting dictates which challenge it will select for the next run. All challenge settings will portal right after the challenge ends, regardless. Helium Per Hour only portals at cell 1 of the first level where your He/Hr went down even slightly compared to the current runs Best He/Hr. Take note, there is a Buffer option, which is like a grace percentage of how low it can dip without triggering. Setting a buffer will portal mid-zone if you exceed 5x of the buffer. CAUTION: Selecting He/hr may immediately portal you if its lower-(use Pause AutoTrimps button to pause the script first to avoid this)', 'dropdown', 'Off', ['Off', 'Helium Per Hour', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted', 'Custom'], "Core"); createSetting('HeliumHourChallenge', 'Portal Challenge', 'Automatically portal into this challenge when using helium per hour or custom autoportal. Custom portals after cell 100 of the zone specified. Do not choose a challenge if you havent unlocked it. ', 'dropdown', 'None', ['None', 'Balance', 'Decay', 'Electricity', 'Life', 'Crushed', 'Nom', 'Toxicity', 'Watch', 'Lead', 'Corrupted'], "Core"); document.getElementById("HeliumHourChallengeLabel").innerHTML = "Portal Challenge:"; @@ -378,9 +378,9 @@ function initializeAllSettings() { //Golden - createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'Buys Golden Upgrades. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); - createSetting('dAutoGoldenUpgrades', 'Daily AutoGoldenUpgrades', 'Buys Golden Upgrades for Dailiess. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Helium", "Battle", "Void 56", "Void 60"], 'Golden'); - createSetting('cAutoGoldenUpgrades', 'C2 AutoGoldenUpgrades', 'Buys Golden Upgrades for C2s. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Battle", "Void 56", "Void 60"], 'Golden'); + createSetting('AutoGoldenUpgrades', 'AutoGoldenUpgrades', 'Buys Golden Upgrades. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Helium", "Battle", "Void 56", "Void 60", "Void 56 + Battle", "Void 60 + Battle"], 'Golden'); + createSetting('dAutoGoldenUpgrades', 'Daily AutoGoldenUpgrades', 'Buys Golden Upgrades for Dailiess. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Helium", "Battle", "Void 56", "Void 60", "Void 56 + Battle", "Void 60 + Battle"], 'Golden'); + createSetting('cAutoGoldenUpgrades', 'C2 AutoGoldenUpgrades', 'Buys Golden Upgrades for C2s. Helium buys all Helium golden upgrades. Battle buys all Battle golden upgrades. Void 56 buys 7 Void golden upgrades (max number you can buy) then buys helium golden upgrades. Void 60 buys golden upgrades in a way that gives you the maximum void drop chance, then buys helium golden upgrades. Choose Void 56 if your Achievement % is lower than 2500%, and Void 60 if its higher. But dont let me tell you how to play the game, do what you want. ', 'dropdown', 'Off', ["Off", "Battle", "Void 56", "Void 60", "Void 56 + Battle", "Void 60 + Battle"], 'Golden'); From 5d5632dd1df30d23a10f234a4d348284d81ae5e6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 10:30:15 +0100 Subject: [PATCH 1246/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 2c971c7c1..374fb7ba0 100644 --- a/modules/other.js +++ b/modules/other.js @@ -16,7 +16,7 @@ function autoGoldenUpgradesAT(setting) { var nextVoidAmt = game.goldenUpgrades.Void.nextAmt().toFixed(2); if (nextVoidAmt == 0.12 && (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60" && game.global.runningChallengeSquared)) setting = "Helium"; - if (nextVoidAmt == 0.12 && && (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.runningChallengeSquared)) + if (nextVoidAmt == 0.12 && (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.runningChallengeSquared)) setting = "Battle"; } var success = buyGoldenUpgrade(setting); From 28d0200914f98db0e7d21d0c9dd65956f51bbef3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 10:31:14 +0100 Subject: [PATCH 1247/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 374fb7ba0..42d6225fd 100644 --- a/modules/other.js +++ b/modules/other.js @@ -7,11 +7,11 @@ function isBelowThreshold(a){return a!=game.global.world} function autoGoldenUpgradesAT(setting) { var num = getAvailableGoldenUpgrades(); if (num == 0) return; - if (setting == "Void 56" || "Void 56 + Battle") + if (setting == "Void 56" || setting == "Void 56 + Battle") setting = "Void"; if (setting == "Battle") setting = "Battle"; - if (setting == "Void 60" || "Void 60 + Battle") { + if (setting == "Void 60" || setting == "Void 60 + Battle") { setting = "Void"; var nextVoidAmt = game.goldenUpgrades.Void.nextAmt().toFixed(2); if (nextVoidAmt == 0.12 && (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60" && game.global.runningChallengeSquared)) From c2476787de25e70da74a1e16060e7d1d0e1056da Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 10:45:16 +0100 Subject: [PATCH 1248/3477] Update other.js --- modules/other.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index 42d6225fd..756c01e10 100644 --- a/modules/other.js +++ b/modules/other.js @@ -14,18 +14,18 @@ function autoGoldenUpgradesAT(setting) { if (setting == "Void 60" || setting == "Void 60 + Battle") { setting = "Void"; var nextVoidAmt = game.goldenUpgrades.Void.nextAmt().toFixed(2); - if (nextVoidAmt == 0.12 && (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60" && game.global.runningChallengeSquared)) + if (nextVoidAmt == 0.12 && (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60" && !game.global.dailyChallenge.seed && !game.global.runningChallengeSquared || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60" && game.global.runningChallengeSquared)) setting = "Helium"; - if (nextVoidAmt == 0.12 && (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.runningChallengeSquared)) + if (nextVoidAmt == 0.12 && (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60 + Battle" && !game.global.dailyChallenge.seed && !game.global.runningChallengeSquared || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.runningChallengeSquared)) setting = "Battle"; } var success = buyGoldenUpgrade(setting); if (!success && setting == "Void") { num = getAvailableGoldenUpgrades(); if (num == 0) return; - if ((autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60" && game.global.runningChallengeSquared) || (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 56" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 56" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 56" && game.global.runningChallengeSquared)) + if ((autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60" && !game.global.dailyChallenge.seed && !game.global.runningChallengeSquared || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60" && game.global.runningChallengeSquared) || (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 56" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 56" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 56" && game.global.runningChallengeSquared)) setting = "Helium"; - if (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.runningChallengeSquared) + if (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60 + Battle" && !game.global.dailyChallenge.seed && !game.global.runningChallengeSquared || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.runningChallengeSquared) setting = "Battle"; buyGoldenUpgrade(setting); } From f265adb45b206234005bd425d01f7637149f5f24 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 10:51:34 +0100 Subject: [PATCH 1249/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 756c01e10..63b6a2938 100644 --- a/modules/other.js +++ b/modules/other.js @@ -23,9 +23,9 @@ function autoGoldenUpgradesAT(setting) { if (!success && setting == "Void") { num = getAvailableGoldenUpgrades(); if (num == 0) return; - if ((autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60" && !game.global.dailyChallenge.seed && !game.global.runningChallengeSquared || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60" && game.global.runningChallengeSquared) || (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 56" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 56" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 56" && game.global.runningChallengeSquared)) + if ((autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60" || "Void 56" && !game.global.dailyChallenge.seed && !game.global.runningChallengeSquared || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60" || "Void 56" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60" || "Void 56" && game.global.runningChallengeSquared) || (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 56" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 56" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 56" && game.global.runningChallengeSquared)) setting = "Helium"; - if (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60 + Battle" && !game.global.dailyChallenge.seed && !game.global.runningChallengeSquared || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60 + Battle" && game.global.runningChallengeSquared) + if (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60 + Battle" || "Void 56 + Battle" && !game.global.dailyChallenge.seed && !game.global.runningChallengeSquared || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60 + Battle" || "Void 56 + Battle" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60 + Battle" || "Void 56 + Battle" && game.global.runningChallengeSquared) setting = "Battle"; buyGoldenUpgrade(setting); } From e7f1d350e057dc86dc96a329fb61342ec5e332d3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 11:04:05 +0100 Subject: [PATCH 1250/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 63b6a2938..0f282b92c 100644 --- a/modules/other.js +++ b/modules/other.js @@ -23,9 +23,9 @@ function autoGoldenUpgradesAT(setting) { if (!success && setting == "Void") { num = getAvailableGoldenUpgrades(); if (num == 0) return; - if ((autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60" || "Void 56" && !game.global.dailyChallenge.seed && !game.global.runningChallengeSquared || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60" || "Void 56" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60" || "Void 56" && game.global.runningChallengeSquared) || (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 56" && game.global.challengeActive == 0 || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 56" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 56" && game.global.runningChallengeSquared)) + if (((autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60" || autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 56") && !game.global.dailyChallenge.seed && !game.global.runningChallengeSquared) || ((autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60" || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 56") && game.global.dailyChallenge.seed) || ((autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60" || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 56") && game.global.runningChallengeSquared)) setting = "Helium"; - if (autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60 + Battle" || "Void 56 + Battle" && !game.global.dailyChallenge.seed && !game.global.runningChallengeSquared || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60 + Battle" || "Void 56 + Battle" && game.global.dailyChallenge.seed || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60 + Battle" || "Void 56 + Battle" && game.global.runningChallengeSquared) + if (((autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 60 + Battle" || autoTrimpSettings.AutoGoldenUpgrades.selected == "Void 56 + Battle") && !game.global.dailyChallenge.seed && !game.global.runningChallengeSquared) || ((autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 60 + Battle" || autoTrimpSettings.dAutoGoldenUpgrades.selected == "Void 56 + Battle") && game.global.dailyChallenge.seed) || ((autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 60 + Battle" || autoTrimpSettings.cAutoGoldenUpgrades.selected == "Void 56 + Battle") && game.global.runningChallengeSquared)) setting = "Battle"; buyGoldenUpgrade(setting); } From 0309df959b46414b7792ee0fc4526d7479e902aa Mon Sep 17 00:00:00 2001 From: Novanet Date: Sun, 9 Sep 2018 11:06:20 +0100 Subject: [PATCH 1251/3477] Update scryer.js Code cleanup --- modules/scryer.js | 69 +++++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index f96bfe18a..3680c1e6a 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -4,7 +4,7 @@ function useScryerStance() { const AutoStance = getPageSetting('AutoStance'); const useScryerEnabled = getPageSetting('UseScryerStance') === true; - const onMapsScreen = game.global.mapsActive; + const onMap = game.global.mapsActive; const onVoidMap = game.global.mapsActive && getCurrentMapObject().location === "Void"; const inDaily = game.global.challengeActive === "Daily"; const dailyScryInVoid = getPageSetting('dscryvoidmaps') === true; @@ -30,20 +30,32 @@ function useScryerStance() { const scryInMapsNever = getPageSetting('ScryerUseinMaps2') === 0; const scryInVoidNever = getPageSetting('ScryerUseinVoidMaps2') === 0; const scryInSpireNever = getPageSetting('ScryerUseinSpire2') === 0; - const inVoidOnMapsScreen = onMapsScreen && onVoidMap; + const inVoidMap = onMap && onVoidMap; const scryOnBossNeverAboveVoid = getPageSetting('ScryerSkipBoss2') === 1; const currentZoneBelowVMZone = game.global.world >= getPageSetting('VoidMaps'); const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; const onBossCell = game.global.lastClearedCell >= 98; neverScry = neverScry || game.global.world <= 60; - neverScry = neverScry || (useScryerEnabled && onMapsScreen && scryInMapsNever && !onVoidMap); - neverScry = neverScry || (inVoidOnMapsScreen && (scryInVoidNever && (!useScryerEnabled && !vmScryerEnabled && !inDaily) || (!useScryerEnabled && !dailyScryInVoid && inDaily))); - neverScry = neverScry || (!onMapsScreen && isActiveSpireAT() && scryInSpireNever); - neverScry = neverScry || (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); - neverScry = neverScry || (!onMapsScreen && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) - || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) - || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); + + let neverScryInMaps = useScryerEnabled && onMap && scryInMapsNever && !onVoidMap; + neverScry = neverScry || neverScryInMaps; + + let neverScryNormalVoid = !useScryerEnabled && !vmScryerEnabled && !inDaily; + let neverScryDailyVoid = !useScryerEnabled && !dailyScryInVoid && inDaily; + let neverScryInVoid = (inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid)); + neverScry = neverScry || neverScryInVoid; + + let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; + neverScry = neverScry || neverScryInSpire; + + let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); + neverScry = neverScry || neverScryOnBoss; + + let neverScryInNature = (!onMap && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) + || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) + || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); + neverScry = neverScry || neverScryInNature; //check Corrupted Never const currentEnemy = getCurrentEnemy(1); @@ -52,9 +64,14 @@ function useScryerStance() { const scryForCorruptedCellsNever = getPageSetting('ScryerSkipCorrupteds2') === 0; let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; - isCorruptedCell = isCorruptedCell || (onMapsScreen && isMagamaCell); - isCorruptedCell = isCorruptedCell || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((isCorruptedCell && scryForCorruptedCellsNever) || neverScry) { + isCorruptedCell = isCorruptedCell || (onMap && isMagamaCell); + + let inCorruptionVoid = inVoidMap && game.global.world >= corruptionStartZone; + isCorruptedCell = isCorruptedCell || inCorruptionVoid; + + neverScry = neverScry || isCorruptedCell && scryForCorruptedCellsNever; + + if (neverScry) { autostancefunction(); wantToScry = false; return; @@ -64,9 +81,11 @@ function useScryerStance() { const currentEnemyHealth = getCurrentEnemy(1); const scryForHealthyCellsNever = getPageSetting('ScryerSkipHealthy') === 0; - let ishealthy = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; - ishealthy = ishealthy || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((ishealthy && scryForHealthyCellsNever) || neverScry) { + let isHealthyCell = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; + isHealthyCell = isHealthyCell || (inVoidMap && game.global.world >= corruptionStartZone); + neverScry = neverScry || isHealthyCell && scryForHealthyCellsNever; + + if (neverScry) { autostancefunction(); wantToScry = false; return; @@ -74,12 +93,14 @@ function useScryerStance() { //Force let scryInMapsForce = getPageSetting('ScryerUseinMaps2') === 1; - let scryinVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; + let scryInVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; - let forceScry = useScryerEnabled && onMapsScreen && scryInMapsForce; - forceScry = forceScry || (inVoidOnMapsScreen && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); - forceScry = forceScry || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); + let forceScry = useScryerEnabled && onMap && scryInMapsForce; + forceScry = forceScry || (inVoidMap && ((scryInVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); + + let forceScryInSpire = (!onMap && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); + forceScry = forceScry || forceScryInSpire; let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) @@ -90,8 +111,9 @@ function useScryerStance() { //check Corrupted Force const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; + forceScry = forceScry || useScryerEnabled && scryForCorruptedCellsForce && isCorruptedCell; - if ((isCorruptedCell && scryForCorruptedCellsForce && useScryerEnabled) || (forceScry)) { + if (forceScry) { setFormation(4); wantToScry = true; return; @@ -99,8 +121,9 @@ function useScryerStance() { //check Healthy force const scryForHealthyCellsForce = getPageSetting('ScryerSkipHealthy') === 1; + forceScry = forceScry || isHealthyCell && scryForHealthyCellsForce && useScryerEnabled; - if ((ishealthy && scryForHealthyCellsForce && useScryerEnabled) || (forceScry)) { + if (forceScry) { setFormation(4); wantToScry = true; return; @@ -139,7 +162,7 @@ function useScryerStance() { let scryForOverkill = getPageSetting('ScryerUseWhenOverkill'); if (scryForOverkill && noOverkillLevels) setPageSetting('ScryerUseWhenOverkill', false); - if (scryForOverkill && !onMapsScreen && isActiveSpireAT() && scryInSpireNever) + if (scryForOverkill && !onMap && isActiveSpireAT() && scryInSpireNever) scryForOverkill = false; if (scryForOverkill && hasOverkillLevels && useScryerEnabled && forceScry) { const minDamage = calcOurDmg("min", false, true); @@ -160,7 +183,7 @@ function useScryerStance() { const valid_max = max_zone <= 0 || game.global.world < max_zone; const onlyScryForMinMaxEnabled = getPageSetting('onlyminmaxworld') === true; - if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { + if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMap)) { if (okToSwitchStance) setFormation(4); wantToScry = true; From d5abed1a368360e4d504ec2506b4299667b9ec35 Mon Sep 17 00:00:00 2001 From: Novanet Date: Sun, 9 Sep 2018 11:14:20 +0100 Subject: [PATCH 1252/3477] Made the lets cleaner --- modules/scryer.js | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 3680c1e6a..a900f524c 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -36,37 +36,33 @@ function useScryerStance() { const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; const onBossCell = game.global.lastClearedCell >= 98; - neverScry = neverScry || game.global.world <= 60; - let neverScryInMaps = useScryerEnabled && onMap && scryInMapsNever && !onVoidMap; - neverScry = neverScry || neverScryInMaps; - let neverScryNormalVoid = !useScryerEnabled && !vmScryerEnabled && !inDaily; let neverScryDailyVoid = !useScryerEnabled && !dailyScryInVoid && inDaily; - let neverScryInVoid = (inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid)); - neverScry = neverScry || neverScryInVoid; - + let neverScryInVoid = inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid); let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; - neverScry = neverScry || neverScryInSpire; - let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); - neverScry = neverScry || neverScryOnBoss; - let neverScryInNature = (!onMap && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); + + neverScry = neverScry || game.global.world <= 60; + neverScry = neverScry || neverScryInMaps; + neverScry = neverScry || neverScryInVoid; + neverScry = neverScry || neverScryInSpire; + neverScry = neverScry || neverScryOnBoss; neverScry = neverScry || neverScryInNature; //check Corrupted Never const currentEnemy = getCurrentEnemy(1); - const isMagamaCell = mutations.Magma.active(); + const isMagmaCell = mutations.Magma.active(); const corruptionStartZone = mutations.Corruption.start(); const scryForCorruptedCellsNever = getPageSetting('ScryerSkipCorrupteds2') === 0; let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; - isCorruptedCell = isCorruptedCell || (onMap && isMagamaCell); - let inCorruptionVoid = inVoidMap && game.global.world >= corruptionStartZone; + + isCorruptedCell = isCorruptedCell || (onMap && isMagmaCell); isCorruptedCell = isCorruptedCell || inCorruptionVoid; neverScry = neverScry || isCorruptedCell && scryForCorruptedCellsNever; @@ -96,15 +92,16 @@ function useScryerStance() { let scryInVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; - let forceScry = useScryerEnabled && onMap && scryInMapsForce; - forceScry = forceScry || (inVoidMap && ((scryInVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); + let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) + || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) + || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); + let forceScry = useScryerEnabled && onMap && scryInMapsForce; let forceScryInSpire = (!onMap && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); + + forceScry = forceScry || (inVoidMap && ((scryInVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); forceScry = forceScry || forceScryInSpire; - let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) - || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) - || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); if (!onVoidMap || (onVoidMap && !scryInVoidNever)) { forceScry = forceScry || willScryForNature; } From 08d5249f98b434bbda39d7c83f12222b1cf0b2c0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 11:28:38 +0100 Subject: [PATCH 1253/3477] Update utils.js --- modules/utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/utils.js b/modules/utils.js index 1d944b606..d0e42ef2d 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -50,6 +50,7 @@ function serializeSettings() { case 'boolean': return v[k] = el.enabled, v; case 'value': + case 'multiValue': case 'valueNegative': case 'multitoggle': return v[k] = el.value, v; From 38353a0538bcad69d01b0d5f06d49ef4cea60cab Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 11:34:48 +0100 Subject: [PATCH 1254/3477] Update utils.js --- modules/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/utils.js b/modules/utils.js index d0e42ef2d..59085cde4 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -62,7 +62,7 @@ function serializeSettings() { } function serializeSettings550() { - return '{"ManualGather2":2,"ATversion":"2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0","BetterAutoFight":3,"AutoStance":3,"BuyStorage":true,"BuyBuildings":true,"BuyUpgrades":true,"BuyJobs":true,"TrapTrimps":false,"AutoHeirlooms":true,"HireScientists":true,"WorkerRatios":false,"ManageBreedtimer":false,"AutoPortal":"Custom","HeliumHourChallenge":"Corrupted","CustomAutoPortal":559,"HeHrDontPortalBefore":496,"HeliumHrBuffer":3,"AutoFinishDaily":true,"AutoFinishDailyZone":0,"AutoStartDaily":false,"PauseScript":false,"BuyArmor":true,"BuyArmorUpgrades":true,"BuyWeapons":true,"BuyWeaponUpgrades":true,"BuyShieldblock":false,"Prestige":"Dagadder","PrestigeBackup":{"selected":"Dagadder","id":"PrestigeBackup","name":"PrestigeBackup"},"DynamicPrestige2":-1,"PrestigeSkipMode":false,"AlwaysArmorLvl2":true,"WaitTill60":true,"DelayArmorWhenNeeded":false,"CapEquip2":125,"AutoMaps":1,"DynamicSiphonology":true,"LowerFarmingZone":true,"MinutestoFarmBeforeSpire":0,"RunBionicBeforeSpire":false,"ExitSpireCell":90,"CorruptionCalc":true,"FarmWhenNomStacks7":true,"VoidMaps":555,"RunNewVoids":false,"RunNewVoidsUntil":600,"VoidCheck":1,"MaxTox":false,"DisableFarm":true,"FarmerRatio":20,"LumberjackRatio":10,"MinerRatio":1000,"MaxScientists":"-1","MaxExplorers":3000,"MaxTrainers":-1,"MaxHut":100,"MaxHouse":0,"MaxMansion":0,"MaxHotel":0,"MaxResort":0,"MaxGateway":0,"MaxWormhole":0,"MaxCollector":0,"FirstGigastation":1,"DeltaGigastation":1,"MaxGym":"-1","MaxTribute":"-1","MaxNursery":-1,"BreedFire":false,"AutoMagmamancers":true,"WarpstationCap":true,"WarpstationWall3":-1,"WarpstationCoordBuy":true,"AutoRoboTrimp":230,"AutoGoldenUpgrades":"Void 60","AutoHeirlooms2":false,"AutoUpgradeHeirlooms":false,"TrainerCaptoTributes":"-1","NoNurseriesUntil":485,"AutoMagmiteSpender2":2,"ForceAbandon":true,"GymWall":-1,"DynamicGyms":true,"AutoAllocatePerks":1,"SpireBreedTimer":-1,"UseScryerStance":false,"ScryerUseWhenOverkill":false,"ScryerMinZone":481,"ScryerMaxZone":-1,"ScryerUseinMaps2":2,"ScryerUseinVoidMaps2":0,"ScryerUseinSpire2":0,"ScryerSkipBoss2":2,"ScryerSkipCorrupteds2":2,"ScryerDieToUseS":true,"SpamGeneral":true,"SpamUpgrades":false,"SpamEquipment":false,"SpamMaps":false,"SpamOther":false,"SpamBuilding":false,"SpamJobs":false,"ManualCoords":false,"TrimpleZ":0,"ScryerDieZ":230.6,"IgnoreCrits":2,"ForcePresZ":-1,"PreferMetal":false,"PreSpireNurseries":7000,"FinishC2":-1,"PowerSaving":0,"PrestigeSkip2":false,"AutoEggs":false,"UseAutoGen":1,"AutoGen2":3,"AutoGen2End":320,"AutoGen2SupplyEnd":false,"AutoGen3":0,"AutoGenDC":1,"AutoGenC2":1,"AutoGen2Override":1,"SupplyWall":1,"OneTimeOnly":false,"BuyOvclock":false,"IgnoreSpiresUntil":500,"goldStrat":"Max then Helium","goldAlternating":2,"goldZone":600,"MaxStacksForSpire":true,"UsePatience":false,"AutoNatureTokens":true,"AutoPoison":"Convert to Wind","AutoWind":"Empowerment","AutoIce":"Convert to Wind","MaxMapBonusAfterZone":-1,"SpamGraphs":false,"allowSettingsUpload":false,"EnhanceGrids":false,"EnableAFK":{"id":"EnableAFK","name":"Enable AFK","description":"Enables CPU and RAM saving AFK-mode","type":"action","value":1},"SpamMagmite":false,"SpamPerks":true,"analyticsID":"7f11701e-adc9-477c-a08d-2b66fe3ec2a2","ChangeLog":{"id":"ChangeLog","name":"Show Changelog","description":"Shows the changelog popup message that AT loads on startup in case you missed it.","type":"action","value":1},"AdvMapSpecialModifier":false,"GeneticistTimer":-1,"goldNoBattle":true,"BuyUpgradesNew":1,"AutoFinishDailyNew":0,"BuyBuildingsNew":1,"BuyJobsNew":2,"BuyArmorNew":1,"BuyWeaponsNew":1,"PrestigeSkip1_2":0,"RunNewVoidsUntilNew":0,"DailyVoidMod":570,"PlusMapVoidToggle":0,"Praidingzone":{"id":"Praidingzone","name":"P Raiding Z","description":"Raids Maps for prestiges at zone specified. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ","type":"multiValue","value":[495,531,540,545,551,555]},"BWraid":false,"BWraidingmin":-1,"BWraidingmax":{"id":"BWraidingmax","name":"Max BW to raid","description":"Raids BWs until zone specified. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Z to BW raid setting for details.","type":"multiValue","value":[615]},"lootdumpz":232,"lootdumpa":10000,"WindStackingMin":526,"ScryUseinPoison":-1,"ScryUseinWind":-1,"ScryUseinIce":-1,"BuyOneTimeOC":2,"AutoHeirloomsNew":2,"ShowSettings":true,"BWraidingz":{"id":"BWraidingz","name":"Z to BW Raid","description":"Raids BWs at zone specified. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.","type":"multiValue","value":[595]},"fastallocate":true,"VoidPraid":true,"trimpsnotdie":true,"gearamounttobuy":5,"Dailyportal":575,"dVoidPraid":true,"dPraidingzone":{"id":"dPraidingzone","name":"Daily P Raiding Z","description":"Raids Maps for prestiges at zone specified in Dailys. Example: 495, will raid Maps at 501. Once all gear is obtained from the map, it will revert back to regular farming. Extremely helpful for spire. Best used in poison zones. You can use multiple values like this 495,506,525! ","type":"multiValue","value":[480,491,495,510,525,531,540,546,551,555,566,570]},"Dailybwraid":false,"dBWraidingz":{"id":"dBWraidingz","name":"Daily Z to BW Raid","description":"Raids BWs at zone specified in dailys. Example: 495, will raid all BWs for all gear starting from 495. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Accepts comma separated lists, and raids up to the value in the corrsponding position in the Max BW to raid setting. So if this is set to 480,495 and Daily Max BW to Raid is set to 500,515 AT will BW raid up to 500 from 480, and 515 from 495. Make sure these lists are the same length or BW raiding may fail.","type":"multiValue","value":[495]},"dBWraidingmax":{"id":"dBWraidingmax","name":"Daily Max BW to raid","description":"Raids BWs until zone specified in dailys. Example: 515, will raid all BWs for all gear until 515. Will skip lower BWs if you have enough damage. Once all gear is obtained, will return to regular farming. Now accepts comma separated lists - see description of Daily Z to BW raid setting for details.","type":"multiValue","value":[515]},"dexitspirecell":-1,"WindStackingMax":195,"buyheliumy":-1,"buynojobsc":true,"Trimpicide":true,"fightforever":false,"use3daily":true,"windcutoff":90,"spireshitbuy":true,"hardcorewind":541,"PraidHarder":false,"PraidFarmFrags":false,"PraidBeforeFarm":false,"dPraidHarder":false,"dMaxPraidZone":{"id":"dMaxPraidZone","name":"Daily Max P Raid Z","description":"List of maximum zones to Praid on Dailies corresponding to the list specified in Daily Praiding Z. e.g. if Daily P raiding Z setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)","type":"multiValue","value":[-1]},"dPraidFarmFragsZ":{"id":"dPraidFarmFragsZ","name":"Daily Farm Frags Z","description":"P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments.","type":"multiValue","value":[-1]},"dPraidBeforeFarmZ":{"id":"dPraidBeforeFarmZ","name":"Dy Raid bef farm Z","description":"P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.","type":"multiValue","value":[-1]},"MaxPraidZone":{"id":"MaxPraidZone","name":"Max P Raid Zones","description":"List of maximum zones to Praid corresponding to the list specified in Praiding zones. e.g. if P raiding zones setting is 491,495 and this setting is 495,505, AT will P raid up to 495 from 491, and 505 from 495. Set to -1 to always buy highest available prestige map. If no corrsponding value, or value is invalid, defaults to max available (up to +10)","type":"multiValue","value":[505,535,545,555,561]},"PraidFarmFragsZ":{"id":"PraidFarmFragsZ","name":"Farm Fragments Z","description":"P Raiding harder: List of zones where we should farm fragments until we can afford the highest or target prestige map for P raiding. Set to -1 to never farm fragments. ","type":"multiValue","value":[-1]},"PraidBeforeFarmZ":{"id":"PraidBeforeFarmZ","name":"Raid before farm Z","description":"P Raiding harder: List of zones where we should P Raid as far as we can afford before trying to farm fragments to Praid the highest or target prestige map. Only occasionally useful, e.g. if it picks up a Speedexplorer or farming fragments is slow due to low damage. Set to -1 to never raid prestiges before farming fragents.","type":"multiValue","value":[-1]},"fuellater":300,"dWindStackingMin":511,"dWindStackingMax":190,"dwindcutoff":80,"dhardcorewind":526,"ScryerSkipHealthy":2,"addpoison":true,"amalcoord":true,"dAutoGoldenUpgrades":"Void 60","cAutoGoldenUpgrades":"Battle","dhardcorewindmax":"-1","cfightforever":true,"work":false,"in":false,"progress":false,"hardcorewindmax":"-1","dfightforever":true}'; + return '{"ManualGather2":2,"BetterAutoFight":3,"AutoStance":2,"TrapTrimps":false,"AutoPortal":"Custom","HeliumHourChallenge":"Corrupted","CustomAutoPortal":555,"HeHrDontPortalBefore":496,"HeliumHrBuffer":3,"AutoStartDaily":false,"PauseScript":false,"BuyShieldblock":false,"Prestige":"Dagadder","DynamicPrestige2":-1,"DelayArmorWhenNeeded":false,"CapEquip2":125,"AutoMaps":1,"DynamicSiphonology":true,"LowerFarmingZone":true,"MinutestoFarmBeforeSpire":0,"RunBionicBeforeSpire":false,"ExitSpireCell":90,"CorruptionCalc":true,"FarmWhenNomStacks7":true,"VoidMaps":555,"VoidCheck":1,"MaxTox":false,"DisableFarm":-1,"FarmerRatio":20,"LumberjackRatio":10,"MinerRatio":1000,"MaxScientists":"-1","MaxExplorers":3000,"MaxTrainers":-1,"MaxHut":100,"MaxHouse":0,"MaxMansion":0,"MaxHotel":0,"MaxResort":0,"MaxGateway":0,"MaxWormhole":0,"MaxCollector":0,"FirstGigastation":1,"DeltaGigastation":1,"MaxGym":"-1","MaxTribute":"-1","MaxNursery":-1,"AutoMagmamancers":true,"WarpstationCap":false,"WarpstationWall3":-1,"WarpstationCoordBuy":false,"AutoRoboTrimp":270,"AutoGoldenUpgrades":"Void 60","AutoUpgradeHeirlooms":false,"NoNurseriesUntil":700,"ForceAbandon":true,"GymWall":-1,"DynamicGyms":true,"AutoAllocatePerks":2,"SpireBreedTimer":-1,"UseScryerStance":false,"ScryerUseWhenOverkill":false,"ScryerMinZone":530,"ScryerMaxZone":-1,"ScryerUseinMaps2":0,"ScryerUseinVoidMaps2":0,"ScryerUseinSpire2":0,"ScryerSkipBoss2":0,"ScryerSkipCorrupteds2":2,"SpamGeneral":true,"SpamUpgrades":false,"SpamEquipment":false,"SpamMaps":false,"SpamOther":false,"SpamBuilding":false,"SpamJobs":false,"TrimpleZ":0,"ScryerDieZ":230.6,"IgnoreCrits":2,"ForcePresZ":-1,"PreferMetal":false,"PreSpireNurseries":7000,"FinishC2":-1,"PowerSaving":0,"UseAutoGen":1,"AutoGenDC":1,"AutoGenC2":1,"SupplyWall":1,"IgnoreSpiresUntil":500,"MaxStacksForSpire":true,"AutoNatureTokens":true,"AutoPoison":"Convert to Wind","AutoWind":"Empowerment","AutoIce":"Convert to Wind","MaxMapBonusAfterZone":-1,"SpamGraphs":false,"EnhanceGrids":false,"EnableAFK":{"id":"EnableAFK","name":"Enable AFK","description":"Enables CPU and RAM saving AFK-mode","type":"action","value":1},"SpamMagmite":false,"SpamPerks":true,"ChangeLog":{"id":"ChangeLog","name":"Show Changelog","description":"Shows the changelog popup message that AT loads on startup in case you missed it.","type":"action","value":1},"AdvMapSpecialModifier":false,"BuyUpgradesNew":1,"BuyBuildingsNew":0,"BuyJobsNew":0,"BuyArmorNew":1,"BuyWeaponsNew":1,"PrestigeSkip1_2":0,"RunNewVoidsUntilNew":0,"DailyVoidMod":570,"Praidingzone":[495,546,555],"BWraid":false,"BWraidingmax":[640],"lootdumpz":260,"WindStackingMin":-1,"ScryUseinPoison":-1,"ScryUseinWind":-1,"ScryUseinIce":-1,"AutoHeirloomsNew":2,"BWraidingz":[597],"fastallocate":true,"trimpsnotdie":true,"gearamounttobuy":5,"dPraidingzone":[495,510,525,540,546,555,566,570],"Dailybwraid":false,"dBWraidingz":[495],"dBWraidingmax":[515],"dexitspirecell":-1,"WindStackingMax":190,"buyheliumy":-1,"buynojobsc":true,"fightforever":0,"use3daily":true,"windcutoff":-1,"spireshitbuy":true,"hardcorewind":-1,"PraidHarder":false,"dPraidHarder":false,"dMaxPraidZone":[-1],"dPraidFarmFragsZ":[-1],"dPraidBeforeFarmZ":[-1],"MaxPraidZone":[505,535,545,555,561],"PraidFarmFragsZ":[495],"PraidBeforeFarmZ":[-1],"fuellater":260,"dWindStackingMin":450,"dWindStackingMax":190,"dwindcutoff":160,"dhardcorewind":480,"ScryerSkipHealthy":2,"addpoison":true,"amalcoord":true,"dAutoGoldenUpgrades":"Void 60","cAutoGoldenUpgrades":"Battle","dhardcorewindmax":"-1","cfightforever":true,"hardcorewindmax":"-1","dfightforever":2,"fuelend":360,"defaultgen":0,"spendmagmite":2,"spendmagmitesetting":1,"ultwind":-1,"ultwindcut":0.05,"CapEquiparm":100,"amalcoordhd":0.0000025,"onlyminmaxworld":false,"amalcoordz":398,"dultwind":"-1","dultwindcut":"0.00025","dwindhealthy":"false","windhealthy":false,"darmormagic":3,"carmormagic":3,"fuckanti":"-1","dscryvoidmaps":true,"scryvoidmaps":true,"dusebstance":true,"usebstance":true,"AutoPortalDaily":2,"dCustomAutoPortal":575,"dHeHrDontPortalBefore":"999","dHeliumHrBuffer":"0","dHeliumHourChallenge":"Corrupted","hidebuildings":true,"fuckjobs":true}'; } function saveSettings(){safeSetItems('autoTrimpSettings',serializeSettings())} From 48a98beb627ab2b61eb632fa650981fc579b229d Mon Sep 17 00:00:00 2001 From: Novanet Date: Sun, 9 Sep 2018 12:03:05 +0100 Subject: [PATCH 1255/3477] Updated scryer.js Fixed nature scrying settings, should work as expected now --- modules/scryer.js | 85 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 69 insertions(+), 16 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index a900f524c..16ecc95a8 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -11,12 +11,15 @@ function useScryerStance() { const inPoisonZone = getEmpowerment() === "Poison"; const inWindZone = getEmpowerment() === "Wind"; const inIceZone = getEmpowerment() === "Ice"; + const inNature = inPoisonZone || inWindZone || inIceZone; const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); + let canScryInCurrentNature = canNatureScry(); + function autostancefunction() { if (AutoStance === 1) autoStance(); @@ -92,28 +95,32 @@ function useScryerStance() { let scryInVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; - let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) - || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) - || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); - let forceScry = useScryerEnabled && onMap && scryInMapsForce; let forceScryInSpire = (!onMap && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); forceScry = forceScry || (inVoidMap && ((scryInVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); forceScry = forceScry || forceScryInSpire; - if (!onVoidMap || (onVoidMap && !scryInVoidNever)) { - forceScry = forceScry || willScryForNature; - } - //check Corrupted Force const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; forceScry = forceScry || useScryerEnabled && scryForCorruptedCellsForce && isCorruptedCell; if (forceScry) { - setFormation(4); - wantToScry = true; - return; + if (inNature) { + if (canScryInCurrentNature) { + setFormation(4); + wantToScry = true; + return; + } + else{ + autostancefunction() + } + } + else { + setFormation(4); + wantToScry = true; + return; + } } //check Healthy force @@ -121,9 +128,21 @@ function useScryerStance() { forceScry = forceScry || isHealthyCell && scryForHealthyCellsForce && useScryerEnabled; if (forceScry) { - setFormation(4); - wantToScry = true; - return; + if (inNature) { + if (canScryInCurrentNature) { + setFormation(4); + wantToScry = true; + return; + } + else{ + autostancefunction() + } + } + else { + setFormation(4); + wantToScry = true; + return; + } } //Calc Damage @@ -168,7 +187,17 @@ function useScryerStance() { const ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; if (ovklHDratio < 2) { if (okToSwitchStance) - setFormation(4); + if (inNature) { + if (canScryInCurrentNature) { + setFormation(4); + } + else{ + autostancefunction() + } + } + else { + setFormation(4); + } return; } } @@ -182,11 +211,35 @@ function useScryerStance() { if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMap)) { if (okToSwitchStance) - setFormation(4); + if (inNature) { + if (canScryInCurrentNature) { + setFormation(4); + } + else{ + autostancefunction() + } + } + else { + setFormation(4); + } + wantToScry = true; } else { autostancefunction(); wantToScry = false; } + + function canNatureScry() { + if (inPoisonZone && scryInPoisonEnabled && inOrAboveScryInPoisonZone) { + return true; + } + if (inWindZone && scryInWindEnabled && inOrAboveScryInWindZone) { + return true; + } + if (inIceZone && scryInIceEnabled && inOrAboveScryInIceZone) { + return true; + } + return false; + } } From 641921b66dab2f6613271acd6d7b37f033f72118 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 16:11:26 +0100 Subject: [PATCH 1256/3477] Update scryer.js --- modules/scryer.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 16ecc95a8..307e34583 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,5 +1,19 @@ let wantToScry = false; + function canNatureScry() { + if (inPoisonZone && scryInPoisonEnabled && inOrAboveScryInPoisonZone) { + return true; + } + if (inWindZone && scryInWindEnabled && inOrAboveScryInWindZone) { + return true; + } + if (inIceZone && scryInIceEnabled && inOrAboveScryInIceZone) { + return true; + } + return false; + } +} + function useScryerStance() { const AutoStance = getPageSetting('AutoStance'); @@ -229,17 +243,3 @@ function useScryerStance() { autostancefunction(); wantToScry = false; } - - function canNatureScry() { - if (inPoisonZone && scryInPoisonEnabled && inOrAboveScryInPoisonZone) { - return true; - } - if (inWindZone && scryInWindEnabled && inOrAboveScryInWindZone) { - return true; - } - if (inIceZone && scryInIceEnabled && inOrAboveScryInIceZone) { - return true; - } - return false; - } -} From ba85f6e5357f22fbced2603b2632e5e230b5ac66 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 16:16:44 +0100 Subject: [PATCH 1257/3477] Update scryer.js --- modules/scryer.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 307e34583..ba8edcf55 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,6 +1,6 @@ let wantToScry = false; - function canNatureScry() { +function canNatureScry() { if (inPoisonZone && scryInPoisonEnabled && inOrAboveScryInPoisonZone) { return true; } @@ -12,7 +12,6 @@ let wantToScry = false; } return false; } -} function useScryerStance() { @@ -127,7 +126,7 @@ function useScryerStance() { return; } else{ - autostancefunction() + autostancefunction(); } } else { @@ -149,7 +148,7 @@ function useScryerStance() { return; } else{ - autostancefunction() + autostancefunction(); } } else { @@ -206,7 +205,7 @@ function useScryerStance() { setFormation(4); } else{ - autostancefunction() + autostancefunction(); } } else { @@ -230,7 +229,7 @@ function useScryerStance() { setFormation(4); } else{ - autostancefunction() + autostancefunction(); } } else { @@ -243,3 +242,4 @@ function useScryerStance() { autostancefunction(); wantToScry = false; } +} From be24c1cefe692912d3ff599bd6c2051a8437f093 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 16:20:41 +0100 Subject: [PATCH 1258/3477] Update scryer.js --- modules/scryer.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index ba8edcf55..1517d38c6 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,6 +1,15 @@ let wantToScry = false; function canNatureScry() { + const inPoisonZone = getEmpowerment() === "Poison"; + const inWindZone = getEmpowerment() === "Wind"; + const inIceZone = getEmpowerment() === "Ice"; + const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; + const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; + const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; + const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); + const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); + const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); if (inPoisonZone && scryInPoisonEnabled && inOrAboveScryInPoisonZone) { return true; } @@ -24,7 +33,6 @@ function useScryerStance() { const inPoisonZone = getEmpowerment() === "Poison"; const inWindZone = getEmpowerment() === "Wind"; const inIceZone = getEmpowerment() === "Ice"; - const inNature = inPoisonZone || inWindZone || inIceZone; const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; From 2adb2488d25326aa7da8e0c3716ff0ea54b17d67 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 16:24:02 +0100 Subject: [PATCH 1259/3477] Update scryer.js --- modules/scryer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/scryer.js b/modules/scryer.js index 1517d38c6..8a73b87de 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -39,6 +39,7 @@ function useScryerStance() { const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); + contr inNature = getEmpowerment() === "Poison" || getEmpowerment() === "Wind" || getEmpowerment() === "Ice"; let canScryInCurrentNature = canNatureScry(); From 5096ac345f551f463efb483cd93e8c8b63ca1f01 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 9 Sep 2018 16:26:35 +0100 Subject: [PATCH 1260/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 8a73b87de..0bd426b7b 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -39,7 +39,7 @@ function useScryerStance() { const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); - contr inNature = getEmpowerment() === "Poison" || getEmpowerment() === "Wind" || getEmpowerment() === "Ice"; + const inNature = getEmpowerment() === "Poison" || getEmpowerment() === "Wind" || getEmpowerment() === "Ice"; let canScryInCurrentNature = canNatureScry(); From e9e9e5647e6aaed1845edb00c6daf7682e515037 Mon Sep 17 00:00:00 2001 From: Novanet Date: Sun, 9 Sep 2018 16:25:48 +0100 Subject: [PATCH 1261/3477] Updated scryer.js Fixed Zek's removal of a variable initalisation --- modules/scryer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 0bd426b7b..f3dbbe4cc 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -33,6 +33,7 @@ function useScryerStance() { const inPoisonZone = getEmpowerment() === "Poison"; const inWindZone = getEmpowerment() === "Wind"; const inIceZone = getEmpowerment() === "Ice"; + const inNature = inPoisonZone || inWindZone || inIceZone; const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; @@ -69,7 +70,7 @@ function useScryerStance() { let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); let neverScryInNature = (!onMap && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) - || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); + || (inIceZone && scryInIceEnabled && !inOrAboveScryInIceZone))); neverScry = neverScry || game.global.world <= 60; neverScry = neverScry || neverScryInMaps; From 0a8b04e940adaf56df7cbb6f3c6590f6bb3b1dbf Mon Sep 17 00:00:00 2001 From: Novanet Date: Sun, 9 Sep 2018 16:28:13 +0100 Subject: [PATCH 1262/3477] Update scryer.js --- modules/scryer.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index f3dbbe4cc..0d4c4c8e4 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -40,7 +40,6 @@ function useScryerStance() { const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); - const inNature = getEmpowerment() === "Poison" || getEmpowerment() === "Wind" || getEmpowerment() === "Ice"; let canScryInCurrentNature = canNatureScry(); From 3b19c7d60c494bb1940173705e458162dc2f8d84 Mon Sep 17 00:00:00 2001 From: Novanet- Date: Sun, 9 Sep 2018 21:34:20 +0100 Subject: [PATCH 1263/3477] Possible quick fix --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 0d4c4c8e4..d6a62176f 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -33,10 +33,10 @@ function useScryerStance() { const inPoisonZone = getEmpowerment() === "Poison"; const inWindZone = getEmpowerment() === "Wind"; const inIceZone = getEmpowerment() === "Ice"; - const inNature = inPoisonZone || inWindZone || inIceZone; const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; + const inNature = (inPoisonZone && scryInPoisonEnabled) || (inWindZone && scryInWindEnabled) || (inIceZone && scryInIceEnabled); const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); From 0372bbf9b8ac7673049800f14ec6b522bbdf880e Mon Sep 17 00:00:00 2001 From: Novanet Date: Mon, 10 Sep 2018 00:08:06 +0100 Subject: [PATCH 1264/3477] Update scryer.js Should make "use scryer = off" actually work as intended. Might fix corrupted voidmaps? --- modules/scryer.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index d6a62176f..82b4874b6 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -61,9 +61,10 @@ function useScryerStance() { const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; const onBossCell = game.global.lastClearedCell >= 98; - let neverScryInMaps = useScryerEnabled && onMap && scryInMapsNever && !onVoidMap; - let neverScryNormalVoid = !useScryerEnabled && !vmScryerEnabled && !inDaily; - let neverScryDailyVoid = !useScryerEnabled && !dailyScryInVoid && inDaily; + let neverScryGlobal = !useScryerEnabled; + let neverScryInMaps = onMap && scryInMapsNever && !onVoidMap; + let neverScryNormalVoid = !vmScryerEnabled && !inDaily; + let neverScryDailyVoid = !dailyScryInVoid && inDaily; let neverScryInVoid = inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid); let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); @@ -72,6 +73,7 @@ function useScryerStance() { || (inIceZone && scryInIceEnabled && !inOrAboveScryInIceZone))); neverScry = neverScry || game.global.world <= 60; + neverScry = neverScry || neverScryGlobal neverScry = neverScry || neverScryInMaps; neverScry = neverScry || neverScryInVoid; neverScry = neverScry || neverScryInSpire; From 2cdb25bdb6ba9365380da471391907c795958fa4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 09:43:34 +0100 Subject: [PATCH 1265/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 842aa0942..ff7bc19b1 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -92,7 +92,6 @@ function mainLoop() { if (getPageSetting('AutoAllocatePerks')==2) lootdump(); if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1 && getDailyHeliumValue(countDailyWeight()) >= getPageSetting('buyheliumy') && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) purchaseSingleRunBonus('heliumy'); if ((getPageSetting('fightforever')==0) || (getPageSetting('fightforever') > 0 && HDratioy() <= getPageSetting('fightforever')) || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) || (getPageSetting('dfightforever') == 1 && game.global.challengeActive == "Daily" && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) || (getPageSetting('dfightforever') == 2 && game.global.challengeActive == "Daily" && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined'))) fightalways(); - if (getPageSetting('use3daily')==true || getPageSetting('use3daily')==false) usedaily3(); if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); if (getPageSetting('spireshitbuy')==true) buyshitspire(); @@ -126,9 +125,9 @@ function mainLoop() { if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); autoLevelEquipment(); if ((getPageSetting('UseScryerStance')== true) || ((getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps') == true && game.global.challengeActive == "Daily"))) useScryerStance(); - else if (getPageSetting('AutoStance')<=1 && !daily3) autoStance(); - else if (getPageSetting('AutoStance')==2 && !daily3) autoStance2(); - else if (getPageSetting('AutoStance')==3 || daily3) autoStance3(); + else if ((getPageSetting('AutoStance')==3) || (getPageSetting('use3daily')==true && game.global.challengeActive == "Daily")) autoStance3(); + else if (getPageSetting('AutoStance')==1) autoStance(); + else if (getPageSetting('AutoStance')==2) autoStance2(); if (getPageSetting('UseAutoGen')==true) autoGenerator(); if (getPageSetting('BetterAutoFight')==1) betterAutoFight(); if (getPageSetting('BetterAutoFight')==2) betterAutoFight2(); From eb9f1d594d940bbb01f9423e8997f1c1e6b3067a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 09:58:18 +0100 Subject: [PATCH 1266/3477] Update scryer.js --- modules/scryer.js | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 82b4874b6..215ef0adf 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,22 +1,16 @@ let wantToScry = false; function canNatureScry() { - const inPoisonZone = getEmpowerment() === "Poison"; - const inWindZone = getEmpowerment() === "Wind"; - const inIceZone = getEmpowerment() === "Ice"; - const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; - const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; - const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; - const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); - const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); - const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); - if (inPoisonZone && scryInPoisonEnabled && inOrAboveScryInPoisonZone) { + const scryInPoisonTrue = getEmpowerment() === "Poison" && (getPageSetting('ScryUseinPoison') < 0) || (game.global.world >= getPageSetting('ScryUseinPoison')); + const scryInWindTrue = getEmpowerment() === "Wind" && (getPageSetting('ScryUseinWind') < 0) || (game.global.world >= getPageSetting('ScryUseinWind')); + const scryInIceTrue = getEmpowerment() === "Ice" && (getPageSetting('ScryUseinIce') < 0) || (game.global.world >= getPageSetting('ScryUseinIce')); + if (scryInPoisonTrue) { return true; } - if (inWindZone && scryInWindEnabled && inOrAboveScryInWindZone) { + if (scryInWindTrue) { return true; } - if (inIceZone && scryInIceEnabled && inOrAboveScryInIceZone) { + if (scryInIceTrue) { return true; } return false; @@ -30,16 +24,10 @@ function useScryerStance() { const onVoidMap = game.global.mapsActive && getCurrentMapObject().location === "Void"; const inDaily = game.global.challengeActive === "Daily"; const dailyScryInVoid = getPageSetting('dscryvoidmaps') === true; - const inPoisonZone = getEmpowerment() === "Poison"; - const inWindZone = getEmpowerment() === "Wind"; - const inIceZone = getEmpowerment() === "Ice"; - const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; - const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; - const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; - const inNature = (inPoisonZone && scryInPoisonEnabled) || (inWindZone && scryInWindEnabled) || (inIceZone && scryInIceEnabled); - const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); - const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); - const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); + const scryInPoison = getEmpowerment() === "Poison" && (getPageSetting('ScryUseinPoison') < 0) || (game.global.world >= getPageSetting('ScryUseinPoison')); + const scryInWind = getEmpowerment() === "Wind" && (getPageSetting('ScryUseinWind') < 0) || (game.global.world >= getPageSetting('ScryUseinWind')); + const scryInIce = getEmpowerment() === "Ice" && (getPageSetting('ScryUseinIce') < 0) || (game.global.world >= getPageSetting('ScryUseinIce')); + const inNature = (getEmpowerment() === "Poison") || (getEmpowerment() === "Wind") || (getEmpowerment() === "Ice"); let canScryInCurrentNature = canNatureScry(); @@ -68,12 +56,10 @@ function useScryerStance() { let neverScryInVoid = inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid); let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); - let neverScryInNature = (!onMap && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) - || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) - || (inIceZone && scryInIceEnabled && !inOrAboveScryInIceZone))); + let neverScryInNature = (!onMap && !canScryInCurrentNature); neverScry = neverScry || game.global.world <= 60; - neverScry = neverScry || neverScryGlobal + neverScry = neverScry || neverScryGlobal; neverScry = neverScry || neverScryInMaps; neverScry = neverScry || neverScryInVoid; neverScry = neverScry || neverScryInSpire; @@ -130,7 +116,7 @@ function useScryerStance() { forceScry = forceScry || useScryerEnabled && scryForCorruptedCellsForce && isCorruptedCell; if (forceScry) { - if (inNature) { + if (!onMap && inNature) { if (canScryInCurrentNature) { setFormation(4); wantToScry = true; @@ -152,7 +138,7 @@ function useScryerStance() { forceScry = forceScry || isHealthyCell && scryForHealthyCellsForce && useScryerEnabled; if (forceScry) { - if (inNature) { + if (!onMap && inNature) { if (canScryInCurrentNature) { setFormation(4); wantToScry = true; From 10fe3046d3def0c71ac43f411b6c19dc3c817815 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:06:23 +0100 Subject: [PATCH 1267/3477] Update scryer.js --- modules/scryer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 215ef0adf..b70e67159 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -78,7 +78,7 @@ function useScryerStance() { isCorruptedCell = isCorruptedCell || (onMap && isMagmaCell); isCorruptedCell = isCorruptedCell || inCorruptionVoid; - neverScry = neverScry || isCorruptedCell && scryForCorruptedCellsNever; + neverScry = (neverScry) || (isCorruptedCell && scryForCorruptedCellsNever); if (neverScry) { autostancefunction(); @@ -92,7 +92,7 @@ function useScryerStance() { let isHealthyCell = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; isHealthyCell = isHealthyCell || (inVoidMap && game.global.world >= corruptionStartZone); - neverScry = neverScry || isHealthyCell && scryForHealthyCellsNever; + neverScry = (neverScry) || (isHealthyCell && scryForHealthyCellsNever); if (neverScry) { autostancefunction(); From df85a482d9d4b9d02aee9dc40e1ac08e24d97918 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:12:42 +0100 Subject: [PATCH 1268/3477] Update scryer.js --- modules/scryer.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index b70e67159..27f7ba339 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,9 +1,9 @@ let wantToScry = false; function canNatureScry() { - const scryInPoisonTrue = getEmpowerment() === "Poison" && (getPageSetting('ScryUseinPoison') < 0) || (game.global.world >= getPageSetting('ScryUseinPoison')); - const scryInWindTrue = getEmpowerment() === "Wind" && (getPageSetting('ScryUseinWind') < 0) || (game.global.world >= getPageSetting('ScryUseinWind')); - const scryInIceTrue = getEmpowerment() === "Ice" && (getPageSetting('ScryUseinIce') < 0) || (game.global.world >= getPageSetting('ScryUseinIce')); + const scryInPoisonTrue = getEmpowerment() === "Poison" && (getPageSetting('ScryUseinPoison') < 0 || game.global.world >= getPageSetting('ScryUseinPoison')); + const scryInWindTrue = getEmpowerment() === "Wind" && (getPageSetting('ScryUseinWind') < 0 || game.global.world >= getPageSetting('ScryUseinWind')); + const scryInIceTrue = getEmpowerment() === "Ice" && (getPageSetting('ScryUseinIce') < 0 || game.global.world >= getPageSetting('ScryUseinIce')); if (scryInPoisonTrue) { return true; } @@ -56,7 +56,6 @@ function useScryerStance() { let neverScryInVoid = inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid); let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); - let neverScryInNature = (!onMap && !canScryInCurrentNature); neverScry = neverScry || game.global.world <= 60; neverScry = neverScry || neverScryGlobal; @@ -64,7 +63,7 @@ function useScryerStance() { neverScry = neverScry || neverScryInVoid; neverScry = neverScry || neverScryInSpire; neverScry = neverScry || neverScryOnBoss; - neverScry = neverScry || neverScryInNature; + neverScry = neverScry || (!game.global.mapsActive && !canScryInCurrentNature); //check Corrupted Never const currentEnemy = getCurrentEnemy(1); From 1bdbb1639651402b3e5f7189a2ddda15872dba76 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:21:58 +0100 Subject: [PATCH 1269/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 27f7ba339..e36957402 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -53,7 +53,7 @@ function useScryerStance() { let neverScryInMaps = onMap && scryInMapsNever && !onVoidMap; let neverScryNormalVoid = !vmScryerEnabled && !inDaily; let neverScryDailyVoid = !dailyScryInVoid && inDaily; - let neverScryInVoid = inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid); + let neverScryInVoid = inVoidMap && (scryInVoidNever && (neverScryNormalVoid || neverScryDailyVoid)); let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); From 28f8faba0b7b7201c7ca2c437e7f65e20b66b281 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:30:24 +0100 Subject: [PATCH 1270/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index e36957402..3fe250cd8 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -53,7 +53,7 @@ function useScryerStance() { let neverScryInMaps = onMap && scryInMapsNever && !onVoidMap; let neverScryNormalVoid = !vmScryerEnabled && !inDaily; let neverScryDailyVoid = !dailyScryInVoid && inDaily; - let neverScryInVoid = inVoidMap && (scryInVoidNever && (neverScryNormalVoid || neverScryDailyVoid)); + let neverScryInVoid = inVoidMap && scryInVoidNever && neverScryNormalVoid && neverScryDailyVoid; let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); From 17e01703ecaeadb3977d2c4b7d60d92a5594cb15 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:36:27 +0100 Subject: [PATCH 1271/3477] Revert "Update scryer.js" This reverts commit 28f8faba0b7b7201c7ca2c437e7f65e20b66b281. --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 3fe250cd8..e36957402 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -53,7 +53,7 @@ function useScryerStance() { let neverScryInMaps = onMap && scryInMapsNever && !onVoidMap; let neverScryNormalVoid = !vmScryerEnabled && !inDaily; let neverScryDailyVoid = !dailyScryInVoid && inDaily; - let neverScryInVoid = inVoidMap && scryInVoidNever && neverScryNormalVoid && neverScryDailyVoid; + let neverScryInVoid = inVoidMap && (scryInVoidNever && (neverScryNormalVoid || neverScryDailyVoid)); let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); From 95a0f0211a9a62d40d7b947f28fb439806dd3396 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:36:32 +0100 Subject: [PATCH 1272/3477] Revert "Update scryer.js" This reverts commit 1bdbb1639651402b3e5f7189a2ddda15872dba76. --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index e36957402..27f7ba339 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -53,7 +53,7 @@ function useScryerStance() { let neverScryInMaps = onMap && scryInMapsNever && !onVoidMap; let neverScryNormalVoid = !vmScryerEnabled && !inDaily; let neverScryDailyVoid = !dailyScryInVoid && inDaily; - let neverScryInVoid = inVoidMap && (scryInVoidNever && (neverScryNormalVoid || neverScryDailyVoid)); + let neverScryInVoid = inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid); let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); From e3595e95550cad4b0715f1cf06da65eee4fb559f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:36:34 +0100 Subject: [PATCH 1273/3477] Revert "Update scryer.js" This reverts commit df85a482d9d4b9d02aee9dc40e1ac08e24d97918. --- modules/scryer.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 27f7ba339..b70e67159 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,9 +1,9 @@ let wantToScry = false; function canNatureScry() { - const scryInPoisonTrue = getEmpowerment() === "Poison" && (getPageSetting('ScryUseinPoison') < 0 || game.global.world >= getPageSetting('ScryUseinPoison')); - const scryInWindTrue = getEmpowerment() === "Wind" && (getPageSetting('ScryUseinWind') < 0 || game.global.world >= getPageSetting('ScryUseinWind')); - const scryInIceTrue = getEmpowerment() === "Ice" && (getPageSetting('ScryUseinIce') < 0 || game.global.world >= getPageSetting('ScryUseinIce')); + const scryInPoisonTrue = getEmpowerment() === "Poison" && (getPageSetting('ScryUseinPoison') < 0) || (game.global.world >= getPageSetting('ScryUseinPoison')); + const scryInWindTrue = getEmpowerment() === "Wind" && (getPageSetting('ScryUseinWind') < 0) || (game.global.world >= getPageSetting('ScryUseinWind')); + const scryInIceTrue = getEmpowerment() === "Ice" && (getPageSetting('ScryUseinIce') < 0) || (game.global.world >= getPageSetting('ScryUseinIce')); if (scryInPoisonTrue) { return true; } @@ -56,6 +56,7 @@ function useScryerStance() { let neverScryInVoid = inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid); let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); + let neverScryInNature = (!onMap && !canScryInCurrentNature); neverScry = neverScry || game.global.world <= 60; neverScry = neverScry || neverScryGlobal; @@ -63,7 +64,7 @@ function useScryerStance() { neverScry = neverScry || neverScryInVoid; neverScry = neverScry || neverScryInSpire; neverScry = neverScry || neverScryOnBoss; - neverScry = neverScry || (!game.global.mapsActive && !canScryInCurrentNature); + neverScry = neverScry || neverScryInNature; //check Corrupted Never const currentEnemy = getCurrentEnemy(1); From 7d1e2e1b1f64047307a3eeff68138353fe5f3aa4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:36:35 +0100 Subject: [PATCH 1274/3477] Revert "Update scryer.js" This reverts commit 10fe3046d3def0c71ac43f411b6c19dc3c817815. --- modules/scryer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index b70e67159..215ef0adf 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -78,7 +78,7 @@ function useScryerStance() { isCorruptedCell = isCorruptedCell || (onMap && isMagmaCell); isCorruptedCell = isCorruptedCell || inCorruptionVoid; - neverScry = (neverScry) || (isCorruptedCell && scryForCorruptedCellsNever); + neverScry = neverScry || isCorruptedCell && scryForCorruptedCellsNever; if (neverScry) { autostancefunction(); @@ -92,7 +92,7 @@ function useScryerStance() { let isHealthyCell = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; isHealthyCell = isHealthyCell || (inVoidMap && game.global.world >= corruptionStartZone); - neverScry = (neverScry) || (isHealthyCell && scryForHealthyCellsNever); + neverScry = neverScry || isHealthyCell && scryForHealthyCellsNever; if (neverScry) { autostancefunction(); From d1a9edd9af5bda6a0caf207326e52b59af57e70b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:36:39 +0100 Subject: [PATCH 1275/3477] Revert "Update scryer.js" This reverts commit eb9f1d594d940bbb01f9423e8997f1c1e6b3067a. --- modules/scryer.js | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 215ef0adf..82b4874b6 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,16 +1,22 @@ let wantToScry = false; function canNatureScry() { - const scryInPoisonTrue = getEmpowerment() === "Poison" && (getPageSetting('ScryUseinPoison') < 0) || (game.global.world >= getPageSetting('ScryUseinPoison')); - const scryInWindTrue = getEmpowerment() === "Wind" && (getPageSetting('ScryUseinWind') < 0) || (game.global.world >= getPageSetting('ScryUseinWind')); - const scryInIceTrue = getEmpowerment() === "Ice" && (getPageSetting('ScryUseinIce') < 0) || (game.global.world >= getPageSetting('ScryUseinIce')); - if (scryInPoisonTrue) { + const inPoisonZone = getEmpowerment() === "Poison"; + const inWindZone = getEmpowerment() === "Wind"; + const inIceZone = getEmpowerment() === "Ice"; + const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; + const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; + const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; + const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); + const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); + const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); + if (inPoisonZone && scryInPoisonEnabled && inOrAboveScryInPoisonZone) { return true; } - if (scryInWindTrue) { + if (inWindZone && scryInWindEnabled && inOrAboveScryInWindZone) { return true; } - if (scryInIceTrue) { + if (inIceZone && scryInIceEnabled && inOrAboveScryInIceZone) { return true; } return false; @@ -24,10 +30,16 @@ function useScryerStance() { const onVoidMap = game.global.mapsActive && getCurrentMapObject().location === "Void"; const inDaily = game.global.challengeActive === "Daily"; const dailyScryInVoid = getPageSetting('dscryvoidmaps') === true; - const scryInPoison = getEmpowerment() === "Poison" && (getPageSetting('ScryUseinPoison') < 0) || (game.global.world >= getPageSetting('ScryUseinPoison')); - const scryInWind = getEmpowerment() === "Wind" && (getPageSetting('ScryUseinWind') < 0) || (game.global.world >= getPageSetting('ScryUseinWind')); - const scryInIce = getEmpowerment() === "Ice" && (getPageSetting('ScryUseinIce') < 0) || (game.global.world >= getPageSetting('ScryUseinIce')); - const inNature = (getEmpowerment() === "Poison") || (getEmpowerment() === "Wind") || (getEmpowerment() === "Ice"); + const inPoisonZone = getEmpowerment() === "Poison"; + const inWindZone = getEmpowerment() === "Wind"; + const inIceZone = getEmpowerment() === "Ice"; + const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; + const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; + const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; + const inNature = (inPoisonZone && scryInPoisonEnabled) || (inWindZone && scryInWindEnabled) || (inIceZone && scryInIceEnabled); + const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); + const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); + const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); let canScryInCurrentNature = canNatureScry(); @@ -56,10 +68,12 @@ function useScryerStance() { let neverScryInVoid = inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid); let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); - let neverScryInNature = (!onMap && !canScryInCurrentNature); + let neverScryInNature = (!onMap && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) + || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) + || (inIceZone && scryInIceEnabled && !inOrAboveScryInIceZone))); neverScry = neverScry || game.global.world <= 60; - neverScry = neverScry || neverScryGlobal; + neverScry = neverScry || neverScryGlobal neverScry = neverScry || neverScryInMaps; neverScry = neverScry || neverScryInVoid; neverScry = neverScry || neverScryInSpire; @@ -116,7 +130,7 @@ function useScryerStance() { forceScry = forceScry || useScryerEnabled && scryForCorruptedCellsForce && isCorruptedCell; if (forceScry) { - if (!onMap && inNature) { + if (inNature) { if (canScryInCurrentNature) { setFormation(4); wantToScry = true; @@ -138,7 +152,7 @@ function useScryerStance() { forceScry = forceScry || isHealthyCell && scryForHealthyCellsForce && useScryerEnabled; if (forceScry) { - if (!onMap && inNature) { + if (inNature) { if (canScryInCurrentNature) { setFormation(4); wantToScry = true; From 038b9e037963c2e3f211ed91e21e23fd5b2e92d8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:00 +0100 Subject: [PATCH 1276/3477] Revert "Update scryer.js" This reverts commit 0372bbf9b8ac7673049800f14ec6b522bbdf880e. --- modules/scryer.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 82b4874b6..d6a62176f 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -61,10 +61,9 @@ function useScryerStance() { const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; const onBossCell = game.global.lastClearedCell >= 98; - let neverScryGlobal = !useScryerEnabled; - let neverScryInMaps = onMap && scryInMapsNever && !onVoidMap; - let neverScryNormalVoid = !vmScryerEnabled && !inDaily; - let neverScryDailyVoid = !dailyScryInVoid && inDaily; + let neverScryInMaps = useScryerEnabled && onMap && scryInMapsNever && !onVoidMap; + let neverScryNormalVoid = !useScryerEnabled && !vmScryerEnabled && !inDaily; + let neverScryDailyVoid = !useScryerEnabled && !dailyScryInVoid && inDaily; let neverScryInVoid = inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid); let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); @@ -73,7 +72,6 @@ function useScryerStance() { || (inIceZone && scryInIceEnabled && !inOrAboveScryInIceZone))); neverScry = neverScry || game.global.world <= 60; - neverScry = neverScry || neverScryGlobal neverScry = neverScry || neverScryInMaps; neverScry = neverScry || neverScryInVoid; neverScry = neverScry || neverScryInSpire; From 0a864d35e4dc9ac1757f2d0b0f8225baf6b05293 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:02 +0100 Subject: [PATCH 1277/3477] Revert "Possible quick fix" This reverts commit 3b19c7d60c494bb1940173705e458162dc2f8d84. --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index d6a62176f..0d4c4c8e4 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -33,10 +33,10 @@ function useScryerStance() { const inPoisonZone = getEmpowerment() === "Poison"; const inWindZone = getEmpowerment() === "Wind"; const inIceZone = getEmpowerment() === "Ice"; + const inNature = inPoisonZone || inWindZone || inIceZone; const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; - const inNature = (inPoisonZone && scryInPoisonEnabled) || (inWindZone && scryInWindEnabled) || (inIceZone && scryInIceEnabled); const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); From a15e502a7d881c755869f1a62f0e5d8a68d2d266 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:05 +0100 Subject: [PATCH 1278/3477] Revert "Update scryer.js" This reverts commit 0a8b04e940adaf56df7cbb6f3c6590f6bb3b1dbf. --- modules/scryer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/scryer.js b/modules/scryer.js index 0d4c4c8e4..f3dbbe4cc 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -40,6 +40,7 @@ function useScryerStance() { const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); + const inNature = getEmpowerment() === "Poison" || getEmpowerment() === "Wind" || getEmpowerment() === "Ice"; let canScryInCurrentNature = canNatureScry(); From 3f724a9671fa59980ecf4cccf4531eaf7050d327 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:07 +0100 Subject: [PATCH 1279/3477] Revert "Updated scryer.js" This reverts commit e9e9e5647e6aaed1845edb00c6daf7682e515037. --- modules/scryer.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index f3dbbe4cc..0bd426b7b 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -33,7 +33,6 @@ function useScryerStance() { const inPoisonZone = getEmpowerment() === "Poison"; const inWindZone = getEmpowerment() === "Wind"; const inIceZone = getEmpowerment() === "Ice"; - const inNature = inPoisonZone || inWindZone || inIceZone; const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; @@ -70,7 +69,7 @@ function useScryerStance() { let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); let neverScryInNature = (!onMap && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) - || (inIceZone && scryInIceEnabled && !inOrAboveScryInIceZone))); + || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); neverScry = neverScry || game.global.world <= 60; neverScry = neverScry || neverScryInMaps; From 010fdf93a0133477fcf3945518f540f2860f5f6b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:09 +0100 Subject: [PATCH 1280/3477] Revert "Update scryer.js" This reverts commit 5096ac345f551f463efb483cd93e8c8b63ca1f01. --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 0bd426b7b..8a73b87de 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -39,7 +39,7 @@ function useScryerStance() { const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); - const inNature = getEmpowerment() === "Poison" || getEmpowerment() === "Wind" || getEmpowerment() === "Ice"; + contr inNature = getEmpowerment() === "Poison" || getEmpowerment() === "Wind" || getEmpowerment() === "Ice"; let canScryInCurrentNature = canNatureScry(); From 57ef5fb054e04804f2c4a2c3abe2b70eece8be61 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:10 +0100 Subject: [PATCH 1281/3477] Revert "Update scryer.js" This reverts commit 2adb2488d25326aa7da8e0c3716ff0ea54b17d67. --- modules/scryer.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 8a73b87de..1517d38c6 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -39,7 +39,6 @@ function useScryerStance() { const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); - contr inNature = getEmpowerment() === "Poison" || getEmpowerment() === "Wind" || getEmpowerment() === "Ice"; let canScryInCurrentNature = canNatureScry(); From fe7518fb3ad0a4fa26853efafb63552179ad2445 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:12 +0100 Subject: [PATCH 1282/3477] Revert "Update scryer.js" This reverts commit be24c1cefe692912d3ff599bd6c2051a8437f093. --- modules/scryer.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 1517d38c6..ba8edcf55 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,15 +1,6 @@ let wantToScry = false; function canNatureScry() { - const inPoisonZone = getEmpowerment() === "Poison"; - const inWindZone = getEmpowerment() === "Wind"; - const inIceZone = getEmpowerment() === "Ice"; - const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; - const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; - const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; - const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); - const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); - const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); if (inPoisonZone && scryInPoisonEnabled && inOrAboveScryInPoisonZone) { return true; } @@ -33,6 +24,7 @@ function useScryerStance() { const inPoisonZone = getEmpowerment() === "Poison"; const inWindZone = getEmpowerment() === "Wind"; const inIceZone = getEmpowerment() === "Ice"; + const inNature = inPoisonZone || inWindZone || inIceZone; const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; From 87b596676e01c98cd212fe1fa183963a1d45c4d2 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:13 +0100 Subject: [PATCH 1283/3477] Revert "Update scryer.js" This reverts commit ba85f6e5357f22fbced2603b2632e5e230b5ac66. --- modules/scryer.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index ba8edcf55..307e34583 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,6 +1,6 @@ let wantToScry = false; -function canNatureScry() { + function canNatureScry() { if (inPoisonZone && scryInPoisonEnabled && inOrAboveScryInPoisonZone) { return true; } @@ -12,6 +12,7 @@ function canNatureScry() { } return false; } +} function useScryerStance() { @@ -126,7 +127,7 @@ function useScryerStance() { return; } else{ - autostancefunction(); + autostancefunction() } } else { @@ -148,7 +149,7 @@ function useScryerStance() { return; } else{ - autostancefunction(); + autostancefunction() } } else { @@ -205,7 +206,7 @@ function useScryerStance() { setFormation(4); } else{ - autostancefunction(); + autostancefunction() } } else { @@ -229,7 +230,7 @@ function useScryerStance() { setFormation(4); } else{ - autostancefunction(); + autostancefunction() } } else { @@ -242,4 +243,3 @@ function useScryerStance() { autostancefunction(); wantToScry = false; } -} From 71dab935eb59f6e5d751aa154e8d19ace74b5b65 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:14 +0100 Subject: [PATCH 1284/3477] Revert "Update scryer.js" This reverts commit 641921b66dab2f6613271acd6d7b37f033f72118. --- modules/scryer.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 307e34583..16ecc95a8 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,19 +1,5 @@ let wantToScry = false; - function canNatureScry() { - if (inPoisonZone && scryInPoisonEnabled && inOrAboveScryInPoisonZone) { - return true; - } - if (inWindZone && scryInWindEnabled && inOrAboveScryInWindZone) { - return true; - } - if (inIceZone && scryInIceEnabled && inOrAboveScryInIceZone) { - return true; - } - return false; - } -} - function useScryerStance() { const AutoStance = getPageSetting('AutoStance'); @@ -243,3 +229,17 @@ function useScryerStance() { autostancefunction(); wantToScry = false; } + + function canNatureScry() { + if (inPoisonZone && scryInPoisonEnabled && inOrAboveScryInPoisonZone) { + return true; + } + if (inWindZone && scryInWindEnabled && inOrAboveScryInWindZone) { + return true; + } + if (inIceZone && scryInIceEnabled && inOrAboveScryInIceZone) { + return true; + } + return false; + } +} From fba3c863779704798fbc91f1ebf8496c5914c383 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:19 +0100 Subject: [PATCH 1285/3477] Revert "Updated scryer.js" This reverts commit 48a98beb627ab2b61eb632fa650981fc579b229d. --- modules/scryer.js | 85 +++++++++-------------------------------------- 1 file changed, 16 insertions(+), 69 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 16ecc95a8..a900f524c 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -11,15 +11,12 @@ function useScryerStance() { const inPoisonZone = getEmpowerment() === "Poison"; const inWindZone = getEmpowerment() === "Wind"; const inIceZone = getEmpowerment() === "Ice"; - const inNature = inPoisonZone || inWindZone || inIceZone; const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); - let canScryInCurrentNature = canNatureScry(); - function autostancefunction() { if (AutoStance === 1) autoStance(); @@ -95,32 +92,28 @@ function useScryerStance() { let scryInVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; + let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) + || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) + || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); + let forceScry = useScryerEnabled && onMap && scryInMapsForce; let forceScryInSpire = (!onMap && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); forceScry = forceScry || (inVoidMap && ((scryInVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); forceScry = forceScry || forceScryInSpire; + if (!onVoidMap || (onVoidMap && !scryInVoidNever)) { + forceScry = forceScry || willScryForNature; + } + //check Corrupted Force const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; forceScry = forceScry || useScryerEnabled && scryForCorruptedCellsForce && isCorruptedCell; if (forceScry) { - if (inNature) { - if (canScryInCurrentNature) { - setFormation(4); - wantToScry = true; - return; - } - else{ - autostancefunction() - } - } - else { - setFormation(4); - wantToScry = true; - return; - } + setFormation(4); + wantToScry = true; + return; } //check Healthy force @@ -128,21 +121,9 @@ function useScryerStance() { forceScry = forceScry || isHealthyCell && scryForHealthyCellsForce && useScryerEnabled; if (forceScry) { - if (inNature) { - if (canScryInCurrentNature) { - setFormation(4); - wantToScry = true; - return; - } - else{ - autostancefunction() - } - } - else { - setFormation(4); - wantToScry = true; - return; - } + setFormation(4); + wantToScry = true; + return; } //Calc Damage @@ -187,17 +168,7 @@ function useScryerStance() { const ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; if (ovklHDratio < 2) { if (okToSwitchStance) - if (inNature) { - if (canScryInCurrentNature) { - setFormation(4); - } - else{ - autostancefunction() - } - } - else { - setFormation(4); - } + setFormation(4); return; } } @@ -211,35 +182,11 @@ function useScryerStance() { if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMap)) { if (okToSwitchStance) - if (inNature) { - if (canScryInCurrentNature) { - setFormation(4); - } - else{ - autostancefunction() - } - } - else { - setFormation(4); - } - + setFormation(4); wantToScry = true; } else { autostancefunction(); wantToScry = false; } - - function canNatureScry() { - if (inPoisonZone && scryInPoisonEnabled && inOrAboveScryInPoisonZone) { - return true; - } - if (inWindZone && scryInWindEnabled && inOrAboveScryInWindZone) { - return true; - } - if (inIceZone && scryInIceEnabled && inOrAboveScryInIceZone) { - return true; - } - return false; - } } From ec8eec76ea4f8f5aa113e673cd71136cf82434c4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:25 +0100 Subject: [PATCH 1286/3477] Revert "Made the lets cleaner" This reverts commit d5abed1a368360e4d504ec2506b4299667b9ec35. --- modules/scryer.js | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index a900f524c..3680c1e6a 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -36,33 +36,37 @@ function useScryerStance() { const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; const onBossCell = game.global.lastClearedCell >= 98; + neverScry = neverScry || game.global.world <= 60; + let neverScryInMaps = useScryerEnabled && onMap && scryInMapsNever && !onVoidMap; + neverScry = neverScry || neverScryInMaps; + let neverScryNormalVoid = !useScryerEnabled && !vmScryerEnabled && !inDaily; let neverScryDailyVoid = !useScryerEnabled && !dailyScryInVoid && inDaily; - let neverScryInVoid = inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid); + let neverScryInVoid = (inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid)); + neverScry = neverScry || neverScryInVoid; + let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; + neverScry = neverScry || neverScryInSpire; + let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); + neverScry = neverScry || neverScryOnBoss; + let neverScryInNature = (!onMap && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); - - neverScry = neverScry || game.global.world <= 60; - neverScry = neverScry || neverScryInMaps; - neverScry = neverScry || neverScryInVoid; - neverScry = neverScry || neverScryInSpire; - neverScry = neverScry || neverScryOnBoss; neverScry = neverScry || neverScryInNature; //check Corrupted Never const currentEnemy = getCurrentEnemy(1); - const isMagmaCell = mutations.Magma.active(); + const isMagamaCell = mutations.Magma.active(); const corruptionStartZone = mutations.Corruption.start(); const scryForCorruptedCellsNever = getPageSetting('ScryerSkipCorrupteds2') === 0; let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; - let inCorruptionVoid = inVoidMap && game.global.world >= corruptionStartZone; + isCorruptedCell = isCorruptedCell || (onMap && isMagamaCell); - isCorruptedCell = isCorruptedCell || (onMap && isMagmaCell); + let inCorruptionVoid = inVoidMap && game.global.world >= corruptionStartZone; isCorruptedCell = isCorruptedCell || inCorruptionVoid; neverScry = neverScry || isCorruptedCell && scryForCorruptedCellsNever; @@ -92,16 +96,15 @@ function useScryerStance() { let scryInVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; - let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) - || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) - || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); - let forceScry = useScryerEnabled && onMap && scryInMapsForce; - let forceScryInSpire = (!onMap && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); - forceScry = forceScry || (inVoidMap && ((scryInVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); + + let forceScryInSpire = (!onMap && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); forceScry = forceScry || forceScryInSpire; + let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) + || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) + || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); if (!onVoidMap || (onVoidMap && !scryInVoidNever)) { forceScry = forceScry || willScryForNature; } From f98477e3ebab3607c0448106a305d474a860368a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:41 +0100 Subject: [PATCH 1287/3477] Revert "Update scryer.js" This reverts commit 0309df959b46414b7792ee0fc4526d7479e902aa. --- modules/scryer.js | 69 ++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 3680c1e6a..f96bfe18a 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -4,7 +4,7 @@ function useScryerStance() { const AutoStance = getPageSetting('AutoStance'); const useScryerEnabled = getPageSetting('UseScryerStance') === true; - const onMap = game.global.mapsActive; + const onMapsScreen = game.global.mapsActive; const onVoidMap = game.global.mapsActive && getCurrentMapObject().location === "Void"; const inDaily = game.global.challengeActive === "Daily"; const dailyScryInVoid = getPageSetting('dscryvoidmaps') === true; @@ -30,32 +30,20 @@ function useScryerStance() { const scryInMapsNever = getPageSetting('ScryerUseinMaps2') === 0; const scryInVoidNever = getPageSetting('ScryerUseinVoidMaps2') === 0; const scryInSpireNever = getPageSetting('ScryerUseinSpire2') === 0; - const inVoidMap = onMap && onVoidMap; + const inVoidOnMapsScreen = onMapsScreen && onVoidMap; const scryOnBossNeverAboveVoid = getPageSetting('ScryerSkipBoss2') === 1; const currentZoneBelowVMZone = game.global.world >= getPageSetting('VoidMaps'); const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; const onBossCell = game.global.lastClearedCell >= 98; neverScry = neverScry || game.global.world <= 60; - - let neverScryInMaps = useScryerEnabled && onMap && scryInMapsNever && !onVoidMap; - neverScry = neverScry || neverScryInMaps; - - let neverScryNormalVoid = !useScryerEnabled && !vmScryerEnabled && !inDaily; - let neverScryDailyVoid = !useScryerEnabled && !dailyScryInVoid && inDaily; - let neverScryInVoid = (inVoidMap && (scryInVoidNever && neverScryNormalVoid || neverScryDailyVoid)); - neverScry = neverScry || neverScryInVoid; - - let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; - neverScry = neverScry || neverScryInSpire; - - let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); - neverScry = neverScry || neverScryOnBoss; - - let neverScryInNature = (!onMap && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) - || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) - || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); - neverScry = neverScry || neverScryInNature; + neverScry = neverScry || (useScryerEnabled && onMapsScreen && scryInMapsNever && !onVoidMap); + neverScry = neverScry || (inVoidOnMapsScreen && (scryInVoidNever && (!useScryerEnabled && !vmScryerEnabled && !inDaily) || (!useScryerEnabled && !dailyScryInVoid && inDaily))); + neverScry = neverScry || (!onMapsScreen && isActiveSpireAT() && scryInSpireNever); + neverScry = neverScry || (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); + neverScry = neverScry || (!onMapsScreen && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) + || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) + || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); //check Corrupted Never const currentEnemy = getCurrentEnemy(1); @@ -64,14 +52,9 @@ function useScryerStance() { const scryForCorruptedCellsNever = getPageSetting('ScryerSkipCorrupteds2') === 0; let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; - isCorruptedCell = isCorruptedCell || (onMap && isMagamaCell); - - let inCorruptionVoid = inVoidMap && game.global.world >= corruptionStartZone; - isCorruptedCell = isCorruptedCell || inCorruptionVoid; - - neverScry = neverScry || isCorruptedCell && scryForCorruptedCellsNever; - - if (neverScry) { + isCorruptedCell = isCorruptedCell || (onMapsScreen && isMagamaCell); + isCorruptedCell = isCorruptedCell || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); + if ((isCorruptedCell && scryForCorruptedCellsNever) || neverScry) { autostancefunction(); wantToScry = false; return; @@ -81,11 +64,9 @@ function useScryerStance() { const currentEnemyHealth = getCurrentEnemy(1); const scryForHealthyCellsNever = getPageSetting('ScryerSkipHealthy') === 0; - let isHealthyCell = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; - isHealthyCell = isHealthyCell || (inVoidMap && game.global.world >= corruptionStartZone); - neverScry = neverScry || isHealthyCell && scryForHealthyCellsNever; - - if (neverScry) { + let ishealthy = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; + ishealthy = ishealthy || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); + if ((ishealthy && scryForHealthyCellsNever) || neverScry) { autostancefunction(); wantToScry = false; return; @@ -93,14 +74,12 @@ function useScryerStance() { //Force let scryInMapsForce = getPageSetting('ScryerUseinMaps2') === 1; - let scryInVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; + let scryinVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; - let forceScry = useScryerEnabled && onMap && scryInMapsForce; - forceScry = forceScry || (inVoidMap && ((scryInVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); - - let forceScryInSpire = (!onMap && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); - forceScry = forceScry || forceScryInSpire; + let forceScry = useScryerEnabled && onMapsScreen && scryInMapsForce; + forceScry = forceScry || (inVoidOnMapsScreen && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); + forceScry = forceScry || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) @@ -111,9 +90,8 @@ function useScryerStance() { //check Corrupted Force const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; - forceScry = forceScry || useScryerEnabled && scryForCorruptedCellsForce && isCorruptedCell; - if (forceScry) { + if ((isCorruptedCell && scryForCorruptedCellsForce && useScryerEnabled) || (forceScry)) { setFormation(4); wantToScry = true; return; @@ -121,9 +99,8 @@ function useScryerStance() { //check Healthy force const scryForHealthyCellsForce = getPageSetting('ScryerSkipHealthy') === 1; - forceScry = forceScry || isHealthyCell && scryForHealthyCellsForce && useScryerEnabled; - if (forceScry) { + if ((ishealthy && scryForHealthyCellsForce && useScryerEnabled) || (forceScry)) { setFormation(4); wantToScry = true; return; @@ -162,7 +139,7 @@ function useScryerStance() { let scryForOverkill = getPageSetting('ScryerUseWhenOverkill'); if (scryForOverkill && noOverkillLevels) setPageSetting('ScryerUseWhenOverkill', false); - if (scryForOverkill && !onMap && isActiveSpireAT() && scryInSpireNever) + if (scryForOverkill && !onMapsScreen && isActiveSpireAT() && scryInSpireNever) scryForOverkill = false; if (scryForOverkill && hasOverkillLevels && useScryerEnabled && forceScry) { const minDamage = calcOurDmg("min", false, true); @@ -183,7 +160,7 @@ function useScryerStance() { const valid_max = max_zone <= 0 || game.global.world < max_zone; const onlyScryForMinMaxEnabled = getPageSetting('onlyminmaxworld') === true; - if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMap)) { + if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { if (okToSwitchStance) setFormation(4); wantToScry = true; From 50f6822bc3b03f508d846fb3fb955f5c5a1bf0d5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:55 +0100 Subject: [PATCH 1288/3477] Revert "Update scryer.js" This reverts commit 6c553c9630890b32fb4e2adf961bcdc87366271c. --- modules/scryer.js | 50 +++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index f96bfe18a..e078c08ab 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -11,6 +11,7 @@ function useScryerStance() { const inPoisonZone = getEmpowerment() === "Poison"; const inWindZone = getEmpowerment() === "Wind"; const inIceZone = getEmpowerment() === "Ice"; + const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; @@ -25,25 +26,29 @@ function useScryerStance() { } //Never - let neverScry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; + let use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; + use_scry = use_scry || game.global.world <= 60; + const vmScryerEnabled = getPageSetting('scryvoidmaps') === true; const scryInMapsNever = getPageSetting('ScryerUseinMaps2') === 0; const scryInVoidNever = getPageSetting('ScryerUseinVoidMaps2') === 0; const scryInSpireNever = getPageSetting('ScryerUseinSpire2') === 0; + const inVoidOnMapsScreen = onMapsScreen && onVoidMap; + + use_scry = use_scry || (useScryerEnabled && onMapsScreen && scryInMapsNever && !onVoidMap); + use_scry = use_scry || (inVoidOnMapsScreen && (scryInVoidNever && (!useScryerEnabled && !vmScryerEnabled && !inDaily) || (!useScryerEnabled && !dailyScryInVoid && inDaily))); + use_scry = use_scry || (!onMapsScreen && isActiveSpireAT() && scryInSpireNever); + const scryOnBossNeverAboveVoid = getPageSetting('ScryerSkipBoss2') === 1; - const currentZoneBelowVMZone = game.global.world >= getPageSetting('VoidMaps'); + const currentZoneBelowVMZone = game.global.world < getPageSetting('VoidMaps'); const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; - const onBossCell = game.global.lastClearedCell >= 98; + const onBossCell = game.global.lastClearedCell === 98; - neverScry = neverScry || game.global.world <= 60; - neverScry = neverScry || (useScryerEnabled && onMapsScreen && scryInMapsNever && !onVoidMap); - neverScry = neverScry || (inVoidOnMapsScreen && (scryInVoidNever && (!useScryerEnabled && !vmScryerEnabled && !inDaily) || (!useScryerEnabled && !dailyScryInVoid && inDaily))); - neverScry = neverScry || (!onMapsScreen && isActiveSpireAT() && scryInSpireNever); - neverScry = neverScry || (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); - neverScry = neverScry || (!onMapsScreen && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) - || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) - || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); + use_scry = use_scry || (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); + use_scry = use_scry || (!onMapsScreen && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) + || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) + || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); //check Corrupted Never const currentEnemy = getCurrentEnemy(1); @@ -54,19 +59,18 @@ function useScryerStance() { let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; isCorruptedCell = isCorruptedCell || (onMapsScreen && isMagamaCell); isCorruptedCell = isCorruptedCell || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((isCorruptedCell && scryForCorruptedCellsNever) || neverScry) { + if ((isCorruptedCell && scryForCorruptedCellsNever)) { autostancefunction(); wantToScry = false; return; } - //check Healthy never const currentEnemyHealth = getCurrentEnemy(1); const scryForHealthyCellsNever = getPageSetting('ScryerSkipHealthy') === 0; let ishealthy = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; ishealthy = ishealthy || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((ishealthy && scryForHealthyCellsNever) || neverScry) { + if ((ishealthy && scryForHealthyCellsNever)) { autostancefunction(); wantToScry = false; return; @@ -77,30 +81,29 @@ function useScryerStance() { let scryinVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; - let forceScry = useScryerEnabled && onMapsScreen && scryInMapsForce; - forceScry = forceScry || (inVoidOnMapsScreen && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); - forceScry = forceScry || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); + let use_scryer = useScryerEnabled && onMapsScreen && scryInMapsForce; + use_scryer = use_scryer || (inVoidOnMapsScreen && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); + use_scryer = use_scryer || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); if (!onVoidMap || (onVoidMap && !scryInVoidNever)) { - forceScry = forceScry || willScryForNature; + use_scryer = use_scryer || willScryForNature; } //check Corrupted Force const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; - if ((isCorruptedCell && scryForCorruptedCellsForce && useScryerEnabled) || (forceScry)) { + if ((isCorruptedCell && scryForCorruptedCellsForce && useScryerEnabled) || (use_scryer)) { setFormation(4); wantToScry = true; return; } - - //check Healthy force + //check healthy force const scryForHealthyCellsForce = getPageSetting('ScryerSkipHealthy') === 1; - if ((ishealthy && scryForHealthyCellsForce && useScryerEnabled) || (forceScry)) { + if ((ishealthy && scryForHealthyCellsForce && useScryerEnabled) || (use_scryer)) { setFormation(4); wantToScry = true; return; @@ -141,7 +144,7 @@ function useScryerStance() { setPageSetting('ScryerUseWhenOverkill', false); if (scryForOverkill && !onMapsScreen && isActiveSpireAT() && scryInSpireNever) scryForOverkill = false; - if (scryForOverkill && hasOverkillLevels && useScryerEnabled && forceScry) { + if (scryForOverkill && hasOverkillLevels && useScryerEnabled && use_scryer) { const minDamage = calcOurDmg("min", false, true); const Sstance = 0.5; const ovkldmg = minDamage * Sstance * (game.portal.Overkill.level * 0.005); @@ -168,5 +171,6 @@ function useScryerStance() { else { autostancefunction(); wantToScry = false; + } } From c0a9bc1d93a2bf20828475ee64a769aae0139c42 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:37:58 +0100 Subject: [PATCH 1289/3477] Revert "Updated scryer.js" This reverts commit 0d97aa9641e82071ede4c64aad4fe0dc00bdd143. --- modules/scryer.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index e078c08ab..53af4f801 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -59,7 +59,7 @@ function useScryerStance() { let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; isCorruptedCell = isCorruptedCell || (onMapsScreen && isMagamaCell); isCorruptedCell = isCorruptedCell || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((isCorruptedCell && scryForCorruptedCellsNever)) { + if ((isCorruptedCell && scryForCorruptedCellsNever || (use_scry))) { autostancefunction(); wantToScry = false; return; @@ -70,7 +70,7 @@ function useScryerStance() { let ishealthy = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; ishealthy = ishealthy || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((ishealthy && scryForHealthyCellsNever)) { + if ((ishealthy && scryForHealthyCellsNever || (use_scry))) { autostancefunction(); wantToScry = false; return; @@ -86,8 +86,8 @@ function useScryerStance() { use_scryer = use_scryer || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) - || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) - || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); + || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) + || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); if (!onVoidMap || (onVoidMap && !scryInVoidNever)) { use_scryer = use_scryer || willScryForNature; } @@ -163,7 +163,7 @@ function useScryerStance() { const valid_max = max_zone <= 0 || game.global.world < max_zone; const onlyScryForMinMaxEnabled = getPageSetting('onlyminmaxworld') === true; - if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { + if (use_scryer && useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { if (okToSwitchStance) setFormation(4); wantToScry = true; From e7e2c9dcb5d3a6342a6b3c3ae03854b3436af295 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:38:05 +0100 Subject: [PATCH 1290/3477] Revert "Update scryer.js" This reverts commit c0ffbe4467e8815793ea6481bb4b7c0b6554aad4. --- modules/scryer.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 53af4f801..18512d699 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -47,8 +47,8 @@ function useScryerStance() { use_scry = use_scry || (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); use_scry = use_scry || (!onMapsScreen && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) - || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) - || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); + || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) + || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); //check Corrupted Never const currentEnemy = getCurrentEnemy(1); @@ -85,9 +85,9 @@ function useScryerStance() { use_scryer = use_scryer || (inVoidOnMapsScreen && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); use_scryer = use_scryer || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); - let willScryForNature = (useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) - || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) - || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); + let willScryForNature = (!onMapsScreen && useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) + || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) + || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); if (!onVoidMap || (onVoidMap && !scryInVoidNever)) { use_scryer = use_scryer || willScryForNature; } @@ -144,7 +144,7 @@ function useScryerStance() { setPageSetting('ScryerUseWhenOverkill', false); if (scryForOverkill && !onMapsScreen && isActiveSpireAT() && scryInSpireNever) scryForOverkill = false; - if (scryForOverkill && hasOverkillLevels && useScryerEnabled && use_scryer) { + if (scryForOverkill && hasOverkillLevels && useScryerEnabled) { const minDamage = calcOurDmg("min", false, true); const Sstance = 0.5; const ovkldmg = minDamage * Sstance * (game.portal.Overkill.level * 0.005); @@ -163,7 +163,7 @@ function useScryerStance() { const valid_max = max_zone <= 0 || game.global.world < max_zone; const onlyScryForMinMaxEnabled = getPageSetting('onlyminmaxworld') === true; - if (use_scryer && useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { + if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { if (okToSwitchStance) setFormation(4); wantToScry = true; From b8707cd2d080401222d565949fce84a649e9799b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:38:08 +0100 Subject: [PATCH 1291/3477] Revert "Update scryer.js" This reverts commit 638b3e064d521cb02d2544abaa74f12d684f8b3b. --- modules/scryer.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 18512d699..3aa90f4f6 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -88,9 +88,7 @@ function useScryerStance() { let willScryForNature = (!onMapsScreen && useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); - if (!onVoidMap || (onVoidMap && !scryInVoidNever)) { - use_scryer = use_scryer || willScryForNature; - } + use_scryer = use_scryer || willScryForNature; //check Corrupted Force const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; From 68d374b272723fb9bf555e66c8af525084016207 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:39:41 +0100 Subject: [PATCH 1292/3477] Revert "Merge pull request #24 from Novanet-/gh-pages" This reverts commit 9b95cfc94bdd9f936a1085f73131af64d549bb01, reversing changes made to e7c88fa1387a6e8aaecd341548a58c71be2f652f. --- modules/scryer.js | 202 ++++++++++++++++------------------------------ 1 file changed, 70 insertions(+), 132 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 3aa90f4f6..be3c264d5 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,174 +1,112 @@ -let wantToScry = false; - +var wantToScry = false; function useScryerStance() { - - const AutoStance = getPageSetting('AutoStance'); - const useScryerEnabled = getPageSetting('UseScryerStance') === true; - const onMapsScreen = game.global.mapsActive; - const onVoidMap = game.global.mapsActive && getCurrentMapObject().location === "Void"; - const inDaily = game.global.challengeActive === "Daily"; - const dailyScryInVoid = getPageSetting('dscryvoidmaps') === true; - const inPoisonZone = getEmpowerment() === "Poison"; - const inWindZone = getEmpowerment() === "Wind"; - const inIceZone = getEmpowerment() === "Ice"; - - const scryInPoisonEnabled = getPageSetting('ScryUseinPoison') >= 0; - const scryInWindEnabled = getPageSetting('ScryUseinWind') >= 0; - const scryInIceEnabled = getPageSetting('ScryUseinIce') >= 0; - const inOrAboveScryInPoisonZone = game.global.world >= getPageSetting('ScryUseinPoison'); - const inOrAboveScryInWindZone = game.global.world >= getPageSetting('ScryUseinWind'); - const inOrAboveScryInIceZone = game.global.world >= getPageSetting('ScryUseinIce'); - - function autostancefunction() { - if (AutoStance === 1) autoStance(); - else if (AutoStance === 2) autoStance2(); - else if (AutoStance === 3) autoStance3(); + + var AutoStance = getPageSetting('AutoStance'); + function autostancefunction() { + if (AutoStance==1) autoStance(); + else if (AutoStance==2) autoStance2(); + else if (AutoStance==3) autoStance3(); } //Never - let use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; +var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; - - const vmScryerEnabled = getPageSetting('scryvoidmaps') === true; - const scryInMapsNever = getPageSetting('ScryerUseinMaps2') === 0; - const scryInVoidNever = getPageSetting('ScryerUseinVoidMaps2') === 0; - const scryInSpireNever = getPageSetting('ScryerUseinSpire2') === 0; - - const inVoidOnMapsScreen = onMapsScreen && onVoidMap; - - use_scry = use_scry || (useScryerEnabled && onMapsScreen && scryInMapsNever && !onVoidMap); - use_scry = use_scry || (inVoidOnMapsScreen && (scryInVoidNever && (!useScryerEnabled && !vmScryerEnabled && !inDaily) || (!useScryerEnabled && !dailyScryInVoid && inDaily))); - use_scry = use_scry || (!onMapsScreen && isActiveSpireAT() && scryInSpireNever); - - const scryOnBossNeverAboveVoid = getPageSetting('ScryerSkipBoss2') === 1; - const currentZoneBelowVMZone = game.global.world < getPageSetting('VoidMaps'); - const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; - const onBossCell = game.global.lastClearedCell === 98; - - use_scry = use_scry || (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); - use_scry = use_scry || (!onMapsScreen && ((inPoisonZone && scryInPoisonEnabled && !inOrAboveScryInPoisonZone) - || (inWindZone && scryInWindEnabled && !inOrAboveScryInWindZone) - || (inIceZone && scryInIceEnabled && !inOrAboveScryInWindZone))); + use_scry = use_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"); + use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) && (getPageSetting('UseScryerStance') == false && getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('UseScryerStance') == false && getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); + use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); + use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); + use_scry = use_scry || (!game.global.mapsActive && (getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never - const currentEnemy = getCurrentEnemy(1); - const isMagamaCell = mutations.Magma.active(); - const corruptionStartZone = mutations.Corruption.start(); - const scryForCorruptedCellsNever = getPageSetting('ScryerSkipCorrupteds2') === 0; - - let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; - isCorruptedCell = isCorruptedCell || (onMapsScreen && isMagamaCell); - isCorruptedCell = isCorruptedCell || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((isCorruptedCell && scryForCorruptedCellsNever || (use_scry))) { + var curEnemy = getCurrentEnemy(1); + var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; + iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Magma.active()); + iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); + if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_scry))) { autostancefunction(); wantToScry = false; return; } //check Healthy never - const currentEnemyHealth = getCurrentEnemy(1); - const scryForHealthyCellsNever = getPageSetting('ScryerSkipHealthy') === 0; - - let ishealthy = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; - ishealthy = ishealthy || (inVoidOnMapsScreen && game.global.world >= corruptionStartZone); - if ((ishealthy && scryForHealthyCellsNever || (use_scry))) { + var curEnemyhealth = getCurrentEnemy(1); + var ishealthy = curEnemyhealth && curEnemyhealth.mutation == "Healthy"; + ishealthy = ishealthy || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); + if ((ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (use_scry))) { autostancefunction(); wantToScry = false; return; } //Force - let scryInMapsForce = getPageSetting('ScryerUseinMaps2') === 1; - let scryinVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; - let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; - - let use_scryer = useScryerEnabled && onMapsScreen && scryInMapsForce; - use_scryer = use_scryer || (inVoidOnMapsScreen && ((scryinVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); - use_scryer = use_scryer || (!onMapsScreen && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); - - let willScryForNature = (!onMapsScreen && useScryerEnabled && ((inPoisonZone && scryInPoisonEnabled && (inOrAboveScryInPoisonZone)) - || (inWindZone && scryInWindEnabled && (inOrAboveScryInWindZone)) - || (inIceZone && scryInIceEnabled && (inOrAboveScryInIceZone)))); - use_scryer = use_scryer || willScryForNature; - +var use_scryer = use_scryer || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1); + use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 1) || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))); + use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); + use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world >= getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world >= getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce'))))); + //check Corrupted Force - const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; - - if ((isCorruptedCell && scryForCorruptedCellsForce && useScryerEnabled) || (use_scryer)) { + if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 1 && getPageSetting('UseScryerStance') == true) || (use_scryer)) { setFormation(4); wantToScry = true; return; } //check healthy force - const scryForHealthyCellsForce = getPageSetting('ScryerSkipHealthy') === 1; - - if ((ishealthy && scryForHealthyCellsForce && useScryerEnabled) || (use_scryer)) { + if ((ishealthy && getPageSetting('ScryerSkipHealthy') == 1 && getPageSetting('UseScryerStance') == true) || (use_scryer)) { setFormation(4); wantToScry = true; return; } //Calc Damage - if (AutoStance === 1) - calcBaseDamageinX(); - else if (AutoStance >= 2) - calcBaseDamageinX2(); +if (AutoStance==1) + calcBaseDamageinX(); +else if (AutoStance>=2) + calcBaseDamageinX2(); //Suicide to Scry - const missingHealth = game.global.soldierHealthMax - game.global.soldierHealth; - const isNewSquadReady = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; - const dieToScryZone = getPageSetting('ScryerDieZ'); - const dieToScryEnabled = dieToScryZone !== -1; - const aboveDieToScryZone = game.global.world >= dieToScryZone; - - let okToSwitchStance = true; - let isAllowedToDie = (dieToScryEnabled && aboveDieToScryZone); - if (isAllowedToDie && dieToScryZone >= 0) { - var [dieZ, dieC] = dieToScryZone.toString().split("."); - if (dieC && dieC.length === 1) dieC = dieC + "0"; - isAllowedToDie = game.global.world >= dieZ && (!dieC || (game.global.lastClearedCell + 1 >= dieC)); +var missingHealth = game.global.soldierHealthMax - game.global.soldierHealth; +var newSquadRdy = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; +var oktoswitch = true; +var die = (getPageSetting('ScryerDieZ') != -1 && getPageSetting('ScryerDieZ') <= game.global.world) ; +var willSuicide = getPageSetting('ScryerDieZ'); + if (die && willSuicide >= 0) { + var [dieZ, dieC] = willSuicide.toString().split("."); + if (dieC && dieC.length == 1) dieC = dieC + "0"; + die = game.global.world >= dieZ && (!dieC || (game.global.lastClearedCell + 1 >= dieC)); } - const inXFormation = game.global.formation === 0; - const inHFormation = game.global.formation === 1; - - if (inXFormation || inHFormation) - okToSwitchStance = isAllowedToDie || isNewSquadReady || (missingHealth < (baseHealth / 2)); + if (game.global.formation == 0 || game.global.formation == 1) + oktoswitch = die || newSquadRdy || (missingHealth < (baseHealth / 2)); //Overkill - const noOverkillLevels = game.portal.Overkill.level === 0; - const hasOverkillLevels = game.portal.Overkill.level > 0; - - let scryForOverkill = getPageSetting('ScryerUseWhenOverkill'); - if (scryForOverkill && noOverkillLevels) - setPageSetting('ScryerUseWhenOverkill', false); - if (scryForOverkill && !onMapsScreen && isActiveSpireAT() && scryInSpireNever) - scryForOverkill = false; - if (scryForOverkill && hasOverkillLevels && useScryerEnabled) { - const minDamage = calcOurDmg("min", false, true); - const Sstance = 0.5; - const ovkldmg = minDamage * Sstance * (game.portal.Overkill.level * 0.005); - const ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; - if (ovklHDratio < 2) { - if (okToSwitchStance) - setFormation(4); +var useoverkill = getPageSetting('ScryerUseWhenOverkill'); +if (useoverkill && game.portal.Overkill.level == 0) + setPageSetting('ScryerUseWhenOverkill', false); +if (useoverkill && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2')==0) + useoverkill = false; +if (useoverkill && game.portal.Overkill.level > 0 && getPageSetting('UseScryerStance') == true) { + var minDamage = calcOurDmg("min",false,true); + var Sstance = 0.5; + var ovkldmg = minDamage * Sstance * (game.portal.Overkill.level*0.005); + var ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; + if (ovklHDratio < 2) { + if (oktoswitch) + setFormation(4); return; } } //Default - const min_zone = getPageSetting('ScryerMinZone'); - const max_zone = getPageSetting('ScryerMaxZone'); - const valid_min = game.global.world >= min_zone && game.global.world > 60; - const valid_max = max_zone <= 0 || game.global.world < max_zone; - const onlyScryForMinMaxEnabled = getPageSetting('onlyminmaxworld') === true; - - if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMapsScreen)) { - if (okToSwitchStance) - setFormation(4); - wantToScry = true; - } - else { - autostancefunction(); - wantToScry = false; - +var min_zone = getPageSetting('ScryerMinZone'); +var max_zone = getPageSetting('ScryerMaxZone'); +var valid_min = game.global.world >= min_zone && game.global.world > 60; +var valid_max = max_zone <= 0 || game.global.world < max_zone; +if (getPageSetting('UseScryerStance') == true && valid_min && valid_max && !(getPageSetting('onlyminmaxworld') == true && game.global.mapsActive)) { + if (oktoswitch) + setFormation(4); + wantToScry = true; + } +else { + autostancefunction(); + wantToScry = false; + return; } } From 1891ca464d5b048de39a55b9515c09d51000c15a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:42:21 +0100 Subject: [PATCH 1293/3477] Create scryerNew.js --- modules/scryerNew.js | 241 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 241 insertions(+) create mode 100644 modules/scryerNew.js diff --git a/modules/scryerNew.js b/modules/scryerNew.js new file mode 100644 index 000000000..3fe250cd8 --- /dev/null +++ b/modules/scryerNew.js @@ -0,0 +1,241 @@ +let wantToScry = false; + +function canNatureScry() { + const scryInPoisonTrue = getEmpowerment() === "Poison" && (getPageSetting('ScryUseinPoison') < 0 || game.global.world >= getPageSetting('ScryUseinPoison')); + const scryInWindTrue = getEmpowerment() === "Wind" && (getPageSetting('ScryUseinWind') < 0 || game.global.world >= getPageSetting('ScryUseinWind')); + const scryInIceTrue = getEmpowerment() === "Ice" && (getPageSetting('ScryUseinIce') < 0 || game.global.world >= getPageSetting('ScryUseinIce')); + if (scryInPoisonTrue) { + return true; + } + if (scryInWindTrue) { + return true; + } + if (scryInIceTrue) { + return true; + } + return false; + } + +function useScryerStance() { + + const AutoStance = getPageSetting('AutoStance'); + const useScryerEnabled = getPageSetting('UseScryerStance') === true; + const onMap = game.global.mapsActive; + const onVoidMap = game.global.mapsActive && getCurrentMapObject().location === "Void"; + const inDaily = game.global.challengeActive === "Daily"; + const dailyScryInVoid = getPageSetting('dscryvoidmaps') === true; + const scryInPoison = getEmpowerment() === "Poison" && (getPageSetting('ScryUseinPoison') < 0) || (game.global.world >= getPageSetting('ScryUseinPoison')); + const scryInWind = getEmpowerment() === "Wind" && (getPageSetting('ScryUseinWind') < 0) || (game.global.world >= getPageSetting('ScryUseinWind')); + const scryInIce = getEmpowerment() === "Ice" && (getPageSetting('ScryUseinIce') < 0) || (game.global.world >= getPageSetting('ScryUseinIce')); + const inNature = (getEmpowerment() === "Poison") || (getEmpowerment() === "Wind") || (getEmpowerment() === "Ice"); + let canScryInCurrentNature = canNatureScry(); + + + function autostancefunction() { + if (AutoStance === 1) autoStance(); + else if (AutoStance === 2) autoStance2(); + else if (AutoStance === 3) autoStance3(); + } + +//Never + let neverScry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; + const vmScryerEnabled = getPageSetting('scryvoidmaps') === true; + const scryInMapsNever = getPageSetting('ScryerUseinMaps2') === 0; + const scryInVoidNever = getPageSetting('ScryerUseinVoidMaps2') === 0; + const scryInSpireNever = getPageSetting('ScryerUseinSpire2') === 0; + const inVoidMap = onMap && onVoidMap; + const scryOnBossNeverAboveVoid = getPageSetting('ScryerSkipBoss2') === 1; + const currentZoneBelowVMZone = game.global.world >= getPageSetting('VoidMaps'); + const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; + const onBossCell = game.global.lastClearedCell >= 98; + + let neverScryGlobal = !useScryerEnabled; + let neverScryInMaps = onMap && scryInMapsNever && !onVoidMap; + let neverScryNormalVoid = !vmScryerEnabled && !inDaily; + let neverScryDailyVoid = !dailyScryInVoid && inDaily; + let neverScryInVoid = inVoidMap && scryInVoidNever && neverScryNormalVoid && neverScryDailyVoid; + let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; + let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); + + neverScry = neverScry || game.global.world <= 60; + neverScry = neverScry || neverScryGlobal; + neverScry = neverScry || neverScryInMaps; + neverScry = neverScry || neverScryInVoid; + neverScry = neverScry || neverScryInSpire; + neverScry = neverScry || neverScryOnBoss; + neverScry = neverScry || (!game.global.mapsActive && !canScryInCurrentNature); + + //check Corrupted Never + const currentEnemy = getCurrentEnemy(1); + const isMagmaCell = mutations.Magma.active(); + const corruptionStartZone = mutations.Corruption.start(); + const scryForCorruptedCellsNever = getPageSetting('ScryerSkipCorrupteds2') === 0; + + let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; + let inCorruptionVoid = inVoidMap && game.global.world >= corruptionStartZone; + + isCorruptedCell = isCorruptedCell || (onMap && isMagmaCell); + isCorruptedCell = isCorruptedCell || inCorruptionVoid; + + neverScry = (neverScry) || (isCorruptedCell && scryForCorruptedCellsNever); + + if (neverScry) { + autostancefunction(); + wantToScry = false; + return; + } + + //check Healthy never + const currentEnemyHealth = getCurrentEnemy(1); + const scryForHealthyCellsNever = getPageSetting('ScryerSkipHealthy') === 0; + + let isHealthyCell = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; + isHealthyCell = isHealthyCell || (inVoidMap && game.global.world >= corruptionStartZone); + neverScry = (neverScry) || (isHealthyCell && scryForHealthyCellsNever); + + if (neverScry) { + autostancefunction(); + wantToScry = false; + return; + } + +//Force + let scryInMapsForce = getPageSetting('ScryerUseinMaps2') === 1; + let scryInVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; + let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; + + let forceScry = useScryerEnabled && onMap && scryInMapsForce; + let forceScryInSpire = (!onMap && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); + + forceScry = forceScry || (inVoidMap && ((scryInVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); + forceScry = forceScry || forceScryInSpire; + + //check Corrupted Force + const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; + forceScry = forceScry || useScryerEnabled && scryForCorruptedCellsForce && isCorruptedCell; + + if (forceScry) { + if (!onMap && inNature) { + if (canScryInCurrentNature) { + setFormation(4); + wantToScry = true; + return; + } + else{ + autostancefunction(); + } + } + else { + setFormation(4); + wantToScry = true; + return; + } + } + + //check Healthy force + const scryForHealthyCellsForce = getPageSetting('ScryerSkipHealthy') === 1; + forceScry = forceScry || isHealthyCell && scryForHealthyCellsForce && useScryerEnabled; + + if (forceScry) { + if (!onMap && inNature) { + if (canScryInCurrentNature) { + setFormation(4); + wantToScry = true; + return; + } + else{ + autostancefunction(); + } + } + else { + setFormation(4); + wantToScry = true; + return; + } + } + +//Calc Damage + if (AutoStance === 1) + calcBaseDamageinX(); + else if (AutoStance >= 2) + calcBaseDamageinX2(); + +//Suicide to Scry + const missingHealth = game.global.soldierHealthMax - game.global.soldierHealth; + const isNewSquadReady = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; + const dieToScryZone = getPageSetting('ScryerDieZ'); + const dieToScryEnabled = dieToScryZone !== -1; + const aboveDieToScryZone = game.global.world >= dieToScryZone; + + let okToSwitchStance = true; + let isAllowedToDie = (dieToScryEnabled && aboveDieToScryZone); + if (isAllowedToDie && dieToScryZone >= 0) { + var [dieZ, dieC] = dieToScryZone.toString().split("."); + if (dieC && dieC.length === 1) dieC = dieC + "0"; + isAllowedToDie = game.global.world >= dieZ && (!dieC || (game.global.lastClearedCell + 1 >= dieC)); + } + const inXFormation = game.global.formation === 0; + const inHFormation = game.global.formation === 1; + + if (inXFormation || inHFormation) + okToSwitchStance = isAllowedToDie || isNewSquadReady || (missingHealth < (baseHealth / 2)); + +//Overkill + const noOverkillLevels = game.portal.Overkill.level === 0; + const hasOverkillLevels = game.portal.Overkill.level > 0; + + let scryForOverkill = getPageSetting('ScryerUseWhenOverkill'); + if (scryForOverkill && noOverkillLevels) + setPageSetting('ScryerUseWhenOverkill', false); + if (scryForOverkill && !onMap && isActiveSpireAT() && scryInSpireNever) + scryForOverkill = false; + if (scryForOverkill && hasOverkillLevels && useScryerEnabled && forceScry) { + const minDamage = calcOurDmg("min", false, true); + const Sstance = 0.5; + const ovkldmg = minDamage * Sstance * (game.portal.Overkill.level * 0.005); + const ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; + if (ovklHDratio < 2) { + if (okToSwitchStance) + if (inNature) { + if (canScryInCurrentNature) { + setFormation(4); + } + else{ + autostancefunction(); + } + } + else { + setFormation(4); + } + return; + } + } + +//Default + const min_zone = getPageSetting('ScryerMinZone'); + const max_zone = getPageSetting('ScryerMaxZone'); + const valid_min = game.global.world >= min_zone && game.global.world > 60; + const valid_max = max_zone <= 0 || game.global.world < max_zone; + const onlyScryForMinMaxEnabled = getPageSetting('onlyminmaxworld') === true; + + if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMap)) { + if (okToSwitchStance) + if (inNature) { + if (canScryInCurrentNature) { + setFormation(4); + } + else{ + autostancefunction(); + } + } + else { + setFormation(4); + } + + wantToScry = true; + } + else { + autostancefunction(); + wantToScry = false; + } +} From bb565603b568175b666f9315d4527c9f50cd2172 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:43:26 +0100 Subject: [PATCH 1294/3477] Update scryer.js --- modules/scryer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index be3c264d5..b2494ce2a 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -22,7 +22,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Magma.active()); iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); - if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_scry))) { + if (!game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_scry))) { autostancefunction(); wantToScry = false; return; @@ -31,7 +31,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | var curEnemyhealth = getCurrentEnemy(1); var ishealthy = curEnemyhealth && curEnemyhealth.mutation == "Healthy"; ishealthy = ishealthy || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); - if ((ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (use_scry))) { + if (!game.global.mapsActive && (ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (use_scry))) { autostancefunction(); wantToScry = false; return; From 621a517977e32864115255f0417610a1e8bcb92e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:55:04 +0100 Subject: [PATCH 1295/3477] Update scryer.js --- modules/scryer.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index b2494ce2a..e796b71db 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -3,9 +3,10 @@ function useScryerStance() { var AutoStance = getPageSetting('AutoStance'); function autostancefunction() { - if (AutoStance==1) autoStance(); + if (getPageSetting('AutoStance')==3) || (getPageSetting('use3daily')==true && game.global.challengeActive == "Daily")) autoStance3(); + else if (AutoStance==1) autoStance(); else if (AutoStance==2) autoStance2(); - else if (AutoStance==3) autoStance3(); + } //Never From c4d83621f9aec570878760744f05488d61acb085 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 10:55:58 +0100 Subject: [PATCH 1296/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index e796b71db..e479047f0 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -3,7 +3,7 @@ function useScryerStance() { var AutoStance = getPageSetting('AutoStance'); function autostancefunction() { - if (getPageSetting('AutoStance')==3) || (getPageSetting('use3daily')==true && game.global.challengeActive == "Daily")) autoStance3(); + if ((getPageSetting('AutoStance')==3) || (getPageSetting('use3daily')==true && game.global.challengeActive == "Daily")) autoStance3(); else if (AutoStance==1) autoStance(); else if (AutoStance==2) autoStance2(); From 44efe2691b827813411dd0169fe707041ae5ed50 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 12:46:25 +0100 Subject: [PATCH 1297/3477] Update scryer.js --- modules/scryer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index e479047f0..dd30a6b30 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -16,7 +16,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) && (getPageSetting('UseScryerStance') == false && getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('UseScryerStance') == false && getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); - use_scry = use_scry || (!game.global.mapsActive && (getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world < getPageSetting('ScryUseinIce')))); + use_scry = use_scry || (!game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never var curEnemy = getCurrentEnemy(1); @@ -42,7 +42,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | var use_scryer = use_scryer || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1); use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 1) || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); - use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && 0 <= getPageSetting('ScryUseinPoison') && (game.global.world >= getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && 0 <= getPageSetting('ScryUseinWind') && (game.global.world >= getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && 0 <= getPageSetting('ScryUseinIce') && (game.global.world >= getPageSetting('ScryUseinIce'))))); + use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && getPageSetting('ScryUseinPoison') > 0 && game.global.world < getPageSetting('ScryUseinPoison')) || (getEmpowerment() == "Wind" && getPageSetting('ScryUseinPoison') > 0 && game.global.world < getPageSetting('ScryUseinWind')) || (getEmpowerment() == "Ice" && getPageSetting('ScryUseinPoison') > 0 && game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Force if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 1 && getPageSetting('UseScryerStance') == true) || (use_scryer)) { From 9a8d7cc6f6f5061484877c67955f6a7ba5c83b2c Mon Sep 17 00:00:00 2001 From: Novanet- Date: Mon, 10 Sep 2018 12:49:21 +0100 Subject: [PATCH 1298/3477] Possible corrupted void fix --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index dd30a6b30..4ddc07eb6 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -23,7 +23,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Magma.active()); iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); - if (!game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_scry))) { + if (!game.global.mapsActive && (iscorrupt && (getPageSetting('ScryerSkipCorrupteds2') == 0 || getPageSetting('ScryerUseinVoidMaps2') == 0) || (use_scry))) { autostancefunction(); wantToScry = false; return; From 4ea2e89d7ee30cb45a95ba18110a7c9bef3ec850 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 12:50:14 +0100 Subject: [PATCH 1299/3477] Update SettingsGUI.js --- SettingsGUI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 5c683f97a..dd667a9b2 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -346,11 +346,11 @@ function initializeAllSettings() { createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER Means what it says!!!
    FORCE means Scryer will ALWAYS activate against Corrupted enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Magma maps and Corrupted Voidmaps are currently classified as corrupted and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerSkipHealthy', ['Healthy: NEVER', 'Healthy: FORCE','Healthy: MAYBE'], 'NEVER Means what it says!!!
    FORCE means Scryer will ALWAYS activate against Healthy enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Corrupted Voidmaps are currently classified as Healthy (same as corrupted) and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
    Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. NOTE: Use at your own risk.
    Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); - createSetting('ScryUseinPoison', 'Scry in Poison','-1 to disable, any other number (including 0) sets a minimum zone to use S in Poison', 'value', -1, null, 'Scryer'); - createSetting('ScryUseinWind', 'Scry in Wind','-1 to disable, any other number (including 0) sets a minimum zone to use S in Wind', 'value', -1, null, 'Scryer'); + createSetting('ScryUseinPoison', 'Scry in Poison', 'Decides what you do in Poison.
    -1 = Maybe
    0 = Never
    Above 0 = Max Zone you want it scrying ', 'value', -1, null, 'Scryer'); + createSetting('ScryUseinWind', 'Decides what you do in Wind.
    -1 = Maybe
    0 = Never
    Above 0 = Max Zone you want it scrying', 'value', -1, null, 'Scryer'); //Line 3 - createSetting('ScryUseinIce', 'Scry in Ice','-1 to disable, any other number (including 0) sets a minimum zone to use S in Ice', 'value', -1, null, 'Scryer'); + createSetting('ScryUseinIce', 'Scry in Ice','Decides what you do in Ice.
    -1 = Maybe
    0 = Never
    Above 0 = Max Zone you want it scrying', 'value', -1, null, 'Scryer'); From 65f4cac2ad6208ae80efea3395272e9f88bbd55c Mon Sep 17 00:00:00 2001 From: Novanet- Date: Mon, 10 Sep 2018 12:54:38 +0100 Subject: [PATCH 1300/3477] Corrupted void attempt #2 --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 4ddc07eb6..e2fac1821 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -23,7 +23,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Magma.active()); iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); - if (!game.global.mapsActive && (iscorrupt && (getPageSetting('ScryerSkipCorrupteds2') == 0 || getPageSetting('ScryerUseinVoidMaps2') == 0) || (use_scry))) { + if ((!game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0)) || (game.global.mapsActive && (iscorrupt && getPageSetting('ScryerUseinVoidMaps2') == 0)) || (use_scry)) { autostancefunction(); wantToScry = false; return; From 7a35a41f57d3ec3529f4af0235307c31b46dc5eb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 12:54:58 +0100 Subject: [PATCH 1301/3477] Update SettingsGUI.js --- SettingsGUI.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index dd667a9b2..3f657d1a6 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -345,13 +345,13 @@ function initializeAllSettings() { createSetting('ScryerSkipBoss2', ['Boss: NEVER (All Levels)','Boss: NEVER (Above VoidLevel)','Boss: MAYBE'], 'NEVER (All Levels) will NEVER use S in cell 100 of the world!!!
    NEVER (Above VoidLevel) will NEVER use S in cell 100 of the world ABOVE the zone that your void maps are set to run at (Maps).
    MAYBE treats the cell no differently to any other, Overkill and Min/Max Scryer is allowed.

    Recommend NEVER (There is little benefit to double NON-HELIUM resources and a small chance of DE).', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER Means what it says!!!
    FORCE means Scryer will ALWAYS activate against Corrupted enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Magma maps and Corrupted Voidmaps are currently classified as corrupted and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerSkipHealthy', ['Healthy: NEVER', 'Healthy: FORCE','Healthy: MAYBE'], 'NEVER Means what it says!!!
    FORCE means Scryer will ALWAYS activate against Healthy enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Corrupted Voidmaps are currently classified as Healthy (same as corrupted) and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); - createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
    Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. NOTE: Use at your own risk.
    Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); createSetting('ScryUseinPoison', 'Scry in Poison', 'Decides what you do in Poison.
    -1 = Maybe
    0 = Never
    Above 0 = Max Zone you want it scrying ', 'value', -1, null, 'Scryer'); - createSetting('ScryUseinWind', 'Decides what you do in Wind.
    -1 = Maybe
    0 = Never
    Above 0 = Max Zone you want it scrying', 'value', -1, null, 'Scryer'); + createSetting('ScryUseinWind', 'Scry in Wind', 'Decides what you do in Wind.
    -1 = Maybe
    0 = Never
    Above 0 = Max Zone you want it scrying', 'value', -1, null, 'Scryer'); + createSetting('ScryUseinIce', 'Scry in Ice','Decides what you do in Ice.
    -1 = Maybe
    0 = Never
    Above 0 = Max Zone you want it scrying', 'value', -1, null, 'Scryer'); //Line 3 - createSetting('ScryUseinIce', 'Scry in Ice','Decides what you do in Ice.
    -1 = Maybe
    0 = Never
    Above 0 = Max Zone you want it scrying', 'value', -1, null, 'Scryer'); - + createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
    Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. NOTE: Use at your own risk.
    Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); + //Magma From 11a5f3e98211a07347829cf577a6ca77de34b513 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 12:59:53 +0100 Subject: [PATCH 1302/3477] Update scryer.js --- modules/scryer.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index e2fac1821..7e19b4475 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -14,9 +14,9 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | use_scry = use_scry || game.global.world <= 60; use_scry = use_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"); use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) && (getPageSetting('UseScryerStance') == false && getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('UseScryerStance') == false && getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); - use_scry = use_scry || (!game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); - use_scry = use_scry || (getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); - use_scry = use_scry || (!game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || game.global.world < getPageSetting('ScryUseinIce')))); + use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); + use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); + use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Never var curEnemy = getCurrentEnemy(1); From 78e2796bcbb88bb60c1af26f3225ac2802002986 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 13:52:00 +0100 Subject: [PATCH 1303/3477] Update other.js --- modules/other.js | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0f282b92c..fad576e05 100644 --- a/modules/other.js +++ b/modules/other.js @@ -463,28 +463,28 @@ if (game.portal.Anticipation.level >= 1) { } function ATspirebreed() { - // Get current geneticist setting var currStep = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); - // Check we are in a valid spire, have a valid timer setting, have not already made a copy of the old settings and set a new timer etc. - if (getPageSetting('SpireBreedTimer') >= 1 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive && !presteps && currStep > 0) { - // Make a copy by value of the old gene assist timers - presteps = game.global.GeneticistassistSteps.slice(); - // Set the current timer to the spire breed timer - game.global.GeneticistassistSteps[currStep] = getPageSetting('SpireBreedTimer'); - game.global.GeneticistassistSetting = getPageSetting('SpireBreedTimer'); - // Update gene assistant settings - toggleGeneticistassist(true); - } - // If we are not in a spire and have saved geneticist assistant timers... - else if (!game.global.spireActive && presteps) { - // Set the gene timers back to the saved array of old values and update the current timer setting - game.global.GeneticistassistSteps = presteps; - game.global.GeneticistassistSetting = presteps[currStep]; - // Update geneticist assistant settings - toggleGeneticistassist(true); - // Null the saved reference to the timer array so that we do not execute this branch again and are ready for the next spire - presteps = null; - } + var switchup; + var activespirebreed = false; + if (getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) { + activespirebreed = true; + if (currStep = 1) + toggleGeneticistassist(true); + toggleGeneticistassist(true); + switchup = 1; + + if (currStep = 2) + toggleGeneticistassist(true); + switchup = 2; + } + else if (activespirebreed && !game.global.spireActive) { + activespirebreed = false; + if (switchup = 1) + toggleGeneticistassist(true); + (if switchup = 2) + toggleGeneticistassist(true); + toggleGeneticistassist(true); + } } function helptrimpsnotdie(){game.global.fighting||game.global.preMapsActive||buyArms()} From c9c1a5d6aeb29c0bb7e866657f66a0fb91579243 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 13:53:17 +0100 Subject: [PATCH 1304/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index ff7bc19b1..7581792f0 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -79,7 +79,7 @@ function mainLoop() { if (getPageSetting('ExitSpireCell') > 0 && game.global.challengeActive != "Daily") exitSpireCell(); if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily") dailyexitSpireCell(); - if (getPageSetting('SpireBreedTimer') > 0) ATspirebreed(); + if (getPageSetting('SpireBreedTimer') == true && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) ATspirebreed(); if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); if (getPageSetting('PraidHarder') && getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily" || getPageSetting('dPraidHarder') && getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") PraidHarder(); else { From 6d1a5f7eaa6ea55c78462e72d3fe6be0a0b1b5c0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 13:55:31 +0100 Subject: [PATCH 1305/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 3f657d1a6..d20d57914 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -270,7 +270,7 @@ function initializeAllSettings() { createSetting('IgnoreSpiresUntil', 'Ignore Spires Until', 'Spire specific settings like end-at-cell are ignored until at least this zone is reached (0 to disable).
    Does not work with Run Bionic Before Spire.', 'value', '200', null, 'Spire'); createSetting('RunBionicBeforeSpire', 'Run Bionic Before Spire', 'CAUTION: Runs Bionic Wonderlands and repeatedly farms Bionic VI @ level 200 before attempting Spire, for the purpose of resource farming. Then it attempts the spire. The Minutes-Before-Spire timer runs concurrently to this, and needs to be set. If not set, it will exit without doing any Bionics... You can un-toggle it on the fly.
    NOTE: Turning this on also mandates that Run Unique Maps be on.
    WARNING: These 100 square maps take ~3x longer than normal maps.
    WARNING: If you dont have Bionic Magnet mastery, this will run the 5 pre-requisites and take longer.
    NOTE: In fact, it may not be what you want at all.', 'boolean', false, null, 'Spire'); //OUTDATED! createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Spire'); - createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Overrides the normal breed timer for the Spire (Affected by ignore spires until zone in Maps tab). Use -1 to disable this special setting.', 'value', -1, null, 'Spire'); + createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Uses Vanilla GA. When spire is active, will automatically change your GA to your 3RD OPTION! Please use the 1st or 2nd GA option for normal behaviour if you intend to use this function properly. ', 'boolean', false, null, 'Spire'); createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); //Line 2 From 99a80d06d657e42a119971922652df23d864a5fe Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 13:58:54 +0100 Subject: [PATCH 1306/3477] Update other.js --- modules/other.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/other.js b/modules/other.js index fad576e05..686228e0a 100644 --- a/modules/other.js +++ b/modules/other.js @@ -468,20 +468,21 @@ function ATspirebreed() { var activespirebreed = false; if (getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) { activespirebreed = true; - if (currStep = 1) + if (currStep == 1) { toggleGeneticistassist(true); toggleGeneticistassist(true); switchup = 1; - - if (currStep = 2) + } + if (currStep == 2) { toggleGeneticistassist(true); switchup = 2; + } } else if (activespirebreed && !game.global.spireActive) { activespirebreed = false; - if (switchup = 1) + if (switchup == 1) toggleGeneticistassist(true); - (if switchup = 2) + if (switchup == 2) toggleGeneticistassist(true); toggleGeneticistassist(true); } From 53dca9d20ea3dc801c5aca30817f0f6a3521ead6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 14:17:34 +0100 Subject: [PATCH 1307/3477] Update other.js --- modules/other.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/other.js b/modules/other.js index 686228e0a..2811ef0e8 100644 --- a/modules/other.js +++ b/modules/other.js @@ -469,22 +469,22 @@ function ATspirebreed() { if (getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) { activespirebreed = true; if (currStep == 1) { - toggleGeneticistassist(true); - toggleGeneticistassist(true); + toggleGeneticistassist(); + toggleGeneticistassist(); switchup = 1; } if (currStep == 2) { - toggleGeneticistassist(true); + toggleGeneticistassist(); switchup = 2; } } else if (activespirebreed && !game.global.spireActive) { activespirebreed = false; if (switchup == 1) - toggleGeneticistassist(true); + toggleGeneticistassist(); if (switchup == 2) - toggleGeneticistassist(true); - toggleGeneticistassist(true); + toggleGeneticistassist(); + toggleGeneticistassist(); } } From 186e6dbfb1ea6cd12a078badf68dce10016a6f80 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 14:20:55 +0100 Subject: [PATCH 1308/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 2811ef0e8..228673a4e 100644 --- a/modules/other.js +++ b/modules/other.js @@ -478,7 +478,7 @@ function ATspirebreed() { switchup = 2; } } - else if (activespirebreed && !game.global.spireActive) { + if (activespirebreed && !game.global.spireActive) { activespirebreed = false; if (switchup == 1) toggleGeneticistassist(); From 7a36f18f1f66bc8c4497003e4faf910ed76e3254 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 14:27:27 +0100 Subject: [PATCH 1309/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 7581792f0..74a379d29 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -79,7 +79,7 @@ function mainLoop() { if (getPageSetting('ExitSpireCell') > 0 && game.global.challengeActive != "Daily") exitSpireCell(); if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily") dailyexitSpireCell(); - if (getPageSetting('SpireBreedTimer') == true && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) ATspirebreed(); + if (getPageSetting('SpireBreedTimer') == true && getPageSetting('IgnoreSpiresUntil') <= game.global.world) ATspirebreed(); if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); if (getPageSetting('PraidHarder') && getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily" || getPageSetting('dPraidHarder') && getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") PraidHarder(); else { From 77f097d1790a0e603411bb049d7df20dfe4daaa9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 14:28:57 +0100 Subject: [PATCH 1310/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 228673a4e..c168aed57 100644 --- a/modules/other.js +++ b/modules/other.js @@ -463,7 +463,7 @@ if (game.portal.Anticipation.level >= 1) { } function ATspirebreed() { - var currStep = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); + var currStep = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); var switchup; var activespirebreed = false; if (getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) { From f0f0af5ce45d8bb2011da001a877e711ace2d589 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 14:32:14 +0100 Subject: [PATCH 1311/3477] Update other.js --- modules/other.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/other.js b/modules/other.js index c168aed57..721db935d 100644 --- a/modules/other.js +++ b/modules/other.js @@ -479,12 +479,15 @@ function ATspirebreed() { } } if (activespirebreed && !game.global.spireActive) { - activespirebreed = false; - if (switchup == 1) + + if (switchup == 1) { toggleGeneticistassist(); - if (switchup == 2) + } + if (switchup == 2) { toggleGeneticistassist(); toggleGeneticistassist(); + } + activespirebreed = false; } } From 2f8516efc6fecf37d3b4ecb3479338255f8150d6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 14:49:47 +0100 Subject: [PATCH 1312/3477] Update other.js --- modules/other.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 721db935d..9b6ef099b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -462,11 +462,13 @@ if (game.portal.Anticipation.level >= 1) { } } +function precurrStep(){return game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting);} + function ATspirebreed() { - var currStep = game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting); var switchup; var activespirebreed = false; if (getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) { + var currStep = precurrStep(); activespirebreed = true; if (currStep == 1) { toggleGeneticistassist(); From f6dbd40534e4d1843ee9979499b4888bcae78eb3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 19:16:39 +0100 Subject: [PATCH 1313/3477] Update scryer.js --- modules/scryer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/scryer.js b/modules/scryer.js index 7e19b4475..9efa3160b 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -17,6 +17,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || game.global.world < getPageSetting('ScryUseinIce')))); + use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('screwessence') == true && countRemainingEssenceDrops() < 1); //check Corrupted Never var curEnemy = getCurrentEnemy(1); From 745cb7ed10cd62ddd7d6d0fee588ace660e2f378 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 19:16:41 +0100 Subject: [PATCH 1314/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index d20d57914..b3f454eff 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -278,6 +278,7 @@ function initializeAllSettings() { + //Raiding //Line 1 @@ -351,7 +352,7 @@ function initializeAllSettings() { //Line 3 createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
    Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. NOTE: Use at your own risk.
    Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); - + createSetting('screwessence', 'Remaining Essence Only', 'Why scry when theres no essence? Turns off scrying when the remaining enemies with essence drops to 0. ', 'boolean', false, null, 'Scryer'); //Magma From dca40d926af05a9aea3b715dfcc8622c97a17544 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 19:27:00 +0100 Subject: [PATCH 1315/3477] Update SettingsGUI.js --- SettingsGUI.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index b3f454eff..d2201a7a8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -83,13 +83,14 @@ function initializeAllSettings() { createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Mining/Building Only', 'Science Research OFF'], 'Controls what you gather/build do. Manual does nothing
    Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
    Mining/Building only does exactly what it says. Only use if you are passed the early stages of the game (No longer need to trap, food and wood are useless).
    You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All Upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); createSetting('amalcoord', 'Amal Boost', 'Boost your Amal count for more Mi. Will not buy coords until your H:D ratio is below a certain value. This means that you will get amals quicker. Will not activate higher than your Amal Boost End Zone Setting! ', 'boolean', false, null, "Core"); + createSetting('amalcoordt', 'Amal Target', 'Set the amount of Amals you wish to aim for. Once this target is reached, it will buy coords below your Amal ratio regardless of your H:D, just enough to keep the Amal. -1 to disable and use H:D for entire boost. ', 'value', -1, null, "Core"); createSetting('amalcoordhd', 'Amal Boost H:D', 'Set your H:D for Amal Boost here. The higher it is the less coords AT will buy. 0.0000025 is the default. ', 'value', 0.0000025, null, "Core"); createSetting('amalcoordz', 'Amal Boost End Z', 'Amal Boost End Zone. Set the zone you want to stop Amal Boosting. -1 to do it infinitely. ', 'value', -1, null, "Core"); createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); - createSetting('fastallocate', 'Fast Allocate', 'Turn on if your helium is above 500Qa. Not recommended for low amounts of helium. ', 'boolean', false, null, 'Core'); - createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Core'); //Line 2 + createSetting('fastallocate', 'Fast Allocate', 'Turn on if your helium is above 500Qa. Not recommended for low amounts of helium. ', 'boolean', false, null, 'Core'); + createSetting('lootdumpz', 'Loot Dump Z', 'What zone to dump all earned helium from previous portal at. E.g; z230, will dump all helium from last run into looting II at zone 230.', 'value', -1, null, 'Core'); createSetting('TrapTrimps', 'Trap Trimps', 'Automatically trap trimps when needed, including building traps. (when you turn this off, you may aswell turn off the in-game autotraps button, think of the starving trimps that could eat that food!)', 'boolean', true, null, "Core"); document.getElementById('TrapTrimps').parentNode.insertAdjacentHTML('afterend','
    '); @@ -523,6 +524,7 @@ function updateCustomButtons() { //Core getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpa"): turnOff("lootdumpa"); getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpz"): turnOff("lootdumpz"); + getPageSetting('amalcoord')==true ? turnOn("amalcoordt"): turnOff("amalcoordt"); getPageSetting('amalcoord')==true ? turnOn("amalcoordhd"): turnOff("amalcoordhd"); getPageSetting('amalcoord')==true ? turnOn("amalcoordz"): turnOff("amalcoordz"); getPageSetting('AutoAllocatePerks')==1 ? turnOn("fastallocate"): turnOff("fastallocate"); From 221a700e99ec16cdb4ca321b8208677650f69a07 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 20:04:29 +0100 Subject: [PATCH 1316/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 424cb672d..09d36a39f 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -7,7 +7,7 @@ function buyUpgrades() { var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; - if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && HDratioy() < getPageSetting('amalcoordhd')))) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000)))) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; From 5a7c174e1b7678a0d845f363a35e6cfe85b2b322 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 20:13:23 +0100 Subject: [PATCH 1317/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 09d36a39f..a8be0b0d7 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -7,7 +7,7 @@ function buyUpgrades() { var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; - if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000)))) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') <= game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000)))) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; From 0548c60361f4189d1843161fca392eb6fecb335b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 20:33:46 +0100 Subject: [PATCH 1318/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index a8be0b0d7..0111e38dd 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -7,7 +7,7 @@ function buyUpgrades() { var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; - if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') <= game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000)))) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') >= game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000)))) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; From ed9447148fb58b6748f147f89f8f81ba06aabda0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 20:34:24 +0100 Subject: [PATCH 1319/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 0111e38dd..097bd1a5a 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -7,7 +7,7 @@ function buyUpgrades() { var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; - if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') >= game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000)))) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') == game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000)))) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; From 85c300a3afb998539048e9b454a4cfbd3787e652 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 22:17:43 +0100 Subject: [PATCH 1320/3477] Update scryer.js --- modules/scryer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 9efa3160b..ad30d1dae 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -24,7 +24,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Magma.active()); iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); - if ((!game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0)) || (game.global.mapsActive && (iscorrupt && getPageSetting('ScryerUseinVoidMaps2') == 0)) || (use_scry)) { + if ((getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0)) || (game.global.mapsActive && (iscorrupt && getPageSetting('ScryerUseinVoidMaps2') == 0)) || (use_scry)) { autostancefunction(); wantToScry = false; return; @@ -32,7 +32,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | //check Healthy never var curEnemyhealth = getCurrentEnemy(1); var ishealthy = curEnemyhealth && curEnemyhealth.mutation == "Healthy"; - ishealthy = ishealthy || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); + ishealthy = ishealthy || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); if (!game.global.mapsActive && (ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (use_scry))) { autostancefunction(); wantToScry = false; From da1dc29a4005b4353dd64eba078e7da5bba2ba08 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 22:20:15 +0100 Subject: [PATCH 1321/3477] Update scryer.js --- modules/scryer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index ad30d1dae..334c2f900 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -24,7 +24,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Magma.active()); iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); - if ((getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0)) || (game.global.mapsActive && (iscorrupt && getPageSetting('ScryerUseinVoidMaps2') == 0)) || (use_scry)) { + if (getPageSetting('UseScryerStance') == true && (!game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0)) || (game.global.mapsActive && (iscorrupt && getPageSetting('ScryerUseinVoidMaps2') == 0)) || (use_scry)) { autostancefunction(); wantToScry = false; return; @@ -32,7 +32,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | //check Healthy never var curEnemyhealth = getCurrentEnemy(1); var ishealthy = curEnemyhealth && curEnemyhealth.mutation == "Healthy"; - ishealthy = ishealthy || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); + ishealthy = ishealthy || (getPageSetting('UseScryerStance') == true && game.global.world >= mutations.Corruption.start()); if (!game.global.mapsActive && (ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (use_scry))) { autostancefunction(); wantToScry = false; From 1d2916ec1f07a102f78b922f2f5a7fc70c001828 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 22:21:41 +0100 Subject: [PATCH 1322/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 334c2f900..16ee324f7 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -17,7 +17,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || game.global.world < getPageSetting('ScryUseinIce')))); - use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('screwessence') == true && countRemainingEssenceDrops() < 1); + //use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('screwessence') == true && countRemainingEssenceDrops() < 1); //check Corrupted Never var curEnemy = getCurrentEnemy(1); From 0a6a8fa0f12d260ce794107d9fa08c99bdf40d74 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 22:26:14 +0100 Subject: [PATCH 1323/3477] Revert "Update scryer.js" This reverts commit 1d2916ec1f07a102f78b922f2f5a7fc70c001828. --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 16ee324f7..334c2f900 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -17,7 +17,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || game.global.world < getPageSetting('ScryUseinIce')))); - //use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('screwessence') == true && countRemainingEssenceDrops() < 1); + use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('screwessence') == true && countRemainingEssenceDrops() < 1); //check Corrupted Never var curEnemy = getCurrentEnemy(1); From 32c0e56e58d669cd7bc21ae1036bdd2a277fb314 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 22:29:52 +0100 Subject: [PATCH 1324/3477] Update scryer.js --- modules/scryer.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 334c2f900..c25ab7385 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -22,9 +22,8 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | //check Corrupted Never var curEnemy = getCurrentEnemy(1); var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; - iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Magma.active()); - iscorrupt = iscorrupt || (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.world >= mutations.Corruption.start()); - if (getPageSetting('UseScryerStance') == true && (!game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0)) || (game.global.mapsActive && (iscorrupt && getPageSetting('ScryerUseinVoidMaps2') == 0)) || (use_scry)) { + iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Corruption.start()); + if (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_scry))) { autostancefunction(); wantToScry = false; return; @@ -32,8 +31,8 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | //check Healthy never var curEnemyhealth = getCurrentEnemy(1); var ishealthy = curEnemyhealth && curEnemyhealth.mutation == "Healthy"; - ishealthy = ishealthy || (getPageSetting('UseScryerStance') == true && game.global.world >= mutations.Corruption.start()); - if (!game.global.mapsActive && (ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (use_scry))) { + ishealthy = ishealthy || (game.global.world >= mutations.Corruption.start()); + if (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (use_scry))) { autostancefunction(); wantToScry = false; return; From 645ca0e00dda2adf0b5668217bfcd8a200e4cbb8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 22:33:47 +0100 Subject: [PATCH 1325/3477] Update scryer.js --- modules/scryer.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index c25ab7385..26ee7b818 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -1,3 +1,5 @@ +//NO TOUCHY PLS + var wantToScry = false; function useScryerStance() { @@ -13,7 +15,7 @@ function useScryerStance() { var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; use_scry = use_scry || game.global.world <= 60; use_scry = use_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"); - use_scry = use_scry || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 0) && (getPageSetting('UseScryerStance') == false && getPageSetting('scryvoidmaps') == false && game.global.challengeActive != "Daily") || (getPageSetting('UseScryerStance') == false && getPageSetting('dscryvoidmaps')== false && game.global.challengeActive == "Daily"))); + use_scry = use_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0); use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || game.global.world < getPageSetting('ScryUseinIce')))); From 50f6989b97ee6136eff7ed122fd12441ea456f84 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 22:40:27 +0100 Subject: [PATCH 1326/3477] Update scryer.js --- modules/scryer.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 26ee7b818..7be2335d1 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -24,7 +24,6 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | //check Corrupted Never var curEnemy = getCurrentEnemy(1); var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; - iscorrupt = iscorrupt || (game.global.mapsActive && mutations.Corruption.start()); if (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_scry))) { autostancefunction(); wantToScry = false; @@ -33,7 +32,6 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | //check Healthy never var curEnemyhealth = getCurrentEnemy(1); var ishealthy = curEnemyhealth && curEnemyhealth.mutation == "Healthy"; - ishealthy = ishealthy || (game.global.world >= mutations.Corruption.start()); if (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (use_scry))) { autostancefunction(); wantToScry = false; From 98aa0ce74e967b4e9df49d6e434e39cee3f8be3d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 10 Sep 2018 23:21:30 +0100 Subject: [PATCH 1327/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index 7be2335d1..3afb21c07 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -19,7 +19,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || game.global.world < getPageSetting('ScryUseinIce')))); - use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('screwessence') == true && countRemainingEssenceDrops() < 1); + use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && getPageSetting('screwessence') == true && countRemainingEssenceDrops() < 1); //check Corrupted Never var curEnemy = getCurrentEnemy(1); From 39745a37c8a1b1f4c35065f423bc99cb6cb938d2 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 09:47:47 +0100 Subject: [PATCH 1328/3477] Revert "Update portal.js" This reverts commit c4197a5ba2a21fcedf90baa08e852888581f8c9d. --- modules/portal.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index fa84312c3..62fdc5643 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -17,6 +17,7 @@ function autoPortal() { case "Toxicity": if (getPageSetting('MaxTox')) settingChanged("MaxTox"); + break; default: if (!game.global.challengeActive) { doPortal(selectedAutoPortalChallenge); @@ -221,7 +222,7 @@ function findOutCurrentPortalLevel() { Watch: 181, Corrupted: 191 }[autoPortalSetting]; - zoneToPortalAt = challengeEndZone + challengeEndZone && (zoneToPortalAt = challengeEndZone); } return zoneToPortalAt; } From 67e8a201bfc8edc3e945c317441fbe15dffe0a11 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 09:47:52 +0100 Subject: [PATCH 1329/3477] Revert "Update portal.js" This reverts commit da7e4f1fe162279a9d2936e98ebb0219ecda1e81. --- modules/portal.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 62fdc5643..1be493cbf 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -6,6 +6,7 @@ let zonePostpone = 0; function autoPortal() { if (!game.global.portalActive) return; + let selectedAutoPortalChallenge = autoTrimpSettings.AutoPortal.selected; switch (selectedAutoPortalChallenge) { case "Helium Per Hour": @@ -17,7 +18,6 @@ function autoPortal() { case "Toxicity": if (getPageSetting('MaxTox')) settingChanged("MaxTox"); - break; default: if (!game.global.challengeActive) { doPortal(selectedAutoPortalChallenge); @@ -30,10 +30,12 @@ function heliumPerHourPortal() { let OKtoPortal = false; if (!game.global.runningChallengeSquared) { const minZone = getPageSetting('HeHrDontPortalBefore'); + game.stats.bestHeliumHourThisRun.evaluate(); const bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; const bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; const myHeliumHr = game.stats.heliumHour.value(); + let heliumHrBuffer = Math.abs(getPageSetting('HeliumHrBuffer')); if (!aWholeNewWorld) heliumHrBuffer *= MODULES["portal"].bufferExceedFactor; @@ -45,6 +47,7 @@ function heliumPerHourPortal() { } if (heliumHrBuffer === 0 && !aWholeNewWorld) OKtoPortal = false; + if (OKtoPortal && zonePostpone === 0) { zonePostpone += 1; debug("My HeliumHr was: " + myHeliumHr + " & the Best HeliumHr was: " + bestHeHr + " at zone: " + bestHeHrZone, "portal"); @@ -75,17 +78,21 @@ function customZonePortal() { function dailyAutoPortal() { if (!game.global.portalActive) return; + let dailyPortalHeliumPerHour = getPageSetting('AutoPortalDaily') === 1; if (dailyPortalHeliumPerHour) { let OKtoPortal = false; if (!game.global.runningChallengeSquared) { const minZone = getPageSetting('dHeHrDontPortalBefore'); + game.stats.bestHeliumHourThisRun.evaluate(); const bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; const bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; const myHeliumHr = game.stats.heliumHour.value(); + let heliumHrBuffer = Math.abs(getPageSetting('dHeliumHrBuffer')); if (!aWholeNewWorld) { + heliumHrBuffer *= MODULES["portal"].bufferExceedFactor; const bufferExceeded = myHeliumHr < bestHeHr * (1 - (heliumHrBuffer / 100)); if (bufferExceeded && game.global.world >= minZone) { @@ -95,6 +102,7 @@ function dailyAutoPortal() { } if (heliumHrBuffer === 0 && !aWholeNewWorld) OKtoPortal = false; + if (OKtoPortal && zonePostpone === 0) { zonePostpone += 1; debug("My HeliumHr was: " + myHeliumHr + " & the Best HeliumHr was: " + bestHeHr + " at zone: " + bestHeHrZone, "portal"); @@ -134,8 +142,10 @@ function dailyAutoPortal() { function doPortal(challenge) { if (!game.global.portalActive) return; + manageMagmite(); manageHeirlooms(); + portalClicked(); let autoAllocateOn = getPageSetting('AutoAllocatePerks') === 1; if (autoAllocateOn && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) @@ -151,7 +161,6 @@ function doPortal(challenge) { activatePortal(); zonePostpone = 0; } - function manageMagmite() { let spendMagmitePortal = getPageSetting('spendmagmite') === 1; if (spendMagmitePortal) autoMagmiteSpender(); @@ -167,6 +176,7 @@ function runDaily(challenge) { selectChallenge('Daily'); checkCompleteDailies(); let lastUnattemptedDaily = selectDaily(); + let noAvailableDailies = lastUnattemptedDaily === 1; if (noAvailableDailies) { debug("All available Dailies already completed.", "portal"); @@ -198,6 +208,7 @@ function finishChallengeSquared() { function findOutCurrentPortalLevel() { const autoPortalSetting = getPageSetting("AutoPortal"); + let zoneToPortalAt = -1; switch (autoPortalSetting) { case "Off": From 04bff4cce8c62fa9c903cfc1ac7e2bcf1695ca32 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 09:48:31 +0100 Subject: [PATCH 1330/3477] Revert "Corrupted void attempt #2" This reverts commit 65f4cac2ad6208ae80efea3395272e9f88bbd55c. --- SettingsGUI.js | 4 +- modules/portal.js | 198 ++++++++++++++++++++++++---------------------- 2 files changed, 107 insertions(+), 95 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index d2201a7a8..52673f609 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -600,7 +600,9 @@ function updateCustomButtons() { } function checkPortalSettings() { - var portalLevel = findOutCurrentPortalLevel(); + var result = findOutCurrentPortalLevel(); + var portalLevel = result.level; + var leadCheck = result.lead; if (portalLevel == -1) return portalLevel; var voidmaps = 0; diff --git a/modules/portal.js b/modules/portal.js index 1be493cbf..6ebfa9884 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -1,122 +1,113 @@ MODULES["portal"] = {}; MODULES["portal"].timeout = 5000; MODULES["portal"].bufferExceedFactor = 5; - -let zonePostpone = 0; +var portalzone = getPageSetting('CustomAutoPortal'); +var zonePostpone = 0; function autoPortal() { if (!game.global.portalActive) return; - - let selectedAutoPortalChallenge = autoTrimpSettings.AutoPortal.selected; - switch (selectedAutoPortalChallenge) { + switch (autoTrimpSettings.AutoPortal.selected) { case "Helium Per Hour": - heliumPerHourPortal(); + var OKtoPortal = false; + if (!game.global.runningChallengeSquared) { + var minZone = getPageSetting('HeHrDontPortalBefore'); + game.stats.bestHeliumHourThisRun.evaluate(); + var bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; + var bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; + var myHeliumHr = game.stats.heliumHour.value(); + var heliumHrBuffer = Math.abs(getPageSetting('HeliumHrBuffer')); + if (!aWholeNewWorld) + heliumHrBuffer *= MODULES["portal"].bufferExceedFactor; + var bufferExceeded = myHeliumHr < bestHeHr * (1 - (heliumHrBuffer / 100)); + if (bufferExceeded && game.global.world >= minZone) { + OKtoPortal = true; + if (aWholeNewWorld) + zonePostpone = 0; + } + if (heliumHrBuffer == 0 && !aWholeNewWorld) + OKtoPortal = false; + if (OKtoPortal && zonePostpone == 0) { + zonePostpone += 1; + debug("My HeliumHr was: " + myHeliumHr + " & the Best HeliumHr was: " + bestHeHr + " at zone: " + bestHeHrZone, "portal"); + cancelTooltip(); + tooltip('confirm', null, 'update', 'Auto Portaling NOW!

    Hit Delay Portal to WAIT 1 more zone.', 'zonePostpone+=1', 'NOTICE: Auto-Portaling in 5 seconds....', 'Delay Portal'); + setTimeout(cancelTooltip, MODULES["portal"].timeout); + setTimeout(function() { + if (zonePostpone >= 2) + return; + if (autoTrimpSettings.HeliumHourChallenge.selected != 'None') + doPortal(autoTrimpSettings.HeliumHourChallenge.selected); + else + doPortal(); + }, MODULES["portal"].timeout + 100); + } + } break; case "Custom": - customZonePortal(); + var portalzone = getPageSetting('CustomAutoPortal'); + if (game.global.world > portalzone) { + if (autoTrimpSettings.HeliumHourChallenge.selected != 'None') + doPortal(autoTrimpSettings.HeliumHourChallenge.selected); + else + doPortal(); + } break; + case "Balance": + case "Decay": + case "Electricity": + case "Life": + case "Crushed": + case "Nom": case "Toxicity": if (getPageSetting('MaxTox')) settingChanged("MaxTox"); - default: + case "Watch": + case "Lead": + case "Corrupted": if (!game.global.challengeActive) { - doPortal(selectedAutoPortalChallenge); + doPortal(autoTrimpSettings.AutoPortal.selected); } break; - } -} - -function heliumPerHourPortal() { - let OKtoPortal = false; - if (!game.global.runningChallengeSquared) { - const minZone = getPageSetting('HeHrDontPortalBefore'); - - game.stats.bestHeliumHourThisRun.evaluate(); - const bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; - const bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; - const myHeliumHr = game.stats.heliumHour.value(); - - let heliumHrBuffer = Math.abs(getPageSetting('HeliumHrBuffer')); - if (!aWholeNewWorld) - heliumHrBuffer *= MODULES["portal"].bufferExceedFactor; - const bufferExceeded = myHeliumHr < bestHeHr * (1 - (heliumHrBuffer / 100)); - if (bufferExceeded && game.global.world >= minZone) { - OKtoPortal = true; - if (aWholeNewWorld) - zonePostpone = 0; - } - if (heliumHrBuffer === 0 && !aWholeNewWorld) - OKtoPortal = false; - - if (OKtoPortal && zonePostpone === 0) { - zonePostpone += 1; - debug("My HeliumHr was: " + myHeliumHr + " & the Best HeliumHr was: " + bestHeHr + " at zone: " + bestHeHrZone, "portal"); - cancelTooltip(); - tooltip('confirm', null, 'update', 'Auto Portaling NOW!

    Hit Delay Portal to WAIT 1 more zone.', 'zonePostpone+=1', 'NOTICE: Auto-Portaling in 5 seconds....', 'Delay Portal'); - setTimeout(cancelTooltip, MODULES["portal"].timeout); - setTimeout(function () { - if (zonePostpone >= 2) - return; - if (autoTrimpSettings.HeliumHourChallenge.selected !== 'None') - doPortal(autoTrimpSettings.HeliumHourChallenge.selected); - else - doPortal(); - }, MODULES["portal"].timeout + 100); - } - } -} - -function customZonePortal() { - const portalzone = getPageSetting('CustomAutoPortal'); - if (game.global.world > portalzone) { - if (autoTrimpSettings.HeliumHourChallenge.selected !== 'None') - doPortal(autoTrimpSettings.HeliumHourChallenge.selected); - else - doPortal(); + default: + break; } } function dailyAutoPortal() { if (!game.global.portalActive) return; - - let dailyPortalHeliumPerHour = getPageSetting('AutoPortalDaily') === 1; - if (dailyPortalHeliumPerHour) { - let OKtoPortal = false; + if (getPageSetting('AutoPortalDaily') == 1) { + var OKtoPortal = false; if (!game.global.runningChallengeSquared) { - const minZone = getPageSetting('dHeHrDontPortalBefore'); - + var minZone = getPageSetting('dHeHrDontPortalBefore'); game.stats.bestHeliumHourThisRun.evaluate(); - const bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; - const bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; - const myHeliumHr = game.stats.heliumHour.value(); - - let heliumHrBuffer = Math.abs(getPageSetting('dHeliumHrBuffer')); + var bestHeHr = game.stats.bestHeliumHourThisRun.storedValue; + var bestHeHrZone = game.stats.bestHeliumHourThisRun.atZone; + var myHeliumHr = game.stats.heliumHour.value(); + var heliumHrBuffer = Math.abs(getPageSetting('dHeliumHrBuffer')); if (!aWholeNewWorld) { - heliumHrBuffer *= MODULES["portal"].bufferExceedFactor; - const bufferExceeded = myHeliumHr < bestHeHr * (1 - (heliumHrBuffer / 100)); + var bufferExceeded = myHeliumHr < bestHeHr * (1 - (heliumHrBuffer / 100)); if (bufferExceeded && game.global.world >= minZone) { OKtoPortal = true; if (aWholeNewWorld) zonePostpone = 0; } - if (heliumHrBuffer === 0 && !aWholeNewWorld) + if (heliumHrBuffer == 0 && !aWholeNewWorld) OKtoPortal = false; - - if (OKtoPortal && zonePostpone === 0) { + if (OKtoPortal && zonePostpone == 0) { zonePostpone += 1; debug("My HeliumHr was: " + myHeliumHr + " & the Best HeliumHr was: " + bestHeHr + " at zone: " + bestHeHrZone, "portal"); cancelTooltip(); tooltip('confirm', null, 'update', 'Auto Portaling NOW!

    Hit Delay Portal to WAIT 1 more zone.', 'zonePostpone+=1', 'NOTICE: Auto-Portaling in 5 seconds....', 'Delay Portal'); setTimeout(cancelTooltip, MODULES["portal"].timeout); - setTimeout(function () { + setTimeout(function() { if (zonePostpone >= 2) return; if (OKtoPortal) { abandonDaily(); document.getElementById('finishDailyBtnContainer').style.display = 'none'; } - if (autoTrimpSettings.dHeliumHourChallenge.selected !== 'None') + if (autoTrimpSettings.dHeliumHourChallenge.selected != 'None') doPortal(autoTrimpSettings.dHeliumHourChallenge.selected); else doPortal(); @@ -125,14 +116,12 @@ function dailyAutoPortal() { } } } - - let dailyPortalCustom = getPageSetting('AutoPortalDaily') === 2; - if (dailyPortalCustom) { - const customPortalZone = getPageSetting('dCustomAutoPortal'); - if (game.global.world > customPortalZone) { + if (getPageSetting('AutoPortalDaily') == 2) { + var portalzone = getPageSetting('dCustomAutoPortal'); + if (game.global.world > portalzone) { abandonDaily(); document.getElementById('finishDailyBtnContainer').style.display = 'none'; - if (autoTrimpSettings.dHeliumHourChallenge.selected !== 'None') + if (autoTrimpSettings.dHeliumHourChallenge.selected != 'None') doPortal(autoTrimpSettings.dHeliumHourChallenge.selected); else doPortal(); @@ -142,30 +131,47 @@ function dailyAutoPortal() { function doPortal(challenge) { if (!game.global.portalActive) return; - - manageMagmite(); - manageHeirlooms(); - + if (getPageSetting('spendmagmite') == 1) autoMagmiteSpender(); + if (getPageSetting('AutoHeirloomsNew') == 0); + else if (getPageSetting('AutoHeirloomsNew') == 1) autoHeirlooms(); + else if (getPageSetting('AutoHeirloomsNew') == 2) autoHeirlooms2(); + if (getPageSetting('AutoUpgradeHeirlooms') && !heirloomsShown) autoNull(); portalClicked(); - let autoAllocateOn = getPageSetting('AutoAllocatePerks') === 1; - if (autoAllocateOn && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) + if (getPageSetting('AutoAllocatePerks') == 1 && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) AutoPerks.clickAllocate(); - if (getPageSetting('AutoStartDaily')) { +<<<<<<< HEAD runDaily(challenge); +======= + selectChallenge('Daily'); + checkCompleteDailies(); + + var lastUndone = -7; + while (++lastUndone <= 0) { + var done = (game.global.recentDailies.indexOf(getDailyTimeString(lastUndone)) != -1); + if (!done) + break; + } + + if (lastUndone == 1) { + debug("All available Dailies already completed.", "portal"); + selectChallenge(challenge || 0); + } else { + getDailyChallenge(lastUndone); + debug("Portaling into Daily for: " + getDailyTimeString(lastUndone, true) + " now!", "portal"); + } +>>>>>>> parent of 8963ba1... Refactored portal.js } else if (challenge) { selectChallenge(challenge); } pushData(); activateClicked(); activatePortal(); + lastHeliumZone = 0; zonePostpone = 0; } -function manageMagmite() { - let spendMagmitePortal = getPageSetting('spendmagmite') === 1; - if (spendMagmitePortal) autoMagmiteSpender(); -} +<<<<<<< HEAD function manageHeirlooms() { if (getPageSetting('AutoHeirloomsNew') === 1) autoHeirlooms(); else if (getPageSetting('AutoHeirloomsNew') === 2) autoHeirlooms2(); @@ -237,3 +243,7 @@ function findOutCurrentPortalLevel() { } return zoneToPortalAt; } +======= +function finishChallengeSquared(){var a=getPageSetting("FinishC2");game.global.world>=a&&(abandonChallenge(),debug("Finished challenge2 because we are on zone "+game.global.world,"other","oil"))} +function findOutCurrentPortalLevel(){var a=-1,b=!1,d=getPageSetting("AutoPortal");switch(d){case"Off":break;case"Custom":"Daily"!=game.global.challengeActive&&(a=getPageSetting("CustomAutoPortal")+1),"Daily"==game.global.challengeActive&&(a=getPageSetting("Dailyportal")+1),b=!("Lead"!=getPageSetting("HeliumHourChallenge"));break;default:var e={Balance:41,Decay:56,Electricity:82,Crushed:126,Nom:146,Toxicity:166,Lead:181,Watch:181,Corrupted:191}[d];e&&(a=e);}return{level:a,lead:b}} +>>>>>>> parent of 8963ba1... Refactored portal.js From 6de1e513f483de5a9c41e870bfdd0e521c2747d8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 09:51:38 +0100 Subject: [PATCH 1331/3477] Update portal.js --- modules/portal.js | 78 ----------------------------------------------- 1 file changed, 78 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 6ebfa9884..30ba1a3ab 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -140,12 +140,9 @@ function doPortal(challenge) { if (getPageSetting('AutoAllocatePerks') == 1 && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) AutoPerks.clickAllocate(); if (getPageSetting('AutoStartDaily')) { -<<<<<<< HEAD runDaily(challenge); -======= selectChallenge('Daily'); checkCompleteDailies(); - var lastUndone = -7; while (++lastUndone <= 0) { var done = (game.global.recentDailies.indexOf(getDailyTimeString(lastUndone)) != -1); @@ -160,7 +157,6 @@ function doPortal(challenge) { getDailyChallenge(lastUndone); debug("Portaling into Daily for: " + getDailyTimeString(lastUndone, true) + " now!", "portal"); } ->>>>>>> parent of 8963ba1... Refactored portal.js } else if (challenge) { selectChallenge(challenge); } @@ -171,79 +167,5 @@ function doPortal(challenge) { zonePostpone = 0; } -<<<<<<< HEAD -function manageHeirlooms() { - if (getPageSetting('AutoHeirloomsNew') === 1) autoHeirlooms(); - else if (getPageSetting('AutoHeirloomsNew') === 2) autoHeirlooms2(); - if (getPageSetting('AutoUpgradeHeirlooms') && !heirloomsShown) autoNull(); -} - -function runDaily(challenge) { - selectChallenge('Daily'); - checkCompleteDailies(); - let lastUnattemptedDaily = selectDaily(); - - let noAvailableDailies = lastUnattemptedDaily === 1; - if (noAvailableDailies) { - debug("All available Dailies already completed.", "portal"); - selectChallenge(challenge || 0); - } else { - getDailyChallenge(lastUnattemptedDaily); - debug("Portaling into Daily for: " + getDailyTimeString(lastUnattemptedDaily, true) + " now!", "portal"); - } -} - -function selectDaily() { - let lastUndone = -7; - while (++lastUndone <= 0) { - let done = (game.global.recentDailies.indexOf(getDailyTimeString(lastUndone)) !== -1); - if (!done) - break; - } - return lastUndone; -} - -function finishChallengeSquared() { - const finishC2Zone = getPageSetting("FinishC2"); - - if (game.global.world >= finishC2Zone){ - abandonChallenge(); - debug("Finished challenge2 because we are on zone " + game.global.world, "other", "oil"); - } -} - -function findOutCurrentPortalLevel() { - const autoPortalSetting = getPageSetting("AutoPortal"); - - let zoneToPortalAt = -1; - switch (autoPortalSetting) { - case "Off": - break; - case "Custom": - if (game.global.challengeActive === "Daily"){ - zoneToPortalAt = getPageSetting("Dailyportal") + 1; - } - else{ - zoneToPortalAt = getPageSetting("CustomAutoPortal") + 1; - } - break; - default: - const challengeEndZone = { - Balance: 41, - Decay: 56, - Electricity: 82, - Crushed: 126, - Nom: 146, - Toxicity: 166, - Lead: 181, - Watch: 181, - Corrupted: 191 - }[autoPortalSetting]; - challengeEndZone && (zoneToPortalAt = challengeEndZone); - } - return zoneToPortalAt; -} -======= function finishChallengeSquared(){var a=getPageSetting("FinishC2");game.global.world>=a&&(abandonChallenge(),debug("Finished challenge2 because we are on zone "+game.global.world,"other","oil"))} function findOutCurrentPortalLevel(){var a=-1,b=!1,d=getPageSetting("AutoPortal");switch(d){case"Off":break;case"Custom":"Daily"!=game.global.challengeActive&&(a=getPageSetting("CustomAutoPortal")+1),"Daily"==game.global.challengeActive&&(a=getPageSetting("Dailyportal")+1),b=!("Lead"!=getPageSetting("HeliumHourChallenge"));break;default:var e={Balance:41,Decay:56,Electricity:82,Crushed:126,Nom:146,Toxicity:166,Lead:181,Watch:181,Corrupted:191}[d];e&&(a=e);}return{level:a,lead:b}} ->>>>>>> parent of 8963ba1... Refactored portal.js From 12fe52e7fde17ea7ce2b705c04fc592e8020d960 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 09:58:06 +0100 Subject: [PATCH 1332/3477] Update portal.js --- modules/portal.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 30ba1a3ab..d1752232a 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -130,17 +130,16 @@ function dailyAutoPortal() { } function doPortal(challenge) { - if (!game.global.portalActive) return; - if (getPageSetting('spendmagmite') == 1) autoMagmiteSpender(); - if (getPageSetting('AutoHeirloomsNew') == 0); - else if (getPageSetting('AutoHeirloomsNew') == 1) autoHeirlooms(); - else if (getPageSetting('AutoHeirloomsNew') == 2) autoHeirlooms2(); + if(!game.global.portalActive) return; + if (getPageSetting('AutoMagmiteSpender2')==1) autoMagmiteSpender(); + if (getPageSetting('AutoHeirloomsNew')==0); + else if (getPageSetting('AutoHeirloomsNew')==1) autoHeirlooms(); + else if (getPageSetting('AutoHeirloomsNew')==2) autoHeirlooms2(); if (getPageSetting('AutoUpgradeHeirlooms') && !heirloomsShown) autoNull(); portalClicked(); - if (getPageSetting('AutoAllocatePerks') == 1 && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) + if (getPageSetting('AutoAllocatePerks')==1 && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) AutoPerks.clickAllocate(); if (getPageSetting('AutoStartDaily')) { - runDaily(challenge); selectChallenge('Daily'); checkCompleteDailies(); var lastUndone = -7; @@ -149,22 +148,21 @@ function doPortal(challenge) { if (!done) break; } - - if (lastUndone == 1) { + if (lastUndone == 1) { // None debug("All available Dailies already completed.", "portal"); selectChallenge(challenge || 0); } else { getDailyChallenge(lastUndone); debug("Portaling into Daily for: " + getDailyTimeString(lastUndone, true) + " now!", "portal"); } - } else if (challenge) { + } + else if(challenge) { selectChallenge(challenge); } pushData(); activateClicked(); activatePortal(); - lastHeliumZone = 0; - zonePostpone = 0; + lastHeliumZone = 0; zonePostpone = 0; } function finishChallengeSquared(){var a=getPageSetting("FinishC2");game.global.world>=a&&(abandonChallenge(),debug("Finished challenge2 because we are on zone "+game.global.world,"other","oil"))} From fe15c9c4e17aa4240ceaffb4c9b447c1c384cd36 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 10:16:34 +0100 Subject: [PATCH 1333/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 74a379d29..0af6b078f 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -91,7 +91,7 @@ function mainLoop() { if (getPageSetting('ForceAbandon')==true || getPageSetting('fuckanti')) trimpcide(); if (getPageSetting('AutoAllocatePerks')==2) lootdump(); if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1 && getDailyHeliumValue(countDailyWeight()) >= getPageSetting('buyheliumy') && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) purchaseSingleRunBonus('heliumy'); - if ((getPageSetting('fightforever')==0) || (getPageSetting('fightforever') > 0 && HDratioy() <= getPageSetting('fightforever')) || (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) || (getPageSetting('dfightforever') == 1 && game.global.challengeActive == "Daily" && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) || (getPageSetting('dfightforever') == 2 && game.global.challengeActive == "Daily" && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined'))) fightalways(); + 0==getPageSetting('fightforever')?fightalways():0=1 && game.global.challengeActive != "Daily") cutoffwind(); if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); if (getPageSetting('spireshitbuy')==true) buyshitspire(); From 5ca874d6e44909d1a764d1fc22d099590a94a1de Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 10:27:31 +0100 Subject: [PATCH 1334/3477] Delete dimgen.js --- modules/dimgen.js | 1 - 1 file changed, 1 deletion(-) delete mode 100644 modules/dimgen.js diff --git a/modules/dimgen.js b/modules/dimgen.js deleted file mode 100644 index 36ef99a93..000000000 --- a/modules/dimgen.js +++ /dev/null @@ -1 +0,0 @@ -MODULES.dimgen={},MODULES.dimgen.FuelOnlyZone=250,MODULES.dimgen.HybridZone=250,MODULES.dimgen.MagmiteZone=400,MODULES.dimgen.FuelOnlyOverclock=!1;var mapsForFuel=!1;function autodimgen(){if(mapsForFuel=!1,!(230>game.global.word)){var a=MODULES.dimgen,b=getGeneratorFuelCap(),c=game.global.magmaFuel,d=Math.min(game.generatorUpgrades.Supply.modifier,0.2+0.01*(game.global.world-230)),e=game.permanentGeneratorUpgrades.Storage.owned?c>b+2:2*d+c>b-0.01;game.global.world Date: Tue, 11 Sep 2018 10:29:22 +0100 Subject: [PATCH 1335/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 0af6b078f..2cba5cfa5 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -77,10 +77,10 @@ function mainLoop() { //Extra - if (getPageSetting('ExitSpireCell') > 0 && game.global.challengeActive != "Daily") exitSpireCell(); - if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily") dailyexitSpireCell(); + if (getPageSetting('ExitSpireCell') > 0 && game.global.challengeActive != "Daily" && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) exitSpireCell(); + if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily" && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) dailyexitSpireCell(); if (getPageSetting('SpireBreedTimer') == true && getPageSetting('IgnoreSpiresUntil') <= game.global.world) ATspirebreed(); - if (getPageSetting('trimpsnotdie')==true) helptrimpsnotdie(); + if (getPageSetting('trimpsnotdie')==true && !game.global.fighting) helptrimpsnotdie(); if (getPageSetting('PraidHarder') && getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily" || getPageSetting('dPraidHarder') && getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") PraidHarder(); else { if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); @@ -89,12 +89,18 @@ function mainLoop() { if (getPageSetting('BWraid') && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid') && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);}; if ((getPageSetting('BWraid') || getPageSetting('DailyBWraid'))&& bwraidon) buyWeps(); if (getPageSetting('ForceAbandon')==true || getPageSetting('fuckanti')) trimpcide(); - if (getPageSetting('AutoAllocatePerks')==2) lootdump(); + if (getPageSetting('AutoAllocatePerks')==2 && game.global.world == getPageSetting('lootdumpz')) lootdump(); if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1 && getDailyHeliumValue(countDailyWeight()) >= getPageSetting('buyheliumy') && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) purchaseSingleRunBonus('heliumy'); - 0==getPageSetting('fightforever')?fightalways():0 0 && HDratioy() <= getPageSetting('fightforever')) fightalways(); + else if (getPageSetting('cfightforever')==true && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom')) fightalways(); + else if (getPageSetting('dfightforever') == 1 && game.global.challengeActive == "Daily" && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) fightalways(); + else if (getPageSetting('dfightforever') == 2 && game.global.challengeActive == "Daily" && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) fightalways(); + } if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); - if (getPageSetting('spireshitbuy')==true) buyshitspire(); + if (getPageSetting('spireshitbuy')==true && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) buyshitspire(); if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") orangewindstack(); if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive == "Daily") dorangewindstack(); if ((getPageSetting('darmormagic') > 0 && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) || (getPageSetting('carmormagic') > 0 && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom'))) armormagic(); @@ -128,7 +134,7 @@ function mainLoop() { else if ((getPageSetting('AutoStance')==3) || (getPageSetting('use3daily')==true && game.global.challengeActive == "Daily")) autoStance3(); else if (getPageSetting('AutoStance')==1) autoStance(); else if (getPageSetting('AutoStance')==2) autoStance2(); - if (getPageSetting('UseAutoGen')==true) autoGenerator(); + if (getPageSetting('UseAutoGen')==true && game.global.world > 229) autoGenerator(); if (getPageSetting('BetterAutoFight')==1) betterAutoFight(); if (getPageSetting('BetterAutoFight')==2) betterAutoFight2(); if (getPageSetting('BetterAutoFight')==3) betterAutoFight3(); @@ -136,9 +142,8 @@ function mainLoop() { if (getPageSetting('DynamicPrestige2')>0 && forcePrecZ) prestigeChanging2(); else autoTrimpSettings.Prestige.selected = document.getElementById('Prestige').value; if (getPageSetting('spendmagmite')==2 && !magmiteSpenderChanged) autoMagmiteSpender(); - if (getPageSetting('AutoNatureTokens')) autoNatureTokens(); + if (getPageSetting('AutoNatureTokens') && game.global.world > 229) autoNatureTokens(); if (game.global.mapsActive && getPageSetting('BWraid') == true && game.global.world == getPageSetting('BWraidingz') && getCurrentMapObject().level <= getPageSetting('BWraidingmax')) buyWeps(); - if (userscriptOn) userscripts(); return; } From 7add6e6575bf190a196861f1af8a2ec963e20653 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 12:22:45 +0100 Subject: [PATCH 1336/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 097bd1a5a..1f04007bb 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -7,7 +7,7 @@ function buyUpgrades() { var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; - if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps() || (getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') == game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000)))) continue; + if (upgrade == 'Coordination' && ((getPageSetting('BuyUpgradesNew') == 2) || (!canAffordCoordinationTrimps()) || (getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) > 2000)))) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; From a3a2428c16c8f0a74d9c32d3037149403cff998b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 12:28:47 +0100 Subject: [PATCH 1337/3477] Update upgrades.js --- modules/upgrades.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/upgrades.js b/modules/upgrades.js index 1f04007bb..580d9b211 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -21,3 +21,4 @@ function buyUpgrades() { debug('Upgraded ' + upgrade, "upgrades", "*upload2"); } } +//work dickhead From 93bbb464ea3fd57b6791a1787b0835ec63e6855c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 12:36:37 +0100 Subject: [PATCH 1338/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 52673f609..da9d4e028 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -83,7 +83,7 @@ function initializeAllSettings() { createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Mining/Building Only', 'Science Research OFF'], 'Controls what you gather/build do. Manual does nothing
    Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
    Mining/Building only does exactly what it says. Only use if you are passed the early stages of the game (No longer need to trap, food and wood are useless).
    You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All Upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); createSetting('amalcoord', 'Amal Boost', 'Boost your Amal count for more Mi. Will not buy coords until your H:D ratio is below a certain value. This means that you will get amals quicker. Will not activate higher than your Amal Boost End Zone Setting! ', 'boolean', false, null, "Core"); - createSetting('amalcoordt', 'Amal Target', 'Set the amount of Amals you wish to aim for. Once this target is reached, it will buy coords below your Amal ratio regardless of your H:D, just enough to keep the Amal. -1 to disable and use H:D for entire boost. ', 'value', -1, null, "Core"); + createSetting('amalcoordt', 'Amal Target', 'NOT CURRENTLY WORKING! Set the amount of Amals you wish to aim for. Once this target is reached, it will buy coords below your Amal ratio regardless of your H:D, just enough to keep the Amal. -1 to disable and use H:D for entire boost. ', 'value', -1, null, "Core"); createSetting('amalcoordhd', 'Amal Boost H:D', 'Set your H:D for Amal Boost here. The higher it is the less coords AT will buy. 0.0000025 is the default. ', 'value', 0.0000025, null, "Core"); createSetting('amalcoordz', 'Amal Boost End Z', 'Amal Boost End Zone. Set the zone you want to stop Amal Boosting. -1 to do it infinitely. ', 'value', -1, null, "Core"); createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); From e504f89777f6a1ffb54c6c2fb2e525b42325d640 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 12:44:34 +0100 Subject: [PATCH 1339/3477] Update scryer.js --- modules/scryer.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 3afb21c07..8056da8a4 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -12,19 +12,19 @@ function useScryerStance() { } //Never -var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; - use_scry = use_scry || game.global.world <= 60; - use_scry = use_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"); - use_scry = use_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0); - use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); - use_scry = use_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); - use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || game.global.world < getPageSetting('ScryUseinIce')))); - use_scry = use_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && getPageSetting('screwessence') == true && countRemainingEssenceDrops() < 1); +var never_scry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; + never_scry = never_scry || game.global.world <= 60; + never_scry = never_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"); + never_scry = never_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0); + never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); + never_scry = never_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); + never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || game.global.world < getPageSetting('ScryUseinIce')))); + never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && getPageSetting('screwessence') == true && countRemainingEssenceDrops() < 1); //check Corrupted Never var curEnemy = getCurrentEnemy(1); var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; - if (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (use_scry))) { + if (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (never_scry))) { autostancefunction(); wantToScry = false; return; @@ -32,7 +32,7 @@ var use_scry = game.global.preMapsActive || game.global.gridArray.length === 0 | //check Healthy never var curEnemyhealth = getCurrentEnemy(1); var ishealthy = curEnemyhealth && curEnemyhealth.mutation == "Healthy"; - if (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (use_scry))) { + if (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (never_scry))) { autostancefunction(); wantToScry = false; return; From 85829c3b71114e218df2bd7675ac8b2262cbb3bd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 12:46:10 +0100 Subject: [PATCH 1340/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index da9d4e028..ced7d3ffa 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -335,7 +335,7 @@ function initializeAllSettings() { //Line 1 createSetting('UseScryerStance', 'Enable Scryer Stance', 'MASTER BUTTON Activates all other scrying settings, and overrides AutoStance when scryer conditions are met. Leave regular Autostance on while this is active. Scryer gives 2x Resources (Non-Helium/Nullifium) and a chance for Dark Essence. Once this is on, priority for Scryer decisions goes as such:
    NEVER USE, FORCE USE, OVERKILL, MIN/MAX ZONE

    NO OTHER BUTTONS WILL DO ANYTHING IF THIS IS OFF.', 'boolean', true, null, 'Scryer'); - createSetting('ScryerUseWhenOverkill', 'Use When Overkill', 'Overrides the Min/Max zones. Does not override any NEVER settings. Toggles stance when we can Overkill in S, giving us double loot with no speed penalty! NOTE: This being on, and being able to overkill in S will override ALL other settings (Except never use in spire). This is a boolean logic shortcut that disregards all the other settings including Min and Max Zone. If you ONLY want to use S during Overkill, as a workaround: turn this on and Min zone: to 9999 and everything else off(red).

    This has not been optimised for double overkill, and does not always produce the intended results, if you have problems, it may be worth turning off until it can be adjusted.', 'boolean', true, null, 'Scryer'); + createSetting('ScryerUseWhenOverkill', 'Use When Overkill', 'Overrides everything! Toggles stance when we can Overkill in S, giving us double loot with no speed penalty (minimum one overkill, if you have more than 1, it will lose speed) NOTE: This being on, and being able to overkill in S will override ALL other settings (Except never use in spire). This is a boolean logic shortcut that disregards all the other settings including Min and Max Zone. If you ONLY want to use S during Overkill, as a workaround: turn this on and Min zone: to 9999 and everything else off(red). ', 'boolean', true, null, 'Scryer'); createSetting('ScryerMinZone', 'Min Zone', 'Minimum zone to start using scryer in.(inclusive) Recommend:(60 or 181). Overkill ignores this. This needs to be On & Valid for the MAYBE option on all other Scryer settings to do anything if Overkill is off. Tip: Use 9999 to disable all Non-Overkill, Non-Force, scryer usage.', 'value', '181', null, 'Scryer'); createSetting('ScryerMaxZone', 'Max Zone', '0 or -1 to disable (Recommended)
    Overkill ignores this. Zone to STOP using scryer at (not inclusive). Turning this ON with a positive number stops MAYBE use of all other Scryer settings.', 'value', '230', null, 'Scryer'); createSetting('onlyminmaxworld', 'World Min & Max Only', 'Forces Scryer to only work in world regardless of other settings. ', 'boolean', false, null, 'Scryer'); From 60f7617720d7350ff373c283133dcd0fce64cf8f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 13:25:02 +0100 Subject: [PATCH 1341/3477] Update maps.js --- modules/maps.js | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index b793e3f94..e06c27a03 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -1,4 +1,4 @@ -MODULES.maps={},MODULES.maps.enoughDamageCutoff=4,MODULES.maps.farmingCutoff=getPageSetting("DisableFarm"),MODULES.maps.numHitsSurvived=8,MODULES.maps.LeadfarmingCutoff=10,MODULES.maps.NomfarmingCutoff=10,MODULES.maps.NomFarmStacksCutoff=[7,30,100],MODULES.maps.MapTierZone=[72,47,16],MODULES.maps.MapTier0Sliders=[9,9,9,"Mountain"],MODULES.maps.MapTier1Sliders=[9,9,9,"Depths"],MODULES.maps.MapTier2Sliders=[9,9,9,"Random"],MODULES.maps.MapTier3Sliders=[9,9,9,"Random"],MODULES.maps.preferGardens=!getPageSetting("PreferMetal"),MODULES.maps.maxMapBonus=10,MODULES.maps.wantHealthMapBonus=10,MODULES.maps.SpireFarm199Maps=!0,MODULES.maps.watchChallengeMaps=[15,25,35,50],MODULES.maps.shouldFarmCell=59,MODULES.maps.SkipNumUnboughtPrestiges=2,MODULES.maps.UnearnedPrestigesRequired=2,MODULES.maps.maxMapBonusAfterZ=MODULES.maps.maxMapBonus;var stackingTox=!1,doVoids=!1,needToVoid=!1,needPrestige=!1,skippedPrestige=!1,voidCheckPercent=0,HDratio=0,ourBaseDamage=0,ourBaseDamage2=0,scryerStuck=!1,shouldDoMaps=!1,mapTimeEstimate=0,lastMapWeWereIn=null,preSpireFarming=!1,spireMapBonusFarming=!1,spireTime=0,doMaxMapBonus=!1,vanillaMapatZone=!1,additionalCritMulti=2 93 && game.challenges.Toxicity.stacks < 1500 && ((getPageSetting('MaxTox') && game.global.world > 59) || needToVoid)) { - shouldDoMaps = true; - stackingTox = !(needToVoid && game.challenges.Toxicity.stacks > 1415); - if (!game.global.mapsActive && !game.global.preMapsActive) { - mapsClicked(); - mapsClicked(); - } - } else stackingTox = false; var watchmaps = customVars.watchChallengeMaps; var shouldDoWatchMaps = false; if (game.global.challengeActive == 'Watch' && watchmaps.indexOf(game.global.world) > -1 && game.global.mapBonus < 1) { @@ -428,7 +420,7 @@ function autoMap() { if (!game.global.preMapsActive && game.global.mapsActive) { var repeatBionics = getPageSetting('RunBionicBeforeSpire') && game.global.bionicOwned >= 6; var doDefaultMapBonus = game.global.mapBonus < customVars.maxMapBonus - 1; - if (selectedMap == game.global.currentMapId && (!getCurrentMapObject().noRecycle && (doDefaultMapBonus || vanillaMapatZone || doMaxMapBonus || shouldFarm || stackingTox || needPrestige || shouldDoSpireMaps) || repeatBionics)) { + if (selectedMap == game.global.currentMapId && (!getCurrentMapObject().noRecycle && (doDefaultMapBonus || vanillaMapatZone || doMaxMapBonus || shouldFarm || needPrestige || shouldDoSpireMaps) || repeatBionics)) { var targetPrestige = autoTrimpSettings.Prestige.selected; if (!game.global.repeatMap) { repeatClicked(); @@ -436,9 +428,6 @@ function autoMap() { if (!shouldDoMaps && (game.global.mapGridArray[game.global.mapGridArray.length - 1].special == targetPrestige && game.mapUnlocks[targetPrestige].last >= (game.global.world + extraMapLevels - 9))) { repeatClicked(); } - if (stackingTox && (game.challenges.Toxicity.stacks + game.global.mapGridArray.length - (game.global.lastClearedMapCell + 1) >= 1500)) { - repeatClicked(); - } if (shouldDoWatchMaps) repeatClicked(); if (shouldDoHealthMaps && game.global.mapBonus >= customVars.wantHealthMapBonus - 1) { @@ -580,7 +569,7 @@ function autoMap() { } } -function updateAutoMapsStatus(a){var b,c=getPageSetting('MinutestoFarmBeforeSpire');if(0==getPageSetting('AutoMaps'))b='Off';else if('Mapology'==game.global.challengeActive&&1>game.challenges.Mapology.credits)b='Out of Map Credits';else if(preSpireFarming){var d=Math.floor(60-60*spireTime%60).toFixed(0),e=Math.floor(c-spireTime).toFixed(0),f=c-(spireTime/60).toFixed(2),g=60<=spireTime?f+'h':e+'m:'+(10<=d?d:'0'+d)+'s';b='Farming for Spire '+g+' left'}else spireMapBonusFarming?b='Getting Spire Map Bonus':doMaxMapBonus?b='Max Map Bonus After Zone':game.global.mapsUnlocked?needPrestige&&!doVoids?b='Prestige':doVoids&&0==voidCheckPercent?b='Void Maps: '+game.global.totalVoidMaps+' remaining':stackingTox?b='Getting Tox Stacks':needToVoid&&!doVoids&&0   He: '+i.toFixed(3)+'%';return a?[b,h,i]:void(document.getElementById('autoMapStatus').innerHTML=b,document.getElementById('hiderStatus').innerHTML=j)} +function updateAutoMapsStatus(a){var b,c=getPageSetting('MinutestoFarmBeforeSpire');if(0==getPageSetting('AutoMaps'))b='Off';else if('Mapology'==game.global.challengeActive&&1>game.challenges.Mapology.credits)b='Out of Map Credits';else if(preSpireFarming){var d=Math.floor(60-60*spireTime%60).toFixed(0),e=Math.floor(c-spireTime).toFixed(0),f=c-(spireTime/60).toFixed(2),g=60<=spireTime?f+'h':e+'m:'+(10<=d?d:'0'+d)+'s';b='Farming for Spire '+g+' left'}else spireMapBonusFarming?b='Getting Spire Map Bonus':doMaxMapBonus?b='Max Map Bonus After Zone':game.global.mapsUnlocked?needPrestige&&!doVoids?b='Prestige':doVoids&&0==voidCheckPercent?b='Void Maps: '+game.global.totalVoidMaps+' remaining':needToVoid&&!doVoids&&0   He: '+i.toFixed(3)+'%';return a?[b,h,i]:void(document.getElementById('autoMapStatus').innerHTML=b,document.getElementById('hiderStatus').innerHTML=j)} MODULES["maps"].advSpecialMapMod_numZones = 3; var advExtraMapLevels = 0; function testMapSpecialModController(){var a=[];if(Object.keys(mapSpecialModifierConfig).forEach(function(o){var p=mapSpecialModifierConfig[o];game.global.highestLevelCleared+1>=p.unlocksAt&&a.push(p.name)}),!(1>a.length)){var b=a.length,c=document.getElementById("advSpecialSelect");if(c){if(59<=game.global.highestLevelCleared){if(needPrestige&&(b=6),c.selectedIndex=b,0==c.selectedIndex)return;if(!needPrestige&&game.talents.hyperspeed2.purchased&&game.global.world>Math.floor(0.5*(game.global.highestLevelCleared+1))?c.selectedIndex=1:needPrestige&&(c.selectedIndex=0),"fa"!=game.global.mapExtraBonus&&1==c.selectedIndex);for(var d=updateMapCost(!0),e=game.resources.fragments.owned,f=100*(d/e);0e;)c.selectedIndex-=1;var d=updateMapCost(!0),e=game.resources.fragments.owned;"0"!=c.value&&console.log("Set the map special modifier to: "+mapSpecialModifierConfig[c.value].name+". Cost: "+(100*(d/e)).toFixed(2)+"% of your fragments.")}var g=getSpecialModifierSetting(),h=109<=game.global.highestLevelCleared,i=checkPerfectChecked(),j=document.getElementById("advPerfectCheckbox"),k=getPageSetting("AdvMapSpecialModifier")?getExtraMapLevels():0,l=209<=game.global.highestLevelCleared;if(l){var m=document.getElementById("advExtraMapLevelselect");if(!m)return;var n=document.getElementById("mapLevelInput").value;for(m.selectedIndex=n==game.global.world?MODULES.maps.advSpecialMapMod_numZones:0;0game.resources.fragments.owned;)m.selectedIndex-=1}}}} From e223b4b10755008c5a916ba3f057bf4fc5f5d35f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 13:27:58 +0100 Subject: [PATCH 1342/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index ced7d3ffa..eac8cdcdb 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -251,14 +251,11 @@ function initializeAllSettings() { //Line 2 createSetting('CorruptionCalc', 'Corruption Farm Mode', 'Recommended. Enabling this will cause the Automaps routine to take amount of corruption in a zone into account, to decide whether it should do maps first for map bonus. ONLY in Zone 181+ (or Headstart 1,2,3 zone: 176,166,151) ', 'boolean', true, null, 'Maps'); - createSetting('MaxTox', 'Max Toxicity Stacks', 'Get maximum toxicity stacks before killing the improbability in each zone 60 and above. Generally only recommended for 1 run to maximize bone portal value. This setting will revert to disabled after a successful Max-Tox run + Toxicity Autoportal.', 'boolean', false, null, 'Maps'); createSetting('VoidMaps', 'Void Maps', '0 to disable The zone at which you want all your void maps to be cleared inclusive of the zone you type. Runs them at Cell 93 by default, unless you set a decimal value indicating the cell (example: 187.75). Use odd zones on Lead.
    If Daily Void Zone Mod is active, your Finish Daily Z Mod will apply to this number when a Daily is active.', 'value', '0', null, "Maps"); createSetting('RunNewVoidsUntilNew', 'New Voids Mod', '0 to disable. Positive numbers are added to your Void Map zone. -1 for no cap. This allows you to run new Void Maps obtained after your Void Map zone by adding this number to your Void Map zone.
    Example Void map zone=185.75 and This setting=10. New Voids run until 197.75).
    This means that any new void maps gained until Z197, cell 75 will be run. CAUTION: May severely slow you down by trying to do too-high level void maps. Default 0 (OFF).', 'value', '0', null, 'Maps'); //Should replace the two below createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. And I cba cause its a meh setting anyway. Advancing 2 zones more than doubles your income. Only useful for spire I, and IMO you may aswell actually play the game manually at SOME point. createSetting('AdvMapSpecialModifier', 'Map Special Modifier', 'EXPERIMENTAL. Attempt to select the BEST map special attacks mod. With this on, this will replace the normal behavior. If bugs, please report as this will become more default soon.', 'boolean', false, null, 'Maps'); - - //Line 3 createSetting('scryvoidmaps', 'VM Scryer', 'Only use if you have Scryhard II, for er, obvious reasons. Works without the scryer options. ', 'boolean', false, null, 'Maps'); From 446d08bf8f7e8fcfb7b636811e5131871a68eb0d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 13:36:09 +0100 Subject: [PATCH 1343/3477] Update maps.js --- modules/maps.js | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index e06c27a03..9169c64a8 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -1,4 +1,4 @@ -MODULES.maps={},MODULES.maps.enoughDamageCutoff=4,MODULES.maps.farmingCutoff=getPageSetting("DisableFarm"),MODULES.maps.numHitsSurvived=8,MODULES.maps.LeadfarmingCutoff=10,MODULES.maps.NomfarmingCutoff=10,MODULES.maps.NomFarmStacksCutoff=[7,30,100],MODULES.maps.MapTierZone=[72,47,16],MODULES.maps.MapTier0Sliders=[9,9,9,"Mountain"],MODULES.maps.MapTier1Sliders=[9,9,9,"Depths"],MODULES.maps.MapTier2Sliders=[9,9,9,"Random"],MODULES.maps.MapTier3Sliders=[9,9,9,"Random"],MODULES.maps.preferGardens=!getPageSetting("PreferMetal"),MODULES.maps.maxMapBonus=10,MODULES.maps.wantHealthMapBonus=10,MODULES.maps.SpireFarm199Maps=!0,MODULES.maps.watchChallengeMaps=[15,25,35,50],MODULES.maps.shouldFarmCell=59,MODULES.maps.SkipNumUnboughtPrestiges=2,MODULES.maps.UnearnedPrestigesRequired=2,MODULES.maps.maxMapBonusAfterZ=MODULES.maps.maxMapBonus;var doVoids=!1,needToVoid=!1,needPrestige=!1,skippedPrestige=!1,voidCheckPercent=0,HDratio=0,ourBaseDamage=0,ourBaseDamage2=0,scryerStuck=!1,shouldDoMaps=!1,mapTimeEstimate=0,lastMapWeWereIn=null,preSpireFarming=!1,spireMapBonusFarming=!1,spireTime=0,doMaxMapBonus=!1,vanillaMapatZone=!1,additionalCritMulti=2 0 ? parseInt(getPageSetting('VoidCheck')) : 2; var ourBlock = getBattleStats("block", true); - if (ourHealth / diff < eAttack - ourBlock) { - shouldFarm = true; - voidCheckPercent = Math.round((ourHealth / diff) / (eAttack - ourBlock) * 100); - abandonVoidMap(); - break; - } else { - voidCheckPercent = 0; - if (getPageSetting('DisableFarm') < 1) + if (getPageSetting('DisableFarm') < 1) shouldFarm = shouldFarm || false; - } if (!restartVoidMap) selectedMap = theMap.id; if (game.global.mapsActive && getCurrentMapObject().location == "Void" && game.global.challengeActive == "Nom" && getPageSetting('FarmWhenNomStacks7')) { @@ -569,7 +560,7 @@ function autoMap() { } } -function updateAutoMapsStatus(a){var b,c=getPageSetting('MinutestoFarmBeforeSpire');if(0==getPageSetting('AutoMaps'))b='Off';else if('Mapology'==game.global.challengeActive&&1>game.challenges.Mapology.credits)b='Out of Map Credits';else if(preSpireFarming){var d=Math.floor(60-60*spireTime%60).toFixed(0),e=Math.floor(c-spireTime).toFixed(0),f=c-(spireTime/60).toFixed(2),g=60<=spireTime?f+'h':e+'m:'+(10<=d?d:'0'+d)+'s';b='Farming for Spire '+g+' left'}else spireMapBonusFarming?b='Getting Spire Map Bonus':doMaxMapBonus?b='Max Map Bonus After Zone':game.global.mapsUnlocked?needPrestige&&!doVoids?b='Prestige':doVoids&&0==voidCheckPercent?b='Void Maps: '+game.global.totalVoidMaps+' remaining':needToVoid&&!doVoids&&0   He: '+i.toFixed(3)+'%';return a?[b,h,i]:void(document.getElementById('autoMapStatus').innerHTML=b,document.getElementById('hiderStatus').innerHTML=j)} +function updateAutoMapsStatus(a){var b,c=getPageSetting('MinutestoFarmBeforeSpire');if(0==getPageSetting('AutoMaps'))b='Off';else if('Mapology'==game.global.challengeActive&&1>game.challenges.Mapology.credits)b='Out of Map Credits';else if(preSpireFarming){var d=Math.floor(60-60*spireTime%60).toFixed(0),e=Math.floor(c-spireTime).toFixed(0),f=c-(spireTime/60).toFixed(2),g=60<=spireTime?f+'h':e+'m:'+(10<=d?d:'0'+d)+'s';b='Farming for Spire '+g+' left'}else spireMapBonusFarming?b='Getting Spire Map Bonus':doMaxMapBonus?b='Max Map Bonus After Zone':game.global.mapsUnlocked?needPrestige&&!doVoids?b='Prestige':doVoids?b='Void Maps: '+game.global.totalVoidMaps+' remaining':needToVoid&&!doVoids&&0   He: '+i.toFixed(3)+'%';return a?[b,h,i]:void(document.getElementById('autoMapStatus').innerHTML=b,document.getElementById('hiderStatus').innerHTML=j)} MODULES["maps"].advSpecialMapMod_numZones = 3; var advExtraMapLevels = 0; function testMapSpecialModController(){var a=[];if(Object.keys(mapSpecialModifierConfig).forEach(function(o){var p=mapSpecialModifierConfig[o];game.global.highestLevelCleared+1>=p.unlocksAt&&a.push(p.name)}),!(1>a.length)){var b=a.length,c=document.getElementById("advSpecialSelect");if(c){if(59<=game.global.highestLevelCleared){if(needPrestige&&(b=6),c.selectedIndex=b,0==c.selectedIndex)return;if(!needPrestige&&game.talents.hyperspeed2.purchased&&game.global.world>Math.floor(0.5*(game.global.highestLevelCleared+1))?c.selectedIndex=1:needPrestige&&(c.selectedIndex=0),"fa"!=game.global.mapExtraBonus&&1==c.selectedIndex);for(var d=updateMapCost(!0),e=game.resources.fragments.owned,f=100*(d/e);0e;)c.selectedIndex-=1;var d=updateMapCost(!0),e=game.resources.fragments.owned;"0"!=c.value&&console.log("Set the map special modifier to: "+mapSpecialModifierConfig[c.value].name+". Cost: "+(100*(d/e)).toFixed(2)+"% of your fragments.")}var g=getSpecialModifierSetting(),h=109<=game.global.highestLevelCleared,i=checkPerfectChecked(),j=document.getElementById("advPerfectCheckbox"),k=getPageSetting("AdvMapSpecialModifier")?getExtraMapLevels():0,l=209<=game.global.highestLevelCleared;if(l){var m=document.getElementById("advExtraMapLevelselect");if(!m)return;var n=document.getElementById("mapLevelInput").value;for(m.selectedIndex=n==game.global.world?MODULES.maps.advSpecialMapMod_numZones:0;0game.resources.fragments.owned;)m.selectedIndex-=1}}}} From c15077ac8acf6bbe2a9887f1107489d4d3f2f705 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 13:38:39 +0100 Subject: [PATCH 1344/3477] Update maps.js --- modules/maps.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/maps.js b/modules/maps.js index 9169c64a8..63cf49e60 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -1,3 +1,4 @@ +//update fuckface MODULES.maps={},MODULES.maps.enoughDamageCutoff=4,MODULES.maps.farmingCutoff=getPageSetting("DisableFarm"),MODULES.maps.numHitsSurvived=8,MODULES.maps.LeadfarmingCutoff=10,MODULES.maps.NomfarmingCutoff=10,MODULES.maps.NomFarmStacksCutoff=[7,30,100],MODULES.maps.MapTierZone=[72,47,16],MODULES.maps.MapTier0Sliders=[9,9,9,"Mountain"],MODULES.maps.MapTier1Sliders=[9,9,9,"Depths"],MODULES.maps.MapTier2Sliders=[9,9,9,"Random"],MODULES.maps.MapTier3Sliders=[9,9,9,"Random"],MODULES.maps.preferGardens=!getPageSetting("PreferMetal"),MODULES.maps.maxMapBonus=10,MODULES.maps.wantHealthMapBonus=10,MODULES.maps.SpireFarm199Maps=!0,MODULES.maps.watchChallengeMaps=[15,25,35,50],MODULES.maps.shouldFarmCell=59,MODULES.maps.SkipNumUnboughtPrestiges=2,MODULES.maps.UnearnedPrestigesRequired=2,MODULES.maps.maxMapBonusAfterZ=MODULES.maps.maxMapBonus;var doVoids=!1,needToVoid=!1,needPrestige=!1,skippedPrestige=!1,HDratio=0,ourBaseDamage=0,ourBaseDamage2=0,scryerStuck=!1,shouldDoMaps=!1,mapTimeEstimate=0,lastMapWeWereIn=null,preSpireFarming=!1,spireMapBonusFarming=!1,spireTime=0,doMaxMapBonus=!1,vanillaMapatZone=!1,additionalCritMulti=2 Date: Tue, 11 Sep 2018 13:38:52 +0100 Subject: [PATCH 1345/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 - 1 file changed, 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index eac8cdcdb..5e8546e28 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -253,7 +253,6 @@ function initializeAllSettings() { createSetting('CorruptionCalc', 'Corruption Farm Mode', 'Recommended. Enabling this will cause the Automaps routine to take amount of corruption in a zone into account, to decide whether it should do maps first for map bonus. ONLY in Zone 181+ (or Headstart 1,2,3 zone: 176,166,151) ', 'boolean', true, null, 'Maps'); createSetting('VoidMaps', 'Void Maps', '0 to disable The zone at which you want all your void maps to be cleared inclusive of the zone you type. Runs them at Cell 93 by default, unless you set a decimal value indicating the cell (example: 187.75). Use odd zones on Lead.
    If Daily Void Zone Mod is active, your Finish Daily Z Mod will apply to this number when a Daily is active.', 'value', '0', null, "Maps"); createSetting('RunNewVoidsUntilNew', 'New Voids Mod', '0 to disable. Positive numbers are added to your Void Map zone. -1 for no cap. This allows you to run new Void Maps obtained after your Void Map zone by adding this number to your Void Map zone.
    Example Void map zone=185.75 and This setting=10. New Voids run until 197.75).
    This means that any new void maps gained until Z197, cell 75 will be run. CAUTION: May severely slow you down by trying to do too-high level void maps. Default 0 (OFF).', 'value', '0', null, 'Maps'); //Should replace the two below - createSetting('VoidCheck', 'Void Difficulty Check', 'How many hits to be able to take from a void map boss in X stance before we attempt the map. Higher values will get you stronger (by farming maps for health) before attempting. Disabling this with 0 or -1 translates into a default of surviving 2 hits. I recommend somewhere between 2 and 12 (default is now 6).', 'value', '6', null, 'Maps'); createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. And I cba cause its a meh setting anyway. Advancing 2 zones more than doubles your income. Only useful for spire I, and IMO you may aswell actually play the game manually at SOME point. createSetting('AdvMapSpecialModifier', 'Map Special Modifier', 'EXPERIMENTAL. Attempt to select the BEST map special attacks mod. With this on, this will replace the normal behavior. If bugs, please report as this will become more default soon.', 'boolean', false, null, 'Maps'); createSetting('scryvoidmaps', 'VM Scryer', 'Only use if you have Scryhard II, for er, obvious reasons. Works without the scryer options. ', 'boolean', false, null, 'Maps'); From 882f656c75cf27f3aa346245d53d923f112c7b6d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 13:44:39 +0100 Subject: [PATCH 1346/3477] Update equipment.js --- modules/equipment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/equipment.js b/modules/equipment.js index ed97b4909..1add8fdbc 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -244,7 +244,7 @@ function autoLevelEquipment() { var max_zone = getPageSetting('ScryerMaxZone'); var valid_min = game.global.world >= min_zone; var valid_max = max_zone <= 0 || game.global.world < max_zone; - enoughHealthE = !(doVoids && voidCheckPercent > 0) && + enoughHealthE = !(doVoids) && (baseHealth / FORMATION_MOD_1 > numHits * (enemyDamage - baseBlock / FORMATION_MOD_1 > 0 ? enemyDamage - baseBlock / FORMATION_MOD_1 : enemyDamage * pierceMod)) && (!(valid_min && valid_max) || (baseHealth / 2 > numHitsScry * (enemyDamage - baseBlock / 2 > 0 ? enemyDamage - baseBlock / 2 : enemyDamage * pierceMod))); enoughDamageE = (baseDamage * MODULES["equipment"].enoughDamageCutoff > enemyHealth); From 49c4dde0f0b8a005c298d102ce3c1e7f8ef51920 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 13:45:19 +0100 Subject: [PATCH 1347/3477] Update buildings.js --- modules/buildings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/buildings.js b/modules/buildings.js index aa7c7cfc0..4962d3867 100644 --- a/modules/buildings.js +++ b/modules/buildings.js @@ -173,7 +173,7 @@ function buyBuildings() { if (!game.global.preMapsActive && getBattleStats("block", true) > calcBadGuyDmg(getCurrentEnemy(), null, true,true)) skipGym = true; } - if (doVoids && voidCheckPercent > 0) + if (doVoids) skipGym = false; var gymwallpct = getPageSetting('GymWall'); if (gymwallpct > 1) { From 6c7710f8438cc1aa51149fb436423a2454af9c5a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 13:46:33 +0100 Subject: [PATCH 1348/3477] Update buildings.js --- modules/buildings.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/buildings.js b/modules/buildings.js index 4962d3867..e1ae9609b 100644 --- a/modules/buildings.js +++ b/modules/buildings.js @@ -173,8 +173,6 @@ function buyBuildings() { if (!game.global.preMapsActive && getBattleStats("block", true) > calcBadGuyDmg(getCurrentEnemy(), null, true,true)) skipGym = true; } - if (doVoids) - skipGym = false; var gymwallpct = getPageSetting('GymWall'); if (gymwallpct > 1) { if (getBuildingItemPrice(game.buildings.Gym, "wood", false, 1) * Math.pow(1 - game.portal.Resourceful.modifier, game.portal.Resourceful.level) > (game.resources.wood.owned / gymwallpct)) From e8089f11e3cee1cca16a3d8463cb8b59cb74ed4d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 13:47:36 +0100 Subject: [PATCH 1349/3477] Update equipment.js --- modules/equipment.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 1add8fdbc..492f4e7a7 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -244,9 +244,7 @@ function autoLevelEquipment() { var max_zone = getPageSetting('ScryerMaxZone'); var valid_min = game.global.world >= min_zone; var valid_max = max_zone <= 0 || game.global.world < max_zone; - enoughHealthE = !(doVoids) && - (baseHealth / FORMATION_MOD_1 > numHits * (enemyDamage - baseBlock / FORMATION_MOD_1 > 0 ? enemyDamage - baseBlock / FORMATION_MOD_1 : enemyDamage * pierceMod)) && - (!(valid_min && valid_max) || (baseHealth / 2 > numHitsScry * (enemyDamage - baseBlock / 2 > 0 ? enemyDamage - baseBlock / 2 : enemyDamage * pierceMod))); + enoughHealthE = (baseHealth / FORMATION_MOD_1 > numHits * (enemyDamage - baseBlock / FORMATION_MOD_1 > 0 ? enemyDamage - baseBlock / FORMATION_MOD_1 : enemyDamage * pierceMod)) && (!(valid_min && valid_max) || (baseHealth / 2 > numHitsScry * (enemyDamage - baseBlock / 2 > 0 ? enemyDamage - baseBlock / 2 : enemyDamage * pierceMod))); enoughDamageE = (baseDamage * MODULES["equipment"].enoughDamageCutoff > enemyHealth); if (!enoughHealthE && MODULES["equipment"].equipHealthDebugMessage) debug("Equipment module thought there was not enough health", "equips"); From 22bd49951116e4f91b3072da2cb5df192dbc67c0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 14:03:20 +0100 Subject: [PATCH 1350/3477] Update breedtimer.js --- modules/breedtimer.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/breedtimer.js b/modules/breedtimer.js index 671c7bbad..53d6bf1be 100644 --- a/modules/breedtimer.js +++ b/modules/breedtimer.js @@ -28,15 +28,13 @@ function abandonVoidMap() { var customVars = MODULES["breedtimer"]; if (!getPageSetting('ForceAbandon')) return; if (game.global.mapsActive && getCurrentMapObject().location == "Void") { - if(voidCheckPercent < customVars.voidCheckPercent) { if (game.portal.Anticipation.level) { var antistacklimitv = 45; - if (!game.talents.patience.purchased) { - antistacklimitv = 30; - } - if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimitv && game.global.antiStacks < antistacklimitv) { + if (!game.talents.patience.purchased) + antistacklimitv = 30; + if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimitv && game.global.antiStacks < antistacklimitv) { mapsClicked(true); - } + } else if (game.global.antiStacks == antistacklimitv) mapsClicked(true); } @@ -44,8 +42,8 @@ function abandonVoidMap() { mapsClicked(true); } return; - } } + function forceAbandonTrimps() { if (!getPageSetting('ForceAbandon')) return; if (!game.global.mapsUnlocked) return; From 1c72f6f8bdc1e735285329ebe14f9a831e5a875e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 14:06:54 +0100 Subject: [PATCH 1351/3477] Update maps.js --- modules/maps.js | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index 63cf49e60..48ee7b954 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -303,17 +303,6 @@ function autoMap() { break; } } - if (getPageSetting('RunBionicBeforeSpire') && (game.global.world == 200) && theMap.name.includes('Bionic Wonderland')) { - var bionicnumber = 1 + ((theMap.level - 125) / 15); - if (bionicnumber == game.global.bionicOwned && bionicnumber < 6) { - selectedMap = theMap.id; - break; - } - if (shouldDoSpireMaps && theMap.name == 'Bionic Wonderland VI') { - selectedMap = theMap.id; - break; - } - } } } } @@ -410,9 +399,8 @@ function autoMap() { return; } if (!game.global.preMapsActive && game.global.mapsActive) { - var repeatBionics = getPageSetting('RunBionicBeforeSpire') && game.global.bionicOwned >= 6; var doDefaultMapBonus = game.global.mapBonus < customVars.maxMapBonus - 1; - if (selectedMap == game.global.currentMapId && (!getCurrentMapObject().noRecycle && (doDefaultMapBonus || vanillaMapatZone || doMaxMapBonus || shouldFarm || needPrestige || shouldDoSpireMaps) || repeatBionics)) { + if (selectedMap == game.global.currentMapId && (!getCurrentMapObject().noRecycle && (doDefaultMapBonus || vanillaMapatZone || doMaxMapBonus || shouldFarm || needPrestige || shouldDoSpireMaps))) { var targetPrestige = autoTrimpSettings.Prestige.selected; if (!game.global.repeatMap) { repeatClicked(); From 5509dd54270d0b12b5eae155f366fe16bef050ef Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 14:07:33 +0100 Subject: [PATCH 1352/3477] Update SettingsGUI.js --- SettingsGUI.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 5e8546e28..d151289eb 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -262,20 +262,16 @@ function initializeAllSettings() { //Spire //Line 1 - createSetting('MaxStacksForSpire', 'Max Map Bonus for Spire', 'Get max map bonus before running the Spire.', 'boolean', false, null, 'Spire'); //Does farm before spire not cover this fairly well anyway? grabbing +1 equips would make way more difference anyway + createSetting('MaxStacksForSpire', 'Max Map Bonus for Spire', 'Get max map bonus before running the Spire.', 'boolean', false, null, 'Spire'); createSetting('MinutestoFarmBeforeSpire', 'Farm Before Spire', 'Farm level 200/199(or BW) maps for X minutes before continuing onto attempting Spire.
    NOTE: Set 0 to disable entirely (default).
    Setting to -1/Infinite does not work here, set a very high number instead.', 'value', '0', null, 'Spire'); createSetting('IgnoreSpiresUntil', 'Ignore Spires Until', 'Spire specific settings like end-at-cell are ignored until at least this zone is reached (0 to disable).
    Does not work with Run Bionic Before Spire.', 'value', '200', null, 'Spire'); - createSetting('RunBionicBeforeSpire', 'Run Bionic Before Spire', 'CAUTION: Runs Bionic Wonderlands and repeatedly farms Bionic VI @ level 200 before attempting Spire, for the purpose of resource farming. Then it attempts the spire. The Minutes-Before-Spire timer runs concurrently to this, and needs to be set. If not set, it will exit without doing any Bionics... You can un-toggle it on the fly.
    NOTE: Turning this on also mandates that Run Unique Maps be on.
    WARNING: These 100 square maps take ~3x longer than normal maps.
    WARNING: If you dont have Bionic Magnet mastery, this will run the 5 pre-requisites and take longer.
    NOTE: In fact, it may not be what you want at all.', 'boolean', false, null, 'Spire'); //OUTDATED! createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Spire'); createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Uses Vanilla GA. When spire is active, will automatically change your GA to your 3RD OPTION! Please use the 1st or 2nd GA option for normal behaviour if you intend to use this function properly. ', 'boolean', false, null, 'Spire'); createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); - - //Line 2 createSetting('spireshitbuy', 'Buy Gear in Spire', 'Will buy Weapons and Armor in Spire regardless of your H:D ratio. Respects your max gear level and ignore spires setting. ', 'boolean', false, null, 'Spire'); - //Raiding //Line 1 From 6bf27049a0e3a0373a230773109edd16722efca4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 11 Sep 2018 14:14:07 +0100 Subject: [PATCH 1353/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index d151289eb..4d7fcbe15 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -366,7 +366,7 @@ function initializeAllSettings() { //Heirloom - createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'Use Autoheirlooms 2. It will keep heirlooms on portal. ', 'multitoggle', 0, null, 'Heirlooms'); + createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'AH1: Keeps any heirloom whether they are staffs or shields. This generally prefers shields over staffs.
    AH2: Keeps 5 slots for shields and 5 slots of staffs. Does not include protected heirlooms, as it will take up a spot, so you would only have 9 to work with. Looks like this: SH/ST/SH/ST/SH/ST/SH/ST/SH/ST
    It will keep heirlooms on portal. ', 'multitoggle', 0, null, 'Heirlooms'); createSetting('AutoUpgradeHeirlooms', 'Auto Upgrade Heirlooms', 'Automatically buys the upgrades the script advises for the Equipped shield and staff, until we are out of nullifium.', 'boolean', false, null, 'Heirlooms'); From 529ac21f3ca546df9fd29dd0d074bea5c76bc02f Mon Sep 17 00:00:00 2001 From: Will Davies Date: Tue, 11 Sep 2018 15:06:26 +0100 Subject: [PATCH 1354/3477] Fixed never_scry not being checked --- modules/scryer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index 8056da8a4..a0ff2bbeb 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -24,7 +24,7 @@ var never_scry = game.global.preMapsActive || game.global.gridArray.length === 0 //check Corrupted Never var curEnemy = getCurrentEnemy(1); var iscorrupt = curEnemy && curEnemy.mutation == "Corruption"; - if (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0 || (never_scry))) { + if (((never_scry) || getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 0))) { autostancefunction(); wantToScry = false; return; @@ -32,7 +32,7 @@ var never_scry = game.global.preMapsActive || game.global.gridArray.length === 0 //check Healthy never var curEnemyhealth = getCurrentEnemy(1); var ishealthy = curEnemyhealth && curEnemyhealth.mutation == "Healthy"; - if (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (ishealthy && getPageSetting('ScryerSkipHealthy') == 0 || (never_scry))) { + if (((never_scry) || getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (ishealthy && getPageSetting('ScryerSkipHealthy') == 0))) { autostancefunction(); wantToScry = false; return; From 582df22d70ef856370265083846d449fd23e0adf Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 08:53:51 +0100 Subject: [PATCH 1355/3477] Update SettingsGUI.js --- SettingsGUI.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 4d7fcbe15..65d050a7d 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -565,10 +565,7 @@ function updateCustomButtons() { document.getElementById('Prestige').selectedIndex = 11; autoTrimpSettings.Prestige.selected = "Bestplate"; } - if (autoTrimpSettings.RunBionicBeforeSpire.enabled && getPageSetting('AutoMaps')==2) { - debug("RunBionicBeforeSpire incompatible with AutoMaps No Unique Maps, changing..."); - setPageSetting("AutoMaps",1); - } + for (var setting in autoTrimpSettings) { var item = autoTrimpSettings[setting]; if (item.type == 'value' || item.type == 'valueNegative' || item.type == 'multitoggle' || item.type == 'multiValue') { From 2c73d98aa86c708f84aa06587658590d0d6ad0b2 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 09:19:43 +0100 Subject: [PATCH 1356/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 2cba5cfa5..753f45e3f 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -89,7 +89,7 @@ function mainLoop() { if (getPageSetting('BWraid') && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid') && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);}; if ((getPageSetting('BWraid') || getPageSetting('DailyBWraid'))&& bwraidon) buyWeps(); if (getPageSetting('ForceAbandon')==true || getPageSetting('fuckanti')) trimpcide(); - if (getPageSetting('AutoAllocatePerks')==2 && game.global.world == getPageSetting('lootdumpz')) lootdump(); + if (getPageSetting('AutoAllocatePerks')==2 && game.global.world >= getPageSetting('lootdumpz')) lootdump(); if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1 && getDailyHeliumValue(countDailyWeight()) >= getPageSetting('buyheliumy') && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) purchaseSingleRunBonus('heliumy'); if (!game.global.fighting){ if (getPageSetting('fightforever')==0) fightalways(); From e38e3e7c280f28dc3fde80c5db83171511073788 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 09:23:24 +0100 Subject: [PATCH 1357/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 9b6ef099b..9d6021ddf 100644 --- a/modules/other.js +++ b/modules/other.js @@ -424,7 +424,7 @@ function BWraiding() { function lootdump() { if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpz') > 0) { viewPortalUpgrades(); - if (game.global.viewingUpgrades && getPortalUpgradePrice("Looting_II")+game.resources.helium.totalSpentTemp <= game.resources.helium.respecMax) { + if (game.global.viewingUpgrades && getPortalUpgradePrice("Looting_II") <= game.resources.helium.respecMax) { numTab(6, true) buyPortalUpgrade('Looting_II'); activateClicked(); From d72a4c4fde5256805ea833e56d41dd553256d3a4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 09:23:44 +0100 Subject: [PATCH 1358/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 753f45e3f..2cba5cfa5 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -89,7 +89,7 @@ function mainLoop() { if (getPageSetting('BWraid') && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid') && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);}; if ((getPageSetting('BWraid') || getPageSetting('DailyBWraid'))&& bwraidon) buyWeps(); if (getPageSetting('ForceAbandon')==true || getPageSetting('fuckanti')) trimpcide(); - if (getPageSetting('AutoAllocatePerks')==2 && game.global.world >= getPageSetting('lootdumpz')) lootdump(); + if (getPageSetting('AutoAllocatePerks')==2 && game.global.world == getPageSetting('lootdumpz')) lootdump(); if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1 && getDailyHeliumValue(countDailyWeight()) >= getPageSetting('buyheliumy') && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) purchaseSingleRunBonus('heliumy'); if (!game.global.fighting){ if (getPageSetting('fightforever')==0) fightalways(); From 4f1ac38a35425799413c5ad8fd2f5b108ae02221 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 12:44:28 +0100 Subject: [PATCH 1359/3477] Update upgrades.js --- modules/upgrades.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 580d9b211..99da9c152 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -5,9 +5,12 @@ function buyUpgrades() { upgrade = upgradeList[upgrade]; var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); + if (upgrade == 'Coordination' && ((getPageSetting('BuyUpgradesNew') == 2) || (!canAffordCoordinationTrimps())) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; - if (upgrade == 'Coordination' && ((getPageSetting('BuyUpgradesNew') == 2) || (!canAffordCoordinationTrimps()) || (getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) > 2000)))) continue; + if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) continue; + if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) continue; + if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; From ca0d99d77d72d98bd1d9ca32b9612ab555ae5b4c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 12:48:49 +0100 Subject: [PATCH 1360/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 99da9c152..18543029e 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -5,7 +5,7 @@ function buyUpgrades() { upgrade = upgradeList[upgrade]; var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); - if (upgrade == 'Coordination' && ((getPageSetting('BuyUpgradesNew') == 2) || (!canAffordCoordinationTrimps())) continue; + if (upgrade == 'Coordination' && ((getPageSetting('BuyUpgradesNew') == 2) || (!canAffordCoordinationTrimps()))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) continue; From 0fd285b16f4649a45546fd7bd0bfa25f0f7bfab1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 12:50:07 +0100 Subject: [PATCH 1361/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 18543029e..8ecd4722a 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -8,7 +8,7 @@ function buyUpgrades() { if (upgrade == 'Coordination' && ((getPageSetting('BuyUpgradesNew') == 2) || (!canAffordCoordinationTrimps()))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; - if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) continue; + if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0)) continue; if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) continue; if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; From eb439c4c33fde35b97f3947d8af930b38f756461 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 12:56:29 +0100 Subject: [PATCH 1362/3477] Update upgrades.js --- modules/upgrades.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 8ecd4722a..baa7f24ab 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -9,8 +9,8 @@ function buyUpgrades() { if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0)) continue; - if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && getPageSetting('amalcoordt') < 0 && HDratioy() < getPageSetting('amalcoordhd')) continue; - if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && getPageSetting('amalcoordt') > 0 && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000) continue; + if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && getPageSetting('amalcoordt') < 0 && getPageSetting('amalcoordhd') > 0 && HDratioy() < getPageSetting('amalcoordhd')) continue; + if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && getPageSetting('amalcoordhd') > 0 && getPageSetting('amalcoordt') > 0 && HDratioy() < getPageSetting('amalcoordhd') && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; From d845dd9fad6832301ae300046fb2c31665813417 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 13:08:05 +0100 Subject: [PATCH 1363/3477] Update upgrades.js --- modules/upgrades.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index baa7f24ab..70b14b78c 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -8,9 +8,7 @@ function buyUpgrades() { if (upgrade == 'Coordination' && ((getPageSetting('BuyUpgradesNew') == 2) || (!canAffordCoordinationTrimps()))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; - if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && (game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0)) continue; - if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && getPageSetting('amalcoordt') < 0 && getPageSetting('amalcoordhd') > 0 && HDratioy() < getPageSetting('amalcoordhd')) continue; - if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && getPageSetting('amalcoordhd') > 0 && getPageSetting('amalcoordt') > 0 && HDratioy() < getPageSetting('amalcoordhd') && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000) continue; + if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && ((game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) || (getPageSetting('amalcoordt') < 0 && getPageSetting('amalcoordhd') > 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordhd') > 0 && getPageSetting('amalcoordt') > 0 && HDratioy() < getPageSetting('amalcoordhd') && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000)))continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; @@ -24,4 +22,3 @@ function buyUpgrades() { debug('Upgraded ' + upgrade, "upgrades", "*upload2"); } } -//work dickhead From 03b3fed99da4fc9bd8495662d2200bb0b4e1eb88 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 13:14:55 +0100 Subject: [PATCH 1364/3477] Update upgrades.js --- modules/upgrades.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 70b14b78c..1771a455f 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -5,10 +5,10 @@ function buyUpgrades() { upgrade = upgradeList[upgrade]; var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); - if (upgrade == 'Coordination' && ((getPageSetting('BuyUpgradesNew') == 2) || (!canAffordCoordinationTrimps()))) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2) || (!canAffordCoordinationTrimps())) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; - if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && ((game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) || (getPageSetting('amalcoordt') < 0 && getPageSetting('amalcoordhd') > 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordhd') > 0 && getPageSetting('amalcoordt') > 0 && HDratioy() < getPageSetting('amalcoordhd') && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000)))continue; + if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && ((game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && getPageSetting('amalcoordhd') > 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordhd') > 0 && getPageSetting('amalcoordt') > 0 && HDratioy() < getPageSetting('amalcoordhd') && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000)))continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; From 29d1ac8a009f8982f1884ff462fdb8951dddb86b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 13:18:30 +0100 Subject: [PATCH 1365/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 1771a455f..67da73fa4 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -8,7 +8,7 @@ function buyUpgrades() { if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2) || (!canAffordCoordinationTrimps())) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; - if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && ((game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && getPageSetting('amalcoordhd') > 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordhd') > 0 && getPageSetting('amalcoordt') > 0 && HDratioy() < getPageSetting('amalcoordhd') && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) < 2000)))continue; + if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && ((game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && getPageSetting('amalcoordhd') > 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordhd') > 0 && getPageSetting('amalcoordt') > 0 && HDratioy() < getPageSetting('amalcoordhd') && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) > 2000))) continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") continue; if (upgrade == 'Coordination' && getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax')<=0) && game.global.challengeActive == "Daily") continue; if (upgrade == 'Shieldblock' && !getPageSetting('BuyShieldblock')) continue; From 4eb756fe020e009d25b73bd27cbb71fc657a4b29 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 13:31:34 +0100 Subject: [PATCH 1366/3477] Update stance.js --- modules/stance.js | 179 +++------------------------------------------- 1 file changed, 10 insertions(+), 169 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index a05581928..04a1e49e2 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -2,175 +2,6 @@ function calcBaseDamageinX(){baseDamage=calcOurDmg("avg",!1,!0),baseBlock=game.g function calcBaseDamageinX2(){baseDamage=calcOurDmg("avg",!1,!0),baseBlock=getBattleStats("block"),baseHealth=getBattleStats("health")} function autoStance() { - calcBaseDamageinX(); - if (game.global.gridArray.length === 0) return; - if (game.global.soldierHealth <= 0) return; - if (!getPageSetting('AutoStance')) return; - if (!game.upgrades.Formations.done) return; - var missingHealth = game.global.soldierHealthMax - game.global.soldierHealth; - var newSquadRdy = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; - var dHealth = baseHealth/2; - var xHealth = baseHealth; - var bHealth = baseHealth/2; - var enemy; - var corrupt = game.global.world >= mutations.Corruption.start(); - if (!game.global.mapsActive && !game.global.preMapsActive) { - enemy = getCurrentEnemy(); - var enemyFast = game.global.challengeActive == "Slow" || ((((game.badGuys[enemy.name].fast || enemy.mutation == "Corruption") && game.global.challengeActive != "Nom") && game.global.challengeActive != "Coordinate")); - var enemyHealth = enemy.health; - var enemyDamage = enemy.attack * 1.2; - enemyDamage = calcDailyAttackMod(enemyDamage); - if (enemy && enemy.mutation == "Corruption"){ - enemyHealth *= getCorruptScale("health"); - enemyDamage *= getCorruptScale("attack"); - } - if (enemy && enemy.corrupted == 'corruptStrong') { - enemyDamage *= 2; - } - if (enemy && enemy.corrupted == 'corruptTough') { - enemyHealth *= 5; - } - if (enemy && game.global.challengeActive == "Nom" && typeof enemy.nomStacks !== 'undefined'){ - enemyDamage *= Math.pow(1.25, enemy.nomStacks); - } - if (game.global.challengeActive == 'Lead') { - enemyDamage *= (1 + (game.challenges.Lead.stacks * 0.04)); - } - if (game.global.challengeActive == 'Watch') { - enemyDamage *= 1.25; - } - var pierceMod = getPierceAmt(); - var dDamage = enemyDamage - baseBlock / 2 > enemyDamage * pierceMod ? enemyDamage - baseBlock / 2 : enemyDamage * pierceMod; - var xDamage = enemyDamage - baseBlock > enemyDamage * pierceMod ? enemyDamage - baseBlock : enemyDamage * pierceMod; - var bDamage = enemyDamage - baseBlock * 4 > enemyDamage * pierceMod ? enemyDamage - baseBlock * 4 : enemyDamage * pierceMod; - - } else if (game.global.mapsActive && !game.global.preMapsActive) { - enemy = getCurrentEnemy(); - var enemyFast = game.global.challengeActive == "Slow" || ((((game.badGuys[enemy.name].fast || enemy.mutation == "Corruption") && game.global.challengeActive != "Nom") || game.global.voidBuff == "doubleAttack") && game.global.challengeActive != "Coordinate"); - var enemyHealth = enemy.health; - var enemyDamage = enemy.attack * 1.2; - enemyDamage = calcDailyAttackMod(enemyDamage); - if (getCurrentMapObject().location == "Void" && corrupt) { - enemyDamage *= getCorruptScale("attack"); - enemyHealth *= getCorruptScale("health"); - if (!mutations.Magma.active()) { - enemyDamage /= 2; - enemyHealth /= 2; - } - } - else if (getCurrentMapObject().location != "Void" && mutations.Magma.active()) { - enemyHealth *= (getCorruptScale("health") / 2); - enemyDamage *= (getCorruptScale("attack") / 2); - } - if (enemy && enemy.corrupted == 'corruptStrong') { - enemyDamage *= 2; - } - if (enemy && enemy.corrupted == 'corruptTough') { - enemyHealth *= 5; - } - if (enemy && game.global.challengeActive == "Nom" && typeof enemy.nomStacks !== 'undefined'){ - enemyDamage *= Math.pow(1.25, enemy.nomStacks); - } - if (game.global.challengeActive == 'Lead') { - enemyDamage *= (1 + (game.challenges.Lead.stacks * 0.04)); - } - if (game.global.challengeActive == 'Watch') { - enemyDamage *= 1.25; - } - var dDamage = enemyDamage - baseBlock / 2 > 0 ? enemyDamage - baseBlock / 2 : 0; - var dVoidCritDamage = enemyDamage*5 - baseBlock / 2 > 0 ? enemyDamage*5 - baseBlock / 2 : 0; - var xDamage = enemyDamage - baseBlock > 0 ? enemyDamage - baseBlock : 0; - var xVoidCritDamage = enemyDamage*5 - baseBlock > 0 ? enemyDamage*5 - baseBlock : 0; - var bDamage = enemyDamage - baseBlock * 4 > 0 ? enemyDamage - baseBlock * 4 : 0; - } - - var drainChallenge = game.global.challengeActive == 'Nom' || game.global.challengeActive == "Toxicity"; - var dailyPlague = game.global.challengeActive == 'Daily' && (typeof game.global.dailyChallenge.plague !== 'undefined'); - var dailyBogged = game.global.challengeActive == 'Daily' && (typeof game.global.dailyChallenge.bogged !== 'undefined'); - - if (game.global.challengeActive == "Electricity" || game.global.challengeActive == "Mapocalypse") { - dDamage+= dHealth * game.global.radioStacks * 0.1; - xDamage+= xHealth * game.global.radioStacks * 0.1; - bDamage+= bHealth * game.global.radioStacks * 0.1; - } else if (drainChallenge) { - dDamage += dHealth/20; - xDamage += xHealth/20; - bDamage += bHealth/20; - var drainChallengeOK = dHealth - missingHealth > dHealth/20; - } else if (dailyPlague) { - drainChallenge = true; - var hplost = dailyModifiers.plague.getMult(game.global.dailyChallenge.plague.strength, 1 + game.global.dailyChallenge.plague.stacks); - //x% of TOTAL health; - dDamage += dHealth * hplost; - xDamage += xHealth * hplost; - bDamage += bHealth * hplost; - var drainChallengeOK = dHealth - missingHealth > dHealth * hplost; - } else if (dailyBogged) { - drainChallenge = true; - var hplost = dailyModifiers.bogged.getMult(game.global.dailyChallenge.bogged.strength); - dDamage += dHealth * hplost; - xDamage += xHealth * hplost; - bDamage += bHealth * hplost; - var drainChallengeOK = dHealth - missingHealth > dHealth * hplost; - } else if (game.global.challengeActive == "Crushed") { - if(dHealth > baseBlock /2) - dDamage = enemyDamage*5 - baseBlock / 2 > 0 ? enemyDamage*5 - baseBlock / 2 : 0; - if(xHealth > baseBlock) - xDamage = enemyDamage*5 - baseBlock > 0 ? enemyDamage*5 - baseBlock : 0; - } - if (game.global.voidBuff == "bleed" || (enemy && enemy.corrupted == 'corruptBleed')) { - dDamage += game.global.soldierHealth * 0.2; - xDamage += game.global.soldierHealth * 0.2; - bDamage += game.global.soldierHealth * 0.2; - } - var isDoubleAttack = game.global.voidBuff == 'doubleAttack' || (enemy && enemy.corrupted == 'corruptDbl'); - var doubleAttackOK = true; - var leadDamage = game.challenges.Lead.stacks * 0.0003; - var leadAttackOK = game.global.challengeActive != 'Lead' || enemyHealth <= baseDamage || ((newSquadRdy && dHealth > dDamage + (dHealth * leadDamage)) || (dHealth - missingHealth > dDamage + (dHealth * leadDamage))); - const ignoreCrits = getPageSetting('IgnoreCrits'); - var isCritVoidMap = ignoreCrits == 2 ? false : (!ignoreCrits && game.global.voidBuff == 'getCrit') || (enemy && enemy.corrupted == 'corruptCrit'); - var voidCritinDok = !isCritVoidMap || (!enemyFast ? enemyHealth <= baseDamage : false) || (newSquadRdy && dHealth > dVoidCritDamage) || (dHealth - missingHealth > dVoidCritDamage); - var voidCritinXok = !isCritVoidMap || (!enemyFast ? enemyHealth <= baseDamage : false) || (newSquadRdy && xHealth > xVoidCritDamage) || (xHealth - missingHealth > xVoidCritDamage); - - if (!game.global.preMapsActive && game.global.soldierHealth > 0) { - if (!enemyFast && game.upgrades.Dominance.done && enemyHealth <= baseDamage && (newSquadRdy || (dHealth - missingHealth > 0 && !drainChallenge) || (drainChallenge && drainChallengeOK))) { - setFormation(2); - } else if (game.upgrades.Dominance.done && ((newSquadRdy && dHealth > dDamage) || dHealth - missingHealth > dDamage) && doubleAttackOK && leadAttackOK && voidCritinDok ) { - setFormation(2); - } else if (isCritVoidMap && !voidCritinDok) { - if (game.global.formation == "0" && game.global.soldierHealth - xVoidCritDamage < game.global.soldierHealthMax/2){ - if (game.upgrades.Barrier.done && (newSquadRdy || (missingHealth < game.global.soldierHealthMax/2)) ) - setFormation(3); - } - else if (xVoidCritDamage == 0 || ((game.global.formation == 2 || game.global.formation == 4) && voidCritinXok)){ - setFormation("0"); - } - else { - if (game.global.formation == "0"){ - if (game.upgrades.Barrier.done && (newSquadRdy || (missingHealth < game.global.soldierHealthMax/2)) ) - setFormation(3); - else - setFormation(1); - } - else if (game.upgrades.Barrier.done && (game.global.formation == 2 || game.global.formation == 4)) - setFormation(3); - } - } else if (game.upgrades.Formations.done && ((newSquadRdy && xHealth > xDamage) || xHealth - missingHealth > xDamage)) { - - if ((game.global.challengeActive == 'Lead') && (xHealth - missingHealth < xDamage + (xHealth * leadDamage))) - setFormation(1); - else - setFormation("0"); - } else if (game.upgrades.Barrier.done && ((newSquadRdy && bHealth > bDamage) || bHealth - missingHealth > bDamage)) { - setFormation(3); //does this ever run? - } else if (game.upgrades.Formations.done) { - setFormation(1); - } else - setFormation("0"); - } -} - -function autoStance2() { calcBaseDamageinX2(); if (game.global.gridArray.length === 0) return true; if (game.global.soldierHealth <= 0) return; @@ -430,6 +261,16 @@ function autoStanceCheck(enemyCrit) { return [true,true]; } +function autostance2() { + if (game.global.gridArray.length === 0) return; + if (game.global.soldierHealth <= 0) return; + if (getPageSetting('AutoStance') == 0) return; + if (!game.upgrades.Formations.done) return; + if (game.global.world <= 70) return; + if (game.global.formation != 2) + setFormation(2); +} + function autoStance3() { calcBaseDamageinX2(); if (game.global.gridArray.length === 0) return; From e213f06784a970ac0f5ca7685a85655d103cbc37 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 13:34:32 +0100 Subject: [PATCH 1367/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 65d050a7d..52e564a26 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -310,11 +310,11 @@ function initializeAllSettings() { //Line 1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
    BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
    BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
    BAF3 = Uses vanilla autofight.
    WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); - createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance 1', 'Auto Stance 2', 'Windstacking'], 'Automatically swap stances to avoid death. The decision between AutoStance 1 or 2 is up to your own discretion and they should be similar. Windstacking is for use after nature (z230), and will keep you in D stance unless you are windstacking (Only useful if transfer is maxed out and wind empowerment is high) ', 'multitoggle', 1, null, "Combat"); + createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance', 'D Stance', 'Windstacking'], 'Autostance: Automatically swap stances to avoid death.
    D Stance: Keeps you in D stance regardless of Health.
    Windstacking: For use after nature (z230), and will keep you in D stance unless you are windstacking (Only useful if transfer is maxed out and wind empowerment is high) ', 'multitoggle', 1, null, "Combat"); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); - createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); //Does anybody actually use this? + createSetting('DynamicGyms', 'Dynamic Gyms', 'Designed to limit your block to slightly more than however much the enemy attack is. If MaxGyms is capped or GymWall is set, those will still work, and this will NOT override those (works concurrently), but it will further limit them. In the future it may override, but the calculation is not easy to get right so I dont want it undo-ing other things yet. ', 'boolean', false, null, 'Combat'); createSetting('AutoRoboTrimp', 'AutoRoboTrimp', 'Use RoboTrimps ability starting at this level, and every 5 levels thereafter. (set to 0 to disable. default 60.) 60 is a good choice for mostly everybody.', 'value', '60', null, 'Combat'); //Line 2 From 495d67ec35af644126e1564a74a05713d72ec196 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 13:35:14 +0100 Subject: [PATCH 1368/3477] Update stance.js --- modules/stance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index 04a1e49e2..dd45f1950 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -261,7 +261,7 @@ function autoStanceCheck(enemyCrit) { return [true,true]; } -function autostance2() { +function autoStance2() { if (game.global.gridArray.length === 0) return; if (game.global.soldierHealth <= 0) return; if (getPageSetting('AutoStance') == 0) return; From 541d2ccabef7630a6907a4d3cb78cea949f74d71 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 13:43:05 +0100 Subject: [PATCH 1369/3477] Update SettingsGUI.js --- SettingsGUI.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 52e564a26..948783c83 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -351,14 +351,15 @@ function initializeAllSettings() { //Magma createSetting('UseAutoGen', 'Auto Generator', 'Turn this on to reveal magma settings and allow them to work. ', 'boolean', false, null, 'Magma'); - createSetting('fuellater', 'Start Fuel Z', 'Start fueling at this zone instead of 230. I would suggest you have a value lower than your max, for obvious reasons. Recommend starting at a value close-ish to your max supply. -1 to start at 230 or use default setting for entire run. ', 'value', -1, null, 'Magma'); + createSetting('beforegen', ['Gain Mi', 'Gain Fuel', 'Hybrid'], 'MODE BEFORE FUELING: Which mode to use before fueling. This is the mode which the generator will use if you fuel after z230. ', 'multitoggle', 1, null, 'Magma'); + createSetting('fuellater', 'Start Fuel Z', 'Start fueling at this zone instead of 230. I would suggest you have a value lower than your max, for obvious reasons. Recommend starting at a value close-ish to your max supply. -1 to start at 230 and use your BEFORE FUEL setting. ', 'value', -1, null, 'Magma'); createSetting('fuelend', 'End Fuel Z', 'End fueling at this zone. After this zone is reached, will follow your preference. -1 to fuel infinitely. ', 'value', -1, null, 'Magma'); createSetting('defaultgen', ['Gain Mi', 'Gain Fuel', 'Hybrid'], 'DEFAULT Which mode to use after fueling. This is your default setting for the Auto Generator. ', 'multitoggle', 1, null, 'Magma'); createSetting('AutoGenDC', ['Daily: Normal', 'Daily: Fuel', 'Daily: Hybrid'], 'Normal: Uses the AutoGen settings.
    Fuel: Fuels the entire Daily.
    Hybrid: Uses Hybrid for the entire Daily. ', 'multitoggle', 1, null, 'Magma'); createSetting('AutoGenC2', ['C2: Normal', 'C2: Fuel', 'C2: Hybrid'], 'Normal: Uses the AutoGen settings.
    Fuel: Fuels the entire C2.
    Hybrid: Uses Hybrid for the entire C2. ', 'multitoggle', 1, null, 'Magma'); - createSetting('spendmagmite', ['Spend Magmite OFF', 'Spend Magmite (Portal)', 'Spend Magmite Always'], 'Auto Spends any unspent Magmite immediately before portaling. (Or Always, if toggled). Part 1 buys any permanent one-and-done upgrades in order from most expensive to least. Part 2 then analyzes Efficiency vs Capacity for cost/benefit, and buys Efficiency if its BETTER than Capacity. If not, if the PRICE of Capacity is less than the price of Supply, it buys Capacity. If not, it buys Supply. And then it repeats itself until you run out of Magmite and cant buy anymore. ', 'multitoggle', 1, null, 'Magma'); //Line 2 + createSetting('spendmagmite', ['Spend Magmite OFF', 'Spend Magmite (Portal)', 'Spend Magmite Always'], 'Auto Spends any unspent Magmite immediately before portaling. (Or Always, if toggled). Part 1 buys any permanent one-and-done upgrades in order from most expensive to least. Part 2 then analyzes Efficiency vs Capacity for cost/benefit, and buys Efficiency if its BETTER than Capacity. If not, if the PRICE of Capacity is less than the price of Supply, it buys Capacity. If not, it buys Supply. And then it repeats itself until you run out of Magmite and cant buy anymore. ', 'multitoggle', 1, null, 'Magma'); createSetting('SupplyWall', 'Throttle Supply (or Capacity)', 'Positive number NOT 1 e.g. 2.5: Consider Supply when its cost * 2.5 is < Capacity, instead of immediately when < Cap. Effectively throttles supply for when you don\'t need too many.

    Negative number (-1 is ok) e.g. -2.5: Consider Supply if it costs < Capacity * 2.5, buy more supplys! Effectively throttling capacity instead.

    Set to 1: DISABLE SUPPLY only spend magmite on Efficiency, Capacity and Overclocker. Always try to get supply close to your HZE.
    Set to 0: IGNORE SETTING and use old behaviour (will still try to buy overclocker)    ', 'valueNegative', 2, null, 'Magma'); createSetting('spendmagmitesetting', ['Normal', 'Normal & No OC', 'OneTime Only', 'OneTime & OC'], 'Normal: Spends Magmite Normally as Explained in Magmite spending behaviour.
    Normal & No OC: Same as normal, except skips OC afterbuying 1 OC upgrade.
    OneTime Only: Only Buys the One off upgrades except skips OC afterbuying 1 OC upgrade.
    OneTime & OC: Buys all One off upgrades, then buys OC only. ', 'multitoggle', 0, null, 'Magma'); createSetting('MagmiteExplain', 'Magmite spending behaviour', '1. Buy one-and-done upgrades, expensive first, then consider 1st level of Overclocker;
    2. Buy Overclocker IF AND ONLY IF we can afford it;
    2.5. Exit if OneTimeOnly
    3. Buy Efficiency if it is better than capacity;
    4. Buy Capacity or Supply depending on which is cheaper, or based on SupplyWall', 'infoclick', 'MagmiteExplain', null, 'Magma'); From fff1e1aef51bdeb741fe8d346690ca0ba68ca610 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 13:43:21 +0100 Subject: [PATCH 1370/3477] Update magmite.js --- modules/magmite.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/magmite.js b/modules/magmite.js index 50a728983..99a7ea903 100644 --- a/modules/magmite.js +++ b/modules/magmite.js @@ -88,6 +88,7 @@ function autoMagmiteSpender() { function autoGenerator() { var defaultgenstate = getPageSetting('defaultgen'); +var beforefuelstate = getPageSetting('beforegen'); if (game.global.world < 230) return; if (game.global.dailyChallenge.seed && getPageSetting('AutoGenDC') == 1 && game.global.generatorMode != 1) changeGeneratorState(1); @@ -105,13 +106,13 @@ var defaultgenstate = getPageSetting('defaultgen'); changeGeneratorState(2); if (game.global.runningChallengeSquared && getPageSetting('AutoGenC2') == 2 && game.global.generatorMode == 2) return; - if (getPageSetting('fuellater') < 1 && game.global.generatorMode != defaultgenstate) - changeGeneratorState(defaultgenstate); - if (getPageSetting('fuellater') < 1 && game.global.generatorMode == defaultgenstate) + if (getPageSetting('fuellater') < 1 && game.global.generatorMode != beforefuelstate) + changeGeneratorState(beforefuelstate); + if (getPageSetting('fuellater') < 1 && game.global.generatorMode == beforefuelstate) return; - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode != defaultgenstate) - changeGeneratorState(defaultgenstate); - if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == defaultgenstate) + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode != beforefuelstate) + changeGeneratorState(beforefuelstate); + if (getPageSetting('fuellater') >= 1 && game.global.world < getPageSetting('fuellater') && game.global.generatorMode == beforefuelstate) return; if (getPageSetting('fuellater') >= 1 && game.global.world >= getPageSetting('fuellater') && game.global.world < getPageSetting('fuelend') && game.global.generatorMode != 1) changeGeneratorState(1); From 651850ac1a0c2f5e0d0dae32b0ffb94e17f894b3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 13:44:59 +0100 Subject: [PATCH 1371/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 948783c83..8609fc692 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -354,7 +354,7 @@ function initializeAllSettings() { createSetting('beforegen', ['Gain Mi', 'Gain Fuel', 'Hybrid'], 'MODE BEFORE FUELING: Which mode to use before fueling. This is the mode which the generator will use if you fuel after z230. ', 'multitoggle', 1, null, 'Magma'); createSetting('fuellater', 'Start Fuel Z', 'Start fueling at this zone instead of 230. I would suggest you have a value lower than your max, for obvious reasons. Recommend starting at a value close-ish to your max supply. -1 to start at 230 and use your BEFORE FUEL setting. ', 'value', -1, null, 'Magma'); createSetting('fuelend', 'End Fuel Z', 'End fueling at this zone. After this zone is reached, will follow your preference. -1 to fuel infinitely. ', 'value', -1, null, 'Magma'); - createSetting('defaultgen', ['Gain Mi', 'Gain Fuel', 'Hybrid'], 'DEFAULT Which mode to use after fueling. This is your default setting for the Auto Generator. ', 'multitoggle', 1, null, 'Magma'); + createSetting('defaultgen', ['Gain Mi', 'Gain Fuel', 'Hybrid'], 'MODE AFTER FUELING: Which mode to use after fueling. ', 'multitoggle', 1, null, 'Magma'); createSetting('AutoGenDC', ['Daily: Normal', 'Daily: Fuel', 'Daily: Hybrid'], 'Normal: Uses the AutoGen settings.
    Fuel: Fuels the entire Daily.
    Hybrid: Uses Hybrid for the entire Daily. ', 'multitoggle', 1, null, 'Magma'); createSetting('AutoGenC2', ['C2: Normal', 'C2: Fuel', 'C2: Hybrid'], 'Normal: Uses the AutoGen settings.
    Fuel: Fuels the entire C2.
    Hybrid: Uses Hybrid for the entire C2. ', 'multitoggle', 1, null, 'Magma'); From a3cde8f6cb37d3beba42a2639642d1fdf4b4db66 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 13:51:42 +0100 Subject: [PATCH 1372/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 2cba5cfa5..be6c2cd9c 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -15,11 +15,12 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "06/09/2018", version: "v2.7.1", description: "4.901 Scryer Stuff actually works now, neat. Replaced one of the autogather options with a new more efficient option for late game. Fight always got an upgrade. Thanks for using the fork in 4.9(01)! ", isNew: true}); +changelogList.push({date: "12/09/2018", version: "v2.7.2", description: "4.91 Scryer Stuff really works now! No really! Nature Scryer got a rework. Removed AS1 in favor of AS2, so make sure yours is set! May need some tuning so let me know if it sucks! Replaced AS1 with D Stance. Amal Target for Amal boosting, may not work correctly, yet. Please let me know if it works though (or doesn\'t)! Added a setting to control mode Before Fueling in Magma. Small performance boost for liq zones. Thanks for using the fork in 4.91! ", isNew: true}); +changelogList.push({date: "06/09/2018", version: "v2.7.1", description: "4.901 Scryer Stuff actually works now, neat. Replaced one of the autogather options with a new more efficient option for late game. Fight always got an upgrade. Thanks for using the fork in 4.9(01)! ", isNew: false}); changelogList.push({date: "05/09/2018", version: "v2.7.0", description: "4.9 Here we go! Added the new Classy perk to Autoperks, along with updated ratios. Added an option in Buildings & Jobs to hide obsolete settings once you have unlocked certain masteries. Fixed Scryer. Added an option to Scry VMs without having to enable scrying. Added B instead of S for WS. ", isNew: false}); -changelogList.push({date: "03/09/2018", version: "v2.6.5", description: "Pre-pre-4.9 update. Check out the C2 Tab! And theres some more tiny optimizations too. ", isNew: false}); -changelogList.push({date: "02/09/2018", version: "v2.6.4", description: "Pre-4.9 update. Revamped the Daily Autoportal settings, so make sure to check it! And sust some small optimizations here and there. I have changed some settings names such as AS3, check em out. Also just a quick thank you to anyone who uses my fork, its nice to know something I have made is actually being used haha. Please report any problems to me! ", isNew: false}); -changelogList.push({date: "22/08/2018", version: "v2.6.3", description: "Disable Farming is now controllable, so make sure to set it! Added Magic Armor option to Dailys/C2s. Changed the Daily Fight Always button, check it! The Daily tab is getting really fat now, oh well lol. ", isNew: false}); +//changelogList.push({date: "03/09/2018", version: "v2.6.5", description: "Pre-pre-4.9 update. Check out the C2 Tab! And theres some more tiny optimizations too. ", isNew: false}); +//changelogList.push({date: "02/09/2018", version: "v2.6.4", description: "Pre-4.9 update. Revamped the Daily Autoportal settings, so make sure to check it! And sust some small optimizations here and there. I have changed some settings names such as AS3, check em out. Also just a quick thank you to anyone who uses my fork, its nice to know something I have made is actually being used haha. Please report any problems to me! ", isNew: false}); +//changelogList.push({date: "22/08/2018", version: "v2.6.3", description: "Disable Farming is now controllable, so make sure to set it! Added Magic Armor option to Dailys/C2s. Changed the Daily Fight Always button, check it! The Daily tab is getting really fat now, oh well lol. ", isNew: false}); //changelogList.push({date: "21/08/2018", version: "v2.6.2", description: "Amal Boost can now be controlled. Disable Farming now has a more intuitive layout, so make sure to set it. You can also mess with Scryer Min/Max Zones better. Some new WS options to be added later. ", isNew: false}); //changelogList.push({date: "19/08/2018", version: "v2.6.1", description: "Windstacking now has its own tab. Added Ultimate Windstacking. There may be some other tweaks that I\'ve forgot about, but have fun experimenting! ", isNew: false}); From 70a78aba8275ad0f7f66608264e8928d0ef24dbf Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 16:18:19 +0100 Subject: [PATCH 1373/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index be6c2cd9c..e248cacee 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -31,7 +31,7 @@ function printChangelog() { var $item = changelogList[i]; var result = assembleChangelog($item.date,$item.version,$item.description,$item.isNew); body+=result; - }; + } var footer = 'ZӘK Fork - Report any bugs/problems please!\
    Talk with the dev: ZӘK#2509 @ AutoTrimps Discord Channel\ @@ -87,7 +87,7 @@ function mainLoop() { if (getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily") Praiding(); if (getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") dailyPraiding(); } - if (getPageSetting('BWraid') && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid') && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);}; + if (getPageSetting('BWraid') && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid') && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);} if ((getPageSetting('BWraid') || getPageSetting('DailyBWraid'))&& bwraidon) buyWeps(); if (getPageSetting('ForceAbandon')==true || getPageSetting('fuckanti')) trimpcide(); if (getPageSetting('AutoAllocatePerks')==2 && game.global.world == getPageSetting('lootdumpz')) lootdump(); From 42ca885c84ae098bdb9dba900086f8b995a8038e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 18:25:52 +0100 Subject: [PATCH 1374/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index e248cacee..ebcc1262f 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -90,7 +90,7 @@ function mainLoop() { if (getPageSetting('BWraid') && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid') && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);} if ((getPageSetting('BWraid') || getPageSetting('DailyBWraid'))&& bwraidon) buyWeps(); if (getPageSetting('ForceAbandon')==true || getPageSetting('fuckanti')) trimpcide(); - if (getPageSetting('AutoAllocatePerks')==2 && game.global.world == getPageSetting('lootdumpz')) lootdump(); + if (getPageSetting('AutoAllocatePerks')==2) lootdump(); if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1 && getDailyHeliumValue(countDailyWeight()) >= getPageSetting('buyheliumy') && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) purchaseSingleRunBonus('heliumy'); if (!game.global.fighting){ if (getPageSetting('fightforever')==0) fightalways(); From 972125c9e34ccf79fcf48686c9f895ccb3d18dff Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 18:28:15 +0100 Subject: [PATCH 1375/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index ebcc1262f..aa150fded 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -90,7 +90,7 @@ function mainLoop() { if (getPageSetting('BWraid') && game.global.challengeActive != "Daily" || getPageSetting('Dailybwraid') && game.global.challengeActive == "Daily") {setTimeout(BWraiding(), 3000);} if ((getPageSetting('BWraid') || getPageSetting('DailyBWraid'))&& bwraidon) buyWeps(); if (getPageSetting('ForceAbandon')==true || getPageSetting('fuckanti')) trimpcide(); - if (getPageSetting('AutoAllocatePerks')==2) lootdump(); + if (getPageSetting('AutoAllocatePerks')==2 && game.global.world >= getPageSetting('lootdumpz')) lootdump(); if (game.global.challengeActive == "Daily" && getPageSetting('buyheliumy') >= 1 && getDailyHeliumValue(countDailyWeight()) >= getPageSetting('buyheliumy') && game.global.b >= 100 && !game.singleRunBonuses.heliumy.owned) purchaseSingleRunBonus('heliumy'); if (!game.global.fighting){ if (getPageSetting('fightforever')==0) fightalways(); From a857febfe295ff75263f5571b9e599aef67d31a8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 12 Sep 2018 22:58:25 +0100 Subject: [PATCH 1376/3477] Update upgrades.js --- modules/upgrades.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/upgrades.js b/modules/upgrades.js index 67da73fa4..a98362a6d 100644 --- a/modules/upgrades.js +++ b/modules/upgrades.js @@ -5,7 +5,7 @@ function buyUpgrades() { upgrade = upgradeList[upgrade]; var gameUpgrade = game.upgrades[upgrade]; var available = (gameUpgrade.allowed > gameUpgrade.done && canAffordTwoLevel(gameUpgrade)); - if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2) || (!canAffordCoordinationTrimps())) continue; + if (upgrade == 'Coordination' && (getPageSetting('BuyUpgradesNew') == 2 || !canAffordCoordinationTrimps())) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"))) continue; if (upgrade == 'Coordination' && (!canAffordCoordinationTrimps() || (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"))) continue; if (upgrade == 'Coordination' && getPageSetting('amalcoord')==true && ((game.global.world < getPageSetting('amalcoordz') || getPageSetting('amalcoordz') < 0) && (getPageSetting('amalcoordt') < 0 && getPageSetting('amalcoordhd') > 0 && HDratioy() < getPageSetting('amalcoordhd')) || (getPageSetting('amalcoordhd') > 0 && getPageSetting('amalcoordt') > 0 && HDratioy() < getPageSetting('amalcoordhd') && getPageSetting('amalcoordt') > game.jobs.Amalgamator.owned && (game.resources.trimps.realMax() / game.resources.trimps.getCurrentSend()) > 2000))) continue; From 4656bb87ba51f099c9aff0cfc82ed22b05228ebc Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 09:36:20 +0100 Subject: [PATCH 1377/3477] Update buildings.js --- modules/buildings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/buildings.js b/modules/buildings.js index e1ae9609b..39f05a54e 100644 --- a/modules/buildings.js +++ b/modules/buildings.js @@ -195,8 +195,8 @@ function buyBuildings() { safeBuyBuilding('Tribute'); } //Nurseries - if (game.buildings.Nursery.locked == 0 && !hidebuild && ((game.global.world >= getPageSetting('NoNurseriesUntil') || getPageSetting('NoNurseriesUntil') < 1) && (getPageSetting('MaxNursery') > game.buildings.Nursery.owned || getPageSetting('MaxNursery') == -1)) || (getPageSetting('PreSpireNurseries') > game.buildings.Nursery.owned && isActiveSpireAT() && game.global.world >= getPageSetting('IgnoreSpiresUntil'))) { - safeBuyBuilding('Nursery'); + if (game.buildings.Nursery.locked == 0 && (!hidebuild &&( game.global.world >= getPageSetting('NoNurseriesUntil') || getPageSetting('NoNurseriesUntil') < 1) && (getPageSetting('MaxNursery') > game.buildings.Nursery.owned || getPageSetting('MaxNursery') == -1)) || (getPageSetting('PreSpireNurseries') > game.buildings.Nursery.owned && isActiveSpireAT() && game.global.world >= getPageSetting('IgnoreSpiresUntil'))) { + safeBuyBuilding('Nursery'); } postBuy2(oldBuy); From 36ed2662707790ea7728d037515bfba304ec7007 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 11:53:26 +0100 Subject: [PATCH 1378/3477] Update equipment.js --- modules/equipment.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 492f4e7a7..555d0e263 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -342,10 +342,10 @@ function autoLevelEquipment() { } var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { - if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; - if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; + if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") postBuy(); return; + if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") postBuy(); return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") postBuy(); return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") postBuy(); return; if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); game.global.buyAmt = getPageSetting('gearamounttobuy'); From 2ce121085f08f43b076c657a41f4d2f9de753acb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 15:54:59 +0100 Subject: [PATCH 1379/3477] Update equipment.js --- modules/equipment.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 555d0e263..1c9228ef4 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -306,11 +306,11 @@ function autoLevelEquipment() { ) ) { var upgrade = equipmentList[equipName].Upgrade; - if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; + /*if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; - if (upgrade != "Gymystic") + */if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); else debug('Upgrading ' + upgrade + " # " + game.upgrades[upgrade].allowed, "equips", '*upload'); From b698b0efdb74153b02f17e4907b6377e7847eab9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 16:08:07 +0100 Subject: [PATCH 1380/3477] Update equipment.js --- modules/equipment.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 1c9228ef4..e94a1f4c3 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -322,9 +322,6 @@ function autoLevelEquipment() { } } } - - preBuy(); - game.global.buyAmt = 1 var BuyWeaponLevels = ((getPageSetting('BuyWeaponsNew') == 1) || (getPageSetting('BuyWeaponsNew') == 3)); var BuyArmorLevels = ((getPageSetting('BuyArmorNew') == 1) || (getPageSetting('BuyArmorNew') == 3)); for (var stat in Best) { @@ -348,6 +345,7 @@ function autoLevelEquipment() { if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") postBuy(); return; if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); + preBuy(); game.global.buyAmt = getPageSetting('gearamounttobuy'); buyEquipment(eqName, null, true); } @@ -355,6 +353,7 @@ function autoLevelEquipment() { if (BuyArmorLevels && (DaThing.Stat == 'health' || DaThing.Stat == 'block') && (!enoughHealthE || maxmap || spirecheck)) { if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); + preBuy(); game.global.buyAmt = getPageSetting('gearamounttobuy'); buyEquipment(eqName, null, true); } @@ -362,6 +361,7 @@ function autoLevelEquipment() { var aalvl2 = MODULES["equipment"].alwaysLvl2; if (BuyArmorLevels && (DaThing.Stat == 'health') && aalvl2 && game.equipment[eqName].level < 2) { if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { + preBuy(); game.global.buyAmt = 1 debug('Leveling equipment ' + eqName + " (AlwaysLvl2)", "equips", '*upload3'); buyEquipment(eqName, null, true); From d08787dcf7d86e4b5fbc3d3c329c9424d957b27b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 16:29:00 +0100 Subject: [PATCH 1381/3477] Update equipment.js --- modules/equipment.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index e94a1f4c3..186cac088 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -339,10 +339,10 @@ function autoLevelEquipment() { } var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { - if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") postBuy(); return; - if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") postBuy(); return; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") postBuy(); return; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") postBuy(); return; + if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; + if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); preBuy(); From 1f8dece6a4f4e9674880c233640f4194f4767bba Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 16:41:27 +0100 Subject: [PATCH 1382/3477] Update equipment.js --- modules/equipment.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 186cac088..eb4c69ded 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -338,11 +338,12 @@ function autoLevelEquipment() { $eqName.style.border = '2px solid red'; } var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; - if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { - if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; - if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; + var ultwind = (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"); + var dultwind = (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"); + var hardcorewind = (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily"); + var dhardcorewind = (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily"); + var notWindstack = !ultwind && !dultwind && !hardcorewind && !dhardcorewind; + if (BuyWeaponLevels && DaThing.Stat == 'attack' && notWindstack && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); preBuy(); From 13e74694a9c8fcf187511b6183f18100e705dd07 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 16:53:24 +0100 Subject: [PATCH 1383/3477] Update equipment.js --- modules/equipment.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index eb4c69ded..3a1597769 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -306,11 +306,11 @@ function autoLevelEquipment() { ) ) { var upgrade = equipmentList[equipName].Upgrade; - /*if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; + if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; - */if (upgrade != "Gymystic") + if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); else debug('Upgrading ' + upgrade + " # " + game.upgrades[upgrade].allowed, "equips", '*upload'); @@ -337,13 +337,11 @@ function autoLevelEquipment() { $eqName.style.color = Best[stat].Wall ? 'orange' : 'red'; $eqName.style.border = '2px solid red'; } - var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; - var ultwind = (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"); - var dultwind = (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"); - var hardcorewind = (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily"); - var dhardcorewind = (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily"); - var notWindstack = !ultwind && !dultwind && !hardcorewind && !dhardcorewind; - if (BuyWeaponLevels && DaThing.Stat == 'attack' && notWindstack && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { + if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { + if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; + if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); preBuy(); From 6874dd8e1d640fe7e6d3081b3fb38884d174e333 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 16:57:03 +0100 Subject: [PATCH 1384/3477] Update equipment.js --- modules/equipment.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/equipment.js b/modules/equipment.js index 3a1597769..0828c8cd0 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -337,6 +337,7 @@ function autoLevelEquipment() { $eqName.style.color = Best[stat].Wall ? 'orange' : 'red'; $eqName.style.border = '2px solid red'; } + var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; From 84d28bf8d7d970bb3068de197d07550bfdc5c785 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 17:16:15 +0100 Subject: [PATCH 1385/3477] Update equipment.js --- modules/equipment.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 0828c8cd0..1edd47ac9 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -306,11 +306,11 @@ function autoLevelEquipment() { ) ) { var upgrade = equipmentList[equipName].Upgrade; - if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; + /*if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; - if (upgrade != "Gymystic") + */if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); else debug('Upgrading ' + upgrade + " # " + game.upgrades[upgrade].allowed, "equips", '*upload'); From 5b700cfcb143f4bd959a02e2da6fe9d7b65fa894 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 17:19:11 +0100 Subject: [PATCH 1386/3477] Update stance.js --- modules/stance.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index dd45f1950..abdd98c3f 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -278,6 +278,7 @@ function autoStance3() { if (getPageSetting('AutoStance') == 0) return; if (!game.upgrades.Formations.done) return; if (game.global.world <= 70) return; + if (game.global.spireActive) return; var windstackzone = 0; var stancetouse = 4; @@ -308,7 +309,7 @@ function autoStance3() { return; } } - else if (game.global.world >= windstackzone || (game.global.world >= windstackzone && getPageSetting('windhealthy') == true && ishealthy && game.global.challengeActive != "Daily") || (game.global.world >= windstackzone && getPageSetting('dwindhealthy') == true && ishealthy && game.global.challengeActive == "Daily")) { + else if (!game.global.spireActive && game.global.world >= windstackzone || (game.global.world >= windstackzone && getPageSetting('windhealthy') == true && ishealthy && game.global.challengeActive != "Daily") || (game.global.world >= windstackzone && getPageSetting('dwindhealthy') == true && ishealthy && game.global.challengeActive == "Daily")) { setFormation(stancetouse); return; } From aaa5cc0a21e304cfc61110ee470eb926e2c96b08 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 21:49:41 +0100 Subject: [PATCH 1387/3477] Revert "Update stance.js" This reverts commit 5b700cfcb143f4bd959a02e2da6fe9d7b65fa894. --- modules/stance.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index abdd98c3f..dd45f1950 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -278,7 +278,6 @@ function autoStance3() { if (getPageSetting('AutoStance') == 0) return; if (!game.upgrades.Formations.done) return; if (game.global.world <= 70) return; - if (game.global.spireActive) return; var windstackzone = 0; var stancetouse = 4; @@ -309,7 +308,7 @@ function autoStance3() { return; } } - else if (!game.global.spireActive && game.global.world >= windstackzone || (game.global.world >= windstackzone && getPageSetting('windhealthy') == true && ishealthy && game.global.challengeActive != "Daily") || (game.global.world >= windstackzone && getPageSetting('dwindhealthy') == true && ishealthy && game.global.challengeActive == "Daily")) { + else if (game.global.world >= windstackzone || (game.global.world >= windstackzone && getPageSetting('windhealthy') == true && ishealthy && game.global.challengeActive != "Daily") || (game.global.world >= windstackzone && getPageSetting('dwindhealthy') == true && ishealthy && game.global.challengeActive == "Daily")) { setFormation(stancetouse); return; } From 063f7aae7e114b5209b5c494b92b11c38535e0e5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 21:49:42 +0100 Subject: [PATCH 1388/3477] Revert "Update equipment.js" This reverts commit 84d28bf8d7d970bb3068de197d07550bfdc5c785. --- modules/equipment.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 1edd47ac9..0828c8cd0 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -306,11 +306,11 @@ function autoLevelEquipment() { ) ) { var upgrade = equipmentList[equipName].Upgrade; - /*if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; + if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; - */if (upgrade != "Gymystic") + if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); else debug('Upgrading ' + upgrade + " # " + game.upgrades[upgrade].allowed, "equips", '*upload'); From f60410d82c11fe5250cecfd3d588e73913cda564 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 21:49:44 +0100 Subject: [PATCH 1389/3477] Revert "Update equipment.js" This reverts commit 6874dd8e1d640fe7e6d3081b3fb38884d174e333. --- modules/equipment.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/equipment.js b/modules/equipment.js index 0828c8cd0..3a1597769 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -337,7 +337,6 @@ function autoLevelEquipment() { $eqName.style.color = Best[stat].Wall ? 'orange' : 'red'; $eqName.style.border = '2px solid red'; } - var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; From 91f868d56235cff8ac37fffd7ef2a13f3a28d3a3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 21:49:45 +0100 Subject: [PATCH 1390/3477] Revert "Update equipment.js" This reverts commit 13e74694a9c8fcf187511b6183f18100e705dd07. --- modules/equipment.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 3a1597769..eb4c69ded 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -306,11 +306,11 @@ function autoLevelEquipment() { ) ) { var upgrade = equipmentList[equipName].Upgrade; - if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; + /*if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; - if (upgrade != "Gymystic") + */if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); else debug('Upgrading ' + upgrade + " # " + game.upgrades[upgrade].allowed, "equips", '*upload'); @@ -337,11 +337,13 @@ function autoLevelEquipment() { $eqName.style.color = Best[stat].Wall ? 'orange' : 'red'; $eqName.style.border = '2px solid red'; } - if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { - if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; - if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; + var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; + var ultwind = (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"); + var dultwind = (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"); + var hardcorewind = (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily"); + var dhardcorewind = (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily"); + var notWindstack = !ultwind && !dultwind && !hardcorewind && !dhardcorewind; + if (BuyWeaponLevels && DaThing.Stat == 'attack' && notWindstack && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); preBuy(); From 21e666212b3e89100718f467b3a66d1eae15c58f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 21:49:47 +0100 Subject: [PATCH 1391/3477] Revert "Update equipment.js" This reverts commit 1f8dece6a4f4e9674880c233640f4194f4767bba. --- modules/equipment.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index eb4c69ded..186cac088 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -338,12 +338,11 @@ function autoLevelEquipment() { $eqName.style.border = '2px solid red'; } var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; - var ultwind = (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily"); - var dultwind = (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily"); - var hardcorewind = (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily"); - var dhardcorewind = (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily"); - var notWindstack = !ultwind && !dultwind && !hardcorewind && !dhardcorewind; - if (BuyWeaponLevels && DaThing.Stat == 'attack' && notWindstack && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { + if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { + if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; + if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); preBuy(); From 9021df538e47295d1fe280ddfb0ab727cc8e55c7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 21:49:49 +0100 Subject: [PATCH 1392/3477] Revert "Update equipment.js" This reverts commit d08787dcf7d86e4b5fbc3d3c329c9424d957b27b. --- modules/equipment.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 186cac088..e94a1f4c3 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -339,10 +339,10 @@ function autoLevelEquipment() { } var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { - if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; - if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; + if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") postBuy(); return; + if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") postBuy(); return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") postBuy(); return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") postBuy(); return; if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); preBuy(); From ea71d33234373b3efc5b97fb30e5e18fe76921b7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 21:49:50 +0100 Subject: [PATCH 1393/3477] Revert "Update equipment.js" This reverts commit b698b0efdb74153b02f17e4907b6377e7847eab9. --- modules/equipment.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index e94a1f4c3..1c9228ef4 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -322,6 +322,9 @@ function autoLevelEquipment() { } } } + + preBuy(); + game.global.buyAmt = 1 var BuyWeaponLevels = ((getPageSetting('BuyWeaponsNew') == 1) || (getPageSetting('BuyWeaponsNew') == 3)); var BuyArmorLevels = ((getPageSetting('BuyArmorNew') == 1) || (getPageSetting('BuyArmorNew') == 3)); for (var stat in Best) { @@ -345,7 +348,6 @@ function autoLevelEquipment() { if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") postBuy(); return; if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); - preBuy(); game.global.buyAmt = getPageSetting('gearamounttobuy'); buyEquipment(eqName, null, true); } @@ -353,7 +355,6 @@ function autoLevelEquipment() { if (BuyArmorLevels && (DaThing.Stat == 'health' || DaThing.Stat == 'block') && (!enoughHealthE || maxmap || spirecheck)) { if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); - preBuy(); game.global.buyAmt = getPageSetting('gearamounttobuy'); buyEquipment(eqName, null, true); } @@ -361,7 +362,6 @@ function autoLevelEquipment() { var aalvl2 = MODULES["equipment"].alwaysLvl2; if (BuyArmorLevels && (DaThing.Stat == 'health') && aalvl2 && game.equipment[eqName].level < 2) { if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { - preBuy(); game.global.buyAmt = 1 debug('Leveling equipment ' + eqName + " (AlwaysLvl2)", "equips", '*upload3'); buyEquipment(eqName, null, true); From 6b6c7b187c06d5e5216296d5b414694e537820dd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 21:49:52 +0100 Subject: [PATCH 1394/3477] Revert "Update equipment.js" This reverts commit 2ce121085f08f43b076c657a41f4d2f9de753acb. --- modules/equipment.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 1c9228ef4..555d0e263 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -306,11 +306,11 @@ function autoLevelEquipment() { ) ) { var upgrade = equipmentList[equipName].Upgrade; - /*if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; + if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; - */if (upgrade != "Gymystic") + if (upgrade != "Gymystic") debug('Upgrading ' + upgrade + " - Prestige " + game.equipment[equipName].prestige, "equips", '*upload'); else debug('Upgrading ' + upgrade + " # " + game.upgrades[upgrade].allowed, "equips", '*upload'); From 7817dca5eaaa6045952df9aaec3be09b9e8764db Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 21:49:57 +0100 Subject: [PATCH 1395/3477] Revert "Update equipment.js" This reverts commit 36ed2662707790ea7728d037515bfba304ec7007. --- modules/equipment.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/equipment.js b/modules/equipment.js index 555d0e263..492f4e7a7 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -342,10 +342,10 @@ function autoLevelEquipment() { } var maxmap = getPageSetting('MaxMapBonusAfterZone') && doMaxMapBonus; if (BuyWeaponLevels && DaThing.Stat == 'attack' && (!enoughDamageE || enoughHealthE || maxmap || spirecheck)) { - if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") postBuy(); return; - if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") postBuy(); return; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") postBuy(); return; - if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") postBuy(); return; + if (getPageSetting('ultwind') >= 1 && game.global.world >= getPageSetting('ultwind') && HDratioy() < getPageSetting('ultwindcut') && game.global.challengeActive != "Daily") return; + if (getPageSetting('dultwind') >= 1 && game.global.world >= getPageSetting('dultwind') && HDratioy() < getPageSetting('dultwindcut') && game.global.challengeActive == "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('windcutoff') && getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') <= 0) && game.global.challengeActive != "Daily") return; + if (getEmpowerment() == "Wind" && HDratioy() <= getPageSetting('dwindcutoff') && getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('dhardcorewindmax') <= 0) && game.global.challengeActive == "Daily") return; if (DaThing.Equip && !Best[stat].Wall && canAffordBuilding(eqName, null, null, true)) { debug('Leveling equipment ' + eqName, "equips", '*upload3'); game.global.buyAmt = getPageSetting('gearamounttobuy'); From 6baf3aba2843b2765a8ec5cc7c7ea1facc79fcf1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 22:01:08 +0100 Subject: [PATCH 1396/3477] Update equipment.js --- modules/equipment.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/equipment.js b/modules/equipment.js index 492f4e7a7..134a9f6f5 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -324,7 +324,6 @@ function autoLevelEquipment() { } preBuy(); - game.global.buyAmt = 1 var BuyWeaponLevels = ((getPageSetting('BuyWeaponsNew') == 1) || (getPageSetting('BuyWeaponsNew') == 3)); var BuyArmorLevels = ((getPageSetting('BuyArmorNew') == 1) || (getPageSetting('BuyArmorNew') == 3)); for (var stat in Best) { From 428dff530615deaa57df0f11cf993793d6c87a51 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 22:01:51 +0100 Subject: [PATCH 1397/3477] Update stance.js --- modules/stance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index dd45f1950..1e01165d0 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -308,7 +308,7 @@ function autoStance3() { return; } } - else if (game.global.world >= windstackzone || (game.global.world >= windstackzone && getPageSetting('windhealthy') == true && ishealthy && game.global.challengeActive != "Daily") || (game.global.world >= windstackzone && getPageSetting('dwindhealthy') == true && ishealthy && game.global.challengeActive == "Daily")) { + else if (!game.global.spireActive && game.global.world >= windstackzone || (game.global.world >= windstackzone && getPageSetting('windhealthy') == true && ishealthy && game.global.challengeActive != "Daily") || (game.global.world >= windstackzone && getPageSetting('dwindhealthy') == true && ishealthy && game.global.challengeActive == "Daily")) { setFormation(stancetouse); return; } From f77973e38b3391b338485b25c562520596c86cee Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 13 Sep 2018 23:41:44 +0100 Subject: [PATCH 1398/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index aa150fded..8bd1985a5 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -45,7 +45,7 @@ function printChangelog() { function printLowerLevelPlayerNotice() { tooltip('confirm', null, 'update', 'The fact that it works at all is misleading new players into thinking its perfect. Its not. If your highest zone is under z60, you have not unlocked the stats required, and have not experienced the full meta with its various paradigm shifts. If you are just starting, my advice is to play along naturally and use AutoTrimps as a tool, not a crutch. Play with the settings as if it was the game, Dont expect to go unattended, if AT chooses wrong, and make the RIGHT choice yourself. Additionally, its not coded to run one-time challenges for you, only repeatable ones for helium. During this part of the game, content is king - automating literally removes the fun of the game. If you find that many flaws in the automation exist for you, level up. Keep in mind the challenge of maintaining the code is that it has to work for everyone. AT cant see the future and doesnt run simulations, it exists only in the present moment. Post any suggestions on how it can be better, or volunteer to adapt the code, or produce some sort of low-level player guide with what youve learned.
    Happy scripting! -genBTC','cancelTooltip()', 'LowLevelPlayer Notes:
    PSA: AutoTrimps was not designed for new/low-level players.', "I understand I am on my own and I Accept and Continue.", null, true); } -var runInterval=100,startupDelay=2500;setTimeout(delayStart,startupDelay);function delayStart(){initializeAutoTrimps(),printChangelog(),setTimeout(delayStartAgain,startupDelay)}function delayStartAgain(){8>game.achievements.zones.finished&&printLowerLevelPlayerNotice(),game.global.addonUser=!0,game.global.autotrimps=!0,MODULESdefault=JSON.parse(JSON.stringify(MODULES)),setInterval(mainLoop,runInterval),setInterval(guiLoop,10*runInterval),autoTrimpSettings.PrestigeBackup!==void 0&&''!=autoTrimpSettings.PrestigeBackup.selected&&(document.getElementById('Prestige').value=autoTrimpSettings.PrestigeBackup.selected),''===document.getElementById('Prestige').value&&(document.getElementById('Prestige').value='Off')} +var runInterval=100,startupDelay=4000;setTimeout(delayStart,startupDelay);function delayStart(){initializeAutoTrimps(),printChangelog(),setTimeout(delayStartAgain,startupDelay)}function delayStartAgain(){8>game.achievements.zones.finished&&printLowerLevelPlayerNotice(),game.global.addonUser=!0,game.global.autotrimps=!0,MODULESdefault=JSON.parse(JSON.stringify(MODULES)),setInterval(mainLoop,runInterval),setInterval(guiLoop,10*runInterval),autoTrimpSettings.PrestigeBackup!==void 0&&''!=autoTrimpSettings.PrestigeBackup.selected&&(document.getElementById('Prestige').value=autoTrimpSettings.PrestigeBackup.selected),''===document.getElementById('Prestige').value&&(document.getElementById('Prestige').value='Off')} var ATrunning=!0,ATmessageLogTabVisible=!0,enableDebug=!0,autoTrimpSettings={},MODULES={},MODULESdefault={},ATMODULES={},ATmoduleList=[],bestBuilding,scienceNeeded,breedFire=!1,shouldFarm=!1,enoughDamage=!0,enoughHealth=!0,baseDamage=0,baseBlock=0,baseHealth=0,preBuyAmt,preBuyFiring,preBuyTooltip,preBuymaxSplit,currentworld=0,lastrunworld=0,aWholeNewWorld=!1,needGymystic=!0,heirloomFlag=!1,heirloomCache=game.global.heirloomsExtra.length,magmiteSpenderChanged=!1,daily3=!1; function mainLoop() { From dde10338ea4082b570f0f3943e462777b8fedfb8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 11:15:39 +0100 Subject: [PATCH 1399/3477] Update SettingsGUI.js --- SettingsGUI.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 8609fc692..24f0b72a9 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -163,6 +163,11 @@ function initializeAllSettings() { createSetting('carmormagic', ['C2 Armor Magic Off', 'CAM: Above 80%', 'CAM: H:D', 'CAM: Always'], 'Will buy Armor to try and prevent death on Nom/Tox Challenges under the 3 conditions.
    Above 80%: Will activate at and above 80% of your HZE and when your health is sufficiently low.
    H:D: Will activate at and above the H:D you have defined in maps.
    Always Will activate always.
    All options will activate at or below 25% of your health. ', 'multitoggle', 0, null, "C2"); createSetting('c2table', 'C2 Table', 'Display your C2s in a convenient table which is colour coded.
    Green = Not worth updating.
    Yellow = Consider updating.
    Red = Updating this C2 is worth doing.
    Blue = You have not yet done/unlockled this C2 challenge. ', 'infoclick', 'c2table', null, 'C2'); + //C2 Runner Line + document.getElementById('c2table').parentNode.insertAdjacentHTML('afterend','
    '); + createSetting('c2runnerstart', 'C2 Runner', 'Runs the \"normal\" C2s in sequence according to difficulty. See C2Table for list. Once zone you have defined has been reached, will portal into next. I will advise you not to touch the challenges (abandoning, doing a different one, etc) if you are running this, it could break it. Only runs challenges that need updating, will not run ones close-ish to your HZE. ', 'boolean', false, null, 'C2'); + createSetting('c2runnerportal', 'C2 Runner Portal', 'Automatically portal AFTER clearing this level in C2 Runner. (ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "C2"); + //Buildings @@ -538,6 +543,9 @@ function updateCustomButtons() { getPageSetting('dhardcorewind')>=1 ? turnOn("dhardcorewindmax"): turnOff("dhardcorewindmax"); getPageSetting('dultwind')>=1 ? turnOn("dultwindcut"): turnOff("dultwindcut"); + //C2 + getPageSetting('c2runnerstart') == true ? turnOn("c2runnerportal"): turnOff("c2runnerportal"); + //Praid harder getPageSetting('PraidHarder') ? turnOn('PraidFarmFragsZ') : turnOff('PraidFarmFragsZ'); getPageSetting('PraidHarder') ? turnOn('PraidBeforeFarmZ') : turnOff('PraidBeforeFarmZ'); From 474d5e7a16852c5e5fbcb427a751aafc57c81326 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 12:15:08 +0100 Subject: [PATCH 1400/3477] Update portal.js --- modules/portal.js | 94 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/modules/portal.js b/modules/portal.js index d1752232a..7d2846299 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -129,6 +129,100 @@ function dailyAutoPortal() { } } +function c2runner() { +var c2listp={None:{number:0},Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; + if (!game.global.portalActive) return; + if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0) { + if (game.global.world > getPageSetting('c2runnerportal')) { + + var what = game.global.challengeActive; + if (!game.global.runningChallengeSquared) + what = None; + //allwhat = every chhalenge? i dont know lol + if (c2listp[allwhat].percentzone > 85 && autoTrimpSettings.HeliumHourChallenge.selected != 'None'){doPortal(autoTrimpSettings.HeliumHourChallenge.selected);} + else if (c2listp[allwhat].percentzone > 85){doPortal();} + + if (c2listp[what].number < 1 && c2listp.Size.percentzone < 85) { + selectChallenge(Size); + pushData(); + activateClicked(); + activatePortal(); + lastHeliumZone = 0; zonePostpone = 0; + } + if (c2listp[what].number < 2 && c2listp.Slow.percentzone < 85) { + selectChallenge(Slow); + pushData(); + activateClicked(); + activatePortal(); + lastHeliumZone = 0; zonePostpone = 0; + } + if (c2listp[what].number < 3 && c2listp.Watch.percentzone < 85) { + selectChallenge(Watch); + pushData(); + activateClicked(); + activatePortal(); + lastHeliumZone = 0; zonePostpone = 0; + } + if (c2listp[what].number < 4 && c2listp.Discipline.percentzone < 85) { + selectChallenge(Discipline); + pushData(); + activateClicked(); + activatePortal(); + lastHeliumZone = 0; zonePostpone = 0; + } + if (c2listp[what].number < 5 && c2listp.Balance.percentzone < 85) { + selectChallenge(Balance); + pushData(); + activateClicked(); + activatePortal(); + lastHeliumZone = 0; zonePostpone = 0; + } + if (c2listp[what].number < 6 && c2listp.Meditate.percentzone < 85) { + selectChallenge(Meditate); + pushData(); + activateClicked(); + activatePortal(); + lastHeliumZone = 0; zonePostpone = 0; + } + if (c2listp[what].number < 7 && c2listp.Metal.percentzone < 85) { + selectChallenge(Metal); + pushData(); + activateClicked(); + activatePortal(); + lastHeliumZone = 0; zonePostpone = 0; + } + if (c2listp[what].number < 8 && c2listp.Lead.percentzone < 85) { + selectChallenge(Lead); + pushData(); + activateClicked(); + activatePortal(); + lastHeliumZone = 0; zonePostpone = 0; + } + if (c2listp[what].number < 9 && c2listp.Nom.percentzone < 85) { + selectChallenge(Nom); + pushData(); + activateClicked(); + activatePortal(); + lastHeliumZone = 0; zonePostpone = 0; + } + if (c2listp[what].number < 10 && c2listp.Electricity.percentzone < 85) { + selectChallenge(Electricity); + pushData(); + activateClicked(); + activatePortal(); + lastHeliumZone = 0; zonePostpone = 0; + } + if (c2listp[what].number < 11 && c2listp.Toxicty.percentzone < 85) { + selectChallenge(Toxicty); + pushData(); + activateClicked(); + activatePortal(); + lastHeliumZone = 0; zonePostpone = 0; + } + } + } +} + function doPortal(challenge) { if(!game.global.portalActive) return; if (getPageSetting('AutoMagmiteSpender2')==1) autoMagmiteSpender(); From 5324b78f4cf110e4538f63c01b90a9ca1c5fe612 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 18:14:09 +0100 Subject: [PATCH 1401/3477] Update portal.js --- modules/portal.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 7d2846299..a15267523 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -225,7 +225,6 @@ var c2listp={None:{number:0},Size:{number:1,percentzone:(100*(game.c2.Size/(game function doPortal(challenge) { if(!game.global.portalActive) return; - if (getPageSetting('AutoMagmiteSpender2')==1) autoMagmiteSpender(); if (getPageSetting('AutoHeirloomsNew')==0); else if (getPageSetting('AutoHeirloomsNew')==1) autoHeirlooms(); else if (getPageSetting('AutoHeirloomsNew')==2) autoHeirlooms2(); From 37f51be055bebc39e8c9c1bea4fb8e9be68521e5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 18:16:07 +0100 Subject: [PATCH 1402/3477] Update portal.js --- modules/portal.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/portal.js b/modules/portal.js index a15267523..2d11d47b7 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -225,6 +225,7 @@ var c2listp={None:{number:0},Size:{number:1,percentzone:(100*(game.c2.Size/(game function doPortal(challenge) { if(!game.global.portalActive) return; + if (getPageSetting('spendmagmite')==1) autoMagmiteSpender(); if (getPageSetting('AutoHeirloomsNew')==0); else if (getPageSetting('AutoHeirloomsNew')==1) autoHeirlooms(); else if (getPageSetting('AutoHeirloomsNew')==2) autoHeirlooms2(); From 4fa4a2a233ef5b06c7014dfa1c174c5e1f8690da Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 18:23:26 +0100 Subject: [PATCH 1403/3477] Update portal.js --- modules/portal.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 2d11d47b7..f9a77a4a5 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -130,8 +130,18 @@ function dailyAutoPortal() { } function c2runner() { + +var badPercents = []; + var c2listp={None:{number:0},Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; - if (!game.global.portalActive) return; + for (var what in c2listp) { + if (c2listp[what].percentzone < 50) { + badPercents.push(what); + } + } + console.log(badPercents) + + /*if (!game.global.portalActive) return; if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0) { if (game.global.world > getPageSetting('c2runnerportal')) { @@ -221,7 +231,7 @@ var c2listp={None:{number:0},Size:{number:1,percentzone:(100*(game.c2.Size/(game } } } -} +}*/ function doPortal(challenge) { if(!game.global.portalActive) return; From fd88f2d09be75431e6977b348ea449023433cadd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 18:31:47 +0100 Subject: [PATCH 1404/3477] Update portal.js --- modules/portal.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index f9a77a4a5..0148ec076 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -230,8 +230,8 @@ var c2listp={None:{number:0},Size:{number:1,percentzone:(100*(game.c2.Size/(game lastHeliumZone = 0; zonePostpone = 0; } } - } -}*/ + }*/ +} function doPortal(challenge) { if(!game.global.portalActive) return; From 07a37831f746ae647eb2c563e4e45bcfd7bcc9ce Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 18:33:59 +0100 Subject: [PATCH 1405/3477] Update portal.js --- modules/portal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 0148ec076..f2d3a3ec7 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -133,7 +133,7 @@ function c2runner() { var badPercents = []; -var c2listp={None:{number:0},Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; +var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; for (var what in c2listp) { if (c2listp[what].percentzone < 50) { badPercents.push(what); From a05d61617a21db904a1c4a4731888fd1f6e35462 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 18:46:30 +0100 Subject: [PATCH 1406/3477] Update portal.js --- modules/portal.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/portal.js b/modules/portal.js index f2d3a3ec7..2d231dfc9 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -140,6 +140,9 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL } } console.log(badPercents) + for (var i = 0; i < arr.length; i++) { + console.log(badPercents[i]); +} /*if (!game.global.portalActive) return; if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0) { From 0435785d5d6a98707c72c21adc8cc5387cdf6aa4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 18:48:47 +0100 Subject: [PATCH 1407/3477] Update portal.js --- modules/portal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 2d231dfc9..daeda40fb 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -140,7 +140,7 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL } } console.log(badPercents) - for (var i = 0; i < arr.length; i++) { + for (var i = 0; i < badPercents.length; i++) { console.log(badPercents[i]); } From 1fd912c467ef2a91a248f41820dc6d07f5c9e168 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 18:52:10 +0100 Subject: [PATCH 1408/3477] Update portal.js --- modules/portal.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index daeda40fb..0965f2cfc 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -139,7 +139,7 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL badPercents.push(what); } } - console.log(badPercents) + console.log(badPercents); for (var i = 0; i < badPercents.length; i++) { console.log(badPercents[i]); } @@ -151,7 +151,7 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL var what = game.global.challengeActive; if (!game.global.runningChallengeSquared) what = None; - //allwhat = every chhalenge? i dont know lol + //allwhat = every challenge? i dont know lol if (c2listp[allwhat].percentzone > 85 && autoTrimpSettings.HeliumHourChallenge.selected != 'None'){doPortal(autoTrimpSettings.HeliumHourChallenge.selected);} else if (c2listp[allwhat].percentzone > 85){doPortal();} From 80eee7fe09a1d8d80be6591b074eed620c5ba87b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 19:06:20 +0100 Subject: [PATCH 1409/3477] Update portal.js --- modules/portal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 0965f2cfc..3625acebb 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -135,7 +135,7 @@ var badPercents = []; var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; for (var what in c2listp) { - if (c2listp[what].percentzone < 50) { + if (c2listp[what].percentzone < 110) { badPercents.push(what); } } From 4442f3e43b4b48e21869a43e04ceab7497263f3b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 19:15:25 +0100 Subject: [PATCH 1410/3477] Update portal.js --- modules/portal.js | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 3625acebb..7a9af6c83 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -135,97 +135,89 @@ var badPercents = []; var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; for (var what in c2listp) { - if (c2listp[what].percentzone < 110) { + if (c2listp[what].percentzone < 99) { badPercents.push(what); } } - console.log(badPercents); - for (var i = 0; i < badPercents.length; i++) { - console.log(badPercents[i]); -} - /*if (!game.global.portalActive) return; + if (!game.global.portalActive) return; if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0) { if (game.global.world > getPageSetting('c2runnerportal')) { - var what = game.global.challengeActive; - if (!game.global.runningChallengeSquared) - what = None; - //allwhat = every challenge? i dont know lol - if (c2listp[allwhat].percentzone > 85 && autoTrimpSettings.HeliumHourChallenge.selected != 'None'){doPortal(autoTrimpSettings.HeliumHourChallenge.selected);} - else if (c2listp[allwhat].percentzone > 85){doPortal();} + if (badPercents == 'undefined' && autoTrimpSettings.HeliumHourChallenge.selected != 'None'){debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal(autoTrimpSettings.HeliumHourChallenge.selected);} + else if (badPercents > 85){debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal();} - if (c2listp[what].number < 1 && c2listp.Size.percentzone < 85) { + if (badPercents[what].number == 'undefined' && c2listp.Size.percentzone < 50) { selectChallenge(Size); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; } - if (c2listp[what].number < 2 && c2listp.Slow.percentzone < 85) { + if (badPercents[what].number < 2 && c2listp.Slow.percentzone < 99) { selectChallenge(Slow); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; } - if (c2listp[what].number < 3 && c2listp.Watch.percentzone < 85) { + if (badPercents[what].number < 3 && c2listp.Watch.percentzone < 85) { selectChallenge(Watch); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; } - if (c2listp[what].number < 4 && c2listp.Discipline.percentzone < 85) { + if (badPercents[what].number < 4 && c2listp.Discipline.percentzone < 85) { selectChallenge(Discipline); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; } - if (c2listp[what].number < 5 && c2listp.Balance.percentzone < 85) { + if (badPercents[what].number < 5 && c2listp.Balance.percentzone < 85) { selectChallenge(Balance); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; } - if (c2listp[what].number < 6 && c2listp.Meditate.percentzone < 85) { + if (badPercents[what].number < 6 && c2listp.Meditate.percentzone < 85) { selectChallenge(Meditate); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; } - if (c2listp[what].number < 7 && c2listp.Metal.percentzone < 85) { + if (badPercents[what].number < 7 && c2listp.Metal.percentzone < 85) { selectChallenge(Metal); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; } - if (c2listp[what].number < 8 && c2listp.Lead.percentzone < 85) { + if (badPercents[what].number < 8 && c2listp.Lead.percentzone < 85) { selectChallenge(Lead); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; } - if (c2listp[what].number < 9 && c2listp.Nom.percentzone < 85) { + if (badPercents[what].number < 9 && c2listp.Nom.percentzone < 85) { selectChallenge(Nom); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; } - if (c2listp[what].number < 10 && c2listp.Electricity.percentzone < 85) { + if (badPercents[what].number < 10 && c2listp.Electricity.percentzone < 85) { selectChallenge(Electricity); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; } - if (c2listp[what].number < 11 && c2listp.Toxicty.percentzone < 85) { + if (badPercents[what].number < 11 && c2listp.Toxicty.percentzone < 85) { selectChallenge(Toxicty); pushData(); activateClicked(); @@ -233,7 +225,7 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL lastHeliumZone = 0; zonePostpone = 0; } } - }*/ + } } function doPortal(challenge) { From e5be0f99daac565450fedccf6e1d6d1f12cb6b24 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 19:19:12 +0100 Subject: [PATCH 1411/3477] Update portal.js --- modules/portal.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 7a9af6c83..9ad54c46f 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -144,8 +144,8 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0) { if (game.global.world > getPageSetting('c2runnerportal')) { - if (badPercents == 'undefined' && autoTrimpSettings.HeliumHourChallenge.selected != 'None'){debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal(autoTrimpSettings.HeliumHourChallenge.selected);} - else if (badPercents > 85){debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal();} + if ((badPercents == 'undefined' || badPercents[what].number > 85) && autoTrimpSettings.HeliumHourChallenge.selected != 'None'){debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal(autoTrimpSettings.HeliumHourChallenge.selected);} + else if (badPercents == 'undefined' || badPercents[what].number > 85){debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal();} if (badPercents[what].number == 'undefined' && c2listp.Size.percentzone < 50) { selectChallenge(Size); From 34a44bc145c4dde91bbf81390d4bb2b971df8a62 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 19:31:38 +0100 Subject: [PATCH 1412/3477] Update portal.js --- modules/portal.js | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 9ad54c46f..2b38665ae 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -131,99 +131,106 @@ function dailyAutoPortal() { function c2runner() { -var badPercents = []; +//var badPercents = ["None"]; var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; - for (var what in c2listp) { + /*for (var what in c2listp) { if (c2listp[what].percentzone < 99) { badPercents.push(what); } - } - + }*/ if (!game.global.portalActive) return; if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0) { - if (game.global.world > getPageSetting('c2runnerportal')) { - - if ((badPercents == 'undefined' || badPercents[what].number > 85) && autoTrimpSettings.HeliumHourChallenge.selected != 'None'){debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal(autoTrimpSettings.HeliumHourChallenge.selected);} - else if (badPercents == 'undefined' || badPercents[what].number > 85){debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal();} - - if (badPercents[what].number == 'undefined' && c2listp.Size.percentzone < 50) { + if ((game.global.world > getPageSetting('c2runnerportal')) || !game.global.runningChallengeSquared) { + if (c2listp.Size.percentzone < 50) { selectChallenge(Size); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + return; } - if (badPercents[what].number < 2 && c2listp.Slow.percentzone < 99) { + if (c2listp.Slow.percentzone < 99) { selectChallenge(Slow); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + return; } - if (badPercents[what].number < 3 && c2listp.Watch.percentzone < 85) { + if (c2listp.Watch.percentzone < 85) { selectChallenge(Watch); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + return; } - if (badPercents[what].number < 4 && c2listp.Discipline.percentzone < 85) { + if (c2listp.Discipline.percentzone < 85) { selectChallenge(Discipline); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + return; } - if (badPercents[what].number < 5 && c2listp.Balance.percentzone < 85) { + if (c2listp.Balance.percentzone < 85) { selectChallenge(Balance); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + return; } - if (badPercents[what].number < 6 && c2listp.Meditate.percentzone < 85) { + if (c2listp.Meditate.percentzone < 85) { selectChallenge(Meditate); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + return; } - if (badPercents[what].number < 7 && c2listp.Metal.percentzone < 85) { + if (c2listp.Metal.percentzone < 85) { selectChallenge(Metal); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; } - if (badPercents[what].number < 8 && c2listp.Lead.percentzone < 85) { + if (c2listp.Lead.percentzone < 85) { selectChallenge(Lead); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + return; } - if (badPercents[what].number < 9 && c2listp.Nom.percentzone < 85) { + if (c2listp.Nom.percentzone < 85) { selectChallenge(Nom); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + return; } - if (badPercents[what].number < 10 && c2listp.Electricity.percentzone < 85) { + if (c2listp.Electricity.percentzone < 85) { selectChallenge(Electricity); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + return; } - if (badPercents[what].number < 11 && c2listp.Toxicty.percentzone < 85) { + if (c2listp.Toxicty.percentzone < 85) { selectChallenge(Toxicty); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + return; } + if (autoTrimpSettings.HeliumHourChallenge.selected != 'None'){debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal(autoTrimpSettings.HeliumHourChallenge.selected);} + else {debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal();} } } } From 6f1cf8ba2ae2fd1d1e9e0b966b2958031ce03505 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 19:38:15 +0100 Subject: [PATCH 1413/3477] Update portal.js --- modules/portal.js | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 2b38665ae..29e10526f 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -143,31 +143,38 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0) { if ((game.global.world > getPageSetting('c2runnerportal')) || !game.global.runningChallengeSquared) { if (c2listp.Size.percentzone < 50) { - selectChallenge(Size); + toggleChallengeSquared(); + selectChallenge("Size"); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + debug("C2 Runner: Running C2 Challenge Size"); return; } if (c2listp.Slow.percentzone < 99) { - selectChallenge(Slow); + toggleChallengeSquared(); + selectChallenge("Slow"); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + debug("C2 Runner: Running C2 Challenge Slow"); return; } if (c2listp.Watch.percentzone < 85) { - selectChallenge(Watch); + toggleChallengeSquared(); + selectChallenge("Watch"); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + debug("C2 Runner: Running C2 Challenge Watch"); return; } if (c2listp.Discipline.percentzone < 85) { - selectChallenge(Discipline); + toggleChallengeSquared(); + selectChallenge("Discipline"); pushData(); activateClicked(); activatePortal(); @@ -175,7 +182,8 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL return; } if (c2listp.Balance.percentzone < 85) { - selectChallenge(Balance); + toggleChallengeSquared(); + selectChallenge("Balance"); pushData(); activateClicked(); activatePortal(); @@ -183,7 +191,8 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL return; } if (c2listp.Meditate.percentzone < 85) { - selectChallenge(Meditate); + toggleChallengeSquared(); + selectChallenge("Meditate"); pushData(); activateClicked(); activatePortal(); @@ -191,14 +200,16 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL return; } if (c2listp.Metal.percentzone < 85) { - selectChallenge(Metal); + toggleChallengeSquared(); + selectChallenge("Metal"); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; } if (c2listp.Lead.percentzone < 85) { - selectChallenge(Lead); + toggleChallengeSquared(); + selectChallenge("Lead"); pushData(); activateClicked(); activatePortal(); @@ -206,7 +217,8 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL return; } if (c2listp.Nom.percentzone < 85) { - selectChallenge(Nom); + toggleChallengeSquared(); + selectChallenge("Nom"); pushData(); activateClicked(); activatePortal(); @@ -214,7 +226,8 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL return; } if (c2listp.Electricity.percentzone < 85) { - selectChallenge(Electricity); + toggleChallengeSquared(); + selectChallenge("Electricity"); pushData(); activateClicked(); activatePortal(); @@ -222,7 +235,8 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL return; } if (c2listp.Toxicty.percentzone < 85) { - selectChallenge(Toxicty); + toggleChallengeSquared(); + selectChallenge("Toxicty"); pushData(); activateClicked(); activatePortal(); From f266541b66d8defaca4408ffd6c1f5b74a790fad Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 14 Sep 2018 19:53:35 +0100 Subject: [PATCH 1414/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 24f0b72a9..a2605ab25 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -165,7 +165,7 @@ function initializeAllSettings() { //C2 Runner Line document.getElementById('c2table').parentNode.insertAdjacentHTML('afterend','
    '); - createSetting('c2runnerstart', 'C2 Runner', 'Runs the \"normal\" C2s in sequence according to difficulty. See C2Table for list. Once zone you have defined has been reached, will portal into next. I will advise you not to touch the challenges (abandoning, doing a different one, etc) if you are running this, it could break it. Only runs challenges that need updating, will not run ones close-ish to your HZE. ', 'boolean', false, null, 'C2'); + createSetting('c2runnerstart', 'C2 Runner', 'Runs the normal C2s in sequence according to difficulty. See C2Table for list. Once zone you have defined has been reached, will portal into next. I will advise you not to touch the challenges (abandoning, doing a different one, etc) if you are running this, it could break it. Only runs challenges that need updating, will not run ones close-ish to your HZE. ', 'boolean', false, null, 'C2'); createSetting('c2runnerportal', 'C2 Runner Portal', 'Automatically portal AFTER clearing this level in C2 Runner. (ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "C2"); From 34792f021456f734de2e0effdfe7bcedcab55723 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 17 Sep 2018 11:50:42 +0100 Subject: [PATCH 1415/3477] Update SettingsGUI.js --- SettingsGUI.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index a2605ab25..476c41ec2 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -261,7 +261,8 @@ function initializeAllSettings() { createSetting('TrimpleZ', 'Trimple Z', 'I don\'t really think doing this automatically is a good idea. You might want to farm for a bit before this, but I\'m not sure if it\'s meaningful at all to make a \'farm X minutes before trimple\' parameter to go along with it. Set it to the zone you want and it will run Trimple of Doom for Ancient Treasure AFTER farming and getting map stacks. If it is a negative number, this will be disabled after a successful run so you can set it differently next time.', 'valueNegative', 0, null, 'Maps'); //in reality this needs another setting to make it farm for a set number of minutes without spending anything. And I cba cause its a meh setting anyway. Advancing 2 zones more than doubles your income. Only useful for spire I, and IMO you may aswell actually play the game manually at SOME point. createSetting('AdvMapSpecialModifier', 'Map Special Modifier', 'EXPERIMENTAL. Attempt to select the BEST map special attacks mod. With this on, this will replace the normal behavior. If bugs, please report as this will become more default soon.', 'boolean', false, null, 'Maps'); createSetting('scryvoidmaps', 'VM Scryer', 'Only use if you have Scryhard II, for er, obvious reasons. Works without the scryer options. ', 'boolean', false, null, 'Maps'); - + createSetting('buywepsvoid', 'VM Buy Weps', 'Buys gear in Void maps regardless of your H:D ratio. Useful if you want to overkill as much as possible. ', 'boolean', false, null, 'Maps'); + //Spire @@ -494,7 +495,7 @@ function updateCustomButtons() { (!fuckbuilding) ? turnOn("MaxCollector") : turnOff("MaxCollector"); (!fuckbuilding) ? turnOn("MaxTribute") : turnOff("MaxTribute"); (!fuckbuilding) ? turnOn("MaxNursery") : turnOff("MaxNursery"); - (!fuckbuilding) ? turnOn("MaxNursery") : turnOff("MaxNursery"); + (!fuckbuilding) ? turnOn("NoNurseriesUntil") : turnOff("NoNurseriesUntil"); (!fuckbuilding) ? turnOn("WarpstationCap") : turnOff("WarpstationCap"); (!fuckbuilding) ? turnOn("WarpstationCoordBuy") : turnOff("WarpstationCoordBuy"); (!fuckbuilding) ? turnOn("FirstGigastation") : turnOff("FirstGigastation"); From 86bad6406c4dc32b3199cc1f40d5907f4c76807b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 17 Sep 2018 11:55:35 +0100 Subject: [PATCH 1416/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 8bd1985a5..ce8022163 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -102,6 +102,7 @@ function mainLoop() { if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); if (getPageSetting('spireshitbuy')==true && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) buyshitspire(); + if (getPageSetting('buywepsvoid')==true && ((getPageSetting('VoidMaps') == game.global.world && game.global.challengeActive != "Daily") || (getPageSetting('DailyVoidMod') == game.global.world && game.global.challengeActive == "Daily")) && game.global.mapsActive && getCurrentMapObject().location == "Void") buyWeps(); if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") orangewindstack(); if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive == "Daily") dorangewindstack(); if ((getPageSetting('darmormagic') > 0 && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) || (getPageSetting('carmormagic') > 0 && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom'))) armormagic(); From 962aed08815a48032a929c36efd63bfbae8be692 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 18 Sep 2018 21:46:25 +0100 Subject: [PATCH 1417/3477] Update other.js --- modules/other.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 9d6021ddf..a7fb4c9c5 100644 --- a/modules/other.js +++ b/modules/other.js @@ -646,8 +646,9 @@ function fightalways() { } function usedaily3(){!0!=getPageSetting('use3daily')||'Daily'!=game.global.challengeActive||daily3||(daily3=!0),!1==getPageSetting('use3daily')&&'Daily'!=game.global.challengeActive&&daily3&&(daily3=!1),!0==getPageSetting('use3daily')&&'Daily'!=game.global.challengeActive&&daily3&&(daily3=!1)} -function cutoffwind(){1>getPageSetting("windcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world!=getPageSetting("WindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=4,MODULES.maps.enoughDamageCutoff=4),1<=getPageSetting("windcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world=getPageSetting("WindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=getPageSetting("windcutoff"),MODULES.maps.enoughDamageCutoff=getPageSetting("windcutoff"))} -function dcutoffwind(){1>getPageSetting("dwindcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world!=getPageSetting("dWindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=4,MODULES.maps.enoughDamageCutoff=4),1<=getPageSetting("dwindcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world=getPageSetting("dWindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=getPageSetting("dwindcutoff"),MODULES.maps.enoughDamageCutoff=getPageSetting("dwindcutoff"))} +function cutoffwind(){!game.global.runningChallengeSquared&&1>getPageSetting("windcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world!=getPageSetting("WindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=4,MODULES.maps.enoughDamageCutoff=4),1<=getPageSetting("windcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world=getPageSetting("WindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=getPageSetting("windcutoff"),MODULES.maps.enoughDamageCutoff=getPageSetting("windcutoff"))} +function dcutoffwind(){!game.global.runningChallengeSquared&&1>getPageSetting("dwindcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world!=getPageSetting("dWindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=4,MODULES.maps.enoughDamageCutoff=4),1<=getPageSetting("dwindcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world=getPageSetting("dWindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=getPageSetting("dwindcutoff"),MODULES.maps.enoughDamageCutoff=getPageSetting("dwindcutoff"))} +function c2mapcut(){getPageSetting('mapc2hd') > 0 && game.global.runningChallengeSquared && game.global.challenge == "Mapology" && MODULES.maps.enoughDamageCutoff != getPageSetting('mapc2hd'))MODULES.maps.enoughDamageCutoff = getPageSetting('mapc2hd'); function buyshitspire(){!0==getPageSetting('spireshitbuy')&&game.global.spireActive&&game.global.world>=getPageSetting('IgnoreSpiresUntil')&&(buyWeps(),buyArms())} function orangewindstack(){'Wind'==getEmpowerment()&&HDratioy()<=getPageSetting('windcutoff')&&1<=getPageSetting('hardcorewind')&&game.global.world>=getPageSetting('hardcorewind')&&(9=getPageSetting('dhardcorewind')&&(9 Date: Tue, 18 Sep 2018 21:46:27 +0100 Subject: [PATCH 1418/3477] Update SettingsGUI.js --- SettingsGUI.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 476c41ec2..14ce72136 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -162,12 +162,13 @@ function initializeAllSettings() { createSetting('cfightforever', 'Tox/Nom Fight Always', 'Sends trimps to fight if they\'re not fighting in the Toxicity and Nom Challenges, regardless of BAF. Essenitally the same as the one in combat, can use either if you wish, except this will only activate in these challenges (duh) ', 'boolean', 'false', null, 'C2'); createSetting('carmormagic', ['C2 Armor Magic Off', 'CAM: Above 80%', 'CAM: H:D', 'CAM: Always'], 'Will buy Armor to try and prevent death on Nom/Tox Challenges under the 3 conditions.
    Above 80%: Will activate at and above 80% of your HZE and when your health is sufficiently low.
    H:D: Will activate at and above the H:D you have defined in maps.
    Always Will activate always.
    All options will activate at or below 25% of your health. ', 'multitoggle', 0, null, "C2"); createSetting('c2table', 'C2 Table', 'Display your C2s in a convenient table which is colour coded.
    Green = Not worth updating.
    Yellow = Consider updating.
    Red = Updating this C2 is worth doing.
    Blue = You have not yet done/unlockled this C2 challenge. ', 'infoclick', 'c2table', null, 'C2'); - + createSetting('mapc2hd', 'Mapology H:D', 'Set your H:D ratio for Mapology. Will not go into maps unless your H:D ratio is above this. -1 to use normal behaviour. ', 'value', '-1', null, 'C2'); + //C2 Runner Line - document.getElementById('c2table').parentNode.insertAdjacentHTML('afterend','
    '); + document.getElementById('mapc2hd').parentNode.insertAdjacentHTML('afterend','
    '); createSetting('c2runnerstart', 'C2 Runner', 'Runs the normal C2s in sequence according to difficulty. See C2Table for list. Once zone you have defined has been reached, will portal into next. I will advise you not to touch the challenges (abandoning, doing a different one, etc) if you are running this, it could break it. Only runs challenges that need updating, will not run ones close-ish to your HZE. ', 'boolean', false, null, 'C2'); createSetting('c2runnerportal', 'C2 Runner Portal', 'Automatically portal AFTER clearing this level in C2 Runner. (ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "C2"); - + //Buildings From 509dade851dde09d41fea4ff3c12289219128ec8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 18 Sep 2018 21:49:16 +0100 Subject: [PATCH 1419/3477] Update portal.js --- modules/portal.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/portal.js b/modules/portal.js index 29e10526f..7e99f3f60 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -283,6 +283,7 @@ function doPortal(challenge) { activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + MODULES.maps.enoughDamageCutoff = 4; } function finishChallengeSquared(){var a=getPageSetting("FinishC2");game.global.world>=a&&(abandonChallenge(),debug("Finished challenge2 because we are on zone "+game.global.world,"other","oil"))} From f2b837d2bc93d44769b40931aed213f731ed8372 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 18 Sep 2018 21:55:45 +0100 Subject: [PATCH 1420/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index ce8022163..d548b80b1 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -106,6 +106,7 @@ function mainLoop() { if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") orangewindstack(); if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive == "Daily") dorangewindstack(); if ((getPageSetting('darmormagic') > 0 && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) || (getPageSetting('carmormagic') > 0 && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom'))) armormagic(); + if (getPageSetting('mapc2hd') > 0 && game.global.runningChallengeSquared && game.global.challenge == "Mapology" && MODULES.maps.enoughDamageCutoff != getPageSetting('mapc2hd')) MODULES.maps.enoughDamageCutoff = getPageSetting('mapc2hd'); //Original From 7e91c7ddf618f83f36ac9e741de66e73003bf8ba Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 18 Sep 2018 21:57:35 +0100 Subject: [PATCH 1421/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index a7fb4c9c5..b3f3ded84 100644 --- a/modules/other.js +++ b/modules/other.js @@ -648,7 +648,7 @@ function fightalways() { function usedaily3(){!0!=getPageSetting('use3daily')||'Daily'!=game.global.challengeActive||daily3||(daily3=!0),!1==getPageSetting('use3daily')&&'Daily'!=game.global.challengeActive&&daily3&&(daily3=!1),!0==getPageSetting('use3daily')&&'Daily'!=game.global.challengeActive&&daily3&&(daily3=!1)} function cutoffwind(){!game.global.runningChallengeSquared&&1>getPageSetting("windcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world!=getPageSetting("WindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=4,MODULES.maps.enoughDamageCutoff=4),1<=getPageSetting("windcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world=getPageSetting("WindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=getPageSetting("windcutoff"),MODULES.maps.enoughDamageCutoff=getPageSetting("windcutoff"))} function dcutoffwind(){!game.global.runningChallengeSquared&&1>getPageSetting("dwindcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world!=getPageSetting("dWindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=4,MODULES.maps.enoughDamageCutoff=4),1<=getPageSetting("dwindcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world=getPageSetting("dWindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=getPageSetting("dwindcutoff"),MODULES.maps.enoughDamageCutoff=getPageSetting("dwindcutoff"))} -function c2mapcut(){getPageSetting('mapc2hd') > 0 && game.global.runningChallengeSquared && game.global.challenge == "Mapology" && MODULES.maps.enoughDamageCutoff != getPageSetting('mapc2hd'))MODULES.maps.enoughDamageCutoff = getPageSetting('mapc2hd'); +//function c2mapcut(){getPageSetting('mapc2hd') > 0 && game.global.runningChallengeSquared && game.global.challenge == "Mapology" && MODULES.maps.enoughDamageCutoff != getPageSetting('mapc2hd'))MODULES.maps.enoughDamageCutoff = getPageSetting('mapc2hd'); function buyshitspire(){!0==getPageSetting('spireshitbuy')&&game.global.spireActive&&game.global.world>=getPageSetting('IgnoreSpiresUntil')&&(buyWeps(),buyArms())} function orangewindstack(){'Wind'==getEmpowerment()&&HDratioy()<=getPageSetting('windcutoff')&&1<=getPageSetting('hardcorewind')&&game.global.world>=getPageSetting('hardcorewind')&&(9=getPageSetting('dhardcorewind')&&(9 Date: Tue, 18 Sep 2018 22:00:09 +0100 Subject: [PATCH 1422/3477] Update SettingsGUI.js --- SettingsGUI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 14ce72136..6500ede4c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -161,11 +161,11 @@ function initializeAllSettings() { createSetting('buynojobsc', 'No F/L/M in C2', 'Buys No Farmers, Lumberjacks or Miners in the C2 challenges Watch and Trapper. ', 'boolean', 'false', null, "C2"); createSetting('cfightforever', 'Tox/Nom Fight Always', 'Sends trimps to fight if they\'re not fighting in the Toxicity and Nom Challenges, regardless of BAF. Essenitally the same as the one in combat, can use either if you wish, except this will only activate in these challenges (duh) ', 'boolean', 'false', null, 'C2'); createSetting('carmormagic', ['C2 Armor Magic Off', 'CAM: Above 80%', 'CAM: H:D', 'CAM: Always'], 'Will buy Armor to try and prevent death on Nom/Tox Challenges under the 3 conditions.
    Above 80%: Will activate at and above 80% of your HZE and when your health is sufficiently low.
    H:D: Will activate at and above the H:D you have defined in maps.
    Always Will activate always.
    All options will activate at or below 25% of your health. ', 'multitoggle', 0, null, "C2"); - createSetting('c2table', 'C2 Table', 'Display your C2s in a convenient table which is colour coded.
    Green = Not worth updating.
    Yellow = Consider updating.
    Red = Updating this C2 is worth doing.
    Blue = You have not yet done/unlockled this C2 challenge. ', 'infoclick', 'c2table', null, 'C2'); createSetting('mapc2hd', 'Mapology H:D', 'Set your H:D ratio for Mapology. Will not go into maps unless your H:D ratio is above this. -1 to use normal behaviour. ', 'value', '-1', null, 'C2'); - + createSetting('c2table', 'C2 Table', 'Display your C2s in a convenient table which is colour coded.
    Green = Not worth updating.
    Yellow = Consider updating.
    Red = Updating this C2 is worth doing.
    Blue = You have not yet done/unlockled this C2 challenge. ', 'infoclick', 'c2table', null, 'C2'); + //C2 Runner Line - document.getElementById('mapc2hd').parentNode.insertAdjacentHTML('afterend','
    '); + document.getElementById('c2table').parentNode.insertAdjacentHTML('afterend','
    '); createSetting('c2runnerstart', 'C2 Runner', 'Runs the normal C2s in sequence according to difficulty. See C2Table for list. Once zone you have defined has been reached, will portal into next. I will advise you not to touch the challenges (abandoning, doing a different one, etc) if you are running this, it could break it. Only runs challenges that need updating, will not run ones close-ish to your HZE. ', 'boolean', false, null, 'C2'); createSetting('c2runnerportal', 'C2 Runner Portal', 'Automatically portal AFTER clearing this level in C2 Runner. (ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "C2"); From 630cb27f05b140fc134c24211bb7ec77b0116ad6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 19 Sep 2018 15:11:00 +0100 Subject: [PATCH 1423/3477] Update scryer.js --- modules/scryer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/scryer.js b/modules/scryer.js index a0ff2bbeb..f4314414c 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -18,7 +18,7 @@ var never_scry = game.global.preMapsActive || game.global.gridArray.length === 0 never_scry = never_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0); never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); never_scry = never_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); - never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || game.global.world < getPageSetting('ScryUseinPoison'))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || game.global.world < getPageSetting('ScryUseinWind'))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || game.global.world < getPageSetting('ScryUseinIce')))); + never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || (getPageSetting('ScryUseinPoison') > 0 && game.global.world >= getPageSetting('ScryUseinPoison')))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || (getPageSetting('ScryUseinWind') > 0 && game.global.world >= getPageSetting('ScryUseinWind')))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || (getPageSetting('ScryUseinIce') > 0 && game.global.world >= getPageSetting('ScryUseinIce'))))); never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && getPageSetting('screwessence') == true && countRemainingEssenceDrops() < 1); //check Corrupted Never @@ -42,7 +42,7 @@ var never_scry = game.global.preMapsActive || game.global.gridArray.length === 0 var use_scryer = use_scryer || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1); use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 1) || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); - use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && getPageSetting('ScryUseinPoison') > 0 && game.global.world < getPageSetting('ScryUseinPoison')) || (getEmpowerment() == "Wind" && getPageSetting('ScryUseinPoison') > 0 && game.global.world < getPageSetting('ScryUseinWind')) || (getEmpowerment() == "Ice" && getPageSetting('ScryUseinPoison') > 0 && game.global.world < getPageSetting('ScryUseinIce')))); + use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && getPageSetting('ScryUseinPoison') > 0 && game.global.world < getPageSetting('ScryUseinPoison')) || (getEmpowerment() == "Wind" && getPageSetting('ScryUseinWind') > 0 && game.global.world < getPageSetting('ScryUseinWind')) || (getEmpowerment() == "Ice" && getPageSetting('ScryUseinIce') > 0 && game.global.world < getPageSetting('ScryUseinIce')))); //check Corrupted Force if ((iscorrupt && getPageSetting('ScryerSkipCorrupteds2') == 1 && getPageSetting('UseScryerStance') == true) || (use_scryer)) { From 1903ce54ac37c1baec5ecab1883be71ed91403a5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 19 Sep 2018 21:10:52 +0100 Subject: [PATCH 1424/3477] Update other.js --- modules/other.js | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/modules/other.js b/modules/other.js index b3f3ded84..936593033 100644 --- a/modules/other.js +++ b/modules/other.js @@ -462,35 +462,24 @@ if (game.portal.Anticipation.level >= 1) { } } -function precurrStep(){return game.global.GeneticistassistSteps.indexOf(game.global.GeneticistassistSetting);} - +var spirebreeding = false; function ATspirebreed() { - var switchup; - var activespirebreed = false; - if (getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) { - var currStep = precurrStep(); - activespirebreed = true; - if (currStep == 1) { - toggleGeneticistassist(); - toggleGeneticistassist(); - switchup = 1; - } - if (currStep == 2) { - toggleGeneticistassist(); - switchup = 2; - } + if(!spirebreeding) + var prespiretimer = game.global.GeneticistassistSetting; + if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) { + spirebreeding = true; + let spiretimer = getPageSetting('SpireBreedTimer'); + if (game.global.GeneticistassistSetting != spiretimer) + game.global.GeneticistassistSetting = spiretimer; + + } + else { + spirebreeding = false; + game.global.GeneticistassistSetting = prespiretimer; + toggleGeneticistassist(); + toggleGeneticistassist(); + toggleGeneticistassist(); } - if (activespirebreed && !game.global.spireActive) { - - if (switchup == 1) { - toggleGeneticistassist(); - } - if (switchup == 2) { - toggleGeneticistassist(); - toggleGeneticistassist(); - } - activespirebreed = false; - } } function helptrimpsnotdie(){game.global.fighting||game.global.preMapsActive||buyArms()} From 92d454092e9c31515f7f32da9f192d98a2e773a4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 19 Sep 2018 21:12:32 +0100 Subject: [PATCH 1425/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 6500ede4c..d5c6ce505 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -273,7 +273,7 @@ function initializeAllSettings() { createSetting('MinutestoFarmBeforeSpire', 'Farm Before Spire', 'Farm level 200/199(or BW) maps for X minutes before continuing onto attempting Spire.
    NOTE: Set 0 to disable entirely (default).
    Setting to -1/Infinite does not work here, set a very high number instead.', 'value', '0', null, 'Spire'); createSetting('IgnoreSpiresUntil', 'Ignore Spires Until', 'Spire specific settings like end-at-cell are ignored until at least this zone is reached (0 to disable).
    Does not work with Run Bionic Before Spire.', 'value', '200', null, 'Spire'); createSetting('ExitSpireCell', 'Exit Spire After Cell', 'Optional/Rare. Exits the Spire early, after completing cell X. example: 40 for Row 4. (use 0 or -1 to disable)', 'value', '-1', null, 'Spire'); - createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Uses Vanilla GA. When spire is active, will automatically change your GA to your 3RD OPTION! Please use the 1st or 2nd GA option for normal behaviour if you intend to use this function properly. ', 'boolean', false, null, 'Spire'); + createSetting('SpireBreedTimer', 'Spire Breed Timer', 'Set a time for your GA in spire. Recommend not toching GA during this time. ', 'value', -1, null, 'Spire'); createSetting('PreSpireNurseries', 'Nurseries pre-Spire', 'Set the maximum number of Nurseries to build for Spires. Overrides No Nurseries Until z and Max Nurseries so you can keep them seperate! Will build nurseries before z200 for Spire 1, but only on the zone of Spires 2+ to avoid unnecessary burning. Disable with -1.', 'value', -1, null, 'Spire'); createSetting('spireshitbuy', 'Buy Gear in Spire', 'Will buy Weapons and Armor in Spire regardless of your H:D ratio. Respects your max gear level and ignore spires setting. ', 'boolean', false, null, 'Spire'); From 10d24867abbec2d3c761783ae0d4fe549f116ce8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 19 Sep 2018 21:14:33 +0100 Subject: [PATCH 1426/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index d548b80b1..9f947c0ee 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -1,4 +1,4 @@ -var ATversion='2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0',atscript=document.getElementById('AutoTrimps-script'),basepath='https://Zorn192.github.io/AutoTrimps/',modulepath='modules/';null!==atscript&&(basepath=atscript.src.replace(/AutoTrimps2\.js$/,'')); +var ATversion='2.7.3 Zek',atscript=document.getElementById('AutoTrimps-script'),basepath='https://Zorn192.github.io/AutoTrimps/',modulepath='modules/';null!==atscript&&(basepath=atscript.src.replace(/AutoTrimps2\.js$/,'')); function ATscriptLoad(a,b){null==b&&debug('Wrong Syntax. Script could not be loaded. Try ATscriptLoad(modulepath, \'example.js\'); ');var c=document.createElement('script');null==a&&(a=''),c.src=basepath+a+b+'.js',c.id=b+'_MODULE',document.head.appendChild(c)} function ATscriptUnload(a){var b=document.getElementById(a+"_MODULE");b&&(document.head.removeChild(b),debug("Removing "+a+"_MODULE","other"))} ATscriptLoad(modulepath, 'utils'); @@ -15,7 +15,8 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "12/09/2018", version: "v2.7.2", description: "4.91 Scryer Stuff really works now! No really! Nature Scryer got a rework. Removed AS1 in favor of AS2, so make sure yours is set! May need some tuning so let me know if it sucks! Replaced AS1 with D Stance. Amal Target for Amal boosting, may not work correctly, yet. Please let me know if it works though (or doesn\'t)! Added a setting to control mode Before Fueling in Magma. Small performance boost for liq zones. Thanks for using the fork in 4.91! ", isNew: true}); +changelogList.push({date: "19/09/2018", version: "v2.7.3", description: "4.911 Added things, fixed things, please report broken things, thanks for using my things. ", isNew: true}); +changelogList.push({date: "12/09/2018", version: "v2.7.2", description: "4.91 Scryer Stuff really works now! No really! Nature Scryer got a rework. Removed AS1 in favor of AS2, so make sure yours is set! May need some tuning so let me know if it sucks! Replaced AS1 with D Stance. Amal Target for Amal boosting, may not work correctly, yet. Please let me know if it works though (or doesn\'t)! Added a setting to control mode Before Fueling in Magma. Small performance boost for liq zones. Thanks for using the fork in 4.91! ", isNew: false}); changelogList.push({date: "06/09/2018", version: "v2.7.1", description: "4.901 Scryer Stuff actually works now, neat. Replaced one of the autogather options with a new more efficient option for late game. Fight always got an upgrade. Thanks for using the fork in 4.9(01)! ", isNew: false}); changelogList.push({date: "05/09/2018", version: "v2.7.0", description: "4.9 Here we go! Added the new Classy perk to Autoperks, along with updated ratios. Added an option in Buildings & Jobs to hide obsolete settings once you have unlocked certain masteries. Fixed Scryer. Added an option to Scry VMs without having to enable scrying. Added B instead of S for WS. ", isNew: false}); //changelogList.push({date: "03/09/2018", version: "v2.6.5", description: "Pre-pre-4.9 update. Check out the C2 Tab! And theres some more tiny optimizations too. ", isNew: false}); @@ -80,7 +81,7 @@ function mainLoop() { if (getPageSetting('ExitSpireCell') > 0 && game.global.challengeActive != "Daily" && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) exitSpireCell(); if (getPageSetting('dexitspirecell') >= 1 && game.global.challengeActive == "Daily" && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) dailyexitSpireCell(); - if (getPageSetting('SpireBreedTimer') == true && getPageSetting('IgnoreSpiresUntil') <= game.global.world) ATspirebreed(); + if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world) ATspirebreed(); if (getPageSetting('trimpsnotdie')==true && !game.global.fighting) helptrimpsnotdie(); if (getPageSetting('PraidHarder') && getPageSetting('Praidingzone').length && game.global.challengeActive != "Daily" || getPageSetting('dPraidHarder') && getPageSetting('dPraidingzone').length && game.global.challengeActive == "Daily") PraidHarder(); else { From dc84ae2aaf8d55037ad42aa7dd4b8e83b6fcd0be Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 19 Sep 2018 21:19:16 +0100 Subject: [PATCH 1427/3477] Update other.js --- modules/other.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index 936593033..11da55244 100644 --- a/modules/other.js +++ b/modules/other.js @@ -475,10 +475,12 @@ function ATspirebreed() { } else { spirebreeding = false; - game.global.GeneticistassistSetting = prespiretimer; - toggleGeneticistassist(); - toggleGeneticistassist(); - toggleGeneticistassist(); + if (game.global.GeneticistassistSetting == spiretimer) { + game.global.GeneticistassistSetting = prespiretimer; + toggleGeneticistassist(); + toggleGeneticistassist(); + toggleGeneticistassist(); + } } } From 40883b9b13c5a6e660f1513230c53772daac4f36 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 19 Sep 2018 21:27:07 +0100 Subject: [PATCH 1428/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index 11da55244..d1ba1e4a4 100644 --- a/modules/other.js +++ b/modules/other.js @@ -467,8 +467,8 @@ function ATspirebreed() { if(!spirebreeding) var prespiretimer = game.global.GeneticistassistSetting; if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) { + var spiretimer = getPageSetting('SpireBreedTimer'); spirebreeding = true; - let spiretimer = getPageSetting('SpireBreedTimer'); if (game.global.GeneticistassistSetting != spiretimer) game.global.GeneticistassistSetting = spiretimer; From fb4917b5220cee89189c7e8014430fb9068694b4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 19 Sep 2018 21:34:57 +0100 Subject: [PATCH 1429/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index d1ba1e4a4..4db6b36c2 100644 --- a/modules/other.js +++ b/modules/other.js @@ -473,7 +473,7 @@ function ATspirebreed() { game.global.GeneticistassistSetting = spiretimer; } - else { + if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && !game.global.spireActive) { spirebreeding = false; if (game.global.GeneticistassistSetting == spiretimer) { game.global.GeneticistassistSetting = prespiretimer; From f19893a472ac1fa6f788f97a509835609de0a7ba Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 19 Sep 2018 22:07:32 +0100 Subject: [PATCH 1430/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 9f947c0ee..25e29f525 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -1,4 +1,4 @@ -var ATversion='2.7.3 Zek',atscript=document.getElementById('AutoTrimps-script'),basepath='https://Zorn192.github.io/AutoTrimps/',modulepath='modules/';null!==atscript&&(basepath=atscript.src.replace(/AutoTrimps2\.js$/,'')); +var ATversion='2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0',atscript=document.getElementById('AutoTrimps-script'),basepath='https://Zorn192.github.io/AutoTrimps/',modulepath='modules/';null!==atscript&&(basepath=atscript.src.replace(/AutoTrimps2\.js$/,'')); function ATscriptLoad(a,b){null==b&&debug('Wrong Syntax. Script could not be loaded. Try ATscriptLoad(modulepath, \'example.js\'); ');var c=document.createElement('script');null==a&&(a=''),c.src=basepath+a+b+'.js',c.id=b+'_MODULE',document.head.appendChild(c)} function ATscriptUnload(a){var b=document.getElementById(a+"_MODULE");b&&(document.head.removeChild(b),debug("Removing "+a+"_MODULE","other"))} ATscriptLoad(modulepath, 'utils'); From 548d3d64d7b4d4c5ba24f96bb807be68a0e49f30 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 21 Sep 2018 11:15:21 +0100 Subject: [PATCH 1431/3477] Update other.js --- modules/other.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/modules/other.js b/modules/other.js index 4db6b36c2..781fbfb9e 100644 --- a/modules/other.js +++ b/modules/other.js @@ -465,18 +465,37 @@ if (game.portal.Anticipation.level >= 1) { var spirebreeding = false; function ATspirebreed() { if(!spirebreeding) + console.log('Setting prespiretimer'); var prespiretimer = game.global.GeneticistassistSetting; + return prespiretimer; if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) { + console.log('Found spire timer, setting spirebreeding to true'); var spiretimer = getPageSetting('SpireBreedTimer'); spirebreeding = true; + if (spirebreeding) + console.log('spirebreeding true'); + else console.log('spirebreeding false'); if (game.global.GeneticistassistSetting != spiretimer) + console.log('changing ga to spiretimer'); game.global.GeneticistassistSetting = spiretimer; + if (game.global.GeneticistassistSetting == spiretimer) + console.log('spiretimer set'); + return game.global.GeneticistassistSetting; + else console.log('spiretimer not set'); } if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && !game.global.spireActive) { + console.log('spire not active, beginning setting back'); spirebreeding = false; + if (!spirebreeding) + console.log('spirebreeding false'); + else console.log('spirebreeding true'); if (game.global.GeneticistassistSetting == spiretimer) { + console.log('found ga set to spiretimer, returning to previous value'); game.global.GeneticistassistSetting = prespiretimer; + return prespiretimer; + return game.global.GeneticistassistSetting; + toggleGeneticistassist(); toggleGeneticistassist(); toggleGeneticistassist(); toggleGeneticistassist(); From 7ee9e725d598ae5f0e1d307627bc89b67caa3358 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 21 Sep 2018 11:18:48 +0100 Subject: [PATCH 1432/3477] Update other.js --- modules/other.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/other.js b/modules/other.js index 781fbfb9e..4bbd9c9b6 100644 --- a/modules/other.js +++ b/modules/other.js @@ -467,20 +467,19 @@ function ATspirebreed() { if(!spirebreeding) console.log('Setting prespiretimer'); var prespiretimer = game.global.GeneticistassistSetting; - return prespiretimer; + console.log(prespiretimer); if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) { console.log('Found spire timer, setting spirebreeding to true'); - var spiretimer = getPageSetting('SpireBreedTimer'); spirebreeding = true; if (spirebreeding) console.log('spirebreeding true'); else console.log('spirebreeding false'); - if (game.global.GeneticistassistSetting != spiretimer) + if (game.global.GeneticistassistSetting != getPageSetting('SpireBreedTimer')) console.log('changing ga to spiretimer'); - game.global.GeneticistassistSetting = spiretimer; - if (game.global.GeneticistassistSetting == spiretimer) + game.global.GeneticistassistSetting = getPageSetting('SpireBreedTimer'); + if (game.global.GeneticistassistSetting == getPageSetting('SpireBreedTimer')){ console.log('spiretimer set'); - return game.global.GeneticistassistSetting; + console.log(game.global.GeneticistassistSetting);} else console.log('spiretimer not set'); } @@ -490,11 +489,11 @@ function ATspirebreed() { if (!spirebreeding) console.log('spirebreeding false'); else console.log('spirebreeding true'); - if (game.global.GeneticistassistSetting == spiretimer) { + if (game.global.GeneticistassistSetting == getPageSetting('SpireBreedTimer')) { console.log('found ga set to spiretimer, returning to previous value'); game.global.GeneticistassistSetting = prespiretimer; - return prespiretimer; - return game.global.GeneticistassistSetting; + console.log(prespiretimer); + console.log(game.global.GeneticistassistSetting); toggleGeneticistassist(); toggleGeneticistassist(); toggleGeneticistassist(); From f8a12a1715744837b36e3dd2de7026cf31daf0dd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 21 Sep 2018 11:21:14 +0100 Subject: [PATCH 1433/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 4bbd9c9b6..cf41b86c8 100644 --- a/modules/other.js +++ b/modules/other.js @@ -468,7 +468,7 @@ function ATspirebreed() { console.log('Setting prespiretimer'); var prespiretimer = game.global.GeneticistassistSetting; console.log(prespiretimer); - if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) { + if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive && game.global.GeneticistassistSetting != getPageSetting('SpireBreedTimer')) { console.log('Found spire timer, setting spirebreeding to true'); spirebreeding = true; if (spirebreeding) @@ -483,7 +483,7 @@ function ATspirebreed() { else console.log('spiretimer not set'); } - if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && !game.global.spireActive) { + if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && !game.global.spireActive && game.global.GeneticistassistSetting == getPageSetting('SpireBreedTimer')) { console.log('spire not active, beginning setting back'); spirebreeding = false; if (!spirebreeding) From 8af0d3b82598b746045d008669215d5d54a57de6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 21 Sep 2018 11:23:31 +0100 Subject: [PATCH 1434/3477] Update other.js --- modules/other.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index cf41b86c8..a83a5d97f 100644 --- a/modules/other.js +++ b/modules/other.js @@ -467,7 +467,6 @@ function ATspirebreed() { if(!spirebreeding) console.log('Setting prespiretimer'); var prespiretimer = game.global.GeneticistassistSetting; - console.log(prespiretimer); if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive && game.global.GeneticistassistSetting != getPageSetting('SpireBreedTimer')) { console.log('Found spire timer, setting spirebreeding to true'); spirebreeding = true; From 92ac53cfbd94f9a1a39f162b36d210bdeadaf090 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 21 Sep 2018 11:27:15 +0100 Subject: [PATCH 1435/3477] Update other.js --- modules/other.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index a83a5d97f..8aa7c2bae 100644 --- a/modules/other.js +++ b/modules/other.js @@ -464,8 +464,7 @@ if (game.portal.Anticipation.level >= 1) { var spirebreeding = false; function ATspirebreed() { - if(!spirebreeding) - console.log('Setting prespiretimer'); + if(!spirebreeding && getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) var prespiretimer = game.global.GeneticistassistSetting; if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive && game.global.GeneticistassistSetting != getPageSetting('SpireBreedTimer')) { console.log('Found spire timer, setting spirebreeding to true'); From 66085e42f120a0a6ba2ce8d0bb375fca28218582 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 21 Sep 2018 11:40:49 +0100 Subject: [PATCH 1436/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 8aa7c2bae..10704e045 100644 --- a/modules/other.js +++ b/modules/other.js @@ -492,10 +492,10 @@ function ATspirebreed() { game.global.GeneticistassistSetting = prespiretimer; console.log(prespiretimer); console.log(game.global.GeneticistassistSetting); + /*toggleGeneticistassist(); toggleGeneticistassist(); toggleGeneticistassist(); - toggleGeneticistassist(); - toggleGeneticistassist(); + toggleGeneticistassist();*/ } } } From 8b7d5bdc7db264496b87f6ee413014ff4ad169c6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 21 Sep 2018 11:45:59 +0100 Subject: [PATCH 1437/3477] Update other.js --- modules/other.js | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/modules/other.js b/modules/other.js index 10704e045..c66d350c3 100644 --- a/modules/other.js +++ b/modules/other.js @@ -467,35 +467,17 @@ function ATspirebreed() { if(!spirebreeding && getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) var prespiretimer = game.global.GeneticistassistSetting; if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive && game.global.GeneticistassistSetting != getPageSetting('SpireBreedTimer')) { - console.log('Found spire timer, setting spirebreeding to true'); spirebreeding = true; - if (spirebreeding) - console.log('spirebreeding true'); - else console.log('spirebreeding false'); - if (game.global.GeneticistassistSetting != getPageSetting('SpireBreedTimer')) - console.log('changing ga to spiretimer'); - game.global.GeneticistassistSetting = getPageSetting('SpireBreedTimer'); - if (game.global.GeneticistassistSetting == getPageSetting('SpireBreedTimer')){ - console.log('spiretimer set'); - console.log(game.global.GeneticistassistSetting);} - else console.log('spiretimer not set'); - + if (game.global.GeneticistassistSetting != getPageSetting('SpireBreedTimer')) + game.global.GeneticistassistSetting = getPageSetting('SpireBreedTimer'); } if (getPageSetting('SpireBreedTimer') > 0 && getPageSetting('IgnoreSpiresUntil') <= game.global.world && !game.global.spireActive && game.global.GeneticistassistSetting == getPageSetting('SpireBreedTimer')) { - console.log('spire not active, beginning setting back'); spirebreeding = false; - if (!spirebreeding) - console.log('spirebreeding false'); - else console.log('spirebreeding true'); if (game.global.GeneticistassistSetting == getPageSetting('SpireBreedTimer')) { - console.log('found ga set to spiretimer, returning to previous value'); game.global.GeneticistassistSetting = prespiretimer; - console.log(prespiretimer); - console.log(game.global.GeneticistassistSetting); - /*toggleGeneticistassist(); toggleGeneticistassist(); toggleGeneticistassist(); - toggleGeneticistassist();*/ + toggleGeneticistassist(); } } } From 21d142cd3628de55d4681edec357124a0983e963 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 22 Sep 2018 11:05:52 +0100 Subject: [PATCH 1438/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index d5c6ce505..e09f7e34b 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -342,15 +342,16 @@ function initializeAllSettings() { createSetting('ScryerUseinVoidMaps2', ['VoidMaps: NEVER','VoidMaps: FORCE', 'VoidMaps: MAYBE'], 'NEVER Means what it says!!!
    FORCE means Scryer will ALWAYS activate in Void Maps
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use in Maps to be on, as well as use on Corrupteds (if above corruption/magma) to activate.

    Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); //Line 2 + createSetting('ScryerUseinBW', ['BW: NEVER','BW: FORCE', 'BW: MAYBE'], 'NEVER Means what it says!!!
    FORCE means Scryer will ALWAYS activate in BW Maps
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use in Maps to be on.

    Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerUseinSpire2', ['Spire: NEVER','Spire: FORCE','Spire: MAYBE'], 'NEVER Means what it says!!!
    FORCE means Scryer will ALWAYS activate in the Spire
    MAYBE means that Overkill and Min/Max use are allowed.
    This setting requires use on Corrupteds to be on for corrupted enemies.

    Recommend NEVER.', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerSkipBoss2', ['Boss: NEVER (All Levels)','Boss: NEVER (Above VoidLevel)','Boss: MAYBE'], 'NEVER (All Levels) will NEVER use S in cell 100 of the world!!!
    NEVER (Above VoidLevel) will NEVER use S in cell 100 of the world ABOVE the zone that your void maps are set to run at (Maps).
    MAYBE treats the cell no differently to any other, Overkill and Min/Max Scryer is allowed.

    Recommend NEVER (There is little benefit to double NON-HELIUM resources and a small chance of DE).', 'multitoggle', 0, null, 'Scryer'); createSetting('ScryerSkipCorrupteds2', ['Corrupted: NEVER', 'Corrupted: FORCE','Corrupted: MAYBE'], 'NEVER Means what it says!!!
    FORCE means Scryer will ALWAYS activate against Corrupted enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Magma maps and Corrupted Voidmaps are currently classified as corrupted and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryerSkipHealthy', ['Healthy: NEVER', 'Healthy: FORCE','Healthy: MAYBE'], 'NEVER Means what it says!!!
    FORCE means Scryer will ALWAYS activate against Healthy enemies
    MAYBE means that Overkill and Min/Max use are allowed.
    Corrupted Voidmaps are currently classified as Healthy (same as corrupted) and NEVER here will override Maps and Voidmaps use of Scryer

    Recommend MAYBE.', 'multitoggle', 2, null, 'Scryer'); createSetting('ScryUseinPoison', 'Scry in Poison', 'Decides what you do in Poison.
    -1 = Maybe
    0 = Never
    Above 0 = Max Zone you want it scrying ', 'value', -1, null, 'Scryer'); createSetting('ScryUseinWind', 'Scry in Wind', 'Decides what you do in Wind.
    -1 = Maybe
    0 = Never
    Above 0 = Max Zone you want it scrying', 'value', -1, null, 'Scryer'); - createSetting('ScryUseinIce', 'Scry in Ice','Decides what you do in Ice.
    -1 = Maybe
    0 = Never
    Above 0 = Max Zone you want it scrying', 'value', -1, null, 'Scryer'); //Line 3 + createSetting('ScryUseinIce', 'Scry in Ice','Decides what you do in Ice.
    -1 = Maybe
    0 = Never
    Above 0 = Max Zone you want it scrying', 'value', -1, null, 'Scryer'); createSetting('ScryerDieZ', 'Die To Use S','-1 to disable.
    Turning this on will switch you back to S even when doing so would kill you. Happens in scenarios where you used Skip Corrupteds that took you into regular Autostance X/H stance, killed the corrupted and reached a non-corrupted enemy that you wish to use S on, but you havent bred yet and you are too low on health to just switch back to S. So you\'d rather die, wait to breed, then use S for the full non-corrupted enemy, to maximize DE. NOTE: Use at your own risk.
    Use this input to set the minimum zone that scryer activates in (You can use decimal values to specify what cell this setting starts from)' , 'value', 230.60, null, 'Scryer'); createSetting('screwessence', 'Remaining Essence Only', 'Why scry when theres no essence? Turns off scrying when the remaining enemies with essence drops to 0. ', 'boolean', false, null, 'Scryer'); From 0a32f2e457daaf83e2536738c26c6e94f02879de Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 22 Sep 2018 11:08:19 +0100 Subject: [PATCH 1439/3477] Update scryer.js --- modules/scryer.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/scryer.js b/modules/scryer.js index f4314414c..a9d722201 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -16,6 +16,7 @@ var never_scry = game.global.preMapsActive || game.global.gridArray.length === 0 never_scry = never_scry || game.global.world <= 60; never_scry = never_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 0 && getCurrentMapObject().location != "Void"); never_scry = never_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0); + never_scry = never_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getCurrentMapObject().location == "Bionic" && getPageSetting('ScryerUseinBW') == 0); never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); never_scry = never_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || (getPageSetting('ScryUseinPoison') > 0 && game.global.world >= getPageSetting('ScryUseinPoison')))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || (getPageSetting('ScryUseinWind') > 0 && game.global.world >= getPageSetting('ScryUseinWind')))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || (getPageSetting('ScryUseinIce') > 0 && game.global.world >= getPageSetting('ScryUseinIce'))))); @@ -41,6 +42,7 @@ var never_scry = game.global.preMapsActive || game.global.gridArray.length === 0 //Force var use_scryer = use_scryer || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1); use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 1) || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))); + use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Bionic" && ((getPageSetting('ScryerUseinBW') == 1); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && getPageSetting('ScryUseinPoison') > 0 && game.global.world < getPageSetting('ScryUseinPoison')) || (getEmpowerment() == "Wind" && getPageSetting('ScryUseinWind') > 0 && game.global.world < getPageSetting('ScryUseinWind')) || (getEmpowerment() == "Ice" && getPageSetting('ScryUseinIce') > 0 && game.global.world < getPageSetting('ScryUseinIce')))); From fd0f0bfb7a6649988536cea5c4e34091585cd56f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 22 Sep 2018 11:09:52 +0100 Subject: [PATCH 1440/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index a9d722201..dc161c3f4 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -42,7 +42,7 @@ var never_scry = game.global.preMapsActive || game.global.gridArray.length === 0 //Force var use_scryer = use_scryer || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getPageSetting('ScryerUseinMaps2') == 1); use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Void" && ((getPageSetting('ScryerUseinVoidMaps2') == 1) || (getPageSetting('scryvoidmaps') == true && game.global.challengeActive != "Daily") || (getPageSetting('dscryvoidmaps')== true && game.global.challengeActive == "Daily"))); - use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Bionic" && ((getPageSetting('ScryerUseinBW') == 1); + use_scryer = use_scryer || (game.global.mapsActive && getCurrentMapObject().location == "Bionic" && getPageSetting('ScryerUseinBW') == 1); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 1); use_scryer = use_scryer || (!game.global.mapsActive && getPageSetting('UseScryerStance') == true && ((getEmpowerment() == "Poison" && getPageSetting('ScryUseinPoison') > 0 && game.global.world < getPageSetting('ScryUseinPoison')) || (getEmpowerment() == "Wind" && getPageSetting('ScryUseinWind') > 0 && game.global.world < getPageSetting('ScryUseinWind')) || (getEmpowerment() == "Ice" && getPageSetting('ScryUseinIce') > 0 && game.global.world < getPageSetting('ScryUseinIce')))); From dd4cd37c3b071dcfbb5cb50bbe79490578fb56c9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 22 Sep 2018 11:12:53 +0100 Subject: [PATCH 1441/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index e09f7e34b..bc2f5e263 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -83,7 +83,7 @@ function initializeAllSettings() { createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Mining/Building Only', 'Science Research OFF'], 'Controls what you gather/build do. Manual does nothing
    Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
    Mining/Building only does exactly what it says. Only use if you are passed the early stages of the game (No longer need to trap, food and wood are useless).
    You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All Upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); createSetting('amalcoord', 'Amal Boost', 'Boost your Amal count for more Mi. Will not buy coords until your H:D ratio is below a certain value. This means that you will get amals quicker. Will not activate higher than your Amal Boost End Zone Setting! ', 'boolean', false, null, "Core"); - createSetting('amalcoordt', 'Amal Target', 'NOT CURRENTLY WORKING! Set the amount of Amals you wish to aim for. Once this target is reached, it will buy coords below your Amal ratio regardless of your H:D, just enough to keep the Amal. -1 to disable and use H:D for entire boost. ', 'value', -1, null, "Core"); + createSetting('amalcoordt', 'Amal Target', 'Set the amount of Amals you wish to aim for. Once this target is reached, it will buy coords below your Amal ratio regardless of your H:D, just enough to keep the Amal. -1 to disable and use H:D for entire boost. ', 'value', -1, null, "Core"); createSetting('amalcoordhd', 'Amal Boost H:D', 'Set your H:D for Amal Boost here. The higher it is the less coords AT will buy. 0.0000025 is the default. ', 'value', 0.0000025, null, "Core"); createSetting('amalcoordz', 'Amal Boost End Z', 'Amal Boost End Zone. Set the zone you want to stop Amal Boosting. -1 to do it infinitely. ', 'value', -1, null, "Core"); createSetting('AutoAllocatePerks', ['Auto Allocate Off', 'Auto Allocate On', 'Dump into Looting II'], 'Uses the AutoPerks ratio based preset system to automatically allocate your perks to spend whatever helium you have when you AutoPortal. Does not change Fixed Perks: siphonology, anticipation, meditation, relentlessness, range, agility, bait, trumps, packrat, capable. NEW: Dump into Looting II, dumps all loot gained from previous portal at specified zone', 'multitoggle', 0, null, 'Core'); @@ -167,7 +167,7 @@ function initializeAllSettings() { //C2 Runner Line document.getElementById('c2table').parentNode.insertAdjacentHTML('afterend','
    '); createSetting('c2runnerstart', 'C2 Runner', 'Runs the normal C2s in sequence according to difficulty. See C2Table for list. Once zone you have defined has been reached, will portal into next. I will advise you not to touch the challenges (abandoning, doing a different one, etc) if you are running this, it could break it. Only runs challenges that need updating, will not run ones close-ish to your HZE. ', 'boolean', false, null, 'C2'); - createSetting('c2runnerportal', 'C2 Runner Portal', 'Automatically portal AFTER clearing this level in C2 Runner. (ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "C2"); + createSetting('c2runnerportal', 'C2 Runner Portal', 'AINT DONE YET FAM MOVE ALONG NOW Automatically portal AFTER clearing this level in C2 Runner. (ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "C2"); From 7be51ce3ece121da765655c09aba583a5cd42643 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 23 Sep 2018 18:40:49 +0100 Subject: [PATCH 1442/3477] Update maps.js --- modules/maps.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/maps.js b/modules/maps.js index 48ee7b954..85e029847 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -135,6 +135,7 @@ function autoMap() { } var pierceMod = (game.global.brokenPlanet && !game.global.mapsActive) ? getPierceAmt() : 0; const FORMATION_MOD_1 = game.upgrades.Dominance.done ? 2 : 1; + calcBaseDamageinX2(); enoughHealth = (baseHealth / FORMATION_MOD_1 > customVars.numHitsSurvived * (enemyDamage - baseBlock / FORMATION_MOD_1 > 0 ? enemyDamage - baseBlock / FORMATION_MOD_1 : enemyDamage * pierceMod)); enoughDamage = (ourBaseDamage * customVars.enoughDamageCutoff > enemyHealth); HDratio = enemyHealth / ourBaseDamage; From 1f0861aa2c5149a691f95e1cc75a9e8ef252967c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 23 Sep 2018 18:41:50 +0100 Subject: [PATCH 1443/3477] Update maps.js --- modules/maps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index 85e029847..cb6c82cb1 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -136,7 +136,7 @@ function autoMap() { var pierceMod = (game.global.brokenPlanet && !game.global.mapsActive) ? getPierceAmt() : 0; const FORMATION_MOD_1 = game.upgrades.Dominance.done ? 2 : 1; calcBaseDamageinX2(); - enoughHealth = (baseHealth / FORMATION_MOD_1 > customVars.numHitsSurvived * (enemyDamage - baseBlock / FORMATION_MOD_1 > 0 ? enemyDamage - baseBlock / FORMATION_MOD_1 : enemyDamage * pierceMod)); + enoughHealth = (getBattleStats("health") / FORMATION_MOD_1 > customVars.numHitsSurvived * (enemyDamage - baseBlock / FORMATION_MOD_1 > 0 ? enemyDamage - baseBlock / FORMATION_MOD_1 : enemyDamage * pierceMod)); enoughDamage = (ourBaseDamage * customVars.enoughDamageCutoff > enemyHealth); HDratio = enemyHealth / ourBaseDamage; updateAutoMapsStatus(); @@ -347,7 +347,7 @@ function autoMap() { var eAttack = getEnemyMaxAttack(game.global.world, theMap.size, 'Voidsnimp', theMap.difficulty); if (game.global.world >= 181 || (game.global.challengeActive == "Corrupted" && game.global.world >= 60)) eAttack *= (getCorruptScale("attack") / 2).toFixed(1); - var ourHealth = baseHealth; + var ourHealth = getBattleStats("health"); if (game.global.challengeActive == 'Balance') { var stacks = game.challenges.Balance.balanceStacks ? (game.challenges.Balance.balanceStacks > theMap.size) ? theMap.size : game.challenges.Balance.balanceStacks : false; eAttack *= 2; From 23b2a866f82c3c01674096a3783b7f529c7d2d74 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 25 Sep 2018 21:19:10 +0100 Subject: [PATCH 1444/3477] Update other.js --- modules/other.js | 71 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/modules/other.js b/modules/other.js index c66d350c3..dde358a0b 100644 --- a/modules/other.js +++ b/modules/other.js @@ -3,6 +3,20 @@ MODULES["other"].enableRoboTrimpSpam = true; var prestraid=!1,dprestraid=!1,failpraid=!1,dfailpraid=!1,bwraided=!1,dbwraided=!1,failbwraid=!1,dfailbwraid=!1,perked=!1,prestraidon=!1,dprestraidon=!1,mapbought=!1,dmapbought=!1,bwraidon=!1,dbwraidon=!1,presteps=null,minMaxMapCost,fMap,pMap,shouldFarmFrags=!1,praidDone=!1; function autoRoboTrimp(){if(!(0=a&&!game.global.useShriek&&(magnetoShriek(),MODULES.other.enableRoboTrimpSpam&&debug("Activated Robotrimp MagnetoShriek Ability @ z"+game.global.world,"graphs","*podcast"))}} function isBelowThreshold(a){return a!=game.global.world} +function buyWeps(){preBuy(),game.global.buyAmt=getPageSetting('gearamounttobuy'),game.equipment.Dagger.levelc.tokens)continue;for(var f in game.empowerments)if(f!=b){c.tokens-=10;var g=game.talents.nature.purchased?game.talents.nature2.purchased?8:6:5;game.empowerments[f].tokens+=g,a=!0,debug('Converted '+b+' tokens to '+f,'nature')}}else{if(10>c.tokens)continue;var h=d.match(/Convert to (\w+)/),f=h?h[1]:null;if(!f||f===b||!game.empowerments[f])continue;c.tokens-=10;var g=game.talents.nature.purchased?game.talents.nature2.purchased?8:6:5;game.empowerments[f].tokens+=g,a=!0,debug('Converted '+b+' tokens to '+f,'nature')}}a&&updateNatureInfoSpans()} +function isActiveSpireAT(){return game.global.spireActive&&game.global.world>=getPageSetting('IgnoreSpiresUntil')} +function exitSpireCell(){isActiveSpireAT()&&game.global.lastClearedCell>=getPageSetting('ExitSpireCell')-1&&endSpire()} +function dailyexitSpireCell(){isActiveSpireAT()&&game.global.lastClearedCell>=getPageSetting('dexitspirecell')-1&&endSpire()} +function plusPres(){document.getElementById("biomeAdvMapsSelect").value="Random",document.getElementById("advExtraLevelSelect").value=plusMapToRun(game.global.world),document.getElementById("advSpecialSelect").value="p",document.getElementById("lootAdvMapsRange").value=0,document.getElementById("difficultyAdvMapsRange").value=9,document.getElementById("sizeAdvMapsRange").value=9,document.getElementById("advPerfectCheckbox").checked=!1,document.getElementById("mapLevelInput").value=game.global.world,updateMapCost()} +function plusMapToRun(a){return 9==a%10?6:5>a%10?5-a%10:11-a%10} +function findLastBionic(){for(var a=game.global.mapsOwnedArray.length-1;0<=a;a--)if("Bionic"===game.global.mapsOwnedArray[a].location)return game.global.mapsOwnedArray[a]} +function helptrimpsnotdie(){game.global.fighting||game.global.preMapsActive||buyArms()} +function usedaily3(){!0!=getPageSetting('use3daily')||'Daily'!=game.global.challengeActive||daily3||(daily3=!0),!1==getPageSetting('use3daily')&&'Daily'!=game.global.challengeActive&&daily3&&(daily3=!1),!0==getPageSetting('use3daily')&&'Daily'!=game.global.challengeActive&&daily3&&(daily3=!1)} +function buyshitspire(){!0==getPageSetting('spireshitbuy')&&game.global.spireActive&&game.global.world>=getPageSetting('IgnoreSpiresUntil')&&(buyWeps(),buyArms())} +function orangewindstack(){'Wind'==getEmpowerment()&&HDratioy()<=getPageSetting('windcutoff')&&1<=getPageSetting('hardcorewind')&&game.global.world>=getPageSetting('hardcorewind')&&(9=getPageSetting('dhardcorewind')&&(9c.tokens)continue;for(var f in game.empowerments)if(f!=b){c.tokens-=10;var g=game.talents.nature.purchased?game.talents.nature2.purchased?8:6:5;game.empowerments[f].tokens+=g,a=!0,debug('Converted '+b+' tokens to '+f,'nature')}}else{if(10>c.tokens)continue;var h=d.match(/Convert to (\w+)/),f=h?h[1]:null;if(!f||f===b||!game.empowerments[f])continue;c.tokens-=10;var g=game.talents.nature.purchased?game.talents.nature2.purchased?8:6:5;game.empowerments[f].tokens+=g,a=!0,debug('Converted '+b+' tokens to '+f,'nature')}}a&&updateNatureInfoSpans()} -function isActiveSpireAT(){return game.global.spireActive&&game.global.world>=getPageSetting('IgnoreSpiresUntil')} -function exitSpireCell(){isActiveSpireAT()&&game.global.lastClearedCell>=getPageSetting('ExitSpireCell')-1&&endSpire()} -function dailyexitSpireCell(){isActiveSpireAT()&&game.global.lastClearedCell>=getPageSetting('dexitspirecell')-1&&endSpire()} -function plusPres(){document.getElementById("biomeAdvMapsSelect").value="Random",document.getElementById("advExtraLevelSelect").value=plusMapToRun(game.global.world),document.getElementById("advSpecialSelect").value="p",document.getElementById("lootAdvMapsRange").value=0,document.getElementById("difficultyAdvMapsRange").value=9,document.getElementById("sizeAdvMapsRange").value=9,document.getElementById("advPerfectCheckbox").checked=!1,document.getElementById("mapLevelInput").value=game.global.world,updateMapCost()} -function plusMapToRun(a){return 9==a%10?6:5>a%10?5-a%10:11-a%10} -function findLastBionic(){for(var a=game.global.mapsOwnedArray.length-1;0<=a;a--)if("Bionic"===game.global.mapsOwnedArray[a].location)return game.global.mapsOwnedArray[a]} - //Praiding function Praiding() { @@ -442,9 +448,6 @@ else if (perked == true && game.global.world !== getPageSetting('lootdumpz')) { } } -function buyWeps(){preBuy(),game.global.buyAmt=getPageSetting('gearamounttobuy'),game.equipment.Dagger.level= 1) { var antistacklimit = 45; @@ -482,9 +485,7 @@ function ATspirebreed() { } } -function helptrimpsnotdie(){game.global.fighting||game.global.preMapsActive||buyArms()} - -function dailyPraiding() { +/*function dailyPraiding() { var dpMap; if (getPageSetting('dPraidingzone').length) { if (getPageSetting('dPraidingzone').includes(game.global.world) && !dprestraid && !dfailpraid) { @@ -554,9 +555,9 @@ function dailyPraiding() { dmapbought = false; praidDone = false; } -} +}*/ -function dailyBWraiding() { +/*function dailyBWraiding() { if (!dprestraidon && game.global.world == getPageSetting('dBWraidingz') && !dbwraided && !dfailbwraid && getPageSetting('Dailybwraid')) { @@ -625,7 +626,7 @@ function dailyBWraiding() { dbwraidon = false; } -} +}*/ function fightalways() { if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || (game.global.spireActive && game.global.world >= getPageSetting('IgnoreSpiresUntil'))) @@ -634,13 +635,35 @@ function fightalways() { fightManual(); } -function usedaily3(){!0!=getPageSetting('use3daily')||'Daily'!=game.global.challengeActive||daily3||(daily3=!0),!1==getPageSetting('use3daily')&&'Daily'!=game.global.challengeActive&&daily3&&(daily3=!1),!0==getPageSetting('use3daily')&&'Daily'!=game.global.challengeActive&&daily3&&(daily3=!1)} -function cutoffwind(){!game.global.runningChallengeSquared&&1>getPageSetting("windcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world!=getPageSetting("WindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=4,MODULES.maps.enoughDamageCutoff=4),1<=getPageSetting("windcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world=getPageSetting("WindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=getPageSetting("windcutoff"),MODULES.maps.enoughDamageCutoff=getPageSetting("windcutoff"))} -function dcutoffwind(){!game.global.runningChallengeSquared&&1>getPageSetting("dwindcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world!=getPageSetting("dWindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=4,MODULES.maps.enoughDamageCutoff=4),1<=getPageSetting("dwindcutoff")&&4!=MODULES.equipment.enoughDamageCutoff&&4!=MODULES.maps.enoughDamageCutoff&&game.global.world=getPageSetting("dWindStackingMin")&&(MODULES.equipment.enoughDamageCutoff=getPageSetting("dwindcutoff"),MODULES.maps.enoughDamageCutoff=getPageSetting("dwindcutoff"))} -//function c2mapcut(){getPageSetting('mapc2hd') > 0 && game.global.runningChallengeSquared && game.global.challenge == "Mapology" && MODULES.maps.enoughDamageCutoff != getPageSetting('mapc2hd'))MODULES.maps.enoughDamageCutoff = getPageSetting('mapc2hd'); -function buyshitspire(){!0==getPageSetting('spireshitbuy')&&game.global.spireActive&&game.global.world>=getPageSetting('IgnoreSpiresUntil')&&(buyWeps(),buyArms())} -function orangewindstack(){'Wind'==getEmpowerment()&&HDratioy()<=getPageSetting('windcutoff')&&1<=getPageSetting('hardcorewind')&&game.global.world>=getPageSetting('hardcorewind')&&(9=getPageSetting('dhardcorewind')&&(9= getPageSetting("WindStackingMin") && getEmpowerment() == 'Wind') { + if (getPageSetting("windcutoffmap") > 0 && MODULES.maps.enoughDamageCutoff != getPageSetting("windcutoffmap")) + MODULES.maps.enoughDamageCutoff = getPageSetting("windcutoffmap"); + if (getPageSetting("windcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("windcutoffmap")) + MODULES.equipment.enoughDamageCutoff = getPageSetting("windcutoff"); + } + if (getPageSetting("AutoStance") == 3 && game.global.challenge != "Daily" && getEmpowerment() != 'Wind') { + if (getPageSetting("windcutoffmap") <= 0 && MODULES.maps.enoughDamageCutoff != 4) + MODULES.maps.enoughDamageCutoff = 4; + if (getPageSetting("windcutoff") <= 0 && MODULES.equipment.enoughDamageCutoff != 4) + MODULES.equipment.enoughDamageCutoff = 4; + } +} + +function dcutoffwind(){ + if (!game.global.runningChallengeSquared && (getPageSetting("AutoStance") == 3 || getPageSetting("use3daily") == true) && game.global.challenge == "Daily" && game.global.world >= getPageSetting("dWindStackingMin") && getEmpowerment() == 'Wind') { + if (getPageSetting("dwindcutoffmap") > 0 && MODULES.maps.enoughDamageCutoff != getPageSetting("dwindcutoffmap")) + MODULES.maps.enoughDamageCutoff = getPageSetting("dwindcutoffmap"); + if (getPageSetting("dwindcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("dwindcutoffmap")) + MODULES.equipment.enoughDamageCutoff = getPageSetting("dwindcutoff"); + } + if ((getPageSetting("AutoStance") == 3 || getPageSetting("use3daily") == true) && game.global.challenge == "Daily" && getEmpowerment() != 'Wind') { + if (getPageSetting("dwindcutoffmap") <= 0 && MODULES.maps.enoughDamageCutoff != 4) + MODULES.maps.enoughDamageCutoff = 4; + if (getPageSetting("dwindcutoff") <= 0 && MODULES.equipment.enoughDamageCutoff != 4) + MODULES.equipment.enoughDamageCutoff = 4; + } +} function armormagic() { var armormagicworld = Math.floor((game.global.highestLevelCleared + 1) * 0.8); From 094c6118c85f0f715d07d56dab434eb2e15206bb Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 25 Sep 2018 21:19:13 +0100 Subject: [PATCH 1445/3477] Update SettingsGUI.js --- SettingsGUI.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index bc2f5e263..4be1f31e4 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -127,18 +127,19 @@ function initializeAllSettings() { createSetting('use3daily', 'Use WS for Daily', ' This must be on for Daily windstacking settings to appear! Overrides your Autostance settings to use the WS stance on Dailies. ', 'boolean', false, null, 'Daily'); createSetting('dWindStackingMin', 'Daily Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set for dailys. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Daily'); createSetting('dWindStackingMax', 'Daily Windstack Max', 'For use with AutoStance 3 in dailys. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Daily'); - createSetting('dwindcutoff', 'Daily Wind Damage Cutoff', 'Set this value to optimise your windstacking in dailys. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Daily'); + createSetting('dwindcutoff', 'Daily Wind Damage Cutoff', 'Set this value to optimise your windstacking in dailys. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Daily'); //Line 3 + createSetting('dwindcutoffmap', 'Daily Wind Map Cutoff', 'Set this value to optimise your windstacking in dailys. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus. If you set this to 160, it will not do maps till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Daily'); createSetting('dhardcorewind', 'Daily Hardcore Windstacking Z', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack in dailys. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Daily'); createSetting('dhardcorewindmax', 'Daily Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking in Dailies. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. Use -1 or a really high value to hardcore windstack endlessly. ', 'value', '-1', null, 'Daily'); createSetting('dultwind', 'Daily Ultimate Windstacking', 'Just when you thought things couldn\'t get any worse. Ultimate Windstacking withholds Coords, your Gear Upgrades and levels throughout the Daily. This means that unless you are over a certain H:D Value you have defined in UWS H:D it will not purchase anything. This will still enable you to overkill things (OOOK) if you set it right, but only purchases the necessary upgrades required. It works very similar to Daily Hardcore WS, but works throughout the run. Recommend starting quite early on, perhaps after your max fuel zone. Experiment with it to find your best result. ', 'value', '-1', null, 'Daily'); createSetting('dultwindcut', 'Daily UWS H:D', 'Fiddle with this to maximise your Daily UWS settings. Default is 0.00025. ', 'value', '0.00025', null, 'Daily'); createSetting('dfightforever', ['DFA: Off', 'DFA: Non-Empowered', 'DFA: All Dailies'], 'Daily Fight Always. Sends trimps to fight if they\'re not fighting in Daily challenges similar to Toxicity/Nom but not on Bloodthirst/Plagued/Bogged Dailies, regardless of BAF. Non-Empowered will only send to fight if the Daily is not Empowered. Essenitally the same as the one in combat, can use either if you wish, except this will only activate in these daily challenges (duh) ', 'multitoggle', '0', null, 'Daily'); createSetting('dwindhealthy', 'Daily WS Healthy Only', 'Will only Windstack Healthy cells in Dailies. Will completely ignore every other cell. ', 'boolean', 'false', null, 'Daily'); - createSetting('darmormagic', ['Daily Armor Magic Off', 'DAM: Above 80%', 'DAM: H:D', 'DAM: Always'], 'Will buy Armor to try and prevent death on Bleed/Plague/Bogged Dailies under the 3 conditions.
    Above 80%: Will activate at and above 80% of your HZE.
    H:D: Will activate at and above the H:D you have defined in maps.
    Always Will activate always.
    All options will activate at or below 25% of your health. ', 'multitoggle', 0, null, "Daily"); //Line 4 + createSetting('darmormagic', ['Daily Armor Magic Off', 'DAM: Above 80%', 'DAM: H:D', 'DAM: Always'], 'Will buy Armor to try and prevent death on Bleed/Plague/Bogged Dailies under the 3 conditions.
    Above 80%: Will activate at and above 80% of your HZE.
    H:D: Will activate at and above the H:D you have defined in maps.
    Always Will activate always.
    All options will activate at or below 25% of your health. ', 'multitoggle', 0, null, "Daily"); createSetting('dscryvoidmaps', 'Daily VM Scryer', 'Only use in Dailies if you have Scryhard II, for er, obvious reasons. Works without the scryer options. ', 'boolean', false, null, 'Daily'); createSetting('dusebstance', 'Daily Use B', 'Use B Stance in Dailies instead of S stance. Useful for when you have unlocked the scryhard mastery. ', 'boolean', 'false', null, 'Daily'); @@ -300,13 +301,12 @@ function initializeAllSettings() { //Line 1 createSetting('WindStackingMin', 'Windstack Min Zone', '-1 = Off
    0 = Always On
    For use with AutoStance 3, enables windstacking in zones above and inclusive of the zone set. (Get specified windstacks then change to D, kill bad guy, then repeat). This is designed to force S use until you have specified stacks in wind zones, overriding scryer settings.', 'value', '-1', null, 'Windstacking'); createSetting('WindStackingMax', 'Windstack Max', 'For use with AutoStance 3. Amount of windstacks to obtain before switching to D stance. Default is 200, but I recommend anywhere between 25-50. ', 'value', '200', null, 'Windstacking'); - createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will do map bonus and buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Windstacking'); + createSetting('windcutoff', 'Wind Damage Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will buy max equipment. If you set this to 160, it will not get more damage till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Windstacking'); + createSetting('windcutoffmap', 'Wind Map Cutoff', 'Set this value to optimise your windstacking. Can work without AS3, but not recommended. AT normally uses 4 as its cutoff. I.e if the cutoff is above 4 it will get map bonus. If you set this to 160, it will not get more map bonus till you are above x160. Essentially, the higher the value, the less damage AT wants to get, this will enable you to windstack to incredibly high amounts. -1 to disable/go back to default. Must set your windstacking min zone to use. ', 'value', '-1', null, 'Windstacking'); createSetting('hardcorewind', 'Hardcore Windstacking', 'ONLY USE IF YOU ARE A BADASS WIND FARMING PSYCHOPATH!!! Warning, this setting will enable some hardcore wind adjustments. Just so we are clear. Set this value to the zone you want to hardcore windstack and onwards. Hardcore windstacking disables buying prestiges, coords and weapons in wind, it also buys prestiges if it lowers your attack. This means that wind zones will be incredibly difficult and slow. If you think this sounds stupid, do not use it until you think its the greatest thing to ever exist. ', 'value', '-1', null, 'Windstacking'); createSetting('hardcorewindmax', 'Hardcore Windstacking Max', 'Max zone to finish hardcore windstacking. I.e If you started Hardcore Windstacking at 526 and want to finish at 530, set this to 530. The next wind zone will not hardcore windstack. Use -1 or a really high value to hardcore windstack endlessly. ', 'value', '-1', null, 'Windstacking'); createSetting('ultwind', 'Ultimate Windstacking', 'Just when you thought things couldn\'t get any worse. Ultimate Windstacking withholds Coords, your Gear Upgrades and levels throughout. This means that unless you are over a certain H:D Value you have defined in UWS H:D it will not purchase anything. This will still enable you to overkill things (OOOK) if you set it right, but only purchases the necessary upgrades required. It works very similar to Hardcore WS, but works throughout the run. Recommend starting quite early on, perhaps after your max fuel zone. Experiment with it to find your best result. ', 'value', '-1', null, 'Windstacking'); createSetting('ultwindcut', 'UWS H:D', 'Fiddle with this to maximise your UWS settings. Default is 0.00025. ', 'value', '0.00025', null, 'Windstacking'); - - //Line 2 createSetting('windhealthy', 'WS Healthy Only', 'Will only Windstack Healthy cells. Will completely ignore every other cell. ', 'boolean', 'false', null, 'Windstacking'); createSetting('usebstance', 'Use B', 'Use B Stance instead of S stance. Useful for when you have unlocked the scryhard mastery. ', 'boolean', 'false', null, 'Windstacking'); createSetting('fuckanti', '0 Antistacks H:D', 'Will try to get 0 antistacks below this H:D. I.e if this is set to 80, it will remain at 0 antistacks below 80 H:D and obtain the max after 80 has been breached. -1 to disable. ', 'value', '-1', null, 'Windstacking'); From 971a301420e5da0d263715ace980e660ffc3c1be Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 25 Sep 2018 21:20:43 +0100 Subject: [PATCH 1446/3477] Update other.js --- modules/other.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/other.js b/modules/other.js index dde358a0b..442e81d37 100644 --- a/modules/other.js +++ b/modules/other.js @@ -636,7 +636,7 @@ function fightalways() { } function cutoffwind(){ - if (!game.global.runningChallengeSquared && getPageSetting("AutoStance") == 3 && && game.global.challenge != "Daily" && game.global.world >= getPageSetting("WindStackingMin") && getEmpowerment() == 'Wind') { + if (!game.global.runningChallengeSquared && getPageSetting("AutoStance") == 3 && game.global.challenge != "Daily" && game.global.world >= getPageSetting("WindStackingMin") && getEmpowerment() == 'Wind') { if (getPageSetting("windcutoffmap") > 0 && MODULES.maps.enoughDamageCutoff != getPageSetting("windcutoffmap")) MODULES.maps.enoughDamageCutoff = getPageSetting("windcutoffmap"); if (getPageSetting("windcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("windcutoffmap")) From 49a002577253f5224e130fb180b29c51fe91151a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 25 Sep 2018 21:25:33 +0100 Subject: [PATCH 1447/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 25e29f525..7d9afb505 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -100,8 +100,8 @@ function mainLoop() { else if (getPageSetting('dfightforever') == 1 && game.global.challengeActive == "Daily" && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) fightalways(); else if (getPageSetting('dfightforever') == 2 && game.global.challengeActive == "Daily" && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) fightalways(); } - if (getPageSetting('windcutoff')>=1 && game.global.challengeActive != "Daily") cutoffwind(); - if (getPageSetting('dwindcutoff')>=1 && game.global.challengeActive == "Daily") dcutoffwind(); + if ((getPageSetting('windcutoff')>0 || getPageSetting('windcutoffmap')>0) && game.global.challengeActive != "Daily") cutoffwind(); + if ((getPageSetting('dwindcutoff')>0 || getPageSetting('dwindcutoffmap')>0) && game.global.challengeActive == "Daily") dcutoffwind(); if (getPageSetting('spireshitbuy')==true && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) buyshitspire(); if (getPageSetting('buywepsvoid')==true && ((getPageSetting('VoidMaps') == game.global.world && game.global.challengeActive != "Daily") || (getPageSetting('DailyVoidMod') == game.global.world && game.global.challengeActive == "Daily")) && game.global.mapsActive && getCurrentMapObject().location == "Void") buyWeps(); if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") orangewindstack(); From be2776ff806f9888d28fc4b199abca91be427efd Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 25 Sep 2018 21:31:49 +0100 Subject: [PATCH 1448/3477] Update other.js --- modules/other.js | 155 ++--------------------------------------------- 1 file changed, 6 insertions(+), 149 deletions(-) diff --git a/modules/other.js b/modules/other.js index 442e81d37..d01cfa9cf 100644 --- a/modules/other.js +++ b/modules/other.js @@ -485,149 +485,6 @@ function ATspirebreed() { } } -/*function dailyPraiding() { - var dpMap; - if (getPageSetting('dPraidingzone').length) { - if (getPageSetting('dPraidingzone').includes(game.global.world) && !dprestraid && !dfailpraid) { - debug('World Zone matches a Daily Praiding Zone!'); - dprestraidon = true; - - if (getPageSetting('AutoMaps') == 1 && !dprestraid && !dfailpraid) { - autoTrimpSettings["AutoMaps"].value = 0; - } - if (!game.global.preMapsActive && !game.global.mapsActive && !dprestraid && !dfailpraid) { - mapsClicked(); - if (!game.global.preMapsActive) { - mapsClicked(); - } - debug("Beginning Daily Prestige Raiding..."); - } - if (game.options.menu.repeatUntil.enabled!=2 && !dprestraid && !dfailpraid) { - game.options.menu.repeatUntil.enabled = 2; - } - if (game.global.preMapsActive && !dprestraid && !dfailpraid) { - plusPres(); - if ((updateMapCost(true) <= game.resources.fragments.owned)) { - buyMap(); - dfailpraid = false; - dmapbought = true; - } - else if ((updateMapCost(true) > game.resources.fragments.owned)) { - if (getPageSetting('AutoMaps') == 0 && !dprestraid) { - autoTrimpSettings["AutoMaps"].value = 1; - dfailpraid = true; - dprestraidon = false; - dmapbought = false; - praidDone = true; - debug("Failed to Daily Prestige Raid. Looks like you can't afford to.."); - } - return; - - } - } - if (dmapbought == true) { - dpMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; - selectMap(dpMap); - runMap(); - } - if (!dprestraid && !dfailpraid && !game.global.repeatMap) { - repeatClicked(); - - } - dprestraid = true; - dfailpraid = false; - dmapbought = false; - } - } - - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dprestraid && !dfailpraid && dprestraidon) { - praidDone = true; - dprestraidon = false; - autoTrimpSettings["AutoMaps"].value = 1; - debug("Daily Prestige Raiding successful! - recycling Praid map"); - recycleMap(getMapIndex(dpMap)); - debug("Turning AutoMaps back on"); - } - if (getPageSetting('dPraidingzone').every(isBelowThreshold)) { - dprestraid = false; - dfailpraid = false - dprestraidon = false; - dmapbought = false; - praidDone = false; - } -}*/ - -/*function dailyBWraiding() { - - if (!dprestraidon && game.global.world == getPageSetting('dBWraidingz') && !dbwraided && !dfailbwraid && getPageSetting('Dailybwraid')) { - - if (getPageSetting('AutoMaps') == 1 && !dbwraided && !dfailbwraid) { - autoTrimpSettings["AutoMaps"].value = 0; - } - - if (!game.global.preMapsActive && !game.global.mapsActive && !dbwraided && !dfailbwraid) { - mapsClicked(); - - if (!game.global.preMapsActive) { - mapsClicked(); - } - } - - if (game.options.menu.repeatUntil.enabled != 2 && !dbwraided && !dfailbwraid) { - game.options.menu.repeatUntil.enabled = 2; - } - - if (game.global.preMapsActive && !dbwraided && !dfailbwraid) { - selectMap(findLastBionic().id); - dfailbwraid = false; - debug("Beginning Daily BW Raiding..."); - } - - else if (game.global.preMapsActive && !dbwraided && !dfailbwraid) { - if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('dBWraidingz') && !dbwraided) { - autoTrimpSettings["AutoMaps"].value = 1; - dfailbwraid = true; - debug("Failed to Daily BW raid. Looks like you don't have a BW to raid..."); - } - - } - - if (findLastBionic().level <= getPageSetting('dBWraidingmax') && !dbwraided && !dfailbwraid && game.global.preMapsActive) { - runMap(); - dbwraidon = true; - } - - if (!game.global.repeatMap && !dbwraided && !dfailbwraid && game.global.mapsActive) { - repeatClicked(); - } - - if (findLastBionic().level > getPageSetting('dBWraidingmax') && !dbwraided && !dfailbwraid) { - dbwraided = true; - dfailbwraid = false; - dbwraidon = false; - debug("...Successfully Daily BW raided!"); - } - - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('dBWraidingz') && dbwraided && !dfailbwraid) { - autoTrimpSettings["AutoMaps"].value = 1; - debug("Turning AutoMaps back on"); - } - - } - - if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dbwraided && !dfailbwraid) { - autoTrimpSettings["AutoMaps"].value = 1; - debug("Turning AutoMaps back on"); - } - - if (dbwraided && !dfailbwraid && game.global.world !== getPageSetting('dBWraidingz')) { - dbwraided = false; - dfailbwraid = false; - dbwraidon = false; - } - -}*/ - function fightalways() { if (game.global.gridArray.length === 0 || game.global.preMapsActive || !game.upgrades.Battle.done || game.global.fighting || (game.global.spireActive && game.global.world >= getPageSetting('IgnoreSpiresUntil'))) return; @@ -642,10 +499,10 @@ function cutoffwind(){ if (getPageSetting("windcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("windcutoffmap")) MODULES.equipment.enoughDamageCutoff = getPageSetting("windcutoff"); } - if (getPageSetting("AutoStance") == 3 && game.global.challenge != "Daily" && getEmpowerment() != 'Wind') { - if (getPageSetting("windcutoffmap") <= 0 && MODULES.maps.enoughDamageCutoff != 4) + if (game.global.challenge != "Daily" && getEmpowerment() != 'Wind') { + if (getPageSetting("windcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) MODULES.maps.enoughDamageCutoff = 4; - if (getPageSetting("windcutoff") <= 0 && MODULES.equipment.enoughDamageCutoff != 4) + if (getPageSetting("windcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) MODULES.equipment.enoughDamageCutoff = 4; } } @@ -657,10 +514,10 @@ function dcutoffwind(){ if (getPageSetting("dwindcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("dwindcutoffmap")) MODULES.equipment.enoughDamageCutoff = getPageSetting("dwindcutoff"); } - if ((getPageSetting("AutoStance") == 3 || getPageSetting("use3daily") == true) && game.global.challenge == "Daily" && getEmpowerment() != 'Wind') { - if (getPageSetting("dwindcutoffmap") <= 0 && MODULES.maps.enoughDamageCutoff != 4) + if (game.global.challenge == "Daily" && getEmpowerment() != 'Wind') { + if (getPageSetting("dwindcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) MODULES.maps.enoughDamageCutoff = 4; - if (getPageSetting("dwindcutoff") <= 0 && MODULES.equipment.enoughDamageCutoff != 4) + if (getPageSetting("dwindcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) MODULES.equipment.enoughDamageCutoff = 4; } } From 1a1c5a2623c336def5af3946021f9a6e811f7a7d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 25 Sep 2018 21:33:12 +0100 Subject: [PATCH 1449/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 7d9afb505..aab552556 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -100,8 +100,8 @@ function mainLoop() { else if (getPageSetting('dfightforever') == 1 && game.global.challengeActive == "Daily" && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) fightalways(); else if (getPageSetting('dfightforever') == 2 && game.global.challengeActive == "Daily" && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) fightalways(); } - if ((getPageSetting('windcutoff')>0 || getPageSetting('windcutoffmap')>0) && game.global.challengeActive != "Daily") cutoffwind(); - if ((getPageSetting('dwindcutoff')>0 || getPageSetting('dwindcutoffmap')>0) && game.global.challengeActive == "Daily") dcutoffwind(); + cutoffwind(); + dcutoffwind(); if (getPageSetting('spireshitbuy')==true && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) buyshitspire(); if (getPageSetting('buywepsvoid')==true && ((getPageSetting('VoidMaps') == game.global.world && game.global.challengeActive != "Daily") || (getPageSetting('DailyVoidMod') == game.global.world && game.global.challengeActive == "Daily")) && game.global.mapsActive && getCurrentMapObject().location == "Void") buyWeps(); if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") orangewindstack(); From ad13e858413aeb6d6e965ef2400d84126f57181f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 25 Sep 2018 21:42:52 +0100 Subject: [PATCH 1450/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index d01cfa9cf..0849834b8 100644 --- a/modules/other.js +++ b/modules/other.js @@ -499,7 +499,7 @@ function cutoffwind(){ if (getPageSetting("windcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("windcutoffmap")) MODULES.equipment.enoughDamageCutoff = getPageSetting("windcutoff"); } - if (game.global.challenge != "Daily" && getEmpowerment() != 'Wind') { + if (game.global.challenge != "Daily" && ((getEmpowerment() != 'Wind') || (getEmpowerment() == 'Wind') && (getPageSetting("WindStackingMin") > 0 && game.global.world < getPageSetting("WindStackingMin") || getPageSetting("WindStackingMin") <= 0))) { if (getPageSetting("windcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) MODULES.maps.enoughDamageCutoff = 4; if (getPageSetting("windcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) @@ -514,7 +514,7 @@ function dcutoffwind(){ if (getPageSetting("dwindcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("dwindcutoffmap")) MODULES.equipment.enoughDamageCutoff = getPageSetting("dwindcutoff"); } - if (game.global.challenge == "Daily" && getEmpowerment() != 'Wind') { + if (game.global.challenge != "Daily" && ((getEmpowerment() != 'Wind') || (getEmpowerment() == 'Wind') && (getPageSetting("dWindStackingMin") > 0 && game.global.world < getPageSetting("dWindStackingMin") || getPageSetting("dWindStackingMin") <= 0))) { if (getPageSetting("dwindcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) MODULES.maps.enoughDamageCutoff = 4; if (getPageSetting("dwindcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) From feb71f137d4827bd68a3b83c8c9fd89277fa4cec Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 25 Sep 2018 21:51:09 +0100 Subject: [PATCH 1451/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index 0849834b8..d3db483d0 100644 --- a/modules/other.js +++ b/modules/other.js @@ -499,7 +499,7 @@ function cutoffwind(){ if (getPageSetting("windcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("windcutoffmap")) MODULES.equipment.enoughDamageCutoff = getPageSetting("windcutoff"); } - if (game.global.challenge != "Daily" && ((getEmpowerment() != 'Wind') || (getEmpowerment() == 'Wind') && (getPageSetting("WindStackingMin") > 0 && game.global.world < getPageSetting("WindStackingMin") || getPageSetting("WindStackingMin") <= 0))) { + if (game.global.challenge != "Daily" && ((getEmpowerment() != 'Wind') || (getEmpowerment() == 'Wind' && (getPageSetting("WindStackingMin") > 0 && game.global.world < getPageSetting("WindStackingMin") || getPageSetting("WindStackingMin") <= 0)))) { if (getPageSetting("windcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) MODULES.maps.enoughDamageCutoff = 4; if (getPageSetting("windcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) @@ -514,7 +514,7 @@ function dcutoffwind(){ if (getPageSetting("dwindcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("dwindcutoffmap")) MODULES.equipment.enoughDamageCutoff = getPageSetting("dwindcutoff"); } - if (game.global.challenge != "Daily" && ((getEmpowerment() != 'Wind') || (getEmpowerment() == 'Wind') && (getPageSetting("dWindStackingMin") > 0 && game.global.world < getPageSetting("dWindStackingMin") || getPageSetting("dWindStackingMin") <= 0))) { + if (game.global.challenge == "Daily" && ((getEmpowerment() != 'Wind' || (getEmpowerment() == 'Wind') && (getPageSetting("dWindStackingMin") > 0 && game.global.world < getPageSetting("dWindStackingMin") || getPageSetting("dWindStackingMin") <= 0)))) { if (getPageSetting("dwindcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) MODULES.maps.enoughDamageCutoff = 4; if (getPageSetting("dwindcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) From 07deadacb031e388da09cc2b80252e0858e69a0d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 25 Sep 2018 21:55:47 +0100 Subject: [PATCH 1452/3477] Update other.js --- modules/other.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/other.js b/modules/other.js index d3db483d0..d5ec5c357 100644 --- a/modules/other.js +++ b/modules/other.js @@ -497,13 +497,14 @@ function cutoffwind(){ if (getPageSetting("windcutoffmap") > 0 && MODULES.maps.enoughDamageCutoff != getPageSetting("windcutoffmap")) MODULES.maps.enoughDamageCutoff = getPageSetting("windcutoffmap"); if (getPageSetting("windcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("windcutoffmap")) - MODULES.equipment.enoughDamageCutoff = getPageSetting("windcutoff"); - } - if (game.global.challenge != "Daily" && ((getEmpowerment() != 'Wind') || (getEmpowerment() == 'Wind' && (getPageSetting("WindStackingMin") > 0 && game.global.world < getPageSetting("WindStackingMin") || getPageSetting("WindStackingMin") <= 0)))) { - if (getPageSetting("windcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) - MODULES.maps.enoughDamageCutoff = 4; - if (getPageSetting("windcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) - MODULES.equipment.enoughDamageCutoff = 4; + MODULES.equipment.enoughDamageCutoff = getPageSetting("windcutoff"); + } + + else if (game.global.challenge != "Daily" && ((getEmpowerment() != 'Wind') || (getEmpowerment() == 'Wind' && ((getPageSetting("WindStackingMin") > 0 && game.global.world < getPageSetting("WindStackingMin")) || (getPageSetting("WindStackingMin") <= 0))))) { + if (getPageSetting("windcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) + MODULES.maps.enoughDamageCutoff = 4; + if (getPageSetting("windcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) + MODULES.equipment.enoughDamageCutoff = 4; } } @@ -514,11 +515,12 @@ function dcutoffwind(){ if (getPageSetting("dwindcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("dwindcutoffmap")) MODULES.equipment.enoughDamageCutoff = getPageSetting("dwindcutoff"); } - if (game.global.challenge == "Daily" && ((getEmpowerment() != 'Wind' || (getEmpowerment() == 'Wind') && (getPageSetting("dWindStackingMin") > 0 && game.global.world < getPageSetting("dWindStackingMin") || getPageSetting("dWindStackingMin") <= 0)))) { - if (getPageSetting("dwindcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) - MODULES.maps.enoughDamageCutoff = 4; - if (getPageSetting("dwindcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) - MODULES.equipment.enoughDamageCutoff = 4; + + else if (game.global.challenge == "Daily" && ((getEmpowerment() != 'Wind') || (getEmpowerment() == 'Wind' && ((getPageSetting("dWindStackingMin") > 0 && game.global.world < getPageSetting("dWindStackingMin")) || (getPageSetting("dWindStackingMin") <= 0))))) { + if (getPageSetting("dwindcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) + MODULES.maps.enoughDamageCutoff = 4; + if (getPageSetting("dwindcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) + MODULES.equipment.enoughDamageCutoff = 4; } } From 280196f364d97cf9c4fb5ec1788fe631530871cf Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 25 Sep 2018 21:56:50 +0100 Subject: [PATCH 1453/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index aab552556..b369b8f45 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -100,8 +100,8 @@ function mainLoop() { else if (getPageSetting('dfightforever') == 1 && game.global.challengeActive == "Daily" && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) fightalways(); else if (getPageSetting('dfightforever') == 2 && game.global.challengeActive == "Daily" && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) fightalways(); } - cutoffwind(); - dcutoffwind(); + if (game.global.challengeActive != "Daily") cutoffwind(); + if (game.global.challengeActive == "Daily") dcutoffwind(); if (getPageSetting('spireshitbuy')==true && getPageSetting('IgnoreSpiresUntil') <= game.global.world && game.global.spireActive) buyshitspire(); if (getPageSetting('buywepsvoid')==true && ((getPageSetting('VoidMaps') == game.global.world && game.global.challengeActive != "Daily") || (getPageSetting('DailyVoidMod') == game.global.world && game.global.challengeActive == "Daily")) && game.global.mapsActive && getCurrentMapObject().location == "Void") buyWeps(); if (getPageSetting('hardcorewind') >= 1 && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive != "Daily") orangewindstack(); From a5808edbe936f629ea19d21de0b3e79a47599c50 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 25 Sep 2018 22:07:48 +0100 Subject: [PATCH 1454/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index d5ec5c357..c2169f370 100644 --- a/modules/other.js +++ b/modules/other.js @@ -500,7 +500,7 @@ function cutoffwind(){ MODULES.equipment.enoughDamageCutoff = getPageSetting("windcutoff"); } - else if (game.global.challenge != "Daily" && ((getEmpowerment() != 'Wind') || (getEmpowerment() == 'Wind' && ((getPageSetting("WindStackingMin") > 0 && game.global.world < getPageSetting("WindStackingMin")) || (getPageSetting("WindStackingMin") <= 0))))) { + else if (game.global.challenge != "Daily" && ((getEmpowerment() != 'Wind') || (getPageSetting("AutoStance") != 3) || (getEmpowerment() == 'Wind' && ((getPageSetting("WindStackingMin") > 0 && game.global.world < getPageSetting("WindStackingMin")) || (getPageSetting("WindStackingMin") <= 0))))) { if (getPageSetting("windcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) MODULES.maps.enoughDamageCutoff = 4; if (getPageSetting("windcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) @@ -516,7 +516,7 @@ function dcutoffwind(){ MODULES.equipment.enoughDamageCutoff = getPageSetting("dwindcutoff"); } - else if (game.global.challenge == "Daily" && ((getEmpowerment() != 'Wind') || (getEmpowerment() == 'Wind' && ((getPageSetting("dWindStackingMin") > 0 && game.global.world < getPageSetting("dWindStackingMin")) || (getPageSetting("dWindStackingMin") <= 0))))) { + else if (game.global.challenge == "Daily" && ((getEmpowerment() != 'Wind') || (getPageSetting("AutoStance") != 3 && getPageSetting("use3daily") == false) || (getEmpowerment() == 'Wind' && ((getPageSetting("dWindStackingMin") > 0 && game.global.world < getPageSetting("dWindStackingMin")) || (getPageSetting("dWindStackingMin") <= 0))))) { if (getPageSetting("dwindcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) MODULES.maps.enoughDamageCutoff = 4; if (getPageSetting("dwindcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) From 6e2ca8edd02b7c1d4b5d19992fd124a0cfc61f4e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 25 Sep 2018 22:18:26 +0100 Subject: [PATCH 1455/3477] Update other.js --- modules/other.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/other.js b/modules/other.js index c2169f370..c77f96bf1 100644 --- a/modules/other.js +++ b/modules/other.js @@ -493,14 +493,14 @@ function fightalways() { } function cutoffwind(){ - if (!game.global.runningChallengeSquared && getPageSetting("AutoStance") == 3 && game.global.challenge != "Daily" && game.global.world >= getPageSetting("WindStackingMin") && getEmpowerment() == 'Wind') { + if (!game.global.runningChallengeSquared && getPageSetting("AutoStance") == 3 && game.global.world >= getPageSetting("WindStackingMin") && getEmpowerment() == 'Wind') { if (getPageSetting("windcutoffmap") > 0 && MODULES.maps.enoughDamageCutoff != getPageSetting("windcutoffmap")) MODULES.maps.enoughDamageCutoff = getPageSetting("windcutoffmap"); if (getPageSetting("windcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("windcutoffmap")) MODULES.equipment.enoughDamageCutoff = getPageSetting("windcutoff"); } - else if (game.global.challenge != "Daily" && ((getEmpowerment() != 'Wind') || (getPageSetting("AutoStance") != 3) || (getEmpowerment() == 'Wind' && ((getPageSetting("WindStackingMin") > 0 && game.global.world < getPageSetting("WindStackingMin")) || (getPageSetting("WindStackingMin") <= 0))))) { + else if ((getEmpowerment() != 'Wind') || (getPageSetting("AutoStance") != 3) || (getEmpowerment() == 'Wind' && ((getPageSetting("WindStackingMin") > 0 && game.global.world < getPageSetting("WindStackingMin")) || (getPageSetting("WindStackingMin") <= 0)))) { if (getPageSetting("windcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) MODULES.maps.enoughDamageCutoff = 4; if (getPageSetting("windcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) @@ -509,14 +509,14 @@ function cutoffwind(){ } function dcutoffwind(){ - if (!game.global.runningChallengeSquared && (getPageSetting("AutoStance") == 3 || getPageSetting("use3daily") == true) && game.global.challenge == "Daily" && game.global.world >= getPageSetting("dWindStackingMin") && getEmpowerment() == 'Wind') { + if (!game.global.runningChallengeSquared && (getPageSetting("AutoStance") == 3 || getPageSetting("use3daily") == true) && game.global.world >= getPageSetting("dWindStackingMin") && getEmpowerment() == 'Wind') { if (getPageSetting("dwindcutoffmap") > 0 && MODULES.maps.enoughDamageCutoff != getPageSetting("dwindcutoffmap")) MODULES.maps.enoughDamageCutoff = getPageSetting("dwindcutoffmap"); if (getPageSetting("dwindcutoff") > 0 && MODULES.equipment.enoughDamageCutoff != getPageSetting("dwindcutoffmap")) MODULES.equipment.enoughDamageCutoff = getPageSetting("dwindcutoff"); } - else if (game.global.challenge == "Daily" && ((getEmpowerment() != 'Wind') || (getPageSetting("AutoStance") != 3 && getPageSetting("use3daily") == false) || (getEmpowerment() == 'Wind' && ((getPageSetting("dWindStackingMin") > 0 && game.global.world < getPageSetting("dWindStackingMin")) || (getPageSetting("dWindStackingMin") <= 0))))) { + else if ((getEmpowerment() != 'Wind') || (getPageSetting("AutoStance") != 3 && getPageSetting("use3daily") == false) || (getEmpowerment() == 'Wind' && ((getPageSetting("dWindStackingMin") > 0 && game.global.world < getPageSetting("dWindStackingMin")) || (getPageSetting("dWindStackingMin") <= 0)))) { if (getPageSetting("dwindcutoffmap") <= 0 || MODULES.maps.enoughDamageCutoff != 4) MODULES.maps.enoughDamageCutoff = 4; if (getPageSetting("dwindcutoff") <= 0 || MODULES.equipment.enoughDamageCutoff != 4) From bbcc7a1b882f76937d1cec7e4eed48fb5fd965cf Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 26 Sep 2018 07:49:26 +0100 Subject: [PATCH 1456/3477] Update other.js --- modules/other.js | 123 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/modules/other.js b/modules/other.js index c77f96bf1..d882509d5 100644 --- a/modules/other.js +++ b/modules/other.js @@ -427,6 +427,129 @@ function BWraiding() { } } +function dailyPraiding() { + var dpMap; + if (getPageSetting('dPraidingzone').length) { + if (getPageSetting('dPraidingzone').includes(game.global.world) && !dprestraid && !dfailpraid) { + debug('World Zone matches a Daily Praiding Zone!'); + dprestraidon = true; + if (getPageSetting('AutoMaps') == 1 && !dprestraid && !dfailpraid) { + autoTrimpSettings["AutoMaps"].value = 0; + } + if (!game.global.preMapsActive && !game.global.mapsActive && !dprestraid && !dfailpraid) { + mapsClicked(); + if (!game.global.preMapsActive) { + mapsClicked(); + } + debug("Beginning Daily Prestige Raiding..."); + } + if (game.options.menu.repeatUntil.enabled!=2 && !dprestraid && !dfailpraid) { + game.options.menu.repeatUntil.enabled = 2; + } + if (game.global.preMapsActive && !dprestraid && !dfailpraid) { + plusPres(); + if ((updateMapCost(true) <= game.resources.fragments.owned)) { + buyMap(); + dfailpraid = false; + dmapbought = true; + } + else if ((updateMapCost(true) > game.resources.fragments.owned)) { + if (getPageSetting('AutoMaps') == 0 && !dprestraid) { + autoTrimpSettings["AutoMaps"].value = 1; + dfailpraid = true; + dprestraidon = false; + dmapbought = false; + praidDone = true; + debug("Failed to Daily Prestige Raid. Looks like you can't afford to.."); + } + return; + } + } + if (dmapbought == true) { + dpMap = game.global.mapsOwnedArray[game.global.mapsOwnedArray.length-1].id; + selectMap(dpMap); + runMap(); + } + if (!dprestraid && !dfailpraid && !game.global.repeatMap) { + repeatClicked(); + } + dprestraid = true; + dfailpraid = false; + dmapbought = false; + } + } + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dprestraid && !dfailpraid && dprestraidon) { + praidDone = true; + dprestraidon = false; + autoTrimpSettings["AutoMaps"].value = 1; + debug("Daily Prestige Raiding successful! - recycling Praid map"); + recycleMap(getMapIndex(dpMap)); + debug("Turning AutoMaps back on"); + } + if (getPageSetting('dPraidingzone').every(isBelowThreshold)) { + dprestraid = false; + dfailpraid = false + dprestraidon = false; + dmapbought = false; + praidDone = false; + } +} + +function dailyBWraiding() { + if (!dprestraidon && game.global.world == getPageSetting('dBWraidingz') && !dbwraided && !dfailbwraid && getPageSetting('Dailybwraid')) { + if (getPageSetting('AutoMaps') == 1 && !dbwraided && !dfailbwraid) { + autoTrimpSettings["AutoMaps"].value = 0; + } + if (!game.global.preMapsActive && !game.global.mapsActive && !dbwraided && !dfailbwraid) { + mapsClicked(); + if (!game.global.preMapsActive) { + mapsClicked(); + } + } + if (game.options.menu.repeatUntil.enabled != 2 && !dbwraided && !dfailbwraid) { + game.options.menu.repeatUntil.enabled = 2; + } + if (game.global.preMapsActive && !dbwraided && !dfailbwraid) { + selectMap(findLastBionic().id); + dfailbwraid = false; + debug("Beginning Daily BW Raiding..."); + } + else if (game.global.preMapsActive && !dbwraided && !dfailbwraid) { + if (getPageSetting('AutoMaps') == 0 && game.global.world == getPageSetting('dBWraidingz') && !dbwraided) { + autoTrimpSettings["AutoMaps"].value = 1; + dfailbwraid = true; + debug("Failed to Daily BW raid. Looks like you don't have a BW to raid..."); + } + } + if (findLastBionic().level <= getPageSetting('dBWraidingmax') && !dbwraided && !dfailbwraid && game.global.preMapsActive) { + runMap(); + dbwraidon = true; + } + if (!game.global.repeatMap && !dbwraided && !dfailbwraid && game.global.mapsActive) { + repeatClicked(); + } + if (findLastBionic().level > getPageSetting('dBWraidingmax') && !dbwraided && !dfailbwraid) { + dbwraided = true; + dfailbwraid = false; + dbwraidon = false; + debug("...Successfully Daily BW raided!"); + } + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && game.global.world == getPageSetting('dBWraidingz') && dbwraided && !dfailbwraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); + } + } + if (getPageSetting('AutoMaps') == 0 && game.global.preMapsActive && dbwraided && !dfailbwraid) { + autoTrimpSettings["AutoMaps"].value = 1; + debug("Turning AutoMaps back on"); + } + if (dbwraided && !dfailbwraid && game.global.world !== getPageSetting('dBWraidingz')) { + dbwraided = false; + dfailbwraid = false; + dbwraidon = false; + } + } + function lootdump() { if (game.global.world==getPageSetting('lootdumpz') && !perked && getPageSetting('AutoAllocatePerks')==2 && getPageSetting('lootdumpz') > 0) { viewPortalUpgrades(); From 8e594cd083002366b4213659c26e844d267429e7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 26 Sep 2018 12:07:43 +0100 Subject: [PATCH 1457/3477] Update tabs.css --- tabs.css | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tabs.css b/tabs.css index 05651c27d..052c7b718 100644 --- a/tabs.css +++ b/tabs.css @@ -1,16 +1,13 @@ -/*For the autotrimps Top right Story/Loot/Unlocks/Combat/Settings/AutoTrimps Tabs, so they dont overlap*/ #logBtnGroup div { width: 19%!important; } div#logConfigHolder.btn-group { - width: 5%!important; /* overriding like 3 previous things :/ */ + width: 5%!important; } #logConfigBtn { - padding: 6px 0px!important; + padding: 6px 0!important; } -/*For the SettingsGUI.js settings window*/ -/* Style the list */ ul.tab { list-style-type: none; margin: 0; @@ -20,10 +17,8 @@ ul.tab { background-color: #f1f1f1; } -/* Float the list items side by side */ ul.tab li {float: left;} -/* Style the links inside the list items */ ul.tab li a { display: inline-block; color: black; @@ -33,13 +28,11 @@ ul.tab li a { transition: 0.3s; font-size: 2vh; } -/* Create an active/current tablink class */ + ul.tab li a.active {background-color: #ccc;} -/* Change background color of links on hover */ ul.tab li a:hover {background-color: #ddd;} -/* Style the tab content */ .tabcontent { display: none; border: 1px solid #ccc; @@ -74,7 +67,6 @@ ul.tab li a:hover {background-color: #ddd;} 100% { background-color: #83ddd6; } } -/* stop the additional breed timer we added from pushing down the whole Breeding area and pushing Traps out */ #trapArea { border: 1px solid white; display: inline-block; @@ -83,7 +75,6 @@ ul.tab li a:hover {background-color: #ddd;} padding: 0; } -/* stop the Traps building progress from showing through the AT settings screen */ #animationDiv { z-index: -1!important; } From 612a509fc3079332a86561175631cd1a43e96469 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 26 Sep 2018 12:09:31 +0100 Subject: [PATCH 1458/3477] Update styles.css --- github/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github/styles.css b/github/styles.css index 2e1768e14..a0739c56b 100644 --- a/github/styles.css +++ b/github/styles.css @@ -292,7 +292,7 @@ footer { padding:0; } - header ul, header p.view { + header ul, header .view { position:static; } From 6441028e433c125a98773cbe250ea9ccf467bf37 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 26 Sep 2018 12:10:47 +0100 Subject: [PATCH 1459/3477] Update tabs.css --- tabs.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tabs.css b/tabs.css index 052c7b718..3be20fdbb 100644 --- a/tabs.css +++ b/tabs.css @@ -29,7 +29,7 @@ ul.tab li a { font-size: 2vh; } -ul.tab li a.active {background-color: #ccc;} +ul.tab li .active {background-color: #ccc;} ul.tab li a:hover {background-color: #ddd;} @@ -52,7 +52,7 @@ ul.tab li a:hover {background-color: #ddd;} to {opacity: 1;} } -#tipText b.AutoEggs, +#tipText .AutoEggs, #AutoEggs.settingBtntrue { -webkit-animation: eggGradient 3s infinite; animation: eggGradient 3s infinite; From ef049e0189320ff6c0650b4032b2823805b6979b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 26 Sep 2018 12:11:21 +0100 Subject: [PATCH 1460/3477] Update dark-graph.css --- dark-graph.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dark-graph.css b/dark-graph.css index c8aecade9..bcacc0c90 100644 --- a/dark-graph.css +++ b/dark-graph.css @@ -1,8 +1,8 @@ -[id^='highcharts'] rect.highcharts-background, +[id^='highcharts'] .highcharts-background, [id^='highcharts'] .highcharts-tooltip > path:last-of-type { fill: rgba(0, 0, 0, 0.5) !important; } -[id^='highcharts'] rect.highcharts-selection-marker { +[id^='highcharts'] .highcharts-selection-marker { fill: rgba(255, 255, 255, 0.5); } [id^='highcharts'] .highcharts-xaxis > path, From 48373246408ae5fb951412d0f71b85209d4b8ddf Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 26 Sep 2018 12:12:36 +0100 Subject: [PATCH 1461/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 4be1f31e4..e24aaa74c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -619,5 +619,5 @@ function checkPortalSettings() { } function getDailyHeHrStats(){var a="";if("Daily"==game.global.challengeActive){var b=game.stats.heliumHour.value()/(game.global.totalHeliumEarned-(game.global.heliumLeftover+game.resources.helium.owned));b*=100+getDailyHeliumValue(countDailyWeight()),a="After Daily He/Hr: "+b.toFixed(3)+"%"}return a} -function settingsProfileMakeGUI(){}; +function settingsProfileMakeGUI(){} function toggleAutoMaps(){getPageSetting('AutoMaps')?setPageSetting('AutoMaps',0):setPageSetting('AutoMaps',1),document.getElementById('autoMapBtn').setAttribute('class','noselect settingsBtn settingBtn'+autoTrimpSettings.AutoMaps.value)} From 1cf647a2eb43b004f108d495dc4c557d3255b717 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 26 Sep 2018 12:17:59 +0100 Subject: [PATCH 1462/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index b369b8f45..f3d9234f9 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -16,7 +16,7 @@ function initializeAutoTrimps() { var changelogList = []; changelogList.push({date: "19/09/2018", version: "v2.7.3", description: "4.911 Added things, fixed things, please report broken things, thanks for using my things. ", isNew: true}); -changelogList.push({date: "12/09/2018", version: "v2.7.2", description: "4.91 Scryer Stuff really works now! No really! Nature Scryer got a rework. Removed AS1 in favor of AS2, so make sure yours is set! May need some tuning so let me know if it sucks! Replaced AS1 with D Stance. Amal Target for Amal boosting, may not work correctly, yet. Please let me know if it works though (or doesn\'t)! Added a setting to control mode Before Fueling in Magma. Small performance boost for liq zones. Thanks for using the fork in 4.91! ", isNew: false}); +changelogList.push({date: "12/09/2018", version: "v2.7.2", description: "4.91 Scryer Stuff really works now! No really! Nature Scryer got a rework. Removed AS1 in favor of AS2, so make sure yours is set! May need some tuning so let me know if it sucks! Replaced AS1 with D Stance. Amal Target for Amal boosting, may not work correctly, yet. Please let me know if it works though! Added a setting to control mode Before Fueling in Magma. Small performance boost for liq zones. Thanks for using the fork in 4.91! ", isNew: false}); changelogList.push({date: "06/09/2018", version: "v2.7.1", description: "4.901 Scryer Stuff actually works now, neat. Replaced one of the autogather options with a new more efficient option for late game. Fight always got an upgrade. Thanks for using the fork in 4.9(01)! ", isNew: false}); changelogList.push({date: "05/09/2018", version: "v2.7.0", description: "4.9 Here we go! Added the new Classy perk to Autoperks, along with updated ratios. Added an option in Buildings & Jobs to hide obsolete settings once you have unlocked certain masteries. Fixed Scryer. Added an option to Scry VMs without having to enable scrying. Added B instead of S for WS. ", isNew: false}); //changelogList.push({date: "03/09/2018", version: "v2.6.5", description: "Pre-pre-4.9 update. Check out the C2 Tab! And theres some more tiny optimizations too. ", isNew: false}); From 9c5eab6c4582c05ae2aeb6d2c2a9b71b910d504e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 26 Sep 2018 12:18:46 +0100 Subject: [PATCH 1463/3477] Update breedtimer.js --- modules/breedtimer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/breedtimer.js b/modules/breedtimer.js index 53d6bf1be..3377dacaf 100644 --- a/modules/breedtimer.js +++ b/modules/breedtimer.js @@ -7,7 +7,7 @@ function addBreedingBoxTimers() { var addbreedTimerContainer = document.createElement("DIV"); addbreedTimerContainer.setAttribute('class', "col-xs-11"); addbreedTimerContainer.setAttribute('style', 'padding-right: 0;'); - addbreedTimerContainer.setAttribute("onmouseover", 'tooltip(\"Hidden Next Group Breed Timer\", \"customText\", event, \"How long your next army has been breeding for, or how many anticipation stacks you will have if you send a new army now. This number is what BetterAutoFight #4 refers to when it says NextGroupBreedTimer.\")'); + addbreedTimerContainer.setAttribute("onmouseover", 'tooltip("Hidden Next Group Breed Timer", "customText", event, "How long your next army has been breeding for, or how many anticipation stacks you will have if you send a new army now. This number is what BetterAutoFight #4 refers to when it says NextGroupBreedTimer.")'); addbreedTimerContainer.setAttribute("onmouseout", 'tooltip("hide")'); var addbreedTimerInside = document.createElement("DIV"); addbreedTimerInside.setAttribute('style', 'display: block;'); From 45ee6490313b89f61aa023d2817e755661bea43d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 26 Sep 2018 12:21:23 +0100 Subject: [PATCH 1464/3477] Update fight-info.js --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index f5e6c7947..3368fe4dd 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -1 +1 @@ -(function(a){a.fightinfo={},a.fightinfo.$worldGrid=document.getElementById("grid"),a.fightinfo.$mapGrid=document.getElementById("mapGrid"),a.fightinfo.powerful=["Improbability","Omnipotrimp","Mutimp","Hulking_Mutimp"],a.fightinfo.exotics=["Feyimp","Tauntimp","Venimp","Whipimp","Magnimp","Goblimp","Flutimp","Jestimp","Titimp","Chronoimp"],a.fightinfo.colors={bone:"#ffffff",exotic:"#000000",powerful:"#000000"},a.fightinfo.lastProcessedWorld=null,a.fightinfo.lastProcessedMap=null,a.fightinfo.Update=function(){if(game.global.mapsActive)var c=game.global.mapGridArray,d=Array.prototype.slice.call(a.fightinfo.$mapGrid.children);else{if(null===a.fightinfo.lastProcessedWorld||a.fightinfo.lastProcessedWorld!==game.global.world)a.fightinfo.lastProcessedWorld=game.global.world;else return;var c=game.global.gridArray,d=Array.prototype.slice.call(a.fightinfo.$worldGrid.children)}d=d.reverse();var e=[];d.forEach(function(j){e=e.concat(Array.prototype.slice.call(j.children))});for(var f=0;f`,g.style.textShadow="0px 0px 15px #ffffff"):-1 ",g.style.textShadow="0px 0px 15px #8c0000"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"),null!=h.corrupted&&"none"!==h.corrupted?g.title+=`${h.name} \- ${mutationEffects[h.corrupted].title}`:game.global.mapsActive?g.title=`${h.name}`:g.title+=` ${h.name}`}}})(MODULES); +(function(a){a.fightinfo={},a.fightinfo.$worldGrid=document.getElementById("grid"),a.fightinfo.$mapGrid=document.getElementById("mapGrid"),a.fightinfo.powerful=["Improbability","Omnipotrimp","Mutimp","Hulking_Mutimp"],a.fightinfo.exotics=["Feyimp","Tauntimp","Venimp","Whipimp","Magnimp","Goblimp","Flutimp","Jestimp","Titimp","Chronoimp"],a.fightinfo.colors={bone:"#ffffff",exotic:"#000000",powerful:"#000000"},a.fightinfo.lastProcessedWorld=null,a.fightinfo.lastProcessedMap=null,a.fightinfo.Update=function(){if(game.global.mapsActive)var c=game.global.mapGridArray,d=Array.prototype.slice.call(a.fightinfo.$mapGrid.children);else{if(null===a.fightinfo.lastProcessedWorld||a.fightinfo.lastProcessedWorld!==game.global.world)a.fightinfo.lastProcessedWorld=game.global.world;else return;var c=game.global.gridArray,d=Array.prototype.slice.call(a.fightinfo.$worldGrid.children)}d=d.reverse();var e=[];d.forEach(function(j){e=e.concat(Array.prototype.slice.call(j.children))});for(var f=0;f`,g.style.textShadow="0px 0px 15px #ffffff"):-1 ",g.style.textShadow="0px 0px 15px #8c0000"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"),null!=h.corrupted&&"none"!==h.corrupted?g.title+=`${h.name} \- ${mutationEffects[h.corrupted].title}`:game.global.mapsActive?g.title=`${h.name}`:g.title+=` ${h.name}`}}})(MODULES); From 969a531995053438c9ee5a6c27355f184c132123 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 26 Sep 2018 12:31:44 +0100 Subject: [PATCH 1465/3477] Revert "Update fight-info.js" This reverts commit 45ee6490313b89f61aa023d2817e755661bea43d. --- modules/fight-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fight-info.js b/modules/fight-info.js index 3368fe4dd..f5e6c7947 100644 --- a/modules/fight-info.js +++ b/modules/fight-info.js @@ -1 +1 @@ -(function(a){a.fightinfo={},a.fightinfo.$worldGrid=document.getElementById("grid"),a.fightinfo.$mapGrid=document.getElementById("mapGrid"),a.fightinfo.powerful=["Improbability","Omnipotrimp","Mutimp","Hulking_Mutimp"],a.fightinfo.exotics=["Feyimp","Tauntimp","Venimp","Whipimp","Magnimp","Goblimp","Flutimp","Jestimp","Titimp","Chronoimp"],a.fightinfo.colors={bone:"#ffffff",exotic:"#000000",powerful:"#000000"},a.fightinfo.lastProcessedWorld=null,a.fightinfo.lastProcessedMap=null,a.fightinfo.Update=function(){if(game.global.mapsActive)var c=game.global.mapGridArray,d=Array.prototype.slice.call(a.fightinfo.$mapGrid.children);else{if(null===a.fightinfo.lastProcessedWorld||a.fightinfo.lastProcessedWorld!==game.global.world)a.fightinfo.lastProcessedWorld=game.global.world;else return;var c=game.global.gridArray,d=Array.prototype.slice.call(a.fightinfo.$worldGrid.children)}d=d.reverse();var e=[];d.forEach(function(j){e=e.concat(Array.prototype.slice.call(j.children))});for(var f=0;f`,g.style.textShadow="0px 0px 15px #ffffff"):-1 ",g.style.textShadow="0px 0px 15px #8c0000"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"),null!=h.corrupted&&"none"!==h.corrupted?g.title+=`${h.name} \- ${mutationEffects[h.corrupted].title}`:game.global.mapsActive?g.title=`${h.name}`:g.title+=` ${h.name}`}}})(MODULES); +(function(a){a.fightinfo={},a.fightinfo.$worldGrid=document.getElementById("grid"),a.fightinfo.$mapGrid=document.getElementById("mapGrid"),a.fightinfo.powerful=["Improbability","Omnipotrimp","Mutimp","Hulking_Mutimp"],a.fightinfo.exotics=["Feyimp","Tauntimp","Venimp","Whipimp","Magnimp","Goblimp","Flutimp","Jestimp","Titimp","Chronoimp"],a.fightinfo.colors={bone:"#ffffff",exotic:"#000000",powerful:"#000000"},a.fightinfo.lastProcessedWorld=null,a.fightinfo.lastProcessedMap=null,a.fightinfo.Update=function(){if(game.global.mapsActive)var c=game.global.mapGridArray,d=Array.prototype.slice.call(a.fightinfo.$mapGrid.children);else{if(null===a.fightinfo.lastProcessedWorld||a.fightinfo.lastProcessedWorld!==game.global.world)a.fightinfo.lastProcessedWorld=game.global.world;else return;var c=game.global.gridArray,d=Array.prototype.slice.call(a.fightinfo.$worldGrid.children)}d=d.reverse();var e=[];d.forEach(function(j){e=e.concat(Array.prototype.slice.call(j.children))});for(var f=0;f`,g.style.textShadow="0px 0px 15px #ffffff"):-1 ",g.style.textShadow="0px 0px 15px #8c0000"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1 ",g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"):-1`,g.style.textShadow="0px 0px 15px #fb753f"),null!=h.corrupted&&"none"!==h.corrupted?g.title+=`${h.name} \- ${mutationEffects[h.corrupted].title}`:game.global.mapsActive?g.title=`${h.name}`:g.title+=` ${h.name}`}}})(MODULES); From 2a679159f9e036e42f4f6db2a6110e3274af9269 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 10:23:01 +0100 Subject: [PATCH 1466/3477] Update scryer.js --- modules/scryer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/scryer.js b/modules/scryer.js index dc161c3f4..ef9864f38 100644 --- a/modules/scryer.js +++ b/modules/scryer.js @@ -18,7 +18,7 @@ var never_scry = game.global.preMapsActive || game.global.gridArray.length === 0 never_scry = never_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getCurrentMapObject().location == "Void" && getPageSetting('ScryerUseinVoidMaps2') == 0); never_scry = never_scry || (getPageSetting('UseScryerStance') == true && game.global.mapsActive && getCurrentMapObject().location == "Bionic" && getPageSetting('ScryerUseinBW') == 0); never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && isActiveSpireAT() && getPageSetting('ScryerUseinSpire2') == 0); - never_scry = never_scry || (getPageSetting('UseScryerStance') == true && getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); + never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && getPageSetting('ScryerSkipBoss2') == 1 && game.global.world < getPageSetting('VoidMaps') && game.global.lastClearedCell == 98) || (getPageSetting('ScryerSkipBoss2') == 0 && game.global.lastClearedCell == 98); never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && (getEmpowerment() == "Poison" && (getPageSetting('ScryUseinPoison') == 0 || (getPageSetting('ScryUseinPoison') > 0 && game.global.world >= getPageSetting('ScryUseinPoison')))) || (getEmpowerment() == "Wind" && (getPageSetting('ScryUseinWind') == 0 || (getPageSetting('ScryUseinWind') > 0 && game.global.world >= getPageSetting('ScryUseinWind')))) || (getEmpowerment() == "Ice" && (getPageSetting('ScryUseinIce') == 0 || (getPageSetting('ScryUseinIce') > 0 && game.global.world >= getPageSetting('ScryUseinIce'))))); never_scry = never_scry || (getPageSetting('UseScryerStance') == true && !game.global.mapsActive && getPageSetting('screwessence') == true && countRemainingEssenceDrops() < 1); From ced7755ea583b65e7c1a07cf58c62c7765d0b38a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 12:21:37 +0100 Subject: [PATCH 1467/3477] Update utils.js --- modules/utils.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/utils.js b/modules/utils.js index 59085cde4..f75ec10d3 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -61,8 +61,11 @@ function serializeSettings() { }, {})); } +function serializeSettings60() { + return '{"ManualGather2":1,"ATversion":"2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0","BuyUpgrades":true,"TrapTrimps":true,"ManageBreedtimer":false,"UsePatience":true,"GeneticistTimer":-1,"SpireBreedTimer":60,"AutoAllocatePerks":0,"AutoStartDaily":false,"AutoFinishDaily":false,"AutoFinishDailyZone":-30,"FinishC2":-1,"AutoEggs":true,"ManualCoords":2,"AutoPortal":"Off","HeliumHourChallenge":"None","CustomAutoPortal":999,"HeHrDontPortalBefore":496,"HeliumHrBuffer":1,"PauseScript":false,"BuyStorage":true,"BuyBuildings":true,"WarpstationCap":true,"WarpstationCoordBuy":true,"MaxHut":100,"MaxHouse":100,"MaxMansion":100,"MaxHotel":100,"MaxResort":100,"MaxGateway":50,"MaxWormhole":"0","MaxCollector":-1,"MaxGym":"-1","MaxTribute":"-1","GymWall":-1,"FirstGigastation":10,"DeltaGigastation":2,"WarpstationWall3":1,"MaxNursery":-1,"NoNurseriesUntil":-1,"PreSpireNurseries":-1,"BuyJobs":true,"WorkerRatios":true,"AutoMagmamancers":true,"FarmerRatio":1,"LumberjackRatio":11,"MinerRatio":12,"MaxScientists":-1,"MaxExplorers":"-1","MaxTrainers":"-1","TrainerCaptoTributes":10,"BreedFire":false,"BuyArmor":true,"BuyArmorUpgrades":true,"BuyWeapons":true,"BuyWeaponUpgrades":true,"CapEquip2":15,"DynamicPrestige2":-1,"Prestige":"Dagadder","PrestigeBackup":{"selected":"Dagadder","id":"PrestigeBackup","name":"PrestigeBackup"},"ForcePresZ":-1,"PrestigeSkipMode":false,"PrestigeSkip2":false,"DelayArmorWhenNeeded":false,"BuyShieldblock":true,"AutoMaps":1,"DynamicSiphonology":true,"PreferMetal":false,"MaxMapBonusAfterZone":-1,"DisableFarm":16,"LowerFarmingZone":true,"MaxStacksForSpire":true,"MinutestoFarmBeforeSpire":0,"IgnoreSpiresUntil":0,"RunBionicBeforeSpire":false,"ExitSpireCell":-1,"CorruptionCalc":true,"FarmWhenNomStacks7":true,"VoidMaps":-1,"RunNewVoids":true,"RunNewVoidsUntil":-1,"VoidCheck":6,"MaxTox":false,"TrimpleZ":0,"AdvMapSpecialModifier":false,"BetterAutoFight":2,"AutoStance":1,"IgnoreCrits":0,"PowerSaving":0,"ForceAbandon":true,"DynamicGyms":true,"AutoRoboTrimp":60,"UseScryerStance":true,"ScryerUseWhenOverkill":true,"ScryerMinZone":181,"ScryerMaxZone":-1,"ScryerUseinMaps2":0,"ScryerUseinVoidMaps2":0,"ScryerUseinSpire2":0,"ScryerSkipBoss2":0,"ScryerSkipCorrupteds2":2,"ScryerDieToUseS":false,"ScryerDieZ":181,"UseAutoGen":true,"AutoGen2":1,"AutoGen2End":400,"AutoGen2SupplyEnd":true,"AutoGen3":0,"AutoGenDC":1,"AutoGenC2":1,"AutoGen2Override":1,"AutoMagmiteSpender2":1,"SupplyWall":2.4,"OneTimeOnly":false,"BuyOvclock":false,"AutoHeirlooms":true,"AutoHeirlooms2":true,"AutoUpgradeHeirlooms":false,"AutoGoldenUpgrades":"Helium","goldStrat":"Max then Helium","goldAlternating":1.5,"goldZone":401,"goldNoBattle":false,"AutoNatureTokens":true,"AutoPoison":"Empowerment","AutoWind":"Empowerment","AutoIce":"Empowerment","EnhanceGrids":false,"SpamGeneral":true,"SpamUpgrades":false,"SpamEquipment":false,"SpamMaps":true,"SpamOther":true,"SpamBuilding":false,"SpamJobs":false,"SpamGraphs":false,"SpamMagmite":true,"SpamPerks":true,"allowSettingsUpload":true,"analyticsID":"b93c4930-760d-4feb-9330-f72041b1d362","BuyUpgradesNew":1,"fastallocate":false,"lootdumpz":-1,"lootdumpa":-1,"AutoFinishDailyNew":1,"BuyBuildingsNew":1,"BuyJobsNew":1,"BuyArmorNew":1,"BuyWeaponsNew":1,"PrestigeSkip1_2":0,"RunNewVoidsUntilNew":-1,"DailyVoidMod":-1,"VoidPraid":false,"Praidingzone":[-1],"BWraid":false,"BWraidingz":[-1],"BWraidingmax":[-1],"WindStackingMin":100,"ScryUseinPoison":-1,"ScryUseinWind":0,"ScryUseinIce":-1,"BuyOneTimeOC":2,"AutoHeirloomsNew":2,"ShowSettings":true,"Raiding":false,"RaidingStartZone":506,"PrestigeRaiding":0,"AutomateAT":true,"DailyVMZone":525,"FillerVMZone":510,"FillerSpireCell":40,"WindStack":true,"WindStackCutOff":60,"Dailyportal":546,"dVoidPraid":true,"dPraidingzone":[-1],"dexitspirecell":-1,"Dailybwraid":false,"dBWraidingz":[-1],"dBWraidingmax":[-1],"trimpsnotdie":true,"gearamounttobuy":1,"WindStackingMax":195,"buyheliumy":-1,"use3daily":false,"buynojobsc":true,"fightforever":-1,"windcutoff":-1,"spireshitbuy":true,"hardcorewind":-1,"dPraidHarder":false,"dMaxPraidZone":[-1],"dPraidFarmFragsZ":[-1],"dPraidBeforeFarmZ":[-1],"dWindStackingMin":100,"dWindStackingMax":195,"dwindcutoff":-1,"dhardcorewind":-1,"PraidHarder":false,"MaxPraidZone":[-1],"PraidFarmFragsZ":[-1],"PraidBeforeFarmZ":[-1],"fuellater":300,"ScryerSkipHealthy":2,"addpoison":false,"amalcoord":false,"dhardcorewindmax":-1,"cfightforever":true,"work":"false","in":"false","progress":"false","hardcorewindmax":"-1","dAutoGoldenUpgrades":"Helium","cAutoGoldenUpgrades":"Battle","dfightforever":2,"fuelend":260,"defaultgen":2,"spendmagmite":2,"spendmagmitesetting":0,"amalcoordhd":0.000025,"amalcoordz":-1,"dultwind":-1,"dultwindcut":-1,"dwindhealthy":"false","darmormagic":3,"carmormagic":1,"CapEquiparm":15,"ultwind":-1,"ultwindcut":"0.00025","windhealthy":false,"onlyminmaxworld":true,"fuckanti":-1,"dscryvoidmaps":false,"scryvoidmaps":false,"dusebstance":false,"AutoPortalDaily":0,"dHeliumHourChallenge":"None","dCustomAutoPortal":560,"dHeHrDontPortalBefore":"999","dHeliumHrBuffer":"0","usebstance":"false","hidebuildings":false,"fuckjobs":false,"amalcoordt":-1,"screwessence":true,"beforegen":2,"c2runnerstart":false,"c2runnerportal":"999","mapc2hd":6,"buywepsvoid":true,"ScryerUseinBW":0,"dwindcutoffmap":-1,"windcutoffmap":-1}'; + function serializeSettings550() { - return '{"ManualGather2":2,"BetterAutoFight":3,"AutoStance":2,"TrapTrimps":false,"AutoPortal":"Custom","HeliumHourChallenge":"Corrupted","CustomAutoPortal":555,"HeHrDontPortalBefore":496,"HeliumHrBuffer":3,"AutoStartDaily":false,"PauseScript":false,"BuyShieldblock":false,"Prestige":"Dagadder","DynamicPrestige2":-1,"DelayArmorWhenNeeded":false,"CapEquip2":125,"AutoMaps":1,"DynamicSiphonology":true,"LowerFarmingZone":true,"MinutestoFarmBeforeSpire":0,"RunBionicBeforeSpire":false,"ExitSpireCell":90,"CorruptionCalc":true,"FarmWhenNomStacks7":true,"VoidMaps":555,"VoidCheck":1,"MaxTox":false,"DisableFarm":-1,"FarmerRatio":20,"LumberjackRatio":10,"MinerRatio":1000,"MaxScientists":"-1","MaxExplorers":3000,"MaxTrainers":-1,"MaxHut":100,"MaxHouse":0,"MaxMansion":0,"MaxHotel":0,"MaxResort":0,"MaxGateway":0,"MaxWormhole":0,"MaxCollector":0,"FirstGigastation":1,"DeltaGigastation":1,"MaxGym":"-1","MaxTribute":"-1","MaxNursery":-1,"AutoMagmamancers":true,"WarpstationCap":false,"WarpstationWall3":-1,"WarpstationCoordBuy":false,"AutoRoboTrimp":270,"AutoGoldenUpgrades":"Void 60","AutoUpgradeHeirlooms":false,"NoNurseriesUntil":700,"ForceAbandon":true,"GymWall":-1,"DynamicGyms":true,"AutoAllocatePerks":2,"SpireBreedTimer":-1,"UseScryerStance":false,"ScryerUseWhenOverkill":false,"ScryerMinZone":530,"ScryerMaxZone":-1,"ScryerUseinMaps2":0,"ScryerUseinVoidMaps2":0,"ScryerUseinSpire2":0,"ScryerSkipBoss2":0,"ScryerSkipCorrupteds2":2,"SpamGeneral":true,"SpamUpgrades":false,"SpamEquipment":false,"SpamMaps":false,"SpamOther":false,"SpamBuilding":false,"SpamJobs":false,"TrimpleZ":0,"ScryerDieZ":230.6,"IgnoreCrits":2,"ForcePresZ":-1,"PreferMetal":false,"PreSpireNurseries":7000,"FinishC2":-1,"PowerSaving":0,"UseAutoGen":1,"AutoGenDC":1,"AutoGenC2":1,"SupplyWall":1,"IgnoreSpiresUntil":500,"MaxStacksForSpire":true,"AutoNatureTokens":true,"AutoPoison":"Convert to Wind","AutoWind":"Empowerment","AutoIce":"Convert to Wind","MaxMapBonusAfterZone":-1,"SpamGraphs":false,"EnhanceGrids":false,"EnableAFK":{"id":"EnableAFK","name":"Enable AFK","description":"Enables CPU and RAM saving AFK-mode","type":"action","value":1},"SpamMagmite":false,"SpamPerks":true,"ChangeLog":{"id":"ChangeLog","name":"Show Changelog","description":"Shows the changelog popup message that AT loads on startup in case you missed it.","type":"action","value":1},"AdvMapSpecialModifier":false,"BuyUpgradesNew":1,"BuyBuildingsNew":0,"BuyJobsNew":0,"BuyArmorNew":1,"BuyWeaponsNew":1,"PrestigeSkip1_2":0,"RunNewVoidsUntilNew":0,"DailyVoidMod":570,"Praidingzone":[495,546,555],"BWraid":false,"BWraidingmax":[640],"lootdumpz":260,"WindStackingMin":-1,"ScryUseinPoison":-1,"ScryUseinWind":-1,"ScryUseinIce":-1,"AutoHeirloomsNew":2,"BWraidingz":[597],"fastallocate":true,"trimpsnotdie":true,"gearamounttobuy":5,"dPraidingzone":[495,510,525,540,546,555,566,570],"Dailybwraid":false,"dBWraidingz":[495],"dBWraidingmax":[515],"dexitspirecell":-1,"WindStackingMax":190,"buyheliumy":-1,"buynojobsc":true,"fightforever":0,"use3daily":true,"windcutoff":-1,"spireshitbuy":true,"hardcorewind":-1,"PraidHarder":false,"dPraidHarder":false,"dMaxPraidZone":[-1],"dPraidFarmFragsZ":[-1],"dPraidBeforeFarmZ":[-1],"MaxPraidZone":[505,535,545,555,561],"PraidFarmFragsZ":[495],"PraidBeforeFarmZ":[-1],"fuellater":260,"dWindStackingMin":450,"dWindStackingMax":190,"dwindcutoff":160,"dhardcorewind":480,"ScryerSkipHealthy":2,"addpoison":true,"amalcoord":true,"dAutoGoldenUpgrades":"Void 60","cAutoGoldenUpgrades":"Battle","dhardcorewindmax":"-1","cfightforever":true,"hardcorewindmax":"-1","dfightforever":2,"fuelend":360,"defaultgen":0,"spendmagmite":2,"spendmagmitesetting":1,"ultwind":-1,"ultwindcut":0.05,"CapEquiparm":100,"amalcoordhd":0.0000025,"onlyminmaxworld":false,"amalcoordz":398,"dultwind":"-1","dultwindcut":"0.00025","dwindhealthy":"false","windhealthy":false,"darmormagic":3,"carmormagic":3,"fuckanti":"-1","dscryvoidmaps":true,"scryvoidmaps":true,"dusebstance":true,"usebstance":true,"AutoPortalDaily":2,"dCustomAutoPortal":575,"dHeHrDontPortalBefore":"999","dHeliumHrBuffer":"0","dHeliumHourChallenge":"Corrupted","hidebuildings":true,"fuckjobs":true}'; + return '{"ManualGather2":2,"ATversion":"2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0","BetterAutoFight":3,"AutoStance":2,"BuyStorage":true,"BuyBuildings":true,"BuyUpgrades":true,"BuyJobs":true,"TrapTrimps":false,"AutoHeirlooms":true,"HireScientists":true,"WorkerRatios":false,"ManageBreedtimer":false,"AutoPortal":"Custom","HeliumHourChallenge":"Corrupted","CustomAutoPortal":560,"HeHrDontPortalBefore":496,"HeliumHrBuffer":3,"AutoFinishDaily":true,"AutoFinishDailyZone":0,"AutoStartDaily":true,"PauseScript":false,"BuyArmor":true,"BuyArmorUpgrades":true,"BuyWeapons":true,"BuyWeaponUpgrades":true,"BuyShieldblock":false,"Prestige":"Dagadder","PrestigeBackup":{"selected":"Dagadder","id":"PrestigeBackup","name":"PrestigeBackup"},"DynamicPrestige2":-1,"PrestigeSkipMode":false,"AlwaysArmorLvl2":true,"WaitTill60":true,"DelayArmorWhenNeeded":false,"CapEquip2":200,"AutoMaps":1,"DynamicSiphonology":true,"LowerFarmingZone":true,"MinutestoFarmBeforeSpire":0,"RunBionicBeforeSpire":false,"ExitSpireCell":-1,"CorruptionCalc":true,"FarmWhenNomStacks7":true,"VoidMaps":555,"RunNewVoids":false,"RunNewVoidsUntil":600,"VoidCheck":1,"MaxTox":false,"DisableFarm":-1,"FarmerRatio":20,"LumberjackRatio":10,"MinerRatio":1000,"MaxScientists":"-1","MaxExplorers":3000,"MaxTrainers":-1,"MaxHut":100,"MaxHouse":0,"MaxMansion":0,"MaxHotel":0,"MaxResort":0,"MaxGateway":0,"MaxWormhole":0,"MaxCollector":0,"FirstGigastation":1,"DeltaGigastation":1,"MaxGym":"-1","MaxTribute":"-1","MaxNursery":-1,"BreedFire":false,"AutoMagmamancers":false,"WarpstationCap":false,"WarpstationWall3":-1,"WarpstationCoordBuy":false,"AutoRoboTrimp":270,"AutoGoldenUpgrades":"Void 60","AutoHeirlooms2":false,"AutoUpgradeHeirlooms":false,"TrainerCaptoTributes":"-1","NoNurseriesUntil":498,"AutoMagmiteSpender2":2,"ForceAbandon":true,"GymWall":-1,"DynamicGyms":true,"AutoAllocatePerks":2,"SpireBreedTimer":-1,"UseScryerStance":false,"ScryerUseWhenOverkill":false,"ScryerMinZone":530,"ScryerMaxZone":-1,"ScryerUseinMaps2":0,"ScryerUseinVoidMaps2":0,"ScryerUseinSpire2":0,"ScryerSkipBoss2":0,"ScryerSkipCorrupteds2":2,"ScryerDieToUseS":true,"SpamGeneral":true,"SpamUpgrades":false,"SpamEquipment":false,"SpamMaps":false,"SpamOther":false,"SpamBuilding":false,"SpamJobs":false,"ManualCoords":false,"TrimpleZ":0,"ScryerDieZ":230.6,"IgnoreCrits":2,"ForcePresZ":-1,"PreferMetal":false,"PreSpireNurseries":7000,"FinishC2":-1,"PowerSaving":0,"PrestigeSkip2":false,"AutoEggs":false,"UseAutoGen":1,"AutoGen2":3,"AutoGen2End":320,"AutoGen2SupplyEnd":false,"AutoGen3":0,"AutoGenDC":1,"AutoGenC2":1,"AutoGen2Override":1,"SupplyWall":1,"OneTimeOnly":false,"BuyOvclock":false,"IgnoreSpiresUntil":500,"goldStrat":"Max then Helium","goldAlternating":2,"goldZone":600,"MaxStacksForSpire":true,"UsePatience":false,"AutoNatureTokens":true,"AutoPoison":"Empowerment","AutoWind":"Convert to Poison","AutoIce":"Convert to Poison","MaxMapBonusAfterZone":-1,"SpamGraphs":false,"allowSettingsUpload":false,"EnhanceGrids":false,"EnableAFK":{"id":"EnableAFK","name":"Enable AFK","description":"Enables CPU and RAM saving AFK-mode","type":"action","value":1},"SpamMagmite":false,"SpamPerks":true,"analyticsID":"7f11701e-adc9-477c-a08d-2b66fe3ec2a2","ChangeLog":{"id":"ChangeLog","name":"Show Changelog","description":"Shows the changelog popup message that AT loads on startup in case you missed it.","type":"action","value":1},"AdvMapSpecialModifier":false,"GeneticistTimer":-1,"goldNoBattle":true,"BuyUpgradesNew":1,"AutoFinishDailyNew":0,"BuyBuildingsNew":0,"BuyJobsNew":0,"BuyArmorNew":1,"BuyWeaponsNew":1,"PrestigeSkip1_2":0,"RunNewVoidsUntilNew":0,"DailyVoidMod":570,"PlusMapVoidToggle":0,"Praidingzone":[495,546,555,561,566,570],"BWraid":false,"BWraidingmin":-1,"BWraidingmax":[640],"lootdumpz":265,"lootdumpa":10000,"WindStackingMin":-1,"ScryUseinPoison":-1,"ScryUseinWind":-1,"ScryUseinIce":-1,"BuyOneTimeOC":2,"AutoHeirloomsNew":2,"ShowSettings":true,"BWraidingz":[597],"fastallocate":true,"VoidPraid":true,"trimpsnotdie":true,"gearamounttobuy":5,"Dailyportal":560,"dVoidPraid":true,"dPraidingzone":[495,510,525,540,555,570],"Dailybwraid":false,"dBWraidingz":[495],"dBWraidingmax":[515],"dexitspirecell":-1,"WindStackingMax":190,"buyheliumy":-1,"buynojobsc":true,"Trimpicide":true,"fightforever":0,"use3daily":true,"windcutoff":-1,"spireshitbuy":true,"hardcorewind":-1,"PraidHarder":false,"PraidFarmFrags":false,"PraidBeforeFarm":false,"dPraidHarder":false,"dMaxPraidZone":[-1],"dPraidFarmFragsZ":[-1],"dPraidBeforeFarmZ":[-1],"MaxPraidZone":[505,535,545,555,561],"PraidFarmFragsZ":[495],"PraidBeforeFarmZ":[-1],"fuellater":260,"dWindStackingMin":450,"dWindStackingMax":190,"dwindcutoff":160,"dhardcorewind":480,"ScryerSkipHealthy":2,"addpoison":true,"amalcoord":true,"dAutoGoldenUpgrades":"Void 60","cAutoGoldenUpgrades":"Battle","dhardcorewindmax":"-1","cfightforever":true,"work":false,"in":false,"progress":false,"hardcorewindmax":"-1","dfightforever":2,"fuelend":320,"defaultgen":0,"spendmagmite":2,"spendmagmitesetting":1,"ultwind":-1,"ultwindcut":0.05,"CapEquiparm":100,"amalcoordhd":0.0000025,"onlyminmaxworld":false,"amalcoordz":398,"dultwind":"-1","dultwindcut":"0.00025","dwindhealthy":"false","windhealthy":false,"mapcutoff":4,"darmormagic":3,"carmormagic":3,"fuckanti":"-1","dscryvoidmaps":true,"scryvoidmaps":true,"dusebstance":true,"usebstance":true,"AutoPortalDaily":2,"dCustomAutoPortal":575,"dHeHrDontPortalBefore":"999","dHeliumHrBuffer":"0","dHeliumHourChallenge":"Corrupted","hidebuildings":true,"fuckjobs":true,"amalcoordt":6,"screwessence":false,"beforegen":0,"c2runnerstart":false,"c2runnerportal":"999","buywepsvoid":true,"mapc2hd":"-1","ScryerUseinBW":0,"dwindcutoffmap":160,"windcutoffmap":"-1"}'; } function saveSettings(){safeSetItems('autoTrimpSettings',serializeSettings())} From c03a023a99f0579a02f8bcc3ca32ec327db1e785 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 12:25:36 +0100 Subject: [PATCH 1468/3477] Update utils.js --- modules/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/utils.js b/modules/utils.js index f75ec10d3..af76affb1 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -63,7 +63,7 @@ function serializeSettings() { function serializeSettings60() { return '{"ManualGather2":1,"ATversion":"2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0","BuyUpgrades":true,"TrapTrimps":true,"ManageBreedtimer":false,"UsePatience":true,"GeneticistTimer":-1,"SpireBreedTimer":60,"AutoAllocatePerks":0,"AutoStartDaily":false,"AutoFinishDaily":false,"AutoFinishDailyZone":-30,"FinishC2":-1,"AutoEggs":true,"ManualCoords":2,"AutoPortal":"Off","HeliumHourChallenge":"None","CustomAutoPortal":999,"HeHrDontPortalBefore":496,"HeliumHrBuffer":1,"PauseScript":false,"BuyStorage":true,"BuyBuildings":true,"WarpstationCap":true,"WarpstationCoordBuy":true,"MaxHut":100,"MaxHouse":100,"MaxMansion":100,"MaxHotel":100,"MaxResort":100,"MaxGateway":50,"MaxWormhole":"0","MaxCollector":-1,"MaxGym":"-1","MaxTribute":"-1","GymWall":-1,"FirstGigastation":10,"DeltaGigastation":2,"WarpstationWall3":1,"MaxNursery":-1,"NoNurseriesUntil":-1,"PreSpireNurseries":-1,"BuyJobs":true,"WorkerRatios":true,"AutoMagmamancers":true,"FarmerRatio":1,"LumberjackRatio":11,"MinerRatio":12,"MaxScientists":-1,"MaxExplorers":"-1","MaxTrainers":"-1","TrainerCaptoTributes":10,"BreedFire":false,"BuyArmor":true,"BuyArmorUpgrades":true,"BuyWeapons":true,"BuyWeaponUpgrades":true,"CapEquip2":15,"DynamicPrestige2":-1,"Prestige":"Dagadder","PrestigeBackup":{"selected":"Dagadder","id":"PrestigeBackup","name":"PrestigeBackup"},"ForcePresZ":-1,"PrestigeSkipMode":false,"PrestigeSkip2":false,"DelayArmorWhenNeeded":false,"BuyShieldblock":true,"AutoMaps":1,"DynamicSiphonology":true,"PreferMetal":false,"MaxMapBonusAfterZone":-1,"DisableFarm":16,"LowerFarmingZone":true,"MaxStacksForSpire":true,"MinutestoFarmBeforeSpire":0,"IgnoreSpiresUntil":0,"RunBionicBeforeSpire":false,"ExitSpireCell":-1,"CorruptionCalc":true,"FarmWhenNomStacks7":true,"VoidMaps":-1,"RunNewVoids":true,"RunNewVoidsUntil":-1,"VoidCheck":6,"MaxTox":false,"TrimpleZ":0,"AdvMapSpecialModifier":false,"BetterAutoFight":2,"AutoStance":1,"IgnoreCrits":0,"PowerSaving":0,"ForceAbandon":true,"DynamicGyms":true,"AutoRoboTrimp":60,"UseScryerStance":true,"ScryerUseWhenOverkill":true,"ScryerMinZone":181,"ScryerMaxZone":-1,"ScryerUseinMaps2":0,"ScryerUseinVoidMaps2":0,"ScryerUseinSpire2":0,"ScryerSkipBoss2":0,"ScryerSkipCorrupteds2":2,"ScryerDieToUseS":false,"ScryerDieZ":181,"UseAutoGen":true,"AutoGen2":1,"AutoGen2End":400,"AutoGen2SupplyEnd":true,"AutoGen3":0,"AutoGenDC":1,"AutoGenC2":1,"AutoGen2Override":1,"AutoMagmiteSpender2":1,"SupplyWall":2.4,"OneTimeOnly":false,"BuyOvclock":false,"AutoHeirlooms":true,"AutoHeirlooms2":true,"AutoUpgradeHeirlooms":false,"AutoGoldenUpgrades":"Helium","goldStrat":"Max then Helium","goldAlternating":1.5,"goldZone":401,"goldNoBattle":false,"AutoNatureTokens":true,"AutoPoison":"Empowerment","AutoWind":"Empowerment","AutoIce":"Empowerment","EnhanceGrids":false,"SpamGeneral":true,"SpamUpgrades":false,"SpamEquipment":false,"SpamMaps":true,"SpamOther":true,"SpamBuilding":false,"SpamJobs":false,"SpamGraphs":false,"SpamMagmite":true,"SpamPerks":true,"allowSettingsUpload":true,"analyticsID":"b93c4930-760d-4feb-9330-f72041b1d362","BuyUpgradesNew":1,"fastallocate":false,"lootdumpz":-1,"lootdumpa":-1,"AutoFinishDailyNew":1,"BuyBuildingsNew":1,"BuyJobsNew":1,"BuyArmorNew":1,"BuyWeaponsNew":1,"PrestigeSkip1_2":0,"RunNewVoidsUntilNew":-1,"DailyVoidMod":-1,"VoidPraid":false,"Praidingzone":[-1],"BWraid":false,"BWraidingz":[-1],"BWraidingmax":[-1],"WindStackingMin":100,"ScryUseinPoison":-1,"ScryUseinWind":0,"ScryUseinIce":-1,"BuyOneTimeOC":2,"AutoHeirloomsNew":2,"ShowSettings":true,"Raiding":false,"RaidingStartZone":506,"PrestigeRaiding":0,"AutomateAT":true,"DailyVMZone":525,"FillerVMZone":510,"FillerSpireCell":40,"WindStack":true,"WindStackCutOff":60,"Dailyportal":546,"dVoidPraid":true,"dPraidingzone":[-1],"dexitspirecell":-1,"Dailybwraid":false,"dBWraidingz":[-1],"dBWraidingmax":[-1],"trimpsnotdie":true,"gearamounttobuy":1,"WindStackingMax":195,"buyheliumy":-1,"use3daily":false,"buynojobsc":true,"fightforever":-1,"windcutoff":-1,"spireshitbuy":true,"hardcorewind":-1,"dPraidHarder":false,"dMaxPraidZone":[-1],"dPraidFarmFragsZ":[-1],"dPraidBeforeFarmZ":[-1],"dWindStackingMin":100,"dWindStackingMax":195,"dwindcutoff":-1,"dhardcorewind":-1,"PraidHarder":false,"MaxPraidZone":[-1],"PraidFarmFragsZ":[-1],"PraidBeforeFarmZ":[-1],"fuellater":300,"ScryerSkipHealthy":2,"addpoison":false,"amalcoord":false,"dhardcorewindmax":-1,"cfightforever":true,"work":"false","in":"false","progress":"false","hardcorewindmax":"-1","dAutoGoldenUpgrades":"Helium","cAutoGoldenUpgrades":"Battle","dfightforever":2,"fuelend":260,"defaultgen":2,"spendmagmite":2,"spendmagmitesetting":0,"amalcoordhd":0.000025,"amalcoordz":-1,"dultwind":-1,"dultwindcut":-1,"dwindhealthy":"false","darmormagic":3,"carmormagic":1,"CapEquiparm":15,"ultwind":-1,"ultwindcut":"0.00025","windhealthy":false,"onlyminmaxworld":true,"fuckanti":-1,"dscryvoidmaps":false,"scryvoidmaps":false,"dusebstance":false,"AutoPortalDaily":0,"dHeliumHourChallenge":"None","dCustomAutoPortal":560,"dHeHrDontPortalBefore":"999","dHeliumHrBuffer":"0","usebstance":"false","hidebuildings":false,"fuckjobs":false,"amalcoordt":-1,"screwessence":true,"beforegen":2,"c2runnerstart":false,"c2runnerportal":"999","mapc2hd":6,"buywepsvoid":true,"ScryerUseinBW":0,"dwindcutoffmap":-1,"windcutoffmap":-1}'; - +} function serializeSettings550() { return '{"ManualGather2":2,"ATversion":"2.1.6.9b-genbtc-4-2-2018 + KFrowde + Zeker0","BetterAutoFight":3,"AutoStance":2,"BuyStorage":true,"BuyBuildings":true,"BuyUpgrades":true,"BuyJobs":true,"TrapTrimps":false,"AutoHeirlooms":true,"HireScientists":true,"WorkerRatios":false,"ManageBreedtimer":false,"AutoPortal":"Custom","HeliumHourChallenge":"Corrupted","CustomAutoPortal":560,"HeHrDontPortalBefore":496,"HeliumHrBuffer":3,"AutoFinishDaily":true,"AutoFinishDailyZone":0,"AutoStartDaily":true,"PauseScript":false,"BuyArmor":true,"BuyArmorUpgrades":true,"BuyWeapons":true,"BuyWeaponUpgrades":true,"BuyShieldblock":false,"Prestige":"Dagadder","PrestigeBackup":{"selected":"Dagadder","id":"PrestigeBackup","name":"PrestigeBackup"},"DynamicPrestige2":-1,"PrestigeSkipMode":false,"AlwaysArmorLvl2":true,"WaitTill60":true,"DelayArmorWhenNeeded":false,"CapEquip2":200,"AutoMaps":1,"DynamicSiphonology":true,"LowerFarmingZone":true,"MinutestoFarmBeforeSpire":0,"RunBionicBeforeSpire":false,"ExitSpireCell":-1,"CorruptionCalc":true,"FarmWhenNomStacks7":true,"VoidMaps":555,"RunNewVoids":false,"RunNewVoidsUntil":600,"VoidCheck":1,"MaxTox":false,"DisableFarm":-1,"FarmerRatio":20,"LumberjackRatio":10,"MinerRatio":1000,"MaxScientists":"-1","MaxExplorers":3000,"MaxTrainers":-1,"MaxHut":100,"MaxHouse":0,"MaxMansion":0,"MaxHotel":0,"MaxResort":0,"MaxGateway":0,"MaxWormhole":0,"MaxCollector":0,"FirstGigastation":1,"DeltaGigastation":1,"MaxGym":"-1","MaxTribute":"-1","MaxNursery":-1,"BreedFire":false,"AutoMagmamancers":false,"WarpstationCap":false,"WarpstationWall3":-1,"WarpstationCoordBuy":false,"AutoRoboTrimp":270,"AutoGoldenUpgrades":"Void 60","AutoHeirlooms2":false,"AutoUpgradeHeirlooms":false,"TrainerCaptoTributes":"-1","NoNurseriesUntil":498,"AutoMagmiteSpender2":2,"ForceAbandon":true,"GymWall":-1,"DynamicGyms":true,"AutoAllocatePerks":2,"SpireBreedTimer":-1,"UseScryerStance":false,"ScryerUseWhenOverkill":false,"ScryerMinZone":530,"ScryerMaxZone":-1,"ScryerUseinMaps2":0,"ScryerUseinVoidMaps2":0,"ScryerUseinSpire2":0,"ScryerSkipBoss2":0,"ScryerSkipCorrupteds2":2,"ScryerDieToUseS":true,"SpamGeneral":true,"SpamUpgrades":false,"SpamEquipment":false,"SpamMaps":false,"SpamOther":false,"SpamBuilding":false,"SpamJobs":false,"ManualCoords":false,"TrimpleZ":0,"ScryerDieZ":230.6,"IgnoreCrits":2,"ForcePresZ":-1,"PreferMetal":false,"PreSpireNurseries":7000,"FinishC2":-1,"PowerSaving":0,"PrestigeSkip2":false,"AutoEggs":false,"UseAutoGen":1,"AutoGen2":3,"AutoGen2End":320,"AutoGen2SupplyEnd":false,"AutoGen3":0,"AutoGenDC":1,"AutoGenC2":1,"AutoGen2Override":1,"SupplyWall":1,"OneTimeOnly":false,"BuyOvclock":false,"IgnoreSpiresUntil":500,"goldStrat":"Max then Helium","goldAlternating":2,"goldZone":600,"MaxStacksForSpire":true,"UsePatience":false,"AutoNatureTokens":true,"AutoPoison":"Empowerment","AutoWind":"Convert to Poison","AutoIce":"Convert to Poison","MaxMapBonusAfterZone":-1,"SpamGraphs":false,"allowSettingsUpload":false,"EnhanceGrids":false,"EnableAFK":{"id":"EnableAFK","name":"Enable AFK","description":"Enables CPU and RAM saving AFK-mode","type":"action","value":1},"SpamMagmite":false,"SpamPerks":true,"analyticsID":"7f11701e-adc9-477c-a08d-2b66fe3ec2a2","ChangeLog":{"id":"ChangeLog","name":"Show Changelog","description":"Shows the changelog popup message that AT loads on startup in case you missed it.","type":"action","value":1},"AdvMapSpecialModifier":false,"GeneticistTimer":-1,"goldNoBattle":true,"BuyUpgradesNew":1,"AutoFinishDailyNew":0,"BuyBuildingsNew":0,"BuyJobsNew":0,"BuyArmorNew":1,"BuyWeaponsNew":1,"PrestigeSkip1_2":0,"RunNewVoidsUntilNew":0,"DailyVoidMod":570,"PlusMapVoidToggle":0,"Praidingzone":[495,546,555,561,566,570],"BWraid":false,"BWraidingmin":-1,"BWraidingmax":[640],"lootdumpz":265,"lootdumpa":10000,"WindStackingMin":-1,"ScryUseinPoison":-1,"ScryUseinWind":-1,"ScryUseinIce":-1,"BuyOneTimeOC":2,"AutoHeirloomsNew":2,"ShowSettings":true,"BWraidingz":[597],"fastallocate":true,"VoidPraid":true,"trimpsnotdie":true,"gearamounttobuy":5,"Dailyportal":560,"dVoidPraid":true,"dPraidingzone":[495,510,525,540,555,570],"Dailybwraid":false,"dBWraidingz":[495],"dBWraidingmax":[515],"dexitspirecell":-1,"WindStackingMax":190,"buyheliumy":-1,"buynojobsc":true,"Trimpicide":true,"fightforever":0,"use3daily":true,"windcutoff":-1,"spireshitbuy":true,"hardcorewind":-1,"PraidHarder":false,"PraidFarmFrags":false,"PraidBeforeFarm":false,"dPraidHarder":false,"dMaxPraidZone":[-1],"dPraidFarmFragsZ":[-1],"dPraidBeforeFarmZ":[-1],"MaxPraidZone":[505,535,545,555,561],"PraidFarmFragsZ":[495],"PraidBeforeFarmZ":[-1],"fuellater":260,"dWindStackingMin":450,"dWindStackingMax":190,"dwindcutoff":160,"dhardcorewind":480,"ScryerSkipHealthy":2,"addpoison":true,"amalcoord":true,"dAutoGoldenUpgrades":"Void 60","cAutoGoldenUpgrades":"Battle","dhardcorewindmax":"-1","cfightforever":true,"work":false,"in":false,"progress":false,"hardcorewindmax":"-1","dfightforever":2,"fuelend":320,"defaultgen":0,"spendmagmite":2,"spendmagmitesetting":1,"ultwind":-1,"ultwindcut":0.05,"CapEquiparm":100,"amalcoordhd":0.0000025,"onlyminmaxworld":false,"amalcoordz":398,"dultwind":"-1","dultwindcut":"0.00025","dwindhealthy":"false","windhealthy":false,"mapcutoff":4,"darmormagic":3,"carmormagic":3,"fuckanti":"-1","dscryvoidmaps":true,"scryvoidmaps":true,"dusebstance":true,"usebstance":true,"AutoPortalDaily":2,"dCustomAutoPortal":575,"dHeHrDontPortalBefore":"999","dHeliumHrBuffer":"0","dHeliumHourChallenge":"Corrupted","hidebuildings":true,"fuckjobs":true,"amalcoordt":6,"screwessence":false,"beforegen":0,"c2runnerstart":false,"c2runnerportal":"999","buywepsvoid":true,"mapc2hd":"-1","ScryerUseinBW":0,"dwindcutoffmap":160,"windcutoffmap":"-1"}'; } From 4dd6eab1016dc45a03591c76e8e95d8903c8cacf Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 12:26:21 +0100 Subject: [PATCH 1469/3477] Update import-export.js --- modules/import-export.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/import-export.js b/modules/import-export.js index b54a98e5e..abe877bcd 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -55,6 +55,22 @@ function ImportExportTooltip(what, event) { } }); }; + } else if (what == "Export60") { + tooltipText = "This is your AUTOTRIMPS z60 save string. Use this string to import the settings.

    "; + costText = "

    Got it
    "; + if (document.queryCommandSupported('copy')) { + costText += "
    Copy to Clipboard
    "; + ondisplay = function() { + document.getElementById('exportArea').select(); + document.getElementById('clipBoardBtn').addEventListener('click', function(event) { + document.getElementById('exportArea').select(); + try { + document.execCommand('copy'); + } catch (err) { + document.getElementById('clipBoardBtn').innerHTML = "Error, not copied"; + } + }); + }; } else { ondisplay = function() { document.getElementById('exportArea').select(); From c1c01388401dae8eab46169956f09b4f0f569ae3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 12:27:16 +0100 Subject: [PATCH 1470/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 + 1 file changed, 1 insertion(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index e24aaa74c..b937f9ecc 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -431,6 +431,7 @@ function initializeAllSettings() { createSetting('ImportAutoTrimps', 'Import AutoTrimps', 'Import your AutoTrimps Settings. Asks you to name it as a profile afterwards.', 'infoclick', 'ImportAutoTrimps', null, 'Import Export'); createSetting('ExportAutoTrimps', 'Export AutoTrimps', 'Export your AutoTrimps Settings as a output string text formatted in JSON.', 'infoclick', 'ExportAutoTrimps', null, 'Import Export'); createSetting('DefaultAutoTrimps', 'Reset to Default', 'Reset everything to the way it was when you first installed the script. ', 'infoclick', 'ResetDefaultSettingsProfiles', null, 'Import Export'); + createSetting('Export60', '-60 AT Settings', 'Gives you an AT settings String that you can use to import. Use if you are less than z60. ', 'infoclick', 'Export60', null, 'Import Export'); createSetting('Export550', '550+ AT Settings', 'Gives you an AT settings String that you can use to import. Use if you are z550+ ', 'infoclick', 'Export550', null, 'Import Export'); createSetting('CleanupAutoTrimps', 'Cleanup Saved Settings ', 'Deletes old values from previous versions of the script from your AutoTrimps Settings file.', 'infoclick', 'CleanupAutoTrimps', null, 'Import Export'); settingsProfileMakeGUI(); From 5d7475116b31d68b0cbe7a46dd56fc117ef5ad7f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 12:34:41 +0100 Subject: [PATCH 1471/3477] Update import-export.js --- modules/import-export.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/import-export.js b/modules/import-export.js index abe877bcd..33c61e429 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -55,6 +55,7 @@ function ImportExportTooltip(what, event) { } }); }; + } } else if (what == "Export60") { tooltipText = "This is your AUTOTRIMPS z60 save string. Use this string to import the settings.

    "; costText = "
    Got it
    "; @@ -71,6 +72,7 @@ function ImportExportTooltip(what, event) { } }); }; + } } else { ondisplay = function() { document.getElementById('exportArea').select(); From 3acb42960d50e9c0cc26b7758a5999c7bbadb617 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 12:36:19 +0100 Subject: [PATCH 1472/3477] Update import-export.js --- modules/import-export.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/import-export.js b/modules/import-export.js index 33c61e429..b93d2c59a 100644 --- a/modules/import-export.js +++ b/modules/import-export.js @@ -72,7 +72,6 @@ function ImportExportTooltip(what, event) { } }); }; - } } else { ondisplay = function() { document.getElementById('exportArea').select(); From 845418b06984478cec014a9eb31f89a2bc913fb8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 12:45:04 +0100 Subject: [PATCH 1473/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index b937f9ecc..b733ff88d 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -401,6 +401,7 @@ function initializeAllSettings() { //Line 1 createSetting('EnhanceGrids', 'Enhance Grids', 'Apply slight visual enhancements to world and map grids that highlights with drop shadow all the exotic, powerful, skeletimps and other special imps.', 'boolean', false, null, 'Display'); + createSetting('showbreedtimer', 'Enable Breed Timer', 'Enables the display of the hidden breedtimer. Turn this off to reduce memory. ', 'boolean', true, null, 'Display'); createSetting('EnableAFK', 'Go AFK Mode', '(Action Button). Go AFK uses a Black Screen, and suspends ALL the Trimps GUI visual update functions (updateLabels) to improve performance by not doing unnecessary stuff. This feature is primarily just a CPU and RAM saving mode. Everything will resume when you come back and press the Back button. Console debug output is also disabled. The blue color means this is not a settable setting, just a button. You can now also click the Zone # (World Info) area to go AFK now.', 'action', 'MODULES["performance"].EnableAFKMode()', null, 'Display'); document.getElementById('battleSideTitle').setAttribute('onclick','MODULES["performance"].EnableAFKMode()'); document.getElementById('battleSideTitle').setAttribute('onmouseover', "getZoneStats(event);this.style.cursor='pointer'"); @@ -436,6 +437,7 @@ function initializeAllSettings() { createSetting('CleanupAutoTrimps', 'Cleanup Saved Settings ', 'Deletes old values from previous versions of the script from your AutoTrimps Settings file.', 'infoclick', 'CleanupAutoTrimps', null, 'Import Export'); settingsProfileMakeGUI(); } + initializeAllSettings(); function createSetting(a,b,c,d,e,f,g){var h=document.createElement('DIV');h.setAttribute('style','display: inline-block; vertical-align: top; margin-left: 1vw; margin-bottom: 1vw; width: 13.142vw;');var i=document.createElement('DIV');i.id=a;var j=autoTrimpSettings[a];if('boolean'==d)j&&a==j.id&&j.type===d||(autoTrimpSettings[a]={id:a,name:b,description:c,type:d,enabled:void 0===j?e||!1:j}),i.setAttribute('style','font-size: 1.1vw;'),i.setAttribute('class','noselect settingsBtn settingBtn'+autoTrimpSettings[a].enabled),i.setAttribute('onclick','settingChanged("'+a+'")'),i.setAttribute('onmouseover','tooltip("'+b+'", "customText", event, "'+c+'")'),i.setAttribute('onmouseout','tooltip("hide")'),i.textContent=b,h.appendChild(i),g?document.getElementById(g).appendChild(h):document.getElementById('autoSettings').appendChild(h);else if('value'==d||'valueNegative'==d)j&&a==j.id&&j.type===d||(autoTrimpSettings[a]={id:a,name:b,description:c,type:d,value:void 0===j?e:j}),i.setAttribute('style','font-size: 1.1vw;'),i.setAttribute('class','noselect settingsBtn btn-info'),i.setAttribute('onclick',`autoSetValueToolTip("${a}", "${b}", ${'valueNegative'==d}, ${'multiValue'==d})`),i.setAttribute('onmouseover','tooltip("'+b+'", "customText", event, "'+c+'")'),i.setAttribute('onmouseout','tooltip("hide")'),i.textContent=b,h.appendChild(i),g?document.getElementById(g).appendChild(h):document.getElementById('autoSettings').appendChild(h);else if('multiValue'==d||'valueNegative'==d)j&&a==j.id&&j.type===d||(autoTrimpSettings[a]={id:a,name:b,description:c,type:d,value:void 0===j?e:j}),i.setAttribute('style','font-size: 1.1vw;'),i.setAttribute('class','noselect settingsBtn btn-info'),i.setAttribute('onclick',`autoSetValueToolTip("${a}", "${b}", ${'valueNegative'==d}, ${'multiValue'==d})`),i.setAttribute('onmouseover','tooltip("'+b+'", "customText", event, "'+c+'")'),i.setAttribute('onmouseout','tooltip("hide")'),i.textContent=b,h.appendChild(i),g?document.getElementById(g).appendChild(h):document.getElementById('autoSettings').appendChild(h);else if('dropdown'==d){j&&a==j.id&&j.type===d||(autoTrimpSettings[a]={id:a,name:b,description:c,type:d,selected:void 0===j?e:j,list:f});var i=document.createElement('select');for(var k in i.id=a,2==game.options.menu.darkTheme.enabled?i.setAttribute('style','color: #C8C8C8; font-size: 1.0vw;'):i.setAttribute('style','color:black; font-size: 1.0vw;'),i.setAttribute('class','noselect'),i.setAttribute('onmouseover','tooltip("'+b+'", "customText", event, "'+c+'")'),i.setAttribute('onmouseout','tooltip("hide")'),i.setAttribute('onchange','settingChanged("'+a+'")'),f){var l=document.createElement('option');l.value=f[k],l.text=f[k],i.appendChild(l)}i.value=autoTrimpSettings[a].selected;var m=document.createElement('Label');m.id=a+'Label',m.innerHTML=b+':',m.setAttribute('style','margin-right: 0.3vw; font-size: 0.8vw;'),h.appendChild(m),h.appendChild(i),g?document.getElementById(g).appendChild(h):document.getElementById('autoSettings').appendChild(h)}else{if('infoclick'==d)return i.setAttribute('class','btn btn-info'),i.setAttribute('onclick','ImportExportTooltip(\''+e+'\', \'update\')'),i.setAttribute('onmouseover','tooltip("'+b+'", "customText", event, "'+c+'")'),i.setAttribute('onmouseout','tooltip("hide")'),i.setAttribute('style','display: block; font-size: 0.8vw;'),i.textContent=b,h.style.width='',h.appendChild(i),void(g?document.getElementById(g).appendChild(h):document.getElementById('autoSettings').appendChild(h));if('multitoggle'==d)j&&a==j.id&&j.type===d||(autoTrimpSettings[a]={id:a,name:b,description:c,type:d,value:void 0===j?e||0:j}),i.setAttribute('style','font-size: 1.1vw;'),i.setAttribute('class','noselect settingsBtn settingBtn'+autoTrimpSettings[a].value),i.setAttribute('onclick','settingChanged("'+a+'")'),i.setAttribute('onmouseover','tooltip("'+b.join(' / ')+'", "customText", event, "'+c+'")'),i.setAttribute('onmouseout','tooltip("hide")'),i.textContent=autoTrimpSettings[a].name[autoTrimpSettings[a].value],h.appendChild(i),g?document.getElementById(g).appendChild(h):document.getElementById('autoSettings').appendChild(h);else if('action'===d)return i.setAttribute('style','font-size: 1.1vw;'),i.setAttribute('class','noselect settingsBtn settingBtn3'),i.setAttribute('onclick',e),i.setAttribute('onmouseover','tooltip("'+b+'", "customText", event, "'+c+'")'),i.setAttribute('onmouseout','tooltip("hide")'),i.textContent=b,h.appendChild(i),void(g?document.getElementById(g).appendChild(h):document.getElementById('autoSettings').appendChild(h))}autoTrimpSettings[a].name!=b&&(autoTrimpSettings[a].name=b),autoTrimpSettings[a].description!=c&&(autoTrimpSettings[a].description=c),autoTrimpSettings.ATversion=ATversion} From 3bbd3cbf7424f2ab8e5938a05367b7d75bff2b33 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 12:45:22 +0100 Subject: [PATCH 1474/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index f3d9234f9..2889fd5da 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -53,9 +53,11 @@ function mainLoop() { if (ATrunning == false) return; if(getPageSetting('PauseScript') || game.options.menu.pauseGame.enabled || game.global.viewingUpgrades) return; ATrunning = true; - if(game.options.menu.showFullBreed.enabled != 1) toggleSetting("showFullBreed"); - addbreedTimerInsideText.innerHTML = ((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) + 's'; //add breed time for next army; - addToolTipToArmyCount(); + if (getPageSetting('showbreedtimer') { + if(game.options.menu.showFullBreed.enabled != 1) toggleSetting("showFullBreed"); + addbreedTimerInsideText.innerHTML = ((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) + 's'; //add breed time for next army; + addToolTipToArmyCount(); + } if (mainCleanup() || portalWindowOpen || (!heirloomsShown && heirloomFlag) || (heirloomCache != game.global.heirloomsExtra.length)) { if (getPageSetting('AutoHeirloomsNew')==2) autoHeirlooms2(); else if (getPageSetting('AutoHeirloomsNew')==1) autoHeirlooms(); From 4560614bdb6cfcc3abefc74504688d839f091e55 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 12:45:58 +0100 Subject: [PATCH 1475/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 2889fd5da..9c8d6900d 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -53,7 +53,7 @@ function mainLoop() { if (ATrunning == false) return; if(getPageSetting('PauseScript') || game.options.menu.pauseGame.enabled || game.global.viewingUpgrades) return; ATrunning = true; - if (getPageSetting('showbreedtimer') { + if (getPageSetting('showbreedtimer')==true) { if(game.options.menu.showFullBreed.enabled != 1) toggleSetting("showFullBreed"); addbreedTimerInsideText.innerHTML = ((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) + 's'; //add breed time for next army; addToolTipToArmyCount(); From d93430afd12151b858cd46c22dc30def309e4d8f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 12:49:49 +0100 Subject: [PATCH 1476/3477] Update SettingsGUI.js --- SettingsGUI.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index b733ff88d..9074c695a 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -487,6 +487,9 @@ function updateCustomButtons() { getPageSetting('AutoPortalDaily')==1 ? turnOn("dHeliumHrBuffer") : turnOff("dHeliumHrBuffer"); getPageSetting('AutoPortalDaily')>0 ? turnOn("dHeliumHourChallenge") : turnOff("dHeliumHourChallenge"); + //Breed + turnOff("hiddenBreedTimer"); + //Buildings var fuckbuilding = (game.talents.autoStructure.purchased && game.talents.deciBuild.purchased && getPageSetting('hidebuildings')==true && getPageSetting('BuyBuildingsNew')==0); (game.talents.autoStructure.purchased && game.talents.deciBuild.purchased) ? turnOn("hidebuildings") : turnOff("hidebuildings"); From 04b69f13a26d86ef06ca4278512a444630870c48 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 12:50:40 +0100 Subject: [PATCH 1477/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 9074c695a..50508752c 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -488,7 +488,7 @@ function updateCustomButtons() { getPageSetting('AutoPortalDaily')>0 ? turnOn("dHeliumHourChallenge") : turnOff("dHeliumHourChallenge"); //Breed - turnOff("hiddenBreedTimer"); + if (getPageSetting('enablebreedtimer')==false) turnOff("hiddenBreedTimer"); //Buildings var fuckbuilding = (game.talents.autoStructure.purchased && game.talents.deciBuild.purchased && getPageSetting('hidebuildings')==true && getPageSetting('BuyBuildingsNew')==0); From 62339b9c17fa60312515c993e5abab9e5211a0c1 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 12:54:24 +0100 Subject: [PATCH 1478/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 50508752c..d219d609a 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -488,7 +488,7 @@ function updateCustomButtons() { getPageSetting('AutoPortalDaily')>0 ? turnOn("dHeliumHourChallenge") : turnOff("dHeliumHourChallenge"); //Breed - if (getPageSetting('enablebreedtimer')==false) turnOff("hiddenBreedTimer"); + if (getPageSetting('showbreedtimer')==false) turnOff("hiddenBreedTimer"); //Buildings var fuckbuilding = (game.talents.autoStructure.purchased && game.talents.deciBuild.purchased && getPageSetting('hidebuildings')==true && getPageSetting('BuyBuildingsNew')==0); From 3f6d035ea1d913bf28b83d2c5fe2be5b008ced11 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 13:27:06 +0100 Subject: [PATCH 1479/3477] Update SettingsGUI.js --- SettingsGUI.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index d219d609a..436318c79 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -402,6 +402,7 @@ function initializeAllSettings() { //Line 1 createSetting('EnhanceGrids', 'Enhance Grids', 'Apply slight visual enhancements to world and map grids that highlights with drop shadow all the exotic, powerful, skeletimps and other special imps.', 'boolean', false, null, 'Display'); createSetting('showbreedtimer', 'Enable Breed Timer', 'Enables the display of the hidden breedtimer. Turn this off to reduce memory. ', 'boolean', true, null, 'Display'); + createSetting('showautomapstatus', 'Enable AutoMap Status', 'Enables the display of the map status. Turn this off to reduce memory. ', 'boolean', true, null, 'Display'); createSetting('EnableAFK', 'Go AFK Mode', '(Action Button). Go AFK uses a Black Screen, and suspends ALL the Trimps GUI visual update functions (updateLabels) to improve performance by not doing unnecessary stuff. This feature is primarily just a CPU and RAM saving mode. Everything will resume when you come back and press the Back button. Console debug output is also disabled. The blue color means this is not a settable setting, just a button. You can now also click the Zone # (World Info) area to go AFK now.', 'action', 'MODULES["performance"].EnableAFKMode()', null, 'Display'); document.getElementById('battleSideTitle').setAttribute('onclick','MODULES["performance"].EnableAFKMode()'); document.getElementById('battleSideTitle').setAttribute('onmouseover', "getZoneStats(event);this.style.cursor='pointer'"); @@ -487,8 +488,9 @@ function updateCustomButtons() { getPageSetting('AutoPortalDaily')==1 ? turnOn("dHeliumHrBuffer") : turnOff("dHeliumHrBuffer"); getPageSetting('AutoPortalDaily')>0 ? turnOn("dHeliumHourChallenge") : turnOff("dHeliumHourChallenge"); - //Breed + //Memory if (getPageSetting('showbreedtimer')==false) turnOff("hiddenBreedTimer"); + if (getPageSetting('showautomapstatus')==false) turnOff("autoMapStatus"); //Buildings var fuckbuilding = (game.talents.autoStructure.purchased && game.talents.deciBuild.purchased && getPageSetting('hidebuildings')==true && getPageSetting('BuyBuildingsNew')==0); From 2ef5533b30bc42f2b1b6159a284fd4f45fb7994f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 13:27:08 +0100 Subject: [PATCH 1480/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 9c8d6900d..d67874eac 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -129,7 +129,8 @@ function mainLoop() { else if (getPageSetting('BuyJobsNew')==2) buyJobs(); if (getPageSetting('ManualGather2')==1) manualLabor2(); else if (getPageSetting('ManualGather2')==2) autogather3(); - getPageSetting('AutoMaps') > 0 ? autoMap() : updateAutoMapsStatus(); + if (getPageSetting('AutoMaps') > 0) autoMap(); + if (getPageSetting('showautomapstatus')== true) updateAutoMapsStatus(); if (autoTrimpSettings.AutoPortal.selected != "Off" && game.global.challengeActive != "Daily") autoPortal(); if (getPageSetting('AutoPortalDaily') > 0 && game.global.challengeActive == "Daily") dailyAutoPortal(); if (getPageSetting('TrapTrimps') && game.global.trapBuildAllowed && game.global.trapBuildToggled == false) toggleAutoTrap(); From d0222dd3a36e861ad8bf51bff34f1f4759831ea0 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 13:39:53 +0100 Subject: [PATCH 1481/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 + 1 file changed, 1 insertion(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 436318c79..84d9003b8 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -426,6 +426,7 @@ function initializeAllSettings() { createSetting('SpamGraphs', 'Starting Zone Spam', 'Disables \'Starting new Zone ###\' , RoboTrimp MagnetoShreik, and any future Graph Spam that comes from graph logs.', 'boolean', true, null, 'Display'); createSetting('SpamMagmite', 'Magmite/Magma Spam', 'Everything in Magmite Module and Buy Magmamancers', 'boolean', true, null, 'Display'); createSetting('SpamPerks', 'AutoPerks Spam', 'Everything in related to AutoPerks', 'boolean', true, null, 'Display'); + createSetting('SpamNature', 'Nature Spam', 'Everything in related to Nature', 'boolean', true, null, 'Display'); From 43fa5e09e49d4c63ae7ab695b1e638533e64f728 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 28 Sep 2018 13:40:01 +0100 Subject: [PATCH 1482/3477] Update utils.js --- modules/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/utils.js b/modules/utils.js index af76affb1..0e62ff9bf 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -71,7 +71,7 @@ function serializeSettings550() { function saveSettings(){safeSetItems('autoTrimpSettings',serializeSettings())} function getPageSetting(a){if(!1==autoTrimpSettings.hasOwnProperty(a))return!1;return'boolean'==autoTrimpSettings[a].type?autoTrimpSettings[a].enabled:'multiValue'==autoTrimpSettings[a].type?Array.from(autoTrimpSettings[a].value).map(b=>parseInt(b)):'value'==autoTrimpSettings[a].type||'valueNegative'==autoTrimpSettings[a].type?parseFloat(autoTrimpSettings[a].value):'multitoggle'==autoTrimpSettings[a].type?parseInt(autoTrimpSettings[a].value):'dropdown'==autoTrimpSettings[a].type?autoTrimpSettings[a].selected:void 0} function setPageSetting(a,b){return!1!=autoTrimpSettings.hasOwnProperty(a)&&void('boolean'==autoTrimpSettings[a].type?(autoTrimpSettings[a].enabled=b,document.getElementById(a).setAttribute('class','noselect settingsBtn settingBtn'+autoTrimpSettings[a].enabled)):'value'==autoTrimpSettings[a].type||'valueNegative'==autoTrimpSettings[a].type?autoTrimpSettings[a].value=b:'multiValue'==autoTrimpSettings[a].type||'valueNegative'==autoTrimpSettings[a].type?autoTrimpSettings[a].value=b:'multitoggle'==autoTrimpSettings[a].type?(autoTrimpSettings[a].value=b,document.getElementById(a).setAttribute('class','noselect settingsBtn settingBtn'+autoTrimpSettings[a].value)):'dropdown'==autoTrimpSettings[a].type&&(autoTrimpSettings[a].selected=b))} -function debug(a,b,c){var d=getPageSetting('SpamGeneral'),e=getPageSetting('SpamUpgrades'),f=getPageSetting('SpamEquipment'),g=getPageSetting('SpamMaps'),h=getPageSetting('SpamOther'),i=getPageSetting('SpamBuilding'),j=getPageSetting('SpamJobs'),k=getPageSetting('SpamGraphs'),l=getPageSetting('SpamMagmite'),m=getPageSetting('SpamPerks'),n=getPageSetting('SpamProfiles'),o=!0;switch(b){case null:break;case'general':o=d;break;case'upgrades':o=e;break;case'equips':o=f;break;case'buildings':o=i;break;case'jobs':o=j;break;case'maps':o=g;break;case'other':o=h;break;case'graphs':o=k;break;case'magmite':o=l;break;case'perks':o=m;break;case'profiles':o=n;}o&&(enableDebug&&console.log(timeStamp()+' '+a),message2(a,'AutoTrimps',c,b))} +function debug(a,b,c){var d=getPageSetting('SpamGeneral'),e=getPageSetting('SpamUpgrades'),f=getPageSetting('SpamEquipment'),g=getPageSetting('SpamMaps'),h=getPageSetting('SpamOther'),i=getPageSetting('SpamBuilding'),j=getPageSetting('SpamJobs'),k=getPageSetting('SpamGraphs'),l=getPageSetting('SpamMagmite'),m=getPageSetting('SpamPerks'),n=getPageSetting('SpamProfiles'),o=getPageSetting('SpamNature'),p=!0;switch(b){case null:break;case'general':p=d;break;case'upgrades':p=e;break;case'equips':p=f;break;case'buildings':p=i;break;case'jobs':p=j;break;case'maps':p=g;break;case'other':p=h;break;case'graphs':p=k;break;case'magmite':p=l;break;case'perks':p=m;break;case'profiles':p=n;break;case'nature':p=o;}p&&(enableDebug&&console.log(timeStamp()+' '+a),message2(a,'AutoTrimps',c,b))} function timeStamp(){for(var a=new Date,b=[a.getHours(),a.getMinutes(),a.getSeconds()],c=1;3>c;c++)10>b[c]&&(b[c]="0"+b[c]);return b.join(":")} function preBuy(){preBuyAmt=game.global.buyAmt,preBuyFiring=game.global.firing,preBuyTooltip=game.global.lockTooltip,preBuymaxSplit=game.global.maxSplit} function postBuy(){game.global.buyAmt=preBuyAmt,game.global.firing=preBuyFiring,game.global.lockTooltip=preBuyTooltip,game.global.maxSplit=preBuymaxSplit} From 8b5187837bb92a077baae9301b3c99660ea1f251 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 11:36:33 +0100 Subject: [PATCH 1483/3477] Update equipment.js --- modules/equipment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/equipment.js b/modules/equipment.js index 134a9f6f5..a74a64c68 100644 --- a/modules/equipment.js +++ b/modules/equipment.js @@ -328,8 +328,8 @@ function autoLevelEquipment() { var BuyArmorLevels = ((getPageSetting('BuyArmorNew') == 1) || (getPageSetting('BuyArmorNew') == 3)); for (var stat in Best) { var eqName = Best[stat].Name; - var $eqName = document.getElementById(eqName); if (eqName !== '') { + var $eqName = document.getElementById(eqName); var DaThing = equipmentList[eqName]; if (eqName == 'Gym' && needGymystic) { $eqName.style.color = 'white'; From 7e3ca1e8770ef49b5778ca49a134c8f09b2d592d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 11:41:32 +0100 Subject: [PATCH 1484/3477] Update heirlooms.js --- modules/heirlooms.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 99543d2d1..9c9a3aaef 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -157,11 +157,11 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'FarmerSpeed': - tempEff = 0.5 * loom.mods[m][1] / 1000; + tempEff = 0.75 * loom.mods[m][1] / 10000; eff += tempEff; if (upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.5 * steps[2] / 1000) / ((game.heirlooms.Staff.FarmerSpeed.currentBonus / 100) + 1); + tempEff = (0.5 * steps[2] / 100) / ((game.heirlooms.Staff.FarmerSpeed.currentBonus / 100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if (tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -171,11 +171,11 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'LumberjackSpeed': - tempEff = 0.5 * loom.mods[m][1] / 1000; + tempEff = 0.75 * loom.mods[m][1] / 10000; eff += tempEff; if (upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; - tempEff = (0.5 * steps[2] / 1000) / ((game.heirlooms.Staff.LumberjackSpeed.currentBonus / 100) + 1); + tempEff = (0.5 * steps[2] / 100) / ((game.heirlooms.Staff.LumberjackSpeed.currentBonus / 100) + 1); tempEff = tempEff / getModUpgradeCost(loom, m); if (tempEff > bestUpgrade.effect) { bestUpgrade.effect = tempEff; @@ -233,8 +233,6 @@ function evaluateHeirloomMods(loom, location, upgrade) { av = steps[0] + ((steps[1] - steps[0]) / 2); if (!checkForMod('MinerSpeed', index, location) || !checkForMod('metalDrop', index, location) || !checkForMod('fragmentsDrop', index, location) || !checkForMod('ExplorerSpeed', index, location) || !checkForMod('FluffyExp', index, location)) { eff += 0.8 * av / 100; - } else if (!checkForMod('FarmerSpeed', index, location) || !checkForMod('LumberjackSpeed', index, location)) { - eff += 0.4 * av / 100; } } break; From 53046dffd8e2a215a0893970aa75f005bcf100b8 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 12:02:28 +0100 Subject: [PATCH 1485/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index d67874eac..e8394a7aa 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -133,6 +133,7 @@ function mainLoop() { if (getPageSetting('showautomapstatus')== true) updateAutoMapsStatus(); if (autoTrimpSettings.AutoPortal.selected != "Off" && game.global.challengeActive != "Daily") autoPortal(); if (getPageSetting('AutoPortalDaily') > 0 && game.global.challengeActive == "Daily") dailyAutoPortal(); + if (getPageSetting('c2runnerportal') > 0 && game.global.runningChallengeSquared) c2runner(); if (getPageSetting('TrapTrimps') && game.global.trapBuildAllowed && game.global.trapBuildToggled == false) toggleAutoTrap(); if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); From 436e50519cb255cd451daa5e83abf066d220b0a6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 12:09:04 +0100 Subject: [PATCH 1486/3477] Update portal.js --- modules/portal.js | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 7e99f3f60..e3e478d12 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -131,18 +131,12 @@ function dailyAutoPortal() { function c2runner() { -//var badPercents = ["None"]; - var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; - /*for (var what in c2listp) { - if (c2listp[what].percentzone < 99) { - badPercents.push(what); - } - }*/ - if (!game.global.portalActive) return; + +if (!game.global.portalActive) return; if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0) { if ((game.global.world > getPageSetting('c2runnerportal')) || !game.global.runningChallengeSquared) { - if (c2listp.Size.percentzone < 50) { + if (c2listp.Size.percentzone < 85) { toggleChallengeSquared(); selectChallenge("Size"); pushData(); @@ -152,7 +146,7 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL debug("C2 Runner: Running C2 Challenge Size"); return; } - if (c2listp.Slow.percentzone < 99) { + if (c2listp.Slow.percentzone < 85) { toggleChallengeSquared(); selectChallenge("Slow"); pushData(); @@ -179,6 +173,7 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + debug("C2 Runner: Running C2 Challenge Discipline"); return; } if (c2listp.Balance.percentzone < 85) { @@ -188,6 +183,7 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + debug("C2 Runner: Running C2 Challenge Balance"); return; } if (c2listp.Meditate.percentzone < 85) { @@ -197,6 +193,7 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + debug("C2 Runner: Running C2 Challenge Meditate"); return; } if (c2listp.Metal.percentzone < 85) { @@ -206,6 +203,8 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + debug("C2 Runner: Running C2 Challenge Metal"); + return; } if (c2listp.Lead.percentzone < 85) { toggleChallengeSquared(); @@ -214,6 +213,7 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + debug("C2 Runner: Running C2 Challenge Lead"); return; } if (c2listp.Nom.percentzone < 85) { @@ -223,6 +223,7 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + debug("C2 Runner: Running C2 Challenge Nom"); return; } if (c2listp.Electricity.percentzone < 85) { @@ -232,15 +233,17 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + debug("C2 Runner: Running C2 Challenge Electricity"); return; } - if (c2listp.Toxicty.percentzone < 85) { + if (c2listp.Toxicity.percentzone < 85) { toggleChallengeSquared(); - selectChallenge("Toxicty"); + selectChallenge("Toxicity"); pushData(); activateClicked(); activatePortal(); lastHeliumZone = 0; zonePostpone = 0; + debug("C2 Runner: Running C2 Challenge Toxicity"); return; } if (autoTrimpSettings.HeliumHourChallenge.selected != 'None'){debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal(autoTrimpSettings.HeliumHourChallenge.selected);} @@ -259,6 +262,10 @@ function doPortal(challenge) { portalClicked(); if (getPageSetting('AutoAllocatePerks')==1 && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) AutoPerks.clickAllocate(); + if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0) { + c2runner(); + return; + } if (getPageSetting('AutoStartDaily')) { selectChallenge('Daily'); checkCompleteDailies(); From 80ea964ee2fe7faa5aa721de7f670e49572f8ffc Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 12:17:53 +0100 Subject: [PATCH 1487/3477] Update portal.js --- modules/portal.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index e3e478d12..49417d3b2 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -134,9 +134,9 @@ function c2runner() { var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; if (!game.global.portalActive) return; - if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0) { - if ((game.global.world > getPageSetting('c2runnerportal')) || !game.global.runningChallengeSquared) { - if (c2listp.Size.percentzone < 85) { + if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { + if ((game.global.world >= getPageSetting('c2runnerportal')) || !game.global.runningChallengeSquared) { + if (c2listp.Size.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Size"); pushData(); @@ -146,7 +146,7 @@ if (!game.global.portalActive) return; debug("C2 Runner: Running C2 Challenge Size"); return; } - if (c2listp.Slow.percentzone < 85) { + if (c2listp.Slow.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Slow"); pushData(); @@ -156,7 +156,7 @@ if (!game.global.portalActive) return; debug("C2 Runner: Running C2 Challenge Slow"); return; } - if (c2listp.Watch.percentzone < 85) { + if (c2listp.Watch.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Watch"); pushData(); @@ -166,7 +166,7 @@ if (!game.global.portalActive) return; debug("C2 Runner: Running C2 Challenge Watch"); return; } - if (c2listp.Discipline.percentzone < 85) { + if (c2listp.Discipline.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Discipline"); pushData(); @@ -176,7 +176,7 @@ if (!game.global.portalActive) return; debug("C2 Runner: Running C2 Challenge Discipline"); return; } - if (c2listp.Balance.percentzone < 85) { + if (c2listp.Balance.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Balance"); pushData(); @@ -186,7 +186,7 @@ if (!game.global.portalActive) return; debug("C2 Runner: Running C2 Challenge Balance"); return; } - if (c2listp.Meditate.percentzone < 85) { + if (c2listp.Meditate.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Meditate"); pushData(); @@ -196,7 +196,7 @@ if (!game.global.portalActive) return; debug("C2 Runner: Running C2 Challenge Meditate"); return; } - if (c2listp.Metal.percentzone < 85) { + if (c2listp.Metal.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Metal"); pushData(); @@ -206,7 +206,7 @@ if (!game.global.portalActive) return; debug("C2 Runner: Running C2 Challenge Metal"); return; } - if (c2listp.Lead.percentzone < 85) { + if (c2listp.Lead.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Lead"); pushData(); @@ -216,7 +216,7 @@ if (!game.global.portalActive) return; debug("C2 Runner: Running C2 Challenge Lead"); return; } - if (c2listp.Nom.percentzone < 85) { + if (c2listp.Nom.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Nom"); pushData(); @@ -226,7 +226,7 @@ if (!game.global.portalActive) return; debug("C2 Runner: Running C2 Challenge Nom"); return; } - if (c2listp.Electricity.percentzone < 85) { + if (c2listp.Electricity.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Electricity"); pushData(); @@ -236,7 +236,7 @@ if (!game.global.portalActive) return; debug("C2 Runner: Running C2 Challenge Electricity"); return; } - if (c2listp.Toxicity.percentzone < 85) { + if (c2listp.Toxicity.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Toxicity"); pushData(); From 69cedb1eb7b7cc53a374212ff81e9762e14ca578 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 12:20:02 +0100 Subject: [PATCH 1488/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 84d9003b8..7019ae0fe 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -169,7 +169,7 @@ function initializeAllSettings() { document.getElementById('c2table').parentNode.insertAdjacentHTML('afterend','
    '); createSetting('c2runnerstart', 'C2 Runner', 'Runs the normal C2s in sequence according to difficulty. See C2Table for list. Once zone you have defined has been reached, will portal into next. I will advise you not to touch the challenges (abandoning, doing a different one, etc) if you are running this, it could break it. Only runs challenges that need updating, will not run ones close-ish to your HZE. ', 'boolean', false, null, 'C2'); createSetting('c2runnerportal', 'C2 Runner Portal', 'AINT DONE YET FAM MOVE ALONG NOW Automatically portal AFTER clearing this level in C2 Runner. (ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "C2"); - + createSetting('c2runnerpercent', 'C2 Runner %', 'AINT DONE YET FAM MOVE ALONG NOW What percent Threshhold you want C2s to be over. E.g 85, will only run C2s with HZE% below this number. Default is 85%. Must have a value set for C2 Runner to... well, run. ', 'value', '85', null, "C2"); //Buildings From ed313404744d7861bb37784d88807a9b7bae9b29 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 12:25:26 +0100 Subject: [PATCH 1489/3477] Update portal.js --- modules/portal.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 49417d3b2..1cbe60f7c 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -246,8 +246,6 @@ if (!game.global.portalActive) return; debug("C2 Runner: Running C2 Challenge Toxicity"); return; } - if (autoTrimpSettings.HeliumHourChallenge.selected != 'None'){debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal(autoTrimpSettings.HeliumHourChallenge.selected);} - else {debug("All C2s are above thresh-hold! Portalling into filler. ");doPortal();} } } } From 0ddea43a4329496dd785a5851284f68a93b8bb2e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 12:26:49 +0100 Subject: [PATCH 1490/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index e8394a7aa..1011502b8 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -133,7 +133,7 @@ function mainLoop() { if (getPageSetting('showautomapstatus')== true) updateAutoMapsStatus(); if (autoTrimpSettings.AutoPortal.selected != "Off" && game.global.challengeActive != "Daily") autoPortal(); if (getPageSetting('AutoPortalDaily') > 0 && game.global.challengeActive == "Daily") dailyAutoPortal(); - if (getPageSetting('c2runnerportal') > 0 && game.global.runningChallengeSquared) c2runner(); + //if (getPageSetting('c2runnerportal') > 0 && game.global.runningChallengeSquared) c2runner(); if (getPageSetting('TrapTrimps') && game.global.trapBuildAllowed && game.global.trapBuildToggled == false) toggleAutoTrap(); if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); From 83c60eac2b8d274313f02d32424833664ef22a73 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 12:27:23 +0100 Subject: [PATCH 1491/3477] Update portal.js --- modules/portal.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 1cbe60f7c..8069624b5 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -262,7 +262,6 @@ function doPortal(challenge) { AutoPerks.clickAllocate(); if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0) { c2runner(); - return; } if (getPageSetting('AutoStartDaily')) { selectChallenge('Daily'); From 4b335d9968878ae94b29491560013cfe9b029ec4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 12:41:41 +0100 Subject: [PATCH 1492/3477] Update portal.js --- modules/portal.js | 79 +++++++---------------------------------------- 1 file changed, 12 insertions(+), 67 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 8069624b5..42f11af10 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -139,112 +139,57 @@ if (!game.global.portalActive) return; if (c2listp.Size.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Size"); - pushData(); - activateClicked(); - activatePortal(); - lastHeliumZone = 0; zonePostpone = 0; debug("C2 Runner: Running C2 Challenge Size"); - return; } - if (c2listp.Slow.percentzone < getPageSetting('c2runnerpercent')) { + else if (c2listp.Slow.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Slow"); - pushData(); - activateClicked(); - activatePortal(); - lastHeliumZone = 0; zonePostpone = 0; debug("C2 Runner: Running C2 Challenge Slow"); - return; } - if (c2listp.Watch.percentzone < getPageSetting('c2runnerpercent')) { + else if (c2listp.Watch.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Watch"); - pushData(); - activateClicked(); - activatePortal(); - lastHeliumZone = 0; zonePostpone = 0; debug("C2 Runner: Running C2 Challenge Watch"); - return; } - if (c2listp.Discipline.percentzone < getPageSetting('c2runnerpercent')) { + else if (c2listp.Discipline.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Discipline"); - pushData(); - activateClicked(); - activatePortal(); - lastHeliumZone = 0; zonePostpone = 0; debug("C2 Runner: Running C2 Challenge Discipline"); - return; } - if (c2listp.Balance.percentzone < getPageSetting('c2runnerpercent')) { + else if (c2listp.Balance.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Balance"); - pushData(); - activateClicked(); - activatePortal(); - lastHeliumZone = 0; zonePostpone = 0; debug("C2 Runner: Running C2 Challenge Balance"); - return; } - if (c2listp.Meditate.percentzone < getPageSetting('c2runnerpercent')) { + else if (c2listp.Meditate.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Meditate"); - pushData(); - activateClicked(); - activatePortal(); - lastHeliumZone = 0; zonePostpone = 0; debug("C2 Runner: Running C2 Challenge Meditate"); - return; } - if (c2listp.Metal.percentzone < getPageSetting('c2runnerpercent')) { + else if (c2listp.Metal.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Metal"); - pushData(); - activateClicked(); - activatePortal(); - lastHeliumZone = 0; zonePostpone = 0; debug("C2 Runner: Running C2 Challenge Metal"); - return; } - if (c2listp.Lead.percentzone < getPageSetting('c2runnerpercent')) { + else if (c2listp.Lead.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Lead"); - pushData(); - activateClicked(); - activatePortal(); - lastHeliumZone = 0; zonePostpone = 0; debug("C2 Runner: Running C2 Challenge Lead"); - return; } - if (c2listp.Nom.percentzone < getPageSetting('c2runnerpercent')) { + else if (c2listp.Nom.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Nom"); - pushData(); - activateClicked(); - activatePortal(); - lastHeliumZone = 0; zonePostpone = 0; debug("C2 Runner: Running C2 Challenge Nom"); - return; } - if (c2listp.Electricity.percentzone < getPageSetting('c2runnerpercent')) { + else if (c2listp.Electricity.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Electricity"); - pushData(); - activateClicked(); - activatePortal(); - lastHeliumZone = 0; zonePostpone = 0; debug("C2 Runner: Running C2 Challenge Electricity"); - return; } - if (c2listp.Toxicity.percentzone < getPageSetting('c2runnerpercent')) { + else if (c2listp.Toxicity.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Toxicity"); - pushData(); - activateClicked(); - activatePortal(); - lastHeliumZone = 0; zonePostpone = 0; debug("C2 Runner: Running C2 Challenge Toxicity"); - return; } } } @@ -260,10 +205,10 @@ function doPortal(challenge) { portalClicked(); if (getPageSetting('AutoAllocatePerks')==1 && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) AutoPerks.clickAllocate(); - if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0) { + if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { c2runner(); } - if (getPageSetting('AutoStartDaily')) { + else if (getPageSetting('AutoStartDaily')) { selectChallenge('Daily'); checkCompleteDailies(); var lastUndone = -7; From 996a98a8b945731fccff154562cd8da0679b7630 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 12:55:34 +0100 Subject: [PATCH 1493/3477] Update portal.js --- modules/portal.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 42f11af10..0a7dacda4 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -129,13 +129,22 @@ function dailyAutoPortal() { } } +function c2runnerportal() { + if (game.global.world > getPageSetting('c2runnerportal')) { + if (autoTrimpSettings.HeliumHourChallenge.selected != 'None') + doPortal(autoTrimpSettings.HeliumHourChallenge.selected); + else + doPortal(); + } +} + function c2runner() { var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; if (!game.global.portalActive) return; if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { - if ((game.global.world >= getPageSetting('c2runnerportal')) || !game.global.runningChallengeSquared) { + if ((game.global.world > getPageSetting('c2runnerportal')) || !game.global.runningChallengeSquared) { if (c2listp.Size.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Size"); From 3e28c7f6e09ea60cb77169573d2a0a9b23cb3105 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 12:55:42 +0100 Subject: [PATCH 1494/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 1011502b8..7941cf615 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -131,9 +131,9 @@ function mainLoop() { else if (getPageSetting('ManualGather2')==2) autogather3(); if (getPageSetting('AutoMaps') > 0) autoMap(); if (getPageSetting('showautomapstatus')== true) updateAutoMapsStatus(); - if (autoTrimpSettings.AutoPortal.selected != "Off" && game.global.challengeActive != "Daily") autoPortal(); + if (autoTrimpSettings.AutoPortal.selected != "Off" && game.global.challengeActive != "Daily" && !game.global.runningChallengeSquared) autoPortal(); if (getPageSetting('AutoPortalDaily') > 0 && game.global.challengeActive == "Daily") dailyAutoPortal(); - //if (getPageSetting('c2runnerportal') > 0 && game.global.runningChallengeSquared) c2runner(); + if (getPageSetting('c2runnerportal') > 0 && game.global.runningChallengeSquared && game.global.world > getPageSetting('c2runnerportal')) c2runnerportal(); if (getPageSetting('TrapTrimps') && game.global.trapBuildAllowed && game.global.trapBuildToggled == false) toggleAutoTrap(); if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); From 09c55c6820e46895d97446e823cf8937505c1852 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 13:06:29 +0100 Subject: [PATCH 1495/3477] Update portal.js --- modules/portal.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 0a7dacda4..a4074a0b9 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -144,7 +144,7 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL if (!game.global.portalActive) return; if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { - if ((game.global.world > getPageSetting('c2runnerportal')) || !game.global.runningChallengeSquared) { + //if ((game.global.world > getPageSetting('c2runnerportal')) || !game.global.runningChallengeSquared) { if (c2listp.Size.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Size"); @@ -200,7 +200,8 @@ if (!game.global.portalActive) return; selectChallenge("Toxicity"); debug("C2 Runner: Running C2 Challenge Toxicity"); } - } + else toggleChallengeSquared(); + //} } } From eba93fafbbe186487c5417e2df5b4de85e58a9f6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 13:16:00 +0100 Subject: [PATCH 1496/3477] Update portal.js --- modules/portal.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index a4074a0b9..1efdf8942 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -144,7 +144,7 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL if (!game.global.portalActive) return; if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { - //if ((game.global.world > getPageSetting('c2runnerportal')) || !game.global.runningChallengeSquared) { + var c2threshhold = false; if (c2listp.Size.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Size"); @@ -200,8 +200,7 @@ if (!game.global.portalActive) return; selectChallenge("Toxicity"); debug("C2 Runner: Running C2 Challenge Toxicity"); } - else toggleChallengeSquared(); - //} + else c2threshhold=true; } } @@ -217,8 +216,11 @@ function doPortal(challenge) { AutoPerks.clickAllocate(); if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { c2runner(); + if (c2threshhold) + debug("C2 Runner: All C2s above Threshold!"); + selectChallenge(challenge || 0); } - else if (getPageSetting('AutoStartDaily')) { + if (getPageSetting('AutoStartDaily') && c2threshhold) { selectChallenge('Daily'); checkCompleteDailies(); var lastUndone = -7; @@ -235,7 +237,7 @@ function doPortal(challenge) { debug("Portaling into Daily for: " + getDailyTimeString(lastUndone, true) + " now!", "portal"); } } - else if(challenge) { + if(challenge) { selectChallenge(challenge); } pushData(); From 0831804a1cedb3477cc996a832e616e2473e1900 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 13:23:53 +0100 Subject: [PATCH 1497/3477] Update other.js --- modules/other.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/other.js b/modules/other.js index d882509d5..d6deda466 100644 --- a/modules/other.js +++ b/modules/other.js @@ -578,9 +578,9 @@ if (game.portal.Anticipation.level >= 1) { antistacklimit = 30; if (getPageSetting('fuckanti') > 0 && getEmpowerment() == "Wind" && game.global.world >= getPageSetting('hardcorewind') && (game.global.world < getPageSetting('hardcorewindmax') || getPageSetting('hardcorewindmax') < 1) && HDratioy() < getPageSetting('fuckanti')) antistacklimit = 0; - if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && (game.global.antiStacks < antistacklimit || antistacklimit == 0 && game.global.antiStacks >= 1) && !game.global.spireActive) + if (game.global.fighting && ((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && (game.global.antiStacks < antistacklimit || antistacklimit == 0 && game.global.antiStacks >= 1) && !game.global.spireActive) forceAbandonTrimps(); - if (((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit && game.global.mapsActive) { + if (game.global.fighting && ((game.jobs.Amalgamator.owned > 0) ? Math.floor((new Date().getTime() - game.global.lastSoldierSentAt) / 1000) : Math.floor(game.global.lastBreedTime / 1000)) >= antistacklimit && game.global.antiStacks < antistacklimit && game.global.mapsActive) { if (getCurrentMapObject().location == "Void") { abandonVoidMap(); } From 4bde535dcd8570cfeb5e3f0627676ef34eb6a2f4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 13:25:40 +0100 Subject: [PATCH 1498/3477] Update portal.js --- modules/portal.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 1efdf8942..3ba2de64f 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -205,6 +205,7 @@ if (!game.global.portalActive) return; } function doPortal(challenge) { + var c2done = false; if(!game.global.portalActive) return; if (getPageSetting('spendmagmite')==1) autoMagmiteSpender(); if (getPageSetting('AutoHeirloomsNew')==0); @@ -216,11 +217,13 @@ function doPortal(challenge) { AutoPerks.clickAllocate(); if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { c2runner(); - if (c2threshhold) + if (c2threshhold) { + c2done = true; debug("C2 Runner: All C2s above Threshold!"); selectChallenge(challenge || 0); + } } - if (getPageSetting('AutoStartDaily') && c2threshhold) { + if (getPageSetting('AutoStartDaily') && c2done) { selectChallenge('Daily'); checkCompleteDailies(); var lastUndone = -7; From 07e1b0decde88d320c506f3b940f639609be6d47 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 13:29:51 +0100 Subject: [PATCH 1499/3477] Update portal.js --- modules/portal.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 3ba2de64f..7f9d927f1 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -144,63 +144,73 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL if (!game.global.portalActive) return; if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { - var c2threshhold = false; if (c2listp.Size.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Size"); debug("C2 Runner: Running C2 Challenge Size"); + return false; } else if (c2listp.Slow.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Slow"); debug("C2 Runner: Running C2 Challenge Slow"); + return false; } else if (c2listp.Watch.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Watch"); debug("C2 Runner: Running C2 Challenge Watch"); + return false; } else if (c2listp.Discipline.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Discipline"); debug("C2 Runner: Running C2 Challenge Discipline"); + return false; } else if (c2listp.Balance.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Balance"); debug("C2 Runner: Running C2 Challenge Balance"); + return false; } else if (c2listp.Meditate.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Meditate"); debug("C2 Runner: Running C2 Challenge Meditate"); + return false; } else if (c2listp.Metal.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Metal"); debug("C2 Runner: Running C2 Challenge Metal"); + return false; } else if (c2listp.Lead.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Lead"); debug("C2 Runner: Running C2 Challenge Lead"); + return false; } else if (c2listp.Nom.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Nom"); debug("C2 Runner: Running C2 Challenge Nom"); + return false; } else if (c2listp.Electricity.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Electricity"); debug("C2 Runner: Running C2 Challenge Electricity"); + return false; } else if (c2listp.Toxicity.percentzone < getPageSetting('c2runnerpercent')) { toggleChallengeSquared(); selectChallenge("Toxicity"); debug("C2 Runner: Running C2 Challenge Toxicity"); + return false; } - else c2threshhold=true; + else return true; } } @@ -217,7 +227,7 @@ function doPortal(challenge) { AutoPerks.clickAllocate(); if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { c2runner(); - if (c2threshhold) { + if (c2runner() == true) { c2done = true; debug("C2 Runner: All C2s above Threshold!"); selectChallenge(challenge || 0); From c651b8ce90ec579012b6e4e5476f2e4683a96bae Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 13:42:02 +0100 Subject: [PATCH 1500/3477] Update portal.js --- modules/portal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 7f9d927f1..4c3a7cf6c 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -250,7 +250,7 @@ function doPortal(challenge) { debug("Portaling into Daily for: " + getDailyTimeString(lastUndone, true) + " now!", "portal"); } } - if(challenge) { + else if(challenge) { selectChallenge(challenge); } pushData(); From b99d90194faccc08522c97a68d5f9bbcae620794 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 13:49:28 +0100 Subject: [PATCH 1501/3477] Update portal.js --- modules/portal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 4c3a7cf6c..b0044e778 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -250,7 +250,7 @@ function doPortal(challenge) { debug("Portaling into Daily for: " + getDailyTimeString(lastUndone, true) + " now!", "portal"); } } - else if(challenge) { + else if(challenge && c2done) { selectChallenge(challenge); } pushData(); From 6698b14628fc1e475bd96cfe6e9b1b463945f1e5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 29 Sep 2018 14:56:09 +0100 Subject: [PATCH 1502/3477] Update portal.js --- modules/portal.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index b0044e778..017b0932a 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -225,15 +225,15 @@ function doPortal(challenge) { portalClicked(); if (getPageSetting('AutoAllocatePerks')==1 && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) AutoPerks.clickAllocate(); - if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { + /*if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { c2runner(); if (c2runner() == true) { c2done = true; debug("C2 Runner: All C2s above Threshold!"); selectChallenge(challenge || 0); } - } - if (getPageSetting('AutoStartDaily') && c2done) { + }*/ + if (getPageSetting('AutoStartDaily')) { selectChallenge('Daily'); checkCompleteDailies(); var lastUndone = -7; @@ -250,7 +250,7 @@ function doPortal(challenge) { debug("Portaling into Daily for: " + getDailyTimeString(lastUndone, true) + " now!", "portal"); } } - else if(challenge && c2done) { + else if(challenge) { selectChallenge(challenge); } pushData(); From 1b75b33a9b9186f5b43864f4e57386f21a44605e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 30 Sep 2018 09:50:48 +0100 Subject: [PATCH 1503/3477] Update maps.js --- modules/maps.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/maps.js b/modules/maps.js index cb6c82cb1..a8dd49051 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -1,5 +1,5 @@ //update fuckface -MODULES.maps={},MODULES.maps.enoughDamageCutoff=4,MODULES.maps.farmingCutoff=getPageSetting("DisableFarm"),MODULES.maps.numHitsSurvived=8,MODULES.maps.LeadfarmingCutoff=10,MODULES.maps.NomfarmingCutoff=10,MODULES.maps.NomFarmStacksCutoff=[7,30,100],MODULES.maps.MapTierZone=[72,47,16],MODULES.maps.MapTier0Sliders=[9,9,9,"Mountain"],MODULES.maps.MapTier1Sliders=[9,9,9,"Depths"],MODULES.maps.MapTier2Sliders=[9,9,9,"Random"],MODULES.maps.MapTier3Sliders=[9,9,9,"Random"],MODULES.maps.preferGardens=!getPageSetting("PreferMetal"),MODULES.maps.maxMapBonus=10,MODULES.maps.wantHealthMapBonus=10,MODULES.maps.SpireFarm199Maps=!0,MODULES.maps.watchChallengeMaps=[15,25,35,50],MODULES.maps.shouldFarmCell=59,MODULES.maps.SkipNumUnboughtPrestiges=2,MODULES.maps.UnearnedPrestigesRequired=2,MODULES.maps.maxMapBonusAfterZ=MODULES.maps.maxMapBonus;var doVoids=!1,needToVoid=!1,needPrestige=!1,skippedPrestige=!1,HDratio=0,ourBaseDamage=0,ourBaseDamage2=0,scryerStuck=!1,shouldDoMaps=!1,mapTimeEstimate=0,lastMapWeWereIn=null,preSpireFarming=!1,spireMapBonusFarming=!1,spireTime=0,doMaxMapBonus=!1,vanillaMapatZone=!1,additionalCritMulti=2 Date: Sun, 30 Sep 2018 09:59:35 +0100 Subject: [PATCH 1504/3477] Update maps.js --- modules/maps.js | 415 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 414 insertions(+), 1 deletion(-) diff --git a/modules/maps.js b/modules/maps.js index a8dd49051..dc9df3b4e 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -1,4 +1,417 @@ -//update fuckface +//moving battle calc + +function getBattleStats(what,form,crit) { + var currentCalc = 0; + if (what == "health" || what == "attack"){ + currentCalc += (what == "health") ? 50 : 6; + + for (var equip in game.equipment){ + var temp = game.equipment[equip]; + if (typeof temp[what] === 'undefined' || temp.level <= 0 || temp.blockNow) continue; + var equipStrength = temp[what + "Calculated"] * temp.level; + currentCalc += equipStrength; + } + } + else if (what == "block"){ + var gym = game.buildings.Gym; + if (gym.owned > 0){ + var gymStrength = gym.owned * gym.increase.by; + currentCalc += gymStrength; + } + var shield = game.equipment.Shield; + if (shield.blockNow && shield.level > 0){ + var shieldStrength = shield.level * shield.blockCalculated; + currentCalc += shieldStrength; + } + var trainer = game.jobs.Trainer; + if (trainer.owned > 0){ + var trainerStrength = trainer.owned * (trainer.modifier / 100); + trainerStrength = calcHeirloomBonus("Shield", "trainerEfficiency", trainerStrength); + currentCalc *= (trainerStrength + 1); + } + } + currentCalc *= game.resources.trimps.maxSoldiers; + if (what == "attack" && game.global.achievementBonus > 0){ + currentCalc *= 1 + (game.global.achievementBonus / 100); + } + var perk = ""; + if (what == "health") perk = "Toughness"; + if (what == "attack") perk = "Power"; + if (perk && game.portal[perk].level > 0){ + var PerkStrength = (game.portal[perk].level * game.portal[perk].modifier); + currentCalc *= (PerkStrength + 1); + } + perk = perk + "_II"; + if (game.portal[perk] && game.portal[perk].level > 0){ + var PerkStrength = (game.portal[perk].level * game.portal[perk].modifier); + currentCalc *= (PerkStrength + 1); + } + if (what == "health" && game.portal.Resilience.level > 0){ + var resStrength = Math.pow(game.portal.Resilience.modifier + 1, game.portal.Resilience.level); + currentCalc *= resStrength; + } + var geneticist = game.jobs.Geneticist; + if (geneticist.owned > 0 && what == "health"){ + var geneticistStrength = Math.pow(1.01, game.global.lastLowGen); + currentCalc *= geneticistStrength; + } + var anticipation = game.portal.Anticipation; + if (anticipation.level > 0 && what == "attack"){ + var antiStrength = ((anticipation.level * anticipation.modifier * game.global.antiStacks) + 1); + currentCalc *= antiStrength; + } + if (form && game.global.formation > 0){ + var formStrength = 0.5; + if ((game.global.formation == 1 && what == "health") || (game.global.formation == 2 && what == "attack") || (game.global.formation == 3 && what == "block")) formStrength = 4; + currentCalc *= formStrength; + } + if (!game.global.mapsActive && game.global.mapBonus > 0 && what == "attack"){ + var mapBonusMult = 0.2 * game.global.mapBonus; + currentCalc *= (1 + mapBonusMult); + mapBonusMult *= 100; + } + if (what == "attack" && game.global.roboTrimpLevel > 0){ + var roboTrimpMod = 0.2 * game.global.roboTrimpLevel; + currentCalc *= (1 + roboTrimpMod); + roboTrimpMod *= 100; + } + if (what == "health" && game.global.challengeActive == "Life"){ + currentCalc *= game.challenges.Life.getHealthMult(); + } + if (what == "attack" && game.global.challengeActive == "Life"){ + currentCalc *= game.challenges.Life.getHealthMult(); + } + if (what == "health" && game.global.challengeActive == "Balance"){ + currentCalc *= game.challenges.Balance.getHealthMult(); + } + if (what == "attack" && game.global.challengeActive == "Lead" && ((game.global.world % 2) == 1)){ + currentCalc *= 1.5; + } + var heirloomBonus = calcHeirloomBonus("Shield", "trimp" + capitalizeFirstLetter(what), 0, true); + if (heirloomBonus > 0){ + currentCalc *= ((heirloomBonus / 100) + 1); + } + if (game.global.challengeActive == "Decay" && what == "attack"){ + currentCalc *= 5; + var stackStr = Math.pow(0.995, game.challenges.Decay.stacks); + currentCalc *= stackStr; + } + if ((game.global.challengeActive == "Electricity" || game.global.challengeActive == "Mapocalypse") && what == "attack") { + var mult = (1 - (game.challenges.Electricity.stacks * 0.1)); + currentCalc *= mult; + } + if (game.global.radioStacks > 0) { + currentCalc *= (1 - (game.global.radioStacks * 0.1)); + } + if (game.global.challengeActive == "Daily"){ + var mult = 0; + if (game.talents.daily.purchased && what == "attack"){ + currentCalc *= 1.5; + } + if (typeof game.global.dailyChallenge.weakness !== 'undefined' && what == "attack"){ + mult = dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); + currentCalc *= mult; + } + if (typeof game.global.dailyChallenge.oddTrimpNerf !== 'undefined' && what == "attack" && (game.global.world % 2 == 1)){ + mult = dailyModifiers.oddTrimpNerf.getMult(game.global.dailyChallenge.oddTrimpNerf.strength); + currentCalc *= mult; + } + if (typeof game.global.dailyChallenge.evenTrimpBuff !== 'undefined' && what == "attack" && (game.global.world % 2 == 0)){ + mult = dailyModifiers.evenTrimpBuff.getMult(game.global.dailyChallenge.evenTrimpBuff.strength); + currentCalc *= mult; + } + if (typeof game.global.dailyChallenge.rampage !== 'undefined' && what == "attack"){ + mult = dailyModifiers.rampage.getMult(game.global.dailyChallenge.rampage.strength, game.global.dailyChallenge.rampage.stacks); + currentCalc *= mult; + } + if (typeof game.global.dailyChallenge.pressure !== 'undefined' && what == "health"){ + mult = dailyModifiers.pressure.getMult(game.global.dailyChallenge.pressure.strength, game.global.dailyChallenge.pressure.stacks); + currentCalc *= mult; + } + } + if (what != "block" && game.goldenUpgrades.Battle.currentBonus > 0){ + amt = game.goldenUpgrades.Battle.currentBonus; + currentCalc *= 1 + amt; + } + if (what != "block" && game.talents.voidPower.purchased && game.global.voidBuff){ + amt = (game.talents.voidPower2.purchased) ? ((game.talents.voidPower3.purchased) ? 65 : 35) : 15; + currentCalc *= (1 + (amt / 100)); + } + if (game.talents.stillRowing2.purchased && what == "attack" && game.global.spireRows >= 1){ + amt = game.global.spireRows * 0.06; + currentCalc *= (amt + 1); + } + if (game.talents.healthStrength.purchased && what == "attack" && mutations.Healthy.active()){ + var cellCount = mutations.Healthy.cellCount(); + amt = (0.15 * cellCount); + currentCalc *= (amt + 1); + } + if (game.talents.scry.purchased && what == "attack" && game.global.formation == 4 && (mutations.Healthy.active() || mutations.Corruption.active())){ + currentCalc *= 2 + } + if (game.global.sugarRush > 0 && what == "attack"){ + currentCalc *= sugarRush.getAttackStrength(); + textString += "Sugar Rush  x " + sugarRush.getAttackStrength() + "" + prettify(currentCalc) + "" + ((what == "attack") ? getFluctuation(currentCalc, minFluct, maxFluct) : "") + ""; + } + if (mutations.Magma.active() && (what == "attack" || what == "health")){ + var mult = mutations.Magma.getTrimpDecay(); + var lvls = game.global.world - mutations.Magma.start() + 1; + currentCalc *= mult; + } + if (game.global.totalSquaredReward > 0 && (what == "attack" || what == "health")){ + var amt = game.global.totalSquaredReward; + currentCalc *= (1 + (amt / 100)); + } + if (what == "attack" && getEmpowerment() == "Ice"){ + var amt = 1 - game.empowerments.Ice.getCombatModifier(); + currentCalc *= (1 + amt); + } + if (what == "attack" && Fluffy.isActive()){ + var amt = Fluffy.getDamageModifier(); + currentCalc *= amt; + } + if (what == "attack" && game.jobs.Amalgamator.owned > 0){ + var amt = game.jobs.Amalgamator.getDamageMult(); + currentCalc *= amt; + } + if (what == "health" && game.jobs.Amalgamator.owned > 0){ + var amt = game.jobs.Amalgamator.getHealthMult(); + currentCalc *= amt; + } + if (what == "attack" && game.singleRunBonuses.sharpTrimps.owned) { + currentCalc *= 1.5; + } + if (game.jobs.Magmamancer.owned > 0) { + currentCalc *= game.jobs.Magmamancer.getBonusPercent(); + } + if (what == "attack" && getEmpowerment() == "Poison" && getPageSetting('addpoison') == true){ + var amt = game.empowerments.Poison.getModifier() * 2; + currentCalc *= (1 + amt); + } + if (crit) { + var critChance = getPlayerCritChance(); + if (what == "attack" && critChance){ + currentCalc *= getPlayerCritDamageMult(); + } + } + return currentCalc; +} + +function calcOurDmg(minMaxAvg, incStance, incFlucts) { + var number = game.global.soldierCurrentAttack; + var fluctuation = .2; + var maxFluct = -1; + var minFluct = -1; + if (game.jobs.Amalgamator.owned > 0){ + number *= game.jobs.Amalgamator.getDamageMult(); + } + if (game.challenges.Electricity.stacks > 0) { //Electricity + number *= (1 - (game.challenges.Electricity.stacks * 0.1)); + } + if (game.global.antiStacks > 0) { + number *= ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1); + } + if (!game.global.mapsActive && game.global.mapBonus > 0){ + number *= ((game.global.mapBonus * .2) + 1); + } + if (game.global.achievementBonus > 0){ + number *= (1 + (game.global.achievementBonus / 100)); + } + if (game.global.challengeActive == "Discipline"){ + fluctuation = .995; + } + else if (game.portal.Range.level > 0){ + minFluct = fluctuation - (.02 * game.portal.Range.level); + } + if (game.global.challengeActive == "Decay"){ + number *= 5; + number *= Math.pow(0.995, game.challenges.Decay.stacks); + } + if (game.global.roboTrimpLevel > 0){ + number *= ((0.2 * game.global.roboTrimpLevel) + 1); + } + if (game.global.challengeActive == "Lead" && ((game.global.world % 2) == 1)){ + number *= 1.5; + } + if (game.goldenUpgrades.Battle.currentBonus > 0){ + number *= game.goldenUpgrades.Battle.currentBonus + 1; + } + if (game.talents.voidPower.purchased && game.global.voidBuff){ + var vpAmt = (game.talents.voidPower2.purchased) ? ((game.talents.voidPower3.purchased) ? 65 : 35) : 15; + number *= ((vpAmt / 100) + 1); + } + if (game.global.totalSquaredReward > 0){ + number *= ((game.global.totalSquaredReward / 100) + 1) + } + if (getEmpowerment() == "Ice"){ + number *= 1 + (1 - game.empowerments.Ice.getCombatModifier()); + } + if (getEmpowerment() == "Poison" && getPageSetting('addpoison') == true){ + number *= 1 + game.empowerments.Poison.getModifier(); + } + if (game.talents.magmamancer.purchased){ + number *= game.jobs.Magmamancer.getBonusPercent(); + } + if (game.talents.stillRowing2.purchased){ + number *= ((game.global.spireRows * 0.06) + 1); + } + if (game.talents.healthStrength.purchased && mutations.Healthy.active()){ + number *= ((0.15 * mutations.Healthy.cellCount()) + 1); + } + if (game.global.sugarRush > 0){ + number *= sugarRush.getAttackStrength(); + } + if (game.global.challengeActive == "Life") { + number *= game.challenges.Life.getHealthMult(); + } + if (game.singleRunBonuses.sharpTrimps.owned){ + number *= 1.5; + } + if (game.global.challengeActive == "Daily" && game.talents.daily.purchased){ + number *= 1.5; + } + if (game.global.challengeActive == "Daily"){ + if (typeof game.global.dailyChallenge.minDamage !== 'undefined'){ + if (minFluct == -1) minFluct = fluctuation; + minFluct += dailyModifiers.minDamage.getMult(game.global.dailyChallenge.minDamage.strength); + } + if (typeof game.global.dailyChallenge.maxDamage !== 'undefined'){ + if (maxFluct == -1) maxFluct = fluctuation; + maxFluct += dailyModifiers.maxDamage.getMult(game.global.dailyChallenge.maxDamage.strength); + } + if (typeof game.global.dailyChallenge.weakness !== 'undefined'){ + number *= dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); + } + if (typeof game.global.dailyChallenge.oddTrimpNerf !== 'undefined' && ((game.global.world % 2) == 1)){ + number *= dailyModifiers.oddTrimpNerf.getMult(game.global.dailyChallenge.oddTrimpNerf.strength); + } + if (typeof game.global.dailyChallenge.evenTrimpBuff !== 'undefined' && ((game.global.world % 2) == 0)){ + number *= dailyModifiers.evenTrimpBuff.getMult(game.global.dailyChallenge.evenTrimpBuff.strength); + } + if (typeof game.global.dailyChallenge.rampage !== 'undefined'){ + number *= dailyModifiers.rampage.getMult(game.global.dailyChallenge.rampage.strength, game.global.dailyChallenge.rampage.stacks); + } + } + if (Fluffy.isActive()){ + number *= Fluffy.getDamageModifier(); + } + + if (!incStance && game.global.formation != 0) { + number /= (game.global.formation == 2) ? 4 : 0.5; + } + + var min = number; + var max = number; + var avg = number; + + var critTier = 0; + var critChance = getPlayerCritChance(); + if (critChance > 0){ + critTier = Math.floor(critChance); + critChance = critChance % 1; + max *= getPlayerCritDamageMult(); + if (critTier > 0){ + min = max; + if (critTier > 1){ + min *= getMegaCritDamageMult(critTier); + } + if (critChance > 0) max *= getMegaCritDamageMult(critTier + 1); + else max = min; + } + avg = max * critChance + min * (1 - critChance); + } + if (critChance < 0) { + min *= 0.2; + if (critChance <= -1) max *= 0.2; + avg = max * (1 + critChance) + min * -critChance; + } + + if (incFlucts) { + if (minFluct > 1) minFluct = 1; + if (maxFluct == -1) maxFluct = fluctuation; + if (minFluct == -1) minFluct = fluctuation; + + min *= (1 - minFluct); + max *= (1 + maxFluct); + avg *= 1 + (maxFluct - minFluct)/2; + } + + if (minMaxAvg == "min") return min; + else if (minMaxAvg == "max") return max; + else if (minMaxAvg == "avg") return avg; + +} + + + +function calcBadGuyDmg(enemy,attack,daily,maxormin,disableFlucts) { + var number; + if (enemy) + number = enemy.attack; + else + number = attack; + var fluctuation = .2; + var maxFluct = -1; + var minFluct = -1; + + if (game.global.challengeActive){ + if (game.global.challengeActive == "Coordinate"){ + number *= getBadCoordLevel(); + } + else if (game.global.challengeActive == "Meditate"){ + number *= 1.5; + } + else if (enemy && game.global.challengeActive == "Nom" && typeof enemy.nomStacks !== 'undefined'){ + number *= Math.pow(1.25, enemy.nomStacks); + } + else if (game.global.challengeActive == "Watch") { + number *= 1.25; + } + else if (game.global.challengeActive == "Lead"){ + number *= (1 + (game.challenges.Lead.stacks * 0.04)); + } + else if (game.global.challengeActive == "Scientist" && getScientistLevel() == 5) { + number *= 10; + } + else if (game.global.challengeActive == "Corrupted"){ + number *= 3; + } + else if (game.global.challengeActive == "Obliterated"){ + number *= 1e12; + } + if (daily) + number = calcDailyAttackMod(number); + } + if (game.global.usingShriek) { + number *= game.mapUnlocks.roboTrimp.getShriekValue(); + } + + if (!disableFlucts) { + if (minFluct > 1) minFluct = 1; + if (maxFluct == -1) maxFluct = fluctuation; + if (minFluct == -1) minFluct = fluctuation; + var min = Math.floor(number * (1 - minFluct)); + var max = Math.ceil(number + (number * maxFluct)); + return maxormin ? max : min; + } + else + return number; +} +function calcDailyAttackMod(number) { + if (game.global.challengeActive == "Daily"){ + if (typeof game.global.dailyChallenge.badStrength !== 'undefined'){ + number *= dailyModifiers.badStrength.getMult(game.global.dailyChallenge.badStrength.strength); + } + if (typeof game.global.dailyChallenge.badMapStrength !== 'undefined' && game.global.mapsActive){ + number *= dailyModifiers.badMapStrength.getMult(game.global.dailyChallenge.badMapStrength.strength); + } + if (typeof game.global.dailyChallenge.bloodthirst !== 'undefined'){ + number *= dailyModifiers.bloodthirst.getMult(game.global.dailyChallenge.bloodthirst.strength, game.global.dailyChallenge.bloodthirst.stacks); + } + } + return number; +} + MODULES.maps={},MODULES.maps.enoughDamageCutoff=4,MODULES.maps.farmingCutoff=getPageSetting("DisableFarm"),MODULES.maps.numHitsSurvived=8,MODULES.maps.LeadfarmingCutoff=10,MODULES.maps.NomfarmingCutoff=10,MODULES.maps.NomFarmStacksCutoff=[7,30,100],MODULES.maps.MapTierZone=[72,47,16],MODULES.maps.MapTier0Sliders=[9,9,9,"Mountain"],MODULES.maps.MapTier1Sliders=[9,9,9,"Depths"],MODULES.maps.MapTier2Sliders=[9,9,9,"Random"],MODULES.maps.MapTier3Sliders=[9,9,9,"Random"],MODULES.maps.preferGardens=!getPageSetting("PreferMetal"),MODULES.maps.maxMapBonus=10,MODULES.maps.wantHealthMapBonus=10,MODULES.maps.SpireFarm199Maps=!0,MODULES.maps.watchChallengeMaps=[15,25,35,50],MODULES.maps.shouldFarmCell=59,MODULES.maps.SkipNumUnboughtPrestiges=2,MODULES.maps.UnearnedPrestigesRequired=2,MODULES.maps.maxMapBonusAfterZ=MODULES.maps.maxMapBonus;var doVoids=!1,needToVoid=!1,needPrestige=!1,skippedPrestige=!1,HDratio=0,ourBaseDamage=calcOurDmg("avg", false, true),ourBaseDamage2=0,scryerStuck=!1,shouldDoMaps=!1,mapTimeEstimate=0,lastMapWeWereIn=null,preSpireFarming=!1,spireMapBonusFarming=!1,spireTime=0,doMaxMapBonus=!1,vanillaMapatZone=!1,additionalCritMulti=2 Date: Sun, 30 Sep 2018 09:59:52 +0100 Subject: [PATCH 1505/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 7941cf615..e90f85b99 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -7,7 +7,7 @@ function initializeAutoTrimps() { loadPageVariables(); ATscriptLoad('','SettingsGUI'); ATscriptLoad('','Graphs'); - ATmoduleList = ['query', 'portal', 'upgrades', 'heirlooms', 'buildings', 'jobs', 'equipment', 'gather', 'stance', 'battlecalc', 'maps', 'breedtimer', 'dynprestige', 'fight', 'scryer', 'magmite', 'other', 'import-export', 'perks', 'fight-info', 'performance']; + ATmoduleList = ['query', 'portal', 'upgrades', 'heirlooms', 'buildings', 'jobs', 'equipment', 'gather', 'stance', /*'battlecalc',*/ 'maps', 'breedtimer', 'dynprestige', 'fight', 'scryer', 'magmite', 'other', 'import-export', 'perks', 'fight-info', 'performance']; for (var m in ATmoduleList) { ATscriptLoad(modulepath, ATmoduleList[m]); } From 925f1ef0f5eb3f5301094037cefc8342518723c2 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 30 Sep 2018 10:01:47 +0100 Subject: [PATCH 1506/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index e90f85b99..f29ef5f76 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -7,7 +7,7 @@ function initializeAutoTrimps() { loadPageVariables(); ATscriptLoad('','SettingsGUI'); ATscriptLoad('','Graphs'); - ATmoduleList = ['query', 'portal', 'upgrades', 'heirlooms', 'buildings', 'jobs', 'equipment', 'gather', 'stance', /*'battlecalc',*/ 'maps', 'breedtimer', 'dynprestige', 'fight', 'scryer', 'magmite', 'other', 'import-export', 'perks', 'fight-info', 'performance']; + ATmoduleList = ['query', 'portal', 'upgrades', 'heirlooms', 'buildings', 'jobs', 'equipment', 'gather', 'stance', 'maps', 'breedtimer', 'dynprestige', 'fight', 'scryer', 'magmite', 'other', 'import-export', 'perks', 'fight-info', 'performance']; for (var m in ATmoduleList) { ATscriptLoad(modulepath, ATmoduleList[m]); } From 19e63db750c0f7705d0c57df7a322eda368f990b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 30 Sep 2018 10:02:06 +0100 Subject: [PATCH 1507/3477] Update battlecalc.js --- modules/battlecalc.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/battlecalc.js b/modules/battlecalc.js index 872cd07a2..78af95bdd 100644 --- a/modules/battlecalc.js +++ b/modules/battlecalc.js @@ -1,3 +1,6 @@ +//unused + + function getBattleStats(what,form,crit) { var currentCalc = 0; if (what == "health" || what == "attack"){ From 66c7bce85c3da40715ccf582a67c561ccf48e017 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 30 Sep 2018 12:41:29 +0100 Subject: [PATCH 1508/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index f29ef5f76..b6610badb 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -47,7 +47,7 @@ function printLowerLevelPlayerNotice() { tooltip('confirm', null, 'update', 'The fact that it works at all is misleading new players into thinking its perfect. Its not. If your highest zone is under z60, you have not unlocked the stats required, and have not experienced the full meta with its various paradigm shifts. If you are just starting, my advice is to play along naturally and use AutoTrimps as a tool, not a crutch. Play with the settings as if it was the game, Dont expect to go unattended, if AT chooses wrong, and make the RIGHT choice yourself. Additionally, its not coded to run one-time challenges for you, only repeatable ones for helium. During this part of the game, content is king - automating literally removes the fun of the game. If you find that many flaws in the automation exist for you, level up. Keep in mind the challenge of maintaining the code is that it has to work for everyone. AT cant see the future and doesnt run simulations, it exists only in the present moment. Post any suggestions on how it can be better, or volunteer to adapt the code, or produce some sort of low-level player guide with what youve learned.
    Happy scripting! -genBTC','cancelTooltip()', 'LowLevelPlayer Notes:
    PSA: AutoTrimps was not designed for new/low-level players.', "I understand I am on my own and I Accept and Continue.", null, true); } var runInterval=100,startupDelay=4000;setTimeout(delayStart,startupDelay);function delayStart(){initializeAutoTrimps(),printChangelog(),setTimeout(delayStartAgain,startupDelay)}function delayStartAgain(){8>game.achievements.zones.finished&&printLowerLevelPlayerNotice(),game.global.addonUser=!0,game.global.autotrimps=!0,MODULESdefault=JSON.parse(JSON.stringify(MODULES)),setInterval(mainLoop,runInterval),setInterval(guiLoop,10*runInterval),autoTrimpSettings.PrestigeBackup!==void 0&&''!=autoTrimpSettings.PrestigeBackup.selected&&(document.getElementById('Prestige').value=autoTrimpSettings.PrestigeBackup.selected),''===document.getElementById('Prestige').value&&(document.getElementById('Prestige').value='Off')} -var ATrunning=!0,ATmessageLogTabVisible=!0,enableDebug=!0,autoTrimpSettings={},MODULES={},MODULESdefault={},ATMODULES={},ATmoduleList=[],bestBuilding,scienceNeeded,breedFire=!1,shouldFarm=!1,enoughDamage=!0,enoughHealth=!0,baseDamage=0,baseBlock=0,baseHealth=0,preBuyAmt,preBuyFiring,preBuyTooltip,preBuymaxSplit,currentworld=0,lastrunworld=0,aWholeNewWorld=!1,needGymystic=!0,heirloomFlag=!1,heirloomCache=game.global.heirloomsExtra.length,magmiteSpenderChanged=!1,daily3=!1; +var ATrunning=!0,ATmessageLogTabVisible=!0,enableDebug=!0,autoTrimpSettings={},MODULES={},MODULESdefault={},ATMODULES={},ATmoduleList=[],bestBuilding,scienceNeeded,breedFire=!1,shouldFarm=!1,enoughDamage=!0,enoughHealth=!0,baseDamage=calcOurDmg("avg", false, true),baseBlock=0,baseHealth=0,preBuyAmt,preBuyFiring,preBuyTooltip,preBuymaxSplit,currentworld=0,lastrunworld=0,aWholeNewWorld=!1,needGymystic=!0,heirloomFlag=!1,heirloomCache=game.global.heirloomsExtra.length,magmiteSpenderChanged=!1,daily3=!1; function mainLoop() { if (ATrunning == false) return; From 5c9b9da03de0b424782c9599231c62704f037c85 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 30 Sep 2018 12:46:08 +0100 Subject: [PATCH 1509/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 147 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index b6610badb..deea29207 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -47,6 +47,153 @@ function printLowerLevelPlayerNotice() { tooltip('confirm', null, 'update', 'The fact that it works at all is misleading new players into thinking its perfect. Its not. If your highest zone is under z60, you have not unlocked the stats required, and have not experienced the full meta with its various paradigm shifts. If you are just starting, my advice is to play along naturally and use AutoTrimps as a tool, not a crutch. Play with the settings as if it was the game, Dont expect to go unattended, if AT chooses wrong, and make the RIGHT choice yourself. Additionally, its not coded to run one-time challenges for you, only repeatable ones for helium. During this part of the game, content is king - automating literally removes the fun of the game. If you find that many flaws in the automation exist for you, level up. Keep in mind the challenge of maintaining the code is that it has to work for everyone. AT cant see the future and doesnt run simulations, it exists only in the present moment. Post any suggestions on how it can be better, or volunteer to adapt the code, or produce some sort of low-level player guide with what youve learned.
    Happy scripting! -genBTC','cancelTooltip()', 'LowLevelPlayer Notes:
    PSA: AutoTrimps was not designed for new/low-level players.', "I understand I am on my own and I Accept and Continue.", null, true); } var runInterval=100,startupDelay=4000;setTimeout(delayStart,startupDelay);function delayStart(){initializeAutoTrimps(),printChangelog(),setTimeout(delayStartAgain,startupDelay)}function delayStartAgain(){8>game.achievements.zones.finished&&printLowerLevelPlayerNotice(),game.global.addonUser=!0,game.global.autotrimps=!0,MODULESdefault=JSON.parse(JSON.stringify(MODULES)),setInterval(mainLoop,runInterval),setInterval(guiLoop,10*runInterval),autoTrimpSettings.PrestigeBackup!==void 0&&''!=autoTrimpSettings.PrestigeBackup.selected&&(document.getElementById('Prestige').value=autoTrimpSettings.PrestigeBackup.selected),''===document.getElementById('Prestige').value&&(document.getElementById('Prestige').value='Off')} + +function calcOurDmg(minMaxAvg, incStance, incFlucts) { + var number = game.global.soldierCurrentAttack; + var fluctuation = .2; + var maxFluct = -1; + var minFluct = -1; + if (game.jobs.Amalgamator.owned > 0){ + number *= game.jobs.Amalgamator.getDamageMult(); + } + if (game.challenges.Electricity.stacks > 0) { //Electricity + number *= (1 - (game.challenges.Electricity.stacks * 0.1)); + } + if (game.global.antiStacks > 0) { + number *= ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1); + } + if (!game.global.mapsActive && game.global.mapBonus > 0){ + number *= ((game.global.mapBonus * .2) + 1); + } + if (game.global.achievementBonus > 0){ + number *= (1 + (game.global.achievementBonus / 100)); + } + if (game.global.challengeActive == "Discipline"){ + fluctuation = .995; + } + else if (game.portal.Range.level > 0){ + minFluct = fluctuation - (.02 * game.portal.Range.level); + } + if (game.global.challengeActive == "Decay"){ + number *= 5; + number *= Math.pow(0.995, game.challenges.Decay.stacks); + } + if (game.global.roboTrimpLevel > 0){ + number *= ((0.2 * game.global.roboTrimpLevel) + 1); + } + if (game.global.challengeActive == "Lead" && ((game.global.world % 2) == 1)){ + number *= 1.5; + } + if (game.goldenUpgrades.Battle.currentBonus > 0){ + number *= game.goldenUpgrades.Battle.currentBonus + 1; + } + if (game.talents.voidPower.purchased && game.global.voidBuff){ + var vpAmt = (game.talents.voidPower2.purchased) ? ((game.talents.voidPower3.purchased) ? 65 : 35) : 15; + number *= ((vpAmt / 100) + 1); + } + if (game.global.totalSquaredReward > 0){ + number *= ((game.global.totalSquaredReward / 100) + 1) + } + if (getEmpowerment() == "Ice"){ + number *= 1 + (1 - game.empowerments.Ice.getCombatModifier()); + } + if (getEmpowerment() == "Poison" && getPageSetting('addpoison') == true){ + number *= 1 + game.empowerments.Poison.getModifier(); + } + if (game.talents.magmamancer.purchased){ + number *= game.jobs.Magmamancer.getBonusPercent(); + } + if (game.talents.stillRowing2.purchased){ + number *= ((game.global.spireRows * 0.06) + 1); + } + if (game.talents.healthStrength.purchased && mutations.Healthy.active()){ + number *= ((0.15 * mutations.Healthy.cellCount()) + 1); + } + if (game.global.sugarRush > 0){ + number *= sugarRush.getAttackStrength(); + } + if (game.global.challengeActive == "Life") { + number *= game.challenges.Life.getHealthMult(); + } + if (game.singleRunBonuses.sharpTrimps.owned){ + number *= 1.5; + } + if (game.global.challengeActive == "Daily" && game.talents.daily.purchased){ + number *= 1.5; + } + if (game.global.challengeActive == "Daily"){ + if (typeof game.global.dailyChallenge.minDamage !== 'undefined'){ + if (minFluct == -1) minFluct = fluctuation; + minFluct += dailyModifiers.minDamage.getMult(game.global.dailyChallenge.minDamage.strength); + } + if (typeof game.global.dailyChallenge.maxDamage !== 'undefined'){ + if (maxFluct == -1) maxFluct = fluctuation; + maxFluct += dailyModifiers.maxDamage.getMult(game.global.dailyChallenge.maxDamage.strength); + } + if (typeof game.global.dailyChallenge.weakness !== 'undefined'){ + number *= dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); + } + if (typeof game.global.dailyChallenge.oddTrimpNerf !== 'undefined' && ((game.global.world % 2) == 1)){ + number *= dailyModifiers.oddTrimpNerf.getMult(game.global.dailyChallenge.oddTrimpNerf.strength); + } + if (typeof game.global.dailyChallenge.evenTrimpBuff !== 'undefined' && ((game.global.world % 2) == 0)){ + number *= dailyModifiers.evenTrimpBuff.getMult(game.global.dailyChallenge.evenTrimpBuff.strength); + } + if (typeof game.global.dailyChallenge.rampage !== 'undefined'){ + number *= dailyModifiers.rampage.getMult(game.global.dailyChallenge.rampage.strength, game.global.dailyChallenge.rampage.stacks); + } + } + if (Fluffy.isActive()){ + number *= Fluffy.getDamageModifier(); + } + + if (!incStance && game.global.formation != 0) { + number /= (game.global.formation == 2) ? 4 : 0.5; + } + + var min = number; + var max = number; + var avg = number; + + var critTier = 0; + var critChance = getPlayerCritChance(); + if (critChance > 0){ + critTier = Math.floor(critChance); + critChance = critChance % 1; + max *= getPlayerCritDamageMult(); + if (critTier > 0){ + min = max; + if (critTier > 1){ + min *= getMegaCritDamageMult(critTier); + } + if (critChance > 0) max *= getMegaCritDamageMult(critTier + 1); + else max = min; + } + avg = max * critChance + min * (1 - critChance); + } + if (critChance < 0) { + min *= 0.2; + if (critChance <= -1) max *= 0.2; + avg = max * (1 + critChance) + min * -critChance; + } + + if (incFlucts) { + if (minFluct > 1) minFluct = 1; + if (maxFluct == -1) maxFluct = fluctuation; + if (minFluct == -1) minFluct = fluctuation; + + min *= (1 - minFluct); + max *= (1 + maxFluct); + avg *= 1 + (maxFluct - minFluct)/2; + } + + if (minMaxAvg == "min") return min; + else if (minMaxAvg == "max") return max; + else if (minMaxAvg == "avg") return avg; + +} + + var ATrunning=!0,ATmessageLogTabVisible=!0,enableDebug=!0,autoTrimpSettings={},MODULES={},MODULESdefault={},ATMODULES={},ATmoduleList=[],bestBuilding,scienceNeeded,breedFire=!1,shouldFarm=!1,enoughDamage=!0,enoughHealth=!0,baseDamage=calcOurDmg("avg", false, true),baseBlock=0,baseHealth=0,preBuyAmt,preBuyFiring,preBuyTooltip,preBuymaxSplit,currentworld=0,lastrunworld=0,aWholeNewWorld=!1,needGymystic=!0,heirloomFlag=!1,heirloomCache=game.global.heirloomsExtra.length,magmiteSpenderChanged=!1,daily3=!1; function mainLoop() { From 62c749c5dd94747159672f04f5c37ac4c9f95a4d Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 30 Sep 2018 12:46:56 +0100 Subject: [PATCH 1510/3477] Update maps.js --- modules/maps.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index dc9df3b4e..b9f81d055 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -197,7 +197,7 @@ function getBattleStats(what,form,crit) { return currentCalc; } -function calcOurDmg(minMaxAvg, incStance, incFlucts) { +/*function calcOurDmg(minMaxAvg, incStance, incFlucts) { var number = game.global.soldierCurrentAttack; var fluctuation = .2; var maxFluct = -1; @@ -340,9 +340,7 @@ function calcOurDmg(minMaxAvg, incStance, incFlucts) { else if (minMaxAvg == "max") return max; else if (minMaxAvg == "avg") return avg; -} - - +}*/ function calcBadGuyDmg(enemy,attack,daily,maxormin,disableFlucts) { var number; From fdd1c6aae6ba17868298874e91d89909cefd423f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 30 Sep 2018 12:49:08 +0100 Subject: [PATCH 1511/3477] Update maps.js --- modules/maps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/maps.js b/modules/maps.js index b9f81d055..081fff44e 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -197,7 +197,7 @@ function getBattleStats(what,form,crit) { return currentCalc; } -/*function calcOurDmg(minMaxAvg, incStance, incFlucts) { +function calcOurDmg(minMaxAvg, incStance, incFlucts) { var number = game.global.soldierCurrentAttack; var fluctuation = .2; var maxFluct = -1; @@ -340,7 +340,7 @@ function getBattleStats(what,form,crit) { else if (minMaxAvg == "max") return max; else if (minMaxAvg == "avg") return avg; -}*/ +} function calcBadGuyDmg(enemy,attack,daily,maxormin,disableFlucts) { var number; From 0370f0068a3928f1620d3f48377645e7de468294 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 30 Sep 2018 12:51:08 +0100 Subject: [PATCH 1512/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 149 +------------------------------------------------ 1 file changed, 1 insertion(+), 148 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index deea29207..58e6fdeef 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -47,154 +47,7 @@ function printLowerLevelPlayerNotice() { tooltip('confirm', null, 'update', 'The fact that it works at all is misleading new players into thinking its perfect. Its not. If your highest zone is under z60, you have not unlocked the stats required, and have not experienced the full meta with its various paradigm shifts. If you are just starting, my advice is to play along naturally and use AutoTrimps as a tool, not a crutch. Play with the settings as if it was the game, Dont expect to go unattended, if AT chooses wrong, and make the RIGHT choice yourself. Additionally, its not coded to run one-time challenges for you, only repeatable ones for helium. During this part of the game, content is king - automating literally removes the fun of the game. If you find that many flaws in the automation exist for you, level up. Keep in mind the challenge of maintaining the code is that it has to work for everyone. AT cant see the future and doesnt run simulations, it exists only in the present moment. Post any suggestions on how it can be better, or volunteer to adapt the code, or produce some sort of low-level player guide with what youve learned.
    Happy scripting! -genBTC','cancelTooltip()', 'LowLevelPlayer Notes:
    PSA: AutoTrimps was not designed for new/low-level players.', "I understand I am on my own and I Accept and Continue.", null, true); } var runInterval=100,startupDelay=4000;setTimeout(delayStart,startupDelay);function delayStart(){initializeAutoTrimps(),printChangelog(),setTimeout(delayStartAgain,startupDelay)}function delayStartAgain(){8>game.achievements.zones.finished&&printLowerLevelPlayerNotice(),game.global.addonUser=!0,game.global.autotrimps=!0,MODULESdefault=JSON.parse(JSON.stringify(MODULES)),setInterval(mainLoop,runInterval),setInterval(guiLoop,10*runInterval),autoTrimpSettings.PrestigeBackup!==void 0&&''!=autoTrimpSettings.PrestigeBackup.selected&&(document.getElementById('Prestige').value=autoTrimpSettings.PrestigeBackup.selected),''===document.getElementById('Prestige').value&&(document.getElementById('Prestige').value='Off')} - -function calcOurDmg(minMaxAvg, incStance, incFlucts) { - var number = game.global.soldierCurrentAttack; - var fluctuation = .2; - var maxFluct = -1; - var minFluct = -1; - if (game.jobs.Amalgamator.owned > 0){ - number *= game.jobs.Amalgamator.getDamageMult(); - } - if (game.challenges.Electricity.stacks > 0) { //Electricity - number *= (1 - (game.challenges.Electricity.stacks * 0.1)); - } - if (game.global.antiStacks > 0) { - number *= ((game.global.antiStacks * game.portal.Anticipation.level * game.portal.Anticipation.modifier) + 1); - } - if (!game.global.mapsActive && game.global.mapBonus > 0){ - number *= ((game.global.mapBonus * .2) + 1); - } - if (game.global.achievementBonus > 0){ - number *= (1 + (game.global.achievementBonus / 100)); - } - if (game.global.challengeActive == "Discipline"){ - fluctuation = .995; - } - else if (game.portal.Range.level > 0){ - minFluct = fluctuation - (.02 * game.portal.Range.level); - } - if (game.global.challengeActive == "Decay"){ - number *= 5; - number *= Math.pow(0.995, game.challenges.Decay.stacks); - } - if (game.global.roboTrimpLevel > 0){ - number *= ((0.2 * game.global.roboTrimpLevel) + 1); - } - if (game.global.challengeActive == "Lead" && ((game.global.world % 2) == 1)){ - number *= 1.5; - } - if (game.goldenUpgrades.Battle.currentBonus > 0){ - number *= game.goldenUpgrades.Battle.currentBonus + 1; - } - if (game.talents.voidPower.purchased && game.global.voidBuff){ - var vpAmt = (game.talents.voidPower2.purchased) ? ((game.talents.voidPower3.purchased) ? 65 : 35) : 15; - number *= ((vpAmt / 100) + 1); - } - if (game.global.totalSquaredReward > 0){ - number *= ((game.global.totalSquaredReward / 100) + 1) - } - if (getEmpowerment() == "Ice"){ - number *= 1 + (1 - game.empowerments.Ice.getCombatModifier()); - } - if (getEmpowerment() == "Poison" && getPageSetting('addpoison') == true){ - number *= 1 + game.empowerments.Poison.getModifier(); - } - if (game.talents.magmamancer.purchased){ - number *= game.jobs.Magmamancer.getBonusPercent(); - } - if (game.talents.stillRowing2.purchased){ - number *= ((game.global.spireRows * 0.06) + 1); - } - if (game.talents.healthStrength.purchased && mutations.Healthy.active()){ - number *= ((0.15 * mutations.Healthy.cellCount()) + 1); - } - if (game.global.sugarRush > 0){ - number *= sugarRush.getAttackStrength(); - } - if (game.global.challengeActive == "Life") { - number *= game.challenges.Life.getHealthMult(); - } - if (game.singleRunBonuses.sharpTrimps.owned){ - number *= 1.5; - } - if (game.global.challengeActive == "Daily" && game.talents.daily.purchased){ - number *= 1.5; - } - if (game.global.challengeActive == "Daily"){ - if (typeof game.global.dailyChallenge.minDamage !== 'undefined'){ - if (minFluct == -1) minFluct = fluctuation; - minFluct += dailyModifiers.minDamage.getMult(game.global.dailyChallenge.minDamage.strength); - } - if (typeof game.global.dailyChallenge.maxDamage !== 'undefined'){ - if (maxFluct == -1) maxFluct = fluctuation; - maxFluct += dailyModifiers.maxDamage.getMult(game.global.dailyChallenge.maxDamage.strength); - } - if (typeof game.global.dailyChallenge.weakness !== 'undefined'){ - number *= dailyModifiers.weakness.getMult(game.global.dailyChallenge.weakness.strength, game.global.dailyChallenge.weakness.stacks); - } - if (typeof game.global.dailyChallenge.oddTrimpNerf !== 'undefined' && ((game.global.world % 2) == 1)){ - number *= dailyModifiers.oddTrimpNerf.getMult(game.global.dailyChallenge.oddTrimpNerf.strength); - } - if (typeof game.global.dailyChallenge.evenTrimpBuff !== 'undefined' && ((game.global.world % 2) == 0)){ - number *= dailyModifiers.evenTrimpBuff.getMult(game.global.dailyChallenge.evenTrimpBuff.strength); - } - if (typeof game.global.dailyChallenge.rampage !== 'undefined'){ - number *= dailyModifiers.rampage.getMult(game.global.dailyChallenge.rampage.strength, game.global.dailyChallenge.rampage.stacks); - } - } - if (Fluffy.isActive()){ - number *= Fluffy.getDamageModifier(); - } - - if (!incStance && game.global.formation != 0) { - number /= (game.global.formation == 2) ? 4 : 0.5; - } - - var min = number; - var max = number; - var avg = number; - - var critTier = 0; - var critChance = getPlayerCritChance(); - if (critChance > 0){ - critTier = Math.floor(critChance); - critChance = critChance % 1; - max *= getPlayerCritDamageMult(); - if (critTier > 0){ - min = max; - if (critTier > 1){ - min *= getMegaCritDamageMult(critTier); - } - if (critChance > 0) max *= getMegaCritDamageMult(critTier + 1); - else max = min; - } - avg = max * critChance + min * (1 - critChance); - } - if (critChance < 0) { - min *= 0.2; - if (critChance <= -1) max *= 0.2; - avg = max * (1 + critChance) + min * -critChance; - } - - if (incFlucts) { - if (minFluct > 1) minFluct = 1; - if (maxFluct == -1) maxFluct = fluctuation; - if (minFluct == -1) minFluct = fluctuation; - - min *= (1 - minFluct); - max *= (1 + maxFluct); - avg *= 1 + (maxFluct - minFluct)/2; - } - - if (minMaxAvg == "min") return min; - else if (minMaxAvg == "max") return max; - else if (minMaxAvg == "avg") return avg; - -} - - -var ATrunning=!0,ATmessageLogTabVisible=!0,enableDebug=!0,autoTrimpSettings={},MODULES={},MODULESdefault={},ATMODULES={},ATmoduleList=[],bestBuilding,scienceNeeded,breedFire=!1,shouldFarm=!1,enoughDamage=!0,enoughHealth=!0,baseDamage=calcOurDmg("avg", false, true),baseBlock=0,baseHealth=0,preBuyAmt,preBuyFiring,preBuyTooltip,preBuymaxSplit,currentworld=0,lastrunworld=0,aWholeNewWorld=!1,needGymystic=!0,heirloomFlag=!1,heirloomCache=game.global.heirloomsExtra.length,magmiteSpenderChanged=!1,daily3=!1; +var ATrunning=!0,ATmessageLogTabVisible=!0,enableDebug=!0,autoTrimpSettings={},MODULES={},MODULESdefault={},ATMODULES={},ATmoduleList=[],bestBuilding,scienceNeeded,breedFire=!1,shouldFarm=!1,enoughDamage=!0,enoughHealth=!0,baseDamage=1,baseBlock=1,baseHealth=1,preBuyAmt,preBuyFiring,preBuyTooltip,preBuymaxSplit,currentworld=0,lastrunworld=0,aWholeNewWorld=!1,needGymystic=!0,heirloomFlag=!1,heirloomCache=game.global.heirloomsExtra.length,magmiteSpenderChanged=!1,daily3=!1; function mainLoop() { if (ATrunning == false) return; From 7dfda9057588acac393471421b05d106a913ca63 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 30 Sep 2018 12:58:44 +0100 Subject: [PATCH 1513/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 58e6fdeef..bf756526e 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -15,10 +15,11 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "19/09/2018", version: "v2.7.3", description: "4.911 Added things, fixed things, please report broken things, thanks for using my things. ", isNew: true}); +changelogList.push({date: "30/09/2018", version: "v2.7.4", description: "4.912 Added more things, fixed more things, please report more broken things, thanks for using more of my things. ", isNew: true}); +changelogList.push({date: "19/09/2018", version: "v2.7.3", description: "4.911 Added things, fixed things, please report broken things, thanks for using my things. ", isNew: false}); changelogList.push({date: "12/09/2018", version: "v2.7.2", description: "4.91 Scryer Stuff really works now! No really! Nature Scryer got a rework. Removed AS1 in favor of AS2, so make sure yours is set! May need some tuning so let me know if it sucks! Replaced AS1 with D Stance. Amal Target for Amal boosting, may not work correctly, yet. Please let me know if it works though! Added a setting to control mode Before Fueling in Magma. Small performance boost for liq zones. Thanks for using the fork in 4.91! ", isNew: false}); changelogList.push({date: "06/09/2018", version: "v2.7.1", description: "4.901 Scryer Stuff actually works now, neat. Replaced one of the autogather options with a new more efficient option for late game. Fight always got an upgrade. Thanks for using the fork in 4.9(01)! ", isNew: false}); -changelogList.push({date: "05/09/2018", version: "v2.7.0", description: "4.9 Here we go! Added the new Classy perk to Autoperks, along with updated ratios. Added an option in Buildings & Jobs to hide obsolete settings once you have unlocked certain masteries. Fixed Scryer. Added an option to Scry VMs without having to enable scrying. Added B instead of S for WS. ", isNew: false}); +//changelogList.push({date: "05/09/2018", version: "v2.7.0", description: "4.9 Here we go! Added the new Classy perk to Autoperks, along with updated ratios. Added an option in Buildings & Jobs to hide obsolete settings once you have unlocked certain masteries. Fixed Scryer. Added an option to Scry VMs without having to enable scrying. Added B instead of S for WS. ", isNew: false}); //changelogList.push({date: "03/09/2018", version: "v2.6.5", description: "Pre-pre-4.9 update. Check out the C2 Tab! And theres some more tiny optimizations too. ", isNew: false}); //changelogList.push({date: "02/09/2018", version: "v2.6.4", description: "Pre-4.9 update. Revamped the Daily Autoportal settings, so make sure to check it! And sust some small optimizations here and there. I have changed some settings names such as AS3, check em out. Also just a quick thank you to anyone who uses my fork, its nice to know something I have made is actually being used haha. Please report any problems to me! ", isNew: false}); //changelogList.push({date: "22/08/2018", version: "v2.6.3", description: "Disable Farming is now controllable, so make sure to set it! Added Magic Armor option to Dailys/C2s. Changed the Daily Fight Always button, check it! The Daily tab is getting really fat now, oh well lol. ", isNew: false}); From cadae8ba5a7eb9f3089f6940122591c037211979 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Tue, 2 Oct 2018 11:34:12 +0100 Subject: [PATCH 1514/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index bf756526e..8dcbe7e81 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -134,7 +134,7 @@ function mainLoop() { if (getPageSetting('showautomapstatus')== true) updateAutoMapsStatus(); if (autoTrimpSettings.AutoPortal.selected != "Off" && game.global.challengeActive != "Daily" && !game.global.runningChallengeSquared) autoPortal(); if (getPageSetting('AutoPortalDaily') > 0 && game.global.challengeActive == "Daily") dailyAutoPortal(); - if (getPageSetting('c2runnerportal') > 0 && game.global.runningChallengeSquared && game.global.world > getPageSetting('c2runnerportal')) c2runnerportal(); + //if (getPageSetting('c2runnerportal') > 0 && game.global.runningChallengeSquared && game.global.world > getPageSetting('c2runnerportal')) c2runnerportal(); if (getPageSetting('TrapTrimps') && game.global.trapBuildAllowed && game.global.trapBuildToggled == false) toggleAutoTrap(); if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); From 6caa2b9ff2bac2ffd42e3801bd9ffcf984fe7e2f Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 3 Oct 2018 11:58:20 +0100 Subject: [PATCH 1515/3477] Update portal.js --- modules/portal.js | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 017b0932a..1fc1b98ad 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -145,95 +145,95 @@ var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestL if (!game.global.portalActive) return; if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { if (c2listp.Size.percentzone < getPageSetting('c2runnerpercent')) { - toggleChallengeSquared(); + challengeSquaredMode = true; selectChallenge("Size"); debug("C2 Runner: Running C2 Challenge Size"); return false; } else if (c2listp.Slow.percentzone < getPageSetting('c2runnerpercent')) { - toggleChallengeSquared(); + challengeSquaredMode = true; selectChallenge("Slow"); debug("C2 Runner: Running C2 Challenge Slow"); return false; } else if (c2listp.Watch.percentzone < getPageSetting('c2runnerpercent')) { - toggleChallengeSquared(); + challengeSquaredMode = true; selectChallenge("Watch"); debug("C2 Runner: Running C2 Challenge Watch"); return false; } else if (c2listp.Discipline.percentzone < getPageSetting('c2runnerpercent')) { - toggleChallengeSquared(); + challengeSquaredMode = true; selectChallenge("Discipline"); debug("C2 Runner: Running C2 Challenge Discipline"); return false; } else if (c2listp.Balance.percentzone < getPageSetting('c2runnerpercent')) { - toggleChallengeSquared(); + challengeSquaredMode = true; selectChallenge("Balance"); debug("C2 Runner: Running C2 Challenge Balance"); return false; } else if (c2listp.Meditate.percentzone < getPageSetting('c2runnerpercent')) { - toggleChallengeSquared(); + challengeSquaredMode = true; selectChallenge("Meditate"); debug("C2 Runner: Running C2 Challenge Meditate"); return false; } else if (c2listp.Metal.percentzone < getPageSetting('c2runnerpercent')) { - toggleChallengeSquared(); + challengeSquaredMode = true; selectChallenge("Metal"); debug("C2 Runner: Running C2 Challenge Metal"); return false; } else if (c2listp.Lead.percentzone < getPageSetting('c2runnerpercent')) { - toggleChallengeSquared(); + challengeSquaredMode = true; selectChallenge("Lead"); debug("C2 Runner: Running C2 Challenge Lead"); return false; } else if (c2listp.Nom.percentzone < getPageSetting('c2runnerpercent')) { - toggleChallengeSquared(); + challengeSquaredMode = true; selectChallenge("Nom"); debug("C2 Runner: Running C2 Challenge Nom"); return false; } else if (c2listp.Electricity.percentzone < getPageSetting('c2runnerpercent')) { - toggleChallengeSquared(); + challengeSquaredMode = true; selectChallenge("Electricity"); debug("C2 Runner: Running C2 Challenge Electricity"); return false; } else if (c2listp.Toxicity.percentzone < getPageSetting('c2runnerpercent')) { - toggleChallengeSquared(); + challengeSquaredMode = true; selectChallenge("Toxicity"); debug("C2 Runner: Running C2 Challenge Toxicity"); return false; } - else return true; + else { + return true; + challengeSquaredMode = false; } } function doPortal(challenge) { - var c2done = false; + var c2done = true; if(!game.global.portalActive) return; if (getPageSetting('spendmagmite')==1) autoMagmiteSpender(); if (getPageSetting('AutoHeirloomsNew')==0); else if (getPageSetting('AutoHeirloomsNew')==1) autoHeirlooms(); else if (getPageSetting('AutoHeirloomsNew')==2) autoHeirlooms2(); if (getPageSetting('AutoUpgradeHeirlooms') && !heirloomsShown) autoNull(); - portalClicked(); + portalClicked(); if (getPageSetting('AutoAllocatePerks')==1 && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) AutoPerks.clickAllocate(); - /*if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { - c2runner(); + if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { if (c2runner() == true) { - c2done = true; - debug("C2 Runner: All C2s above Threshold!"); - selectChallenge(challenge || 0); + c2done = false; } - }*/ - if (getPageSetting('AutoStartDaily')) { + else debug("C2 Runner: All C2s above Threshold!"); + } + if (getPageSetting('AutoStartDaily') && c2done) { selectChallenge('Daily'); checkCompleteDailies(); var lastUndone = -7; @@ -242,7 +242,7 @@ function doPortal(challenge) { if (!done) break; } - if (lastUndone == 1) { // None + if (lastUndone == 1) { debug("All available Dailies already completed.", "portal"); selectChallenge(challenge || 0); } else { @@ -250,7 +250,7 @@ function doPortal(challenge) { debug("Portaling into Daily for: " + getDailyTimeString(lastUndone, true) + " now!", "portal"); } } - else if(challenge) { + else if(challenge && c2done) { selectChallenge(challenge); } pushData(); @@ -258,6 +258,7 @@ function doPortal(challenge) { activatePortal(); lastHeliumZone = 0; zonePostpone = 0; MODULES.maps.enoughDamageCutoff = 4; + MODULES.equipment.enoughDamageCutoff = 4; } function finishChallengeSquared(){var a=getPageSetting("FinishC2");game.global.world>=a&&(abandonChallenge(),debug("Finished challenge2 because we are on zone "+game.global.world,"other","oil"))} From fd2a1f5e1ac79cb84ac39cd66c1e8f1900117f70 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 3 Oct 2018 12:00:27 +0100 Subject: [PATCH 1516/3477] Update portal.js --- modules/portal.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 1fc1b98ad..83af7ce07 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -211,8 +211,9 @@ if (!game.global.portalActive) return; return false; } else { - return true; challengeSquaredMode = false; + return true; + } } } From 5bb580aadbc70580b06c6083519dd3442c2a6f62 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 3 Oct 2018 12:02:50 +0100 Subject: [PATCH 1517/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 8dcbe7e81..c9d9788ab 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -134,7 +134,7 @@ function mainLoop() { if (getPageSetting('showautomapstatus')== true) updateAutoMapsStatus(); if (autoTrimpSettings.AutoPortal.selected != "Off" && game.global.challengeActive != "Daily" && !game.global.runningChallengeSquared) autoPortal(); if (getPageSetting('AutoPortalDaily') > 0 && game.global.challengeActive == "Daily") dailyAutoPortal(); - //if (getPageSetting('c2runnerportal') > 0 && game.global.runningChallengeSquared && game.global.world > getPageSetting('c2runnerportal')) c2runnerportal(); + if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0 && game.global.runningChallengeSquared && game.global.world > getPageSetting('c2runnerportal')) c2runnerportal(); if (getPageSetting('TrapTrimps') && game.global.trapBuildAllowed && game.global.trapBuildToggled == false) toggleAutoTrap(); if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp(); if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); From 2ce03c84fa10033d1e7311de51839c03eb1f1afe Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 3 Oct 2018 12:07:35 +0100 Subject: [PATCH 1518/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 + 1 file changed, 1 insertion(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 7019ae0fe..e6b32e2fe 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -557,6 +557,7 @@ function updateCustomButtons() { //C2 getPageSetting('c2runnerstart') == true ? turnOn("c2runnerportal"): turnOff("c2runnerportal"); + getPageSetting('c2runnerstart') == true ? turnOn("c2runnerpercent"): turnOff("c2runnerpercent"); //Praid harder getPageSetting('PraidHarder') ? turnOn('PraidFarmFragsZ') : turnOff('PraidFarmFragsZ'); From 1137aa86e5f91fc442361a97514152ab0ffc0e38 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 3 Oct 2018 12:16:59 +0100 Subject: [PATCH 1519/3477] Update portal.js --- modules/portal.js | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 83af7ce07..456a47390 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -148,72 +148,57 @@ if (!game.global.portalActive) return; challengeSquaredMode = true; selectChallenge("Size"); debug("C2 Runner: Running C2 Challenge Size"); - return false; } else if (c2listp.Slow.percentzone < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Slow"); debug("C2 Runner: Running C2 Challenge Slow"); - return false; } else if (c2listp.Watch.percentzone < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Watch"); debug("C2 Runner: Running C2 Challenge Watch"); - return false; } else if (c2listp.Discipline.percentzone < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Discipline"); debug("C2 Runner: Running C2 Challenge Discipline"); - return false; } else if (c2listp.Balance.percentzone < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Balance"); debug("C2 Runner: Running C2 Challenge Balance"); - return false; } else if (c2listp.Meditate.percentzone < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Meditate"); debug("C2 Runner: Running C2 Challenge Meditate"); - return false; } else if (c2listp.Metal.percentzone < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Metal"); debug("C2 Runner: Running C2 Challenge Metal"); - return false; } else if (c2listp.Lead.percentzone < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Lead"); debug("C2 Runner: Running C2 Challenge Lead"); - return false; } else if (c2listp.Nom.percentzone < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Nom"); debug("C2 Runner: Running C2 Challenge Nom"); - return false; } else if (c2listp.Electricity.percentzone < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Electricity"); debug("C2 Runner: Running C2 Challenge Electricity"); - return false; } else if (c2listp.Toxicity.percentzone < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Toxicity"); debug("C2 Runner: Running C2 Challenge Toxicity"); - return false; } - else { - challengeSquaredMode = false; - return true; - } } } @@ -229,7 +214,8 @@ function doPortal(challenge) { if (getPageSetting('AutoAllocatePerks')==1 && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) AutoPerks.clickAllocate(); if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { - if (c2runner() == true) { + c2runner(); + if (challengeSquaredMode == true) { c2done = false; } else debug("C2 Runner: All C2s above Threshold!"); From c43db2f6e2ceac76ab78a8f9eb0f31e5f56cf0a5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 3 Oct 2018 12:35:15 +0100 Subject: [PATCH 1520/3477] Update SettingsGUI.js --- SettingsGUI.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index e6b32e2fe..fef4d0934 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -163,13 +163,14 @@ function initializeAllSettings() { createSetting('cfightforever', 'Tox/Nom Fight Always', 'Sends trimps to fight if they\'re not fighting in the Toxicity and Nom Challenges, regardless of BAF. Essenitally the same as the one in combat, can use either if you wish, except this will only activate in these challenges (duh) ', 'boolean', 'false', null, 'C2'); createSetting('carmormagic', ['C2 Armor Magic Off', 'CAM: Above 80%', 'CAM: H:D', 'CAM: Always'], 'Will buy Armor to try and prevent death on Nom/Tox Challenges under the 3 conditions.
    Above 80%: Will activate at and above 80% of your HZE and when your health is sufficiently low.
    H:D: Will activate at and above the H:D you have defined in maps.
    Always Will activate always.
    All options will activate at or below 25% of your health. ', 'multitoggle', 0, null, "C2"); createSetting('mapc2hd', 'Mapology H:D', 'Set your H:D ratio for Mapology. Will not go into maps unless your H:D ratio is above this. -1 to use normal behaviour. ', 'value', '-1', null, 'C2'); - createSetting('c2table', 'C2 Table', 'Display your C2s in a convenient table which is colour coded.
    Green = Not worth updating.
    Yellow = Consider updating.
    Red = Updating this C2 is worth doing.
    Blue = You have not yet done/unlockled this C2 challenge. ', 'infoclick', 'c2table', null, 'C2'); //C2 Runner Line - document.getElementById('c2table').parentNode.insertAdjacentHTML('afterend','
    '); + document.getElementById('mapc2hd').parentNode.insertAdjacentHTML('afterend','
    '); createSetting('c2runnerstart', 'C2 Runner', 'Runs the normal C2s in sequence according to difficulty. See C2Table for list. Once zone you have defined has been reached, will portal into next. I will advise you not to touch the challenges (abandoning, doing a different one, etc) if you are running this, it could break it. Only runs challenges that need updating, will not run ones close-ish to your HZE. ', 'boolean', false, null, 'C2'); createSetting('c2runnerportal', 'C2 Runner Portal', 'AINT DONE YET FAM MOVE ALONG NOW Automatically portal AFTER clearing this level in C2 Runner. (ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "C2"); createSetting('c2runnerpercent', 'C2 Runner %', 'AINT DONE YET FAM MOVE ALONG NOW What percent Threshhold you want C2s to be over. E.g 85, will only run C2s with HZE% below this number. Default is 85%. Must have a value set for C2 Runner to... well, run. ', 'value', '85', null, "C2"); + createSetting('c2table', 'C2 Table', 'Display your C2s in a convenient table which is colour coded.
    Green = Not worth updating.
    Yellow = Consider updating.
    Red = Updating this C2 is worth doing.
    Blue = You have not yet done/unlockled this C2 challenge. ', 'infoclick', 'c2table', null, 'C2'); + //Buildings From 70d355f5c9f40b915f383f560fc2f5d01aa8d59e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 3 Oct 2018 12:36:59 +0100 Subject: [PATCH 1521/3477] Update SettingsGUI.js --- SettingsGUI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index fef4d0934..d71f29998 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -167,9 +167,9 @@ function initializeAllSettings() { //C2 Runner Line document.getElementById('mapc2hd').parentNode.insertAdjacentHTML('afterend','
    '); createSetting('c2runnerstart', 'C2 Runner', 'Runs the normal C2s in sequence according to difficulty. See C2Table for list. Once zone you have defined has been reached, will portal into next. I will advise you not to touch the challenges (abandoning, doing a different one, etc) if you are running this, it could break it. Only runs challenges that need updating, will not run ones close-ish to your HZE. ', 'boolean', false, null, 'C2'); - createSetting('c2runnerportal', 'C2 Runner Portal', 'AINT DONE YET FAM MOVE ALONG NOW Automatically portal AFTER clearing this level in C2 Runner. (ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "C2"); - createSetting('c2runnerpercent', 'C2 Runner %', 'AINT DONE YET FAM MOVE ALONG NOW What percent Threshhold you want C2s to be over. E.g 85, will only run C2s with HZE% below this number. Default is 85%. Must have a value set for C2 Runner to... well, run. ', 'value', '85', null, "C2"); - createSetting('c2table', 'C2 Table', 'Display your C2s in a convenient table which is colour coded.
    Green = Not worth updating.
    Yellow = Consider updating.
    Red = Updating this C2 is worth doing.
    Blue = You have not yet done/unlockled this C2 challenge. ', 'infoclick', 'c2table', null, 'C2'); + createSetting('c2runnerportal', 'C2 Runner Portal', 'Automatically portal AFTER clearing this level in C2 Runner. (ie: setting to 200 would portal when you first reach level 201)', 'value', '999', null, "C2"); + createSetting('c2runnerpercent', 'C2 Runner %', 'What percent Threshhold you want C2s to be over. E.g 85, will only run C2s with HZE% below this number. Default is 85%. Must have a value set for C2 Runner to... well, run. ', 'value', '85', null, "C2"); + createSetting('c2table', 'C2 Table', 'Display your C2s in a convenient table which is colour coded.
    Green = Not worth updating.
    Yellow = Consider updating.
    Red = Updating this C2 is worth doing.
    Blue = You have not yet done/unlocked this C2 challenge. ', 'infoclick', 'c2table', null, 'C2'); From 1ef1ce6bb4fbeb6733951bd4c45e56873d2cb1c9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 3 Oct 2018 12:39:55 +0100 Subject: [PATCH 1522/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index c9d9788ab..916b7f566 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -15,10 +15,11 @@ function initializeAutoTrimps() { } var changelogList = []; -changelogList.push({date: "30/09/2018", version: "v2.7.4", description: "4.912 Added more things, fixed more things, please report more broken things, thanks for using more of my things. ", isNew: true}); +changelogList.push({date: "03/10/2018", version: "v2.8.0", description: "4.912 C2 Runner fully functional. Customize the C2 runner however you like, portal and percent threshhold. Also added a few QoL buttons in a few tabs, some backend adjustments. Please report any bugs, and as always, thanks for using my fork! ", isNew: true}); +changelogList.push({date: "30/09/2018", version: "v2.7.4", description: "4.912 Added more things, fixed more things, please report more broken things, thanks for using more of my things. ", isNew: false}); changelogList.push({date: "19/09/2018", version: "v2.7.3", description: "4.911 Added things, fixed things, please report broken things, thanks for using my things. ", isNew: false}); changelogList.push({date: "12/09/2018", version: "v2.7.2", description: "4.91 Scryer Stuff really works now! No really! Nature Scryer got a rework. Removed AS1 in favor of AS2, so make sure yours is set! May need some tuning so let me know if it sucks! Replaced AS1 with D Stance. Amal Target for Amal boosting, may not work correctly, yet. Please let me know if it works though! Added a setting to control mode Before Fueling in Magma. Small performance boost for liq zones. Thanks for using the fork in 4.91! ", isNew: false}); -changelogList.push({date: "06/09/2018", version: "v2.7.1", description: "4.901 Scryer Stuff actually works now, neat. Replaced one of the autogather options with a new more efficient option for late game. Fight always got an upgrade. Thanks for using the fork in 4.9(01)! ", isNew: false}); +//changelogList.push({date: "06/09/2018", version: "v2.7.1", description: "4.901 Scryer Stuff actually works now, neat. Replaced one of the autogather options with a new more efficient option for late game. Fight always got an upgrade. Thanks for using the fork in 4.9(01)! ", isNew: false}); //changelogList.push({date: "05/09/2018", version: "v2.7.0", description: "4.9 Here we go! Added the new Classy perk to Autoperks, along with updated ratios. Added an option in Buildings & Jobs to hide obsolete settings once you have unlocked certain masteries. Fixed Scryer. Added an option to Scry VMs without having to enable scrying. Added B instead of S for WS. ", isNew: false}); //changelogList.push({date: "03/09/2018", version: "v2.6.5", description: "Pre-pre-4.9 update. Check out the C2 Tab! And theres some more tiny optimizations too. ", isNew: false}); //changelogList.push({date: "02/09/2018", version: "v2.6.4", description: "Pre-4.9 update. Revamped the Daily Autoportal settings, so make sure to check it! And sust some small optimizations here and there. I have changed some settings names such as AS3, check em out. Also just a quick thank you to anyone who uses my fork, its nice to know something I have made is actually being used haha. Please report any problems to me! ", isNew: false}); From d74543812d0114822d0bd49aee2db75e9f354c67 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 3 Oct 2018 16:06:24 +0100 Subject: [PATCH 1523/3477] Update gather.js --- modules/gather.js | 100 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/modules/gather.js b/modules/gather.js index 267852086..11ee47654 100644 --- a/modules/gather.js +++ b/modules/gather.js @@ -1,5 +1,103 @@ MODULES.gather={},MODULES.gather.minTraps=100,MODULES.gather.minScienceAmount=100,MODULES.gather.minScienceSeconds=60; -function manualLabor2(){if(0!=getPageSetting('ManualGather2')){var a=game.resources.trimps.owned-game.resources.trimps.employed,b=game.buildings.Trap.owned=game.global.world&&5e3>=game.global.totalHeliumEarned&&0==game.global.buildingsQueue.length&&('trimps'!=game.global.playerGathering||0==game.buildings.Trap.owned))return!game.triggers.wood.done||10>game.resources.food.owned||Math.floor(game.resources.food.owned)a||f||g)&&0==game.buildings.Trap.owned&&canAffordBuilding('Trap'))return void(safeBuyBuilding('Trap')||setGather('buildings'));if(d&&(5>a||f||g)&&0game.global.turkimpTimer)&&3!=getPageSetting('ManualGather2'))return void setGather('science');if(game.resources.science.owned 0; + + if (game.global.world <=3 && game.global.totalHeliumEarned<=5000) { + if (game.global.buildingsQueue.length == 0 && (game.global.playerGathering != 'trimps' || game.buildings.Trap.owned == 0)){ + if (!game.triggers.wood.done || game.resources.food.owned < 10 || Math.floor(game.resources.food.owned) < Math.floor(game.resources.wood.owned)) + setGather('food'); + else + setGather('wood'); + } + } + + if(watchJumpstartTraps || trapTrimpsOK && (breedingTrimps < 5 || trapperTrapUntilFull) && game.buildings.Trap.owned == 0 && canAffordBuilding('Trap')) { + if(!safeBuyBuilding('Trap')) + setGather('buildings'); + } + else if (watchJumpstartTraps || trapTrimpsOK && (breedingTrimps < 5 || trapperTrapUntilFull) && game.buildings.Trap.owned > 0) { + setGather('trimps'); + if (trapperTrapUntilFull && (game.global.buildingsQueue.length == 0 || game.buildings.Trap.owned == 1) && !game.global.trapBuildAllowed && canAffordBuilding('Trap')) + safeBuyBuilding('Trap'); + } + else if (getPageSetting('ManualGather2') != 3 && game.resources.science.owned < MODULES["gather"].minScienceAmount && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') + setGather('science'); + else if (!game.talents.foreman.purchased && (game.global.buildingsQueue.length ? (game.global.buildingsQueue.length > 1 || game.global.autoCraftModifier == 0 || (getPlayerModifier() > 1000 && game.global.buildingsQueue[0] != 'Trap.1')) : false)) { + setGather('buildings'); + } + else if (!game.global.trapBuildToggled && (game.global.buildingsQueue[0] == 'Barn.1' || game.global.buildingsQueue[0] == 'Shed.1' || game.global.buildingsQueue[0] == 'Forge.1')){ + setGather('buildings'); + } + else if (game.resources.science.owned < scienceNeeded && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') { + if ((getPlayerModifier() < getPerSecBeforeManual('Scientist') && hasTurkimp)||getPageSetting('ManualGather2') == 3){ + setGather('metal'); + } + else if (getPageSetting('ManualGather2') != 3){ + setGather('science'); + } + } + else if (trapTrimpsOK && targetBreed < getBreedTime(true)){ + if (game.buildings.Trap.owned < 100 && canAffordBuilding('Trap')) { + safeBuyBuilding('Trap'); + setGather('buildings'); + } + else if (game.buildings.Trap.owned > 0) + setGather('trimps'); + } + else { + var manualResourceList = { + 'food': 'Farmer', + 'wood': 'Lumberjack', + 'metal': 'Miner', + }; + var lowestResource = 'food'; + var lowestResourceRate = -1; + var haveWorkers = true; + for (var resource in manualResourceList) { + var job = manualResourceList[resource]; + var currentRate = game.jobs[job].owned * game.jobs[job].modifier; + if (document.getElementById(resource).style.visibility != 'hidden') { + if (currentRate === 0) { + currentRate = game.resources[resource].owned; + if ((haveWorkers) || (currentRate < lowestResourceRate)) { + haveWorkers = false; + lowestResource = resource; + lowestResourceRate = currentRate; + } + } + if ((currentRate < lowestResourceRate || lowestResourceRate == -1) && haveWorkers) { + lowestResource = resource; + lowestResourceRate = currentRate; + } + } + } + if (game.global.playerGathering != lowestResource && !haveWorkers && !breedFire) { + if (hasTurkimp) + setGather('metal'); + else + setGather(lowestResource); + } else if (getPageSetting('ManualGather2') != 3 && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') { + if (game.resources.science.owned < getPsString('science', true) * MODULES["gather"].minScienceSeconds && game.global.turkimpTimer < 1 && haveWorkers) + setGather('science'); + else if (hasTurkimp) + setGather('metal'); + else + setGather(lowestResource); + } + else if(trapTrimpsOK && game.global.trapBuildToggled == true && lowOnTraps) + setGather('buildings'); + else + setGather(lowestResource); + } +} function autogather3() { if (game.global.buildingsQueue.length <= 1) setGather('metal'); From 8c4c05f8406bb369b6e36e564ba26b17b400b8ab Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 4 Oct 2018 13:23:59 +0100 Subject: [PATCH 1524/3477] Update heirlooms.js --- modules/heirlooms.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index 9c9a3aaef..d0481c0e2 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -29,7 +29,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { var ccb = (critchance - game.heirlooms.Shield.critChance.currentBonus / 100); switch (loom.mods[m][0]) { case 'critChance': - tempEff = ((loom.mods[m][1] / 100) * cmb) / (ccb * cmb + 1 - ccb); + tempEff = ((loom.mods[m][1] / 10) * cmb) / (ccb * cmb + 1 - ccb); eff += tempEff; if (upgrade) { steps = game.heirlooms.Shield.critChance.steps[loom.rarity]; @@ -43,7 +43,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'critDamage': - tempEff = ((loom.mods[m][1] / 100) * ccb) / (cmb * ccb + 1 - ccb); + tempEff = ((loom.mods[m][1] / 10) * ccb) / (cmb * ccb + 1 - ccb); eff += tempEff; if (upgrade) { steps = game.heirlooms.Shield.critDamage.steps[loom.rarity]; @@ -57,7 +57,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'trimpAttack': - tempEff = loom.mods[m][1] / 100; + tempEff = loom.mods[m][1] / 10; eff += tempEff; if (upgrade) { steps = game.heirlooms.Shield.trimpAttack.steps[loom.rarity]; @@ -71,7 +71,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'voidMaps': - tempEff = loom.mods[m][1] / 100; + tempEff = loom.mods[m][1] / 10; eff += tempEff; if (upgrade) { steps = game.heirlooms.Shield.voidMaps.steps[loom.rarity]; @@ -101,7 +101,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { break; case 'MinerSpeed': - tempEff = 0.75 * loom.mods[m][1] / 100; + tempEff = 0.75 * loom.mods[m][1] / 10; eff += tempEff; if (upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -115,7 +115,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'metalDrop': - tempEff = 0.75 * loom.mods[m][1] / 100; + tempEff = 0.75 * loom.mods[m][1] / 10; eff += tempEff; if (upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -129,7 +129,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'fragmentsDrop': - tempEff = 0.75 * loom.mods[m][1] / 100; + tempEff = 0.75 * loom.mods[m][1] / 10; eff += tempEff; if (upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -143,7 +143,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'ExplorerSpeed': - tempEff = 0.75 * loom.mods[m][1] / 100; + tempEff = 0.75 * loom.mods[m][1] / 10; eff += tempEff; if (upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -157,7 +157,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'FarmerSpeed': - tempEff = 0.75 * loom.mods[m][1] / 10000; + tempEff = 0.75 * loom.mods[m][1] / 100; eff += tempEff; if (upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; @@ -171,7 +171,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } break; case 'LumberjackSpeed': - tempEff = 0.75 * loom.mods[m][1] / 10000; + tempEff = 0.75 * loom.mods[m][1] / 100; eff += tempEff; if (upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; From 24efdfc970a7f9f5e2b08aba9061c40b1d45c553 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 4 Oct 2018 13:26:54 +0100 Subject: [PATCH 1525/3477] Delete scryerNew.js --- modules/scryerNew.js | 241 ------------------------------------------- 1 file changed, 241 deletions(-) delete mode 100644 modules/scryerNew.js diff --git a/modules/scryerNew.js b/modules/scryerNew.js deleted file mode 100644 index 3fe250cd8..000000000 --- a/modules/scryerNew.js +++ /dev/null @@ -1,241 +0,0 @@ -let wantToScry = false; - -function canNatureScry() { - const scryInPoisonTrue = getEmpowerment() === "Poison" && (getPageSetting('ScryUseinPoison') < 0 || game.global.world >= getPageSetting('ScryUseinPoison')); - const scryInWindTrue = getEmpowerment() === "Wind" && (getPageSetting('ScryUseinWind') < 0 || game.global.world >= getPageSetting('ScryUseinWind')); - const scryInIceTrue = getEmpowerment() === "Ice" && (getPageSetting('ScryUseinIce') < 0 || game.global.world >= getPageSetting('ScryUseinIce')); - if (scryInPoisonTrue) { - return true; - } - if (scryInWindTrue) { - return true; - } - if (scryInIceTrue) { - return true; - } - return false; - } - -function useScryerStance() { - - const AutoStance = getPageSetting('AutoStance'); - const useScryerEnabled = getPageSetting('UseScryerStance') === true; - const onMap = game.global.mapsActive; - const onVoidMap = game.global.mapsActive && getCurrentMapObject().location === "Void"; - const inDaily = game.global.challengeActive === "Daily"; - const dailyScryInVoid = getPageSetting('dscryvoidmaps') === true; - const scryInPoison = getEmpowerment() === "Poison" && (getPageSetting('ScryUseinPoison') < 0) || (game.global.world >= getPageSetting('ScryUseinPoison')); - const scryInWind = getEmpowerment() === "Wind" && (getPageSetting('ScryUseinWind') < 0) || (game.global.world >= getPageSetting('ScryUseinWind')); - const scryInIce = getEmpowerment() === "Ice" && (getPageSetting('ScryUseinIce') < 0) || (game.global.world >= getPageSetting('ScryUseinIce')); - const inNature = (getEmpowerment() === "Poison") || (getEmpowerment() === "Wind") || (getEmpowerment() === "Ice"); - let canScryInCurrentNature = canNatureScry(); - - - function autostancefunction() { - if (AutoStance === 1) autoStance(); - else if (AutoStance === 2) autoStance2(); - else if (AutoStance === 3) autoStance3(); - } - -//Never - let neverScry = game.global.preMapsActive || game.global.gridArray.length === 0 || game.global.highestLevelCleared < 180; - const vmScryerEnabled = getPageSetting('scryvoidmaps') === true; - const scryInMapsNever = getPageSetting('ScryerUseinMaps2') === 0; - const scryInVoidNever = getPageSetting('ScryerUseinVoidMaps2') === 0; - const scryInSpireNever = getPageSetting('ScryerUseinSpire2') === 0; - const inVoidMap = onMap && onVoidMap; - const scryOnBossNeverAboveVoid = getPageSetting('ScryerSkipBoss2') === 1; - const currentZoneBelowVMZone = game.global.world >= getPageSetting('VoidMaps'); - const scryOnBossNever = getPageSetting('ScryerSkipBoss2') === 0; - const onBossCell = game.global.lastClearedCell >= 98; - - let neverScryGlobal = !useScryerEnabled; - let neverScryInMaps = onMap && scryInMapsNever && !onVoidMap; - let neverScryNormalVoid = !vmScryerEnabled && !inDaily; - let neverScryDailyVoid = !dailyScryInVoid && inDaily; - let neverScryInVoid = inVoidMap && scryInVoidNever && neverScryNormalVoid && neverScryDailyVoid; - let neverScryInSpire = !onMap && isActiveSpireAT() && scryInSpireNever; - let neverScryOnBoss = (scryOnBossNeverAboveVoid && currentZoneBelowVMZone && onBossCell) || (scryOnBossNever && onBossCell); - - neverScry = neverScry || game.global.world <= 60; - neverScry = neverScry || neverScryGlobal; - neverScry = neverScry || neverScryInMaps; - neverScry = neverScry || neverScryInVoid; - neverScry = neverScry || neverScryInSpire; - neverScry = neverScry || neverScryOnBoss; - neverScry = neverScry || (!game.global.mapsActive && !canScryInCurrentNature); - - //check Corrupted Never - const currentEnemy = getCurrentEnemy(1); - const isMagmaCell = mutations.Magma.active(); - const corruptionStartZone = mutations.Corruption.start(); - const scryForCorruptedCellsNever = getPageSetting('ScryerSkipCorrupteds2') === 0; - - let isCorruptedCell = currentEnemy && currentEnemy.mutation === "Corruption"; - let inCorruptionVoid = inVoidMap && game.global.world >= corruptionStartZone; - - isCorruptedCell = isCorruptedCell || (onMap && isMagmaCell); - isCorruptedCell = isCorruptedCell || inCorruptionVoid; - - neverScry = (neverScry) || (isCorruptedCell && scryForCorruptedCellsNever); - - if (neverScry) { - autostancefunction(); - wantToScry = false; - return; - } - - //check Healthy never - const currentEnemyHealth = getCurrentEnemy(1); - const scryForHealthyCellsNever = getPageSetting('ScryerSkipHealthy') === 0; - - let isHealthyCell = currentEnemyHealth && currentEnemyHealth.mutation === "Healthy"; - isHealthyCell = isHealthyCell || (inVoidMap && game.global.world >= corruptionStartZone); - neverScry = (neverScry) || (isHealthyCell && scryForHealthyCellsNever); - - if (neverScry) { - autostancefunction(); - wantToScry = false; - return; - } - -//Force - let scryInMapsForce = getPageSetting('ScryerUseinMaps2') === 1; - let scryInVoidForce = getPageSetting('ScryerUseinVoidMaps2') === 1; - let scryInSpireForce = getPageSetting('ScryerUseinSpire2') === 1; - - let forceScry = useScryerEnabled && onMap && scryInMapsForce; - let forceScryInSpire = (!onMap && useScryerEnabled && isActiveSpireAT() && scryInSpireForce); - - forceScry = forceScry || (inVoidMap && ((scryInVoidForce) || (vmScryerEnabled && !inDaily) || (dailyScryInVoid && inDaily))); - forceScry = forceScry || forceScryInSpire; - - //check Corrupted Force - const scryForCorruptedCellsForce = getPageSetting('ScryerSkipCorrupteds2') === 1; - forceScry = forceScry || useScryerEnabled && scryForCorruptedCellsForce && isCorruptedCell; - - if (forceScry) { - if (!onMap && inNature) { - if (canScryInCurrentNature) { - setFormation(4); - wantToScry = true; - return; - } - else{ - autostancefunction(); - } - } - else { - setFormation(4); - wantToScry = true; - return; - } - } - - //check Healthy force - const scryForHealthyCellsForce = getPageSetting('ScryerSkipHealthy') === 1; - forceScry = forceScry || isHealthyCell && scryForHealthyCellsForce && useScryerEnabled; - - if (forceScry) { - if (!onMap && inNature) { - if (canScryInCurrentNature) { - setFormation(4); - wantToScry = true; - return; - } - else{ - autostancefunction(); - } - } - else { - setFormation(4); - wantToScry = true; - return; - } - } - -//Calc Damage - if (AutoStance === 1) - calcBaseDamageinX(); - else if (AutoStance >= 2) - calcBaseDamageinX2(); - -//Suicide to Scry - const missingHealth = game.global.soldierHealthMax - game.global.soldierHealth; - const isNewSquadReady = game.resources.trimps.realMax() <= game.resources.trimps.owned + 1; - const dieToScryZone = getPageSetting('ScryerDieZ'); - const dieToScryEnabled = dieToScryZone !== -1; - const aboveDieToScryZone = game.global.world >= dieToScryZone; - - let okToSwitchStance = true; - let isAllowedToDie = (dieToScryEnabled && aboveDieToScryZone); - if (isAllowedToDie && dieToScryZone >= 0) { - var [dieZ, dieC] = dieToScryZone.toString().split("."); - if (dieC && dieC.length === 1) dieC = dieC + "0"; - isAllowedToDie = game.global.world >= dieZ && (!dieC || (game.global.lastClearedCell + 1 >= dieC)); - } - const inXFormation = game.global.formation === 0; - const inHFormation = game.global.formation === 1; - - if (inXFormation || inHFormation) - okToSwitchStance = isAllowedToDie || isNewSquadReady || (missingHealth < (baseHealth / 2)); - -//Overkill - const noOverkillLevels = game.portal.Overkill.level === 0; - const hasOverkillLevels = game.portal.Overkill.level > 0; - - let scryForOverkill = getPageSetting('ScryerUseWhenOverkill'); - if (scryForOverkill && noOverkillLevels) - setPageSetting('ScryerUseWhenOverkill', false); - if (scryForOverkill && !onMap && isActiveSpireAT() && scryInSpireNever) - scryForOverkill = false; - if (scryForOverkill && hasOverkillLevels && useScryerEnabled && forceScry) { - const minDamage = calcOurDmg("min", false, true); - const Sstance = 0.5; - const ovkldmg = minDamage * Sstance * (game.portal.Overkill.level * 0.005); - const ovklHDratio = getCurrentEnemy(1).maxHealth / ovkldmg; - if (ovklHDratio < 2) { - if (okToSwitchStance) - if (inNature) { - if (canScryInCurrentNature) { - setFormation(4); - } - else{ - autostancefunction(); - } - } - else { - setFormation(4); - } - return; - } - } - -//Default - const min_zone = getPageSetting('ScryerMinZone'); - const max_zone = getPageSetting('ScryerMaxZone'); - const valid_min = game.global.world >= min_zone && game.global.world > 60; - const valid_max = max_zone <= 0 || game.global.world < max_zone; - const onlyScryForMinMaxEnabled = getPageSetting('onlyminmaxworld') === true; - - if (useScryerEnabled && valid_min && valid_max && !(onlyScryForMinMaxEnabled && onMap)) { - if (okToSwitchStance) - if (inNature) { - if (canScryInCurrentNature) { - setFormation(4); - } - else{ - autostancefunction(); - } - } - else { - setFormation(4); - } - - wantToScry = true; - } - else { - autostancefunction(); - wantToScry = false; - } -} From bbadb7a40fe33e68ae03bb1c753af13b19887c38 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 4 Oct 2018 13:28:23 +0100 Subject: [PATCH 1526/3477] Update heirlooms.js --- modules/heirlooms.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/heirlooms.js b/modules/heirlooms.js index d0481c0e2..d7a5bab62 100644 --- a/modules/heirlooms.js +++ b/modules/heirlooms.js @@ -184,7 +184,7 @@ function evaluateHeirloomMods(loom, location, upgrade) { } } case 'FluffyExp': - tempEff = 0.5 * loom.mods[m][1] / 10; + tempEff = 0.9 * loom.mods[m][1] / 10; eff += tempEff; if (upgrade) { steps = game.heirlooms.defaultSteps[loom.rarity]; From e0e58c58dcb82a77435a8757498e20c963cea9c4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Thu, 4 Oct 2018 16:54:34 +0100 Subject: [PATCH 1527/3477] Update portal.js --- modules/portal.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index 456a47390..a0a1b2970 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -131,6 +131,8 @@ function dailyAutoPortal() { function c2runnerportal() { if (game.global.world > getPageSetting('c2runnerportal')) { + if (game.global.runningChallengeSquared) + abandonChallenge(); if (autoTrimpSettings.HeliumHourChallenge.selected != 'None') doPortal(autoTrimpSettings.HeliumHourChallenge.selected); else @@ -140,61 +142,61 @@ function c2runnerportal() { function c2runner() { -var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; +//var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; if (!game.global.portalActive) return; if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { - if (c2listp.Size.percentzone < getPageSetting('c2runnerpercent')) { + if ((100*(game.c2.Size/(game.global.highestLevelCleared+1))) < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Size"); debug("C2 Runner: Running C2 Challenge Size"); } - else if (c2listp.Slow.percentzone < getPageSetting('c2runnerpercent')) { + else if ((100*(game.c2.Slow/(game.global.highestLevelCleared+1))) < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Slow"); debug("C2 Runner: Running C2 Challenge Slow"); } - else if (c2listp.Watch.percentzone < getPageSetting('c2runnerpercent')) { + else if ((100*(game.c2.Watch/(game.global.highestLevelCleared+1))) < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Watch"); debug("C2 Runner: Running C2 Challenge Watch"); } - else if (c2listp.Discipline.percentzone < getPageSetting('c2runnerpercent')) { + else if ((100*(game.c2.Discipline/(game.global.highestLevelCleared+1))) < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Discipline"); debug("C2 Runner: Running C2 Challenge Discipline"); } - else if (c2listp.Balance.percentzone < getPageSetting('c2runnerpercent')) { + else if ((100*(game.c2.Balance/(game.global.highestLevelCleared+1))) < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Balance"); debug("C2 Runner: Running C2 Challenge Balance"); } - else if (c2listp.Meditate.percentzone < getPageSetting('c2runnerpercent')) { + else if ((100*(game.c2.Meditate/(game.global.highestLevelCleared+1))) < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Meditate"); debug("C2 Runner: Running C2 Challenge Meditate"); } - else if (c2listp.Metal.percentzone < getPageSetting('c2runnerpercent')) { + else if ((100*(game.c2.Metal/(game.global.highestLevelCleared+1))) < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Metal"); debug("C2 Runner: Running C2 Challenge Metal"); } - else if (c2listp.Lead.percentzone < getPageSetting('c2runnerpercent')) { + else if ((100*(game.c2.Lead/(game.global.highestLevelCleared+1))) < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Lead"); debug("C2 Runner: Running C2 Challenge Lead"); } - else if (c2listp.Nom.percentzone < getPageSetting('c2runnerpercent')) { + else if ((100*(game.c2.Nom/(game.global.highestLevelCleared+1))) < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Nom"); debug("C2 Runner: Running C2 Challenge Nom"); } - else if (c2listp.Electricity.percentzone < getPageSetting('c2runnerpercent')) { + else if ((100*(game.c2.Electricity/(game.global.highestLevelCleared+1))) < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Electricity"); debug("C2 Runner: Running C2 Challenge Electricity"); } - else if (c2listp.Toxicity.percentzone < getPageSetting('c2runnerpercent')) { + else if ((100*(game.c2.Toxicity/(game.global.highestLevelCleared+1))) < getPageSetting('c2runnerpercent')) { challengeSquaredMode = true; selectChallenge("Toxicity"); debug("C2 Runner: Running C2 Challenge Toxicity"); From c3d586993bc16c832c1b10afc46a6710674d64ff Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 5 Oct 2018 09:46:09 +0100 Subject: [PATCH 1528/3477] Update gather.js --- modules/gather.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gather.js b/modules/gather.js index 11ee47654..98fa129ba 100644 --- a/modules/gather.js +++ b/modules/gather.js @@ -2,7 +2,7 @@ MODULES.gather={},MODULES.gather.minTraps=100,MODULES.gather.minScienceAmount=10 function manualLabor2() { if (getPageSetting('ManualGather2')==0) return; var breedingTrimps = game.resources.trimps.owned - game.resources.trimps.employed; - var lowOnTraps = game.buildings.Trap.owned < MODULES["gather"].minTraps; + var lowOnTraps = game.buildings.Trap.owned < MODULES.gather.minTraps; var notFullPop = game.resources.trimps.owned < game.resources.trimps.realMax(); var trapTrimpsOK = getPageSetting('TrapTrimps'); var targetBreed = getPageSetting('GeneticistTimer'); @@ -28,7 +28,7 @@ function manualLabor2() { if (trapperTrapUntilFull && (game.global.buildingsQueue.length == 0 || game.buildings.Trap.owned == 1) && !game.global.trapBuildAllowed && canAffordBuilding('Trap')) safeBuyBuilding('Trap'); } - else if (getPageSetting('ManualGather2') != 3 && game.resources.science.owned < MODULES["gather"].minScienceAmount && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') + else if (getPageSetting('ManualGather2') != 3 && game.resources.science.owned < MODULES.gather.minScienceAmount && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') setGather('science'); else if (!game.talents.foreman.purchased && (game.global.buildingsQueue.length ? (game.global.buildingsQueue.length > 1 || game.global.autoCraftModifier == 0 || (getPlayerModifier() > 1000 && game.global.buildingsQueue[0] != 'Trap.1')) : false)) { setGather('buildings'); @@ -85,7 +85,7 @@ function manualLabor2() { else setGather(lowestResource); } else if (getPageSetting('ManualGather2') != 3 && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') { - if (game.resources.science.owned < getPsString('science', true) * MODULES["gather"].minScienceSeconds && game.global.turkimpTimer < 1 && haveWorkers) + if (game.resources.science.owned < getPsString('science', true) * MODULES.gather.minScienceSeconds && game.global.turkimpTimer < 1 && haveWorkers) setGather('science'); else if (hasTurkimp) setGather('metal'); From 45d393e5b49076c2b55c90711828bf2324c4a117 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 5 Oct 2018 10:32:18 +0100 Subject: [PATCH 1529/3477] Update gather.js --- modules/gather.js | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/modules/gather.js b/modules/gather.js index 98fa129ba..6985b9104 100644 --- a/modules/gather.js +++ b/modules/gather.js @@ -1,8 +1,15 @@ -MODULES.gather={},MODULES.gather.minTraps=100,MODULES.gather.minScienceAmount=100,MODULES.gather.minScienceSeconds=60; +MODULES["gather"] = {}; +//These can be changed (in the console) if you know what you're doing: +MODULES["gather"].minTraps = 100; +MODULES["gather"].minScienceAmount = 100; +MODULES["gather"].minScienceSeconds = 60; + +//OLD: "Auto Gather/Build" function manualLabor2() { if (getPageSetting('ManualGather2')==0) return; + //vars var breedingTrimps = game.resources.trimps.owned - game.resources.trimps.employed; - var lowOnTraps = game.buildings.Trap.owned < MODULES.gather.minTraps; + var lowOnTraps = game.buildings.Trap.owned < MODULES["gather"].minTraps; var notFullPop = game.resources.trimps.owned < game.resources.trimps.realMax(); var trapTrimpsOK = getPageSetting('TrapTrimps'); var targetBreed = getPageSetting('GeneticistTimer'); @@ -10,6 +17,7 @@ function manualLabor2() { var watchJumpstartTraps = game.global.challengeActive == "Watch" && notFullPop; var hasTurkimp = game.talents.turkimp4.purchased || game.global.turkimpTimer > 0; + //FRESH GAME NO HELIUM CODE. if (game.global.world <=3 && game.global.totalHeliumEarned<=5000) { if (game.global.buildingsQueue.length == 0 && (game.global.playerGathering != 'trimps' || game.buildings.Trap.owned == 0)){ if (!game.triggers.wood.done || game.resources.food.owned < 10 || Math.floor(game.resources.food.owned) < Math.floor(game.resources.wood.owned)) @@ -20,31 +28,38 @@ function manualLabor2() { } if(watchJumpstartTraps || trapTrimpsOK && (breedingTrimps < 5 || trapperTrapUntilFull) && game.buildings.Trap.owned == 0 && canAffordBuilding('Trap')) { + //safeBuyBuilding returns false if item is already in queue if(!safeBuyBuilding('Trap')) setGather('buildings'); } else if (watchJumpstartTraps || trapTrimpsOK && (breedingTrimps < 5 || trapperTrapUntilFull) && game.buildings.Trap.owned > 0) { setGather('trimps'); if (trapperTrapUntilFull && (game.global.buildingsQueue.length == 0 || game.buildings.Trap.owned == 1) && !game.global.trapBuildAllowed && canAffordBuilding('Trap')) - safeBuyBuilding('Trap'); + safeBuyBuilding('Trap'); //get ahead on trap building since it is always needed for Trapper } - else if (getPageSetting('ManualGather2') != 3 && game.resources.science.owned < MODULES.gather.minScienceAmount && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') + else if (getPageSetting('ManualGather2') != 2 && game.resources.science.owned < MODULES["gather"].minScienceAmount && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') setGather('science'); + //if we have more than 2 buildings in queue, or (our modifier is real fast and trapstorm is off), build else if (!game.talents.foreman.purchased && (game.global.buildingsQueue.length ? (game.global.buildingsQueue.length > 1 || game.global.autoCraftModifier == 0 || (getPlayerModifier() > 1000 && game.global.buildingsQueue[0] != 'Trap.1')) : false)) { setGather('buildings'); } + //if trapstorm is off (likely we havent gotten it yet, the game is still early, buildings take a while to build ), then Prioritize Storage buildings when they hit the front of the queue (should really be happening anyway since the queue should be >2(fits the clause above this), but in case they are the only object in the queue.) else if (!game.global.trapBuildToggled && (game.global.buildingsQueue[0] == 'Barn.1' || game.global.buildingsQueue[0] == 'Shed.1' || game.global.buildingsQueue[0] == 'Forge.1')){ setGather('buildings'); } + //if we have some upgrades sitting around which we don't have enough science for, gather science else if (game.resources.science.owned < scienceNeeded && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') { - if ((getPlayerModifier() < getPerSecBeforeManual('Scientist') && hasTurkimp)||getPageSetting('ManualGather2') == 3){ + // debug('Science needed ' + scienceNeeded); + if ((getPlayerModifier() < getPerSecBeforeManual('Scientist') && hasTurkimp)||getPageSetting('ManualGather2') == 2){ + //if manual is less than science production, switch on turkimp setGather('metal'); } - else if (getPageSetting('ManualGather2') != 3){ + else if (getPageSetting('ManualGather2') != 2){ setGather('science'); } } else if (trapTrimpsOK && targetBreed < getBreedTime(true)){ + //combined to optimize code. if (game.buildings.Trap.owned < 100 && canAffordBuilding('Trap')) { safeBuyBuilding('Trap'); setGather('buildings'); @@ -64,34 +79,40 @@ function manualLabor2() { for (var resource in manualResourceList) { var job = manualResourceList[resource]; var currentRate = game.jobs[job].owned * game.jobs[job].modifier; + // debug('Current rate for ' + resource + ' is ' + currentRate + ' is hidden? ' + (document.getElementById(resource).style.visibility == 'hidden')); if (document.getElementById(resource).style.visibility != 'hidden') { + //find the lowest resource rate if (currentRate === 0) { currentRate = game.resources[resource].owned; + // debug('Current rate for ' + resource + ' is ' + currentRate + ' lowest ' + lowestResource + lowestResourceRate); if ((haveWorkers) || (currentRate < lowestResourceRate)) { + // debug('New Lowest1 ' + resource + ' is ' + currentRate + ' lowest ' + lowestResource + lowestResourceRate+ ' haveworkers ' +haveWorkers); haveWorkers = false; lowestResource = resource; lowestResourceRate = currentRate; } } if ((currentRate < lowestResourceRate || lowestResourceRate == -1) && haveWorkers) { + // debug('New Lowest2 ' + resource + ' is ' + currentRate + ' lowest ' + lowestResource + lowestResourceRate); lowestResource = resource; lowestResourceRate = currentRate; } } - } + } if (game.global.playerGathering != lowestResource && !haveWorkers && !breedFire) { if (hasTurkimp) setGather('metal'); else setGather(lowestResource); - } else if (getPageSetting('ManualGather2') != 3 && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') { - if (game.resources.science.owned < getPsString('science', true) * MODULES.gather.minScienceSeconds && game.global.turkimpTimer < 1 && haveWorkers) + } else if (getPageSetting('ManualGather2') != 2 && document.getElementById('scienceCollectBtn').style.display != 'none' && document.getElementById('science').style.visibility != 'hidden') { + if (game.resources.science.owned < getPsString('science', true) * MODULES["gather"].minScienceSeconds && game.global.turkimpTimer < 1 && haveWorkers) setGather('science'); else if (hasTurkimp) setGather('metal'); else setGather(lowestResource); } + //Build more traps if we have TrapTrimps on, and we own less than (100) traps. else if(trapTrimpsOK && game.global.trapBuildToggled == true && lowOnTraps) setGather('buildings'); else From 09266951e4b155fc0e542c59fbece12d3986a274 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 5 Oct 2018 10:33:26 +0100 Subject: [PATCH 1530/3477] Update gather.js --- modules/gather.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/gather.js b/modules/gather.js index 6985b9104..045937a50 100644 --- a/modules/gather.js +++ b/modules/gather.js @@ -1,3 +1,4 @@ +//updated MODULES["gather"] = {}; //These can be changed (in the console) if you know what you're doing: MODULES["gather"].minTraps = 100; From cb2ee43b0302b5e5228fc8b293fcb4a65d9e6f2c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 10:20:28 +0100 Subject: [PATCH 1531/3477] Update stance.js --- modules/stance.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/stance.js b/modules/stance.js index 1e01165d0..000a34297 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -1,6 +1,33 @@ function calcBaseDamageinX(){baseDamage=calcOurDmg("avg",!1,!0),baseBlock=game.global.soldierCurrentBlock,baseHealth=game.global.soldierHealthMax} function calcBaseDamageinX2(){baseDamage=calcOurDmg("avg",!1,!0),baseBlock=getBattleStats("block"),baseHealth=getBattleStats("health")} +function autostancenew() { + if (game.global.gridArray.length === 0) return; + if (game.global.soldierHealth <= 0) return; + if (!getPageSetting('AutoStance')) return; + if (!game.upgrades.Formations.done) return; + + var baseHealth = getBattleStats("health"); + var baseHealthD = baseHealth/2; + var baseHealthH = baseHealth*4; + var stayD = ((game.global.soldierHealth > baseHealthH*0.875) || (getEmpowerment() == 'Ice')); + var stayX = (game.global.soldierHealth > baseHealthH*0.625 && game.global.soldierHealth <= baseHealthH*0.875); + var stayH = (game.global.soldierHealth <= baseHealthH*0.625); + + if (!game.global.preMapsActive && game.global.soldierHealth > 0) { + + if (stayD && game.global.formation != 2) { + setFormation(2); + } + if (stayX && game.global.formation != 0) { + setFormation(0); + } + if (stayH && game.global.formation != 1) { + setFormation(1); + } + } +} + function autoStance() { calcBaseDamageinX2(); if (game.global.gridArray.length === 0) return true; From 13b0efe4cf291b680de269ed0bcac3ccd74c9b34 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 10:23:27 +0100 Subject: [PATCH 1532/3477] Update SettingsGUI.js --- SettingsGUI.js | 1 + 1 file changed, 1 insertion(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index d71f29998..007b59b19 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -319,6 +319,7 @@ function initializeAllSettings() { //Line 1 createSetting('BetterAutoFight', ['Better AutoFight OFF', 'Better Auto Fight 1', 'Better Auto Fight 2', 'Better Auto Fight 3'], '4-Way Button, Recommended. Will automatically handle fighting.
    BAF1 = Old Algo (Fights if dead, new squad ready, new squad breed timer target exceeded, and if breeding takes under 0.5 seconds
    BAF2 = Newer, As with BAF1, but also solves DimGen looping, sends trimps immediately when breed target met, and deals with the consequences by firing geneticists
    BAF3 = Uses vanilla autofight.
    WARNING: If you autoportal with BetterAutoFight disabled, the game may sit there doing nothing until you click FIGHT. (not good for afk) ', 'multitoggle', 3, null, "Combat"); createSetting('AutoStance', ['Auto Stance OFF', 'Auto Stance', 'D Stance', 'Windstacking'], 'Autostance: Automatically swap stances to avoid death.
    D Stance: Keeps you in D stance regardless of Health.
    Windstacking: For use after nature (z230), and will keep you in D stance unless you are windstacking (Only useful if transfer is maxed out and wind empowerment is high) ', 'multitoggle', 1, null, "Combat"); + createSetting('AutoStanceNew', 'Beta AS', 'Turn this on and Autostance off to experience testing hell! Yaaaaaay!', 'boolean', false, null, "Combat"); createSetting('IgnoreCrits', ['Safety First', 'Ignore Void Strength', 'Ignore All Crits'], 'No longer switches to B against corrupted precision and/or void strength. Basically we now treat \'crit things\' as regular in both autoStance and autoStance2. In fact it no longer takes precision / strength into account and will manage like a normal enemy, thus retaining X / D depending on your needs. If you\'re certain your block is high enough regardless if you\'re fighting a crit guy in a crit daily, use this! Alternatively, manage the stances yourself.', 'multitoggle', 0, null, 'Combat'); createSetting('PowerSaving', ['AutoAbandon', 'Don\'t Abandon', 'Only Rush Voids'], 'Autoabandon: Considers abandoning trimps for void maps/prestiges.
    Don\'t Abandon: Will not abandon troops, but will still agressively autostance even if it will kill you (WILL NOT ABANDON TRIMPS TO DO VOIDS).
    Only Rush Voids: Considers abandoning trimps for void maps, but not prestiges, still autostances aggressively.
    Made for Empower daily, and you might find this helpful if you\'re doing Workplace Safety feat. Then again with that I strongly recommend doing it fully manually. Anyway, don\'t blame me whatever happens.
    Note: AT will no longer be able to fix when your scryer gets stuck!', 'multitoggle', 0, null, 'Combat'); createSetting('ForceAbandon', 'Trimpicide', 'If a new fight group is available and anticipation stacks aren\'t maxed, Trimpicide and grab a new group. Will not abandon in spire. Recommended ON. ', 'boolean', true, null, 'Combat'); From 7f3f2e8cf6234c53013eb4ae5ee35e7651d79ce4 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 10:24:36 +0100 Subject: [PATCH 1533/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 916b7f566..d1bb5c58d 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -144,6 +144,7 @@ function mainLoop() { else if ((getPageSetting('AutoStance')==3) || (getPageSetting('use3daily')==true && game.global.challengeActive == "Daily")) autoStance3(); else if (getPageSetting('AutoStance')==1) autoStance(); else if (getPageSetting('AutoStance')==2) autoStance2(); + else if (getPageSetting('AutoStanceNew')==true) autoStanceNew(); if (getPageSetting('UseAutoGen')==true && game.global.world > 229) autoGenerator(); if (getPageSetting('BetterAutoFight')==1) betterAutoFight(); if (getPageSetting('BetterAutoFight')==2) betterAutoFight2(); From 5db098c8afc3e8416f6aaf485f46f812382b8f2c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 10:25:14 +0100 Subject: [PATCH 1534/3477] Update stance.js --- modules/stance.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 000a34297..cf01d7dd7 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -1,10 +1,9 @@ function calcBaseDamageinX(){baseDamage=calcOurDmg("avg",!1,!0),baseBlock=game.global.soldierCurrentBlock,baseHealth=game.global.soldierHealthMax} function calcBaseDamageinX2(){baseDamage=calcOurDmg("avg",!1,!0),baseBlock=getBattleStats("block"),baseHealth=getBattleStats("health")} -function autostancenew() { +function autoStanceNew() { if (game.global.gridArray.length === 0) return; if (game.global.soldierHealth <= 0) return; - if (!getPageSetting('AutoStance')) return; if (!game.upgrades.Formations.done) return; var baseHealth = getBattleStats("health"); From b5e48c099d1d3a81fd407c1bfb41702907e20b26 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 10:26:26 +0100 Subject: [PATCH 1535/3477] Update stance.js --- modules/stance.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index cf01d7dd7..5e9d52c26 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -15,13 +15,13 @@ function autoStanceNew() { if (!game.global.preMapsActive && game.global.soldierHealth > 0) { - if (stayD && game.global.formation != 2) { + if (stayD) { setFormation(2); } - if (stayX && game.global.formation != 0) { + else if (stayX) { setFormation(0); } - if (stayH && game.global.formation != 1) { + else if (stayH) { setFormation(1); } } From e1582afc780db763266314a091f51feafab9443b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 10:31:46 +0100 Subject: [PATCH 1536/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index d1bb5c58d..12897bb69 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -144,7 +144,7 @@ function mainLoop() { else if ((getPageSetting('AutoStance')==3) || (getPageSetting('use3daily')==true && game.global.challengeActive == "Daily")) autoStance3(); else if (getPageSetting('AutoStance')==1) autoStance(); else if (getPageSetting('AutoStance')==2) autoStance2(); - else if (getPageSetting('AutoStanceNew')==true) autoStanceNew(); + if (getPageSetting('AutoStanceNew')==true) autoStanceNew(); if (getPageSetting('UseAutoGen')==true && game.global.world > 229) autoGenerator(); if (getPageSetting('BetterAutoFight')==1) betterAutoFight(); if (getPageSetting('BetterAutoFight')==2) betterAutoFight2(); From 686b09147ca2f81c3a35da232c2884bb4b014389 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 10:34:57 +0100 Subject: [PATCH 1537/3477] Update stance.js --- modules/stance.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 5e9d52c26..12ad93a61 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -15,15 +15,15 @@ function autoStanceNew() { if (!game.global.preMapsActive && game.global.soldierHealth > 0) { - if (stayD) { + if (stayD && !stayX && !stayH) setFormation(2); - } - else if (stayX) { + + if (stayX && !stayD && !stayH) setFormation(0); - } - else if (stayH) { + + if (stayH && !stayD && !stayX) setFormation(1); - } + } } From 0cac9128c9cfc5d1fd6326ebdc3449dfb1c8c8b9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 10:42:35 +0100 Subject: [PATCH 1538/3477] Update stance.js --- modules/stance.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 12ad93a61..9afbc2028 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -15,14 +15,15 @@ function autoStanceNew() { if (!game.global.preMapsActive && game.global.soldierHealth > 0) { - if (stayD && !stayX && !stayH) - setFormation(2); - - if (stayX && !stayD && !stayH) - setFormation(0); - - if (stayH && !stayD && !stayX) + if (stayH) { setFormation(1); + } + else if (stayX) { + setFormation(0); + } + else if (stayD) + setFormation(2); + } } } From be21d588e52d355f6c290c0f907d3aee7d19ec93 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 10:43:22 +0100 Subject: [PATCH 1539/3477] Update stance.js --- modules/stance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index 9afbc2028..e9d375c2b 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -21,7 +21,7 @@ function autoStanceNew() { else if (stayX) { setFormation(0); } - else if (stayD) + else if (stayD) { setFormation(2); } From 2241962231b41f7f4dfcf97b938c72b42f68118b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 10:45:25 +0100 Subject: [PATCH 1540/3477] Update stance.js --- modules/stance.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index e9d375c2b..4e568f949 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -10,18 +10,18 @@ function autoStanceNew() { var baseHealthD = baseHealth/2; var baseHealthH = baseHealth*4; var stayD = ((game.global.soldierHealth > baseHealthH*0.875) || (getEmpowerment() == 'Ice')); - var stayX = (game.global.soldierHealth > baseHealthH*0.625 && game.global.soldierHealth <= baseHealthH*0.875); - var stayH = (game.global.soldierHealth <= baseHealthH*0.625); + var stayX = (game.global.soldierHealth > baseHealthH*0.625 && game.global.soldierHealth <= baseHealthH*0.875 && !stayD); + var stayH = (game.global.soldierHealth <= baseHealthH*0.625 && !stayD && !stayX); if (!game.global.preMapsActive && game.global.soldierHealth > 0) { - if (stayH) { + if (stayH && game.global.formation ! = 1) { setFormation(1); } - else if (stayX) { + else if (stayX && game.global.formation ! = 0) { setFormation(0); } - else if (stayD) { + else if (stayD && game.global.formation ! = 2) { setFormation(2); } From 9dd42ee3241fae00f0ce777abeea53ebb4db3c8a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 10:46:11 +0100 Subject: [PATCH 1541/3477] Update stance.js --- modules/stance.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 4e568f949..5d6e8b8e2 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -15,13 +15,13 @@ function autoStanceNew() { if (!game.global.preMapsActive && game.global.soldierHealth > 0) { - if (stayH && game.global.formation ! = 1) { + if (stayH && game.global.formation != 1) { setFormation(1); } - else if (stayX && game.global.formation ! = 0) { + else if (stayX && game.global.formation != 0) { setFormation(0); } - else if (stayD && game.global.formation ! = 2) { + else if (stayD && game.global.formation != 2) { setFormation(2); } From 84f68b87f76a413b01efe6dacadb07ffc32de2e5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 10:51:41 +0100 Subject: [PATCH 1542/3477] Update stance.js --- modules/stance.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 5d6e8b8e2..eacd6c14d 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -15,13 +15,13 @@ function autoStanceNew() { if (!game.global.preMapsActive && game.global.soldierHealth > 0) { - if (stayH && game.global.formation != 1) { + if (stayH) { setFormation(1); } - else if (stayX && game.global.formation != 0) { + if (stayX) { setFormation(0); } - else if (stayD && game.global.formation != 2) { + if (stayD) { setFormation(2); } From 28c412c6f69e3ea72c4179b91adc6bcb32a352be Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 11:01:15 +0100 Subject: [PATCH 1543/3477] Update stance.js --- modules/stance.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index eacd6c14d..7e7a439be 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -6,23 +6,25 @@ function autoStanceNew() { if (game.global.soldierHealth <= 0) return; if (!game.upgrades.Formations.done) return; - var baseHealth = getBattleStats("health"); - var baseHealthD = baseHealth/2; - var baseHealthH = baseHealth*4; - var stayD = ((game.global.soldierHealth > baseHealthH*0.875) || (getEmpowerment() == 'Ice')); - var stayX = (game.global.soldierHealth > baseHealthH*0.625 && game.global.soldierHealth <= baseHealthH*0.875 && !stayD); - var stayH = (game.global.soldierHealth <= baseHealthH*0.625 && !stayD && !stayX); + var baseHealth = (getBattleStats("health")*4); + var currentHealth = game.global.soldierHealth; + var Ice = (getEmpowerment() == 'Ice'); + var baseHealthD = baseHealth*0.875; + var baseHealthX = baseHealth*0.625; + var stayD = ((currentHealth > baseHealthD) || (Ice)); + var stayX = (currentHealth > baseHealthX && currentHealth <= baseHealthD && !stayD); + var stayH = (currentHealth <= baseHealthX && !stayD && !stayX); if (!game.global.preMapsActive && game.global.soldierHealth > 0) { - if (stayH) { - setFormation(1); + if (stayD) { + setFormation(2); } if (stayX) { setFormation(0); } - if (stayD) { - setFormation(2); + if (stayH) { + setFormation(1); } } From 472849372c768db0abfadc82f4e0b23816043334 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 11:06:08 +0100 Subject: [PATCH 1544/3477] Update stance.js --- modules/stance.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/stance.js b/modules/stance.js index 7e7a439be..a9b5342cf 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -19,12 +19,15 @@ function autoStanceNew() { if (stayD) { setFormation(2); + return; } if (stayX) { setFormation(0); + return; } if (stayH) { setFormation(1); + return; } } From 01fe69d0339eec761f8ff94c2ac610a8ad317745 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 11:08:51 +0100 Subject: [PATCH 1545/3477] Update stance.js --- modules/stance.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index a9b5342cf..a5317d1b2 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -16,20 +16,18 @@ function autoStanceNew() { var stayH = (currentHealth <= baseHealthX && !stayD && !stayX); if (!game.global.preMapsActive && game.global.soldierHealth > 0) { - if (stayD) { setFormation(2); return; } - if (stayX) { + else if (stayX) { setFormation(0); return; } - if (stayH) { + else { setFormation(1); return; } - } } From 9fab0756fc795e7fffe2d5b126fba035e43dfc4c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sat, 6 Oct 2018 11:27:52 +0100 Subject: [PATCH 1546/3477] Update stance.js --- modules/stance.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index a5317d1b2..01d72c37e 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -6,14 +6,12 @@ function autoStanceNew() { if (game.global.soldierHealth <= 0) return; if (!game.upgrades.Formations.done) return; - var baseHealth = (getBattleStats("health")*4); + var baseHealth = getBattleStats("health"); + var baseHealthD = baseHealth/2; var currentHealth = game.global.soldierHealth; var Ice = (getEmpowerment() == 'Ice'); - var baseHealthD = baseHealth*0.875; - var baseHealthX = baseHealth*0.625; - var stayD = ((currentHealth > baseHealthD) || (Ice)); - var stayX = (currentHealth > baseHealthX && currentHealth <= baseHealthD && !stayD); - var stayH = (currentHealth <= baseHealthX && !stayD && !stayX); + var stayD = ((currentHealth > (baseHealthD*0.25)) || (Ice)); + var stayX = ((currentHealth > (baseHealth*0.25)) && !stayD); if (!game.global.preMapsActive && game.global.soldierHealth > 0) { if (stayD) { From bc7b998ee7e01c9b99b90786c2b60f419dc5ef70 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 7 Oct 2018 15:20:05 +0100 Subject: [PATCH 1547/3477] Update stance.js --- modules/stance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index 01d72c37e..54662cbe4 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -330,7 +330,7 @@ function autoStance3() { windstackmax = getPageSetting('dWindStackingMax'); var curEnemyhealthy = getCurrentEnemy(1); var ishealthy = curEnemyhealthy && curEnemyhealthy.mutation == "Healthy"; - if (getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower >= windstackmax || windstackzone < 0 || windstackzone >= game.global.world || game.global.spireActive || getPageSetting('windhealthy') == true && !ishealthy && game.global.challengeActive != "Daily" || getPageSetting('dwindhealthy') == true && !ishealthy && game.global.challengeActive == "Daily") { + if (((getPageSetting('WindStackingMin') >= 1 && game.global.challengeActive != "Daily") || (getPageSetting('dWindStackingMin') >= 1 && game.global.challengeActive == "Daily")) && (getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower >= windstackmax || windstackzone < 0 || windstackzone >= game.global.world || game.global.spireActive || getPageSetting('windhealthy') == true && !ishealthy && game.global.challengeActive != "Daily" || getPageSetting('dwindhealthy') == true && !ishealthy && game.global.challengeActive == "Daily")) { if (!(game.global.mapsActive && game.global.mapsOwnedArray[getMapIndex(game.global.currentMapId)].bonus === "lmc")) { setFormation(2); return; From 259d933f7c555ae385e0dfe61df7ab9e228442e5 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 7 Oct 2018 20:20:41 +0100 Subject: [PATCH 1548/3477] Revert "Update stance.js" This reverts commit bc7b998ee7e01c9b99b90786c2b60f419dc5ef70. --- modules/stance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stance.js b/modules/stance.js index 54662cbe4..01d72c37e 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -330,7 +330,7 @@ function autoStance3() { windstackmax = getPageSetting('dWindStackingMax'); var curEnemyhealthy = getCurrentEnemy(1); var ishealthy = curEnemyhealthy && curEnemyhealthy.mutation == "Healthy"; - if (((getPageSetting('WindStackingMin') >= 1 && game.global.challengeActive != "Daily") || (getPageSetting('dWindStackingMin') >= 1 && game.global.challengeActive == "Daily")) && (getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower >= windstackmax || windstackzone < 0 || windstackzone >= game.global.world || game.global.spireActive || getPageSetting('windhealthy') == true && !ishealthy && game.global.challengeActive != "Daily" || getPageSetting('dwindhealthy') == true && !ishealthy && game.global.challengeActive == "Daily")) { + if (getEmpowerment() != "Wind" || game.global.mapsActive || game.empowerments.Wind.currentDebuffPower >= windstackmax || windstackzone < 0 || windstackzone >= game.global.world || game.global.spireActive || getPageSetting('windhealthy') == true && !ishealthy && game.global.challengeActive != "Daily" || getPageSetting('dwindhealthy') == true && !ishealthy && game.global.challengeActive == "Daily") { if (!(game.global.mapsActive && game.global.mapsOwnedArray[getMapIndex(game.global.currentMapId)].bonus === "lmc")) { setFormation(2); return; From 5759a620f919af786e35c5068228ac1b57bf82a7 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 8 Oct 2018 15:41:19 +0100 Subject: [PATCH 1549/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SettingsGUI.js b/SettingsGUI.js index 007b59b19..91c371579 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -81,6 +81,7 @@ function initializeAllSettings() { //Line 1: createSetting('ManualGather2', ['Manual Gather/Build', 'Auto Gather/Build', 'Mining/Building Only', 'Science Research OFF'], 'Controls what you gather/build do. Manual does nothing
    Auto Gathering of Food,Wood,Metal(w/turkimp) & Science. Auto speed-Builds your build queue.
    Mining/Building only does exactly what it says. Only use if you are passed the early stages of the game (No longer need to trap, food and wood are useless).
    You can disable science researching for the achievement: Reach Z120 without using manual research.', 'multitoggle', 1, null, "Core"); + createSetting('gathermetal', 'Metal Only', 'For use with Mining/Gather Only. Only gathers Metal if you have foremany unlocked. ', 'boolean', false, null, "Core"); createSetting('BuyUpgradesNew', ['Manual Upgrades', 'Buy All Upgrades', 'Upgrades no Coords'], 'Autobuys non-equipment upgrades (equipment is controlled in the Gear tab). The second option does NOT buy coordination (use this ONLY if you know what you\'re doing).', 'multitoggle', 1, null, "Core"); createSetting('amalcoord', 'Amal Boost', 'Boost your Amal count for more Mi. Will not buy coords until your H:D ratio is below a certain value. This means that you will get amals quicker. Will not activate higher than your Amal Boost End Zone Setting! ', 'boolean', false, null, "Core"); createSetting('amalcoordt', 'Amal Target', 'Set the amount of Amals you wish to aim for. Once this target is reached, it will buy coords below your Amal ratio regardless of your H:D, just enough to keep the Amal. -1 to disable and use H:D for entire boost. ', 'value', -1, null, "Core"); @@ -535,6 +536,7 @@ function updateCustomButtons() { //Core getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpa"): turnOff("lootdumpa"); + (getPageSetting('ManualGather2')==2 && game.talents.foreman.purchased) ? turnOn("gathermetal"): turnOff("gathermetal"); getPageSetting('AutoAllocatePerks')==2 ? turnOn("lootdumpz"): turnOff("lootdumpz"); getPageSetting('amalcoord')==true ? turnOn("amalcoordt"): turnOff("amalcoordt"); getPageSetting('amalcoord')==true ? turnOn("amalcoordhd"): turnOff("amalcoordhd"); From 996e1b12522b1d8c232d9e50130c6660a44f0e5c Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 8 Oct 2018 15:43:16 +0100 Subject: [PATCH 1550/3477] Update gather.js --- modules/gather.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gather.js b/modules/gather.js index 045937a50..107e42006 100644 --- a/modules/gather.js +++ b/modules/gather.js @@ -122,6 +122,6 @@ function manualLabor2() { } function autogather3() { -if (game.global.buildingsQueue.length <= 1) setGather('metal'); +if ((game.global.buildingsQueue.length <= 1 && getPageSetting('gathermetal') == false) || (getPageSetting('gathermetal') == true)) setGather('metal'); else setGather('buildings') } From 60f5b786c0cd5e183307665aa229e364f07b2c71 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 8 Oct 2018 15:46:56 +0100 Subject: [PATCH 1551/3477] Update portal.js --- modules/portal.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/portal.js b/modules/portal.js index a0a1b2970..823f88a27 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -141,9 +141,7 @@ function c2runnerportal() { } function c2runner() { - -//var c2listp={Size:{number:1,percentzone:(100*(game.c2.Size/(game.global.highestLevelCleared+1)))},Slow:{number:2,percentzone:(100*(game.c2.Slow/(game.global.highestLevelCleared+1)))},Watch:{number:3,percentzone:(100*(game.c2.Watch/(game.global.highestLevelCleared+1)))},Discipline:{number:4,percentzone:(100*(game.c2.Discipline/(game.global.highestLevelCleared+1)))},Balance:{number:5,percentzone:(100*(game.c2.Balance/(game.global.highestLevelCleared+1)))},Meditate:{number:6,percentzone:(100*(game.c2.Meditate/(game.global.highestLevelCleared+1)))},Metal:{number:7,percentzone:(100*(game.c2.Metal/(game.global.highestLevelCleared+1)))},Lead:{number:8,percentzone:(100*(game.c2.Lead/(game.global.highestLevelCleared+1)))},Nom:{number:9,percentzone:(100*(game.c2.Nom/(game.global.highestLevelCleared+1)))},Electricity:{number:10,percentzone:(100*(game.c2.Electricity/(game.global.highestLevelCleared+1)))},Toxicity:{number:11,percentzone:(100*(game.c2.Toxicity/(game.global.highestLevelCleared+1)))}}; - + if (!game.global.portalActive) return; if (getPageSetting('c2runnerstart') == true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { if ((100*(game.c2.Size/(game.global.highestLevelCleared+1))) < getPageSetting('c2runnerpercent')) { @@ -211,8 +209,7 @@ function doPortal(challenge) { if (getPageSetting('AutoHeirloomsNew')==0); else if (getPageSetting('AutoHeirloomsNew')==1) autoHeirlooms(); else if (getPageSetting('AutoHeirloomsNew')==2) autoHeirlooms2(); - if (getPageSetting('AutoUpgradeHeirlooms') && !heirloomsShown) autoNull(); - portalClicked(); + portalClicked(); if (getPageSetting('AutoAllocatePerks')==1 && (typeof MODULES["perks"] !== 'undefined' || typeof AutoPerks !== 'undefined')) AutoPerks.clickAllocate(); if (getPageSetting('c2runnerstart')==true && getPageSetting('c2runnerportal') > 0 && getPageSetting('c2runnerpercent') > 0) { From d440f321fef733b25c65735dd8c2cf9f4e696fae Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 8 Oct 2018 16:48:05 +0100 Subject: [PATCH 1552/3477] Update SettingsGUI.js --- SettingsGUI.js | 61 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 91c371579..2c5cda555 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -379,8 +379,28 @@ function initializeAllSettings() { //Heirloom createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'AH1: Keeps any heirloom whether they are staffs or shields. This generally prefers shields over staffs.
    AH2: Keeps 5 slots for shields and 5 slots of staffs. Does not include protected heirlooms, as it will take up a spot, so you would only have 9 to work with. Looks like this: SH/ST/SH/ST/SH/ST/SH/ST/SH/ST
    It will keep heirlooms on portal. ', 'multitoggle', 0, null, 'Heirlooms'); - createSetting('AutoUpgradeHeirlooms', 'Auto Upgrade Heirlooms', 'Automatically buys the upgrades the script advises for the Equipped shield and staff, until we are out of nullifium.', 'boolean', false, null, 'Heirlooms'); - + + createSetting('autoheirlooms', 'Auto Heirlooms', 'Auto Heirlooms master button. Turn this on to enable all Auto Heirloom settings.

    The Modifier points will be explained here. The more points an heirloom has, the better chance it has of being kept. If empty is selected, it will muliplty the score by 4. If any is selected, it will multiply the score of the heirloom by 2.

    E.g Mod 1 = CC (+5 if dropped, 1st modifier)
    Mod 2 = CD (+4 if dropped, 2nd modifier)
    Mod 3 = PB (+3 if dropped, 3rd modifier)
    Mod 4 = Empty (x4 if dropped, +0 if not)
    Mod 5 = Empty (x4 if dropped, +0 if not)

    If an heirloom dropped with these exact modifiers, it would get a score of 192 (5+4+3*4*4=192). The highest point heirlooms will be kept. ', 'boolean', false, null, 'Heirlooms'); + createSetting('typetokeep', ['None', 'Shields', 'Staffs', 'Both'], 'Shields: Keeps Shields and nothing else.
    Staffs: Keeps Staffs and nothing else.
    Both: Keeps 5 Shields and 5 Staffs. If you have protected heirlooms in your inventory it will overrite one slot. E.g if one heirloom is protected, you will keep 5 Shields and 4 Staffs. ', 'multitoggle', 0, null, 'Heirlooms'); + createSetting('raretokeep', 'Rarity to Keep', 'Auto Heirlooms. Keeps the selected rarity of heirloom, recycles all others. ', 'dropdown', 'None', ["None", "Common", "Uncommon", "Rare", "Epic", "Legendary", "Magnificent", "Ethereal", "Magmatic", "Plagued"], 'Heirlooms'); + + //Shield Line + document.getElementById('raretokeep').parentNode.insertAdjacentHTML('afterend','
    '); + createSetting('keepshields', 'Shields', 'Auto Heirlooms. Enables in-depth shield settings. ', 'boolean', false, null, 'Heirlooms'); + createSetting('slot1modsh', 'Shield: Modifier 1', 'Auto Heirlooms. Keeps Shields with selected Mod. Modifier 1 is worth 5 points. ', 'dropdown', 'Empty', ["Empty", "Any", "Player Efficiency", "Trainer Efficiency", "Storage Size", "Breeding Speed", "Trimp Health", "Trimp Attack", "Trimp Block", "Crit Damage", "Crit Chance", "VM Drop Chance", "Plaguebringer"], 'Heirlooms'); + createSetting('slot2modsh', 'Shield: Modifier 2', 'Auto Heirlooms. Keeps Shields with selected Mod. Modifier 2 is worth 4 points. ', 'dropdown', 'Empty', ["Empty", "Any", "Player Efficiency", "Trainer Efficiency", "Storage Size", "Breeding Speed", "Trimp Health", "Trimp Attack", "Trimp Block", "Crit Damage", "Crit Chance", "VM Drop Chance", "Plaguebringer"], 'Heirlooms'); + createSetting('slot3modsh', 'Shield: Modifier 3', 'Auto Heirlooms. Keeps Shields with selected Mod. Modifier 3 is worth 3 points. ', 'dropdown', 'Empty', ["Empty", "Any", "Player Efficiency", "Trainer Efficiency", "Storage Size", "Breeding Speed", "Trimp Health", "Trimp Attack", "Trimp Block", "Crit Damage", "Crit Chance", "VM Drop Chance", "Plaguebringer"], 'Heirlooms'); + createSetting('slot4modsh', 'Shield: Modifier 4', 'Auto Heirlooms. Keeps Shields with selected Mod. Modifier 4 is worth 2 points. ', 'dropdown', 'Empty', ["Empty", "Any", "Player Efficiency", "Trainer Efficiency", "Storage Size", "Breeding Speed", "Trimp Health", "Trimp Attack", "Trimp Block", "Crit Damage", "Crit Chance", "VM Drop Chance", "Plaguebringer"], 'Heirlooms'); + createSetting('slot5modsh', 'Shield: Modifier 5', 'Auto Heirlooms. Keeps Shields with selected Mod. Modifier 5 is worth 1 points. ', 'dropdown', 'Empty', ["Empty", "Any", "Player Efficiency", "Trainer Efficiency", "Storage Size", "Breeding Speed", "Trimp Health", "Trimp Attack", "Trimp Block", "Crit Damage", "Crit Chance", "VM Drop Chance", "Plaguebringer"], 'Heirlooms'); + + //Staff Line + document.getElementById('slot5modsh').parentNode.insertAdjacentHTML('afterend','
    '); + createSetting('keepstaffs', 'Staffs', 'Auto Heirlooms. Enables in-depth staff settings. ', 'boolean', false, null, 'Heirlooms'); + createSetting('slot1modst', 'Staff: Modifier 1', 'Auto Heirlooms. Keeps Staffs with selected Mod. Modifier 1 is worth 5 points. ', 'dropdown', 'Empty', ["Empty", "Any", "Metal Drop Rate", "Food Drop Rate", "Wood Drop Rate", "Gem Drop Rate", "Fragment Drop Rate", "Miner Efficiency", "Farmer Efficiency", "Lumberjack Efficiency", "Dragimp Efficiency", "Explorer Efficiency", "Scientist Efficiency", "Fluffy EXP"], 'Heirlooms'); + createSetting('slot2modst', 'Staff: Modifier 2', 'Auto Heirlooms. Keeps Staffs with selected Mod. Modifier 2 is worth 4 points. ', 'dropdown', 'Empty', ["Empty", "Any", "Metal Drop Rate", "Food Drop Rate", "Wood Drop Rate", "Gem Drop Rate", "Fragment Drop Rate", "Miner Efficiency", "Farmer Efficiency", "Lumberjack Efficiency", "Dragimp Efficiency", "Explorer Efficiency", "Scientist Efficiency", "Fluffy EXP"], 'Heirlooms'); + createSetting('slot3modst', 'Staff: Modifier 3', 'Auto Heirlooms. Keeps Staffs with selected Mod. Modifier 3 is worth 3 points. ', 'dropdown', 'Empty', ["Empty", "Any", "Metal Drop Rate", "Food Drop Rate", "Wood Drop Rate", "Gem Drop Rate", "Fragment Drop Rate", "Miner Efficiency", "Farmer Efficiency", "Lumberjack Efficiency", "Dragimp Efficiency", "Explorer Efficiency", "Scientist Efficiency", "Fluffy EXP"], 'Heirlooms'); + createSetting('slot4modst', 'Staff: Modifier 4', 'Auto Heirlooms. Keeps Staffs with selected Mod. Modifier 4 is worth 2 points. ', 'dropdown', 'Empty', ["Empty", "Any", "Metal Drop Rate", "Food Drop Rate", "Wood Drop Rate", "Gem Drop Rate", "Fragment Drop Rate", "Miner Efficiency", "Farmer Efficiency", "Lumberjack Efficiency", "Dragimp Efficiency", "Explorer Efficiency", "Scientist Efficiency", "Fluffy EXP"], 'Heirlooms'); + createSetting('slot5modst', 'Staff: Modifier 5', 'Auto Heirlooms. Keeps Staffs with selected Mod. Modifier 5 is worth 1 points. ', 'dropdown', 'Empty', ["Empty", "Any", "Metal Drop Rate", "Food Drop Rate", "Wood Drop Rate", "Gem Drop Rate", "Fragment Drop Rate", "Miner Efficiency", "Farmer Efficiency", "Lumberjack Efficiency", "Dragimp Efficiency", "Explorer Efficiency", "Scientist Efficiency", "Fluffy EXP"], 'Heirlooms'); //Golden @@ -574,6 +594,29 @@ function updateCustomButtons() { //Display (game.worldUnlocks.easterEgg) ? turnOn('AutoEggs') : turnOff('AutoEggs'); + //Heirlooms + var autoheirloomenable = (getPageSetting('autoheirlooms')==true); + var keepshieldenable = (autoheirloomenable && getPageSetting('keepshields')==true); + var keepstaffenable = (autoheirloomenable && getPageSetting('keepstaffs')==true); + + (autoheirloomenable) ? turnOn('typetokeep') : turnOff('typetokeep'); + (autoheirloomenable) ? turnOn('raretokeep') : turnOff('raretokeep'); + (autoheirloomenable) ? turnOn('keepshields') : turnOff('keepshields'); + (autoheirloomenable) ? turnOn('keepstaffs') : turnOff('keepstaffs'); + + (keepshieldenable) = ? turnOn('slot1modsh') : turnOff('slot1modsh'); + (keepshieldenable) = ? turnOn('slot2modsh') : turnOff('slot2modsh'); + (keepshieldenable) = ? turnOn('slot3modsh') : turnOff('slot3modsh'); + (keepshieldenable) = ? turnOn('slot4modsh') : turnOff('slot4modsh'); + (keepshieldenable) = ? turnOn('slot5modsh') : turnOff('slot5modsh'); + + (keepstaffenable) = ? turnOn('slot1modst') : turnOff('slot1modst'); + (keepstaffenable) = ? turnOn('slot2modst') : turnOff('slot2modst'); + (keepstaffenable) = ? turnOn('slot3modst') : turnOff('slot3modst'); + (keepstaffenable) = ? turnOn('slot4modst') : turnOff('slot4modst'); + (keepstaffenable) = ? turnOn('slot5modst') : turnOff('slot5modst'); + + //Dropdowns document.getElementById('AutoPortal').value = autoTrimpSettings.AutoPortal.selected; document.getElementById('HeliumHourChallenge').value = autoTrimpSettings.HeliumHourChallenge.selected; document.getElementById('AutoGoldenUpgrades').value = autoTrimpSettings.AutoGoldenUpgrades.selected; @@ -583,6 +626,20 @@ function updateCustomButtons() { document.getElementById('AutoWind').value = autoTrimpSettings.AutoWind.selected; document.getElementById('AutoIce').value = autoTrimpSettings.AutoIce.selected; + //Heirloom dropdowns + document.getElementById('raretokeep').value = autoTrimpSettings.raretokeep.selected; + document.getElementById('slot1modsh').value = autoTrimpSettings.slot1modsh.selected; + document.getElementById('slot2modsh').value = autoTrimpSettings.slot2modsh.selected; + document.getElementById('slot3modsh').value = autoTrimpSettings.slot3modsh.selected; + document.getElementById('slot4modsh').value = autoTrimpSettings.slot4modsh.selected; + document.getElementById('slot5modsh').value = autoTrimpSettings.slot5modsh.selected; + document.getElementById('slot1modst').value = autoTrimpSettings.slot1modst.selected; + document.getElementById('slot2modst').value = autoTrimpSettings.slot2modst.selected; + document.getElementById('slot3modst').value = autoTrimpSettings.slot3modst.selected; + document.getElementById('slot4modst').value = autoTrimpSettings.slot4modst.selected; + document.getElementById('slot5modst').value = autoTrimpSettings.slot5modst.selected; + + if (getPageSetting('DisableFarm') < 1) shouldFarm = false; From 7c946cad298b13f1af857213022991ac0f5a8dfe Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 8 Oct 2018 16:50:24 +0100 Subject: [PATCH 1553/3477] Update SettingsGUI.js --- SettingsGUI.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 2c5cda555..fc3196a7b 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -604,17 +604,17 @@ function updateCustomButtons() { (autoheirloomenable) ? turnOn('keepshields') : turnOff('keepshields'); (autoheirloomenable) ? turnOn('keepstaffs') : turnOff('keepstaffs'); - (keepshieldenable) = ? turnOn('slot1modsh') : turnOff('slot1modsh'); - (keepshieldenable) = ? turnOn('slot2modsh') : turnOff('slot2modsh'); - (keepshieldenable) = ? turnOn('slot3modsh') : turnOff('slot3modsh'); - (keepshieldenable) = ? turnOn('slot4modsh') : turnOff('slot4modsh'); - (keepshieldenable) = ? turnOn('slot5modsh') : turnOff('slot5modsh'); - - (keepstaffenable) = ? turnOn('slot1modst') : turnOff('slot1modst'); - (keepstaffenable) = ? turnOn('slot2modst') : turnOff('slot2modst'); - (keepstaffenable) = ? turnOn('slot3modst') : turnOff('slot3modst'); - (keepstaffenable) = ? turnOn('slot4modst') : turnOff('slot4modst'); - (keepstaffenable) = ? turnOn('slot5modst') : turnOff('slot5modst'); + (keepshieldenable) ? turnOn('slot1modsh') : turnOff('slot1modsh'); + (keepshieldenable) ? turnOn('slot2modsh') : turnOff('slot2modsh'); + (keepshieldenable) ? turnOn('slot3modsh') : turnOff('slot3modsh'); + (keepshieldenable) ? turnOn('slot4modsh') : turnOff('slot4modsh'); + (keepshieldenable) ? turnOn('slot5modsh') : turnOff('slot5modsh'); + + (keepstaffenable) ? turnOn('slot1modst') : turnOff('slot1modst'); + (keepstaffenable) ? turnOn('slot2modst') : turnOff('slot2modst'); + (keepstaffenable) ? turnOn('slot3modst') : turnOff('slot3modst'); + (keepstaffenable) ? turnOn('slot4modst') : turnOff('slot4modst'); + (keepstaffenable) ? turnOn('slot5modst') : turnOff('slot5modst'); //Dropdowns document.getElementById('AutoPortal').value = autoTrimpSettings.AutoPortal.selected; From a3952e373bcaaba7addbc5a25997a1204e25324e Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Mon, 8 Oct 2018 17:37:08 +0100 Subject: [PATCH 1554/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index fc3196a7b..09fd26d11 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -380,7 +380,7 @@ function initializeAllSettings() { //Heirloom createSetting('AutoHeirloomsNew', ['AutoHeirlooms Off', 'AutoHeirlooms 1', 'AutoHeirlooms 2'], 'AH1: Keeps any heirloom whether they are staffs or shields. This generally prefers shields over staffs.
    AH2: Keeps 5 slots for shields and 5 slots of staffs. Does not include protected heirlooms, as it will take up a spot, so you would only have 9 to work with. Looks like this: SH/ST/SH/ST/SH/ST/SH/ST/SH/ST
    It will keep heirlooms on portal. ', 'multitoggle', 0, null, 'Heirlooms'); - createSetting('autoheirlooms', 'Auto Heirlooms', 'Auto Heirlooms master button. Turn this on to enable all Auto Heirloom settings.

    The Modifier points will be explained here. The more points an heirloom has, the better chance it has of being kept. If empty is selected, it will muliplty the score by 4. If any is selected, it will multiply the score of the heirloom by 2.

    E.g Mod 1 = CC (+5 if dropped, 1st modifier)
    Mod 2 = CD (+4 if dropped, 2nd modifier)
    Mod 3 = PB (+3 if dropped, 3rd modifier)
    Mod 4 = Empty (x4 if dropped, +0 if not)
    Mod 5 = Empty (x4 if dropped, +0 if not)

    If an heirloom dropped with these exact modifiers, it would get a score of 192 (5+4+3*4*4=192). The highest point heirlooms will be kept. ', 'boolean', false, null, 'Heirlooms'); + createSetting('autoheirlooms', 'Auto Heirlooms', 'NOT CURRENTLY WORKING Auto Heirlooms master button. Turn this on to enable all Auto Heirloom settings.

    The Modifier points will be explained here. The more points an heirloom has, the better chance it has of being kept. If empty is selected, it will muliplty the score by 4. If any is selected, it will multiply the score of the heirloom by 2.

    E.g Mod 1 = CC (+5 if dropped, 1st modifier)
    Mod 2 = CD (+4 if dropped, 2nd modifier)
    Mod 3 = PB (+3 if dropped, 3rd modifier)
    Mod 4 = Empty (x4 if dropped, +0 if not)
    Mod 5 = Empty (x4 if dropped, +0 if not)

    If an heirloom dropped with these exact modifiers, it would get a score of 192 (5+4+3*4*4=192). The highest point heirlooms will be kept. ', 'boolean', false, null, 'Heirlooms'); createSetting('typetokeep', ['None', 'Shields', 'Staffs', 'Both'], 'Shields: Keeps Shields and nothing else.
    Staffs: Keeps Staffs and nothing else.
    Both: Keeps 5 Shields and 5 Staffs. If you have protected heirlooms in your inventory it will overrite one slot. E.g if one heirloom is protected, you will keep 5 Shields and 4 Staffs. ', 'multitoggle', 0, null, 'Heirlooms'); createSetting('raretokeep', 'Rarity to Keep', 'Auto Heirlooms. Keeps the selected rarity of heirloom, recycles all others. ', 'dropdown', 'None', ["None", "Common", "Uncommon", "Rare", "Epic", "Legendary", "Magnificent", "Ethereal", "Magmatic", "Plagued"], 'Heirlooms'); From a39b6a447d9bb2b8b645e1cb39d087aea49f29c3 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 12 Oct 2018 09:56:01 +0100 Subject: [PATCH 1555/3477] Update stance.js --- modules/stance.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 01d72c37e..7140a4bea 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -7,24 +7,24 @@ function autoStanceNew() { if (!game.upgrades.Formations.done) return; var baseHealth = getBattleStats("health"); - var baseHealthD = baseHealth/2; + var baseHealthH = baseHealth*4; + var healthD = baseHealthH*0.875; + var healthX = baseHealthH*0.625; var currentHealth = game.global.soldierHealth; var Ice = (getEmpowerment() == 'Ice'); - var stayD = ((currentHealth > (baseHealthD*0.25)) || (Ice)); - var stayX = ((currentHealth > (baseHealth*0.25)) && !stayD); - - if (!game.global.preMapsActive && game.global.soldierHealth > 0) { + var stayD = ((currentHealth > healthD) || (Ice)); + var DtoX = (currentHealth <= healthD && currentHealth > healthX); + var XtoH = (currentHealth <= healthX); + + if (!game.global.preMapsActive && currentHealth > 0) { if (stayD) { setFormation(2); - return; } - else if (stayX) { + else if (DtoX) { setFormation(0); - return; } else { setFormation(1); - return; } } } From 3c11776f7184cfecff34b5e96bf56d6b8fb4287a Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 12 Oct 2018 10:04:40 +0100 Subject: [PATCH 1556/3477] Update stance.js --- modules/stance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 7140a4bea..3c8b78544 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -20,10 +20,10 @@ function autoStanceNew() { if (stayD) { setFormation(2); } - else if (DtoX) { + if (DtoX) { setFormation(0); } - else { + if (XtoH) { setFormation(1); } } From 9dd85d1810b3118e14b6e8f756f17c243c0c8389 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 12 Oct 2018 10:10:07 +0100 Subject: [PATCH 1557/3477] Update stance.js --- modules/stance.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 3c8b78544..0253ef96c 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -17,13 +17,13 @@ function autoStanceNew() { var XtoH = (currentHealth <= healthX); if (!game.global.preMapsActive && currentHealth > 0) { - if (stayD) { + if (stayD && game.global.formation != 2) { setFormation(2); } - if (DtoX) { + if (DtoX && game.global.formation != 0) { setFormation(0); } - if (XtoH) { + if (XtoH && game.global.formation != 1) { setFormation(1); } } From 69058b343738d6767221cbe4758144ec6300e3b9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 12 Oct 2018 10:12:44 +0100 Subject: [PATCH 1558/3477] Update stance.js --- modules/stance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 0253ef96c..a77d716d4 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -13,8 +13,8 @@ function autoStanceNew() { var currentHealth = game.global.soldierHealth; var Ice = (getEmpowerment() == 'Ice'); var stayD = ((currentHealth > healthD) || (Ice)); - var DtoX = (currentHealth <= healthD && currentHealth > healthX); - var XtoH = (currentHealth <= healthX); + var DtoX = !stayD && (currentHealth <= healthD && currentHealth > healthX); + var XtoH = (!stayD && !DtoX) && (currentHealth <= healthX); if (!game.global.preMapsActive && currentHealth > 0) { if (stayD && game.global.formation != 2) { From 946a70b398ae0f6df44a713d6c92c1a6f29503cf Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 12 Oct 2018 10:19:53 +0100 Subject: [PATCH 1559/3477] Update stance.js --- modules/stance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index a77d716d4..8218d0246 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -20,10 +20,10 @@ function autoStanceNew() { if (stayD && game.global.formation != 2) { setFormation(2); } - if (DtoX && game.global.formation != 0) { + else if (DtoX && game.global.formation != 0) { setFormation(0); } - if (XtoH && game.global.formation != 1) { + else if (XtoH && game.global.formation != 1) { setFormation(1); } } From 4cfdefdee13326f5d31103c0b46685b4978200f9 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 12 Oct 2018 10:30:24 +0100 Subject: [PATCH 1560/3477] Update stance.js --- modules/stance.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index 8218d0246..acde602b5 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -6,10 +6,15 @@ function autoStanceNew() { if (game.global.soldierHealth <= 0) return; if (!game.upgrades.Formations.done) return; - var baseHealth = getBattleStats("health"); - var baseHealthH = baseHealth*4; - var healthD = baseHealthH*0.875; - var healthX = baseHealthH*0.625; + var baseHealth; + if (game.global.formation == 0) + baseHealth = game.global.soldierHealthMax*4 + if (game.global.formation == 1) + baseHealth = game.global.soldierHealthMax + if (game.global.formation > 1) + baseHealth = game.global.soldierHealthMax*8 + var healthD = baseHealth*0.875; + var healthX = baseHealth*0.625; var currentHealth = game.global.soldierHealth; var Ice = (getEmpowerment() == 'Ice'); var stayD = ((currentHealth > healthD) || (Ice)); From e4e586b4f6533a14a590d878e2f5b627fcdc6f37 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 12 Oct 2018 10:32:39 +0100 Subject: [PATCH 1561/3477] Update stance.js --- modules/stance.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index acde602b5..fddde25ab 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -7,12 +7,10 @@ function autoStanceNew() { if (!game.upgrades.Formations.done) return; var baseHealth; - if (game.global.formation == 0) - baseHealth = game.global.soldierHealthMax*4 - if (game.global.formation == 1) - baseHealth = game.global.soldierHealthMax - if (game.global.formation > 1) - baseHealth = game.global.soldierHealthMax*8 + if (game.global.formation == 0) {baseHealth = game.global.soldierHealthMax*4;} + else if (game.global.formation == 1) {baseHealth = game.global.soldierHealthMax;} + else if (game.global.formation > 1) {baseHealth = game.global.soldierHealthMax*8;} + var healthD = baseHealth*0.875; var healthX = baseHealth*0.625; var currentHealth = game.global.soldierHealth; From a2a113e4d9a36ff08bed28e5732020a78781ea5b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 12 Oct 2018 10:38:33 +0100 Subject: [PATCH 1562/3477] Update stance.js --- modules/stance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/stance.js b/modules/stance.js index fddde25ab..1a7861488 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -11,8 +11,8 @@ function autoStanceNew() { else if (game.global.formation == 1) {baseHealth = game.global.soldierHealthMax;} else if (game.global.formation > 1) {baseHealth = game.global.soldierHealthMax*8;} - var healthD = baseHealth*0.875; - var healthX = baseHealth*0.625; + var healthD = baseHealth*0.9; + var healthX = baseHealth*0.7; var currentHealth = game.global.soldierHealth; var Ice = (getEmpowerment() == 'Ice'); var stayD = ((currentHealth > healthD) || (Ice)); From 60a2c1c8103174c7103c2afc2a899a63f8786782 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 17 Oct 2018 12:56:49 +0100 Subject: [PATCH 1563/3477] Update breedtimer.js --- modules/breedtimer.js | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/modules/breedtimer.js b/modules/breedtimer.js index 3377dacaf..6adf72d17 100644 --- a/modules/breedtimer.js +++ b/modules/breedtimer.js @@ -1,6 +1,57 @@ MODULES["breedtimer"] = {}; MODULES["breedtimer"].voidCheckPercent = 95; +function ATaddGeneticist(amount){ + if (game.global.challengeActive == "Corrupted") game.challenges.Corrupted.hiredGenes = true; + var workspaces = game.workspaces; + var owned = game.resources.trimps.owned - game.resources.trimps.employed; + if (owned < 1) return; + if (owned < amount) + amount = owned; + if (workspaces <= 0) { + if (!game.options.menu.gaFire.enabled) return; + //try to free up a workspace if possible + if (!freeWorkspace(amount)){ + amount = 1; + if (!freeWorkspace(amount)) + return; + } + } + var cost = game.jobs.Geneticist.cost.food; + var price = Math.floor((cost[0] * Math.pow(cost[1], game.jobs.Geneticist.owned)) * ((Math.pow(cost[1], amount) - 1) / (cost[1] - 1))); + if (game.resources.food.owned < price) { + price = getNextGeneticistCost(); + if (game.resources.food.owned < price) return; + amount = 1; + } + game.resources.food.owned -= price; + game.jobs.Geneticist.owned += amount; +} + +function ATremoveGeneticist(amount){ + if (game.jobs.Geneticist.owned < amount) return; + game.jobs.Geneticist.owned -= amount; +} + +function ATGA() { + var doubleGA = ((getPageSetting('ATGA')/game.global.breedTime*2)*100 < 80) + var quadGA = ((getPageSetting('ATGA')/game.global.breedTime*4)*100 < 80) + var decGA = ((getPageSetting('ATGA')/game.global.breedTime*10)*100 < 80) + while (game.global.breedTime < getPageSetting('ATGA') && game.resources.food.owned >= getNextGeneticistCost()) { + ATaddGeneticist(); + } + var toremove = 1; + if (doubleGA) + toremove = 2; + if (quadGA) + toremove = 4; + if (decGA) + toremove = 10; + while (game.global.breedTime > getPageSetting('ATGA')) { + ATremoveGeneticist(toremove); + } +} + var addbreedTimerInsideText; function addBreedingBoxTimers() { var breedbarContainer = document.querySelector('#trimps > div.row'); From c06a4f23952e2676a1d143a31b42c1a1884f1d32 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Fri, 19 Oct 2018 16:00:41 +0100 Subject: [PATCH 1564/3477] Update portal.js --- modules/portal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/portal.js b/modules/portal.js index 823f88a27..d22819530 100644 --- a/modules/portal.js +++ b/modules/portal.js @@ -219,7 +219,7 @@ function doPortal(challenge) { } else debug("C2 Runner: All C2s above Threshold!"); } - if (getPageSetting('AutoStartDaily') && c2done) { + if (getPageSetting('AutoStartDaily') == true && c2done) { selectChallenge('Daily'); checkCompleteDailies(); var lastUndone = -7; From 63d9e27c05eea6f7e7b8ae1bfaa4fc3f3c1a709b Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 24 Oct 2018 19:05:35 +0100 Subject: [PATCH 1565/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 12897bb69..44aa13bef 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -112,6 +112,7 @@ function mainLoop() { if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive == "Daily") dorangewindstack(); if ((getPageSetting('darmormagic') > 0 && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) || (getPageSetting('carmormagic') > 0 && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom'))) armormagic(); if (getPageSetting('mapc2hd') > 0 && game.global.runningChallengeSquared && game.global.challenge == "Mapology" && MODULES.maps.enoughDamageCutoff != getPageSetting('mapc2hd')) MODULES.maps.enoughDamageCutoff = getPageSetting('mapc2hd'); + if ((game.global.highestLevelCleared+1)<180) {debug("Zek is the best");} //Original From f28a781350a2091c17f432cb7b8c0c967f842ba6 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Wed, 24 Oct 2018 19:09:54 +0100 Subject: [PATCH 1566/3477] Update AutoTrimps2.js --- AutoTrimps2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 44aa13bef..177072c13 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -112,7 +112,7 @@ function mainLoop() { if (getPageSetting('dhardcorewind') >= 1 && game.global.world >= getPageSetting('dhardcorewind') && (game.global.world < getPageSetting('dhardcorewindmax') || getPageSetting('hardcorewindmax')<=0) && game.global.challengeActive == "Daily") dorangewindstack(); if ((getPageSetting('darmormagic') > 0 && typeof game.global.dailyChallenge.empower == 'undefined' && typeof game.global.dailyChallenge.bloodthirst == 'undefined' && (typeof game.global.dailyChallenge.bogged !== 'undefined' || typeof game.global.dailyChallenge.plague !== 'undefined' || typeof game.global.dailyChallenge.pressure !== 'undefined')) || (getPageSetting('carmormagic') > 0 && (game.global.challengeActive == 'Toxicity' || game.global.challengeActive == 'Nom'))) armormagic(); if (getPageSetting('mapc2hd') > 0 && game.global.runningChallengeSquared && game.global.challenge == "Mapology" && MODULES.maps.enoughDamageCutoff != getPageSetting('mapc2hd')) MODULES.maps.enoughDamageCutoff = getPageSetting('mapc2hd'); - if ((game.global.highestLevelCleared+1)<180) {debug("Zek is the best");} + //if ((game.global.highestLevelCleared+1)<180) {debug("Zek is the best");} //Original From d027de9d7bb4740d33b1376a3f15cb83bb0e4380 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 28 Oct 2018 08:35:09 +0000 Subject: [PATCH 1567/3477] Update SettingsGUI.js --- SettingsGUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SettingsGUI.js b/SettingsGUI.js index 09fd26d11..dd858c3e4 100644 --- a/SettingsGUI.js +++ b/SettingsGUI.js @@ -197,7 +197,7 @@ function initializeAllSettings() { //Line 3 createSetting('FirstGigastation', 'First Gigastation', 'How many warpstations to buy before your first gigastation', 'value', '20', null, "Buildings"); - createSetting('DeltaGigastation', 'Delta Gigastation', 'How many extra warpstations to buy for each gigastation. Supports decimal values. For example 2.5 will buy +2/+3/+2/+3...', 'value', '2', null, "Buildings"); + createSetting('DeltaGigastation', 'Delta Gigastation', 'YOU MUST HAVE BUY UPGRADES ENABLED!
    How many extra warpstations to buy for each gigastation. Supports decimal values. For example 2.5 will buy +2/+3/+2/+3...', 'value', '2', null, "Buildings"); createSetting('WarpstationWall3', 'Warpstation Wall', 'Conserves Metal. Only buys 1 Warpstation when you can afford X warpstations metal cost (at the first one\'s price, simple math). -1, 0, 1 = disable. In other words, only allows warps that cost less than 1/nth your currently owned metal. (to save metal for prestiges)', 'value', -1, null, 'Buildings'); createSetting('MaxNursery', 'Max Nurseries', 'Advanced. Recommend: -1 until you reach Magma (z230+)', 'value', '-1', null, "Buildings"); createSetting('NoNurseriesUntil', 'No Nurseries Until z', 'Builds Nurseries starting from this zone. -1 to build from when they are unlocked. ', 'value', '-1', null, 'Buildings'); From bcc2f7f80607c457f8ece4f191635b2569ff3859 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 28 Oct 2018 11:28:19 +0000 Subject: [PATCH 1568/3477] Update Graphs.js --- Graphs.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Graphs.js b/Graphs.js index 474cbac95..7a1edcebf 100644 --- a/Graphs.js +++ b/Graphs.js @@ -17,7 +17,7 @@ function addGraphNoteLabel(){debug("GOTCHA This feature is not actually written, function autoToggleGraph(){game.options.displayed&&toggleSettingsMenu();var a=document.getElementById('autoSettings');a&&'block'===a.style.display&&(a.style.display='none');var a=document.getElementById('autoTrimpsTabBarMenu');a&&'block'===a.style.display&&(a.style.display='none');var b=document.getElementById('graphParent');'block'===b.style.display?b.style.display='none':(b.style.display='block',setGraph())} function escapeATWindows(){var a=document.getElementById('tooltipDiv');if('none'!=a.style.display)return void cancelTooltip();game.options.displayed&&toggleSettingsMenu();var b=document.getElementById('autoSettings');'block'===b.style.display&&(b.style.display='none');var b=document.getElementById('autoTrimpsTabBarMenu');'block'===b.style.display&&(b.style.display='none');var c=document.getElementById('graphParent');'block'===c.style.display&&(c.style.display='none')}document.addEventListener('keydown',function(a){1!=game.options.menu.hotkeys.enabled||game.global.preMapsActive||game.global.lockTooltip||ctrlPressed||heirloomsShown||27!=a.keyCode||escapeATWindows()},!0); function getTotalDarkEssenceCount(){var a=10*(Math.pow(3,countPurchasedTalents())-1)/2;return game.global.essence+a} -function pushData(){debug("Starting Zone "+game.global.world,"graphs");var a=100*(game.stats.heliumHour.value()/(game.global.totalHeliumEarned-(game.global.heliumLeftover+game.resources.helium.owned))),b=100*(game.resources.helium.owned/(game.global.totalHeliumEarned-game.resources.helium.owned));allSaveData.push({totalPortals:game.global.totalPortals,heliumOwned:game.resources.helium.owned,currentTime:new Date().getTime(),portalTime:game.global.portalTime,world:game.global.world,challenge:game.global.challengeActive,voids:game.global.totalVoidMaps,heirlooms:{value:game.stats.totalHeirlooms.value,valueTotal:game.stats.totalHeirlooms.valueTotal},nullifium:recycleAllExtraHeirlooms(!0),gigas:game.upgrades.Gigastation.done,gigasleft:game.upgrades.Gigastation.allowed-game.upgrades.Gigastation.done,trimps:game.resources.trimps.realMax(),coord:game.upgrades.Coordination.done,lastwarp:game.global.lastWarp,essence:getTotalDarkEssenceCount(),hehr:a.toFixed(4),helife:b.toFixed(4),overkill:GraphsVars.OVKcellsInWorld,zonetime:GraphsVars.ZoneStartTime,mapbonus:GraphsVars.MapBonus,magmite:game.global.magmite,magmamancers:game.jobs.Magmamancer.owned,fluffy:game.global.fluffyExp,nursery:game.buildings.Nursery.purchased,windstacks:game.empowerments.Wind.currentDebuffPower}),clearData(15),safeSetItems("allSaveData",JSON.stringify(allSaveData))} +function pushData(){debug("Starting Zone "+game.global.world,"graphs");var a=100*(game.stats.heliumHour.value()/(game.global.totalHeliumEarned-(game.global.heliumLeftover+game.resources.helium.owned))),b=100*(game.resources.helium.owned/(game.global.totalHeliumEarned-game.resources.helium.owned));allSaveData.push({totalPortals:game.global.totalPortals,heliumOwned:game.resources.helium.owned,currentTime:new Date().getTime(),portalTime:game.global.portalTime,world:game.global.world,challenge:game.global.challengeActive,voids:game.global.totalVoidMaps,heirlooms:{value:game.stats.totalHeirlooms.value,valueTotal:game.stats.totalHeirlooms.valueTotal},nullifium:recycleAllExtraHeirlooms(!0),gigas:game.upgrades.Gigastation.done,gigasleft:game.upgrades.Gigastation.allowed-game.upgrades.Gigastation.done,trimps:game.resources.trimps.realMax(),coord:game.upgrades.Coordination.done,lastwarp:game.global.lastWarp,essence:getTotalDarkEssenceCount(),hehr:a.toFixed(4),helife:b.toFixed(4),overkill:GraphsVars.OVKcellsInWorld,zonetime:GraphsVars.ZoneStartTime,mapbonus:GraphsVars.MapBonus,magmite:game.global.magmite,magmamancers:game.jobs.Magmamancer.owned,fluffy:game.global.fluffyExp,nursery:game.buildings.Nursery.purchased,sphehr:Math.floor((game.resources.helium.owned)/((new Date().getTime()-game.global.portalTime)/3600000)),windstacks:game.empowerments.Wind.currentDebuffPower}),clearData(15),safeSetItems("allSaveData",JSON.stringify(allSaveData))} 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}),safeSetItems('graphAnal',JSON.stringify(graphAnal))} trackHourlyGraphAnalytics(); @@ -539,6 +539,13 @@ function setGraphData(graph) { yType = 'Linear'; xminFloor = 236; break; + case 'Helium Sp': + graphData = allPurposeGraph('sphehr', true, "number"); + title = 'Sp+ He/Hr'; + xTitle = 'Zone'; + yTitle = 'He/Hr'; + yType = 'Linear'; + break; case 'Fluffy XP': graphData = allPurposeGraph('fluffy', true, "number"); title = 'Fluffy XP (Lifetime Total)'; From d182cbe2a7d71c61404fd5e51adc5cb8c62c7944 Mon Sep 17 00:00:00 2001 From: Zeker0 Date: Sun, 28 Oct 2018 11:31:31 +0000 Subject: [PATCH 1569/3477] Update Graphs.js --- Graphs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Graphs.js b/Graphs.js index 7a1edcebf..6d485cef0 100644 --- a/Graphs.js +++ b/Graphs.js @@ -1,4 +1,4 @@ -var allSaveData=[],graphData=[],tmpGraphData=JSON.parse(localStorage.getItem('allSaveData'));null!==tmpGraphData&&(console.log('Graphs: Found allSaveData (portal runs data). Yay!'),allSaveData=tmpGraphData),MODULES.graphs={},MODULES.graphs.useDarkAlways=!1;var head=document.getElementsByTagName('head')[0],chartscript=document.createElement('script');chartscript.type='text/javascript',chartscript.src='https://code.highcharts.com/highcharts.js',head.appendChild(chartscript);var newItem=document.createElement('TD');newItem.appendChild(document.createTextNode('Graphs')),newItem.setAttribute('class','btn btn-default'),newItem.setAttribute('onclick','autoToggleGraph(); drawGraph();');var settingbarRow=document.getElementById('settingsTable').firstElementChild.firstElementChild;settingbarRow.insertBefore(newItem,settingbarRow.childNodes[10]),document.getElementById('settingsRow').innerHTML+='