From 04d2982c5f217580afba6b0256e7cb875e6f41ca Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 21 Jan 2019 16:18:09 -0500
Subject: [PATCH] more budget fixes

---
 devNotes/VersionChangeLog-Premod+LoliMod.txt | 3 +++
 src/SecExp/seeUnit.tw                        | 8 ++++----
 src/uncategorized/pPeacekeepersDeficit.tw    | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index bbb0189c748..5a6221beb47 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,9 @@
 
 01/21/2019
 
+	1
+	-fixed an error with cloning
+
 	0
 	-overhauled budget tracking
 	-embedded vector art now handled in JS
diff --git a/src/SecExp/seeUnit.tw b/src/SecExp/seeUnit.tw
index 0a5d17ef3a3..dce90b6036d 100644
--- a/src/SecExp/seeUnit.tw
+++ b/src/SecExp/seeUnit.tw
@@ -28,7 +28,7 @@
 		<br>
 		<<link "Refine the drone network with $SF.Lower assistance" "seeUnit">>
 		<<set $secBots.maxTroops += 10>>
-			<<run cashX(forceNeg(5000 + 10 * $secBotsUpgradeCost * $secBots.equip), "securityExpansion")>>
+			<<run cashX(forceNeg(5000 + 10 * $secBotsUpgradeCost * $secBots.equip)), "securityExpansion")>>
 		<</link>>
 		Utilize the technological developments made by $SF.Lower to further improve the control matrix of the security drones.
 		<br>//Costs <<print cashFormat(5000 + 10 * $secBotsUpgradeCost * $secBots.equip)>> and will increase the max by 10//
@@ -41,7 +41,7 @@
 		<br>
 		<<link "Improve drone weaponry and armor" "seeUnit">>
 			<<set $secBots.equip += 1>>
-			<<run cashX(forceNeg((($secBotsUpgradeCost * $secBots.maxTroops) + 1000)), "securityExpansion")>>
+			<<run cashX(forceNeg(($secBotsUpgradeCost * $secBots.maxTroops) + 1000), "securityExpansion")>>
 		<</link>>
 		Invest in better equipment for your drones to increase their battle effectiveness.
 		<br>//Costs <<print cashFormat(($secBotsUpgradeCost * $secBots.maxTroops) + 1000)>> and will increase attack and defense value of the unit by 15% for every upgrade.//
@@ -247,7 +247,7 @@
 		<br>
 		<<link "Improve weaponry and equipment">>
 			<<set $slaveUnits[$targetIndex].equip += 1>>
-			<<run cashX(forceNeg($equipUpgradeCost * $slaveUnits[$targetIndex].maxTroops) + 1000), "securityExpansion")>>
+			<<run cashX(forceNeg($equipUpgradeCost * $slaveUnits[$targetIndex].maxTroops + 1000), "securityExpansion")>>
 			<<goto "seeUnit">>
 		<</link>>
 		Invest in better equipment for your soldiers to increase their battle effectiveness.
@@ -453,7 +453,7 @@
 			<br>
 			<<link "Attach Special Force advisors" "seeUnit">>
 				<<set $mercUnits[$targetIndex].SF = 1>>
-				<<run cashX(forceNeg($equipUpgradeCost * $mercUnits[$targetIndex].maxTroops) + 5000), "securityExpansion")>>
+				<<run cashX(forceNeg(($equipUpgradeCost * $mercUnits[$targetIndex].maxTroops) + 5000), "securityExpansion")>>
 			<</link>>
 			Attach $SF.Lower advisors to the unit.
 			<br>//Costs <<print cashFormat(($equipUpgradeCost * $mercUnits[$targetIndex].maxTroops) + 5000)>> and will slightly increase the base stats of the unit.//
diff --git a/src/uncategorized/pPeacekeepersDeficit.tw b/src/uncategorized/pPeacekeepersDeficit.tw
index 18819bd2285..f6924ef32c1 100644
--- a/src/uncategorized/pPeacekeepersDeficit.tw
+++ b/src/uncategorized/pPeacekeepersDeficit.tw
@@ -28,7 +28,8 @@ The singular solution to the two problems is obvious. It's equally obvious that
 			Understanding that the general needs to couch the situation in a way he can justify in public, and perhaps in a way he can justify to himself, you offer to house the prisoners on a contract basis, with immediate payment to the general so he can meet his forces' immediate needs. Naturally, the prisoners will be kept busy while you keep them; menial labor seems appropriate. It's unlikely that the situation will ever stabilize to the point where they can be released, so for safety, they should all be detained indefinitely. And of course, each prisoner's individual detention will be available for resale. Just like any other slave's.
 			<br><br>
 			The general is unable to keep from smiling slightly when he hears that you understand perfectly and are willing and able to assist. There's some bitterness there, but not much. The two of you adjust the terms. The new menial slaves will be delivered immediately, several hundred of them; the general prefers to have this be a one-time transfer. After all, having an ongoing prisoner pipeline between his prisoner pens and the Free City might draw unwanted political attention. For now, he has the funds he needs, not to mention an empty prison camp.
-			<<set $peacekeepers.attitude += 5, cashX(-100000, "peacekeepers") $menials += 200>>
+			<<set $peacekeepers.attitude += 5, $menials += 200>>
+			<<run cashX(-100000, "peacekeepers")>>
 		<</replace>>
 	<</link>> //This will cost <<print cashFormat(100000)>> and provide a number of menial slaves//
 <<else>>
-- 
GitLab