From 79ecb51c44a3d5250ffa892113fda84974c96faf Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Fri, 6 Dec 2019 22:52:34 +0100
Subject: [PATCH] Revert "tabs and spaces SpecialForce.js"
This reverts commit 658292008bb9fc862d887c70d2c7ea7a674c9ed9.
---
src/Mods/SpecialForce/SpecialForce.js | 37 ++++++++++++++-------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index faf5fdc3968..790fae063af 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -2,7 +2,7 @@
App.SF.Init = function() {
V.SF.Toggle = V.SF.Toggle || 0;
if (passage() === "init" || passage() === "New Game Plus") {
- V.SF = {Active: -1, Toggle: V.SF.Toggle};
+ V.SF = {Active: -1, Toggle:V.SF.Toggle};
}
V.SF.FS = V.SF.FS || {};
V.SF.FS.Tension = V.SF.FS.Tension || -1;
@@ -71,6 +71,7 @@ App.SF.Init = function() {
/* no-usedOnce */
App.SF.BC = function() {
+
function InitClean() {
delete V.SFMODToggle;
delete V.securityForceActive;
@@ -264,7 +265,7 @@ App.SF.BC = function() {
App.SF.Init();
if (V.SF.MercCon !== undefined) {
- if ( V.SF.MercCon.View !== undefined) {
+ if( V.SF.MercCon.View !== undefined) {
delete V.SF.MercCon.View;
}
if (V.SF.MercCon.Helots !== undefined) {
@@ -2219,8 +2220,8 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100, text = `\n`)
const Obj = {
Active: -2,
Toggle: V.SF.Toggle,
- Squad: {Troops: V.SF.Squad.Troops},
- Size: V.SF.Size,
+ Squad:{Troops:V.SF.Squad.Troops},
+ Size:V.SF.Size,
FS: {
Tension: V.SF.FS.Tension,
BadOutcome: BadOutcome
@@ -2730,10 +2731,10 @@ App.SF.Count = function() {
let FS_OPTIONS = ['Repopulation', 'Eugenics', 'Gender_radicalism', 'Gender_traditionalism', 'Paternalism', 'Degradationism', 'Body_Purism', 'Transformation_Fetishism', 'Youth_Preferentialism', 'Maturity_Preferentialism', 'Slimness_Enthusiasm', 'Asset_Expansionism', 'Slave_Pastoralism', 'Physical_Idealism', 'Hedonistic_Decadence', 'Chattel_Religionism'];
FS_OPTIONS = FS_OPTIONS.concat(Revivalisms);
for (let i = 0; i < FS_OPTIONS.length; i++) {
- if (V.SF.FS[FS_OPTIONS[i]] === undefined) {
- V.SF.FS[FS_OPTIONS[i]] = {lv: 0, vaildOption: 1, gift: 0};
+ if (V.SF.FS[FS_OPTIONS[i]] === undefined) {
+ V.SF.FS[FS_OPTIONS[i]] = {lv: 0, vaildOption: 1, gift: 0};
+ }
}
- }
}
if (E > 100) {
@@ -3097,19 +3098,19 @@ App.SF.UnitText = function(input) {
let loc2 = ``;
if (V.week % 6 === 0) {
- loc2 += `is`;
- if (input !== 'HAT') {
- loc2 += ` moored to`;
+ loc2 += `is`;
+ if (input !== 'HAT') {
+ loc2 += ` moored to`;
+ } else {
+ loc2 += ` parked on`;
+ }
+ loc2 += ` the pier in the Naval Yard`;
+ if (input === 'HAT') {
+ loc2 += `, ready to ferry ${tons} tons of soldiers and vehicles`;
+ }
} else {
- loc2 += ` parked on`;
- }
- loc2 += ` the pier in the Naval Yard`;
- if (input === 'HAT') {
- loc2 += `, ready to ferry ${tons} tons of soldiers and vehicles`;
+ loc2 += `is patrolling the waters near ${V.arcologies[0].name}`;
}
- } else {
- loc2 += `is patrolling the waters near ${V.arcologies[0].name}`;
- }
switch (input) {
case 'firebase':
if (S.Firebase >= 0) {
--
GitLab