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/costsBudget.tw b/src/uncategorized/costsBudget.tw index 2c6f913fd5c3da64d78d80187077b3c73687f68d..d0f8f42c2b17fd5663969963656afce38f133e93 100644 --- a/src/uncategorized/costsBudget.tw +++ b/src/uncategorized/costsBudget.tw @@ -588,6 +588,18 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ </tr> <</if>> + <<if $lastWeeksCashIncome.babyTransfer || $lastWeeksCashExpenses.babyTransfer>> + <tr> + <td>Buying/Selling Babies</td> + <td>$lastWeeksCashIncome.babyTransfer</td> + <td>$lastWeeksCashExpenses.babyTransfer</td> + <td>$lastWeeksCashIncome.babyTransfer + <<set $lastWeeksCashProfits.babyTransfer = ($lastWeeksCashIncome.babyTransfer + $lastWeeksCashExpenses.babyTransfer)>> + $lastWeeksCashProfits.babyTransfer + </td> + </tr> + <</if>> + <<if $lastWeeksCashIncome.menialRetirement || $lastWeeksCashExpenses.menialRetirement>> <tr> <td>Menials retiring</td> @@ -600,6 +612,18 @@ for(var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){ </tr> <</if>> + <<if $lastWeeksCashIncome.slaveMod || $lastWeeksCashExpenses.slaveMod>> + <tr> + <td>Slave Modification</td> + <td>$lastWeeksCashIncome.slaveMod</td> + <td>$lastWeeksCashExpenses.slaveMod</td> + <td>$lastWeeksCashIncome.slaveMod + <<set $lastWeeksCashProfits.slaveMod = ($lastWeeksCashIncome.slaveMod + $lastWeeksCashExpenses.slaveMod)>> + $lastWeeksCashProfits.slaveMod + </td> + </tr> + <</if>> + <<if $lastWeeksCashIncome.slaveSurgery || $lastWeeksCashExpenses.slaveSurgery>> <tr> <td>Slave Surgery</td> diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw index 48b579723579fb242c14eba722d89a24899e75d6..cf375f698ca107b3cf5ded505a373aa88d7ed17f 100644 --- a/src/uncategorized/persBusiness.tw +++ b/src/uncategorized/persBusiness.tw @@ -20,8 +20,7 @@ <</if>> <<if $cash < 0>> - @@.red;You are in debt.@@ This week, interest came to <<print cashFormat((1+Math.trunc(Math.abs($cash)/100)))>>. - <<set $cash -= (1+Math.trunc(Math.abs($cash)/100))>> + @@.red;You are in debt.@@ This week, interest came to <<print cashFormat(cashX(forceNeg(1+Math.trunc(Math.abs($cash)/100))), "personalBusiness")>>. <<if $arcologies[0].FSRomanRevivalist != "unset">> Society @@.red;very strongly disapproves@@ of your being in debt; this damages the idea that you model yourself on what a Roman leader should be. <<= FSChange("RomanRevivalist", -10)>> @@ -652,7 +651,8 @@ <<if $CashForRep == 1>> <<if $cash > 1000>> This week you gave up business opportunities worth <<print cashFormat($policyCost)>> to help deserving citizens, @@.green;burnishing your reputation.@@ - <<set $rep += 100, $cash -= $policyCost>> + <<set $rep += 100>> + <<run cashX(foceNeg($policyCost), "policies")>> <<if $PC.degeneracy > 1>> This also helps @@.green;offset any rumors@@ about your private actions. <<set $PC.degeneracy -= 1>> @@ -664,7 +664,8 @@ <<if $goodImageCampaign == 1>> <<if $cash > 5000>> This week you paid <<print cashFormat($policyCost)>> to have positive rumors spread about you, @@.green;making you look good<<if $PC.degeneracy > 1>> and weakening existing undesirable rumors<<set $PC.degeneracy -= 2>><</if>>.@@ - <<set $rep += 50, $cash -= $policyCost>> + <<set $rep += 50>> + <<run cashX(foceNeg($policyCost), "policies")>> <<else>> You lacked enough extra ¤ to pay people to spread positive rumors about you this week. <</if>> @@ -673,7 +674,7 @@ <<if $RepForCash == 1>> This week you used your position to secure business opportunities worth <<print cashFormat($policyCost)>> at the expense of citizens, @@.red;damaging your reputation.@@ <<set $rep -= 100>> - <<run cashX($policyCost, "personalBusiness")>> + <<run cashX($policyCost, "policies")>> <</if>> <</if>> <<if $rep <= 18000>> @@ -690,7 +691,7 @@ <<if $secExp == 1>> <<if $smilingManFate == 0 && random(1,100) >= 85>> This week one of the offside adventures of The Smiling Man produced a copious amount of money, of which @@.yellowgreen;you receive your share@@. - <<run cashX(random(10,20) * 1000, "personalBusiness")>> + <<run cashX(random(10,20) * 1000, "policies")>> <</if>> <<if $sellData == 1>>