Skip to content

Fix bugtracker issue 71 #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bugtracker issue 71 #249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13579,7 +13579,7 @@ function getCurrentDailyDescription(){
returnText += "<li>" + dailyModifiers[item].description(daily[item].strength) + "</li>";
}
var portalUni = (game.global.viewingUpgrades) ? game.global.universe : portalUniverse;
returnText += "</ul>Challenge has no end point, and grants an <u><b>additional " + prettify(getDailyHeliumValue(countDailyWeight())) + "%</b></u> of all " + getDailyRewardText(portalUni) + " earned before finishing.";
returnText += "</ul>Challenge has no end point, and grants an <u><b>additional " + prettify(getDailyHeliumValue(countDailyWeight(), portalUni)) + "%</b></u> of all " + getDailyRewardText(portalUni) + " earned before finishing.";
return returnText;
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -18604,4 +18639,4 @@ document.getElementById('mapLevelInput').addEventListener('keydown', function(e)
if (e.which === 38 || e.which === 40) {
e.preventDefault();
}
});
});