diff --git a/src/Mods/SecExp/js/secExp.js b/src/Mods/SecExp/js/secExp.js
index 65b20c1d0bad4b4dc86c6b6c90195ace9d3d3035..4cef0f7b3d5d3298e889b07810cfb9c01aa3ed41 100644
--- a/src/Mods/SecExp/js/secExp.js
+++ b/src/Mods/SecExp/js/secExp.js
@@ -1,9 +1,8 @@
-/**
+/**
* Returns the effect (if any) the Special Force provides.
* @param {string} [report] which report is this function being called from.
* @param {string} [section=''] which sub section (if any) is this function being called from.
- * @returns {number}
- * @returns {string}
+ * @returns {{text:string, bonus:number}}
*/
App.SecExp.SF_effect = function(report, section = '') {
const size = V.SF.Toggle && V.SF.Active >= 1 ? App.SF.upgrades.total() : 0;
@@ -11,15 +10,15 @@ App.SecExp.SF_effect = function(report, section = '') {
if (size > 10) {
if (report === 'authority' || report === 'trade') {
r += `Having a powerful special force increases ${report === 'authority' ? 'your authority' : 'trade security'}.`;
- bonus += size/10;
+ bonus += size / 10;
} else if (report === 'security') {
r += `Having a powerful special force attracts a lot of ${section === 'militia' ? 'citizens' : 'mercenaries'}, hopeful that they may be able to fight along side it.`;
if (section === 'militia') {
bonus *= 1 + (random(1, (Math.round(size / 10))) / 20); // not sure how high size goes, so I hope this makes sense
} else if (section === 'mercs') {
- bonus += random(1, Math.round(size/10));
+ bonus += random(1, Math.round(size / 10));
}
- }
+ }
}
return {text: r, bonus: bonus};
};
@@ -27,33 +26,32 @@ App.SecExp.SF_effect = function(report, section = '') {
/**
* Returns the effect of a campaign launched from the PR hub.
* @param {string} [focus] campaign option to check against.
- * @returns {number}
- * @returns {string}
+ * @returns {{text:string, effect:number}}}
*/
App.SecExp.propagandaEffects = function(focus) {
let t = ``, increase = 0;
if (V.SecExp.buildings.propHub && V.SecExp.buildings.propHub.upgrades.campaign >= 1 && V.SecExp.buildings.propHub.focus === focus) {
- let campaign, modifier, adjut;
+ let campaign, modifier;
const forcedViewing = V.SecExp.edicts.propCampaignBoost === 1;
- const noRecuriter = V.SecExp.buildings.propHub.recruiterOffice === 0 || V.RecruiterID === 0;
- const recuriterActive = V.SecExp.buildings.propHub.recruiterOffice && V.RecruiterID > 0;
- switch(focus) {
+ const noRecruiter = V.SecExp.buildings.propHub.recruiterOffice === 0 || V.RecruiterID === 0;
+ const recruiterActive = V.SecExp.buildings.propHub.recruiterOffice && V.RecruiterID > 0;
+ switch (focus) {
case "social engineering":
campaign = 'societal engineering';
modifier = forcedViewing ? V.SecExp.buildings.propHub.upgrades.campaign : 1;
- if (noRecuriter) {
+ if (noRecruiter) {
increase += (forcedViewing ? 2 : 1) * modifier;
- } else if (recuriterActive) {
- increase += modifier + Math.floor((S.Recruiter.intelligence+S.Recruiter.intelligenceImplant)/32);
+ } else if (recruiterActive) {
+ increase += modifier + Math.floor((S.Recruiter.intelligence + S.Recruiter.intelligenceImplant) / 32);
}
break;
case "recruitment":
campaign = 'militia recruitment';
modifier = forcedViewing ? 1.2 : 1.15;
- if (noRecuriter) {
+ if (noRecruiter) {
increase += (forcedViewing ? 1.1 : 1.05) * modifier;
- } else if (recuriterActive) {
- increase += modifier + Math.floor((S.Recruiter.intelligence+S.Recruiter.intelligenceImplant)/650);
+ } else if (recruiterActive) {
+ increase += modifier + Math.floor((S.Recruiter.intelligence + S.Recruiter.intelligenceImplant) / 650);
}
break;
}
@@ -66,10 +64,10 @@ App.SecExp.propagandaEffects = function(focus) {
t += `</span>`;
}
return {text: t, effect: Math.round(increase)};
-}
+};
/**
- * Returns the raw percetnage of socity that can be drafted.
+ * Returns the raw percentage of society that can be drafted.
* @returns {number}
*/
App.SecExp.militiaCap = function(x = 0) {
@@ -102,7 +100,7 @@ App.SecExp.initTrade = function() {
}
};
-App.SecExp.generalInit = function(){
+App.SecExp.generalInit = function() {
if (V.secExpEnabled === 0) {
return;
}
@@ -110,7 +108,7 @@ App.SecExp.generalInit = function(){
Object.assign(V.SecExp, {
battles: {
major: 0,
- slaveVictories : [],
+ slaveVictories: [],
lastSelection: [],
victories: 0,
victoryStreak: 0,
@@ -175,19 +173,19 @@ App.SecExp.generalInit = function(){
slaves: {
created: 0,
casualties: 0,
- sqauds: []
+ squads: []
},
- milita: {
+ militia: {
created: 0,
free: 0,
casualties: 0,
- sqauds: []
+ squads: []
},
mercs: {
created: 0,
free: 0,
casualties: 0,
- sqauds: []
+ squads: []
}
},
*/
@@ -231,7 +229,7 @@ App.SecExp.generalInit = function(){
pharaonTradition: 0,
}
},
- smilingMan: { progress : 0 },
+ smilingMan: {progress: 0},
defaultNames: {
slaves: "slave platoon",
militia: "citizens' platoon",
@@ -269,7 +267,7 @@ App.SecExp.upkeep = (function() {
if (V.SecExp.edicts.defense.mamluks) { value++; }
if (V.SecExp.edicts.defense.sunTzu) { value++; }
- return value*1000;
+ return value * 1000;
}
/** Upkeep cost of edicts, in authority
@@ -340,10 +338,10 @@ App.SecExp.upkeep = (function() {
value += V.SecExp.edicts.SFSupportLevel >= 5 ? 1000 : 0;
}
if (V.SecExp.buildings.barracks) {
- value += base + upgrade* Object.values(V.SecExp.buildings.barracks).reduce((a, b) => a + b);
+ value += base + upgrade * Object.values(V.SecExp.buildings.barracks).reduce((a, b) => a + b);
}
if (V.SecExp.buildings.riotCenter) {
- value += base + upgrade* Object.values(V.SecExp.buildings.riotCenter.upgrades).reduce((a, b) => a + b);
+ value += base + upgrade * Object.values(V.SecExp.buildings.riotCenter.upgrades).reduce((a, b) => a + b);
if (V.SecExp.buildings.riotCenter.brainImplant < 106 && V.SecExp.buildings.riotCenter.brainImplantProject > 0) {
value += 5000 * V.SecExp.buildings.riotCenter.brainImplantProject;
}
@@ -402,7 +400,7 @@ App.SecExp.battle = (function() {
}
if (input === '') {
- return bots+militiaC+slavesC+mercsC+init;
+ return bots + militiaC + slavesC + mercsC + init;
} else if (input === 'bots') {
return bots;
} else if (input === 'militia') {
@@ -527,7 +525,7 @@ App.SecExp.battle = (function() {
let max = 0;
if (V.SecExp.buildings.barracks) {
max = 8 + (V.SecExp.buildings.barracks.size * 2);
- if(App.SecExp.battle.deploySpeed() === 10) {
+ if (App.SecExp.battle.deploySpeed() === 10) {
max += 2;
}
}
diff --git a/src/Mods/SecExp/js/tradeReport.js b/src/Mods/SecExp/js/tradeReport.js
index 3cc97f6e62853a4bb6c7ecb95d64f988ae35dd0f..582c987ab68eb560f4c2edc4dde6714d93d88f8f 100644
--- a/src/Mods/SecExp/js/tradeReport.js
+++ b/src/Mods/SecExp/js/tradeReport.js
@@ -49,7 +49,7 @@ App.SecExp.tradeReport = function() {
r.push(`Your ${V.rep > 18000 ? 'extremely' : ''} high reputation attracts trade from all over the world.`);
tradeChange += (V.rep > 18000 ? 2 : 1);
}
-
+
if (V.assistant.power > 0) {
const lowPower = V.assistant.power === 1;
r.push(`Due to ${lowPower ? '' : 'incredible'} computing power, ${V.assistant.name} is able to guide the commercial development of the arcology to greater levels.`);
@@ -144,6 +144,6 @@ App.SecExp.tradeReport = function() {
r.push(`With trade at extremely high levels, the <span class="green">prosperity of the arcology grows with unprecedented speed.</span>`);
bonus += 4.5;
}
-
+
return {text: r.join(" "), bonus: bonus};
-}
\ No newline at end of file
+};