diff --git a/src/uncategorized/completeCatalog.tw b/src/uncategorized/completeCatalog.tw index 01b4e6656c629280c51b92c70f4e2ae12062f855..198cccaed79c8caa83598be2522039c0edef6f72 100644 --- a/src/uncategorized/completeCatalog.tw +++ b/src/uncategorized/completeCatalog.tw @@ -102,6 +102,5 @@ The offered price is <<print cashFormat($slaveCost)>>. <<link "Buy $his slave contract" "New Slave Intro">> <<set $activeSlave.weekAcquired = $week, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main", $specialSlave = 1>> - <<set _cashX = forceNeg($slaveCost)>> - <<run cashX(_cashX, "slaveTransfer", $activeSlave)>> + <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>> <</link>> diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw index 7d37bec590e2d2dde16cf084cf7f868abe3e504a..61c36edd7e8b5ce64988f7a191185296fb254b13 100644 --- a/src/uncategorized/genericPlotEvents.tw +++ b/src/uncategorized/genericPlotEvents.tw @@ -1333,7 +1333,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your <<replace "#result">> <<for _genPlot = 0; _genPlot < _newSlaves.length; _genPlot++>> <<slaveCost _newSlaves[_genPlot]>> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <</for>> Prisoners @@.green;sold.@@ <</replace>> diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw index 1891bd4f87267bff9188e1052f04d1777ba366cf..24788e6e0fe12203d88cbfd2b245ab0e1300c30c 100644 --- a/src/uncategorized/pCoupAttempt.tw +++ b/src/uncategorized/pCoupAttempt.tw @@ -262,7 +262,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc <<replace "#result">> <<for _pca = 0; _pca < _newSlaves.length; _pca++>> <<slaveCost _newSlaves[_pca]>> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <</for>> Prisoners sold. <</replace>> diff --git a/src/uncategorized/pInvasion.tw b/src/uncategorized/pInvasion.tw index fa4f2e798081303828e9ef2ea6b79dc267e7f75b..b24ed603aa04484455848d957d40daa80cda7b78 100644 --- a/src/uncategorized/pInvasion.tw +++ b/src/uncategorized/pInvasion.tw @@ -116,7 +116,7 @@ The loose militia lately organized by the arcology owners has been called out to <<replace "#result">> <<for _i = 0; _i < _newSlaves.length; _i++>> <<slaveCost _newSlaves[_i]>> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <</for>> Prisoners sold. <</replace>> diff --git a/src/uncategorized/pRaidResult.tw b/src/uncategorized/pRaidResult.tw index efcd84e8e22335d01e821a5ddd2e88aba1a888c1..4e1460f643a9ba73f5c4c76736242f46f8d8fc65 100644 --- a/src/uncategorized/pRaidResult.tw +++ b/src/uncategorized/pRaidResult.tw @@ -50,7 +50,7 @@ Out ahead of the main body of refugees there is a small knot moving quickly and <<replace "#result">> <<for _prr = 0; _prr < _newSlaves.length; _prr++>> <<slaveCost _newSlaves[_prr]>> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <</for>> Prisoners sold. <</replace>> diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw index 89405f94f27e2c3394b2c965ef60b78ef21f839a..a4e695dc1be235f66bcc389219a4245edf0a8eb5 100644 --- a/src/uncategorized/reBoomerang.tw +++ b/src/uncategorized/reBoomerang.tw @@ -468,7 +468,7 @@ It isn't obvious how $he managed to escape, though no doubt you could review the <</replace>> <</link>> //This will cost in <<print cashFormat($contractCost)>>.// <br><<link "Sell $him immediately">> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <<replace "#result">> The penthouse opens, and $activeSlave.slaveName stumbles inside, sobbing $his thanks. $He's immediately conducted to the autosurgery for some quick cosmetic surgery, while you and $assistantName do the necessary work to falsify the arcology records and conceal $his origins. Before $he's even out from under anesthesia, $he's bundled off into one of the hundreds of slave shipments that move between arcologies every day. This time $he'll be sold far enough away that no matter how much of an escape artist $he is, you won't be seeing any more of $him. $He can whine elsewhere. <<set $boomerangStats = 0>> diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw index e5ff5c674158100829e435c3b4c0e27f2a641cd3..70301817bf489706eadaed338cce0a2e1cb73345 100644 --- a/src/uncategorized/reFSAcquisition.tw +++ b/src/uncategorized/reFSAcquisition.tw @@ -1421,7 +1421,7 @@ The call comes in from an office, and you suppress the urge to check whether $as <</replace>> <</link>> //This will cost <<print cashFormat($contractCost)>>// <br><<link "Sell $him immediately">> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <<replace "#result">> <<switch $FSAcquisitionEvents>> <<case "Pastoralist">> diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw index a2a54aac5e629fae7378b40f733ed562c77b0b82..bf2ffeab58df0a25cb465c5d7d4f0344858499c9 100644 --- a/src/uncategorized/reMalefactor.tw +++ b/src/uncategorized/reMalefactor.tw @@ -590,7 +590,7 @@ $He is easily taken into custody and $his contraband confiscated once the jeerin <</link>> <</if>> <br><<link "Sell $him immediately">> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <<if $cash4Babies == 1 && $malefactor == "anchorBaby">> <<run cashX(random(20,30), "slaveTransfer")>> <</if>> diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw index e6e1ce7f2285505ca2dbc90fab035c6ac3f826c2..0b304fe8db99b1eac6092b3b5b565ff3083ed91c 100644 --- a/src/uncategorized/reRecruit.tw +++ b/src/uncategorized/reRecruit.tw @@ -2674,7 +2674,7 @@ He explains that one of his servant <<= $girl>>s was impregnated by his fool of <<case "forbidden love">> <<default>> <br><<link "Sell $him immediately">> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <<replace "#result">> <<switch $recruit>> <<case "held POW">> diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw index 590353b311319c31974af0ad86a04df47e06e437..b5fd4e4e3caed6cdd823b17ba613b405841f8edd 100644 --- a/src/uncategorized/resFailure.tw +++ b/src/uncategorized/resFailure.tw @@ -804,56 +804,56 @@ The failure of a prominent organization within your arcology has @@.red;affected <<if $RESFailure == "TSS">> <<if ($slaves[$i].origin == "She was given to you by a failed branch campus of The Slavegirl School right after her majority.") || ($slaves[$i].origin == "She was given to you by a failed branch campus of The Slavegirl School after she was retrained as a slave girl.")>> <<slaveCost $slaves[$i]>> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <<include "Remove activeSlave">> <<set $i -= 1>> <</if>> <<elseif $RESFailure == "GRI">> <<if $slaves[$i].origin == "She was given to you by a failed subsidiary lab of the Growth Research Institute right after her use as a test subject ended.">> <<slaveCost $slaves[$i]>> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <<include "Remove activeSlave">> <<set $i -= 1>> <</if>> <<elseif $RESFailure == "SCP">> <<if $slaves[$i].origin == "She was given to you by a failed branch campus of St. Claver Preparatory after she served as a plastic surgeon's passing final exam.">> <<slaveCost $slaves[$i]>> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <<include "Remove activeSlave">> <<set $i -= 1>> <</if>> <<elseif $RESFailure == "LDE">> <<if $slaves[$i].origin == "She was given to you by a failed branch campus of the innovative École des Enculées right after her graduation.">> <<slaveCost $slaves[$i]>> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <<include "Remove activeSlave">> <<set $i -= 1>> <</if>> <<elseif $RESFailure == "TGA">> <<if $slaves[$i].origin == "She was given to you by a failed branch campus of the intense Gymnasium-Academy right after her majority.">> <<slaveCost $slaves[$i]>> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <<include "Remove activeSlave">> <<set $i -= 1>> <</if>> <<elseif $RESFailure == "HA">> <<if $slaves[$i].origin == "She was given to you by a failed branch campus of the Hippolyta Academy right after her majority.">> <<slaveCost $slaves[$i]>> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <<include "Remove activeSlave">> <<set $i -= 1>> <</if>> <<elseif $RESFailure == "TCR">> <<if $slaves[$i].origin == "She is a prized dairy cow given to you by a failed local pasture of The Cattle Ranch.">> <<slaveCost $slaves[$i]>> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <<include "Remove activeSlave">> <<set $i -= 1>> <</if>> <<else>> <<if ($slaves[$i].origin == "She was the leader of your arcology's Futanari Sisters until you engineered her community's failure and enslavement.") || ($slaves[$i].origin == "She was a Futanari Sister until you engineered her early enslavement.")>> <<slaveCost $slaves[$i]>> - <<run cashX(forceNeg($slaveCost), "slaveTransfer")>> + <<run cashX($slaveCost, "slaveTransfer")>> <<include "Remove activeSlave">> <<set $i -= 1>> <</if>> diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw index 5dd8d366a6b51f880dca10b89a8c56c015f4431e..7411a622b220886313470b7c9ba5b6e7d361ee28 100644 --- a/src/uncategorized/seRecruiterSuccess.tw +++ b/src/uncategorized/seRecruiterSuccess.tw @@ -256,7 +256,7 @@ Your recruiter $Recruiter.slaveName has succeeded; $he's convinced a desperate o <</replace>> <</link>> //This will cost <<print cashFormat($contractCost)>>// <br><<link "Sell _him2 immediately">> - <<run cashX(forceNeg($slaveCost), "slaveTransfer", $Recruiter)>> + <<run cashX($slaveCost, "slaveTransfer", $Recruiter)>> <<replace "#result">> $activeSlave.slaveName accepts being resold without much fuss. _He2's merely exchanged one unknown owner for another. For all _he2 knows _his2 new buyer will be less abusive than you would have been. _He2 would be less complacent if _he2 knew who _his2 buyers are; _he2'll be immured in an arcade within the hour. <</replace>> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index dba0231ae2ed72050bdf37b92a33f92a5946f1c6..a91530d4af6c2d18067ef85226c29f5ca44bace8 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1810,7 +1810,7 @@ __Financial__: <<elseif $activeSlave.accent > 3>> //$His lack of language and basic life skills is a red sign to most slave appraisers. $He must not act like a child to be sold without raising suspicion.// | <<else>> - <<link "Sell $him" "Sell Slave">><<run cashX(forceNeg(-500), "slaveTransfer", $activeSlave)>><</link>> //Listing $him for sale will cost <<print cashFormat(500)>>// | + <<link "Sell $him" "Sell Slave">><<run cashX(-500, "slaveTransfer", $activeSlave)>><</link>> //Listing $him for sale will cost <<print cashFormat(500)>>// | <<if ($seeAge != 0) && ($activeSlave.indenture < 1)>> <<link "Retire $him" "SE retirement">><<set $retiree = $activeSlave.ID, $retired = 1>><</link>> | <</if>>