From eaf1471894b1b83398dd51adb33d3d994fc0c398 Mon Sep 17 00:00:00 2001
From: x <okp57855@psoxs.com>
Date: Fri, 1 Jun 2018 00:53:46 +1200
Subject: [PATCH] Fixes II

---
 src/SecExp/propagandaHub.tw        | 18 +++++++++---------
 src/SecExp/weaponsManufacturing.tw |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index 909e667de6d..9ce4f20b4e1 100644
--- a/src/SecExp/propagandaHub.tw
+++ b/src/SecExp/propagandaHub.tw
@@ -27,7 +27,7 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
 		<<goto "propagandaHub">>
 	<</link>>
 	<br>Set up a propaganda campaign to align your citizens with your goals.
-	<br>//Costs <<print cashFormat(5000*$upgradeMultiplierArcology*_HistoryDiscount)>>. Will provide the focused resource each week, but will cost reputation in upkeep.//
+	<br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount))>>. Will provide the focused resource each week, but will cost reputation in upkeep.//
 <<else>>
 	You have set up a team of trained slaves and expert propagandists, ready to spread the message of your choosing to the population.
 	<br>
@@ -86,7 +86,7 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
 			<<goto "propagandaHub">>
 		<</link>>
 		<br>Invest more resources into the project to increase its effectiveness.
-		<br>//Costs <<print cashFormat(5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$HackingSkillMultiplier)>>. Will provide more of the focused resource each week but increase reputation upkeep.//
+		<br>//Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$HackingSkillMultiplier))>>. Will provide more of the focused resource each week but increase reputation upkeep.//
 	<<else>>
 		You upgraded your propaganda machine to its limits.
 	<</if>>
@@ -104,7 +104,7 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
 		<<goto "propagandaHub">>
 	<</link>>
 	<br>Set up a department tasked with guaranteeing the authenticity of all information available in the arcology. Of course if reality is against what is best for the arcology, then it should be redacted as well.
-	<br>//Costs <<print cashFormat(5000*$upgradeMultiplierArcology * _HistoryDiscount)>>. Will provide authority and unlock special upgrades, but will increase upkeep.//
+	<br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology * _HistoryDiscount))>>. Will provide authority and unlock special upgrades, but will increase upkeep.//
 <<else>>
 	<<if $miniTruth < 5>>
 		<<link "Enlarge the authenticity department">>
@@ -114,7 +114,7 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
 			<<goto "propagandaHub">>
 		<</link>>
 		<br>Invest more resources into the project to increase its effectiveness.
-		<br>//Costs <<print cashFormat(5000 * $upgradeMultiplierArcology * ($miniTruth + 1) * _HistoryDiscount)>>. Will provide more authority each week, but increases upkeep.//
+		<br>//Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierArcology * ($miniTruth + 1) * _HistoryDiscount))>>. Will provide more authority each week, but increases upkeep.//
 	<<else>>
 		You have upgraded the authenticity department to its maximum.
 	<</if>>
@@ -127,7 +127,7 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
 			<<goto "propagandaHub">>
 		<</link>>
 		<br>Install an automatic news generator, able to fabricate thousands of plausible sounding news every day.
-		<br>//Costs <<print cashFormat(10000 * $upgradeMultiplierArcology * _HistoryDiscount)>>. The authenticity dept. now provides a small amount of reputation as well as authority, but increases upkeep.//
+		<br>//Costs <<print cashFormat(Math.trunc(10000 * $upgradeMultiplierArcology * _HistoryDiscount))>>. The authenticity dept. now provides a small amount of reputation as well as authority, but increases upkeep.//
 	<<else>>
 		You have installed an automatic news generator. [[Remove news generator|propagandaHub][$fakeNews = 0, $propHubUpkeep -= $upgradeUpkeep]]
 	<</if>>
@@ -141,7 +141,7 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
 			<<goto "propagandaHub">>
 		<</link>>
 		<br>Institute a system able to release erroneous, but plausible, information about your business, leading your competitors to prepared financial traps.
-		<br>//Costs <<print cashFormat(10000 * $upgradeMultiplierArcology * _HistoryDiscount*$HackingSkillMultiplier)>>. The authenticity dept. now slightly increases prosperity each week as well as authority, but increases upkeep.//
+		<br>//Costs <<print cashFormat(Math.trunc(10000 * $upgradeMultiplierArcology * _HistoryDiscount*$HackingSkillMultiplier))>>. The authenticity dept. now slightly increases prosperity each week as well as authority, but increases upkeep.//
 	<<else>>
 		You have instituted controlled leaks protocols, able to create fabricated leaks of sensible information. [[Shut down leak protocols|propagandaHub][$controlLeaks = 0, $propHubUpkeep -= $upgradeUpkeep]]
 	<</if>>
@@ -159,7 +159,7 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
 		<<goto "propagandaHub">>
 	<</link>>
 	<br>Set up a department tasked with the protection of your person, as well as operations requiring a delicate approach.
-	<br>//Costs <<print cashFormat(10000*$upgradeMultiplierArcology * _HistoryDiscount)>>. Will provide authority and unlock special upgrades, but will increase upkeep.//
+	<br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology * _HistoryDiscount))>>. Will provide authority and unlock special upgrades, but will increase upkeep.//
 <<else>>
 	<<if $secretService < 5 && $rep >= ($secretService * 1000) + 5000>>
 		<<link "Expand the secret service">>
@@ -169,7 +169,7 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
 			<<goto "propagandaHub">>
 		<</link>>
 		<br>Invest more resources into the project to increase its effectiveness.
-		<br>//Costs <<print cashFormat(5000 * $upgradeMultiplierArcology * ($secretService + 1) * _HistoryDiscount)>>. Will provide more authority each week, but increases upkeep.//
+		<br>//Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierArcology * ($secretService + 1) * _HistoryDiscount))>>. Will provide more authority each week, but increases upkeep.//
 	<<elseif $secretService < 5>>
 		You lack the reputation to further expand operations.
 	<<else>>
@@ -184,7 +184,7 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
 			<<goto "propagandaHub">>
 		<</link>>
 		<br>Create a black ops team, ready to carry out corporate sabotage and sensitive operations to further your goals.
-		<br>//Costs <<print cashFormat(10000 * $upgradeMultiplierArcology * _HistoryDiscount)>>. The secret services now provides security as well as authority, but increases upkeep.//
+		<br>//Costs <<print cashFormat(Math.trunc(10000 * $upgradeMultiplierArcology * _HistoryDiscount))>>. The secret services now provides security as well as authority, but increases upkeep.//
 	<<else>>
 		You have created a black ops team.
 	<</if>>
diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw
index 5aa12d624e4..0d9e5f3ed56 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -456,3 +456,4 @@ __Upgrades__:
 		<</if>>
 	<</for>>
 <</if>>
+<br>[[Return this sector to standard manufacturing|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $sectors[$AS].type = "Manufacturing", $weapManu = 0]] //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>//
-- 
GitLab