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

Changed variable names

Browse Source
This commit is contained in:
Daniel van Noord
2021-02-09 23:13:42 +01:00
parent a025fe51d7
commit fec72bbf91
5 changed files with 76 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
CookieMonster.js
View File

@@ -5,36 +5,20 @@
/** /**
* This functions creates the necessary objects and is run when they do not already exist * This functions creates the necessary objects and is run when they do not already exist
*/ */
const RunCookieMonsterHeader = function() { const CM = {
CM = {}; Backup: {},
CM.VersionMajor = '2.031'; Cache: {},
CM.VersionMinor = '3'; Config: {},
ConfigData: {},
CM.Backup = {}; Data: {},
Disp: {},
CM.Cache = {}; Footer: {},
Main: {},
CM.Config = {}; Options: {},
Sim: {},
CM.ConfigData = {}; VersionMajor: '2.031',
VersionMinor: '3',
CM.Data = {};
CM.Disp = {};
CM.Footer = {};
CM.Main = {};
CM.Options = {};
CM.Sim = {};
}; };
if (typeof CM == "undefined") {
RunCookieMonsterHeader();
}
/********* /*********
* Cache * * Cache *
*********/ *********/
@@ -798,15 +782,15 @@ CM.Config.ToggleConfig = function(config) {
if (CM.Options[config] == CM.ConfigData[config].label.length) { if (CM.Options[config] == CM.ConfigData[config].label.length) {
CM.Options[config] = 0; CM.Options[config] = 0;
if (CM.ConfigData[config].toggle) l(CM.ConfigPrefix + config).className = 'option off'; if (CM.ConfigData[config].toggle) l(CM.Config.ConfigPrefix + config).className = 'option off';
} }
else l(CM.ConfigPrefix + config).className = 'option'; else l(CM.Config.ConfigPrefix + config).className = 'option';
if (typeof CM.ConfigData[config].func !== 'undefined') { if (typeof CM.ConfigData[config].func !== 'undefined') {
CM.ConfigData[config].func(); CM.ConfigData[config].func();
} }
l(CM.ConfigPrefix + config).innerHTML = CM.ConfigData[config].label[CM.Options[config]]; l(CM.Config.ConfigPrefix + config).innerHTML = CM.ConfigData[config].label[CM.Options[config]];
CM.Config.SaveConfig(); CM.Config.SaveConfig();
}; };
@@ -868,7 +852,16 @@ CM.Config.CheckNotificationPermissions = function(ToggleOnOff) {
} }
} }
} }
};/******** };
/********
* Section: Variables used in Config functions */
/**
* Used to name certain DOM elements and refer to them
*/
CM.Config.ConfigPrefix = 'CMConfig';
/********
* Data * * Data *
********/ ********/
@@ -2194,7 +2187,7 @@ CM.Disp.CreateWhiteScreen = function() {
*/ */
CM.Disp.Flash = function(mode, config) { CM.Disp.Flash = function(mode, config) {
// The arguments check makes the sound not play upon initialization of the mod // The arguments check makes the sound not play upon initialization of the mod
if ((CM.Options[config] == 1 && mode == 3 && CM.Disp.Flash.caller.caller.caller.caller != null) || mode == 1) { if ((CM.Options[config] == 1 && mode == 3 && CM.Disp.Flash.caller.caller.caller.caller == null) || mode == 1) {
CM.Disp.WhiteScreen.style.opacity = '0.5'; CM.Disp.WhiteScreen.style.opacity = '0.5';
if (mode == 3) { if (mode == 3) {
CM.Disp.WhiteScreen.style.display = 'inline'; CM.Disp.WhiteScreen.style.display = 'inline';
@@ -2220,7 +2213,7 @@ CM.Disp.Flash = function(mode, config) {
*/ */
CM.Disp.PlaySound = function(url, sndConfig, volConfig) { CM.Disp.PlaySound = function(url, sndConfig, volConfig) {
// The arguments check makes the sound not play upon initialization of the mod // The arguments check makes the sound not play upon initialization of the mod
if (CM.Options[sndConfig] == 1 && CM.Disp.PlaySound.caller.caller.caller.caller != null) { if (CM.Options[sndConfig] == 1 && CM.Disp.PlaySound.caller.caller.caller.caller == null) {
var sound = new realAudio(url); var sound = new realAudio(url);
sound.volume = (CM.Options[volConfig] / 100) * (Game.volume / 100); sound.volume = (CM.Options[volConfig] / 100) * (Game.volume / 100);
sound.play(); sound.play();
@@ -2236,7 +2229,7 @@ CM.Disp.PlaySound = function(url, sndConfig, volConfig) {
*/ */
CM.Disp.Notification = function(notifyConfig, title, message) { CM.Disp.Notification = function(notifyConfig, title, message) {
// The arguments check makes the sound not play upon initialization of the mod // The arguments check makes the sound not play upon initialization of the mod
if (CM.Options[notifyConfig] == 1 && document.visibilityState == 'hidden' && CM.Disp.Notification.caller.caller.caller.caller != null) { if (CM.Options[notifyConfig] == 1 && document.visibilityState == 'hidden' && CM.Disp.Notification.caller.caller.caller.caller == null) {
var CookieIcon = 'https://orteil.dashnet.org/cookieclicker/favicon.ico'; var CookieIcon = 'https://orteil.dashnet.org/cookieclicker/favicon.ico';
new Notification(title, {body: message, badge: CookieIcon}); new Notification(title, {body: message, badge: CookieIcon});
} }
@@ -3251,7 +3244,7 @@ CM.Disp.CreatePrefOption = function(config) {
else { else {
a.className = 'option'; a.className = 'option';
} }
a.id = CM.ConfigPrefix + config; a.id = CM.Config.ConfigPrefix + config;
a.onclick = function() {CM.Config.ToggleConfig(config);}; a.onclick = function() {CM.Config.ToggleConfig(config);};
a.textContent = CM.ConfigData[config].label[CM.Options[config]]; a.textContent = CM.ConfigData[config].label[CM.Options[config]];
div.appendChild(a); div.appendChild(a);
@@ -3297,7 +3290,7 @@ CM.Disp.CreatePrefOption = function(config) {
span.textContent = CM.ConfigData[config].label + ' '; span.textContent = CM.ConfigData[config].label + ' ';
div.appendChild(span); div.appendChild(span);
let input = document.createElement('input'); let input = document.createElement('input');
input.id = CM.ConfigPrefix + config; input.id = CM.Config.ConfigPrefix + config;
input.className = 'option'; input.className = 'option';
input.type = 'text'; input.type = 'text';
input.readOnly = true; input.readOnly = true;
@@ -3306,13 +3299,13 @@ CM.Disp.CreatePrefOption = function(config) {
div.appendChild(input); div.appendChild(input);
div.appendChild(document.createTextNode(' ')); div.appendChild(document.createTextNode(' '));
let inputPrompt = document.createElement('input'); let inputPrompt = document.createElement('input');
inputPrompt.id = CM.ConfigPrefix + config + 'Prompt'; inputPrompt.id = CM.Config.ConfigPrefix + config + 'Prompt';
inputPrompt.className = 'option'; inputPrompt.className = 'option';
inputPrompt.type = 'text'; inputPrompt.type = 'text';
inputPrompt.setAttribute('value', CM.Options[config]); inputPrompt.setAttribute('value', CM.Options[config]);
let a = document.createElement('a'); let a = document.createElement('a');
a.className = 'option'; a.className = 'option';
a.onclick = function() {Game.Prompt(inputPrompt.outerHTML, [['Save', 'CM.Options[\'' + config + '\'] = l(CM.ConfigPrefix + \'' + config + '\' + \'Prompt\').value; CM.Config.SaveConfig(); Game.ClosePrompt(); Game.UpdateMenu();'], 'Cancel']);}; a.onclick = function() {Game.Prompt(inputPrompt.outerHTML, [['Save', 'CM.Options[\'' + config + '\'] = l(CM.Config.ConfigPrefix + \'' + config + '\' + \'Prompt\').value; CM.Config.SaveConfig(); Game.ClosePrompt(); Game.UpdateMenu();'], 'Cancel']);};
a.textContent = 'Edit'; a.textContent = 'Edit';
div.appendChild(a); div.appendChild(a);
let label = document.createElement('label'); let label = document.createElement('label');
@@ -3347,7 +3340,7 @@ CM.Disp.CreatePrefOption = function(config) {
span.textContent = CM.ConfigData[config].label + ' '; span.textContent = CM.ConfigData[config].label + ' ';
div.appendChild(span); div.appendChild(span);
let input = document.createElement('input'); let input = document.createElement('input');
input.id = CM.ConfigPrefix + config; input.id = CM.Config.ConfigPrefix + config;
input.className = 'option'; input.className = 'option';
input.type = 'number'; input.type = 'number';
input.value = (CM.Options[config]); input.value = (CM.Options[config]);
@@ -4646,9 +4639,15 @@ CM.Main.FixMouseY = function(target) {
} }
}; };
/********
* Section: Variables used in Main functions */
CM.HasReplaceNativeGrimoireLaunch = false; CM.HasReplaceNativeGrimoireLaunch = false;
CM.HasReplaceNativeGrimoireDraw = false; CM.HasReplaceNativeGrimoireDraw = false;
/**
* TODO: See if these can me removed (probably)
*/
CM.Main.lastGoldenCookieState = 0; CM.Main.lastGoldenCookieState = 0;
CM.Main.lastSpawnedGoldenCookieState = 0; CM.Main.lastSpawnedGoldenCookieState = 0;
CM.Main.lastTickerFortuneState = 0; CM.Main.lastTickerFortuneState = 0;
@@ -4656,9 +4655,6 @@ CM.Main.lastSeasonPopupState = 0;
CM.Main.lastGardenNextStep = 0; CM.Main.lastGardenNextStep = 0;
CM.Main.lastMagicBarFull = 0; CM.Main.lastMagicBarFull = 0;
CM.Main.lastWrinklerCount = 0; CM.Main.lastWrinklerCount = 0;
CM.ConfigPrefix = 'CMConfig';
/******* /*******
* Sim * * Sim *
*******/ *******/

14
src/Config.js
View File

@@ -106,15 +106,15 @@ CM.Config.ToggleConfig = function(config) {
if (CM.Options[config] == CM.ConfigData[config].label.length) { if (CM.Options[config] == CM.ConfigData[config].label.length) {
CM.Options[config] = 0; CM.Options[config] = 0;
if (CM.ConfigData[config].toggle) l(CM.ConfigPrefix + config).className = 'option off'; if (CM.ConfigData[config].toggle) l(CM.Config.ConfigPrefix + config).className = 'option off';
} }
else l(CM.ConfigPrefix + config).className = 'option'; else l(CM.Config.ConfigPrefix + config).className = 'option';
if (typeof CM.ConfigData[config].func !== 'undefined') { if (typeof CM.ConfigData[config].func !== 'undefined') {
CM.ConfigData[config].func(); CM.ConfigData[config].func();
} }
l(CM.ConfigPrefix + config).innerHTML = CM.ConfigData[config].label[CM.Options[config]]; l(CM.Config.ConfigPrefix + config).innerHTML = CM.ConfigData[config].label[CM.Options[config]];
CM.Config.SaveConfig(); CM.Config.SaveConfig();
}; };
@@ -177,3 +177,11 @@ CM.Config.CheckNotificationPermissions = function(ToggleOnOff) {
} }
} }
}; };
/********
* Section: Variables used in Config functions */
/**
* Used to name certain DOM elements and refer to them
*/
CM.Config.ConfigPrefix = 'CMConfig';

10
src/Disp.js
View File

@@ -2049,7 +2049,7 @@ CM.Disp.CreatePrefOption = function(config) {
else { else {
a.className = 'option'; a.className = 'option';
} }
a.id = CM.ConfigPrefix + config; a.id = CM.Config.ConfigPrefix + config;
a.onclick = function() {CM.Config.ToggleConfig(config);}; a.onclick = function() {CM.Config.ToggleConfig(config);};
a.textContent = CM.ConfigData[config].label[CM.Options[config]]; a.textContent = CM.ConfigData[config].label[CM.Options[config]];
div.appendChild(a); div.appendChild(a);
@@ -2095,7 +2095,7 @@ CM.Disp.CreatePrefOption = function(config) {
span.textContent = CM.ConfigData[config].label + ' '; span.textContent = CM.ConfigData[config].label + ' ';
div.appendChild(span); div.appendChild(span);
let input = document.createElement('input'); let input = document.createElement('input');
input.id = CM.ConfigPrefix + config; input.id = CM.Config.ConfigPrefix + config;
input.className = 'option'; input.className = 'option';
input.type = 'text'; input.type = 'text';
input.readOnly = true; input.readOnly = true;
@@ -2104,13 +2104,13 @@ CM.Disp.CreatePrefOption = function(config) {
div.appendChild(input); div.appendChild(input);
div.appendChild(document.createTextNode(' ')); div.appendChild(document.createTextNode(' '));
let inputPrompt = document.createElement('input'); let inputPrompt = document.createElement('input');
inputPrompt.id = CM.ConfigPrefix + config + 'Prompt'; inputPrompt.id = CM.Config.ConfigPrefix + config + 'Prompt';
inputPrompt.className = 'option'; inputPrompt.className = 'option';
inputPrompt.type = 'text'; inputPrompt.type = 'text';
inputPrompt.setAttribute('value', CM.Options[config]); inputPrompt.setAttribute('value', CM.Options[config]);
let a = document.createElement('a'); let a = document.createElement('a');
a.className = 'option'; a.className = 'option';
a.onclick = function() {Game.Prompt(inputPrompt.outerHTML, [['Save', 'CM.Options[\'' + config + '\'] = l(CM.ConfigPrefix + \'' + config + '\' + \'Prompt\').value; CM.Config.SaveConfig(); Game.ClosePrompt(); Game.UpdateMenu();'], 'Cancel']);}; a.onclick = function() {Game.Prompt(inputPrompt.outerHTML, [['Save', 'CM.Options[\'' + config + '\'] = l(CM.Config.ConfigPrefix + \'' + config + '\' + \'Prompt\').value; CM.Config.SaveConfig(); Game.ClosePrompt(); Game.UpdateMenu();'], 'Cancel']);};
a.textContent = 'Edit'; a.textContent = 'Edit';
div.appendChild(a); div.appendChild(a);
let label = document.createElement('label'); let label = document.createElement('label');
@@ -2145,7 +2145,7 @@ CM.Disp.CreatePrefOption = function(config) {
span.textContent = CM.ConfigData[config].label + ' '; span.textContent = CM.ConfigData[config].label + ' ';
div.appendChild(span); div.appendChild(span);
let input = document.createElement('input'); let input = document.createElement('input');
input.id = CM.ConfigPrefix + config; input.id = CM.Config.ConfigPrefix + config;
input.className = 'option'; input.className = 'option';
input.type = 'number'; input.type = 'number';
input.value = (CM.Options[config]); input.value = (CM.Options[config]);

42
src/Header.js
View File

@@ -5,33 +5,17 @@
/** /**
* This functions creates the necessary objects and is run when they do not already exist * This functions creates the necessary objects and is run when they do not already exist
*/ */
const RunCookieMonsterHeader = function() { const CM = {
CM = {}; Backup: {},
CM.VersionMajor = '2.031'; Cache: {},
CM.VersionMinor = '3'; Config: {},
ConfigData: {},
CM.Backup = {}; Data: {},
Disp: {},
CM.Cache = {}; Footer: {},
Main: {},
CM.Config = {}; Options: {},
Sim: {},
CM.ConfigData = {}; VersionMajor: '2.031',
VersionMinor: '3',
CM.Data = {};
CM.Disp = {};
CM.Footer = {};
CM.Main = {};
CM.Options = {};
CM.Sim = {};
}; };
if (typeof CM == "undefined") {
RunCookieMonsterHeader();
}

9
src/Main.js
View File

@@ -516,9 +516,15 @@ CM.Main.FixMouseY = function(target) {
} }
}; };
/********
* Section: Variables used in Main functions */
CM.HasReplaceNativeGrimoireLaunch = false; CM.HasReplaceNativeGrimoireLaunch = false;
CM.HasReplaceNativeGrimoireDraw = false; CM.HasReplaceNativeGrimoireDraw = false;
/**
* TODO: See if these can me removed (probably)
*/
CM.Main.lastGoldenCookieState = 0; CM.Main.lastGoldenCookieState = 0;
CM.Main.lastSpawnedGoldenCookieState = 0; CM.Main.lastSpawnedGoldenCookieState = 0;
CM.Main.lastTickerFortuneState = 0; CM.Main.lastTickerFortuneState = 0;
@@ -526,6 +532,3 @@ CM.Main.lastSeasonPopupState = 0;
CM.Main.lastGardenNextStep = 0; CM.Main.lastGardenNextStep = 0;
CM.Main.lastMagicBarFull = 0; CM.Main.lastMagicBarFull = 0;
CM.Main.lastWrinklerCount = 0; CM.Main.lastWrinklerCount = 0;
CM.ConfigPrefix = 'CMConfig';