diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index a0e2d064c7ef0d8e2b2319e5059b0a079c023b07..1311b023116760332f14d3a835bb0d9c1cbcd86d 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -3116,51 +3116,45 @@ window.cashX = function(cost, what, who) {
V.lastWeeksErrors += `NaN: "${cost}" at ${what},
`;
} else {
-
+
+ //Spend the money
+ V.cash += cost;
+
//INCOME
if(cost > 0) {
- if (typeof V.lastWeeksCashIncome[what] !== 'undefined') {
- //record the action
+ //record the action
+ if (typeof V.lastWeeksCashIncome[what] !== 'undefined') {
V.lastWeeksCashIncome[what] += cost;
-
- //record the slave, if available
- if (typeof who !== 'undefined'){
- who.lastWeeksCashIncome += cost;
- who.lifetimeCashIncome += cost;
- }
-
- //Spend the money
- V.cash += cost;
} else {
V.lastWeeksErrors += `Unknown place "${what}",`;
}
+
+ //record the slave, if available
+ if (typeof who !== 'undefined'){
+ who.lastWeeksCashIncome += cost;
+ who.lifetimeCashIncome += cost;
+ }
}
-
+
//EXPENSES
else if(cost < 0) {
- if (typeof V.lastWeeksCashExpenses[what] !== 'undefined') {
- //record the action
+ //record the action
+ if (typeof V.lastWeeksCashExpenses[what] !== 'undefined') {
V.lastWeeksCashExpenses[what] += cost;
-
- //record the slave, if available
- if (typeof who !== 'undefined'){
- if (what === "slaveTransfer"){
- who.slaveCost = cost;
- } else {
- who.lifetimeCashExpenses += cost;
- }
- }
-
- //Spend the money
- V.cash += cost;
} else {
V.lastWeeksErrors += `Unknown place "${what}",`;
}
- }
- else {
- //somebody probably tried to pass a 0, ignore it. New slaves will default to "slaveCost: 0", no need to call a costX for it.
+
+ //record the slave, if available
+ if (typeof who !== 'undefined'){
+ if (what === "slaveTransfer"){
+ who.slaveCost = cost;
+ } else {
+ who.lifetimeCashExpenses += cost;
+ }
+ }
}
return cost;
}
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 1a1d5e184ed858f8124cc6e68090068b6ae98885..8ac5d2cab7d906b841af64276c7689c0068ccd58 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -973,50 +973,44 @@ window.cashX = function(cost, what, who) {
`;
} else {
+ //Spend the money
+ V.cash += cost;
+
//INCOME
if(cost > 0) {
+
+ //record the action
if (typeof V.lastWeeksCashIncome[what] !== 'undefined') {
-
- //record the action
V.lastWeeksCashIncome[what] += cost;
-
- //record the slave, if available
- if (typeof who !== 'undefined'){
- who.lastWeeksCashIncome += cost;
- who.lifetimeCashIncome += cost;
- }
-
- //Spend the money
- V.cash += cost;
} else {
V.lastWeeksErrors += `Unknown place "${what}",`;
}
+
+ //record the slave, if available
+ if (typeof who !== 'undefined'){
+ who.lastWeeksCashIncome += cost;
+ who.lifetimeCashIncome += cost;
+ }
}
//EXPENSES
else if(cost < 0) {
+
+ //record the action
if (typeof V.lastWeeksCashExpenses[what] !== 'undefined') {
-
- //record the action
V.lastWeeksCashExpenses[what] += cost;
-
- //record the slave, if available
- if (typeof who !== 'undefined'){
- if (what === "slaveTransfer"){
- who.slaveCost = cost;
- } else {
- who.lifetimeCashExpenses += cost;
- }
- }
-
- //Spend the money
- V.cash += cost;
} else {
V.lastWeeksErrors += `Unknown place "${what}",`;
}
- }
- else {
- //somebody probably tried to pass a 0, ignore it. New slaves will default to "slaveCost: 0", no need to call a costX for it.
+
+ //record the slave, if available
+ if (typeof who !== 'undefined'){
+ if (what === "slaveTransfer"){
+ who.slaveCost = cost;
+ } else {
+ who.lifetimeCashExpenses += cost;
+ }
+ }
}
return cost;
}
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 2a39a27a10f407aaa641c16599fb3072ec2f86db..bea301341dce0b3606277a6ee5d072aa1a18d443 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -1511,7 +1511,7 @@ Her nationality is $activeSlave.nationality.
<<link "Add this slave">>
<<set $returnTo = "Commit Starting Girl", $createRelatedSlave = 0, $applyCareerBonus = 1, $careerBonusApplied = 0>>
<<StartingSlaveCost $activeSlave>>
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<goto "RG AS Dump">>
<</link>>
//This will apply your @@.springgreen;career bonus@@ to her:
@@ -1542,7 +1542,7 @@ Her nationality is $activeSlave.nationality.
<<link "Add slave without career bonus">>
<<set $returnTo = "Commit Starting Girl", $createRelatedSlave = 0, $applyCareerBonus = 0, $careerBonusApplied = 0>>
<<StartingSlaveCost $activeSlave>>
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<goto "RG AS Dump">>
<</link>>
<<else>>
@@ -1550,7 +1550,7 @@ Her nationality is $activeSlave.nationality.
<<link "Add this slave">>
<<set $returnTo = "Commit Starting Girl", $createRelatedSlave = 0, $applyCareerBonus = 0, $careerBonusApplied = 0>>
<<StartingSlaveCost $activeSlave>>
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<goto "RG AS Dump">>
<</link>>
<br>
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
index cb7fd11d08802997025bdc79bd89fac2e6913ded..a3edd4659216c59ff6eb25f16d946c8d65b496d7 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
@@ -17,7 +17,7 @@ A slave dealer has submitted a slave to satisfy your ''$Role'' order.
<br><br><span id="result">
<<if $cash >= $slaveCost>>
<<link "Accept the offered slave">>
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<replace "#result">>
She has been very well trained by the dealer that offered her to you. She has also picked up on the fact that she was specially selected, and is a little hopeful that this means she may be treated well. She is now eagerly awaiting your instructions.
<<include "New Slave Intro">>
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index 174e56e68b8eee42f398b396bf996883696fe188..c7f8d6be09f7ca9a23974b6689255c289bdf79b1 100644
--- a/src/pregmod/criminalMarkets.tw
+++ b/src/pregmod/criminalMarkets.tw
@@ -52,11 +52,11 @@ You board the transport to
It will cost <<print cashFormat($slaveCost)>> to enslave $him.
<<if $cash >= $slaveCost>>
- <br>[["Enslave " + $him + " and check out other available prisoners"|Criminal Market][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave), $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Enslave " + $him + " and check out other available prisoners"|Criminal Market][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave), $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
- <br>[["Enslave " + $him|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
+ <br>[["Enslave " + $him|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
<<else>>
- <br>[["Enslave " + $him + " and finish your inspection"|Bulk Slave Intro][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave), $newSlaves.push($activeSlave)]]
+ <br>[["Enslave " + $him + " and finish your inspection"|Bulk Slave Intro][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave), $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
//You lack the necessary funds to enslave this criminal.//
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
index b2101a8b67af3761df87eb249083e52ad4fd35ce..421da8b2ec368b5c07d370b0b6faf0af76d00487 100644
--- a/src/pregmod/eliteSlave.tw
+++ b/src/pregmod/eliteSlave.tw
@@ -210,7 +210,7 @@ It will take <<print cashFormat($slaveCost)>> to win the auction.
<br><br>
<<if $cash >= $slaveCost>>
- [[Place that bid|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
+ [[Place that bid|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
<<else>>
//You lack the necessary funds to place a winning bid.//
<</if>>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 22013cb50c83e6d318c9e3f903aaae7cf3b25c2b..d200fac310490af36a87416ad9c7b568d388413d 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -370,7 +370,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
The offered price is <<print cashFormat($slaveCost)>>.
<<if $cash >= $slaveCost>>
- <br>[[Buy her slave contract|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave), $nextLink = "Scheduled Event", $returnTo = "Scheduled Event"]]
+ <br>[[Buy her slave contract|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave), $nextLink = "Scheduled Event", $returnTo = "Scheduled Event"]]
<<else>>
//@@.red;You lack the necessary funds to buy this slave.@@//
<</if>>
diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw
index 7189440cfea66fe92dc690807b1a628b7c597c1c..b10adea6efe6db8d254f16d50cb0938590a73196 100644
--- a/src/uncategorized/bulkSlaveGenerate.tw
+++ b/src/uncategorized/bulkSlaveGenerate.tw
@@ -117,7 +117,7 @@
<<set _i = $numSlaves>>
<<break>>
<<else>>
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<set $newSlaves.push($activeSlave)>>
<<set $spent += $slaveCost>>
<</if>>
diff --git a/src/uncategorized/householdLiquidator.tw b/src/uncategorized/householdLiquidator.tw
index 5063a03b1a79195c8f5e19f29c86ce349fa2160e..0b2964648dd8b8e0f17d7de82f11bd3152b9e0b4 100644
--- a/src/uncategorized/householdLiquidator.tw
+++ b/src/uncategorized/householdLiquidator.tw
@@ -33,7 +33,7 @@ The price is <<print cashFormat($slaveCost*3)>>.
<br><br>
<<if $cash >= $slaveCost*3>>
- [[Buy their slave contract|Siblings Workaround][cashX(forceNeg($slaveCost*3), "slaveTransaction", $activeSlave),,$nextButton = "Continue",$nextLink = "Main"]]
+ [[Buy their slave contract|Siblings Workaround][cashX(forceNeg($slaveCost*3), "slaveTransfer", $activeSlave),,$nextButton = "Continue",$nextLink = "Main"]]
<<else>>
//You lack the necessary funds to buy these slaves.//
<</if>>
@@ -79,7 +79,7 @@ The price is <<print cashFormat($slaveCost*3)>>.<<if $slavesSeen > $slaveMarketL
<br><br>
<<if $cash >= $slaveCost*3>>
- [[Buy their slave contract|Mother Daughter Workaround][cashX(forceNeg($slaveCost*3), "slaveTransaction", $activeSlave),,"Continue",$nextLink = "Main"]]
+ [[Buy their slave contract|Mother Daughter Workaround][cashX(forceNeg($slaveCost*3), "slaveTransfer", $activeSlave),,"Continue",$nextLink = "Main"]]
<<else>>
//You lack the necessary funds to buy these slaves.//
<</if>>
@@ -121,7 +121,7 @@ The price is <<print cashFormat($slaveCost*4)>>.<<if $slavesSeen > $slaveMarketL
<br><br>
<<if $cash >= $slaveCost*4>>
- [[Buy their slave contract|Twins Workaround][cashX(forceNeg($slaveCost*4), "slaveTransaction", $activeSlave),,$nextButton = "Continue",$nextLink = "Main"]]
+ [[Buy their slave contract|Twins Workaround][cashX(forceNeg($slaveCost*4), "slaveTransfer", $activeSlave),,$nextButton = "Continue",$nextLink = "Main"]]
<<else>>
//You lack the necessary funds to buy these slaves.//
<</if>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 30280a6436f75a921a0043eaea192695f4d4e999..ea848a5cf81ebb5e9b0abf7df9e8fd55c3455282 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -239,7 +239,7 @@
<</replace>>
<</link>>
<br><<link "Offer to buy out the contract">>
- <<run cashX(forceNeg($contractCost), "slaveTransaction")>>
+ <<run cashX(forceNeg($contractCost), "slaveTransfer")>>
<<replace "#result">>
You offer to simply buy out the contract, taking the slave for yourself, letting the slave trader out of her side of the deal, and providing for the daughter's medical care. The trader lets it be known amongst her peers that you will make things right no matter the cost to yourself, @@.green;increasing prosperity.@@ The story of the mother willing to be enslaved gets around quickly, @@.green;capturing the hearts@@ of more romantic citizens. The mother, meanwhile, presents herself for enslavement, @@.hotpink;very grateful@@ that you've saved her daughter's life.
<br><br>
@@ -275,7 +275,7 @@
<</replace>>
<</link>>
<br><<link "Compromise on the compensation and offer to buy out the deal">>
- <<run cashX(forceNeg($contractCost), "slaveTransaction")>>
+ <<run cashX(forceNeg($contractCost), "slaveTransfer")>>
<<replace "#result">>
You offer to buy out the deal, paying the breeder and taking the slave yourself, and passing the child off to the buyer. The citizen gets what he wants and speaks @@.green;kindly@@ in public about how you helped smooth over a rather rough dispute. The breeder sends a @@.green;positive note@@ around the industry to the effect that slavers trading with your arcology can expect to be aided in times of need; though the loss of a star mother always stings.
<br><br>
@@ -307,7 +307,7 @@
<</replace>>
<</link>>
<br><<link "Offer to buy out the deal">>
- <<run cashX(forceNeg($contractCost), "slaveTransaction")>>
+ <<run cashX(forceNeg($contractCost), "slaveTransfer")>>
<<replace "#result">>
You offer to simply buy out the deal, paying the trainer and taking the slave yourself, and letting the buyer out of the payment. The trainer, on the other hand, lets it be known that you support businessmen, who can trust you to ensure they don't come out second best, @@.green;increasing prosperity.@@ The buyer lets you know privately that he recently had a business deal go bad, so he's in a tough cash situation right now; he's so grateful for your assistance in this embarrassing situation that he talks @@.green;effusively@@ for days to anyone who will listen about your discreet administration of the arcology. The slave, meanwhile, arrives at your penthouse, @@.hotpink;rather hopeful@@ that she's going to a good master.
<br><br>
@@ -339,7 +339,7 @@
<</replace>>
<</link>>
<br><<link "Compromise on the compensation and offer to buy out the deal">>
- <<run cashX(forceNeg($contractCost), "slaveTransaction")>>
+ <<run cashX(forceNeg($contractCost), "slaveTransfer")>>
<<replace "#result">>
You offer to buy out the deal, paying the school and taking the slave yourself, and compromising on the demanded compensation. The citizen was looking forward to using the slave in question for breeding stock; like many breeders he cares deeply about his stable and is mollified by the moderate payment, and speaks @@.green;kindly@@ in public about how you helped an innocent breeder protect his prize bloodlines. The school sends a @@.green;positive note@@ around the industry to the effect that schools trading with your arcology can expect to have excessive claims sensibly reduced.
<br><br>
@@ -371,7 +371,7 @@
<</replace>>
<</link>>
<br><<link "Buy out the contract and enslave her">>
- <<run cashX(forceNeg($contractCost), "slaveTransaction")>>
+ <<run cashX(forceNeg($contractCost), "slaveTransfer")>>
<<replace "#result">>
You quietly contact the trader and suggest an alternative method of settling the dispute. He is surprised, but agrees readily, chuckling at how the "recalcitrant bitch" is going to be dealt with. To her horror, she finds that your near-total power over deals made in your arcology has been employed to saddle her with additional debts that, under her indentured servitude, she cannot hope to repay. It is then the work of ten minutes to demand payment, and when she cannot pay, demand her body for enslavement. The story of your cunning @@.green;impresses@@ the slave traders, but is @@.red;booed@@ by fairer-minded citizens.
<br><br>
@@ -403,7 +403,7 @@
<</replace>>
<</link>>
<br><<link "Offer to buy out the contract">>
- <<run cashX(forceNeg($contractCost), "slaveTransaction")>>
+ <<run cashX(forceNeg($contractCost), "slaveTransfer")>>
<<replace "#result">>
You offer to simply buy out the contract, taking the slave for yourself. This lets the buyer out of buying her, and the slaveowner gets his money; but it soon becomes apparent that what both of them were really looking for is an opportunity to put one over on the other. Neither is pleased to be denied a petty victory, but they both have the sense to keep their mouths shut. The poor slave, meanwhile, appears in the penthouse entryway, @@.hotpink;hopeful@@ that she's been lucky enough to end up in a less abusive situation.
<br><br>
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index a17cd71687c52cff34c9132eeb279e8f2ce0f7bc..1af9266b843e4c6ee00f94d709827b4a43a99006 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -916,7 +916,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<br>
<<if $cash >= $slaveCost>>
- [[Place that bid|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
+ [[Place that bid|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
<<else>>
//You lack the necessary funds to place a winning bid.//
<</if>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 284ac2ab540823a30644663a0cf153689032cb79..9feaf127b7f14d650f5394cb1945cabe04710950 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -627,7 +627,7 @@ You look up the _relationType. _He2 costs <<print cashFormat($slaveCost)>>, a ba
<br><br>
<span id="result">
<<link "Buy _him2">>
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<switch _relationType>>
<<case "daughter">>
<<if _tempMF == "father">>
@@ -1156,7 +1156,7 @@ You look up the $activeSlave.relation. _He2 costs <<print cashFormat($slaveCost)
/* update $slaves[$i] (eventSlave) before calling any widgets */
<<set $slaves[$i].relation = relationTargetWord($activeSlave)>>
<<set $slaves[$i].relationTarget = $activeSlave.ID>>
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<set $desc = SlaveTitle($eventSlave)>>
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName arrives shortly. The two slaves remember each other only dimly - they parted a long time ago - but they embrace. The devoted $desc explains the situation and encourages $his $activeSlave.relation to be a good slave to you. $activeSlave.slaveName looks a little fearful but clearly realizes that _he2's lucky to be here.
<<include "New Slave Intro">>
diff --git a/src/uncategorized/reShippingContainer.tw b/src/uncategorized/reShippingContainer.tw
index 14bec54bfd04a895c6f2af3c9d5bd507f81872f8..4c5d2c91e0c1c5d86af642c34cd61fbfa2a994c0 100644
--- a/src/uncategorized/reShippingContainer.tw
+++ b/src/uncategorized/reShippingContainer.tw
@@ -41,11 +41,11 @@ For now, the crowd around you is looking at the helpless human cargo with
<<replace "#result">>
<<for _reShip = 0; _reShip < _newSlaves.length; _reShip++>>
<<slaveCost _newSlaves[_reShip]>>
- <<run cashX($slaveCost, "slaveTransaction")>>
+ <<run cashX($slaveCost, "slaveTransfer")>>
<</for>>
Allowing humor into your voice, you announce an auction, to be held immediately. The crowd appreciates the wit, and @@.green;appreciates it even more@@ when you conduct the auction yourself. It's always good to take an opportunity to show off your understanding of the slave market in public. You @@.yellowgreen;sell them all,@@ sex slaves and menials alike. Welcome to the Free Cities.
<<set $menials -= 25>>
- <<run cashX((25*_bonusCash), "slaveTransaction")>>
+ <<run cashX((25*_bonusCash), "slaveTransfer")>>
<<set $rep += 100>>
<</replace>>
<</link>>
@@ -76,7 +76,7 @@ For now, the crowd around you is looking at the helpless human cargo with
<<replace "#result">>
<<for _reShip = 0; _reShip < _newSlaves.length; _reShip++>>
<<slaveCost _newSlaves[_reShip]>>
- <<run cashX($slaveCost, "slaveTransaction")>>
+ <<run cashX($slaveCost, "slaveTransfer")>>
<</for>>
You hurry forward, beckoning the crowd to accompany you. The wretched slaves cringe with fear, but soon they're being comforted, offered water, and examined for injury. Once the most pressing needs are attended to, you call for everyone's attention. You pride yourself on knowing your citizens well, and you can pick good Paternalists out of the crowd at will. Calling them by name, you ask whether they'd be willing to take on one of these poor slaves. One by one, you pair slave and Master or Mistress, rewarding your best people with public approbation, not to mention a free slave. The initial gasps of surprise quickly grow into @@.green;thunderous applause.@@ Your people love you. Several of the slaves begin to cry, mostly from confusion or sheer exhaustion; they don't yet know how lucky they are.
<<set $menials -= 25>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 799d85d07fcd9960d60990abc4d44e88177e1c53..ba50a95ec45418196b506fd995742515e98b228f 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -225,7 +225,7 @@ $His price is <<print cashFormat($slaveCost)>>.
<span id="result">
<<if $cash >= $slaveCost>>
<<link "Accept the offered slave">>
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<replace "#result">>
$He has been reasonably broken by the dealer that offered $him to you. $He has also picked up on the fact that $he was specially selected, and is a little hopeful that this means $he may be treated well. $He is now awaiting your instructions.
<<include "New Slave Intro">>
diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index 4186a681c36f6772eb81b576bcd3dca6ac1e33ae..b0358f25862a667712ef10eb1627e0623b95ff2a 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -111,7 +111,7 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
<<link "Offer $him a one year supplementary indenture">>
<<replace "#result">>
$He smiles almost shyly when you offer $him a one year supplementary indenture. The price is reasonable, but definitely favorable to you. $He accepts it anyway, and you transfer the money into an escrow account to be held for $him until $his new indenture is done. Your sex slave once again, $he awaits your pleasure without a hint of fear.
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<set $lowerClass -= 1>>
<<set $expired = 0>><<set $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
@@ -142,7 +142,7 @@ at the moment of $his scheduled emancipation, $he seems willing to consider a sh
<<link "Offer $him a one year supplementary indenture">>
<<replace "#result">>
$He looks pensive when you offer $him a one year supplementary indenture. The price reflects the market, and is a reasonable compensation for a year of sexual slavery. $He accepts it after some consideration, and you transfer the money into an escrow account to be held for $him until $his new indenture is done. Your sex slave once again, $he awaits orders with complacency.
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<set $lowerClass -= 1>>
<<set $expired = 0>><<set $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index 369f1dc2eb0459c7324faf5a8b618309f98414c2..2f9568493bdd777f3781435ee2b73e79b12b4197 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -387,7 +387,7 @@ The placement fee is <<print cashFormat($slaveCost)>>.
<<if $cash >= $slaveCost>>
<<link "Buy $his slave contract">>
<<replace "#result">>
- <<set cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave), $shelterSlaveBought = 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main">>
+ <<set cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave), $shelterSlaveBought = 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main">>
<<include "New Slave Intro">>
<</replace>>
<</link>>
diff --git a/src/uncategorized/specialSlave.tw b/src/uncategorized/specialSlave.tw
index 320ebfe278156ed91a6c387c8ca0259be9e9fc90..03b45484dbd7bb865ac6d03cf4b003927a75c40c 100644
--- a/src/uncategorized/specialSlave.tw
+++ b/src/uncategorized/specialSlave.tw
@@ -93,7 +93,7 @@
The offered price is <<print cashFormat($slaveCost)>>.
- [["Buy " + $his + " slave contract"|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave),,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main",$specialSlave = 1]]
+ [["Buy " + $his + " slave contract"|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave),,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main",$specialSlave = 1]]
<br><br>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 40f92d0f249448c95c214283885aec0cd0f2b1f7..7156f161205b07a333306be0237f0ce82fbd0bcd 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -729,7 +729,7 @@
<<link "Add this slave">>
<<set $returnTo = "Commit Starting Girl", $createRelatedSlave = 0, $applyCareerBonus = 1, $careerBonusApplied = 0>>
<<StartingSlaveCost $activeSlave>>
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<goto "RG AS Dump">>
<</link>>
//This will apply your @@.springgreen;career bonus@@ to $him:
@@ -760,7 +760,7 @@
<<link "Add slave without career bonus">>
<<set $returnTo = "Commit Starting Girl", $createRelatedSlave = 0, $applyCareerBonus = 0, $careerBonusApplied = 0>>
<<StartingSlaveCost $activeSlave>>
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<goto "RG AS Dump">>
<</link>>
<<else>>
@@ -768,7 +768,7 @@
<<link "Add slave">>
<<set $returnTo = "Commit Starting Girl", $createRelatedSlave = 0, $applyCareerBonus = 0, $careerBonusApplied = 0>>
<<StartingSlaveCost $activeSlave>>
- <<run cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave)>>
+ <<run cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave)>>
<<goto "RG AS Dump">>
<</link>>
<br>