diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index ed9f9d2b7131f6198fdfbee32a959a1fa87517c3..84449b4b5bb56b8534d843a99e6cbe34f32e36f1 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -492,6 +492,15 @@ App.Data.resetOnNGPlus = {
REButtholeCheckinIDs: [],
REFutaSisterCheckinIDs: [],
REReductionCheckinIDs: [],
+
+ deathIDs: {
+ health: [],
+ overdose: [],
+ age: []
+ },
+ burstIDs: [],
+ birthIDs: [],
+ induceIDs: [],
/** @type {FC.SlaveStateOrZero} */
activeSlave: 0,
activeChild: 0,
diff --git a/src/endWeek/saDrugs.js b/src/endWeek/saDrugs.js
index d8371282e49bf12811e15b40ffc3bd0d89f28bb7..fce4d06bf861abe370fe09b8744968529bbe927a 100644
--- a/src/endWeek/saDrugs.js
+++ b/src/endWeek/saDrugs.js
@@ -1626,8 +1626,7 @@ App.SlaveAssignment.drugs = (function() {
slave.chem += 2;
if (WombBirthReady(slave, slave.pregData.normalBirth * 1.5) > 0) {
healthDamage(slave, 20);
- slave.labor = 1;
- slave.induce = 1;
+ induce(slave);
V.birthee = 1;
r += ` ${He} has been ready to give birth for some time now. Suppressing birth for so long <span class="red">greatly affects ${his} health.</span> ${He} may <span class="red">have trouble</span> giving birth to ${his} oversized child`;
if (slave.pregType > 1) {
diff --git a/src/endWeek/saGuardYou.js b/src/endWeek/saGuardYou.js
index 18b96d005fbaf8e78e28d5b654bf26256389c096..c0934db4e7fba10b89674a0eb84fbbe8265fab5e 100644
--- a/src/endWeek/saGuardYou.js
+++ b/src/endWeek/saGuardYou.js
@@ -191,7 +191,7 @@ App.SlaveAssignment.guardYou = (function() {
r.push(`${His} swollen, ${slave.bellyImplant}cc implant filled belly is heavy and occasionally distracts ${him}.`);
}
}
- if (slave.labor === 1) {
+ if (isInLabor(slave)) {
r.push(`${He}'s feeling labor pains, greatly detracting from ${his} ability to protect you.`);
} else if (slave.preg >= slave.pregData.normalBirth && slave.pregControl !== "labor suppressors") {
r.push(`${He}'ll be going into labor any time now, detracting from ${his} ability to protect you.`);
diff --git a/src/endWeek/saPregnancy.js b/src/endWeek/saPregnancy.js
index 27a9ec37ebcbca22129b9e8d514611966efcce1b..347cf6e772bdadfdbeda5388caad5fa7c96f990e 100644
--- a/src/endWeek/saPregnancy.js
+++ b/src/endWeek/saPregnancy.js
@@ -500,7 +500,7 @@ App.SlaveAssignment.pregnancy = (function() {
}
break;
}
- if (slave.induce === 1) {
+ if (isInduced(slave)) {
r.push(`${His} child${slave.pregType > 1 ? "ren visibly shift" : "visibly shifts"} within ${his} womb as ${slave.pregType > 1 ? "they prepare" : "it prepares"} to enter the world. ${He} experiences several`);
if (slave.geneticQuirks.uterineHypersensitivity === 2) {
r.push(`unexpected orgasms,`);
diff --git a/src/events/scheduled/burst/burst.js b/src/events/scheduled/burst/burst.js
index 66bfe9036c2d3cbfdcc14e047ddea71662e08969..1a9e422e3fc2c51e6cd4ddaf32b62de2286e83ab 100644
--- a/src/events/scheduled/burst/burst.js
+++ b/src/events/scheduled/burst/burst.js
@@ -1,7 +1,7 @@
globalThis.allBursts = function() {
const el = new DocumentFragment();
for (const slave of V.slaves) {
- if (slave.burst === 1) {
+ if (burstCheck(slave)) {
if (slave.womb.length > 0) {
el.append(birth(slave));
} else {
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index fe2bd9a5f9431bb37138bc24cb39e480ef7d7fee..2865eacec85f5c698948ace4612e246eb4651077 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -1564,15 +1564,18 @@ App.UI.SlaveInteract.fertility = function(slave) {
App.UI.SlaveInteract.refreshAll(slave);
},
));
- } else if (slave.induce === 1) {
+ } else if (isInduced(slave)) {
note += `Hormones are being slipped into ${his} food; ${he} will give birth suddenly and rapidly this week`;
- } else if (slave.preg > slave.pregData.normalBirth - 2 && slave.preg > slave.pregData.minLiveBirth && slave.broodmother === 0 && slave.labor === 0) {
+ } else if (
+ slave.preg > slave.pregData.normalBirth - 2 &&
+ slave.preg > slave.pregData.minLiveBirth &&
+ slave.broodmother === 0 &&
+ (!isInLabor(slave))
+ ) {
linkArray.push(App.UI.DOM.link(
`Induce labor`,
() => {
- slave.labor = 1;
- slave.induce = 1;
- V.birthee = 1;
+ induce(slave);
App.UI.SlaveInteract.refreshAll(slave);
},
));
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 5a257141d1563c6939e5d73b1cffd3f07b9734b5..0809b032d09aa64a9ffe35ddf203c30d5a88cc6a 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1813,7 +1813,7 @@ globalThis.DefaultRules = (function() {
slave.pregControl = "labor suppressors";
r += `<br>${slave.slaveName} is ready to birth, so ${he} has been put on labor suppressing agents.`;
} else if (rule.pregSpeed === "stimulate" && slave.preg > slave.pregData.normalBirth - 2 && slave.preg > slave.pregData.minLiveBirth && slave.health.condition > -50) {
- slave.labor = 1;
+ startLabor(slave);
slave.induce = 1;
V.birthee = 1;
r += `<br>${slave.slaveName} is ready to birth, so ${his} labor has been stimulated.`;
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 21d991cc868c1c2a0393f839d719d4dbf8ba0226..e6116dfc594b6dec5f99cc12ec18b80ee6e100ba 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -1486,7 +1486,7 @@ globalThis.Deadliness = function(slave) {
}
}
- if (slave.labor === 1) {
+ if (isInLabor(slave)) {
deadliness -= 15;
} else if (slave.preg >= slave.pregData.normalBirth && slave.pregControl !== "labor suppressors") {
deadliness -= 5;
diff --git a/src/js/birth/birth.js b/src/js/birth/birth.js
index 114d63657d00e5408cd31dc6c861a617f6e8dd65..6631591aca064259add4ae92befb50bcb9b44694 100644
--- a/src/js/birth/birth.js
+++ b/src/js/birth/birth.js
@@ -9,6 +9,7 @@ globalThis.allBirths = function() {
V.reservedChildren = FetusGlobalReserveCount("incubator");
V.reservedChildrenNursery = FetusGlobalReserveCount("nursery");
V.birthee = 0;
+ V.birthIDs = [];
return el;
@@ -82,7 +83,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false} = {})
function titleText() {
const title = document.createElement("div");
- if (slave.burst) {
+ if (burstCheck(slave)) {
App.UI.DOM.appendNewElement("span", title, `Alert! `, ["red", "bold"]);
title.append(`Burst report: `);
} else {
@@ -96,7 +97,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false} = {})
* early birth calcs
*/
function suddenBirthCheck() {
- if (slave.induce === 1) {
+ if (isInduced(slave)) {
suddenBirth += 20;
}
if (!canMove(slave)) {
@@ -330,7 +331,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false} = {})
slave.trust -= 5;
slave.devotion -= 5;
}
- } else if (slave.burst === 1) {
+ } else if (burstCheck(slave)) {
r.push(`${slave.slaveName}'s straining womb gave out and burst, taking ${his} life.`);
} else if (slave.fuckdoll === 0) {
if (slave.broodmother === 0 || slave.broodmotherCountDown === 1) {
@@ -532,7 +533,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false} = {})
if (slave.assignment === "work in the dairy" && V.dairyPregSetting > 0) {
r.push(`As a human cow, ${he}`);
- if (slave.burst === 1) {
+ if (burstCheck(slave)) {
r.push(App.UI.DOM.makeElement("span", `gave birth`, "orange"));
r.push(App.UI.DOM.makeElement("span", `in the worst possible way`, "red"));
slaveDead = 1;
@@ -615,7 +616,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false} = {})
}
const fathersReduced = removeDuplicates(fathers);
- if (slave.burst === 1) {
+ if (burstCheck(slave)) {
r.push(`${He}`);
r.push(App.UI.DOM.makeElement("span", `gave birth`, "orange"));
r.push(App.UI.DOM.makeElement("span", `in the worst possible way`, "red"));
@@ -1703,7 +1704,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false} = {})
const el = new DocumentFragment();
const r = [];
r.push(`The ${childrenAre} sent to one of ${V.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.`);
- if (slave.burst) {
+ if (burstCheck(slave)) {
r.push(`Hopefully they will be trained there to not suffer the same fate.`);
} else if (slave.fetish === "mindbroken" || slave.fuckdoll > 0) {
r.push(`${slave.slaveName} has few thoughts about the matter.`);
@@ -1823,7 +1824,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false} = {})
const r = [];
const el = new DocumentFragment();
r.push(`The ${childrenAre} handed off to be raised by their father, the Futanari Sisters.`);
- if (slave.burst) {
+ if (burstCheck(slave)) {
r.push(`You recommend they take it easy for a while before any more burst into kids.`);
} else if (slave.fetish === "mindbroken" || slave.fuckdoll > 0) {
r.push(`${slave.slaveName} has few thoughts about the matter.`);
@@ -2069,7 +2070,6 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false} = {})
el.append(horrifiedSlaves(slave));
slaveDead = 1;
} else {
- slave.labor = 0;
slave.induce = 0;
}
return el;
@@ -6882,7 +6882,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false} = {})
if (slave.fetish === "mindbroken") {
clothesSeed += 20;
}
- if (slave.induce === 1) {
+ if (isInduced(slave)) {
clothesSeed += 90;
}
diff --git a/src/js/death.js b/src/js/death.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa243db18c739c200f81e1fb0aced54634d28afd
--- /dev/null
+++ b/src/js/death.js
@@ -0,0 +1,4 @@
+globalThis.planDeath = function(slave, reason) {
+ slave.death = reason;
+ V.slaveDeath = 1;
+};
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 8469e52d0b93db064628fbde85acca2f28094766..21a0834732bb822b227b2965885d841ff0fb8a56 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -222,7 +222,7 @@ App.UI.SlaveSummaryRenderers = function() {
} else if (slave.pregKnown === 1) {
makeSpan(c, `${slave.pregWeek} wks preg`, styles);
}
- if (slave.induce === 1) {
+ if (isInduced(slave)) {
makeSpan(c, "Early Labor", ["orange", "strong"]);
}
if (slave.pubertyXY === 0 && slave.balls > 0) {
@@ -578,7 +578,7 @@ App.UI.SlaveSummaryRenderers = function() {
makeSpan(c, "(Overdue.)");
}
}
- if (slave.induce === 1) {
+ if (isInduced(slave)) {
makeSpan(c, "Showing signs of early labor.", "orange");
}
if (slave.pubertyXY === 0 && slave.balls > 0) {
diff --git a/src/js/statsChecker/burstChecker.js b/src/js/statsChecker/burstChecker.js
new file mode 100644
index 0000000000000000000000000000000000000000..d023e3e2660bdb5068aa65c1497cb48b29e2de26
--- /dev/null
+++ b/src/js/statsChecker/burstChecker.js
@@ -0,0 +1,18 @@
+globalThis.burstCheck = function(slave) {
+ return (slave.burst);
+ // return V.burstIDs.includes(slave.ID);
+};
+
+globalThis.burst = function(slave) {
+ slave.burst = 1;
+ V.burstee = 1;
+ /*
+ if (typeof slave === "number") {
+ V.burstIDs.push(slave);
+ } else {
+ V.burstIDs.push(slave.ID);
+ }
+ */
+};
+
+
diff --git a/src/js/statsChecker/pregChecker.js b/src/js/statsChecker/pregChecker.js
new file mode 100644
index 0000000000000000000000000000000000000000..c2669705efd72fb3dd1d91c44b34bcdd49519bc7
--- /dev/null
+++ b/src/js/statsChecker/pregChecker.js
@@ -0,0 +1,34 @@
+globalThis.isInLabor = function(slave) {
+ return (slave.labor);
+ // return V.birthIDs.includes(slave.ID);
+};
+
+globalThis.startLabor = function(slave) {
+ slave.labor = 1;
+ V.birthee = 1;
+ /*
+ if (typeof slave === "number") {
+ V.birthIDs.push(slave);
+ } else {
+ V.birthIDs.push(slave.ID);
+ }
+ */
+};
+
+globalThis.isInduced = function(slave) {
+ return (slave.induce);
+ // return V.induceIDs.includes(slave.ID);
+};
+
+globalThis.induce = function(slave) {
+ startLabor(slave);
+ slave.induce = 1;
+ V.birthee = 1;
+ /*
+ if (typeof slave === "number") {
+ V.induceIDs.push(slave);
+ } else {
+ V.induceIDs.push(slave.ID);
+ }
+ */
+};
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index c256d4a533b6d52cf6dbe6e4b994e53c9ba92a86..301a46522eb0107afd4d41bb0c10189b161e76c4 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -103,7 +103,7 @@
$he begins to give birth to yet another child. You call your menials back to your office and decide to take a walk. By the time you're at the door, the head of $activeSlave.slaveName's next child is already cresting.
<<elseif $activeSlave.broodmother == 0 && $activeSlave.preg > $activeSlave.pregData.minLiveBirth+1>>
$his water breaks. You call your menials back to your office and decide to take a walk. As you pass by $him, it's clear that $he'll have more important things to think about it the coming day.
- <<set $activeSlave.labor = 1>>
+ <<run startLabor($activeSlave)>>
<<else>>
$his brood shifts precariously. You call your menials back to your office and decide to take a walk. As you pass by $him, it's clear that $he'll be more concerned with staying whole than whatever foolish endeavors $he was planning.
<</if>>
diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw
index fa4401b9cd8d20f11c32a7589f9980d71f020ddd..a937036864f74111202e5d555037605b1e7011e5 100644
--- a/src/uncategorized/pePitFight.tw
+++ b/src/uncategorized/pePitFight.tw
@@ -122,7 +122,7 @@ Across the ring, $his opponent's owner nods civilly to you and examines $activeS
$His swollen, <<print $activeSlave.bellyImplant>>cc implant filled belly is heavy and makes $him less effective.
<</if>>
<</if>>
-<<if $activeSlave.labor == 1>>
+<<if isInLabor($activeSlave)>>
$He's feeling labor pains. $His child<<if $activeSlave.pregType > 1>>ren are<<else>> is<</if>> ready to be born.
<<elseif $activeSlave.preg >= $activeSlave.pregData.normalBirth && $activeSlave.pregControl != "labor suppressors">>
$He'll be going into labor any time now and $he knows it.
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 9e1c7f4874c7db0ce33436dbc96aa8937ab29faf..e89483fafad94b3c25ae9b013d89c4c5de4542de 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -664,7 +664,6 @@
<<set $activeSlave.pregWeek = $activeSlave.preg>>
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.pregAdaptation = 600>>
- <<set $activeSlave.labor = 1>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.counter.birthsTotal = 5>>
<<set $activeSlave.face = 15>>
@@ -1118,7 +1117,6 @@
<<set $activeSlave.pregAdaptation = 10>>
<<set WombFlush($activeSlave)>>
<<run SetBellySize($activeSlave)>>
- <<set $activeSlave.labor = 0>>
<<set $activeSlave.ovaries = 0>>
<<set $activeSlave.counter.birthsTotal = 0>>
<<set $activeSlave.anus = 0>>
@@ -1170,7 +1168,6 @@
<<set $activeSlave.devotion -= 5>>
<<set $activeSlave.trust -= 5>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
- <<set $activeSlave.labor = 0>>
<<set $activeSlave.counter.birthsTotal = 0>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.skill.vaginal = 0>>
@@ -1489,6 +1486,7 @@
<<link "Enslave the mother">>
<<run newSlave($activeSlave)>>
<<run cashX(forceNeg(_ContractCost), "slaveTransfer", $activeSlave)>>
+ <<run startLabor($activeSlave)>>
<<replace "#result">>
You have the needy $girl immediately bought to your penthouse where you help $his laboring body into an available bed for inspection. $He asks where $his children were taken, to which you reply somewhere they can be raised properly. They'll be taken care of and won't have to grow up on the streets, plus they were sucking the life out of $him. $He's a little depressed at the news, but understands your reasons. You take the opportunity to give $him a good look over; $he is really dilated! Apart from that, between all the births and dicks, $his vagina is rather worn out, though $he seems to understand how to use it. $His anus has also seen use, but not nearly as much.
<</replace>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index c53c335c7ac6fd043b45cf1ae92c0a054f185aa7..e8f87035e2b3507da9a04675dc459621f339f207 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -365,9 +365,10 @@
pays an unusual amount of attention to $slaves[$i].slaveName's pregnancy.
<</if>>
<<elseif $arcologies[0].FSRepopulationFocusPregPolicy == 0 && $arcologies[0].FSRepopulationFocus == "unset" && $HGSuiteDrugs == 1>>
- <<if $slaves[$i].preg > $slaves[$i].pregData.normalBirth-2 && $slaves[$i].preg > $slaves[$i].pregData.minLiveBirth && $slaves[$i].broodmother === 0 && $slaves[$i].labor === 0>>
+ <<if $slaves[$i].preg > $slaves[$i].pregData.normalBirth-2 && $slaves[$i].preg > $slaves[$i].pregData.minLiveBirth && $slaves[$i].broodmother === 0 && !isInLabor($slaves[$i])>>
_S.HeadGirl.slaveName has no interest in a slut stuffed full of unwanted spawn, so _he2 promptly doses slaves[$i].slaveName with labor inducing agents to get $him back in fucking shape.
- <<set $slaves[$i].labor = 1, $slaves[$i].induce = 1, $birthee = 1>>
+ <<run induce($slaves[$i])>>
+ <<run startLabor($slaves[$i])>>
<<else>>
_S.HeadGirl.slaveName promptly aborts the child growing in $slaves[$i].slaveName since _he2 prefers _his2 <<= $girl>>s not harboring someone else's child or loaded down with _his2 own unwanted spawn.
<<run TerminatePregnancy($slaves[$i])>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 837697a18fe23e2977bd8b2c34284cdcf1f14139..43cd470162ab551dfdd975450505f499d58425e4 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2927,7 +2927,7 @@
<<if $slaves[$i].bellyFluid >= 10000 && $seeExtreme == 1 && $slaves[$i].health.health <= -100 && $slaves[$i].geneMods.rapidCellGrowth != 1>>
$He feels an @@.red;unusual intense pain@@ in $his bloated belly.
- <<set $slaves[$i].burst = 1>>
+ <<run burst($slaves[$i])>>
<</if>>
<</if>> /* PREGMOD: CLOSES INFLATION OVERRIDE */
@@ -6275,20 +6275,20 @@
<<if $slaves[$i].pregControl != "labor suppressors" && $slaves[$i].assignment != "labor in the production line">>
<<if $slaves[$i].broodmother < 1>>
<<if WombBirthReady($slaves[$i], $slaves[$i].pregData.normalBirth*1.075) > 0>> /*check for really ready fetuses - 43 weeks - max, overdue*/
- <<set $slaves[$i].labor = 1, $birthee = 1>>
+ <<run startLabor($slaves[$i])>>
<<elseif WombBirthReady($slaves[$i], $slaves[$i].pregData.normalBirth) > 0 && (random(1,100) > 50)>> /*check for really ready fetuses - 40 weeks - normal*/
- <<set $slaves[$i].labor = 1, $birthee = 1>>
+ <<run startLabor($slaves[$i])>>
<<elseif WombBirthReady($slaves[$i], $slaves[$i].pregData.normalBirth/1.1111) > 0 && (random(1,100) > 90)>> /*check for really ready fetuses - 36 weeks minimum */
- <<set $slaves[$i].labor = 1, $birthee = 1>>
+ <<run startLabor($slaves[$i])>>
<</if>>
<<else>>
<<if WombBirthReady($slaves[$i], 37)>> /* broodmothers ready at 37 week always */
- <<set $slaves[$i].labor = 1, $birthee = 1>>
+ <<run startLabor($activeSlave)>>
<</if>>
<</if>>
<</if>>
- <<if $dangerousPregnancy == 1 && $slaves[$i].labor != 1>>
+ <<if $dangerousPregnancy == 1 && !isInLabor($slaves[$i])>>
<<if ($slaves[$i].assignment != "work in the dairy" || $dairyRestraintsSetting < 2) && $slaves[$i].pregAdaptation < 500 && $slaves[$i].broodmother < 1>>
<<set _miscarriageChance = -10>>
<<set _miscarriageChance += (($slaves[$i].bellyPreg/1000)-$slaves[$i].pregAdaptation)>> /* this could use to not be linear */
@@ -6336,19 +6336,23 @@
<<if _miscarriageChance > random(0,100)>>
<<set _chance = random(1,100)>>
<<if $slaves[$i].preg >= $slaves[$i].pregData.normalBirth/1.33>>
- <<set $slaves[$i].labor = 1, $birthee = 1>>
+ <<run startLabor($slaves[$i])>>
<<set _miscarriage = 1>>
<<elseif $slaves[$i].preg > $slaves[$i].pregData.normalBirth/1.48>>
- <<set $slaves[$i].labor = 1, $slaves[$i].prematureBirth = 1, $birthee = 1>>
+ <<set $slaves[$i].prematureBirth = 1>>
+ <<run startLabor($slaves[$i])>>
<<set _miscarriage = 1>>
<<elseif $slaves[$i].preg > $slaves[$i].pregData.normalBirth/1.6 && _chance > 10>>
- <<set $slaves[$i].labor = 1, $slaves[$i].prematureBirth = 1, $birthee = 1>>
+ <<set $slaves[$i].prematureBirth = 1>>
+ <<run startLabor($slaves[$i])>>
<<set _miscarriage = 1>>
<<elseif $slaves[$i].preg > $slaves[$i].pregData.normalBirth/1.73 && _chance > 40>>
- <<set $slaves[$i].labor = 1, $slaves[$i].prematureBirth = 1, $birthee = 1>>
+ <<set $slaves[$i].prematureBirth = 1>>
+ <<run startLabor($slaves[$i])>>
<<set _miscarriage = 1>>
<<elseif $slaves[$i].preg > $slaves[$i].pregData.normalBirth/1.81 && _chance > 75>>
- <<set $slaves[$i].labor = 1, $slaves[$i].prematureBirth = 1, $birthee = 1>>
+ <<set $slaves[$i].prematureBirth = 1>>
+ <<run startLabor($slaves[$i])>>
<<set _miscarriage = 1>>
<<else>>
$His overwhelmed body has @@.orange;forced $him to miscarry,@@ possibly saving $his life.
@@ -6438,7 +6442,7 @@
<</if>>
<<set _burstChance = Math.round(_burstChance)>>
<<if _burstChance > random(0,100)>>
- <<set $slaves[$i].burst = 1>>
+ <<run burst($slaves[$i])>>
<<else>>
Constant @@.red;<<if $slaves[$i].geneticQuirks.uterineHypersensitivity == 2>>painful orgasms<<else>>sharp pains<</if>>@@ from $his womb strongly suggest @@.red;$his body is beginning to break.@@
<</if>>
@@ -6451,7 +6455,7 @@
<<run endWeekHealthDamage($slaves[$i])>>
-<<if $slaves[$i].burst == 1>>
+<<if burstCheck($slaves[$i])>>
<<set $burstee = 1>>
<<else>>
<<if $slaves[$i].health.health <= -90 && $slaves[$i].assignment != "get treatment in the clinic">>
@@ -6472,19 +6476,16 @@
<<set _deathSeed += 200>>
<</if>>
<<if random(1,1000) > (400+_deathSeed)>>
- <<set $slaves[$i].death = "health">>
- <<set $slaveDeath = 1>>
+ <<run planDeath($slaves[$i], "health")>>
<</if>>
<<if ($slaves[$i].aphrodisiacs > 0 || $slaves[$i].inflationType == "aphrodisiac") && random(1,1000) > (200+_deathSeed)>>
- <<set $slaves[$i].death = "OD">>
- <<set $slaveDeath = 1>>
+ <<run planDeath($slaves[$i], "OD")>>
<</if>>
<</if>>
<<if $seeAge == 1>>
<<set _deathSeed = (($slaves[$i].health.health*2)-($slaves[$i].physicalAge*2)-($slaves[$i].chem*4)-($slaves[$i].addict*3))>>
<<if $slaves[$i].physicalAge >= Math.max((70+($slaves[$i].health.health/5)-($slaves[$i].addict)-($slaves[$i].chem/20)),50) && random(1,1000) > 800+_deathSeed>>
- <<set $slaves[$i].death = "old">>
- <<set $slaveDeath = 1>>
+ <<run planDeath($slaves[$i], "old")>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index 6881c5af71f2d5b088c14dac27398a36947d5ab9..e26d45c0ca4a3700e1bf4fa50804fdb1d635bfd8 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -208,7 +208,7 @@ You review the rules — the <<if $pitAnimal == 0>>combatants<<else>>slave<</if>
$His swollen, <<print _fighterOne.bellyImplant>>cc implant filled belly is heavy and makes $him less effective.
<</if>>
<</if>>
-<<if _fighterOne.labor == 1>>
+<<if isInLabor(_fighterOne)>>
$He's feeling labor pains. $His child<<if _fighterOne.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious to the fact that it will mean the death of <<if _fighterOne.pregType > 1>>their<<else>>its<</if>> mother.
<<elseif _fighterOne.preg >= _fighterOne.pregData.normalBirth && _fighterOne.pregControl != "labor suppressors">>
$He'll be going into labor any time now and $he knows it. $He's terrified of the thought of $his water breaking during the fight.
@@ -368,7 +368,7 @@ You review the rules — the <<if $pitAnimal == 0>>combatants<<else>>slave<</if>
_His2 swollen, <<print _fighterTwo.bellyImplant>>cc implant filled belly is heavy and makes _him2 less effective.
<</if>>
<</if>>
- <<if _fighterTwo.labor == 1>>
+ <<if isInLabor(_fighterTwo)>>
_He2's feeling labor pains. _His2 child<<if _fighterTwo.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will mean the death of <<if _fighterTwo.pregType > 1>>their<<else>>its<</if>> mother.
<<elseif _fighterTwo.preg >= _fighterTwo.pregData.normalBirth && _fighterTwo.pregControl != "labor suppressors">>
_He2'll be going into labor any time now and _he2 knows it. _He2's terrified of the thought of _his2 water breaking during the fight.
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index 88e66ad0b21ed991e0f07a50ebbaec5b9a6e723e..7a9e0cfe1ce4a6d8bc0dcd5758bb3ef460166d35 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -194,7 +194,7 @@
$His swollen, <<print _fighterOne.bellyImplant>>cc implant filled belly is heavy and makes $him less effective.
<</if>>
<</if>>
- <<if _fighterOne.labor == 1>>
+ <<if isInLabor(_fighterOne)>>
$He's feeling labor pains. $His child<<if _fighterOne.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will put <<if _fighterOne.pregType > 1>>their<<else>>its<</if>> mother at the mercy of $his opponent.
<<elseif _fighterOne.preg >= _fighterOne.pregData.normalBirth && _fighterOne.pregControl != "labor suppressors">>
$He'll be going into labor any time now and $he knows it. $He's terrified of the thought of $his water breaking during the fight.
@@ -342,7 +342,7 @@
_His2 swollen, <<print _fighterTwo.bellyImplant>>cc implant filled belly is heavy and makes _him2 less effective.
<</if>>
<</if>>
- <<if _fighterTwo.labor == 1>>
+ <<if isInLabor(_fighterTwo)>>
_He2's feeling labor pains. _His2 child<<if _fighterTwo.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will put <<if _fighterTwo.pregType > 1>>their<<else>>its<</if>> mother at the mercy of _his2 opponent.
<<elseif _fighterTwo.preg >= _fighterTwo.pregData.normalBirth && _fighterTwo.pregControl != "labor suppressors">>
_He2'll be going into labor any time now and _he2 knows it. _He2's terrified of the thought of _his2 water breaking during the fight.
@@ -976,7 +976,7 @@
<<set _orifice = "mouth">> /*this shouldn't ever actually be used*/
<</if>>
- <<if ($activeSlave.muscles > -30) && ($activeSlave.weight <= 95) && ($activeSlave.health.condition >= -50) && ($activeSlave.bellyPreg <= 5000) && ($activeSlave.bellyImplant <= 4000) && ($activeSlave.labor == 0) && ($activeSlave.bellyFluid <= 2000)>>
+ <<if ($activeSlave.muscles > -30) && ($activeSlave.weight <= 95) && ($activeSlave.health.condition >= -50) && ($activeSlave.bellyPreg <= 5000) && ($activeSlave.bellyImplant <= 4000) && (!isInLabor($activeSlave)) && ($activeSlave.bellyFluid <= 2000)>>
<<set _canRun = 1>>
<<else>>
<<set _canRun = 0>>