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

Merge pull request #665 from DanielNoord/fix/hotfix

Browse Source 
Hotfix
This commit is contained in:
Daniël van Noord
2021-03-14 19:37:48 +01:00
committed by GitHub
parent 3e07541fd5 2f34b26602
commit f85cde5fea
6 changed files with 11 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

2
dist/CookieMonster.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/CookieMonster.js.map vendored
View File

File diff suppressed because one or more lines are too long

3
package.json
View File

@@ -11,8 +11,9 @@
"Orteil"
],
"scripts": {
"copy-file": "cp dist/CookieMonster.js CookieMonster.js",
"eslint_src": "eslint src",
"build": "run-s eslint_src pack_prod remove_comment",
"build": "run-s eslint_src pack_prod remove_comment copy-file",
"build_test": "run-s pack_dev",
"pack_prod": "webpack --env production",
"pack_dev": "webpack",

6
src/Disp/BeautifyAndFormatting/BeautifyFormatting.js
View File

@@ -74,13 +74,15 @@ export function Beautify(num, floats, forced) {
}
}
if (answer === '') {
console.log(`Could not beautify number with CM.Disp.Beautify: ${num}`);
console.log(
`Could not beautify number with Cookie Monster Beautify: ${num}`,
);
answer = BackupFunctions.Beautify(num, floats);
}
if (CMOptions.ScaleSeparator) answer = answer.replace('.', ',');
return answer;
}
console.log(`Could not beautify number with CM.Disp.Beautify: ${num}`);
console.log(`Could not beautify number with Cookie Monster Beautify: ${num}`);
return BackupFunctions.Beautify(num, floats);
}

3
src/Main/CheckStates/Ticker.js
View File

@@ -1,3 +1,4 @@
import { CMOptions } from '../../Config/VariablesAndData';
import Flash from '../../Disp/Notifications/Flash';
import Notification from '../../Disp/Notifications/Notification';
import PlaySound from '../../Disp/Notifications/Sound';
@@ -16,7 +17,7 @@ export default function CheckTickerFortune() {
Game.TickerEffect && Game.TickerEffect.type === 'fortune';
if (LastTickerFortuneState) {
Flash(3, 'FortuneFlash');
PlaySound(CM.Options.FortuneSoundURL, 'FortuneSound', 'FortuneVolume');
PlaySound(CMOptions.FortuneSoundURL, 'FortuneSound', 'FortuneVolume');
Notification(
'FortuneNotification',
'Fortune Cookie found',