diff --git a/config.js b/config.js index 47e182e8..f3adb1ec 100644 --- a/config.js +++ b/config.js @@ -3029,12 +3029,16 @@ var toReturn = { get tooltip(){ var extra = (this.levelTemp) ? this.levelTemp : 0; var text = "Huffy has learned much from Assaulting his Spire, now store some of that knowledge in your Portal! Gain " + (this.baseStats * 100) + "% attack and health plus another " + (this.statsPerLevel * 100) + "% per Spire Assault level cleared, compounding per perk level. " - if (this.radLevel + extra > 0) text += "

You are currently gaining " + formatMultAsPercent(this.getMult(0, extra), true) + " attack and health. Your next Spire Assault level will increase this bonus to " + formatMultAsPercent(this.getMult(1, extra), true) + ", or your next perk level will increase this bonus to " + formatMultAsPercent(this.getMult(0, 1 + extra), true) + "."; + if (this.radLevel + extra > 0){ + text += "

You are currently gaining " + formatMultAsPercent(this.getMult(0, extra), true) + " attack and health." + if (autoBattle.levelsCleared() == 160) text += " Your next perk level will increase this bonus to " + formatMultAsPercent(this.getMult(0, 1 + extra), true) + "."; + else text += " Your next Spire Assault level will increase this bonus to " + formatMultAsPercent(this.getMult(1, extra), true) + ", or your next perk level will increase this bonus to " + formatMultAsPercent(this.getMult(0, 1 + extra), true) + "."; + } return text; }, getMult: function(addAb, addLev){ var level = this.radLevel; - var abLevel = autoBattle.maxEnemyLevel - 1; + var abLevel = autoBattle.levelsCleared(); if (addAb) abLevel += addAb; if (addLev) level += addLev; var base = this.baseStats + (this.statsPerLevel * abLevel); diff --git a/main.js b/main.js index 852eda92..4f12123b 100644 --- a/main.js +++ b/main.js @@ -18888,7 +18888,7 @@ var Fluffy = { reward *= (1 + (knowBonus / 100)); } if (autoBattle.oneTimers.Battlescruff.owned && game.global.universe == 2){ - reward *= (1 + ((autoBattle.maxEnemyLevel - 1) / 50)); + reward *= (1 + ((autoBattle.levelsCleared()) / 50)); } if (game.global.universe == 2 && u2Mutations.tree.Scruffy.purchased){ reward *= 1.3; @@ -19055,7 +19055,7 @@ var Fluffy = { elem.innerHTML = 'From Nurture. Increases Exp gain by 10% (compounding) per constructed Laboratory. Currently granting ' + prettify(game.buildings.Laboratory.getExpMult()) + 'x.'; return; case "battlescruff": - elem.innerHTML = 'From the Battlescruff Spire Assault reward. Increases Scruffy XP gained by 2% per level cleared, currently granting ' + prettify(1 + ((autoBattle.maxEnemyLevel - 1) / 50)) + 'x.'; + elem.innerHTML = 'From the Battlescruff Spire Assault reward. Increases Scruffy XP gained by 2% per level cleared, currently granting ' + prettify(1 + ((autoBattle.levelsCleared()) / 50)) + 'x.'; return; case "mutators": elem.innerHTML = 'From Mutators. Currently granting 1.3x.'; @@ -19364,14 +19364,14 @@ var Fluffy = { }, SADailies: { get description(){ - var cleared = autoBattle.maxEnemyLevel - 1; + var cleared = autoBattle.levelsCleared(); return "Your Trimps gain +4% Attack and +0.25% Crit Chance per Spire Assault level cleared while on a Daily Challenge. You have cleared " + cleared + " SA levels, granting +" + prettify((this.attackMod() - 1) * 100) + "% Attack and +" + prettify(this.critChance() * 100) + "% Crit Chance on Daily Challenges." }, critChance: function(){ - return (0.0025 * (autoBattle.maxEnemyLevel - 1)); + return (0.0025 * (autoBattle.levelsCleared())); }, attackMod: function(){ - return 1 + (0.04 * (autoBattle.maxEnemyLevel - 1)); + return 1 + (0.04 * (autoBattle.levelsCleared())); } }, bigSeeds: { diff --git a/objects.js b/objects.js index 18b88c89..e822570a 100644 --- a/objects.js +++ b/objects.js @@ -1014,6 +1014,10 @@ var autoBattle = { if (setting.onToggle) setting.onToggle(); this.popup(true, false, true); }, + levelsCleared: function(){ + if (this.canSeal) return 160; + return this.maxEnemyLevel - 1; + }, settings: { loadHide: { enabled: 1, @@ -2809,7 +2813,7 @@ var autoBattle = { }, owned: false, getMult: function(){ - return 1 + (0.05 * (autoBattle.maxEnemyLevel - 1)); + return 1 + (0.05 * (autoBattle.levelsCleared())); }, requiredItems: 7 }, @@ -2837,7 +2841,7 @@ var autoBattle = { }, owned: false, getMult: function(){ - return Math.pow(0.99, autoBattle.maxEnemyLevel - 1); + return Math.pow(0.99, autoBattle.levelsCleared()); }, requiredItems: 21 }, @@ -2851,7 +2855,7 @@ var autoBattle = { owned: false, requiredItems: 28, getHubs: function(){ - return 2 + Math.floor((autoBattle.maxEnemyLevel - 1) / 30); + return 2 + Math.floor(autoBattle.levelsCleared() / 30); } }, Dusty_Tome: { @@ -2869,13 +2873,13 @@ var autoBattle = { owned: false, requiredItems: 36, getMult: function(){ - return 1 + ((autoBattle.maxEnemyLevel - 1) * 0.005); + return 1 + (autoBattle.levelsCleared() * 0.005); } }, Suprism: { description: "Increases Prismatic Shield by 3% per Spire Assault level cleared.", getMult: function(){ - return ((autoBattle.maxEnemyLevel -1) * 0.03); + return (autoBattle.levelsCleared() * 0.03); }, owned: false, requiredItems: 39, @@ -3450,7 +3454,7 @@ var autoBattle = { } amt += this.trimp.dustMult; if (this.oneTimers.Dusty_Tome.owned){ - amt *= (1 + (0.05 * (this.maxEnemyLevel - 1))); + amt *= (1 + (0.05 * (this.levelsCleared()))); } if (u2Mutations.tree.Dust.purchased){ var mutMult = 1.25; diff --git a/updates.js b/updates.js index 212be55e..4867656d 100644 --- a/updates.js +++ b/updates.js @@ -2797,7 +2797,7 @@ function getBattleStatBd(what) { if (autoBattle.oneTimers.Suprism.owned){ var bonus = autoBattle.oneTimers.Suprism.getMult(); currentCalc += bonus; - textString += "Suprism3%" + (autoBattle.maxEnemyLevel - 1) + "" + prettify(bonus * 100) + "%" + Math.round(currentCalc * 100) + "%"; + textString += "Suprism3%" + (autoBattle.levelsCleared()) + "" + prettify(bonus * 100) + "%" + Math.round(currentCalc * 100) + "%"; } if (Fluffy.isRewardActive('shieldlayer')){ var layers = (Fluffy.isRewardActive('shieldlayer') + 1); @@ -3083,12 +3083,12 @@ function getBattleStatBd(what) { if ((what == "attack" || what == "health") && getPerkLevel("Championism")){ var mult = game.portal.Championism.getMult(); currentCalc *= mult; - textString += "Championism" + (1 + (0.5 * (autoBattle.maxEnemyLevel - 1))) + "%" + getPerkLevel("Championism") + "" + formatMultAsPercent(mult) + "" + prettify(currentCalc) + "" + ((what == "attack") ? getFluctuation(currentCalc, minFluct, maxFluct) : "") + ""; + textString += "Championism" + (1 + (0.5 * (autoBattle.levelsCleared()))) + "%" + getPerkLevel("Championism") + "" + formatMultAsPercent(mult) + "" + prettify(currentCalc) + "" + ((what == "attack") ? getFluctuation(currentCalc, minFluct, maxFluct) : "") + ""; } if (what == "attack" && Fluffy.isRewardActive('SADailies') && game.global.challengeActive == "Daily"){ var mult = Fluffy.rewardConfig.SADailies.attackMod(); currentCalc *= mult; - textString += "Scruffy Dailies+ 4%" + (autoBattle.maxEnemyLevel - 1) + "+ " + prettify((mult - 1) * 100) + "%" + prettify(currentCalc) + "" + getFluctuation(currentCalc, minFluct, maxFluct) + "" + textString += "Scruffy Dailies+ 4%" + (autoBattle.levelsCleared()) + "+ " + prettify((mult - 1) * 100) + "%" + prettify(currentCalc) + "" + getFluctuation(currentCalc, minFluct, maxFluct) + "" } if ((what == "attack" || what == "health") && game.global.challengeActive == "Alchemy" && game.global.universe == 2){ var mult = alchObj.getPotionEffect("Potion of Strength");