diff --git a/src/pregmod/manageCorporation.tw b/src/pregmod/manageCorporation.tw
index d26daf1d5fe3cf8f1b6c429bde94a3619a3cbfd1..6325496683213c275ac5ada06880f10bcf0b8c9d 100644
--- a/src/pregmod/manageCorporation.tw
+++ b/src/pregmod/manageCorporation.tw
@@ -166,7 +166,7 @@ __Division Management__
_corpDivExtraRev = menialSlaveCost() * 10>> /*bit of statistics setup to help make informed decisions*/
<br>The corporation has an extralegal enslavement division.
<br>It averages @@.green;$corpDivExtraDev new slaves@@ each week.
- <br>It costs @@.yellowgreen;<<print cashFormat(_corpDivExtraCost)>>@@ to run. On average that is @@.yellowgreen;<<print cashFormat(_corpDivExtraCostPU)>>@@ per slave.
+ <br>It costs @@.red;<<print cashFormat(_corpDivExtraCost)>>@@ to run. On average that is @@.red;<<print cashFormat(_corpDivExtraCostPU)>>@@ per slave.
<br>The slaves acquired can be sold for @@.yellowgreen;<<print cashFormat(_corpDivExtraRev)>>@@ each.
<<if $corpDivExtraSlaves > 0>>
<br>Currently the division is holding
@@ -202,7 +202,7 @@ __Division Management__
<</if>>
| [[Sell all|Manage Corporation][$corpCash += $corpDivExtraSlaves * 10 * menialSlaveCost(-$corpDivExtraSlaves), $corpDivExtraSlaves = 0, $menialDemandFactor -= $corpDivExtraSlaves, $corpRev += $corpDivExtraSlaves * 10 * menialSlaveCost(-$corpDivExtraSlaves)]]
<</if>>
- <br>Expanding the division costs @@.yellowgreen;<<print cashFormat(20000)>>.@@ Downsizing recoups 80% of the investment. /*changing the division's size*/
+ <br>Expanding the division costs @@.red;<<print cashFormat(20000)>>.@@ Downsizing recoups 80% of the investment. /*changing the division's size*/
<br><<if $corpCash > 20000>>
[[Expand Division|Manage Corporation][$corpDivExtraDev += 1, $corpCash -= 20000, $corpAssetsDev += 20000]]
<</if>>
@@ -271,7 +271,7 @@ __Division Management__
_corpDivLegalRev = menialSlaveCost() * 15>>
<br>The corporation has a legal enslavement division.
<br>It averages @@.green;$corpDivLegalDev new slaves@@ each week.
- <br>It costs @@.yellowgreen;<<print cashFormat(_corpDivLegalCost)>>@@ to run. On average that is @@.yellowgreen;<<print cashFormat(_corpDivLegalCostPU)>>@@ per slave.
+ <br>It costs @@.red;<<print cashFormat(_corpDivLegalCost)>>@@ to run. On average that is @@.red;<<print cashFormat(_corpDivLegalCostPU)>>@@ per slave.
<br>The slaves acquired can be sold for @@.yellowgreen;<<print cashFormat(_corpDivLegalRev)>>@@ each.
<<if $corpDivLegalSlaves > 0>>
<br>Currently the division is holding @@.green;<<if $corpDivLegalSlaves > 1>>$corpDivLegalSlaves slaves<<else>>one slave<</if>>.@@
@@ -313,7 +313,7 @@ __Division Management__
<</if>>
| [[Sell all|Manage Corporation][$corpCash += $corpDivLegalSlaves * 15 * menialSlaveCost(-$corpDivLegalSlaves), $corpDivLegalSlaves = 0, $menialDemandFactor -= $corpDivLegalSlaves, $corpRev += $corpDivLegalSlaves * 15 * menialSlaveCost(-$corpDivLegalSlaves)]]
<</if>>
- <br>Expanding the division costs @@.yellowgreen;<<print cashFormat(25000)>>.@@ Downsizing recoups 80% of the investment.
+ <br>Expanding the division costs @@.red;<<print cashFormat(25000)>>.@@ Downsizing recoups 80% of the investment.
<br><<if $corpCash > 25000>>
[[Expand Division|Manage Corporation][$corpDivLegalDev += 1, $corpCash -= 25000, $corpAssetsDev += 25000]]
<</if>>
@@ -395,7 +395,7 @@ __Division Management__
_corpDivBreakProc = Math.trunc($corpDivBreakDev * 0.3)>>
<br>The corporation has a slave breaking division.
<br>It can break an average of @@.green;<<print _corpDivBreakProc>> slaves@@ each week when filled to capacity ($corpDivBreakDev).
- <br>It costs @@.yellowgreen;<<print cashFormat(_corpDivBreakCost)>>@@ to run. On average that is @@.yellowgreen;<<print cashFormat(_corpDivBreakCostPU)>>@@ per slave broken.
+ <br>It costs @@.red;<<print cashFormat(_corpDivBreakCost)>>@@ to run. On average that is @@.red;<<print cashFormat(_corpDivBreakCostPU)>>@@ per slave broken.
<br>The broken slaves can be sold for @@.yellowgreen;<<print cashFormat(_corpDivBreakRev)>>@@ each.
<<if $corpDivBreakSlaves > 0>>
<br>Currently the division is attempting to break <<if $corpDivBreakSlaves > 1>>@@.green;$corpDivBreakSlaves slaves.@@<<else>>@@.green;one slave.@@<</if>>
@@ -452,7 +452,7 @@ __Division Management__
<</if>>
| [[Sell all|Manage Corporation][$corpCash += $corpDivBreakSlaves2 * 15 * menialSlaveCost(-$corpDivBreakSlaves2), $corpDivBreakSlaves2 = 0, $menialDemandFactor -= $corpDivBreakSlaves2, $corpRev += $corpDivBreakSlaves2 * 15 * menialSlaveCost(-$corpDivBreakSlaves2)]]
<</if>>
- <br>Expanding the division costs @@.yellowgreen;<<print cashFormat(9000)>>.@@ Downsizing recoups 80% of the investment.
+ <br>Expanding the division costs @@.red;<<print cashFormat(9000)>>.@@ Downsizing recoups 80% of the investment.
<br>
<<if $corpCash > 9000>>
[[Expand Division|Manage Corporation][$corpDivBreakDev += 1, $corpCash -= 9000, $corpAssetsDev += 9000]]
@@ -556,7 +556,7 @@ __Division Management__
_corpDivSurgeryProc = Math.trunc($corpDivSurgeryDev * 0.5)>>
<br>The corporation has a physical slave modification division.
<br>It can modify an average of @@.green;<<print _corpDivSurgeryProc>> slaves@@ each week when filled to capacity ($corpDivSurgeryDev).
- <br>It costs @@.yellowgreen;<<print cashFormat(_corpDivSurgeryCost)>>@@ to run. On average that is @@.yellowgreen;<<print cashFormat(_corpDivSurgeryCostPU)>>@@ per slave.
+ <br>It costs @@.red;<<print cashFormat(_corpDivSurgeryCost)>>@@ to run. On average that is @@.red;<<print cashFormat(_corpDivSurgeryCostPU)>>@@ per slave.
<br>The improved slaves can be sold for @@.yellowgreen;<<print cashFormat(_corpDivSurgeryRev)>>@@ each.
<<if $corpDivSurgerySlaves > 0>>
<br>Currently the division is working on
@@ -612,7 +612,7 @@ __Division Management__
<</if>>
| [[Sell all|Manage Corporation][$corpCash += $corpDivSurgerySlaves2 * 23 * menialSlaveCost(-$corpDivSurgerySlaves2), $corpDivSurgerySlaves2 = 0, $menialDemandFactor -= $corpDivSurgerySlaves2, $corpRev += $corpDivSurgerySlaves2 * 23 * menialSlaveCost(-$corpDivSurgerySlaves2)]]
<</if>>
- <br>Expanding the division costs @@.yellowgreen;<<print cashFormat(20000)>>.@@ Downsizing recoups 80% of the investment.
+ <br>Expanding the division costs @@.red;<<print cashFormat(20000)>>.@@ Downsizing recoups 80% of the investment.
<br>
<<if $corpCash > 20000>>
[[Expand Division|Manage Corporation][$corpDivSurgeryDev += 1, $corpCash -= 20000, $corpAssetsDev += 20000]]
@@ -710,7 +710,7 @@ __Division Management__
_corpDivTrainProc = Math.trunc($corpDivTrainDev * 0.2)>>
<br>The corporation has a slave training division.
<br>It can train an average of @@.green;<<print _corpDivTrainProc>> slaves@@ each week when filled to capacity ($corpDivTrainDev).
- <br>It costs @@.yellowgreen;<<print cashFormat(_corpDivTrainCost)>>@@ to run. On average that is @@.yellowgreen;<<print cashFormat(_corpDivTrainCostPU)>>@@ per slave.
+ <br>It costs @@.red;<<print cashFormat(_corpDivTrainCost)>>@@ to run. On average that is @@.red;<<print cashFormat(_corpDivTrainCostPU)>>@@ per slave.
<br>The trained slaves can be sold for @@.yellowgreen;<<print cashFormat(_corpDivTrainRev)>>@@ each.
<<if $corpDivTrainSlaves > 0>>
<br>Currently the division is training
@@ -739,7 +739,7 @@ __Division Management__
_corpDivTrainProc = Math.trunc($corpDivTrainDev * 0.2)>>
<br>The corporation has a slave training division.
<br>It can train an average of @@.green;<<print _corpDivTrainProc>> slaves@@ each week when filled to capacity ($corpDivTrainDev).
- <br>It costs @@.yellowgreen;<<print cashFormat(_corpDivTrainCost)>>@@ to run. On average that is @@.yellowgreen;<<print cashFormat(_corpDivTrainCostPU)>>@@ per slave.
+ <br>It costs @@.red;<<print cashFormat(_corpDivTrainCost)>>@@ to run. On average that is @@.red;<<print cashFormat(_corpDivTrainCostPU)>>@@ per slave.
<br>The trained slaves can be sold for @@.yellowgreen;<<print cashFormat(_corpDivTrainRev)>>@@ each.
<<if $corpDivTrainSlaves > 0>>
<br>Currently the division is training
@@ -768,7 +768,7 @@ __Division Management__
_corpDivTrainProc = Math.trunc($corpDivTrainDev * 0.2)>>
<br>The corporation has a slave training division.
<br>It can train an average of @@.green;<<print _corpDivTrainProc>> slaves@@ each week when filled to capacity ($corpDivTrainDev).
- <br>It costs @@.yellowgreen;<<print cashFormat(_corpDivTrainCost)>>@@ to run. On average that is @@.yellowgreen;<<print cashFormat(_corpDivTrainCostPU)>>@@ per slave.
+ <br>It costs @@.red;<<print cashFormat(_corpDivTrainCost)>>@@ to run. On average that is @@.red;<<print cashFormat(_corpDivTrainCostPU)>>@@ per slave.
<br>The trained slaves can be sold for @@.yellowgreen;<<print cashFormat(_corpDivTrainRev)>>@@ each.
<<if $corpDivTrainSlaves > 0>>
<br>Currently the division is training
@@ -836,7 +836,7 @@ __Division Management__
| [[Sell all|Manage Corporation][$corpCash += $corpDivTrainSlaves2 * 34 * menialSlaveCost(-$corpDivTrainSlaves2), $corpDivTrainSlaves2 = 0, $menialDemandFactor -= $corpDivTrainSlaves2, $corpRev += $corpDivTrainSlaves2 * 34 * menialSlaveCost(-$corpDivTrainSlaves2)]]
<</if>>
<</if>>
- <br>Expanding the division costs @@.yellowgreen;<<print cashFormat(25000)>>.@@ Downsizing recoups 80% of the investment.
+ <br>Expanding the division costs @@.red;<<print cashFormat(25000)>>.@@ Downsizing recoups 80% of the investment.
<br>
<<if $corpCash > 25000>>
[[Expand Division|Manage Corporation][$corpDivTrainDev += 1, $corpCash -= 25000, $corpAssetsDev += 25000]]
@@ -966,7 +966,7 @@ __Division Management__
@@.red;less than one slave@@
<</if>>
each week when filled to capacity ($corpDivArcadeDev).
- <br>It costs @@.yellowgreen;<<print cashFormat(_corpDivArcadeCost)>>@@ to run. On average that is @@.yellowgreen;<<print cashFormat(_corpDivArcadeCostPU)>>@@ per slave.
+ <br>It costs @@.red;<<print cashFormat(_corpDivArcadeCost)>>@@ to run. On average that is @@.red;<<print cashFormat(_corpDivArcadeCostPU)>>@@ per slave.
<br>The arcade generates on average @@.yellowgreen;<<print cashFormat(_corpDivArcadeRev)>>@@ per slave.
<<if $corpDivArcadeSlaves > 0>>
<br>Currently the division is exploiting
@@ -988,7 +988,7 @@ __Division Management__
<</if>>
<</if>>
<</if>>
- <br>Expanding the division costs @@.yellowgreen;<<print cashFormat(5000)>>.@@ Downsizing recoups 80% of the investment.
+ <br>Expanding the division costs @@.red;<<print cashFormat(5000)>>.@@ Downsizing recoups 80% of the investment.
<br><<if $corpCash > 5000>>
[[Expand Division|Manage Corporation][$corpDivArcadeDev += 1, $corpCash -= 5000, $corpAssetsDev += 5000]]
<</if>>
@@ -1054,7 +1054,7 @@ __Division Management__
_corpDivMenialProc = Math.trunc($corpDivMenialDev * 0.05)>>
<br>The corporation has a menial services division.
<br>It has to replace approximately <<if _corpDivMenialProc > 1>>@@.red;<<print _corpDivMenialProc>> slaves@@<<else>>@@.red;less than one slave@@<</if>> each week when operating at capacity ($corpDivMenialDev).
- <br>It costs @@.yellowgreen;<<print cashFormat(_corpDivMenialCost)>>@@ to run. On average that is @@.yellowgreen;<<print cashFormat(_corpDivMenialCostPU)>>@@ per slave.
+ <br>It costs @@.red;<<print cashFormat(_corpDivMenialCost)>>@@ to run. On average that is @@.red;<<print cashFormat(_corpDivMenialCostPU)>>@@ per slave.
<br>The menial services generate @@.yellowgreen;<<print cashFormat(_corpDivMenialRev)>>@@ per slave on average.
<<if $corpDivMenialSlaves > 0>>
<br>Currently the division is exploiting <<if $corpDivMenialSlaves > 1>>@@.green;$corpDivMenialSlaves slaves.@@<<else>>@@.green;one slave.@@<</if>>
@@ -1071,7 +1071,7 @@ __Division Management__
<</if>>
<</if>>
<</if>>
- <br>Expanding the division costs @@.yellowgreen;<<print cashFormat(6500)>>.@@ Downsizing recoups 80% of the investment.
+ <br>Expanding the division costs @@.red;<<print cashFormat(6500)>>.@@ Downsizing recoups 80% of the investment.
<br><<if $corpCash > 6500>>
[[Expand Division|Manage Corporation][$corpDivMenialDev += 1, $corpCash -= 6500, $corpAssetsDev += 6500]]
<</if>>
@@ -1138,7 +1138,7 @@ __Division Management__
_corpDivDairyProc = Math.trunc($corpDivDairyDev * 0.05)>>
<br>The corporation has a dairy division.
<br>It has to replace approximately <<if _corpDivDairyProc > 1>>@@.red;<<print _corpDivDairyProc>> slaves@@<<else>>@@.red;less than one slave@@<</if>> each week when operating at capacity ($corpDivDairyDev).
- <br>It costs @@.yellowgreen;<<print cashFormat(_corpDivDairyCost)>>@@ to run. On average that is @@.yellowgreen;<<print cashFormat(_corpDivDairyCostPU)>>@@ per slave.
+ <br>It costs @@.red;<<print cashFormat(_corpDivDairyCost)>>@@ to run. On average that is @@.red;<<print cashFormat(_corpDivDairyCostPU)>>@@ per slave.
<br>The dairy generates @@.yellowgreen;<<print cashFormat(_corpDivDairyRev)>>@@ per slave on average.
<<if $corpDivDairySlaves > 0>>
<br>Currently the division is milking <<if $corpDivDairySlaves > 1>>@@.green;$corpDivDairySlaves slaves.@@<<else>>@@.green;one slave.@@<</if>>
@@ -1155,7 +1155,7 @@ __Division Management__
<</if>>
<</if>>
<</if>>
- <br>Expanding the division costs @@.yellowgreen;<<print cashFormat(15000)>>.@@ Downsizing recoups 80% of the investment.
+ <br>Expanding the division costs @@.red;<<print cashFormat(15000)>>.@@ Downsizing recoups 80% of the investment.
<br><<if $corpCash > 15000>>
[[Expand Division|Manage Corporation][$corpDivDairyDev += 1, $corpCash -= 15000, $corpAssetsDev += 15000]]
<</if>>
@@ -1229,7 +1229,7 @@ __Division Management__
_corpDivWhoreProc = Math.trunc($corpDivWhoreDev * 0.05)>>
<br>The corporation has an escort division.
<br>It has to replace approximately <<if _corpDivWhoreProc > 1>>@@.red;<<print _corpDivWhoreProc>> slaves@@<<else>>@@.red;less than one slave@@<</if>> each week when operating at capacity ($corpDivWhoreDev).
- <br>It costs @@.yellowgreen;<<print cashFormat(_corpDivWhoreCost)>>@@ to run. On average that is @@.yellowgreen;<<print cashFormat(_corpDivWhoreCostPU)>>@@ per slave.
+ <br>It costs @@.red;<<print cashFormat(_corpDivWhoreCost)>>@@ to run. On average that is @@.red;<<print cashFormat(_corpDivWhoreCostPU)>>@@ per slave.
<br>The escorts generate @@.yellowgreen;<<print cashFormat(_corpDivWhoreRev)>>@@ per slave on average.
<<if $corpDivWhoreSlaves > 0>>
<br>Currently the division is whoring out <<if $corpDivWhoreSlaves > 1>>@@.green;$corpDivWhoreSlaves slaves.@@<<else>>@@.green;one slave.@@<</if>>
@@ -1247,7 +1247,7 @@ __Division Management__
<</if>>
<<elseif $corpDivTrainSurgerySwitch == 1 && $corpDivTrainSurgeryTimer < 20>>
<<if $corpCash >= Math.trunc((26 + 0.4 * $corpDivTrainSurgeryTimer) * menialSlaveCost())>>
- If you do not have eligable slaves in your corporation to move here you can buy them from the market. [[Buy 1|Manage Corporation][$corpCash -= Math.trunc((26 + 0.4 * $corpDivTrainSurgeryTimer) * menialSlaveCost(), $corpDivWhoreSlaves += 1, $menialSupplyFactor -= 1, $corpAssetsSlave += (26 + 4 * $corpDivTrainSurgeryTimer) * menialSlaveCost()]]
+ If you do not have eligable slaves in your corporation to move here you can buy them from the market. [[Buy 1|Manage Corporation][$corpCash -= Math.trunc((26 + 0.4 * $corpDivTrainSurgeryTimer) * menialSlaveCost()), $corpDivWhoreSlaves += 1, $menialSupplyFactor -= 1, $corpAssetsSlave += (26 + 4 * $corpDivTrainSurgeryTimer) * menialSlaveCost()]]
<<if $corpCash > (260 + 4 * $corpDivTrainSurgeryTimer) * menialSlaveCost(10)>>
| [[Buy 10|Manage Corporation][$corpCash -= (260 + 4 * $corpDivTrainSurgeryTimer) * menialSlaveCost(10), $corpDivWhoreSlaves += 10, $menialSupplyFactor -= 10, $corpAssetsSlave += (260 + 4 * $corpDivTrainSurgeryTimer) * menialSlaveCost(10)]]
<</if>>
@@ -1268,7 +1268,7 @@ __Division Management__
<</if>>
<</if>>
<</if>>
- <br>Expanding the division costs @@.yellowgreen;<<print cashFormat(20000)>>.@@ Downsizing recoups 80% of the investment.
+ <br>Expanding the division costs @@.red;<<print cashFormat(20000)>>.@@ Downsizing recoups 80% of the investment.
<br><<if $corpCash > 20000>>
[[Expand Division|Manage Corporation][$corpDivWhoreDev += 1, $corpCash -= 20000, $corpAssetsDev += 20000]]
<</if>>
@@ -1376,8 +1376,8 @@ __Dividend__
<br><br>
__Shares__
-<br>You own $personalShares shares while another $publicShares shares are traded publicly. The going rate on the market for 1000 shares is currently @@.yellowgreen;<<print cashFormat(corpSharePrice())>>.@@
-<br>The corporation can buyback 1000 shares for @@.yellowgreen;<<print cashFormat(corpSharePrice(-1000))>>@@ or issue 1000 shares and net @@.yellowgreen;<<print cashFormat(corpSharePrice(1000))>>.@@
+<br>You own <<print commaNum($personalShares)>> shares while another <<print commaNum($publicShares)>> shares are traded publicly. The going rate on the market for 1000 shares is currently @@.yellowgreen;<<print cashFormat(corpSharePrice())>>.@@
+<br>The corporation can buyback 1000 shares for @@.red;<<print cashFormat(corpSharePrice(-1000))>>@@ or issue 1000 shares and net @@.yellowgreen;<<print cashFormat(corpSharePrice(1000))>>.@@
<<if $corpCash > corpSharePrice(-1000)>>
<<if $publicShares <= $personalShares - 2000 && $publicShares > 0>> /*It won't buy back player shares if the corporation is entirely owned by the player*/
<br>The corporation can buyback some of your shares. [[Buyback 1000|Manage Corporation][cashX(corpSharePrice(-1000), "stocksTraded"), $corpCash -= corpSharePrice(-1000), $personalShares -= 1000]]
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 236021b03bc94d0012e457dea9706b907b7e4db7..9f65ff970a2430bf0033b677b958ded1a30a37a1 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -2207,36 +2207,6 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
</tr>
<</if>>
- <<if $securityForceActive > 0>>
- <tr>
- <td>Acquisitions: [[$securityForceNameCaps|SFM Barracks][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]]</td>
- <td>
- <<if Math.trunc($lastWeeksCashIncome.mercenaries) > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashIncome.mercenaries))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashIncome.mercenaries))>>
- <</if>>
- </td>
- <td>
- <<if Math.trunc($lastWeeksCashExpenses.mercenaries) < 0>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashExpenses.mercenaries)))>>@@
- <<else>>
- <<print cashFormat(Math.trunc($lastWeeksCashExpenses.mercenaries))>>
- <</if>>
- </td>
- <td>
- <<set $lastWeeksCashProfits.mercenaries = ($lastWeeksCashIncome.mercenaries + $lastWeeksCashExpenses.mercenaries)>>
- <<if $lastWeeksCashProfits.mercenaries > 0>>
- @@.yellowgreen;+<<print cashFormat(Math.trunc($lastWeeksCashProfits.mercenaries))>>@@
- <<elseif Math.trunc($lastWeeksCashProfits.mercenaries) == 0>>
- <<print cashFormat(Math.trunc($lastWeeksCashProfits.mercenaries))>>
- <<else>>
- @@.red;-<<print cashFormat(Math.abs(Math.trunc($lastWeeksCashProfits.mercenaries)))>>@@
- <</if>>
- </td>
- </tr>
- <</if>>
-
<<if (def $peacekeepers) and ($peacekeepers != 0) >>
<<if $peacekeepers.undermining != 0>>
<tr>