diff --git a/src/js/birthJS.js b/src/js/birthJS.js
index dfda1b3e0168045e8fdec53773594c3173d1e2c6..02170a841ea9bd0a407d5f69d7aedff738b61627 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 307d5a34646d03613cf352911beb89aef8a22eab..1ec5dffb8da99abf5bc4d0969c727563c9b9bf2d 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/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 85a129ae3264ca00ecda028494d7a1fbd8ded5ac..91c41ca654647387237638b9475e0e40de636e9e 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -375,17 +375,6 @@ __Rumors__
<</link>>
</span>
</span>
- /*Old version
- <span id="family">
- <<link "Pull up the file on your family tree.">>
- <<replace #family>>
- <div id="editFamily"><div id="graph"></div></div>
- <<run updateFamilyTree(null, $slaves, $PC)>>
- <script>updateFamilyTree()</script>
- <</replace>>
- <</link>>
- </span>
- */
<<if totalPlayerRelatives($PC) > 0 || ($showMissingSlaves && ($PC.mother in $missingTable || $PC.father in $missingTable))>>
<<PlayerFamily>>
<</if>>
diff --git a/src/pregmod/seBurst.tw b/src/pregmod/seBurst.tw
index 914f12f223905100b714f031eb74a0433419ad4e..a8cbcb1f79fb8acce4415ba1506920e76a1f94d6 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 bab56a24225c3059e1b2d09dc380621692ff3589..02dec838ce46faf5f2bf9ba5b95b61b223205de7 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>>
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index a4f4543ad53c67c6ca8c1da9b2b1cdb2c3c418f5..c6fa6bf9b1471c0d38aa8a63fe23d441b204dd99 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -8,47 +8,43 @@
<<if $corpDivTrainSurgerySwitch == 1 && $corpDivTrainSurgeryTimer < 20>>
<<set $corpDivTrainSurgeryTimer++>>
<</if>>
-<<set _corpOpCost = 0>>
+<<set _corpOpCost = 0,
+_corpRev = 0,
+_corpAssetsSlave = 0>>
__Corporation Management__
<br>''Operational Results''
/*Divisions doing their thing*/
<<if $corpDivExtra == 1>>
<<if $mercenariesHelpCorp > 0>> /*This is the cost of acquiring slaves, the level of development is also the amount of slaves on average*/
- <<set $corpCash -= 7500 * $corpDivExtraDev + 5 * Math.pow($corpDivExtraDev, 2) - ($mercenaries - 2) * 50,
- _corpOpCost += 7500 * $corpDivExtraDev + 5 * Math.pow($corpDivExtraDev, 2) - ($mercenaries - 2) * 50,
+ <<set _corpOpCost += 7500 * $corpDivExtraDev + 5 * Math.pow($corpDivExtraDev, 2) - ($mercenaries - 2) * 50,
_corpDivExtraSlaves = Math.trunc($corpDivExtraDev * (1 + random(-40,40) / 100)),
$corpDivExtraSlaves += _corpDivExtraSlaves>> /*the actual amount of slaves acquired*/
<<else>>
- <<set $corpCash -= 7500 * $corpDivExtraDev + 5 * Math.pow($corpDivExtraDev, 2),
- _corpOpCost += 7500 * $corpDivExtraDev + 5 * Math.pow($corpDivExtraDev, 2),
+ <<set _corpOpCost += 7500 * $corpDivExtraDev + 5 * Math.pow($corpDivExtraDev, 2),
_corpDivExtraSlaves = Math.trunc($corpDivExtraDev * (1 + random(-40,40) / 100)),
$corpDivExtraSlaves += _corpDivExtraSlaves>>
<</if>>
<</if>>
<<if $corpDivLegal == 1>>
- <<set $corpCash -= 12000 * $corpDivLegalDev + 6 * Math.pow($corpDivExtraDev, 2),
- _corpOpCost += 12000 * $corpDivLegalDev + 6 * Math.pow($corpDivExtraDev, 2),
+ <<set _corpOpCost += 12000 * $corpDivLegalDev + 6 * Math.pow($corpDivExtraDev, 2),
_corpDivLegalSlaves = Math.trunc($corpDivLegalDev * (1 + random(-25,25) / 100)),
$corpDivLegalSlaves += _corpDivLegalSlaves>>
<</if>>
<<if $corpDivBreak == 1>>
- <<set $corpCash -= 450 * $corpDivBreakSlaves + Math.trunc(0.7 * Math.pow($corpDivBreakDev, 2)),
- _corpOpCost += 450 * $corpDivBreakSlaves + Math.trunc(0.7 * Math.pow($corpDivBreakDev, 2)),
+ <<set _corpOpCost += 450 * $corpDivBreakSlaves + Math.trunc(0.7 * Math.pow($corpDivBreakDev, 2)),
_corpDivBreakProc = Math.trunc($corpDivBreakSlaves * 0.3 * (1 + random(-15,15) / 100)),
$corpDivBreakSlaves2 += _corpDivBreakProc,
$corpDivBreakSlaves -= _corpDivBreakProc>>
<</if>>
<<if $corpDivSurgery == 1>>
- <<set $corpCash -= 2400 * $corpDivSurgerySlaves + Math.pow($corpDivSurgeryDev, 2),
- _corpOpCost += 2400 * $corpDivSurgerySlaves + Math.pow($corpDivSurgeryDev, 2),
+ <<set _corpOpCost += 2400 * $corpDivSurgerySlaves + Math.pow($corpDivSurgeryDev, 2),
_corpDivSurgeryProc = Math.trunc($corpDivSurgerySlaves * 0.5 * (1 + random(-10,10) / 100)),
$corpDivSurgerySlaves2 += _corpDivSurgeryProc,
$corpDivSurgerySlaves -= _corpDivSurgeryProc>>
<</if>>
<<if $corpDivTrain == 1>>
- <<set $corpCash -= 700 * $corpDivTrainSlaves + Math.trunc(0.8 * Math.pow($corpDivTrainDev, 2)),
- _corpOpCost += 700 * $corpDivTrainSlaves + Math.trunc(0.8 * Math.pow($corpDivTrainDev, 2)),
+ <<set _corpOpCost += 700 * $corpDivTrainSlaves + Math.trunc(0.8 * Math.pow($corpDivTrainDev, 2)),
_corpDivTrainProc = Math.trunc($corpDivTrainSlaves * 0.2 * (1 + random(-15,15) / 100)),
$corpDivTrainSlaves2 += _corpDivTrainProc,
$corpDivTrainSlaves -= _corpDivTrainProc>>
@@ -56,8 +52,7 @@ __Corporation Management__
<<if $corpDivArcade == 1>>
<<set _corpOpCost += 200 * $corpDivArcadeSlaves + Math.trunc(0.125 * Math.pow($corpDivArcadeDev, 2)),
_corpDivArcadeRev = Math.trunc(1000 * (1 + random(-5,5) / 100) * $corpDivArcadeSlaves),
- $corpRev += _corpDivArcadeRev,
- $corpCash += _corpDivArcadeRev,
+ _corpRev += _corpDivArcadeRev,
_corpDivArcadeProc = $corpDivArcadeSlaves * 0.05 * (1 + random(-10,10) / 100)>>
<<if _corpDivArcadeProc > 1>>
<<set _corpDivArcadeProc = Math.trunc(_corpDivArcadeProc)>>
@@ -71,8 +66,7 @@ __Corporation Management__
<<if $corpDivMenial == 1>>
<<set _corpDivMenialRev = Math.trunc(1250 * (1 + random(-10,10) / 100)) * $corpDivMenialSlaves,
_corpOpCost += 200 * $corpDivMenialSlaves + Math.trunc(0.1 * Math.pow($corpDivMenialDev, 2)),
- $corpRev += _corpDivMenialRev,
- $corpCash += _corpDivMenialRev,
+ _corpRev += _corpDivMenialRev,
_corpDivMenialProc = $corpDivMenialSlaves * 0.05 * (1 + random(-10,10) / 100)>>
<<if _corpDivMenialProc > 1>>
<<set _corpDivMenialProc = Math.trunc(_corpDivMenialProc)>>
@@ -86,8 +80,7 @@ __Corporation Management__
<<if $corpDivDairy == 1>>
<<set _corpDivDairyRev = Math.trunc(3000 * (1 + random(-10,10) / 100) * $corpDivDairySlaves),
_corpOpCost += 850 * $corpDivDairySlaves + Math.trunc(0.4 * Math.pow($corpDivDairyDev, 2)),
- $corpRev += _corpDivDairyRev,
- $corpCash += _corpDivDairyRev,
+ _corpRev += _corpDivDairyRev,
_corpDivDairyProc = $corpDivDairySlaves * 0.05 * (1 + random(-10,10) / 100)>>
<<if _corpDivDairyProc > 1>>
<<set _corpDivDairyProc = Math.trunc(_corpDivDairyProc)>>
@@ -101,8 +94,7 @@ __Corporation Management__
<<if $corpDivWhore == 1>>
<<set _corpDivWhoreRev = Math.trunc(3000 * (1 + random(-5,5) / 100) * $corpDivWhoreSlaves),
_corpOpCost += 700 * $corpDivWhoreSlaves + Math.trunc(0.25 * Math.pow($corpDivWhoreDev, 2)),
- $corpRev += _corpDivWhoreRev,
- $corpCash += _corpDivWhoreRev,
+ _corpRev += _corpDivWhoreRev,
_corpDivWhoreProc = $corpDivWhoreSlaves * 0.05 * (1 + random(-10,10) / 100)>>
<<if _corpDivWhoreProc > 1>>
<<set _corpDivWhoreProc = Math.trunc(_corpDivWhoreProc)>>
@@ -159,8 +151,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivExtraToMarket == 1 && $corpDivExtraSlaves > 0>>
It immediately sold <<if $corpDivExtraSlaves > 1>>$corpDivExtraSlaves slaves<<elseif $corpDivExtraSlaves > 0>>one slave<</if>>
<<set _corpDivExtraRev = $corpDivExtraSlaves * 10 * menialSlaveCost(-_corpDivExtraSlaves),
- $corpCash += _corpDivExtraRev,
- $corpRev += _corpDivExtraRev,
+ _corpRev += _corpDivExtraRev,
$corpDivExtraSlaves = 0>>
to the market and made @@.yellowgreen;<<print cashFormat(_corpDivExtraRev)>>.@@
<<elseif $corpDivExtraSlaves > 0>>
@@ -168,8 +159,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivExtraSlaves > $corpDivExtraDev * 2>> /*The division can store some slaves it has acquired/processed, but not a huge amount*/
<<set _corpDivExtraCapSlaves = $corpDivExtraSlaves - $corpDivExtraDev * 2,
_corpDivExtraRev = _corpDivExtraCapSlaves * 10 * menialSlaveCost(-_corpDivExtraCapSlaves),
- $corpCash += _corpDivExtraRev,
- $corpRev += _corpDivExtraRev,
+ _corpRev += _corpDivExtraRev,
$menialDemandFactor -= _corpDivExtraCapSlaves,
$corpDivExtraSlaves = $corpDivExtraDev * 2>> /*slaves over holding capacity get sold*/
But it ran out of storage space and had to sell <<if _corpDivExtraCapSlaves > 1>>@@.red;<<print _corpDivExtraCapSlaves>> slaves@@<<else>>@@.red;one slave@@<</if>> and made @@.yellowgreen;<<print cashFormat(_corpDivExtraRev)>>.@@
@@ -221,8 +211,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivLegalToMarket == 1 && $corpDivLegalSlaves > 0>>
It immediately sold <<if $corpDivLegalSlaves > 1>><<print $corpDivLegalSlaves>> slaves<<else>>one slave<</if>>
<<set _corpDivLegalRev = $corpDivLegalSlaves * 10 * menialSlaveCost(-$corpDivLegalSlaves),
- $corpCash += _corpDivLegalRev,
- $corpRev += _corpDivLegalRev,
+ _corpRev += _corpDivLegalRev,
$corpDivLegalSlaves = 0>>
to the market and made @@.yellowgreen;<<print cashFormat(_corpDivLegalRev)>>.@@
<<elseif $corpDivLegalSlaves > 0>>
@@ -230,8 +219,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivLegalSlaves > $corpDivLegalDev * 2>>
<<set _corpDivLegalCapSlaves = $corpDivLegalSlaves - $corpDivLegalDev * 2,
_corpDivLegalRev = _corpDivLegalCapSlaves * 15 * menialSlaveCost(-_corpDivLegalCapSlaves),
- $corpCash += _corpDivLegalRev,
- $corpRev += _corpDivLegalRev,
+ _corpRev += _corpDivLegalRev,
$menialDemandFactor -= _corpDivLegalCapSlaves,
$corpDivLegalSlaves = $corpDivLegalDev * 2>>
But it ran out of storage space and had to sell <<if _corpDivBreakCapSlaves > 1>>@@.red;<<print _corpDivBreakCapSlaves>> slaves@@<<else>>@@.red;one slave@@<</if>> and made @@.yellowgreen;<<print cashFormat(_corpDivLegalRev)>>.@@
@@ -244,8 +232,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivBreakFromMarket == 1 && _corpDivBreakSlavesRoom > 0>>
It replenished its slave stock and bought <<print _corpDivBreakSlavesRoom>> slaves that need breaking from the market.
<<set _corpDivBreakAssetsSlave = _corpDivBreakSlavesRoom * 10 * menialSlaveCost(_corpDivBreakSlavesRoom),
- $corpCash -= _corpDivBreakAssetsSlave,
- $corpAssetsSlave += _corpDivBreakAssetsSlave,
+ _corpAssetsSlave += _corpDivBreakAssetsSlave,
$corpDivBreakSlaves = $corpDivBreakDev>>
<</if>>
<<if $corpDivBreakToMenial == 1 && _corpDivMenialSlavesRoom > 0>>
@@ -290,8 +277,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivBreakToMarket == 1 && $corpDivBreakSlaves2 > 0>>
It immediately sold <<if $corpDivBreakSlaves2 > 1>>$corpDivBreakSlaves2 slaves<<else>>one slave<</if>>
<<set _corpDivBreakRev = $corpDivBreakSlaves2 * 15 * menialSlaveCost(-$corpDivBreakSlaves2),
- $corpCash += _corpDivBreakRev,
- $corpRev += _corpDivBreakRev,
+ _corpRev += _corpDivBreakRev,
$corpDivBreakSlaves2 = 0>>
to the market and made @@.yellowgreen;<<print cashFormat(_corpDivBreakRev)>>.@@
<<elseif $corpDivBreakSlaves2 > 0>>
@@ -299,8 +285,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivBreakSlaves2 > Math.trunc($corpDivBreakDev * 0.6)>>
<<set _corpDivBreakCapSlaves = $corpDivBreakSlaves2 - Math.trunc($corpDivBreakDev * 0.6),
_corpDivBreakRev = _corpDivBreakCapSlaves * 15 * menialSlaveCost(-_corpDivBreakCapSlaves),
- $corpCash += _corpDivBreakRev,
- $corpRev += _corpDivBreakRev,
+ _corpRev += _corpDivBreakRev,
$menialDemandFactor -= _corpDivBreakCapSlaves,
$corpDivBreakSlaves2 = Math.trunc($corpDivBreakDev * 0.6)>>
But it ran out of storage space and had to sell <<if _corpDivBreakCapSlaves > 1>>@@.red;<<print _corpDivBreakCapSlaves>> slaves@@<<else>>@@.red;one slave@@<</if>> and made @@.yellowgreen;<<print cashFormat(_corpDivBreakRev)>>.@@
@@ -313,8 +298,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivSurgeryFromMarket == 1 && _corpDivSurgerySlavesRoom > 0>>
It replenished its slave stock and bought <<print _corpDivSurgerySlavesRoom>> slaves that could use some work done to their bodies from the market.
<<set _corpDivSurgeryAssetsSlave = _corpDivSurgerySlavesRoom * 15 * menialSlaveCost(_corpDivSurgerySlavesRoom),
- $corpCash -= _corpDivSurgeryAssetsSlave,
- $corpAssetsSlave += _corpDivSurgeryAssetsSlave,
+ _corpAssetsSlave += _corpDivSurgeryAssetsSlave,
$corpDivSurgerySlaves = $corpDivSurgeryDev,
_corpDivSurgerySlavesRoom = corpDivSurgerySlavesRoom()>>
<</if>>
@@ -347,8 +331,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivSurgeryToMarket == 1 && $corpDivSurgerySlaves2 > 0>>
It immediately sold <<if $corpDivSurgerySlaves2 > 1>><<print $corpDivSurgerySlaves2>> slaves<<else>>one slave<</if>>
<<set _corpDivSurgeryRev = $corpDivSurgerySlaves2 * 23 * menialSlaveCost(-$corpDivSurgerySlaves2),
- $corpCash += _corpDivSurgeryRev,
- $corpRev += _corpDivSurgeryRev,
+ _corpRev += _corpDivSurgeryRev,
$corpDivSurgerySlaves2 = 0>>
to the market and made @@.yellowgreen;<<print cashFormat(_corpDivSurgeryRev)>>.@@
<<elseif $corpDivSurgerySlaves2 > 0>>
@@ -356,8 +339,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivSurgerySlaves2 > Math.trunc($corpDivSurgeryDev)>>
<<set _corpDivSurgeryCapSlaves = $corpDivSurgerySlaves2 - Math.trunc($corpDivSurgeryDev),
_corpDivSurgeryRev = _corpDivSurgeryCapSlaves * 23 * menialSlaveCost(-_corpDivSurgeryCapSlaves),
- $corpCash += _corpDivSurgeryRev,
- $corpRev += _corpDivSurgeryRev,
+ _corpRev += _corpDivSurgeryRev,
$menialDemandFactor -= _corpDivSurgeryCapSlaves,
$corpDivSurgerySlaves2 = Math.trunc($corpDivSurgeryDev)>>
But it ran out of storage space and had to sell <<if _corpDivSurgeryCapSlaves > 1>>@@.red;<<print _corpDivSurgeryCapSlaves>> slaves@@<<else>>@@.red;one slave@@<</if>> and made @@.yellowgreen;<<print cashFormat(_corpDivSurgeryRev)>>.@@
@@ -371,14 +353,12 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivSurgery == 0 && $corpDivTrainSurgerySwitch == 0 && _corpDivTrainSlavesRoom > 0>>
It replenished its slave stock and bought <<print _corpDivTrainSlavesRoom>> slaves that need slave training from the market.
<<set _corpDivTrainAssetsSlave = _corpDivTrainSlavesRoom * 15 * menialSlaveCost(_corpDivTrainSlavesRoom),
- $corpCash -= _corpDivTrainAssetsSlave,
- $corpAssetsSlave += _corpDivTrainAssetsSlave,
+ _corpAssetsSlave += _corpDivTrainAssetsSlave,
$corpDivTrainSlaves = $corpDivTrainDev>>
<<elseif _corpDivTrainSlavesRoom > 0>>
It replenished its slave stock and bought <<print _corpDivTrainSlavesRoom>> slaves that need slave training from the market.
<<set _corpDivTrainAssetsSlave = _corpDivTrainSlavesRoom * 23 * menialSlaveCost(_corpDivTrainSlavesRoom),
- $corpCash -= _corpDivTrainAssetsSlave,
- $corpAssetsSlave += _corpDivTrainAssetsSlave,
+ _corpAssetsSlave += _corpDivTrainAssetsSlave,
$corpDivTrainSlaves = $corpDivTrainDev>>
<</if>>
<</if>>
@@ -399,22 +379,19 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivSurgery == 0 && $corpDivTrainSurgerySwitch == 0>>
It immediately sold <<if $corpDivTrainSlaves2 > 1>>$corpDivTrainSlaves2 slaves<<else>>one slave<</if>>
<<set _corpDivTrainRev = $corpDivTrainSlaves2 * 26 * menialSlaveCost(-$corpDivTrainSlaves2),
- $corpCash += _corpDivTrainRev,
- $corpRev += _corpDivTrainRev,
+ _corpRev += _corpDivTrainRev,
$corpDivTrainSlaves2 = 0>>
to the market and made @@.yellowgreen;<<print cashFormat(_corpDivTrainRev)>>.@@
<<elseif $corpDivTrainSurgerySwitch == 1 && $corpDivTrainSurgeryTimer < 5>>
It immediately sold <<if $corpDivTrainSlaves2 > 1>>$corpDivTrainSlaves2 slaves<<else>>one slave<</if>>
<<set _corpDivTrainRev = Math.trunc($corpDivTrainSlaves2 * (26 + $corpDivTrainSurgeryTimer * 1.6) * menialSlaveCost(-$corpDivTrainSlaves2)),
- $corpCash += _corpDivTrainRev,
- $corpRev += _corpDivTrainRev,
+ _corpRev += _corpDivTrainRev,
$corpDivTrainSlaves2 = 0>>
to the market and made @@.yellowgreen;<<print cashFormat(_corpDivTrainRev)>>.@@
<<else>>
It immediately sold <<if $corpDivTrainSlaves2 > 1>><<print $corpDivTrainSlaves2>> slaves<<else>>one slave<</if>>
<<set _corpDivTrainRev = $corpDivTrainSlaves2 * 34 * menialSlaveCost(-$corpDivTrainSlaves2),
- $corpCash += _corpDivTrainRev,
- $corpRev += _corpDivTrainRev,
+ _corpRev += _corpDivTrainRev,
$corpDivTrainSlaves2 = 0>>
to the market and made @@.yellowgreen;<<print cashFormat(_corpDivTrainRev)>>.@@
<</if>>
@@ -423,16 +400,14 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivTrainSurgeryTimer < 5 || $corpDivSurgery == 0>>
<<set _corpDivTrainCapSlaves = $corpDivTrainSlaves2 - Math.trunc($corpDivTrainDev * 0.4),
_corpDivTrainRev = _corpDivTrainCapSlaves * 26 * menialSlaveCost(-_corpDivTrainCapSlaves),
- $corpCash += _corpDivTrainRev,
- $corpRev += _corpDivTrainRev,
+ _corpRev += _corpDivTrainRev,
$menialDemandFactor -= _corpDivTrainCapSlaves,
$corpDivTrainSlaves2 = Math.trunc($corpDivTrainDev * 0.4)>>
But it ran out of storage space and had to sell <<if _corpDivTrainCapSlaves > 1>>@@.red;<<print _corpDivTrainCapSlaves>> slaves@@<<elseif _corpDivTrainCapSlaves > 0>>@@.red;one slave@@<</if>> and made @@.yellowgreen;<<print cashFormat(_corpDivTrainRev)>>.@@
<<else>>
<<set _corpDivTrainCapSlaves = $corpDivTrainSlaves2 - Math.trunc($corpDivTrainDev * 0.4),
_corpDivTrainRev = _corpDivTrainCapSlaves * 34 * menialSlaveCost(-_corpDivTrainCapSlaves),
- $corpCash += _corpDivTrainRev,
- $corpRev += _corpDivTrainRev,
+ _corpRev += _corpDivTrainRev,
$menialDemandFactor -= _corpDivTrainCapSlaves,
$corpDivTrainSlaves2 = Math.trunc($corpDivTrainDev * 0.4)>>
But it ran out of storage space and had to sell <<if _corpDivTrainCapSlaves > 1>>@@.red;<<print _corpDivTrainCapSlaves>> slaves@@<<elseif _corpDivTrainCapSlaves > 0>>@@.red;one slave@@<</if>> and made @@.yellowgreen;<<print cashFormat(_corpDivTrainRev)>>.@@
@@ -447,8 +422,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivArcadeFromMarket == 1 && _corpDivArcadeSlavesRoom > 0>>
It replenished its slave stock and bought <<print _corpDivArcadeSlavesRoom>> fresh slaves from the market.
<<set _corpDivArcadeAssetsSlave = _corpDivArcadeSlavesRoom * 10 * menialSlaveCost(_corpDivArcadeSlavesRoom),
- $corpCash -= _corpDivArcadeAssetsSlave,
- $corpAssetsSlave += _corpDivArcadeAssetsSlave,
+ _corpAssetsSlave += _corpDivArcadeAssetsSlave,
$corpDivArcadeSlaves = $corpDivArcadeDev>>
<</if>>
<</if>>
@@ -459,8 +433,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivMenialFromMarket == 1 && _corpDivMenialSlavesRoom > 0>>
It replenished its slave stock and bought <<print _corpDivMenialSlavesRoom>> menial slaves from the market.
<<set _corpDivMenialAssetsSlave = _corpDivMenialSlavesRoom * 15 * menialSlaveCost(_corpDivMenialSlavesRoom),
- $corpCash -= _corpDivMenialAssetsSlave,
- $corpAssetsSlave += _corpDivMenialAssetsSlave,
+ _corpAssetsSlave += _corpDivMenialAssetsSlave,
$corpDivMenialSlaves = $corpDivMenialDev>>
<</if>>
<</if>>
@@ -471,8 +444,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivDairyFromMarket == 1 && _corpDivDairySlavesRoom > 0>>
It replenished its slave stock and bought <<print _corpDivDairySlavesRoom>> cows from the market.
<<set _corpDivDairyAssetsSlave = _corpDivDairySlavesRoom * 23 * menialSlaveCost(_corpDivDairySlavesRoom),
- $corpCash -= _corpDivDairyAssetsSlave,
- $corpAssetsSlave += _corpDivDairyAssetsSlave,
+ _corpAssetsSlave += _corpDivDairyAssetsSlave,
$corpDivDairySlaves = $corpDivDairyDev>>
<</if>>
<</if>>
@@ -483,14 +455,12 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpDivWhoreFromMarket == 1 && $corpDivTrainSurgerySwitch > 0 && _corpDivWhoreSlavesRoom > 0>>
It replenished its slave stock and bought <<print _corpDivWhoreSlavesRoom>> trained whores from the market.
<<set _corpDivWhoreAssetsSlave = _corpDivWhoreSlavesRoom * 34 * menialSlaveCost(_corpDivWhoreSlavesRoom),
- $corpCash -= _corpDivWhoreAssetsSlave,
- $corpAssetsSlave += _corpDivWhoreAssetsSlave,
+ _corpAssetsSlave += _corpDivWhoreAssetsSlave,
$corpDivWhoreSlaves = $corpDivWhoreDev>>
<<elseif $corpDivWhoreFromMarket == 1 && _corpDivWhoreSlavesRoom > 0>>
It replenished its slave stock and bought <<print _corpDivWhoreSlavesRoom>> trained whores from the market.
<<set _corpDivWhoreAssetsSlave = _corpDivWhoreSlavesRoom * 26 * menialSlaveCost(_corpDivWhoreSlavesRoom),
- $corpCash -= _corpDivWhoreAssetsSlave,
- $corpAssetsSlave += _corpDivWhoreAssetsSlave,
+ _corpAssetsSlave += _corpDivWhoreAssetsSlave,
$corpDivWhoreSlaves = $corpDivWhoreDev>>
<</if>>
<</if>>
@@ -506,9 +476,13 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
<<if $corpEasy == 1>>
<<set _corpOverhead = Math.trunc(_corpOverhead / 2)>>
<</if>>
-<</if>>
-<<set $corpCash -= _corpOverhead,
-_corpProfitProvisional = $corpRev - $corpAssetsDev - $corpAssetsSlave - _corpOpCost>>
+<</if>>
+
+/*cash, rev and costs state variables get corrected here*/
+<<set $corpCash += _corpRev - (_corpOverhead + _corpOpCost + _corpAssetsSlave),
+$corpRev += _corpRev,
+$corpAssetsSlave += _corpAssetsSlave,
+_corpProfitProvisional = $corpRev - ($corpAssetsDev + $corpAssetsSlave + _corpOpCost + _corpOverhead)>>
<<if _corpProfitProvisional > 0>>
<<set $corpEcon = Math.trunc(_corpProfitProvisional / (100 / $localEcon) - _corpProfitProvisional),
$corpCash += $corpEcon,
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index e87743ebd51d7beb3ff14e809411db7c7124f4cd..b7fcf36b570866692b75f44b9749d4b73e73d251 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -9,8 +9,10 @@
<</for>>
<<set $averageProsperity = $averageProsperity/$arcologies.length>>
-<<set _corpBonus = Math.trunc(1000 * Math.pow(corpValue(), 0.1)),
-$corpNeighborBonus = 0>>
+<<if $corpIncorporated == 1>>
+ <<set _corpBonus = Math.trunc(1000 * Math.pow(corpValue(), 0.1)),
+ $corpNeighborBonus = 0>>
+<</if>>
<<if $useTabs == 0>>__Arcologies in the Free City__<</if>>
@@ -1908,8 +1910,10 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<</if>>
-<<set $corpCash += $corpNeighborBonus,
-$corpRev += $corpNeighborBonus>>
+<<if $corpIncorporated == 1>>
+ <<set $corpCash += $corpNeighborBonus,
+ $corpRev += $corpNeighborBonus>>
+<</if>>
/* FUTURE SOCIETY ADOPTION */
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index a46f7e5ea2622399158dacc7fc71f3d8e438ac93..075b559b56dfe4c9e0a7d381db74e4ca92e695eb 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -405,17 +405,6 @@
<</link>>
</span>
</span>
- /* Old version
- <span id="family">
- <<link "Pull up the file on $his family tree.">>
- <<replace #family>>
- <div id="editFamily"><div id="graph"></div></div>
- <<run updateFamilyTree($activeSlave, $slaves, $PC)>>
- <script>updateFamilyTree()</script>
- <</replace>>
- <</link>>
- </span>
- */
<</if>>
<<if $universalRulesImpregnation == "HG" && $seePreg != 0>>
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 03811128432841ebdc898c395b7e9c5d94b5bb54..85501d63f4de3b32187403d89c410899bfb645bc 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -1259,9 +1259,6 @@
<span id="familySummary"><<Family>></span>
<br>
</div>
-/*<div id="graph"></div>
-<<run updateFamilyTree($activeSlave, $slaves, $PC)>>
-<script>updateFamilyTree()</script>*/
<div id="familyTree"></div>
<<set _tSlaveList = [$activeSlave]>>
<<set _tSlaveList.push.apply(_tSlaveList, $slaves)>>