diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 7eec38c70923898aa34b27217d3c92df53adf50a..7904018c519c626d061ca1c8859fd8c21e2c980c 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -11,7 +11,6 @@
<<SlaveSort $DairyiIDs>>
<<set _DL = $DairyiIDs.length, $dairySlaves = _DL, _SL = $slaves.length, $bioreactorPerfectedID = 0, $legendaryBallsID = 0, $legendaryCowID = 0, $milkmaidDevotionBonus = 1, $milkmaidHealthBonus = 0, $milkmaidTrustBonus = 1, $milkmaidDevotionThreshold = 45, $milkmaidTrustThreshold = 35, _anusesStretched = 0, _birthers = 0, _births = 0, _cumWeek = 0, _femCumWeek = 0, _FLsFetish = 0, _milkWeek = 0, _balltacular = 0, _boobtacular = 0, _careerForgotten = 0, _chemMinor = 0, _chemSevere = 0, _desterilized = 0, _hatefilled = 0, _horrified = 0, $intelligenceLost = 0, _mindbroken = 0, _profits = 0, _skillsLost = 0, _stupidified = 0, _vaginasStretched = 0>>
-<<set _surgeryCost forceNeg($surgeryCost)>>
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.dairy = initFacilityStatistics($facility.dairy)>>
@@ -407,16 +406,16 @@
<</if>>
<<if $slaves[$i].prostate == 1>>
<<set $slaves[$i].prostate = 2, $slaves[$i].health -= 10>>
- <<run cashX(_surgeryCost, "slaveSurgery", $slaves[$i])>>
+ <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>>
<</if>>
<<if $slaves[$i].vasectomy == 1>>
<<set $slaves[$i].vasectomy = 0, $slaves[$i].health -= 10>>
- <<run cashX(_surgeryCost, "slaveSurgery", $slaves[$i])>>
+ <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>>
<</if>>
<<if ($dairySlimMaintain == 0)>>
<<if ($slaves[$i].lactation < 2) && ($slaves[$i].boobs > 300 || $slaves[$i].dick == 0 || $slaves[$i].lactation == 1 || $dairyImplantsSetting == 1) && $dairyImplantsSetting != 2>>
<<set $slaves[$i].lactation = 2, $slaves[$i].health -= 10>>
- <<run cashX(_surgeryCost, "slaveSurgery", $slaves[$i])>>
+ <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>>
<</if>>
<</if>>
<<if ($dairyFeedersUpgrade == 1) && ($dairyFeedersSetting > 0)>>
@@ -795,11 +794,11 @@
<</if>>
<<elseif ($slaves[$i].pregKnown == 1)>>
<<if ($dairyPregSetting > 2)>>
- <<run cashX(100, "Milked", $slaves[$i])>>
+ <<run cashX(100, "milked", $slaves[$i])>>
<<elseif ($dairyPregSetting > 1)>>
- <<run cashX(50, "Milked", $slaves[$i])>>
+ <<run cashX(50, "milked", $slaves[$i])>>
<<else>>
- <<run cashX(25, "Milked", $slaves[$i])>>
+ <<run cashX(25, "milked", $slaves[$i])>>
<</if>>
<<if ($dairyPregSetting > 1) && ($slaves[$i].vagina < 4)>>
<<set $slaves[$i].vagina++>>
diff --git a/src/js/datatypeCleanupJS.tw b/src/js/datatypeCleanupJS.tw
index 91b64fdf60d23c1814ad991fc751b9b6abaad31e..75f7f434a08e2cc76dfa91515779e4b118ad843e 100644
--- a/src/js/datatypeCleanupJS.tw
+++ b/src/js/datatypeCleanupJS.tw
@@ -597,7 +597,9 @@ window.slaveMiscellaneousDatatypeCleanup = function slaveMiscellaneousDatatypeCl
if (typeof slave.death !== "string") {
slave.death = "";
}
- slave.slaveCost = Math.max(+slave.slaveCost, -1) || -1;
+ if (slave.slaveCost !== 0) {
+ slave.slaveCost = Math.max(+slave.slaveCost, -1) || -1;
+ }
slave.lifetimeCashExpenses = Math.max(+slave.lifetimeCashExpenses, 0) || 0;
slave.lifetimeCashIncome = Math.max(+slave.lifetimeCashIncome, 0) || 0;
slave.lastWeeksCashIncome = Math.max(+slave.lifetimeCashIncome, 0) || 0;
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 82b7b70ec74c83147c3f762a7d6280d57e4122d9..9593626c84df23f05393adb0bf4594bb287e7fb5 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -661,7 +661,7 @@ The previous owner seems to have left in something of a hurry.
<</if>>
<<if _valueOwed-_valueGiven > 0>>
There are some valuables present, worth <<print cashFormat(_valueOwed-_valueGiven)>>.
- <<run cashX((_valueOwed-_valueGiven), "event", $activeSlave)>>
+ <<run cashX((_valueOwed-_valueGiven), "event">>
<</if>>
//
diff --git a/src/pregmod/huskSlave.tw b/src/pregmod/huskSlave.tw
index 9d82ade5804f61b628f902a1b712ba1ada3462ab..e40c9bd8d8d433d51f6bde0eb6a8a9d599adcb66 100644
--- a/src/pregmod/huskSlave.tw
+++ b/src/pregmod/huskSlave.tw
@@ -55,5 +55,5 @@ Reserving a body will cost <<print cashFormat(10000)>> up front. Canceling an or
<<elseif $cash < 10000>>
//You lack the credits to place a body reservation.//
<<else>>
-[[Post body order|Main][$huskSlaveOrdered = 1, $cash -= 10000]]
+[[Post body order|Main][$huskSlaveOrdered = 1, cashX(-10000, "slaveTransfer")]]
<</if>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index ca8525c3f9a7529406eb022467b8decfafc35c22..48961cd8a4fc8775187927e78388d0693b3fb6ed 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -913,7 +913,7 @@ All in all,
<<set _lostBabies = 0>>
<<else>>
$His <<if _curBabies > 1>>babies<<else>>baby<</if>> sold for <<if _curBabies > 1>>a total of <</if>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@<<if $slaves[$i].prematureBirth == 1>> A low price due to the added costs of caring for them.<</if>>
- <<run cashX((_curBabies*(50+_babyCost)), "babyTransfer")>>
+ <<run cashX((_curBabies*(50+_babyCost)), "babyTransfer", $slaves[$i])>>
<</if>>
<</if>>
<<if _lostBabies != 1 && $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination === "individually decided fates">>
@@ -972,7 +972,7 @@ All in all,
<<set _babyCost = random(-12,12)>>
<<if $slaves[$i].prematureBirth == 1>><<set _babyCost = -45>><</if>>
$His <<if _curBabies > 1>>babies<<else>>baby<</if>> were sold for <<if _curBabies > 1>>a total of <</if>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@<<if $slaves[$i].prematureBirth == 1>> A low price due to the added costs of caring for them.<</if>>
- <<run cashX((_curBabies*(50+_babyCost)), "babyTransfer")>>
+ <<run cashX((_curBabies*(50+_babyCost)), "babyTransfer", $slaves[$i])>>
<</if>>
<</widget>>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 56caa19c1fb1908188a68026b653e8f8de8062ea..3769c0d1e88f9e69e6064aca4117eb88034084ca 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -5,7 +5,6 @@
<<SlaveSort $ArcadeiIDs>>
<<set _DL = $ArcadeiIDs.length, $arcadeSlaves = _DL, _SL = $slaves.length, _cockmilked = 0, _milked = 0, _milkprofits = 0, _profits = 0, _oldCash = 0, $boobsImplanted = 0, $prostatesImplanted = 0, $vasectomiesUndone = 0>>
-<<set _surgeryCost forceNeg($surgeryCost)>>
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.arcade = initFacilityStatistics($facility.arcade)>>
@@ -87,13 +86,13 @@
<<if ($arcadeUpgradeCollectors > 0)>>
<<if ($slaves[$i].vasectomy == 1)>>
<<set $slaves[$i].vasectomy = 0, $slaves[$i].health -= 10, $vasectomiesUndone++>>
- <<run cashX(_surgeryCost, "slaveSurgery", $slaves[$i])>>
+ <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>>
<<elseif ($slaves[$i].lactation < 2)>>
<<set $slaves[$i].lactation = 2, $slaves[$i].health -= 10, $boobsImplanted++>>
- <<run cashX(_surgeryCost, "slaveSurgery", $slaves[$i])>>
+ <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>>
<<elseif $slaves[$i].prostate == 1>>
<<set $slaves[$i].prostate = 2, $slaves[$i].health -= 10, $prostatesImplanted++>>
- <<run cashX(_surgeryCost, "slaveSurgery", $slaves[$i])>>
+ <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>>
<<elseif ($slaves[$i].lactation > 0) || ($slaves[$i].balls > 0)>>
<<set _oldCash = $cash>>
<<if $showEWD != 0>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 918a841c78750af2a020dc8691d4d26b5e94b153..59e828fd6d659fe43da5a81835d120e82d7377aa 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1120,7 +1120,6 @@ You own
<<run cashX(_menialEarnings, "menialTrades")>>
<</if>>
-
<<if $menialBioreactors > 0>>
<<set _bioreactorEarnings = 0>>
<<set _bioreactorEarnings += $menialBioreactors*(10+(10*$arcologies[0].FSPastoralistLaw))>>
@@ -1139,8 +1138,8 @@ You own
<<set _fuckdollsEarnings += random(1,10)>>
<<run cashX(_fuckdollsEarnings, "fuckdolls")>>
<</if>>
+<<set _earnings += random(1,10)>>
-<<set _earnings = (_menialEarnings + _bioreactorEarnings + _fuckdollsEarnings)>>
earning you @@.yellowgreen;<<print cashFormat(_earnings)>>.@@
<</if>>
@@ -1548,18 +1547,14 @@ Your ''business assistant'' manages the menial slave market.
There is no room in the parts of your arcology you own for more menial slaves.
<<else>>
<<if $cash > $marketAssistantLimit+_menialSlaveValue>>
- <<set _cashX = $cash>>
<<set _menialBulkPremium = Math.trunc(1+Math.clamp(($cash-$marketAssistantLimit)/_menialSlaveValue,0,_bulkMax)/400)>>
_HeM acquires more chattel, since it's a buyers' market.
<<if ($arcologies[0].FSPastoralist != "unset") && ($arcologies[0].FSPaternalist == "unset")>>
<<set $menialBioreactors += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax)), $cash -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium-100),0,_bulkMax))*(_menialSlaveValue+_menialBulkPremium-100)>>
- <<set $lastWeeksCashExpenses.menialBioreactorsTransfer += ($cash - _cashX)>>
<<elseif ($arcologies[0].FSDegradationist != "unset")>>
<<set $fuckdolls += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), $cash -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax))*((_menialSlaveValue+_menialBulkPremium)*2)>>
- <<set $lastWeeksCashExpenses.fuckdollsTransfer += ($cash - _cashX)>>
<<else>>
<<set $menials += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+100),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)), $cash -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)*(_menialSlaveValue+_menialBulkPremium))>>
- <<set $lastWeeksCashExpenses.menialTradesTransfer += ($cash - _cashX)>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/completeCatalog.tw b/src/uncategorized/completeCatalog.tw
index f9b2a9e9669f73c7323cdbe5cb4209373aefe580..01b4e6656c629280c51b92c70f4e2ae12062f855 100644
--- a/src/uncategorized/completeCatalog.tw
+++ b/src/uncategorized/completeCatalog.tw
@@ -101,7 +101,7 @@
The offered price is <<print cashFormat($slaveCost)>>.
<<link "Buy $his slave contract" "New Slave Intro">>
- <<set $cash -= $slaveCost, $activeSlave.weekAcquired = $week, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main", $specialSlave = 1>>
+ <<set $activeSlave.weekAcquired = $week, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main", $specialSlave = 1>>
<<set _cashX = forceNeg($slaveCost)>>
<<run cashX(_cashX, "slaveTransfer", $activeSlave)>>
<</link>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 82780a78f9e7f19bba37fb20d85a560a56841b6a..4f1f0cb2837ec6f08720f41289b44b16c7a6be72 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -7,7 +7,6 @@
<<SlaveSort $DairyiIDs>>
<<set _DL = $DairyiIDs.length, $dairySlaves = _DL, _SL = $slaves.length, $bioreactorPerfectedID = 0, $legendaryBallsID = 0, $legendaryCowID = 0, $milkmaidDevotionBonus = 1, $milkmaidHealthBonus = 0, $milkmaidTrustBonus = 1, $milkmaidDevotionThreshold = 45, $milkmaidTrustThreshold = 35, _anusesStretched = 0, _birthers = 0, _births = 0, _cumWeek = 0, _femCumWeek = 0, _FLsFetish = 0, _milkWeek = 0, _balltacular = 0, _boobtacular = 0, _careerForgotten = 0, _chemMinor = 0, _chemSevere = 0, _desterilized = 0, _hatefilled = 0, _horrified = 0, $intelligenceLost = 0, _mindbroken = 0, _profits = 0, _skillsLost = 0, _stupidified = 0, _vaginasStretched = 0>>
-<<set _surgeryCost forceNeg($surgeryCost)>>
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.dairy = initFacilityStatistics($facility.dairy)>>
@@ -455,17 +454,17 @@
<</if>>
<<if $slaves[$i].prostate == 1>>
<<set $slaves[$i].prostate = 2, $slaves[$i].health -= 10>>
- <<run cashX(_surgeryCost, "slaveSurgery", $slaves[$i])>>
+ <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>>
<</if>>
<<if $slaves[$i].vasectomy == 1>>
<<set $slaves[$i].vasectomy = 0, $slaves[$i].health -= 10,>>
- <<run cashX(_surgeryCost, "slaveSurgery", $slaves[$i])>>
+ <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>>
<</if>>
<<if ($dairySlimMaintain == 0)>>
<<if $dairyImplantsSetting <= 1>>
<<if ($slaves[$i].lactation < 2) && ($slaves[$i].boobs > 300 || $slaves[$i].balls == 0 || $slaves[$i].lactation == 1 || $dairyImplantsSetting == 1)>>
<<set $slaves[$i].lactation = 2, $slaves[$i].lactationDuration = 2, $slaves[$i].health -= 10>>
- <<run cashX(_surgeryCost, "slaveSurgery", $slaves[$i])>>
+ <<run cashX(forceNeg($surgeryCost), "slaveSurgery", $slaves[$i])>>
<</if>>
<<elseif $dairyImplantsSetting == 3>>
<<if ($slaves[$i].lactation < 1) && ($slaves[$i].boobs > 300 || $slaves[$i].balls == 0)>>
@@ -850,11 +849,11 @@
<</if>>
<<elseif ($slaves[$i].pregKnown == 1)>>
<<if ($dairyPregSetting > 2)>>
- <<run cashX(100, "Milked", $slaves[$i])>>
+ <<run cashX(100, "milked", $slaves[$i])>>
<<elseif ($dairyPregSetting > 1)>>
- <<run cashX(50, "Milked", $slaves[$i])>>
+ <<run cashX(50, "milked", $slaves[$i])>>
<<else>>
- <<run cashX(25, "Milked", $slaves[$i])>>
+ <<run cashX(25, "milked", $slaves[$i])>>
<</if>>
<<if ($dairyPregSetting > 1) && ($slaves[$i].vagina < 4)>>
<<set $slaves[$i].vagina++>>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index 050a53e52218d81eea0f04245116f537d929aefe..1c7713f623a82e9c8dc3c4ac240d8dcadf51690c 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -13,7 +13,7 @@
<<if $buyArcologyDirection != 0 && def $buyArcologyDirection>>
<<set _nei = $arcologies.findIndex(function(s) { return s.direction == $buyArcologyDirection; })>>
- <<run cashX(forceNeg($transaction*(500*Math.trunc($arcologies[_nei].prosperity*(1+($arcologies[_nei].demandFactor/100)))))_meetingBonus, "war")>>
+ <<run cashX(forceNeg($transaction*(500*Math.trunc($arcologies[_nei].prosperity*(1+($arcologies[_nei].demandFactor/100))))), "war")>>
<<set $cash -= 10000>>
<<set $arcologies[_nei].PCminority += $transaction>>
<<set $arcologies[_nei].demandFactor += $transaction*5>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 11a25e4eeab3b1901ffe6cd7bb87bd988f2fa2b3..12988e896248e7094c7702400e3181c1a378b1dc 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -7240,13 +7240,8 @@
<<set $repGain += (100*$slaves[$i].pornPrestige)>>
<<set _donations = Math.floor($slaves[$i].pornFame/(random(13,20)))+(random(-5000,5000))>>
<<if _donations > 0>>
-<<<<<<< HEAD
A number of gifts and donations totaling @@.yellowgreen;<<print cashFormat(_donations)>>@@ were also sent to $him, among other things.
- <<set $cash += _donations>>
-=======
- A number of gifts and donations totalling @@.yellowgreen;<<print cashFormat(_donations)>>@@ were also sent to $him, among other things.
<<run cashX(_donations, "porn", $slaves[$i])>>
->>>>>>> First Stage of the budget screen, should have most of the good stuff
<</if>>
<<elseif $slaves[$i].pornFeed > 0>>
<<include "SA Porn">>