From 0f3b3c66b046e443ab99d49ad175538c2e8d45bc Mon Sep 17 00:00:00 2001 From: Dr-Nye Date: Mon, 1 Aug 2022 07:25:23 +0200 Subject: [PATCH] Update main.js --- main.js | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/main.js b/main.js index 155bc621..e2f80842 100644 --- a/main.js +++ b/main.js @@ -13579,7 +13579,7 @@ function getCurrentDailyDescription(){ returnText += "
  • " + dailyModifiers[item].description(daily[item].strength) + "
  • "; } var portalUni = (game.global.viewingUpgrades) ? game.global.universe : portalUniverse; - returnText += "Challenge has no end point, and grants an additional " + prettify(getDailyHeliumValue(countDailyWeight())) + "% of all " + getDailyRewardText(portalUni) + " earned before finishing."; + returnText += "Challenge has no end point, and grants an additional " + prettify(getDailyHeliumValue(countDailyWeight(), portalUni)) + "% of all " + getDailyRewardText(portalUni) + " earned before finishing."; return returnText; } @@ -13619,6 +13619,41 @@ function getDailyHeliumValue(weight){ return value; } +function getDailyHeliumValue(weight, portalUni){ + //min 2, max 6 + var value = 75 * weight + 20; + if (value < 100) value = 100; + else if (value > 500) value = 500; + + //gives checks wrong perk if viewing cross-universe + //if (Fluffy.isRewardActive("dailies")) value += 100; + //this is what needs to be adressed + + var hasPetBonus = false; + if(portalUni == 2){ + var scruffXP = game.global.fluffyExp2 / 1000; + var scruffLvl = Math.log(scruffXP) / Math.log(4); + if(game.talents.fluffyAbility.purchased){scruffLvl = scruffLvl+1;} + if(scruffLvl >= 9){hasPetBonus = true;} + } + else + { + var fluffyPrestigeCount = game.global.fluffyPrestige; + var fluffXP = game.global.fluffyExp / (1000 * 5^fluffyPrestigeCount); + var fluffLvl = Math.log(fluffXP) / Math.log(4); + if(game.talents.fluffyAbility.purchased){fluffLvl = fluffLvl+1;} + var fluffLvl = fluffLvl + fluffyPrestigeCount; + if(fluffLvl >= 11){hasPetBonus = true;} + } + if(hasPetBonus){value = value + 100;} + + + + return value; +} + + + function handleFinishDailyBtn(){ var display = (game.global.challengeActive == "Daily" && !game.global.mapsActive && !game.global.preMapsActive) ? "block" : "none"; document.getElementById('finishDailyBtnContainer').style.display = display; @@ -18604,4 +18639,4 @@ document.getElementById('mapLevelInput').addEventListener('keydown', function(e) if (e.which === 38 || e.which === 40) { e.preventDefault(); } -}); \ No newline at end of file +});