diff --git a/src/Mods/SecExp/buildings/transportHub.tw b/src/Mods/SecExp/buildings/transportHub.tw
index c567ba844afa9b2f4b6a6c83500ec0200a4e656e..394dc6778a080f15ea1f6f286f962a25c2ad9881 100644
--- a/src/Mods/SecExp/buildings/transportHub.tw
+++ b/src/Mods/SecExp/buildings/transportHub.tw
@@ -76,28 +76,28 @@ You quickly reach the transport hub, where a constant stream of vehicles, people
/* airport */
<<if $airport == 1>>
<<link "Modernize the airport">>
- <<run cashX(forceNeg(5000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx")>>
<<set $airport++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(5000*$upgradeMultiplierArcology)>> and will increase trade, but will affect security//
+ <</link>> //Will cost <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>> and will increase trade, but will affect security//
<<elseif $airport == 2>>
<<link "Enlarge the airport">>
- <<run cashX(forceNeg(15000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Math.trunc(15000*$upgradeMultiplierArcology)), "capEx")>>
<<set $airport++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(15000*$upgradeMultiplierArcology)>> and will increase trade, but will affect security//
+ <</link>> //Will cost <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology))>> and will increase trade, but will affect security//
<<elseif $airport == 3>>
<<link "Further modernize the airport">>
- <<run cashX(forceNeg(45000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Math.trunc(45000*$upgradeMultiplierArcology)), "capEx")>>
<<set $airport++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(45000*$upgradeMultiplierArcology)>> and will increase trade, but will affect security//
+ <</link>> //Will cost <<print cashFormat(Math.trunc(45000*$upgradeMultiplierArcology))>> and will increase trade, but will affect security//
<<elseif $airport == 4>>
<<link "Further enlarge the airport">>
- <<run cashX(forceNeg(85000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Math.truc(85000*$upgradeMultiplierArcology)), "capEx")>>
<<set $airport++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(85000*$upgradeMultiplierArcology)>> and will increase trade, but will affect security//
+ <</link>> //Will cost <<print cashFormat(Math.trunc(85000*$upgradeMultiplierArcology))>> and will increase trade, but will affect security//
<<else>>
The airport is fully upgraded.
<</if>>
@@ -106,44 +106,44 @@ You quickly reach the transport hub, where a constant stream of vehicles, people
<<if $terrain != "oceanic" && $terrain != "marine">>
<<if $railway == 1>>
<<link "Modernize the railway">>
- <<run cashX(forceNeg(10000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx")>>
<<set $railway++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(10000*$upgradeMultiplierArcology)>>, will increase trade and slightly lower arcology's upkeep, but will affect security//
+ <</link>> //Will cost <<print cashFormat(Math.trunc*10000*$upgradeMultiplierArcology))>>, will increase trade and slightly lower arcology's upkeep, but will affect security//
<<elseif $railway == 2>>
<<link "Enlarge the railway">>
- <<run cashX(forceNeg(25000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Math.trunc(25000*$upgradeMultiplierArcology)), "capEx")>>
<<set $railway++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(25000*$upgradeMultiplierArcology)>>, will increase trade and slightly lower arcology's upkeep, but will affect security//
+ <</link>> //Will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology))>>, will increase trade and slightly lower arcology's upkeep, but will affect security//
<<elseif $railway == 3>>
<<link "Further modernize and enlarge the railway">>
- <<run cashX(forceNeg(65000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Math.trunc(65000*$upgradeMultiplierArcology)), "capEx")>>
<<set $railway++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(65000*$upgradeMultiplierArcology)>>, will increase trade and slightly lower arcology's upkeep, but will affect security//
+ <</link>> //Will cost <<print cashFormat(Math.trunc(65000*$upgradeMultiplierArcology))>>, will increase trade and slightly lower arcology's upkeep, but will affect security//
<<else>>
The railway is fully upgraded.
<</if>>
<<else>>
<<if $docks == 1>>
<<link "Modernize the docks">>
- <<run cashX(forceNeg(10000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx")>>
<<set $docks++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(10000*$upgradeMultiplierArcology)>>, will increase trade and slightly lower arcology's upkeep, but will affect security//
+ <</link>> //Will cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>, will increase trade and slightly lower arcology's upkeep, but will affect security//
<<elseif $docks == 2>>
<<link "Enlarge the docks">>
- <<run cashX(forceNeg(25000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Math.trunc(25000*$upgradeMultiplierArcology)), "capEx")>>
<<set $docks++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(25000*$upgradeMultiplierArcology)>>, will increase trade and slightly lower arcology's upkeep, but will affect security//
+ <</link>> //Will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology))>>, will increase trade and slightly lower arcology's upkeep, but will affect security//
<<elseif $docks == 3>>
<<link "Further modernize and enlarge the docks">>
- <<run cashX(forceNeg(65000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Math.trunc(65000*$upgradeMultiplierArcology)), "capEx")>>
<<set $docks++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(65000*$upgradeMultiplierArcology)>>, will increase trade and slightly lower arcology's upkeep, but will affect security//
+ <</link>> //Will cost <<print cashFormat(Math.trunc(65000*$upgradeMultiplierArcology))>>, will increase trade and slightly lower arcology's upkeep, but will affect security//
<<else>>
The docks are fully upgraded.
<</if>>
@@ -152,22 +152,22 @@ You quickly reach the transport hub, where a constant stream of vehicles, people
/* security */
<<if $hubSecurity == 1>>
<<link "Expand and modernize the surveillance system">>
- <<run cashX(forceNeg(15000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Mat.trunc(15000*$upgradeMultiplierArcology)), "capEx")>>
<<set $hubSecurity++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(15000*$upgradeMultiplierArcology)>> and lower the transport hub security modifiers//
+ <</link>> //Will cost <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology))>> and lower the transport hub security modifiers//
<<elseif $hubSecurity == 2>>
<<link "Establish a rapid response team">>
- <<run cashX(forceNeg(35000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Math.trunc(35000*$upgradeMultiplierArcology)), "capEx")>>
<<set $hubSecurity++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(35000*$upgradeMultiplierArcology)>> and further lower the transport hub security modifiers//
+ <</link>> //Will cost <<print cashFormat(Math.trunc(35000*$upgradeMultiplierArcology))>> and further lower the transport hub security modifiers//
<<elseif $hubSecurity == 3>>
<<link "Add additional security drones to the structure">>
- <<run cashX(forceNeg(55000*$upgradeMultiplierArcology), "capEx")>>
+ <<run cashX(forceNeg(Math.trunc(55000*$upgradeMultiplierArcology)), "capEx")>>
<<set $hubSecurity++>>
<<goto "transportHub">>
- <</link>> //Will cost <<print cashFormat(55000*$upgradeMultiplierArcology)>> and further lower the transport hub security modifiers//
+ <</link>> //Will cost <<print cashFormat(Math.trunc(55000*$upgradeMultiplierArcology))>> and further lower the transport hub security modifiers//
<<else>>
The hub security is fully upgraded
<</if>>
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index 6e9631705647a088540b809c864746b29475c89f..ba69c9cc2cde609b346a4fcd84cd0b3132d175e1 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -91,7 +91,10 @@ App.SF.upgrades = (function() {
};
function total() {
- return Object.values(V.SF.Squad).reduce((a,b) => a+b);
+ if (V.SF.Toggle === 0 || V.SF.Active < 1) {
+ return 0;
+ }
+ return Object.values(V.SF.Squad).reduce((a,b) => a+b);
}
function list(completeView = '') {
diff --git a/src/personalAssistant/assistantOptions.tw b/src/personalAssistant/assistantOptions.tw
index ef4550e6d13f9b955e3fc328f808e7a55688d46a..d7a2fa55d62b81f8af9f49f6710b39e46968a640 100644
--- a/src/personalAssistant/assistantOptions.tw
+++ b/src/personalAssistant/assistantOptions.tw
@@ -363,7 +363,7 @@ Seated at your desk, you glance at the visual representation of
<<if $arcologies[0].FSPaternalist != "unset">> <<set _seed.push("paternalism")>> <</if>>
<<if $arcologies[0].FSBodyPurist != "unset">> <<set _seed.push("body purism")>> <</if>>
<<if $arcologies[0].FSMaturityPreferentialist != "unset">> <<set _seed.push("maturity preferentialism")>> <</if>>
- <<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
+ <<if $arcologies[0].FSPastoralist != "unset">> <<set _seed.push("pastoralism")>> <</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">> <<set _seed.push("chattel religionism")>> <</if>>
<<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _seed.push("Egyptian revivalism")>> <</if>>
<<if $arcologies[0].FSRepopulationFocus != "unset">> <<set _seed.push("repopulationism")>> <</if>>