diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw index 3198500509b544781e4cee1ef4e79ecaaae759ca..524e0e2d304197e393b3403a7bcf263945819ec5 100644 --- a/src/SecExp/attackReport.tw +++ b/src/SecExp/attackReport.tw @@ -1567,7 +1567,7 @@ <br> <span id="captOptions"> <<link "sell them all immediately">> - <<run cashX((_menialPrice * _captives), "menialTradesTransfer")>> + <<run cashX((_menialPrice * _captives), "menialTransfer")>> <<replace "#captOptions">>Captives sold<</replace>> <</link>> | diff --git a/src/js/birthJS.tw b/src/js/birthJS.tw index ae9d942a9661515aec2f70d718d68e08bbbb3691..86e5522eee98ac84fb18450659555a466f6fb1f2 100644 --- a/src/js/birthJS.tw +++ b/src/js/birthJS.tw @@ -101,7 +101,7 @@ window.BirthDestinationText = function(choice,slave) { r += `For a moment, ${he} saw a glimmer of good in you; <span class='mediumorchid'>${He} was clearly wrong.</span> ${His} mind struggles to comprehend <span class='gold'>why ${he} could ever even think of trusting such a person.</span>`; slave.trust -= 30, slave.devotion -= 30; } - cashX(T.curBabies*(50+T.babyCost), "slaveTransfer", slave); + cashX(T.curBabies*(50+T.babyCost), "babyTransfer", slave); break; } return r; diff --git a/src/pregmod/birthStorm.tw b/src/pregmod/birthStorm.tw index 3604d1bbf262c00396da1b3278bd748b865b082c..2f12ac7e002b8312c32780536508d8e4cf9c7636 100644 --- a/src/pregmod/birthStorm.tw +++ b/src/pregmod/birthStorm.tw @@ -59,7 +59,7 @@ The remote surgery allows the removal of the pregnancy generator through convent <</if>> <<if $Cash4Babies == 1 && _curBabies > 0>> $His surviving <<if _curBabies > 1>>children<<else>>child<</if>> sold for a total of @@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyPrice))>>.@@ - <<run cashX((_curBabies*(50+_babyPrice)), "slaveTransfer", $activeSlave)>> + <<run cashX((_curBabies*(50+_babyPrice)), "babyTransfer", $activeSlave)>> <</if>> <<set $activeSlave.births += _curBabies>> <<set $activeSlave.birthsTotal += _curBabies>> diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index e1558e5f689ad56d7773fb3bfecccf5892a10990..307d5a34646d03613cf352911beb89aef8a22eab 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -212,7 +212,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a <<elseif $Cash4Babies == 1 && ($activeSlave.relationship != -3) && ($activeSlave.assignment != "serve in the master suite") && ($activeSlave.assignment != "be your Concubine")>> <<set _lostBabies = 1, _babyCost = random(-12,12)>> sold for a total of @@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@ - <<run cashX((_curBabies*(50+_babyCost)), "slaveTransfer", $activeSlave)>> + <<run cashX((_curBabies*(50+_babyCost)), "babyTransfer", $activeSlave)>> <<elseif $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination === "individually decided fates">> <<set _lostBabies = 1>> <<= BirthDestinationText("Orphanage",$activeSlave)>> diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw index 908278bb09599ed0c1ac9328185b663b7ade78d8..b25d38376b104933bfd80a46799dd6d3bae61394 100644 --- a/src/pregmod/sePlayerBirth.tw +++ b/src/pregmod/sePlayerBirth.tw @@ -623,7 +623,7 @@ You arrange yourself to give birth, relaxing until your body urges you to begin <<if $arcologies[0].FSRepopulationFocus > 40>> | <<link "Breeding School">><<replace "#choice">><<print "You have decided to send them to be raised into a proper breeder. Perhaps you'll even see them again, though it's unlikely you'll recognize them with their reproduction focused body.">><</replace>><<set $breederOrphanageTotal += _curBabies>><</link>> <</if>> - <<if $Cash4Babies == 1>> | <<link "Auction Them">><<replace "#choice">><<print "You send the child<<if _curBabies > 1>>ren<</if>> to be sold at auction amongst other prestigious slaves. The winning bid for your offspring came in at @@.yellowgreen;<<print cashFormat(1000*_seed*_curBabies)>>.@@">><</replace>><<run cashX((1000*_seed*_curBabies), "slaveTransfer")>><</link>><</if>> + <<if $Cash4Babies == 1>> | <<link "Auction Them">><<replace "#choice">><<print "You send the child<<if _curBabies > 1>>ren<</if>> to be sold at auction amongst other prestigious slaves. The winning bid for your offspring came in at @@.yellowgreen;<<print cashFormat(1000*_seed*_curBabies)>>.@@">><</replace>><<run cashX((1000*_seed*_curBabies), "babyTransfer")>><</link>><</if>> </span> <</if>> diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index 46dd288315f8c4a2f37803500e914f7e7f28f2b9..ca8525c3f9a7529406eb022467b8decfafc35c22 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)), "slaveTransfer")>> + <<run cashX((_curBabies*(50+_babyCost)), "babyTransfer")>> <</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)), "slaveTransfer")>> + <<run cashX((_curBabies*(50+_babyCost)), "babyTransfer")>> <</if>> <</widget>> diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index 7237a899cacff606155e8d6a1e0c10b51df8f536..fd45dc1eefc04447e70da14476eeb9bae6634f8b 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -1562,7 +1562,7 @@ Your ''business assistant'' manages the menial slave market. <</if>> <<if $menials > 0>> <<set _cashX = $menials*(menialSlaveCost(-$menials)), $menialDemandFactor -= $menials, $menials = 0>> - <<run cashX(_cashX, "menialTradesTransfer")>> + <<run cashX(_cashX, "menialTransfer")>> <</if>> <<if $fuckdolls > 0>> <<set _cashX = $fuckdolls*(menialSlaveCost(-$fuckdolls)*2), $menialDemandFactor -= $fuckdolls, $fuckdolls = 0>> diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw index b4f671a172d75d17f71180a1567347c03c9aed8f..c67cdb6864ceb9fa86280bc5c9f2dde42b89b6e2 100644 --- a/src/uncategorized/costsBudget.tw +++ b/src/uncategorized/costsBudget.tw @@ -353,6 +353,8 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ <</if>> // <</if>> + + <<if $lastWeeksCashIncome.cyberMod || $lastWeeksCashExpenses.cyberMod>> @@ -498,11 +500,11 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ <<if $marketAssistantLimit>> <tr> <td>Menials: [[Assistant's|Personal assistant options][$nextButton = "Back to Budget", $nextLink = "Costs Budget"]] flipping</td> - <td><<= cashNumFormat($lastWeeksCashIncome.menialTradesTransfer)>></td> - <td><<= cashNumFormat($lastWeeksCashExpenses.menialTradesTransfer)>></td> + <td>$lastWeeksCashIncome.menialTransfer</td> + <td>$lastWeeksCashExpenses.menialTransfer</td> <td> - <<set $lastWeeksCashProfits.menialTradesTransfer = ($lastWeeksCashIncome.menialTradesTransfer + $lastWeeksCashExpenses.menialTradesTransfer)>> - <<= cashNumFormat($lastWeeksCashProfits.menialTradesTransfer)>> + <<set $lastWeeksCashProfits.menialTransfer = ($lastWeeksCashIncome.menialTransfer + $lastWeeksCashExpenses.menialTransfer)>> + $lastWeeksCashProfits.menialTransfer </td> </tr> <</if>> diff --git a/src/uncategorized/costsWidgets.tw b/src/uncategorized/costsWidgets.tw index f77792e8657c6f475781d1e6411c6ddcc75a3255..24888e8d0652796342ea103306b18653c66e4ad5 100644 --- a/src/uncategorized/costsWidgets.tw +++ b/src/uncategorized/costsWidgets.tw @@ -479,7 +479,7 @@ menialBioreactors: 0, slaveTransfer:0, fuckdollsTransfer:0, -menialTradesTransfer:0, +menialTransfer:0, menialBioreactorsTransfer: 0, babyTransfer: 0, menialRetirement: 0,