david/CookieMonster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash on selecting sell all #620

Browse Source
This commit is contained in:
Daniël van Noord
2021-02-25 22:50:06 +01:00
parent 61a30c704f
commit 6ca414ed17
3 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CookieMonster.js
View File

File diff suppressed because one or more lines are too long

4
src/Cache.js
View File

@@ -684,7 +684,7 @@ CM.Cache.CacheBuildingsPP = function () {
if (typeof CM.Options.PPExcludeTop === 'undefined') CM.Options.PPExcludeTop = 0; // Otherwise breaks during initialization
// Calculate PP and colors when compared to purchase of optimal building in single-purchase mode
if (CM.Options.ColorPPBulkMode === 0) {
if (CM.Options.ColorPPBulkMode === 0 && Game.buyMode > 0) {
for (const i of Object.keys(CM.Cache.Objects1)) {
if (Game.cookiesPs) {
CM.Cache.Objects1[i].pp = (Math.max(Game.Objects[i].getPrice() - (Game.cookies + CM.Disp.GetWrinkConfigBank()), 0) / Game.cookiesPs) + (Game.Objects[i].getPrice() / CM.Cache.Objects1[i].bonus);
@@ -714,7 +714,7 @@ CM.Cache.CacheBuildingsPP = function () {
// Calculate PP of bulk-buy modes
CM.Cache.CacheBuildingsBulkPP('Objects10');
CM.Cache.CacheBuildingsBulkPP('Objects100');
} else {
} else if (Game.buyMode > 0) {
// Calculate PP and colors when compared to purchase of selected bulk mode
const target = `Objects${Game.buyBulk}`;
for (const i of Object.keys(CM.Cache[target])) {

30
src/Disp.js
View File

@@ -374,10 +374,15 @@ CM.Disp.CreateBotBar = function () {
* It is called by CM.Disp.Draw()
*/
CM.Disp.UpdateBotBar = function () {
if (CM.Options.BotBar === 1 && CM.Cache.Objects1) {
if (CM.Options.BotBar === 1 && CM.Cache.Objects1 && Game.buyMode === 1) {
let count = 0;
for (const i of Object.keys(CM.Cache.Objects1)) {
const target = `Objects${Game.buyBulk}`;
let target = `Objects${Game.buyBulk}`;
if (Game.buyMode === 1) {
CM.Disp.LastTargetBotBar = target;
} else {
target = CM.Disp.LastTargetBotBar;
}
count++;
CM.Disp.BotBar.firstChild.firstChild.childNodes[0].childNodes[count].childNodes[1].textContent = Game.Objects[i].amount;
CM.Disp.BotBar.firstChild.firstChild.childNodes[1].childNodes[count].textContent = Beautify(CM.Cache[target][i].bonus, 2);
@@ -670,7 +675,12 @@ CM.Disp.UpdateBotTimerBarPosition = function () {
* And by changes in CM.Options.BuildColor, CM.Options.SortBuild & CM.Data.Config.BulkBuildColor
*/
CM.Disp.UpdateBuildings = function () {
const target = `Objects${Game.buyBulk}`;
let target = `Objects${Game.buyBulk}`;
if (Game.buyMode === 1) {
CM.Disp.LastTargetBuildings = target;
} else {
target = CM.Disp.LastTargetBuildings;
}
if (Game.buyMode === 1) {
if (CM.Options.BuildColor === 1) {
for (const i of Object.keys(CM.Cache[target])) {
@@ -1388,7 +1398,12 @@ CM.Disp.UpdateTooltipBuilding = function () {
const tooltipBox = l('CMTooltipBorder');
CM.Disp.TooltipCreateCalculationSection(tooltipBox);
const target = `Objects${Game.buyBulk}`;
let target = `Objects${Game.buyBulk}`;
if (Game.buyMode === 1) {
CM.Disp.LastTargetTooltipBuilding = target;
} else {
target = CM.Disp.LastTargetTooltipBuilding;
}
CM.Disp.TooltipPrice = Game.Objects[CM.Disp.tooltipName].bulkPrice;
CM.Disp.TooltipBonusIncome = CM.Cache[target][CM.Disp.tooltipName].bonus;
@@ -2954,3 +2969,10 @@ CM.Disp.TooltipWrinkler = -1;
* Used to store the number of cookies to be displayed in the tab-title
*/
CM.Disp.Title = '';
/**
* These are variables used to create various displays when the game is loaded on the "sell all" screen
*/
CM.Disp.LastTargetBotBar = 1;
CM.Disp.LastTargetBuildings = 1;
CM.Disp.LastTargetTooltipBuilding = 1;