From 3b025f15499466ae7ad371b800e5b4dd7b0ff465 Mon Sep 17 00:00:00 2001 From: gen BTC Date: Sun, 25 Mar 2018 21:29:21 -0400 Subject: [PATCH] Readme & AutoMaps MapAtZone --- AutoTrimps2.js | 11 ++++++----- modules/maps.js | 15 +++++++++------ modules/stance.js | 3 ++- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/AutoTrimps2.js b/AutoTrimps2.js index 08cfc0b5d..a18c44254 100644 --- a/AutoTrimps2.js +++ b/AutoTrimps2.js @@ -48,10 +48,11 @@ function initializeAutoTrimps() { var changelogList = []; //changelogList.push({date: " ", version: " ", description: "", isNew: true}); //TEMPLATE -changelogList.push({date: "3/23", version: "v2.1.6.9", description: "AutoMaps setting combined with RunUniqueMaps. Be advised, the variable has changed from boolean false,true to a value 0,1,2. Settings file has been migrated as such. New: Map SpecialMod is extremely beta and can break your game. 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/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/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/24", version: "v2.1.6.5-stable", description: "Set up Stable Repository for the faint of heart. Equipment changes, see README at GitHub and check commit history; Sorry for any breakages.", isNew: true}); +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: "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/7", version: "v2.1.6.5", description: "Save/Reload Profiles in Import/Export. Magmamancer graph. Magmite/Magma Spam disableable.", isNew: false}); @@ -69,8 +70,8 @@ function printChangelog() { }; var footer = 'Ongoing Development - Report any bugs/problems please!\ -
Talk with the dev: genr8_#8163 @ AutoTrimps Discord Channel\ -
Or check the commit history (if you want).' +
Talk with the dev: genr8_#8163 @ AutoTrimps Discord Channel\ +
SeeReadMe 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/modules/maps.js b/modules/maps.js index 604274227..5bc957492 100644 --- a/modules/maps.js +++ b/modules/maps.js @@ -46,6 +46,7 @@ var preSpireFarming = false; var spireMapBonusFarming = false; var spireTime = 0; var doMaxMapBonus = false; +var vanillaMapatZone = false; //AutoMap - function originally created by Belaith (in 1971) //anything/everything to do with maps. @@ -227,7 +228,6 @@ function autoMap() { if (ourBaseDamage > 0){ shouldDoMaps = !enoughDamage || shouldFarm || scryerStuck; } - //Check our graph history and - Estimate = The zone should take around this long in milliseconds. mapTimeEstimate = mapTimeEstimater(); @@ -339,11 +339,14 @@ function autoMap() { } //MaxMapBonusAfterZone (idea from awnv) var maxMapBonusZ = getPageSetting('MaxMapBonusAfterZone'); - doMaxMapBonus = false; - if (maxMapBonusZ >= 0 && game.global.mapBonus < customVars.maxMapBonusAfterZ && game.global.world >= maxMapBonusZ) { + doMaxMapBonus = (maxMapBonusZ >= 0 && game.global.mapBonus < customVars.maxMapBonusAfterZ && game.global.world >= maxMapBonusZ); + if (doMaxMapBonus) shouldDoMaps = true; - doMaxMapBonus = 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); + if (vanillaMapatZone) + 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 @@ -573,7 +576,7 @@ function autoMap() { //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; - if (selectedMap == game.global.currentMapId && (!getCurrentMapObject().noRecycle && (doDefaultMapBonus || doMaxMapBonus || shouldFarm || stackingTox || needPrestige || shouldDoSpireMaps) || repeatBionics)) { + 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 if (!game.global.repeatMap) { diff --git a/modules/stance.js b/modules/stance.js index 4b02d964d..22e902c94 100644 --- a/modules/stance.js +++ b/modules/stance.js @@ -44,8 +44,9 @@ function calcBaseDamageinX() { //S stance is accounted for (combination of all the above's else clauses) } +//goes to battlecalc.js which came from Trimps "updates.js" line 1103 function calcBaseDamageinX2() { - //baseDamage - calcOurDmg goes to battlecalc.js which came from Trimps "updates.js" line 1103 + //baseDamage baseDamage = calcOurDmg(game.global.soldierCurrentAttack,false); //baseBlock baseBlock = getBattleStats("block");