From 0724f0695d6226fcbc99b17721521b163b37578c Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Tue, 4 Jun 2019 00:27:49 -0500 Subject: [PATCH] Hrmm --- src/pregmod/csec.tw | 28 ++-------- src/pregmod/seBurst.tw | 57 +++++++++++++-------- src/pregmod/widgets/seBirthWidgets.tw | 26 ++-------- src/uncategorized/BackwardsCompatibility.tw | 5 +- src/uncategorized/seBirth.tw | 2 +- 5 files changed, 44 insertions(+), 74 deletions(-) diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index d6731657615..d6b3215b597 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -212,32 +212,12 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a <span id="_disposition"> <<if _incubated == 1 || _nursed == 1>>the rest<</if>> <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 1 && ($activeSlave.pregSource == -1 || $activeSlave.pregSource == -6) && $propOutcome == 1>> - <<set _lostBabies = 1>> handed off to the Societal Elite to be raised into upstanding members of the new society. <<elseif $Cash4Babies == 1 && $activeSlave.pregSource == -9 && ($activeSlave.relationship != -3) && ($activeSlave.assignment != "serve in the master suite") && ($activeSlave.assignment != "be your Concubine") && $DefaultBirthDestination == "the market">> - <<set _lostBabies = 1, _babyCost = random(1000,2500)>> + <<set _babyCost = random(1000,2500)>> purchased by the Futanari Sisters for @@.yellowgreen;<<print cashFormat(_curBabies*(_babyCost))>>.@@ <<run cashX((_curBabies*(_babyCost)), "babyTransfer")>> - <</if>> - <<if _lostBabies != 1 && $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination == "breeder schools">> - <<set _lostBabies = 1>> - sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. $activeSlave.slaveName - <<if $activeSlave.fetish == "mindbroken" || $activeSlave.fuckdoll > 0>> - has few thoughts about the matter. - <<elseif $activeSlave.devotion > 95>> - loves you already, but $he'll @@.hotpink;love you even more@@ for this. $He can't wait to see $his child<<if _curBabies > 1>>ren<</if>> proudly furthering your cause. - <<set $activeSlave.devotion += 4>> - <<elseif $activeSlave.devotion > 50>> - heard about these and will be @@.hotpink;happy that $his child<<if _curBabies > 1>>ren<</if>> will have a purpose in your society other than slavery.@@ $He will miss $his child<<if _curBabies > 1>>ren<</if>>, but $he expected that. - <<set $activeSlave.devotion += 4>> - <<elseif $activeSlave.devotion > 20>> - will naturally miss $his child<<if _curBabies > 1>>ren<</if>>, but will is broken enough to hope that $his offspring will have a better life, or at least an enjoyable one. - <<else>> - will of course @@.mediumorchid;hate you for this.@@ The mere thought of $his <<if $minimumSlaveAge > $fertilityAge>>$minimumSlaveAge<<else>>$fertilityAge<</if>> year old daughter<<if _curBabies > 1>>s<</if>> swollen with life, and proud of it, fills $him with @@.gold;disdain.@@ - <<set $activeSlave.devotion -= 4, $activeSlave.trust -= 4>> - <</if>> - <<set $breederOrphanageTotal += _curBabies, $slaveOrphanageTotal -= _curBabies>> - <<elseif _lostBabies != 1 && $DefaultBirthDestination == "individually decided fates">> + <<elseif $DefaultBirthDestination == "individually decided fates">> <br><br> <<link "...sent to a slave orphanage.">> <<replace #_disposition>> @@ -323,7 +303,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a //Will cost <<print cashFormat(100)>> weekly// <br><<link "...sent to be raised privately.">> <<replace #_disposition>> - The child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to be privately raised, to be brought up as a future high class citizen, an expensive proposition. $activeSlave.slaveName + The child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to be privately raised, to be brought up as <<if _curBabies > 1>>future high class citizens<<else>>a future high class citizen<</if>>, an expensive proposition. $activeSlave.slaveName <<if $activeSlave.fetish == "mindbroken" || $activeSlave.fuckdoll > 0>> does not give any hint of a response. <<elseif $activeSlave.devotion > 95>> @@ -374,7 +354,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a <<set $nextButton = "Back">><<UpdateNextButton>> /* unlock Continue button */ <</link>> <</if>> - <<elseif _lostBabies != 1 && $DefaultBirthDestination != "individually decided fates">> + <<else>> sent to $DefaultBirthDestination. <<switch $DefaultBirthDestination>> <<case "an orphanage">> diff --git a/src/pregmod/seBurst.tw b/src/pregmod/seBurst.tw index 82eac9d0285..9505775eb1b 100644 --- a/src/pregmod/seBurst.tw +++ b/src/pregmod/seBurst.tw @@ -202,18 +202,12 @@ <br><br> <<span $dispositionId>> <<if $arcologies[0].FSRestart != "unset" && $slaves[_b].breedingMark == 1 && $propOutcome == 1 && ($slaves[_b].pregSource == -1 || $slaves[_b].pregSource == -6)>> - <<set _lostBabies = 1>> From there, $his child<<if _curBabies > 1>>ren are<<else>> is<</if>> collected by the Societal Elite to be raised into upstanding members of the new society. <<elseif $Cash4Babies == 1 && $slaves[_b].pregSource == -9>> - <<set _lostBabies = 1, _babyCost = random(1000,2500)>> + <<set _babyCost = random(1000,2500)>> $His <<if _curBabies > 1>>babies were<<else>>baby was<</if>> purchased by the Futanari Sisters for @@.yellowgreen;<<print cashFormat(_curBabies*(_babyCost))>>.@@ <<run cashX((_curBabies*(_babyCost)), "babyTransfer")>> - <</if>> - <<if _lostBabies != 1 && $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination == "breeder schools">> - <<set _lostBabies = 1>> - $His child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. Hopefully there they will be trained to not suffer the same fate. - <<set $breederOrphanageTotal += _curBabies>> - <<elseif _lostBabies != 1 && $DefaultBirthDestination == "individually decided fates" && $universalRulesChildrenBecomeBreeders < 1>> + <<elseif $DefaultBirthDestination == "individually decided fates">> Unless you provide otherwise, the child<<if _curBabies > 1>>ren<</if>> will be remanded to one of $arcologies[0].name's slave orphanages. <<set $slaveOrphanageTotal += _curBabies>> <<capture $i, $dispositionId, _curBabies>> @@ -230,7 +224,7 @@ <<link "Send them to a citizen school">> <<replace `"#" + $dispositionId`>> The child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to one of $arcologies[0].name's citizen schools, to be brought up coequal with the arcology's other young people. - <<set $slaves[_b].devotion += 4, $citizenOrphanageTotal += _curBabies, $slaveOrphanageTotal -= _curBabies>> + <<set $citizenOrphanageTotal += _curBabies, $slaveOrphanageTotal -= _curBabies>> <</replace>> <</link>> //Will cost <<print cashFormat(100)>> weekly// @@ -244,8 +238,8 @@ <</if>> | <<link "Have them raised privately">> <<replace `"#" + $dispositionId`>> - The child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to be privately raised, to be brought up as a future high class citizen. - <<set $slaves[_b].devotion += 6, $privateOrphanageTotal += _curBabies, $slaveOrphanageTotal -= _curBabies>> + The child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to be privately raised, to be brought up as <<if _curBabies > 1>>future high class citizens<<else>>a future high class citizen<</if>>. + <<set $privateOrphanageTotal += _curBabies, $slaveOrphanageTotal -= _curBabies>> <</replace>> <</link>> //Will cost <<print cashFormat(500)>> weekly// @@ -253,11 +247,11 @@ <<if $slaves[_b].prestige > 1 || $slaves[_b].pornPrestige > 2>> | <<link "Send them to auction">> <<replace `"#" + $dispositionId`>> - <<set _babyCost = random(-12,12)>> - <<if $slaves[_b].prematureBirth == 1>><<set _babyCost = -45>><</if>> - $His <<if _curBabies > 1>>babies were<<else>>baby was<</if>> sold for <<if _curBabies > 1>>a total of <</if>><<if $slaves[_b].prematureBirth == 1>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>,@@ a low price, due to the added costs of caring for them.<<else>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@<</if>> - <<run cashX((_curBabies*(50+_babyCost)), "babyTransfer")>> - <<set $slaveOrphanageTotal -= _curBabies>> + <<set _babyCost = random(-12,12)>> + <<if $slaves[_b].prematureBirth == 1>><<set _babyCost = -45>><</if>> + $His <<if _curBabies > 1>>babies were<<else>>baby was<</if>> sold for <<if _curBabies > 1>>a total of <</if>><<if $slaves[_b].prematureBirth == 1>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>,@@ a low price, due to the added costs of caring for them.<<else>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@<</if>> + <<run cashX((_curBabies*(50+_babyCost)), "babyTransfer")>> + <<set $slaveOrphanageTotal -= _curBabies>> <</replace>> <</link>> <<else>> @@ -273,14 +267,33 @@ <</if>> <</if>> <</capture>> + <<else>> + <<switch $DefaultBirthDestination>> + <<case "an orphanage">> + The child<<if _curBabies > 1>>ren<</if>> will be remanded to one of $arcologies[0].name's slave orphanages. + <<set $slaveOrphanageTotal += _curBabies>> + <<case "a citizen school">> + The child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to one of $arcologies[0].name's citizen schools, to be brought up coequal with the arcology's other young people. + <<set $citizenOrphanageTotal += _curBabies, $slaveOrphanageTotal -= _curBabies>> + <<case "a private school">> + The child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to be privately raised, to be brought up as <<if _curBabies > 1>>future high class citizens<<else>>a future high class citizen<</if>>. + <<set $privateOrphanageTotal += _curBabies, $slaveOrphanageTotal -= _curBabies>> + <<case "breeder schools">> + The child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. Hopefully there they will be trained to not suffer the same fate. + <<set $breederOrphanageTotal += _curBabies, $slaveOrphanageTotal -= _curBabies>> + <<case "the market">> + <<if $slaves[$_b].prestige > 1 || $slaves[$_b].pornPrestige > 2>> + <<set _babyCost = random(-12,100)>> + <<if $slaves[$_b].prematureBirth > 0>><<set _babyCost = random(-32,40)>><</if>> + <<else>> + <<set _babyCost = random(-12,12)>> + <<if $slaves[$_b].prematureBirth > 0>><<set _babyCost = -45>><</if>> + <</if>> + $His <<if _curBabies > 1>>babies were<<else>>baby was<</if>> sold for <<if _curBabies > 1>>a total of <</if>><<if $slaves[$_b].prematureBirth == 1>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>,@@ a low price, due to the added costs of caring for them.<<else>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@<</if>> + <<run cashX(_curBabies*(50+_babyCost), "babyTransfer")>> + <</switch>> <</if>> <</span>> - <<elseif $Cash4Babies == 1 && _curBabies > 0 && $DefaultBirthDestination == "the market" && $universalRulesChildrenBecomeBreeders < 1>> - <br><br> - <<set _babyCost = random(-12,12)>> - <<if $slaves[_b].prematureBirth == 1>><<set _babyCost = -45>><</if>> - $His <<if _curBabies > 1>>babies were<<else>>baby was<</if>> sold for <<if _curBabies > 1>>a total of <</if>><<if $slaves[_b].prematureBirth == 1>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>,@@ a low price, due to the added costs of caring for them.<<else>>@@.yellowgreen;<<print cashFormat(_curBabies*(50+_babyCost))>>.@@<</if>> - <<run cashX((_curBabies*(50+_babyCost)), "babyTransfer")>> <</if>> <<if $arcologies[0].FSRestart != "unset" && _curBabies > 0>> diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index 1d7b4f382b7..81ffacbb01f 100644 --- a/src/pregmod/widgets/seBirthWidgets.tw +++ b/src/pregmod/widgets/seBirthWidgets.tw @@ -907,43 +907,23 @@ All in all, <br><br> <<span $dispositionId>> <<if $arcologies[0].FSRestart != "unset" && $slaves[$i].breedingMark == 1 && $propOutcome == 1 && ($slaves[$i].pregSource == -1 || $slaves[$i].pregSource == -6)>> - <<set _lostBabies = 1>> $His child<<if _curBabies > 1>>ren are<<else>> is<</if>> collected by the Societal Elite to be raised into upstanding members of the new society. <<elseif $Cash4Babies == 1 && $slaves[$i].pregSource == -9>> - <<set _lostBabies = 1, _babyCost = random(1000,2500)>> + <<set _babyCost = random(1000,2500)>> $His <<if _curBabies > 1>>babies were<<else>>baby was<</if>> purchased by the Futanari Sisters for @@.yellowgreen;<<print cashFormat(_curBabies*(_babyCost))>>.@@ <<run cashX((_curBabies*(_babyCost)), "babyTransfer")>> <<elseif $Cash4Babies == 1 && $DefaultBirthDestination == "the market" && ($slaves[$i].relationship == -3)>> - <<set _lostBabies = 1>> <<set _babyCost = random(-12,12)>> <<if $slaves[$i].prematureBirth == 1>><<set _babyCost = -45>><</if>> You make sure $his child<<if _curBabies > 1>>ren are<<else>> is<</if>> cared for, since $he is your wife. $slaves[$i].slaveName is @@.hotpink;touched@@ by this @@.mediumaquamarine;act of kindness.@@ <<set $slaves[$i].trust += 3, $slaves[$i].devotion += 3>> <<elseif $Cash4Babies == 1 && $DefaultBirthDestination == "the market" && ($slaves[$i].assignment == "serve in the master suite" || $slaves[$i].assignment == "be your Concubine")>> - <<set _lostBabies = 1>> <<set _babyCost = random(-12,12)>> <<if $slaves[$i].prematureBirth == 1>><<set _babyCost = -45>><</if>> $His child<<if _curBabies > 1>>ren<</if>> are guaranteed to be treated well despite the laws you've passed since $he is a member of your harem. $slaves[$i].slaveName is @@.hotpink;touched@@ by this @@.mediumaquamarine;act of kindness.@@ <<set $slaves[$i].trust += 3, $slaves[$i].devotion += 3>> - <</if>> - <<if _lostBabies != 1 && $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination == "breeder schools">> - $His child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to one of $arcologies[0].name's future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. $slaves[$i].slaveName - <<if $slaves[$i].fetish == "mindbroken" || $slaves[$i].fuckdoll > 0>> - has few thoughts about the matter. - <<elseif $slaves[$i].devotion > 95>> - loves you already, but $he'll @@.hotpink;love you even more@@ for this. $He can't wait to see $his child<<if _curBabies > 1>>ren<</if>> proudly furthering your cause. - <<set $slaves[$i].devotion += 4>> - <<elseif $slaves[$i].devotion > 50>> - heard about these and will be @@.hotpink;happy that $his child<<if _curBabies > 1>>ren<</if>> will have a purpose in your society other than slavery.@@ $He will miss $his child<<if _curBabies > 1>>ren<</if>>, but $he expected that. - <<set $slaves[$i].devotion += 4>> - <<elseif $slaves[$i].devotion > 20>> - will naturally miss $his child<<if _curBabies > 1>>ren<</if>>, but will is broken enough to hope that $his offspring will have a better life, or at least an enjoyable one. - <<else>> - will of course @@.mediumorchid;hate you for this.@@ The mere thought of $his <<if $minimumSlaveAge > $fertilityAge>>$minimumSlaveAge<<else>>$fertilityAge<</if>> year old daughter<<if _curBabies > 1>>s<</if>> swollen with life, and proud of it, fills $him with @@.gold;disdain.@@ - <<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>> - <</if>> <<set $breederOrphanageTotal += _curBabies, $slaveOrphanageTotal -= _curBabies>> - <<elseif _lostBabies != 1 && $DefaultBirthDestination == "individually decided fates" && $universalRulesChildrenBecomeBreeders < 1>> + <<elseif $DefaultBirthDestination == "individually decided fates">> <<set $slaveOrphanageTotal += _curBabies>> Unless you provide otherwise, the child<<if _curBabies > 1>>ren<</if>> will be remanded to one of $arcologies[0].name's slave orphanages. $slaves[$i].slaveName <<if $slaves[$i].fetish == "mindbroken" || $slaves[$i].fuckdoll > 0>> @@ -1023,7 +1003,7 @@ All in all, <</if>> | <<link "Have them raised privately">> <<replace `"#" + $dispositionId`>> - The child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to be privately raised, to be brought up as a future high class citizen. $slaves[$i].slaveName + The child<<if _curBabies > 1>>ren are<<else>> is<</if>> sent to be privately raised, to be brought up as <<if _curBabies > 1>>future high class citizens<<else>>a future high class citizen<</if>>. $slaves[$i].slaveName <<if $slaves[$i].fetish == "mindbroken" || $slaves[$i].fuckdoll > 0>> does not give any hint of a response. <<elseif $slaves[$i].devotion > 95>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index e9e4c113cdb..0750592ebf7 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -3678,10 +3678,7 @@ Done<br> <<if def $sissy>> <<unset $sissy>> <</if>> -<<if $DefaultBirthDestination === ""||$DefaultBirthDestination == "anywhere">> - <<set $DefaultBirthDestination = "individually decided fates">> -<</if>> -<<if ndef $DefaultBirthDestination>> +<<if ((ndef $DefaultBirthDestination) || ($DefaultBirthDestination === "") || ($DefaultBirthDestination == "anywhere"))>> <<set $DefaultBirthDestination = "individually decided fates">> <</if>> <<if ndef $abbreviateHormoneBalance>> diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw index 8e12f70a1b1..df56752466e 100644 --- a/src/uncategorized/seBirth.tw +++ b/src/uncategorized/seBirth.tw @@ -38,7 +38,7 @@ I need to break single passage to several widgets, as it's been overcomplicated <<seBirthCalc>> <<seBirthMainScene>> <<seBirthBabies>> - <<if $DefaultBirthDestination != "individually decided fates" && $universalRulesChildrenBecomeBreeders < 1>> + <<if $DefaultBirthDestination != "individually decided fates">> $His <<if _curBabies > 1>>babies were<<else>>baby was<</if>> sent to $DefaultBirthDestination. <<switch $DefaultBirthDestination>> <<case "an orphanage">> -- GitLab