From 7fabac2067c3aec12d81269e97aec220808b956c Mon Sep 17 00:00:00 2001
From: Blank <okp57855@psoxs.com>
Date: Thu, 31 Jan 2019 14:31:47 -0800
Subject: [PATCH] BirthTextFix
---
src/js/birthJS.js | 135 +++++++++++++++-----------
src/pregmod/csec.tw | 5 +-
src/pregmod/seBurst.tw | 40 +++-----
src/pregmod/widgets/seBirthWidgets.tw | 15 +--
4 files changed, 96 insertions(+), 99 deletions(-)
diff --git a/src/js/birthJS.js b/src/js/birthJS.js
index dfda1b3e016..02170a841ea 100644
--- a/src/js/birthJS.js
+++ b/src/js/birthJS.js
@@ -10,69 +10,83 @@ window.BirthDestinationText = function(choice,slave) {
}
switch(choice) {
case "Breeder":
- if (T.call !== 1) r += `future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction. ${sn} `;
- if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ if (T.call !== 1) r += `future minded schools, to be administered fertility and virility treatments as well as be brought up to take pride in reproduction.`;
+ if (slave.burst > 0) r += ` Hopefully there they will be trained to not suffer the same fate.`;
+ r += ` ${sn} `;
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0 || slave.burst > 0) {
r += `has few thoughts about the matter.`;
- } else if (slave.devotion > 95) {
- r += `loves you already, but ${he}'ll <span class='hotpink'>love you even more</span> for this. ${He} can't wait to see ${his} ${child} proudly furthering your cause.`;
- slave.devotion += 4;
- } else if (slave.devotion > 50) {
- r += `heard about these and will be <span class='hotpink;happy that ${his} ${child} will have a purpose in your society other than slavery.</span> ${He} will miss ${his} ${child}, but ${he} expected that.`;
- slave.devotion += 4;
- } else if (slave.devotion > 20) {
- r += `will naturally miss ${his} ${child}, but will is broken enough to hope that ${his} offspring will have a better life, or at least an enjoyable one.`;
- } else {
- r += `will of course <span class='mediumorchid'>hate you for this.</span> The mere thought of ${his} ${V.fertilityAge} year old daughter${T.count > 1 ? 's':''} swollen with life, and proud of it, fills ${him} with <span class='gold'>disdain.</span>`;
- slave.devotion -= 4, slave.trust -= 4;
+ }
+ if (V.slave.burst < 1) {
+ if (slave.devotion > 95) {
+ r += `loves you already, but ${he}'ll <span class='hotpink'>love you even more</span> for this. ${He} can't wait to see ${his} ${child} proudly furthering your cause.`;
+ slave.devotion += 4;
+ } else if (slave.devotion > 50) {
+ r += `heard about these and will be <span class='hotpink;happy that ${his} ${child} will have a purpose in your society other than slavery.</span> ${He} will miss ${his} ${child}, but ${he} expected that.`;
+ slave.devotion += 4;
+ } else if (slave.devotion > 20) {
+ r += `will naturally miss ${his} ${child}, but will is broken enough to hope that ${his} offspring will have a better life, or at least an enjoyable one.`;
+ } else {
+ r += `will of course <span class='mediumorchid'>hate you for this.</span> The mere thought of ${his} ${V.fertilityAge} year old daughter${T.count > 1 ? 's':''} swollen with life, and proud of it, fills ${him} with <span class='gold'>disdain.</span>`;
+ slave.devotion -= 4, slave.trust -= 4;
+ }
}
break;
case "Orphanage":
- if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
- r += `has few thoughts about the matter.`;
- } else if (slave.devotion > 95) {
- r += `worships you so completely that ${he} will not resent this.`;
- } else if ( slave.devotion > 50) {
- r += `is devoted to you, but ${he} will <span class='mediumorchid'>struggle to accept this.</span>`;
- slave.devotion -= 2;
- } else if ( slave.devotion > 20) {
- r += `has accepted being a sex slave, but ${he} will <span class='mediumorchid'>resent this intensely.</span>`;
- slave.devotion -= 3;
- } else {
- r += `will of course <span class='mediumorchid'>hate you for this.</span>`;
- slave.devotion -= 4;
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0 || slave.burst > 0) {
+ r += `has few thoughts about the matter.`;
+ }
+ if (V.slave.burst < 1) {
+ if (slave.devotion > 95) {
+ r += `worships you so completely that ${he} will not resent this.`;
+ } else if ( slave.devotion > 50) {
+ r += `is devoted to you, but ${he} will <span class='mediumorchid'>struggle to accept this.</span>`;
+ slave.devotion -= 2;
+ } else if ( slave.devotion > 20) {
+ r += `has accepted being a sex slave, but ${he} will <span class='mediumorchid'>resent this intensely.</span>`;
+ slave.devotion -= 3;
+ } else {
+ r += `will of course <span class='mediumorchid'>hate you for this.</span>`;
+ slave.devotion -= 4;
+ }
}
break;
case "Citizen":
if (T.call !== 1) r += `citizen schools, to be brought up coequal with the arcology's other young people. ${sn} `;
- if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
- r += `has few thoughts about the matter.`;
- } else if (slave.devotion > 95) {
- r += `loves you already, but ${he}'ll <span class='hotpink'>love you even more</span> for this.`;
- } else if (slave.devotion > 50) {
- r += `knows about these and will be <span class='hotpink'>overjoyed,</span> ${he} will miss ${his} ${child}, but ${he} expected that.`;
- } else if (slave.devotion > 20) {
- r += `will naturally miss ${his} ${child}, but will <span class='hotpink;take comfort@@ in the hope that ${his} offspring will have a better life.`;
- } else {
- r += `will naturally retain some resentment over being separated from ${his} ${child}, but this should be balanced by hope that ${his} offspring will have a better life.`;
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0 || slave.burst > 0) {
+ r += `has few thoughts about the matter.`;
+ }
+ if (V.slave.burst < 1) {
+ if (slave.devotion > 95) {
+ r += `loves you already, but ${he}'ll <span class='hotpink'>love you even more</span> for this.`;
+ } else if (slave.devotion > 50) {
+ r += `knows about these and will be <span class='hotpink'>overjoyed,</span> ${he} will miss ${his} ${child}, but ${he} expected that.`;
+ } else if (slave.devotion > 20) {
+ r += `will naturally miss ${his} ${child}, but will <span class='hotpink;take comfort@@ in the hope that ${his} offspring will have a better life.`;
+ } else {
+ r += `will naturally retain some resentment over being separated from ${his} ${child}, but this should be balanced by hope that ${his} offspring will have a better life.`;
+ }
}
break;
case "Private":
if (T.call !== 1) r += `${T.count > 1 ? 'ren are':' is'} sent to be privately raised, to be brought up as a future high class citizen. ${sn} `;
- if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0 || slave.burst > 0) {
r += `has few thoughts about the matter.`;
- } else if (slave.devotion > 95) {
- r += `will <span class='hotpink'>worship you utterly</span> for this.`;
- } else if (slave.devotion > 50) {
- r += `understands that this is the best possible outcome for the offspring of a slave, and will be <span class='hotpink'>overjoyed.</span>`;
- } else if (slave.devotion > 20) {
- r += `will miss ${his} ${child}, but will be <span class='hotpink'>very grateful,</span> since ${he}'ll understand this is the best possible outcome for a slave mother.`;
- } else {
- r += `will resent being separated from ${his} ${child}, but <span class='hotpink'>should understand and be grateful</span> that this is the best possible outcome here.`;
+ }
+ if (V.slave.burst < 1) {
+ if (slave.devotion > 95) {
+ r += `will <span class='hotpink'>worship you utterly</span> for this.`;
+ } else if (slave.devotion > 50) {
+ r += `understands that this is the best possible outcome for the offspring of a slave, and will be <span class='hotpink'>overjoyed.</span>`;
+ } else if (slave.devotion > 20) {
+ r += `will miss ${his} ${child}, but will be <span class='hotpink'>very grateful,</span> since ${he}'ll understand this is the best possible outcome for a slave mother.`;
+ } else {
+ r += `will resent being separated from ${his} ${child}, but <span class='hotpink'>should understand and be grateful</span> that this is the best possible outcome here.`;
+ }
}
r += ` The ${child} will be raised privately, with expert care and tutoring, an expensive proposition.`;
break;
case "Sold":
- r += `${T.call !== 1 ? "${V.his} ${T.count > 1 ? 'babies':'baby'}":"Where they"} `;
+ if (T.call !== 1) r += `${T.call !== 1 ? "${V.his} ${T.count > 1 ? 'babies':'baby'}":"Where they"} `;
if (slave.prestige > 1 || slave.pornPrestige > 2) {
T.babyCost = jsRandom(-12,100);
if (slave.prematureBirth > 0) { T.babyCost = jsRandom(-32,40); }
@@ -84,20 +98,23 @@ window.BirthDestinationText = function(choice,slave) {
}
const cash = cashFormat(T.count*(50+T.babyCost));r += ` <span class='yellowgreen'>${cash}.</span>`;
if (slave.prematureBirth > 0) r += ` A low price due to the added costs of caring for ${T.count > 1 ? 'them':'it'}.`;
- if (slave.devotion > 20) r += ` ${sn} `;
- if (slave.fetish == "mindbroken" || slave.fuckdoll > 0) {
+ r += ` ${sn} `;
+ if (slave.fetish == "mindbroken" || slave.fuckdoll > 0 || slave.burst > 0) {
r += `has few thoughts about the matter.`;
- } else if (slave.devotion > 95) {
- r += `adheres to your thoughts so strongly that even though you backed out of caring for ${his} ${child}, ${he} still truly believes you are doing ${him} an honor.`;
- } else if (slave.devotion > 50) {
- r += `is <span class='mediumorchid'>deeply hurt</span> by your sudden decision to sell ${his} ${child} instead of having ${T.count > 1 ? 'them':'it'} cared for. ${His} trust in your words <span class='gold'>wavers</span> as ${he} thinks of ${his} ${child}'s future.`;
- slave.trust -= 5, slave.devotion -= 5;
- } else if (slave.devotion > 20) {
- r += `is <span class='mediumorchid'>devastated</span> by your sudden decision to sell ${his} ${child} instead of having ${T.count > 1 ? 'them':'it'} cared for. ${His} mind struggles to comprehend <span class='gold'>such betrayal.</span>`;
- slave.trust -= 10, slave.devotion -= 10;
- } else {
- 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;
+ }
+ if (V.slave.burst < 1) {
+ if (slave.devotion > 95) {
+ r += `adheres to your thoughts so strongly that even though you backed out of caring for ${his} ${child}, ${he} still truly believes you are doing ${him} an honor.`;
+ } else if (slave.devotion > 50) {
+ r += `is <span class='mediumorchid'>deeply hurt</span> by your sudden decision to sell ${his} ${child} instead of having ${T.count > 1 ? 'them':'it'} cared for. ${His} trust in your words <span class='gold'>wavers</span> as ${he} thinks of ${his} ${child}'s future.`;
+ slave.trust -= 5, slave.devotion -= 5;
+ } else if (slave.devotion > 20) {
+ r += `is <span class='mediumorchid'>devastated</span> by your sudden decision to sell ${his} ${child} instead of having ${T.count > 1 ? 'them':'it'} cared for. ${His} mind struggles to comprehend <span class='gold'>such betrayal.</span>`;
+ slave.trust -= 10, slave.devotion -= 10;
+ } else {
+ 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), "babyTransfer", slave);
break;
diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw
index 307d5a34646..1ec5dffb8da 100644
--- a/src/pregmod/csec.tw
+++ b/src/pregmod/csec.tw
@@ -210,9 +210,8 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a
<<set _lostBabies = 1>>
handed off to the Societal Elite to be raised into upstanding members of the new society.
<<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)), "babyTransfer", $activeSlave)>>
+ <<set _lostBabies = 1, _call = 1>>
+ <<= BirthDestinationText("Sold",$activeSlave)>>
<<elseif $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination === "individually decided fates">>
<<set _lostBabies = 1>>
<<= BirthDestinationText("Orphanage",$activeSlave)>>
diff --git a/src/pregmod/seBurst.tw b/src/pregmod/seBurst.tw
index 914f12f2239..a8cbcb1f79f 100644
--- a/src/pregmod/seBurst.tw
+++ b/src/pregmod/seBurst.tw
@@ -195,29 +195,27 @@
<<set _count = _curBabies>>
<br><br>
<<span $dispositionId>>
- <<if $arcologies[0].FSRestart != "unset" && $slaves[[_b].breedingMark == 1 && $propOutcome == 1 && $slaves[$i].pregSource == -1>>
+ <<if $arcologies[0].FSRestart != "unset" && $slaves[_b].breedingMark == 1 && $propOutcome == 1 && $slaves[_b].pregSource == -1>>
<<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 && $DefaultBirthDestination !== "the market">>
<<set _lostBabies = 1>>
- <<set _babyCost = random(-12,12)>>
- <<if $slaves[$i].prematureBirth == 1>><<set _babyCost = -45>><</if>>
- $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)), "babyTransfer")>>
+ <<= BirthDestinationText("Sold",$slaves[_b])>>
<</if>>
<<if _lostBabies != 1 && $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination === "individually decided fates">>
<<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.
+ $His <<= BirthDestinationText("Breeder",$slaves[_b])>>
<<set $breederOrphanageTotal += _count>>
<<elseif _lostBabies != 1 && $DefaultBirthDestination === "individually decided fates" && $universalRulesChildrenBecomeBreeders < 1>>
- <<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.
+ <<set _call = 1>> <<= BirthDestinationText("Orphanage",$slaves[_b])>>
+ <<set $slaveOrphanageTotal += _count>>
<<capture $i, $dispositionId, _count>>
<br>
<<if $arcologies[0].FSRepopulationFocus > 40>>
<<link 'Send them to a breeder school'>>
<<replace `"#" + $dispositionId`>>
- The child<<if _count > 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.
+ The child<<if _count > 1>>ren are<<else>> is<</if>> <<= BirthDestinationText("Breeder",$slaves[_b])>>
<<set $breederOrphanageTotal += _count, $slaveOrphanageTotal -= _count>>
<</replace>>
<</link>>
@@ -225,36 +223,30 @@
<</if>>
<<link 'Send them to a citizen school'>>
<<replace `"#" + $dispositionId`>>
- The child<<if _count > 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[$i].devotion += 4, $citizenOrphanageTotal += _count, $slaveOrphanageTotal -= _count>>
+ The child<<if _count > 1>>ren are<<else>> is<</if>> <<= BirthDestinationText("Citizen",$slaves[_b])>>
+ <<set $slaves[_b].devotion += 4, $citizenOrphanageTotal += _count, $slaveOrphanageTotal -= _count>>
<</replace>>
<</link>>
//Will cost <<print cashFormat(100)>> weekly//
| <<link 'Have them raised privately'>>
<<replace `"#" + $dispositionId`>>
- The child<<if _count > 1>>ren are<<else>> is<</if>> sent to be privately raised, to be brought up as a future high class citizen.
- <<set $slaves[$i].devotion += 6, $privateOrphanageTotal += _count, $slaveOrphanageTotal -= _count>>
+ The <<= BirthDestinationText("Private",$slaves[_b])>>
+ <<set $slaves[_b].devotion += 6, $privateOrphanageTotal += _count, $slaveOrphanageTotal -= _count>>
<</replace>>
<</link>>
//Will cost <<print cashFormat(500)>> weekly//
<<if $Cash4Babies == 1>>
- <<if $slaves[$i].prestige > 1 || $slaves[$i].pornPrestige > 2>>
+ <<if $slaves[_b].prestige > 1 || $slaves[_b].pornPrestige > 2>>
| <<link 'Send them to auction'>>
<<replace `"#" + $dispositionId`>>
- <<set _babyCost = random(-12,12)>>
- <<if $slaves[$i].prematureBirth == 1>><<set _babyCost = -45>><</if>>
- $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)), "babyTransfer")>>
+ <<= BirthDestinationText("Sold",$slaves[_b])>>
<<set $slaveOrphanageTotal -= _count>>
<</replace>>
<</link>>
<<else>>
| <<link 'Sell them anyway'>>
<<replace `"#" + $dispositionId`>>
- <<set _babyCost = random(-12,12)>>
- <<if $slaves[$i].prematureBirth == 1>><<set _babyCost = -45>><</if>>
- $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)), "babyTransfer")>>
+ <<= BirthDestinationText("Sold",$slaves[_b])>>
<<set $slaveOrphanageTotal -= _count>>
<</replace>>
<</link>>
@@ -264,11 +256,7 @@
<</if>>
<</span>>
<<elseif $Cash4Babies == 1 && _curBabies > 0 && $DefaultBirthDestination === "individually decided fates" && $universalRulesChildrenBecomeBreeders < 1>>
- <br><br>
- <<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)), "babyTransfer")>>
+ <<= BirthDestinationText("Sold",$slaves[_b])>>
<</if>>
<<if $arcologies[0].FSRestart != "unset" && _curBabies > 0 && $eugenicsFullControl != 1>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index bab56a24225..02dec838ce4 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -912,18 +912,17 @@ All in all,
<<set $slaves[$i].trust += 3, $slaves[$i].devotion += 3>>
<<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)), "babyTransfer")>>
+ <<= BirthDestinationText("Sold",$slaves[$i])>>
<</if>>
<</if>>
<<if _lostBabies != 1 && $universalRulesChildrenBecomeBreeders > 0 && $arcologies[0].FSRepopulationFocus > 40 && $DefaultBirthDestination === "individually decided fates">>
<<set _lostBabies = 1>>
- $His <<= BirthDestinationText("Orphanage",$slaves[$i])>>
+ $His <<= BirthDestinationText("Breeder",$slaves[$i])>>
<<set $breederOrphanageTotal += _curBabies>>
<<elseif _lostBabies != 1 && $DefaultBirthDestination === "individually decided fates" && $universalRulesChildrenBecomeBreeders < 1>>
- <<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.
- <<= BirthDestinationText("Orphanage",$slaves[$i])>>
+ <<set _call = 1>> <<= BirthDestinationText("Orphanage",$slaves[$i])>>
+ <<set $slaveOrphanageTotal += _curBabies>>
<<capture $i, $dispositionId, _count>>
<br>
<<if $arcologies[0].FSRepopulationFocus > 40>>
@@ -969,12 +968,6 @@ All in all,
<</capture>>
<</if>>
<</span>>
-<<elseif $Cash4Babies == 1 && _curBabies > 0 && $DefaultBirthDestination === "individually decided fates" && $universalRulesChildrenBecomeBreeders < 1>>
- <br><br>
- <<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)), "babyTransfer")>>
<</if>>
<</widget>>
--
GitLab