From 6ddfb2e59f2f685bb8b303d73c7367a0d20823cc Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Tue, 4 Jun 2019 21:30:50 -0500 Subject: [PATCH] MoreSceneFixes --- src/pregmod/birthStorm.tw | 6 +++--- src/pregmod/csec.tw | 8 ++++---- src/pregmod/seBurst.tw | 3 +-- src/pregmod/sePlayerBirth.tw | 4 +++- src/pregmod/widgets/seBirthWidgets.tw | 15 ++------------- 5 files changed, 13 insertions(+), 23 deletions(-) diff --git a/src/pregmod/birthStorm.tw b/src/pregmod/birthStorm.tw index a9c482a760e..86f33c44fc7 100644 --- a/src/pregmod/birthStorm.tw +++ b/src/pregmod/birthStorm.tw @@ -240,7 +240,7 @@ The remote surgery allows the removal of the pregnancy generator through convent <<if _incubated == 1 || _nursed == 1>>the rest<</if>> <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 1 && ($activeSlave.pregSource == -1 || $activeSlave.pregSource == -6) && $propOutcome == 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">> + <<elseif $activeSlave.pregSource == -9 && $DefaultBirthDestination == "the market">> <<set _babyCost = random(1000,2500)>> purchased by the Futanari Sisters for @@.yellowgreen;<<print cashFormat(_curBabies*(_babyCost))>>.@@ <<run cashX((_curBabies*(_babyCost)), "babyTransfer")>> @@ -330,14 +330,14 @@ The remote surgery allows the removal of the pregnancy generator through convent //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 <<if _curBabies > 1>>future high class citizens<<else>>a future high class citizen<</if>>, an expensive proposition. $activeSlave.slaveName + 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>> will @@.hotpink;worship you utterly@@ for this. <<set $activeSlave.devotion += 6>> <<elseif $activeSlave.devotion > 50>> - understands that this is the best possible outcome for the offspring of slave, and will be @@.hotpink;overjoyed.@@ + understands that this is the best possible outcome for the offspring of a slave, and will be @@.hotpink;overjoyed.@@ <<set $activeSlave.devotion += 6>> <<elseif $activeSlave.devotion > 20>> will miss $his child<<if _curBabies > 1>>ren<</if>>, but will be @@.hotpink;very grateful,@@ since <<print $he>>'ll understand this is the best possible outcome for a slave mother. diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index 0d4c5e444a4..d2aee7532e3 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -213,7 +213,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a <<if _incubated == 1 || _nursed == 1>>the rest<</if>> <<if $arcologies[0].FSRestart != "unset" && $activeSlave.breedingMark == 1 && ($activeSlave.pregSource == -1 || $activeSlave.pregSource == -6) && $propOutcome == 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">> + <<elseif $activeSlave.pregSource == -9 && $DefaultBirthDestination == "the market">> <<set _babyCost = random(1000,2500)>> purchased by the Futanari Sisters for @@.yellowgreen;<<print cashFormat(_curBabies*(_babyCost))>>.@@ <<run cashX((_curBabies*(_babyCost)), "babyTransfer")>> @@ -303,14 +303,14 @@ 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 <<if _curBabies > 1>>future high class citizens<<else>>a future high class citizen<</if>>, an expensive proposition. $activeSlave.slaveName + 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>> will @@.hotpink;worship you utterly@@ for this. <<set $activeSlave.devotion += 6>> <<elseif $activeSlave.devotion > 50>> - understands that this is the best possible outcome for the offspring of slave, and will be @@.hotpink;overjoyed.@@ + understands that this is the best possible outcome for the offspring of a slave, and will be @@.hotpink;overjoyed.@@ <<set $activeSlave.devotion += 6>> <<elseif $activeSlave.devotion > 20>> will miss $his child<<if _curBabies > 1>>ren<</if>>, but will be @@.hotpink;very grateful,@@ since <<print $he>>'ll understand this is the best possible outcome for a slave mother. @@ -400,7 +400,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a will @@.hotpink;worship you utterly@@ for this. <<set $activeSlave.devotion += 6>> <<elseif $activeSlave.devotion > 50>> - understands that this is the best possible outcome for the offspring of slave, and will be @@.hotpink;overjoyed.@@ + understands that this is the best possible outcome for the offspring of a slave, and will be @@.hotpink;overjoyed.@@ <<set $activeSlave.devotion += 6>> <<elseif $activeSlave.devotion > 20>> will miss $his child<<if _curBabies > 1>>ren<</if>>, but will be @@.hotpink;very grateful,@@ since <<print $he>>'ll understand this is the best possible outcome for a slave mother. diff --git a/src/pregmod/seBurst.tw b/src/pregmod/seBurst.tw index afc513807dd..5b0f77d8a75 100644 --- a/src/pregmod/seBurst.tw +++ b/src/pregmod/seBurst.tw @@ -191,7 +191,6 @@ <</if>> <</for>> <</if>> - <<else>> life and <<if _curBabies <= 1>>that of $his child<<else>>those of $his children<</if>>. <</if>> @@ -203,7 +202,7 @@ <<span $dispositionId>> <<if $arcologies[0].FSRestart != "unset" && $slaves[_b].breedingMark == 1 && $propOutcome == 1 && ($slaves[_b].pregSource == -1 || $slaves[_b].pregSource == -6)>> 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>> + <<elseif $slaves[_b].pregSource == -9 && $DefaultBirthDestination == "the market">> <<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")>> diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw index 2933a04f8c7..410ad6eaa67 100644 --- a/src/pregmod/sePlayerBirth.tw +++ b/src/pregmod/sePlayerBirth.tw @@ -626,7 +626,9 @@ 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), "babyTransfer")>><</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>> <<if $PC.pregSource == -9>> | <<link "Futanari Sisters">><<replace "#choice">><<print "You have decided to gift them to the Futanari Sisters to be raised to join them. They are more than happy to cover all the expenses for the gift you gave them ā€” especially after they gave you a gift in return.">><</replace>><</link>> <</if>> diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index c892e120ab2..61a11745810 100644 --- a/src/pregmod/widgets/seBirthWidgets.tw +++ b/src/pregmod/widgets/seBirthWidgets.tw @@ -908,21 +908,10 @@ All in all, <<span $dispositionId>> <<if $arcologies[0].FSRestart != "unset" && $slaves[$i].breedingMark == 1 && $propOutcome == 1 && ($slaves[$i].pregSource == -1 || $slaves[$i].pregSource == -6)>> $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>> + <<elseif $slaves[$i].pregSource == -9 && $DefaultBirthDestination == "the market">> <<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 _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 _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>> - <<set $breederOrphanageTotal += _curBabies, $slaveOrphanageTotal -= _curBabies>> <<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 @@ -1122,7 +1111,7 @@ All in all, will @@.hotpink;worship you utterly@@ for this. <<set $slaves[$i].devotion += 6>> <<elseif $slaves[$i].devotion > 50>> - understands that this is the best possible outcome for the offspring of slave, and will be @@.hotpink;overjoyed.@@ + understands that this is the best possible outcome for the offspring of a slave, and will be @@.hotpink;overjoyed.@@ <<set $slaves[$i].devotion += 6>> <<elseif $slaves[$i].devotion > 20>> will miss $his child<<if _curBabies > 1>>ren<</if>>, but will be @@.hotpink;very grateful,@@ since <<print $he>>'ll understand this is the best possible outcome for a slave mother. -- GitLab