From 781a01faca25b6dfd5b9410b51194b05e324623c Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 21 Sep 2020 17:39:19 -0400
Subject: [PATCH] birth
---
js/birth/birth.js | 7 ++++---
src/uncategorized/seBirth.tw | 37 +-----------------------------------
2 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/js/birth/birth.js b/js/birth/birth.js
index 7ba8f1cf3c7..27a0e16b61f 100644
--- a/js/birth/birth.js
+++ b/js/birth/birth.js
@@ -1,4 +1,5 @@
globalThis.allBirths = function() {
+ debugger;
const el = new DocumentFragment();
for (const slave of V.slaves) {
if (slave.labor === 1) {
@@ -177,7 +178,7 @@ globalThis.allBirths = function() {
if (slave.geneticQuirks.uterineHypersensitivity === 2) {
birthDamage -= 5;
}
- if (setup.nurseCareers.includes(slave.career) && slave.fetish !== "mindbroken" && slave.muscles >= -95) {
+ if (App.Data.misc.nurseCareers.includes(slave.career) && slave.fetish !== "mindbroken" && slave.muscles >= -95) {
birthDamage = 0;
} else if (slave.intelligenceImplant >= 15) {
birthDamage -= 2;
@@ -952,7 +953,7 @@ globalThis.allBirths = function() {
(slave.vagina >= 2 || slave.vaginaLube > 0) && slave.mpreg === 1) ||
newMother === 0 ||
slave.hips > 0 ||
- (setup.nurseCareers.includes(slave.career) && slave.fetish !== "mindbroken" && slave.muscles >= -95) ||
+ (App.Data.misc.nurseCareers.includes(slave.career) && slave.fetish !== "mindbroken" && slave.muscles >= -95) ||
slave.intelligenceImplant >= 15 ||
slave.pregAdaptation >= 100
) {
@@ -1011,7 +1012,7 @@ globalThis.allBirths = function() {
}
App.Events.addNode(p, r, "div");
- if (setup.nurseCareers.includes(slave.career) && slave.fetish !== "mindbroken" && slave.muscles >= -95) {
+ if (App.Data.misc.nurseCareers.includes(slave.career) && slave.fetish !== "mindbroken" && slave.muscles >= -95) {
r.push(`Thanks to ${his}`);
r.push(App.UI.DOM.makeElement("span", `previous career,`, "green"));
r.push(`childbirth went smoothly.`);
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
index 59627e67709..aca76f1af75 100644
--- a/src/uncategorized/seBirth.tw
+++ b/src/uncategorized/seBirth.tw
@@ -17,39 +17,4 @@ I need to break single passage to several widgets, as it's been overcomplicated
<<set $nextButton = "Continue">>
<<set $nextLink = "Scheduled Event">>
-<<if $legendaryWombID != 0>>
- <<set $legendaryWombID = 0>>
-<</if>>
-
-<<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].labor == 1>>
- <<if ndef $slaves[$i].counter.laborCount>>
- <<set $slaves[$i].counter.laborCount = 0>>
- <<if $slaves[$i].counter.birthsTotal > 0 && $slaves[$i].counter.laborCount == 0>>
- <<set $slaves[$i].counter.laborCount = $slaves[$i].counter.birthsTotal>> /*we do not have a way to know multiples birth count for backward compatibility code. :( */
- <</if>>
- <</if>>
- <<set $dispositionId = _.uniqueId('babyDisposition-')>>
- Birth report: @@.coral;<<= SlaveFullName($slaves[$i])>>@@
- <br>
- <<seBirthPreCheck>>
- <<seBirthPreScene>>
- <<if $slaveDead != 1>>
- <<seBirthCalc>>
- <<seBirthMainScene>>
- <<seBirthBabies>>
- <<seBirthPostpartum>>
- <<set $slaves[$i].counter.laborCount++>>
- <<seBirthCritical>>
- <<else>>
- <<= removeSlave($slaves[$i])>>
- <<set $slaveDead = 0>>
- <</if>>
- <br><br><hr style="margin:0"><br>
- <</if>>
-<</for>>
-
-<<set $reservedChildren = FetusGlobalReserveCount("incubator")>>
-<<set $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
-
-<<set $birthee = 0>>
+<<includeDOM allBirths()>>
--
GitLab