From ff6f88abb1ee39251fefd21f69918ce4ba6b1e87 Mon Sep 17 00:00:00 2001 From: Skriv <skrivelese@gmail.com> Date: Sat, 9 Mar 2019 01:24:34 +0100 Subject: [PATCH] camelcase for local variables --- src/js/utilJS.js | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/js/utilJS.js b/src/js/utilJS.js index 63be179ba01..bf312a1d70a 100644 --- a/src/js/utilJS.js +++ b/src/js/utilJS.js @@ -843,12 +843,12 @@ window.arraySwap = function arraySwap(array, a, b) { }; // circumvents sugarcube, allowing a plain HTML5 UI within it -window.html5passage = function html5passage(passage_function) { +window.html5passage = function html5passage(passageFunction) { $(document).one(":passagedisplay", (ev) => { const element = document.createElement("div"); element.classList.add("passage"); document.getElementById("passages").appendChild(element); - passage_function(element); + passageFunction(element); $(document).off(":passagedisplay"); }); }; @@ -1126,7 +1126,7 @@ window.ValidateFacilityDecoration = function ValidateFacilityDecoration(decorati } }; -window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { +window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) { "use strict"; const V = State.variables; let errorMessage = ""; @@ -1139,7 +1139,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSSupremacist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSSupremacist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSSupremacist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "Subjugationist": @@ -1149,7 +1149,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSSubjugationist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSSubjugationist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSSubjugationist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "GenderRadicalist": @@ -1159,7 +1159,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSGenderRadicalist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSGenderRadicalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSGenderRadicalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "GenderFundamentalist": @@ -1169,7 +1169,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSGenderFundamentalist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSGenderFundamentalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSGenderFundamentalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "Paternalist": @@ -1179,7 +1179,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSPaternalist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSPaternalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSPaternalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "Degradationist": @@ -1189,7 +1189,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSDegradationist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSDegradationist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSDegradationist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "AssetExpansionist": @@ -1199,7 +1199,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSAssetExpansionist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSAssetExpansionist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSAssetExpansionist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "SlimnessEnthusiast": @@ -1209,7 +1209,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSSlimnessEnthusiast / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSSlimnessEnthusiast += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSSlimnessEnthusiast += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "TransformationFetishist": @@ -1219,7 +1219,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSTransformationFetishist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSTransformationFetishist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSTransformationFetishist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "BodyPurist": @@ -1229,7 +1229,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSBodyPurist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSBodyPurist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSBodyPurist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "MaturityPreferentialist": @@ -1239,7 +1239,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSMaturityPreferentialist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSMaturityPreferentialist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSMaturityPreferentialist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "YouthPreferentialist": @@ -1249,7 +1249,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSYouthPreferentialist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSYouthPreferentialist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSYouthPreferentialist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "Pastoralist": @@ -1259,7 +1259,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSPastoralist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSPastoralist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSPastoralist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "PhysicalIdealist": @@ -1269,7 +1269,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSPhysicalIdealist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSPhysicalIdealist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSPhysicalIdealist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "ChattelReligionist": @@ -1279,7 +1279,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSChattelReligionist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSChattelReligionist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSChattelReligionist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "RomanRevivalist": @@ -1289,7 +1289,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSRomanRevivalist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSRomanRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSRomanRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "AztecRevivalist": @@ -1299,7 +1299,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSAztecRevivalist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSAztecRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSAztecRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "EgyptianRevivalist": @@ -1309,7 +1309,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSEgyptianRevivalist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSEgyptianRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSEgyptianRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "EdoRevivalist": @@ -1319,7 +1319,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSEdoRevivalist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSEdoRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSEdoRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "ArabianRevivalist": @@ -1329,7 +1329,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSArabianRevivalist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSArabianRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSArabianRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "ChineseRevivalist": @@ -1339,7 +1339,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSChineseRevivalist / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSChineseRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSChineseRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "Repopulationist": @@ -1349,7 +1349,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSRepopulationFocus / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSRepopulationFocus += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSRepopulationFocus += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "Eugenics": @@ -1359,7 +1359,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSRestart / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSRestart += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSRestart += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; case "Hedonism": @@ -1369,7 +1369,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) { } else { repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSHedonisticDecadence / V.FSLockinLevel), "futureSocieties"); } - V.arcologies[0].FSHedonisticDecadence += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1); + V.arcologies[0].FSHedonisticDecadence += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1); } break; default: -- GitLab