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

cleaned-up whitespace formatting to match the rest (tabs instead of spaces)

Browse Source
This commit is contained in:
Eric Olsen
2019-10-05 00:29:57 -06:00
parent 836804b3f9
commit 431b1e6cd0
4 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
CookieMonster.js
View File

@@ -546,7 +546,7 @@ CM.ConfigData.FortuneFlash = {label: ['Fortune Cookie Flash OFF', 'Fortune Cooki
CM.ConfigData.FortuneSound = {label: ['Fortune Cookie Sound OFF', 'Fortune Cookie Sound ON'], desc: 'Play a sound on Fortune Cookie', toggle: true};
CM.ConfigData.FortuneVolume = {label: [], desc: 'Volume of the Fortune Cookie sound'};
for (var i = 0; i < 101; i++) {
CM.ConfigData.FortuneVolume.label[i] = i + '%';
CM.ConfigData.FortuneVolume.label[i] = i + '%';
}
CM.ConfigData.FortuneSoundURL = {label: 'Fortune Cookie Sound URL:', desc: 'URL of the sound to be played when the Ticker has a Fortune Cookie'};
CM.ConfigData.SeaFlash = {label: ['Season Special Flash OFF', 'Season Special Flash ON'], desc: 'Flash screen on Season Popup', toggle: true};
@@ -1457,13 +1457,13 @@ CM.Disp.CheckGoldenCookie = function() {
}
CM.Disp.CheckTickerFortune = function() {
if (CM.Disp.lastTickerFortuneState != (Game.TickerEffect && Game.TickerEffect.type == 'fortune')) {
CM.Disp.lastTickerFortuneState = (Game.TickerEffect && Game.TickerEffect.type == 'fortune');
if (CM.Disp.lastTickerFortuneState) {
CM.Disp.Flash(3, 'FortuneFlash');
CM.Disp.PlaySound(CM.Config.FortuneSoundURL, 'FortuneSound', 'FortuneVolume');
}
}
if (CM.Disp.lastTickerFortuneState != (Game.TickerEffect && Game.TickerEffect.type == 'fortune')) {
CM.Disp.lastTickerFortuneState = (Game.TickerEffect && Game.TickerEffect.type == 'fortune');
if (CM.Disp.lastTickerFortuneState) {
CM.Disp.Flash(3, 'FortuneFlash');
CM.Disp.PlaySound(CM.Config.FortuneSoundURL, 'FortuneSound', 'FortuneVolume');
}
}
}
CM.Disp.CheckSeasonPopup = function() {
@@ -1709,9 +1709,9 @@ CM.Disp.AddMenuPref = function(title) {
frag.appendChild(listing('GCTimer'));
frag.appendChild(listing('Favicon'));
frag.appendChild(listing('FortuneFlash'));
frag.appendChild(listing('FortuneSound'));
frag.appendChild(vol('FortuneVolume'));
frag.appendChild(url('FortuneSoundURL'));
frag.appendChild(listing('FortuneSound'));
frag.appendChild(vol('FortuneVolume'));
frag.appendChild(url('FortuneSoundURL'));
frag.appendChild(listing('SeaFlash'));
frag.appendChild(listing('SeaSound'));
frag.appendChild(vol('SeaVolume'));
@@ -2926,10 +2926,10 @@ CM.ConfigDefault = {
GCSoundURL: 'https://freesound.org/data/previews/66/66717_931655-lq.mp3',
GCTimer: 1,
Favicon: 1,
FortuneFlash: 1,
FortuneSound: 1,
FortuneVolume: 100,
FortuneSoundURL: 'https://freesound.org/data/previews/419/419594_7062176-lq.mp3',
FortuneFlash: 1,
FortuneSound: 1,
FortuneVolume: 100,
FortuneSoundURL: 'https://freesound.org/data/previews/419/419594_7062176-lq.mp3',
SeaFlash: 1,
SeaSound: 1,
SeaVolume: 100,

2
src/Config.js
View File

@@ -152,7 +152,7 @@ CM.ConfigData.FortuneFlash = {label: ['Fortune Cookie Flash OFF', 'Fortune Cooki
CM.ConfigData.FortuneSound = {label: ['Fortune Cookie Sound OFF', 'Fortune Cookie Sound ON'], desc: 'Play a sound on Fortune Cookie', toggle: true};
CM.ConfigData.FortuneVolume = {label: [], desc: 'Volume of the Fortune Cookie sound'};
for (var i = 0; i < 101; i++) {
CM.ConfigData.FortuneVolume.label[i] = i + '%';
CM.ConfigData.FortuneVolume.label[i] = i + '%';
}
CM.ConfigData.FortuneSoundURL = {label: 'Fortune Cookie Sound URL:', desc: 'URL of the sound to be played when the Ticker has a Fortune Cookie'};
CM.ConfigData.SeaFlash = {label: ['Season Special Flash OFF', 'Season Special Flash ON'], desc: 'Flash screen on Season Popup', toggle: true};

20
src/Disp.js
View File

@@ -870,13 +870,13 @@ CM.Disp.CheckGoldenCookie = function() {
}
CM.Disp.CheckTickerFortune = function() {
if (CM.Disp.lastTickerFortuneState != (Game.TickerEffect && Game.TickerEffect.type == 'fortune')) {
CM.Disp.lastTickerFortuneState = (Game.TickerEffect && Game.TickerEffect.type == 'fortune');
if (CM.Disp.lastTickerFortuneState) {
CM.Disp.Flash(3, 'FortuneFlash');
CM.Disp.PlaySound(CM.Config.FortuneSoundURL, 'FortuneSound', 'FortuneVolume');
}
}
if (CM.Disp.lastTickerFortuneState != (Game.TickerEffect && Game.TickerEffect.type == 'fortune')) {
CM.Disp.lastTickerFortuneState = (Game.TickerEffect && Game.TickerEffect.type == 'fortune');
if (CM.Disp.lastTickerFortuneState) {
CM.Disp.Flash(3, 'FortuneFlash');
CM.Disp.PlaySound(CM.Config.FortuneSoundURL, 'FortuneSound', 'FortuneVolume');
}
}
}
CM.Disp.CheckSeasonPopup = function() {
@@ -1122,9 +1122,9 @@ CM.Disp.AddMenuPref = function(title) {
frag.appendChild(listing('GCTimer'));
frag.appendChild(listing('Favicon'));
frag.appendChild(listing('FortuneFlash'));
frag.appendChild(listing('FortuneSound'));
frag.appendChild(vol('FortuneVolume'));
frag.appendChild(url('FortuneSoundURL'));
frag.appendChild(listing('FortuneSound'));
frag.appendChild(vol('FortuneVolume'));
frag.appendChild(url('FortuneSoundURL'));
frag.appendChild(listing('SeaFlash'));
frag.appendChild(listing('SeaSound'));
frag.appendChild(vol('SeaVolume'));

8
src/Main.js
View File

@@ -269,10 +269,10 @@ CM.ConfigDefault = {
GCSoundURL: 'https://freesound.org/data/previews/66/66717_931655-lq.mp3',
GCTimer: 1,
Favicon: 1,
FortuneFlash: 1,
FortuneSound: 1,
FortuneVolume: 100,
FortuneSoundURL: 'https://freesound.org/data/previews/419/419594_7062176-lq.mp3',
FortuneFlash: 1,
FortuneSound: 1,
FortuneVolume: 100,
FortuneSoundURL: 'https://freesound.org/data/previews/419/419594_7062176-lq.mp3',
SeaFlash: 1,
SeaSound: 1,
SeaVolume: 100,