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

Fix upgrade bar not displaying #908

Browse Source
This commit is contained in:
Daniël van Noord
2021-07-25 14:15:16 +02:00
parent f59972892b
commit 9996e59024
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/CookieMonsterDev.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/CookieMonsterDev.js.map vendored
View File

File diff suppressed because one or more lines are too long

10
src/Config/Toggles/ToggleUpgradeBarAndColour.js
View File

@@ -2,14 +2,16 @@ import UpdateUpgrades from '../../Disp/BuildingsUpgrades/Upgrades';
/**
* This function toggles the upgrade bar and the colours of upgrades
* It is called by a change in CM.Options.UpBarColor
* It is called by a change in CM.Options.UpBarColour
*/
export default function ToggleUpgradeBarAndColor() {
if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpBarColor === 1) {
export default function ToggleUpgradeBarAndColour() {
if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpBarColour === 1) {
// Colours and bar on
l('CMUpgradeBar').style.display = '';
UpdateUpgrades();
} else if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpBarColor === 2) {
} else if (
Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpBarColour === 2
) {
// Colours on and bar off
l('CMUpgradeBar').style.display = 'none';
UpdateUpgrades();

18
test/t_Config/t_Toggles/t_ToggleUpgradeBarAndColour.js
View File

@@ -2,36 +2,36 @@ import { before, beforeEach, describe, it } from 'mocha';
import { assert } from 'chai';
import { l, Game } from '../../GlobalsForTesting';
import ToggleUpgradeBarAndColor from '../../../src/Config/Toggles/ToggleUpgradeBarAndColour';
import ToggleUpgradeBarAndColour from '../../../src/Config/Toggles/ToggleUpgradeBarAndColour';
describe('ToggleUpgradeBarAndColor', () => {
describe('ToggleUpgradeBarAndColour', () => {
global.l = l;
global.Game = Game;
beforeEach(() => {
global.domids = {};
ToggleUpgradeBarAndColor();
ToggleUpgradeBarAndColour();
});
describe('UpBarColor = 0', () => {
describe('UpBarColour = 0', () => {
before(() => {
Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpBarColor = 0;
Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpBarColour = 0;
});
it('Toggle style correctly', () => {
assert.equal(domids.CMUpgradeBar.style.display, 'none'); // eslint-disable-line no-undef
});
});
describe('UpBarColor = 1', () => {
describe('UpBarColour = 1', () => {
before(() => {
Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpBarColor = 1;
Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpBarColour = 1;
});
it('Toggle style correctly', () => {
assert.equal(domids.CMUpgradeBar.style.display, ''); // eslint-disable-line no-undef
});
});
describe('UpBarColor = 2', () => {
describe('UpBarColour = 2', () => {
before(() => {
Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpBarColor = 2;
Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.UpBarColour = 2;
});
it('Toggle style correctly', () => {
assert.equal(domids.CMUpgradeBar.style.display, 'none'); // eslint-disable-line no-undef