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

[Automated] Merge dev into gh-pages

Browse Source
This commit is contained in:
github-actions[bot]
2021-06-20 20:36:12 +00:00
committed by GitHub
parent b06ff269a1 1c1afb6880
commit 96b55fb77c
4 changed files with 6 additions and 6 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

2
src/Disp/Initialization/CreateWrinklerButton.js
View File

@@ -18,7 +18,7 @@ export default function CreateWrinklerButtons() {
}; };
popAllA.onmouseover = function () { popAllA.onmouseover = function () {
Game.tooltip.dynamic = 1; Game.tooltip.dynamic = 1;
Game.tooltip.draw(this, () => CreateTooltip('wb', 'PopAll'), 'this'); Game.tooltip.draw(this, () => CreateTooltip('wb', 'PopAllNormal'), 'this');
Game.tooltip.wobble(); Game.tooltip.wobble();
}; };
l('sectionLeftExtra').children[0].append(popAllA); l('sectionLeftExtra').children[0].append(popAllA);

6
src/Disp/Tooltips/TypesOfTooltips/WrinklerButton.js
View File

@@ -1,4 +1,4 @@
import { CacheWrinklersFattest, CacheWrinklersTotal } from '../../../Cache/VariablesAndData'; import { CacheWrinklersFattest, CacheWrinklersNormal } from '../../../Cache/VariablesAndData';
import Beautify from '../../BeautifyAndFormatting/Beautify'; import Beautify from '../../BeautifyAndFormatting/Beautify';
import { TooltipName } from '../../VariablesAndData'; import { TooltipName } from '../../VariablesAndData';
import * as Create from '../CreateTooltip'; import * as Create from '../CreateTooltip';
@@ -13,8 +13,8 @@ export default function WrinklerButton() {
const WrinklerReward = document.createElement('div'); const WrinklerReward = document.createElement('div');
WrinklerReward.id = 'CMWrinklerReward'; WrinklerReward.id = 'CMWrinklerReward';
if (TooltipName === 'PopAll') { if (TooltipName === 'PopAllNormal') {
WrinklerReward.textContent = Beautify(CacheWrinklersTotal); WrinklerReward.textContent = Beautify(CacheWrinklersNormal);
} else if (TooltipName === 'PopFattest') { } else if (TooltipName === 'PopFattest') {
WrinklerReward.textContent = Beautify(CacheWrinklersFattest[0]); WrinklerReward.textContent = Beautify(CacheWrinklersFattest[0]);
} }