From f9a99feffc7a8fcb72f9d72fa25f0e20b6de2fc8 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Sun, 31 Mar 2019 15:49:44 +0200
Subject: [PATCH] second pass
---
src/js/economyJS.js | 4 ++--
src/js/futureSocietyJS.js | 50 +++++++++++++++++++--------------------
src/js/sexActsJS.js | 6 ++---
3 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 63955e40086..6d92bf1959e 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -954,12 +954,12 @@ window.corpValue = function() {
// Corporation Share Price
// A positive q means adding shares to the market, negative means removing them
-window.corpSharePrice = function(q) {
+window.corpSharePrice = function(q = 0) {
const V = State.variables;
if (V.corpIncorporated === 0) {
return 0;
} else {
- return Math.trunc(1000 * (corpValue() / (V.personalShares + V.publicShares + (q || 0))));
+ return Math.trunc(1000 * (corpValue() / (V.personalShares + V.publicShares + q)));
}
};
diff --git a/src/js/futureSocietyJS.js b/src/js/futureSocietyJS.js
index bd005f0b772..5bd36ca9946 100644
--- a/src/js/futureSocietyJS.js
+++ b/src/js/futureSocietyJS.js
@@ -255,7 +255,7 @@ window.ValidateFacilityDecoration = function ValidateFacilityDecoration(decorati
}
};
-window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
+window.FSChange = function FSChange(FS, magnitude, bonusMultiplier = 1) {
'use strict';
const V = State.variables;
let errorMessage = '';
@@ -268,7 +268,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSSupremacist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSSupremacist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSSupremacist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'Subjugationist':
@@ -278,7 +278,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSSubjugationist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSSubjugationist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSSubjugationist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'GenderRadicalist':
@@ -288,7 +288,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSGenderRadicalist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSGenderRadicalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSGenderRadicalist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'GenderFundamentalist':
@@ -298,7 +298,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSGenderFundamentalist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSGenderFundamentalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSGenderFundamentalist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'Paternalist':
@@ -308,7 +308,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSPaternalist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSPaternalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSPaternalist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'Degradationist':
@@ -318,7 +318,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSDegradationist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSDegradationist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSDegradationist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'AssetExpansionist':
@@ -328,7 +328,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSAssetExpansionist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSAssetExpansionist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSAssetExpansionist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'SlimnessEnthusiast':
@@ -338,7 +338,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSSlimnessEnthusiast / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSSlimnessEnthusiast += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSSlimnessEnthusiast += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'TransformationFetishist':
@@ -348,7 +348,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSTransformationFetishist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSTransformationFetishist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSTransformationFetishist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'BodyPurist':
@@ -358,7 +358,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSBodyPurist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSBodyPurist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSBodyPurist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'MaturityPreferentialist':
@@ -368,7 +368,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSMaturityPreferentialist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSMaturityPreferentialist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSMaturityPreferentialist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'YouthPreferentialist':
@@ -378,7 +378,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSYouthPreferentialist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSYouthPreferentialist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSYouthPreferentialist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'Pastoralist':
@@ -388,7 +388,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSPastoralist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSPastoralist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSPastoralist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'PhysicalIdealist':
@@ -398,7 +398,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSPhysicalIdealist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSPhysicalIdealist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSPhysicalIdealist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'ChattelReligionist':
@@ -408,7 +408,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSChattelReligionist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSChattelReligionist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSChattelReligionist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'RomanRevivalist':
@@ -418,7 +418,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSRomanRevivalist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSRomanRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSRomanRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'AztecRevivalist':
@@ -428,7 +428,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSAztecRevivalist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSAztecRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSAztecRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'EgyptianRevivalist':
@@ -438,7 +438,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSEgyptianRevivalist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSEgyptianRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSEgyptianRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'EdoRevivalist':
@@ -448,7 +448,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSEdoRevivalist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSEdoRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSEdoRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'ArabianRevivalist':
@@ -458,7 +458,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSArabianRevivalist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSArabianRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSArabianRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'ChineseRevivalist':
@@ -468,7 +468,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSChineseRevivalist / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSChineseRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSChineseRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'Repopulationist':
@@ -478,7 +478,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSRepopulationFocus / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSRepopulationFocus += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSRepopulationFocus += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'Eugenics':
@@ -488,7 +488,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSRestart / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSRestart += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSRestart += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
case 'Hedonism':
@@ -498,7 +498,7 @@ window.FSChange = function FSChange(FS, magnitude, bonusMultiplier) {
} else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSHedonisticDecadence / V.FSLockinLevel), 'futureSocieties');
}
- V.arcologies[0].FSHedonisticDecadence += 0.05 * magnitude * V.FSSingleSlaveRep * (bonusMultiplier || 1);
+ V.arcologies[0].FSHedonisticDecadence += 0.05 * magnitude * V.FSSingleSlaveRep * bonusMultiplier;
}
break;
default:
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index d519c141e57..c26283f0783 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -2,7 +2,7 @@
times is how many times to increment the anal counts.
if left undefined it will assume it to be 1.
*/
-window.AnalVCheck = function AnalVCheck(times) {
+window.AnalVCheck = function AnalVCheck(times = 1) {
const V = State.variables;
const slave = V.activeSlave;
const pronouns = getPronouns(slave);
@@ -14,7 +14,6 @@ window.AnalVCheck = function AnalVCheck(times) {
// boy = pronouns.noun;
const He = capFirstChar(he);
const His = capFirstChar(his);
- times = times || 1;
let r = ``;
if (canDoAnal(slave) && slave.anus === 0) {
r += `@@.lime;This breaks in ${slave.slaveName}'s virgin ass.@@ `;
@@ -57,7 +56,7 @@ window.AnalVCheck = function AnalVCheck(times) {
times is how many times to increment the vaginal counts.
if left undefined it will assume it to be 1.
*/
-window.VaginalVCheck = function VaginalVCheck(times) {
+window.VaginalVCheck = function VaginalVCheck(times = 1) {
const V = State.variables;
const slave = V.activeSlave;
const pronouns = getPronouns(slave);
@@ -69,7 +68,6 @@ window.VaginalVCheck = function VaginalVCheck(times) {
const boy = pronouns.noun;
const He = capFirstChar(he);
const His = capFirstChar(his);
- times = times || 1;
let r = ``;
if (canDoVaginal(slave) && slave.vagina === 0) {
r += `@@.lime;This breaks in ${slave.slaveName}'s virgin pussy.@@ `;
--
GitLab