From 3075eaa9b4d6b97192aa96712222d10234b2e41c Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 28 Oct 2020 23:06:36 -0400
Subject: [PATCH] convert personal notes

---
 src/endWeek/economics/persBusiness.js  |   4 +-
 src/endWeek/economics/personalNotes.js | 182 +++++------
 src/pregmod/personalNotes.tw           | 406 -------------------------
 src/uncategorized/economics.tw         |   7 +-
 4 files changed, 96 insertions(+), 503 deletions(-)
 delete mode 100644 src/pregmod/personalNotes.tw

diff --git a/src/endWeek/economics/persBusiness.js b/src/endWeek/economics/persBusiness.js
index dee87e2f029..3354893d34c 100644
--- a/src/endWeek/economics/persBusiness.js
+++ b/src/endWeek/economics/persBusiness.js
@@ -1,8 +1,8 @@
 /**
- * @returns {DocumentFragment}
+ * @returns {HTMLElement}
  */
 App.EndWeek.personalBusiness = function() {
-	const el = new DocumentFragment();
+	const el = document.createElement("p");
 	let r = [];
 	let he, him;
 	let income;
diff --git a/src/endWeek/economics/personalNotes.js b/src/endWeek/economics/personalNotes.js
index b2659e38850..d7f0504efed 100644
--- a/src/endWeek/economics/personalNotes.js
+++ b/src/endWeek/economics/personalNotes.js
@@ -1,26 +1,26 @@
 /**
- * @returns {DocumentFragment}
+ * @returns {HTMLElement}
  */
 App.EndWeek.personalNotes = function() {
-	const el = new DocumentFragment();
+	const el = document.createElement("p");
 	let r = [];
-	let _milk;
-	let _milkSale;
+	let milk;
+	let milkSale;
 	if (V.useTabs === 0) {
 		App.UI.DOM.appendNewElement("h2", el, `Personal Notes`);
 	}
-	// <br>
 	if (V.playerAging !== 0) {
-		r.push(`Your birthday is `);
+		let birthday = `Your birthday is `;
 		if (V.PC.birthWeek === 51) {
-			r.push(`next week`);
+			birthday += `next week`;
 			if (V.playerAging === 2) {
-				r.push(`; you'll be turning ${V.PC.actualAge + 1}`);
+				birthday += `; you'll be turning ${V.PC.actualAge + 1}`;
 			}
 		} else {
-			r.push(`in ${52 - V.PC.birthWeek} weeks`);
+			birthday += `in ${52 - V.PC.birthWeek} weeks`;
 		}
-		r.push(`.`);
+		birthday += `.`;
+		r.push(birthday);
 	}
 	r.push(App.Desc.Player.boobs());
 	r.push(App.Desc.Player.belly());
@@ -31,19 +31,19 @@ App.EndWeek.personalNotes = function() {
 			V.PC.lactationDuration = 2;
 			if (V.PC.rules.lactation === "sell") {
 				/* watch this be a disaster */
-				_milk = milkAmount(V.PC);
-				r.push(`Whenever you have a free moment and a chest swollen with milk, you spend your time attached to the nearest milker. As a result, you produce${_milk} liters of sellable milk over the week.`);
+				milk = milkAmount(V.PC);
+				r.push(`Whenever you have a free moment and a chest swollen with milk, you spend your time attached to the nearest milker. As a result, you produce${milk} liters of sellable milk over the week.`);
 				if (V.arcologies[0].FSPastoralistLaw === 1) {
-					_milkSale = _milk * (28 + Math.trunc(V.arcologies[0].FSPastoralist / 30));
-					r.push(`Since breast milk is ${V.arcologies[0].name}'s only legal dairy product, and yours is in a class all of its own, society can't get enough of it and you make <span class="yellowgreen">${cashFormat(_milkSale)}.</span>`);
+					milkSale = milk * (28 + Math.trunc(V.arcologies[0].FSPastoralist / 30));
+					r.push(`Since breast milk is ${V.arcologies[0].name}'s only legal dairy product, and yours is in a class all of its own, society can't get enough of it and you make <span class="yellowgreen">${cashFormat(milkSale)}.</span>`);
 				} else if ((V.arcologies[0].FSPastoralist !== "unset")) {
-					_milkSale = _milk * (12 + Math.trunc(V.arcologies[0].FSPastoralist / 30));
-					r.push(`Since milk is fast becoming a major part of the ${V.arcologies[0].name}'s dietary culture, and yours is in a class all of its own, you make <span class="yellowgreen">${cashFormat(_milkSale)}.</span>`);
+					milkSale = milk * (12 + Math.trunc(V.arcologies[0].FSPastoralist / 30));
+					r.push(`Since milk is fast becoming a major part of the ${V.arcologies[0].name}'s dietary culture, and yours is in a class all of its own, you make <span class="yellowgreen">${cashFormat(milkSale)}.</span>`);
 				} else {
-					_milkSale = _milk * 8;
-					r.push(`Your milk is sold for <span class="yellowgreen">${cashFormat(_milkSale)}.</span>`);
+					milkSale = milk * 8;
+					r.push(`Your milk is sold for <span class="yellowgreen">${cashFormat(milkSale)}.</span>`);
 				}
-				cashX(_milkSale, "personalBusiness");
+				cashX(milkSale, "personalBusiness");
 			} else {
 				r.push(`You regularly see to your breasts to make sure your milk production doesn't dry up; be it by hand, milker, or mouth, you keep yourself comfortably drained.`);
 			}
@@ -58,22 +58,22 @@ App.EndWeek.personalNotes = function() {
 		}
 	}
 	if (V.PC.preg > 0) {
-		const _oldCount = V.PC.pregType;
+		const oldCount = V.PC.pregType;
 		if (V.PC.preg <= 2) {
 			fetalSplit(V.PC, 1000);
 			WombCleanYYFetuses(V.PC);
 		}
 		if (V.pregnancyMonitoringUpgrade === 1) {
-			if (_oldCount < V.PC.pregType) {
+			if (oldCount < V.PC.pregType) {
 				r.push(`While making use of the advanced pregnancy monitoring equipment, you are surprised to find <span class="lime">your womb is a little more occupied than last checkup.</span>`);
-			} else if (_oldCount > V.PC.pregType) {
+			} else if (oldCount > V.PC.pregType) {
 				r.push(`While making use of the advanced pregnancy monitoring equipment, you are surprised to find <span class="orange">your womb houses less life than last checkup.</span>`);
 				if (V.PC.pregType === 0) {
 					r.push(`For all intents and purposes, <span class="yellow">you are no longer pregnant.</span>`);
 					TerminatePregnancy(V.PC);
 				}
 			}
-		} else if (_oldCount > V.PC.pregType && V.PC.pregType === 0) {
+		} else if (oldCount > V.PC.pregType && V.PC.pregType === 0) {
 			TerminatePregnancy(V.PC);
 		}
 		if (V.PC.preg === 15) {
@@ -95,57 +95,57 @@ App.EndWeek.personalNotes = function() {
 			}
 		}
 		if (V.PC.preg >= V.PC.pregData.normalBirth / 4) {
-			const _gigantomastiaMod = V.PC.geneticQuirks.gigantomastia === 2 ? (V.PC.geneticQuirks.macromastia === 2 ? 3 : 2) : 1;
+			const gigantomastiaMod = V.PC.geneticQuirks.gigantomastia === 2 ? (V.PC.geneticQuirks.macromastia === 2 ? 3 : 2) : 1;
 			/* trim this down */
-			let _boobTarget;
+			let boobTarget;
 			if (V.PC.geneMods.NCS === 1) {
-				_boobTarget = 100;
+				boobTarget = 100;
 			} else if (V.PC.geneticQuirks.androgyny === 2) {
-				_boobTarget = 400;
+				boobTarget = 400;
 			} else if (V.PC.physicalAge >= 18) {
 				if (V.PC.pregType >= 8) {
-					_boobTarget = 1500;
+					boobTarget = 1500;
 					/* 2000 */
 				} else if (V.PC.pregType >= 5) {
-					_boobTarget = 1400;
+					boobTarget = 1400;
 				} else if (V.PC.pregType >= 2) {
-					_boobTarget = 1000;
+					boobTarget = 1000;
 				} else {
-					_boobTarget = 800;
+					boobTarget = 800;
 				}
 			} else if (V.PC.physicalAge >= 13) {
 				if (V.PC.pregType >= 8) {
-					_boobTarget = 1500;
+					boobTarget = 1500;
 					/* 1800 */
 				} else if (V.PC.pregType >= 5) {
-					_boobTarget = 1400;
+					boobTarget = 1400;
 				} else if (V.PC.pregType >= 2) {
-					_boobTarget = 1000;
+					boobTarget = 1000;
 				} else {
-					_boobTarget = 800;
+					boobTarget = 800;
 				}
 			} else if (V.PC.physicalAge >= 8) {
 				if (V.PC.pregType >= 8) {
-					_boobTarget = 1400;
+					boobTarget = 1400;
 				} else if (V.PC.pregType >= 5) {
-					_boobTarget = 1000;
+					boobTarget = 1000;
 				} else if (V.PC.pregType >= 2) {
-					_boobTarget = 800;
+					boobTarget = 800;
 				} else {
-					_boobTarget = 600;
+					boobTarget = 600;
 				}
 			} else {
 				if (V.PC.pregType >= 8) {
-					_boobTarget = 1000;
+					boobTarget = 1000;
 				} else if (V.PC.pregType >= 5) {
-					_boobTarget = 8000;
+					boobTarget = 8000;
 				} else if (V.PC.pregType >= 2) {
-					_boobTarget = 600;
+					boobTarget = 600;
 				} else {
-					_boobTarget = 400;
+					boobTarget = 400;
 				}
 			}
-			/* _boobTarget *= _gigantomastiaMod;*/
+			/* boobTarget *= gigantomastiaMod;*/
 			if (V.PC.geneMods.NCS === 0) {
 				/*
 				if (V.PC.pregType >= 30) {
@@ -154,7 +154,7 @@ App.EndWeek.personalNotes = function() {
 						V.PC.weight += 1;
 					}
 					if (random(1,100) > 60) {
-						if ((V.PC.boobs - V.PC.boobsImplant) < _boobTarget) {
+						if ((V.PC.boobs - V.PC.boobsImplant) < boobTarget) {
 							r.push(`${His} breasts <span class="lime">greatly swell</span> to meet the upcoming demand.`);
 							V.PC.boobs += 100;
 							if (V.PC.boobShape !== "saggy" && V.PC.preg > V.PC.pregData.normalBirth/1.25 && (V.PC.breastMesh !== 1) && (V.PC.drugs !== "sag-B-gone")) {
@@ -174,7 +174,7 @@ App.EndWeek.personalNotes = function() {
 						}
 					}
 				} else if ((V.PC.pregType >= 10)) {
-					if (random(1,100) > 80 && ((V.PC.boobs - V.PC.boobsImplant) < _boobTarget)) {
+					if (random(1,100) > 80 && ((V.PC.boobs - V.PC.boobsImplant) < boobTarget)) {
 						V.PC.boobs += 50;
 						if (V.PC.boobShape !== "saggy" && (V.PC.breastMesh !== 1) && (V.PC.drugs !== "sag-B-gone")) {
 							if (V.PC.preg > random(V.PC.pregData.normalBirth/1.25, V.PC.pregData.normalBirth*2.05)) {
@@ -185,7 +185,7 @@ App.EndWeek.personalNotes = function() {
 					}
 				}
 				*/
-				if ((V.PC.boobs - V.PC.boobsImplant) < _boobTarget) {
+				if ((V.PC.boobs - V.PC.boobsImplant) < boobTarget) {
 					if (V.PC.boobs >= 1400) {
 						if (random(1, 100) > 90) {
 							r.push(`Unsurprisingly, your cow tits <span class="lime">have swollen even larger</span> with your pregnancy.`);
@@ -268,7 +268,7 @@ App.EndWeek.personalNotes = function() {
 							}
 						}
 					}
-					if (_sagCheck) {
+					if (sagCheck) {
 						if (V.PC.boobShape !== "saggy" && V.PC.preg > random(V.PC.pregData.normalBirth / 1.25, V.PC.pregData.normalBirth * 2.5) && (V.PC.breastMesh !== 1) && (V.PC.drugs !== "sag-B-gone")) {
 							r.push(`${His} <span class="orange">breasts become saggy</span> in the last stages of ${his} pregnancy as ${his} body undergoes changes in anticipation of the forthcoming birth.`);
 							V.PC.boobShape = "saggy";
@@ -296,52 +296,51 @@ App.EndWeek.personalNotes = function() {
 				V.PC.labor = 1;
 			}
 			if (V.PC.labor === 1) {
-				// <br>
 				if (V.PC.birthsTotal > 0) {
-					r.push(`<span class="red">A dull cramp runs down your middle.</span> You'll be giving birth soon.`);
+					r.push(App.UI.DOM.makeElement("div", `<span class="red">A dull cramp runs down your middle.</span> You'll be giving birth soon.`));
 				} else {
-					r.push(`You begin to experience <span class="red">odd cramps</span> in your lower body. Contractions, more than likely.`);
+					r.push(App.UI.DOM.makeElement("div", `You begin to experience <span class="red">odd cramps</span> in your lower body. Contractions, more than likely.`));
 				}
 			}
 			/*
 			if (V.dangerousPregnancy === 1 && V.PC.labor !== 1) {
 				if (V.PC.pregAdaptation < 500) {
-					_miscarriageChance = -10;
-					_miscarriageChance += ((V.PC.bellyPreg / 1000) - V.PC.pregAdaptation);
+					miscarriageChance = -10;
+					miscarriageChance += ((V.PC.bellyPreg / 1000) - V.PC.pregAdaptation);
 					r.push(` // this could use to not be linear`);
 					if (V.PC.inflation > 0) {
-						_miscarriageChance += 10;
+						miscarriageChance += 10;
 					}
-					_miscarriageChance -= (V.PC.curatives === 1 ? 100 : 0);
+					miscarriageChance -= (V.PC.curatives === 1 ? 100 : 0);
 					if (V.PC.health.health < -20) {
-						_miscarriageChance -= (V.PC.health.health);
+						miscarriageChance -= (V.PC.health.health);
 					} else if (V.PC.health.health > 80) {
-						_miscarriageChance -= (V.PC.health.health / 10);
+						miscarriageChance -= (V.PC.health.health / 10);
 					}
 					if (V.PC.weight < -50) {
-						_miscarriageChance -= (V.PC.weight);
+						miscarriageChance -= (V.PC.weight);
 					}
 					if (V.PC.bellyAccessory === "a support band") {
-						_miscarriageChance -= 30;
+						miscarriageChance -= 30;
 					}
-					_miscarriageChance = Math.round(_miscarriageChance);
-					if (_miscarriageChance > random(0, 100)) {
-						_chance = random(1, 100);
+					miscarriageChance = Math.round(miscarriageChance);
+					if (miscarriageChance > random(0, 100)) {
+						chance = random(1, 100);
 						if (V.PC.preg >= V.PC.pregData.normalBirth / 1.33) {
 							V.PC.labor = 1, V.birthee = 1;
-							_miscarriage = 1;
+							miscarriage = 1;
 						} else if (V.PC.preg > V.PC.pregData.normalBirth / 1.48) {
 							V.PC.labor = 1, V.PC.prematureBirth = 1;
-							_miscarriage = 1;
-						} else if (V.PC.preg > V.PC.pregData.normalBirth / 1.6 && _chance > 10) {
+							miscarriage = 1;
+						} else if (V.PC.preg > V.PC.pregData.normalBirth / 1.6 && chance > 10) {
 							V.PC.labor = 1, V.PC.prematureBirth = 1;
-							_miscarriage = 1;
-						} else if (V.PC.preg > V.PC.pregData.normalBirth / 1.73 && _chance > 40) {
+							miscarriage = 1;
+						} else if (V.PC.preg > V.PC.pregData.normalBirth / 1.73 && chance > 40) {
 							V.PC.labor = 1, V.PC.prematureBirth = 1;
-							_miscarriage = 1;
-						} else if (V.PC.preg > V.PC.pregData.normalBirth / 1.81 && _chance > 75) {
+							miscarriage = 1;
+						} else if (V.PC.preg > V.PC.pregData.normalBirth / 1.81 && chance > 75) {
 							V.PC.labor = 1, V.PC.prematureBirth = 1;
-							_miscarriage = 1;
+							miscarriage = 1;
 						} else {
 							r.push(`${His} overwhelmed body has <span class="orange">forced ${him} to miscarry,</span> possibly saving ${his} life.`);
 							V.PC.preg = 0;
@@ -391,8 +390,8 @@ App.EndWeek.personalNotes = function() {
 								} else {
 									r.push(`It appears ${he} was more attached to ${his} baby bump than ${he} let on and is hurting even more for it.`);
 								}
-								_fetishModifier = V.PC.fetishStrength / 2;
-								V.PC.devotion -= 1 * _fetishModifier, V.PC.trust -= 1 * _fetishModifier;
+								fetishModifier = V.PC.fetishStrength / 2;
+								V.PC.devotion -= 1 * fetishModifier, V.PC.trust -= 1 * fetishModifier;
 							} else if (V.PC.devotion <= 20) {
 								r.push(`${He} is <span class="mediumorchid">consumed by enduring sorrow</span> and <span class="gold">horror.</span> Even though ${he} knew ${his} bab`);
 								if (V.PC.pregType > 1) {
@@ -423,50 +422,50 @@ App.EndWeek.personalNotes = function() {
 								r.push(` crossed out infant.`);
 								cashX(forceNeg(V.modCost), "slaveMod", V.PC);
 							}
-							_miscarriage = 1;
+							miscarriage = 1;
 						}
 					}
 				}
 				if (V.seeExtreme === 1) {
-					if (_miscarriage !== 1 && V.PC.bellyPreg >= 100000 && V.PC.geneMods.rapidCellGrowth !== 1) {
+					if (miscarriage !== 1 && V.PC.bellyPreg >= 100000 && V.PC.geneMods.rapidCellGrowth !== 1) {
 						r.push(` // If ${he} can't relieve the pressure that way, will ${he} hold?`);
 						if (V.PC.bellyPreg >= 500000 || V.PC.wombImplant !== "restraint") {
 							if ((V.PC.belly > (V.PC.pregAdaptation * 3200)) || V.PC.bellyPreg >= 500000) {
-								_burstChance = -80;
-								_burstChance += ((V.PC.belly / 1000) - V.PC.pregAdaptation);
+								burstChance = -80;
+								burstChance += ((V.PC.belly / 1000) - V.PC.pregAdaptation);
 								r.push(` // this could use to not be linear`);
 								if (V.PC.health.health < -20) {
-									_burstChance -= (V.PC.health.health);
+									burstChance -= (V.PC.health.health);
 								} else if (V.PC.health.health > 80) {
-									_burstChance -= (V.PC.health.health / 10);
+									burstChance -= (V.PC.health.health / 10);
 								}
 								if (V.PC.weight < 0) {
-									_burstChance -= V.PC.weight;
+									burstChance -= V.PC.weight;
 								}
-								_burstChance -= V.PC.bellySag;
-								_burstChance -= V.PC.muscles;
+								burstChance -= V.PC.bellySag;
+								burstChance -= V.PC.muscles;
 								if (V.PC.bellyAccessory === "a support band") {
-									_burstChance -= 10;
+									burstChance -= 10;
 								}
 								if (V.PC.pregControl === "slow gestation") {
-									_burstChance -= 20;
+									burstChance -= 20;
 								}
 								if (V.PC.assignment === "get treatment in the clinic") {
 									if (S.Nurse) {
-										_burstChance -= 100;
+										burstChance -= 100;
 									} else {
-										_burstChance -= 30;
+										burstChance -= 30;
 									}
 								} else if (V.PC.assignment === "work in the dairy" && V.dairyPregSetting === 3) {
-									_burstChance -= 250;
+									burstChance -= 250;
 								}
 								if (V.PC.pregControl === "speed up") {
-									if (_burstChance > 0) {
-										_burstChance *= 4;
+									if (burstChance > 0) {
+										burstChance *= 4;
 									}
 								}
-								_burstChance = Math.round(_burstChance);
-								if (_burstChance > random(0, 100)) {
+								burstChance = Math.round(burstChance);
+								if (burstChance > random(0, 100)) {
 									V.PC.burst = 1;
 								} else {
 									r.push(`Constant <span class="red">`);
@@ -482,8 +481,9 @@ App.EndWeek.personalNotes = function() {
 					}
 				}
 			}
-			* /
+			*/
 		}
 	}
+	App.Events.addParagraph(el, r);
 	return el;
 };
diff --git a/src/pregmod/personalNotes.tw b/src/pregmod/personalNotes.tw
deleted file mode 100644
index bc2ab16cd9d..00000000000
--- a/src/pregmod/personalNotes.tw
+++ /dev/null
@@ -1,406 +0,0 @@
-:: Personal Notes [nobr]
-
-<<if $useTabs == 0>>__Personal Notes__<</if>>
-<br>
-<<if ($playerAging != 0)>>Your birthday is <<if $PC.birthWeek == 51>>next week<<if $playerAging == 2>>; you'll be turning <<print $PC.actualAge+1>><</if>><<else>>in <<print 52-$PC.birthWeek>> weeks<</if>>.<</if>>
-<<= App.Desc.Player.boobs()>>
-<<= App.Desc.Player.belly()>>
-<<= App.Desc.Player.crotch()>>
-<<= App.Desc.Player.butt()>>
-<<if $PC.lactation > 0>>
-	<<if $PC.rules.lactation != "none" && $PC.rules.lactation != "induce">>
-		<<set $PC.lactationDuration = 2>>
-		<<if $PC.rules.lactation == "sell">>
-			/* watch this be a disaster */
-			<<set _milk = milkAmount($PC)>>
-			Whenever you have a free moment and a chest swollen with milk, you spend your time attached to the nearest milker. As a result, you produce _milk liters of sellable milk over the week.
-			<<if ($arcologies[0].FSPastoralistLaw == 1)>>
-				<<set _milkSale = _milk*(28+Math.trunc($arcologies[0].FSPastoralist/30))>>
-				Since breast milk is $arcologies[0].name's only legal dairy product, and yours is in a class all of its own, society can't get enough of it and you make @@.yellowgreen;<<print cashFormat(_milkSale)>>.@@
-			<<elseif ($arcologies[0].FSPastoralist != "unset")>>
-				<<set _milkSale = _milk*(12+Math.trunc($arcologies[0].FSPastoralist/30))>>
-				Since milk is fast becoming a major part of the $arcologies[0].name's dietary culture, and yours is in a class all of its own, you make @@.yellowgreen;<<print cashFormat(_milkSale)>>.@@
-			<<else>>
-				<<set _milkSale = _milk*8>>
-				Your milk is sold for @@.yellowgreen;<<print cashFormat(_milkSale)>>.@@
-			<</if>>
-			<<run cashX(_milkSale, "personalBusiness")>>
-		<<else>>
-			You regularly see to your breasts to make sure your milk production doesn't dry up; be it by hand, milker, or mouth, you keep yourself comfortably drained.
-		<</if>>
-	<<else>>
-		<<if $PC.belly < 1500>>
-			<<set $PC.lactationDuration-->>
-			<<if $PC.lactationDuration == 0>>
-				With no reason to continue production, your @@.yellow;lactation has stopped.@@
-				<<set $PC.lactation = 0>>
-			<</if>>
-		<</if>>
-	<</if>>
-<</if>>
-<<if $PC.preg > 0>>
-	<<set _oldCount = $PC.pregType>>
-	<<if $PC.preg <= 2>>
-		<<run fetalSplit($PC, 1000)>>
-		<<run WombCleanYYFetuses($PC)>>
-	<</if>>
-	<<if $pregnancyMonitoringUpgrade == 1>>
-		<<if _oldCount < $PC.pregType>>
-			While making use of the advanced pregnancy monitoring equipment, you are surprised to find @@.lime;your womb is a little more occupied than last checkup.@@
-		<<elseif _oldCount > $PC.pregType>>
-			While making use of the advanced pregnancy monitoring equipment, you are surprised to find @@.orange;your womb houses less life than last checkup.@@
-			<<if $PC.pregType == 0>>
-				For all intents and purposes, @@.yellow;you are no longer pregnant.@@
-				<<run TerminatePregnancy($PC)>>
-			<</if>>
-		<</if>>
-	<<elseif _oldCount > $PC.pregType && $PC.pregType == 0>>
-		<<run TerminatePregnancy($PC)>>
-	<</if>>
-	<<if $PC.preg == 15>>
-		<<if $PC.pregKnown == 0>>
-			Your areolae have gotten dark. Some cursory tests reveal @@.lime;you are about fifteen weeks pregnant.@@ How did that manage to slip past you?
-			<<set $PC.pregKnown = 1>>
-		<<else>>
-			Your areolae have gotten dark. Just another step along your pregnancy.
-		<</if>>
-	<<elseif $PC.belly >= 1500>>
-		<<if ($PC.preg > 20) && ($PC.lactation == 0)>>
-			<<if $PC.preg > random(18,30)>>
-				A moist sensation on your breasts draws your attention; @@.lime;your milk has come in.@@
-				<<set $PC.lactation = 1>>
-			<</if>>
-		<</if>>
-		<<if $PC.lactation == 1>>
-			<<set $PC.lactationDuration = 2>>
-		<</if>>
-	<</if>>
-	<<if ($PC.preg >= $PC.pregData.normalBirth/4)>>
-		<<set _gigantomastiaMod = $PC.geneticQuirks.gigantomastia == 2 ? ($PC.geneticQuirks.macromastia == 2 ? 3 : 2) : 1>>
-		/* trim this down */
-		<<if $PC.geneMods.NCS == 1>>
-			<<set _boobTarget = 100>>
-		<<elseif $PC.geneticQuirks.androgyny == 2>>
-			<<set _boobTarget = 400>>
-		<<elseif $PC.physicalAge >= 18>>
-			<<if $PC.pregType >= 8>>
-				<<set _boobTarget = 1500>> /* 2000 */
-			<<elseif $PC.pregType >= 5>>
-				<<set _boobTarget = 1400>>
-			<<elseif $PC.pregType >= 2>>
-				<<set _boobTarget = 1000>>
-			<<else>>
-				<<set _boobTarget = 800>>
-			<</if>>
-		<<elseif $PC.physicalAge >= 13>>
-			<<if $PC.pregType >= 8>>
-				<<set _boobTarget = 1500>> /* 1800 */
-			<<elseif $PC.pregType >= 5>>
-				<<set _boobTarget = 1400>>
-			<<elseif $PC.pregType >= 2>>
-				<<set _boobTarget = 1000>>
-			<<else>>
-				<<set _boobTarget = 800>>
-			<</if>>
-		<<elseif $PC.physicalAge >= 8>>
-			<<if $PC.pregType >= 8>>
-				<<set _boobTarget = 1400>>
-			<<elseif $PC.pregType >= 5>>
-				<<set _boobTarget = 1000>>
-			<<elseif $PC.pregType >= 2>>
-				<<set _boobTarget = 800>>
-			<<else>>
-				<<set _boobTarget = 600>>
-			<</if>>
-		<<else>>
-			<<if $PC.pregType >= 8>>
-				<<set _boobTarget = 1000>>
-			<<elseif $PC.pregType >= 5>>
-				<<set _boobTarget = 8000>>
-			<<elseif $PC.pregType >= 2>>
-				<<set _boobTarget = 600>>
-			<<else>>
-				<<set _boobTarget = 400>>
-			<</if>>
-		<</if>>
-		/*<<set _boobTarget *= _gigantomastiaMod>>*/
-		<<if ($PC.geneMods.NCS == 0)>>
-			/*
-			<<if $PC.pregType >= 30>>
-				<<if ($PC.weight <= 65)>>
-					$He has @@.lime;gained weight@@ in order to better sustain $himself and $his children.
-					<<set $PC.weight += 1>>
-				<</if>>
-				<<if (random(1,100) > 60)>>
-					<<if (($PC.boobs - $PC.boobsImplant) < _boobTarget)>>
-						$His breasts @@.lime;greatly swell@@ to meet the upcoming demand.
-						<<set $PC.boobs += 100>>
-						<<if $PC.boobShape != "saggy" && $PC.preg > $PC.pregData.normalBirth/1.25 && ($PC.breastMesh != 1) && ($PC.drugs != "sag-B-gone")>>
-							$His immensely engorged @@.orange;breasts become saggy@@ in the last stages of $his pregnancy as $his body undergoes changes in anticipation of the forthcoming birth.
-							<<set $PC.boobShape = "saggy">>
-						<</if>>
-					<</if>>
-					<<if $PC.geneticQuirks.androgyny != 2>>
-						<<if ($PC.hips < 2)>>
-							$His hips @@.lime;widen@@ for $his upcoming birth.
-							<<set $PC.hips += 1>>
-						<</if>>
-						<<if ($PC.butt < 14)>>
-							$His butt @@.lime;swells with added fat@@ from $his changing body.
-							<<set $PC.butt += 1>>
-						<</if>>
-					<</if>>
-				<</if>>
-			<<elseif ($PC.pregType >= 10)>>
-				<<if random(1,100) > 80 && (($PC.boobs - $PC.boobsImplant) < _boobTarget)>>
-					<<set $PC.boobs += 50>>
-					<<if $PC.boobShape != "saggy" && ($PC.breastMesh != 1) && ($PC.drugs != "sag-B-gone")>>
-						<<if $PC.preg > random($PC.pregData.normalBirth/1.25, $PC.pregData.normalBirth*2.05)>>
-							$His swollen @@.orange;breasts become saggy@@ in the last stages of $his pregnancy as $his body undergoes changes in anticipation of the forthcoming birth.
-							<<set $PC.boobShape = "saggy">>
-						<</if>>
-					<</if>>
-				<</if>>
-			<</if>>
-			*/
-			<<if ($PC.boobs - $PC.boobsImplant) < _boobTarget>>
-				<<if $PC.boobs >= 1400>>
-					<<if random(1,100) > 90>>
-						Unsurprisingly, your cow tits @@.lime;have swollen even larger@@ with your pregnancy.
-						<<set $PC.boobs += 25>>
-					<</if>>
-				<<elseif $PC.boobs >= 1200>>
-					<<if random(1,100) > 90>>
-						Your already huge breasts have @@.lime;grown even heavier@@ with your pregnancy.
-						<<set $PC.boobs += 25>>
-						<<if $PC.boobs >= 1400>>
-							Your desk is steadily starting to disappear; @@.lime;H-cups will do that.@@
-						<</if>>
-					<</if>>
-				<<elseif $PC.boobs >= 1000>>
-					<<if random(1,100) > 75>>
-						Your already large breasts have @@.lime;grown even larger@@ with your pregnancy.
-						<<set $PC.boobs += 25>>
-						<<if $PC.boobs >= 1200>>
-							Nothing fits comfortably now; your tailor says @@.lime;it's your G-cup knockers.@@ Your back agrees.
-						<</if>>
-					<</if>>
-				<<elseif $PC.boobs >= 800>>
-					<<if random(1,100) > 75>>
-						Your breasts have @@.lime;grown a bit larger@@ to feed your coming child<<if $PC.pregType > 1>>ren<</if>>.
-						<<set $PC.boobs += 25>>
-						<<if $PC.boobs >= 1000>>
-							You popped your bra when you put it on; @@.lime;time to order some F-cups.@@
-						<</if>>
-					<</if>>
-				<<elseif $PC.boobs >= 650>>
-					<<if random(1,100) > 80>>
-						Your breasts have @@.lime;grown a bit larger@@ to feed your coming child<<if $PC.pregType > 1>>ren<</if>>.
-						<<set $PC.boobs += 25>>
-						<<if $PC.boobs >= 800>>
-							Their prominence, and a quick measuring, reveals @@.lime;you now sport DDs.@@
-						<</if>>
-					<</if>>
-				<<elseif $PC.boobs >= 500>>
-					<<if random(1,100) > 80>>
-						Your breasts have @@.lime;grown a bit larger@@ to feed your coming child<<if $PC.pregType > 1>>ren<</if>>.
-						<<set $PC.boobs += 25>>
-						<<if $PC.boobs >= 650>>
-							They're big, sensitive, @@.lime;and now a D-cup.@@
-						<</if>>
-					<</if>>
-				<<elseif $PC.boobs >= 400>>
-					<<if random(1,100) > 80>>
-						Your breasts have @@.lime;gotten heavier@@ alongside your pregnancy.
-						<<set $PC.boobs += 25>>
-						<<if $PC.boobs >= 500>>
-							They spill dramatically out of your bra now, which means @@.lime;you've graduated to a C-cup.@@
-						<</if>>
-					<</if>>
-				<<elseif $PC.boobs >= 300>>
-					<<if random(1,100) > 75>>
-						Your breasts have @@.lime;swollen@@ alongside your pregnancy.
-						<<set $PC.boobs += 25>>
-						<<if $PC.boobs >= 400>>
-							A quick measuring after your top started to feel too constricting reveals @@.lime;you are now a B-cup!@@
-						<</if>>
-					<</if>>
-				<<else>>
-					<<if random(1,100) > 75>>
-						Your chest @@.lime;has filled out slightly@@ with your pregnancy.
-						<<set $PC.boobs += 25>>
-						<<if $PC.boobs >= 300>>
-							They've gotten so big that @@.lime;you can now fill an A-cup bra.@@
-						<</if>>
-					<</if>>
-				<</if>>
-				<<if _sagCheck>>
-					<<if $PC.boobShape != "saggy" && $PC.preg > random($PC.pregData.normalBirth/1.25, $PC.pregData.normalBirth*2.5) && ($PC.breastMesh != 1) && ($PC.drugs != "sag-B-gone")>>
-						$His @@.orange;breasts become saggy@@ in the last stages of $his pregnancy as $his body undergoes changes in anticipation of the forthcoming birth.
-						<<set $PC.boobShape = "saggy">>
-					<</if>>
-				<</if>>
-			<</if>>
-			/*
-			<<if $PC.preg > $PC.pregData.normalBirth/1.25 && $PC.physicalAge >= 18 && $PC.hips == 1 && $PC.hipsImplant == 0 && random(1,100) > 90>>
-				$His hips @@.lime;widen@@ to better support $his gravidity.
-				<<set $PC.hips += 1>>
-			<<elseif $PC.preg > $PC.pregData.normalBirth/1.42 && $PC.physicalAge >= 18 && $PC.hips == 0 && $PC.hipsImplant == 0 && random(1,100) > 70>>
-				$His hips @@.lime;widen@@ to better support $his gravidity.
-				<<set $PC.hips += 1>>
-			<</if>>
-			*/
-		<</if>>
-	<</if>>
-	/*--------------- main labor triggers: -------- */
-	<<if $PC.preg > $PC.pregData.normalBirth/8>>
-		<<if WombBirthReady($PC, $PC.pregData.normalBirth*1.075) > 0>> /*check for really ready fetuses - 43 weeks - max, overdue*/
-			<<set $PC.labor = 1>>
-		<<elseif WombBirthReady($PC, $PC.pregData.normalBirth) > 0 && (random(1,100) > 50)>> /*check for really ready fetuses - 40 weeks - normal*/
-			<<set $PC.labor = 1>>
-		<<elseif WombBirthReady($PC, $PC.pregData.normalBirth/1.1111) > 0 && (random(1,100) > 90)>> /*check for really ready fetuses - 36 weeks minimum */
-			<<set $PC.labor = 1>>
-		<</if>>
-		<<if $PC.labor == 1>>
-			<br>
-			<<if $PC.birthsTotal > 0>>
-				@@.red;A dull cramp runs down your middle.@@ You'll be giving birth soon.
-			<<else>>
-				You begin to experience @@.red;odd cramps@@ in your lower body. Contractions, more than likely.
-			<</if>>
-		<</if>>
-		/*
-		<<if $dangerousPregnancy == 1 && $PC.labor != 1>>
-			<<if $PC.pregAdaptation < 500>>
-				<<set _miscarriageChance = -10>>
-				<<set _miscarriageChance += (($PC.bellyPreg/1000)-$PC.pregAdaptation)>> // this could use to not be linear
-				<<if $PC.inflation > 0>>
-					<<set _miscarriageChance += 10>>
-				<</if>>
-				<<set _miscarriageChance -= ($PC.curatives == 1 ? 100 : 0)>>
-				<<if $PC.health.health < -20>>
-					<<set _miscarriageChance -= ($PC.health.health)>>
-				<<elseif $PC.health.health > 80>>
-					<<set _miscarriageChance -= ($PC.health.health/10)>>
-				<</if>>
-				<<if $PC.weight < -50>>
-					<<set _miscarriageChance -= ($PC.weight)>>
-				<</if>>
-				<<if $PC.bellyAccessory == "a support band">>
-					<<set _miscarriageChance -= 30>>
-				<</if>>
-				<<set _miscarriageChance = Math.round(_miscarriageChance)>>
-				<<if _miscarriageChance > random(0,100)>>
-					<<set _chance = random(1,100)>>
-					<<if $PC.preg >= $PC.pregData.normalBirth/1.33>>
-						<<set $PC.labor = 1, $birthee = 1>>
-						<<set _miscarriage = 1>>
-					<<elseif $PC.preg > $PC.pregData.normalBirth/1.48>>
-						<<set $PC.labor = 1, $PC.prematureBirth = 1>>
-						<<set _miscarriage = 1>>
-					<<elseif $PC.preg > $PC.pregData.normalBirth/1.6 && _chance > 10>>
-						<<set $PC.labor = 1, $PC.prematureBirth = 1>>
-						<<set _miscarriage = 1>>
-					<<elseif $PC.preg > $PC.pregData.normalBirth/1.73 && _chance > 40>>
-						<<set $PC.labor = 1, $PC.prematureBirth = 1>>
-						<<set _miscarriage = 1>>
-					<<elseif $PC.preg > $PC.pregData.normalBirth/1.81 && _chance > 75>>
-						<<set $PC.labor = 1, $PC.prematureBirth = 1>>
-						<<set _miscarriage = 1>>
-					<<else>>
-						$His overwhelmed body has @@.orange;forced $him to miscarry,@@ possibly saving $his life.
-						<<set $PC.preg = 0>>
-						<<if $PC.sexualFlaw == "breeder">>
-							$He is @@.mediumorchid;filled with violent, all-consuming hatred@@ at $himself for failing to carry to term and you for allowing this to happen.
-							<<if $PC.pregType > 4>>
-								The loss of so many children at once @@.red;shatters the distraught breeder's mind.@@
-								<<set $PC.fetish = "mindbroken", $PC.behavioralQuirk = "none", $PC.behavioralFlaw = "none", $PC.sexualQuirk = "none", $PC.sexualFlaw = "none", $PC.devotion = 0, $PC.trust = 0>>
-							<<else>>
-								$He cares little for what punishment awaits $his actions.
-								<<set $PC.devotion -= 25*$PC.pregType>>
-							<</if>>
-						<<elseif $PC.devotion < -50>>
-							$He is @@.mediumorchid;filled with violent, consuming hatred@@ and @@.gold;fear.@@ Even though $he knew $his bab<<if $PC.pregType > 1>>ies were<<else>>y was<</if>> likely destined for a slave orphanage, it seems $he cared for <<if $PC.pregType > 1>>them<<else>>it<</if>> and blames you for the loss.
-							<<set $PC.devotion -= 25, $PC.trust -= 25>>
-						<<elseif $PC.devotion < -20>>
-							$He is @@.mediumorchid;afflicted by desperate, inconsolable grief@@ and @@.gold;horror.@@ Even though $he knew $his bab<<if $PC.pregType > 1>>ies were<<else>>y was<</if>> likely destined for a slave orphanage, it seems $he cared for <<if $PC.pregType > 1>>them<<else>>it<</if>>.
-							<<set $PC.devotion -= 10, $PC.trust -= 20>>
-						<<elseif $PC.fetish == "pregnancy">>
-							$He is @@.mediumorchid;filled with deep regret@@ and @@.gold;fear.@@
-							<<if $PC.fetishKnown == 1>>
-								To a pregnancy fetishist, ending it like this hurts far worse than birth ever would.
-							<<else>>
-								It appears $he was more attached to $his baby bump than $he let on and is hurting even more for it.
-							<</if>>
-							<<set _fetishModifier = $PC.fetishStrength/2>>
-							<<set $PC.devotion -= 1*_fetishModifier, $PC.trust -= 1*_fetishModifier>>
-						<<elseif $PC.devotion <= 20>>
-							$He is @@.mediumorchid;consumed by enduring sorrow@@ and @@.gold;horror.@@ Even though $he knew $his bab<<if $PC.pregType > 1>>ies were<<else>>y was<</if>> likely destined for a slave orphanage, it seems $he cared for <<if $PC.pregType > 1>>them<<else>>it<</if>>.
-							<<set $PC.devotion -= 5, $PC.trust -= 5>>
-						<<elseif $PC.devotion <= 50>>
-							$He is dully obedient. $He has been broken to slave life so thoroughly that even this is neither surprising nor affecting.
-						<<else>>
-							$He is @@.mediumorchid;disappointed by this development@@ and @@.gold;afraid@@ of your reaction. By failing to carry to term, $he has failed your will.
-							<<set $PC.devotion -= 10, $PC.trust -= 10>>
-						<</if>>
-						<<set TerminatePregnancy($PC)>>
-						<<run actX($PC, "abortions")>>
-						<<if $PC.abortionTat > -1>>
-							<<set $PC.abortionTat++>>
-							The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($PC.abortionTat)>> crossed out infant.
-							<<run cashX(forceNeg($modCost), "slaveMod", $PC)>>
-						<</if>>
-						<<set _miscarriage = 1>>
-					<</if>>
-				<</if>>
-			<</if>>
-			<<if $seeExtreme == 1>>
-				<<if _miscarriage != 1 && $PC.bellyPreg >= 100000 && $PC.geneMods.rapidCellGrowth != 1>> // If $he can't relieve the pressure that way, will $he hold?
-					<<if $PC.bellyPreg >= 500000 || $PC.wombImplant != "restraint">>
-						<<if (($PC.belly > ($PC.pregAdaptation*3200)) || $PC.bellyPreg >= 500000)>>
-							<<set _burstChance = -80>>
-							<<set _burstChance += (($PC.belly/1000)-$PC.pregAdaptation)>> // this could use to not be linear
-							<<if $PC.health.health < -20>>
-								<<set _burstChance -= ($PC.health.health)>>
-							<<elseif $PC.health.health > 80>>
-								<<set _burstChance -= ($PC.health.health/10)>>
-							<</if>>
-							<<if $PC.weight < 0>>
-								<<set _burstChance -= $PC.weight>>
-							<</if>>
-							<<set _burstChance -= $PC.bellySag>>
-							<<set _burstChance -= $PC.muscles>>
-							<<if $PC.bellyAccessory == "a support band">>
-								<<set _burstChance -= 10>>
-							<</if>>
-							<<if $PC.pregControl == "slow gestation">>
-								<<set _burstChance -= 20>>
-							<</if>>
-							<<if $PC.assignment == "get treatment in the clinic">>
-								<<if _S.Nurse>>
-									<<set _burstChance -= 100>>
-								<<else>>
-									<<set _burstChance -= 30>>
-								<</if>>
-							<<elseif $PC.assignment == "work in the dairy" && $dairyPregSetting == 3>>
-								<<set _burstChance -= 250>>
-							<</if>>
-							<<if $PC.pregControl == "speed up">>
-								<<if _burstChance > 0>>
-									<<set _burstChance *= 4>>
-								<</if>>
-							<</if>>
-							<<set _burstChance = Math.round(_burstChance)>>
-							<<if _burstChance > random(0,100)>>
-								<<set $PC.burst = 1>>
-							<<else>>
-								Constant @@.red;<<if $PC.geneticQuirks.uterineHypersensitivity == 2>>painful orgasms<<else>>sharp pains<</if>>@@ from $his womb strongly suggest @@.red;$his body is beginning to break.@@
-							<</if>>
-						<</if>>
-					<</if>>
-				<</if>>
-			<</if>>
-		<</if>>
-		*/
-	<</if>>
-<</if>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 63a0e062bd2..49219ca9ba5 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -38,11 +38,10 @@
 <</if>>
 
 <<include "Reputation">>
-<br> <<includeDOM App.EndWeek.personalBusiness()>>
+<<includeDOM App.EndWeek.personalBusiness()>>
 
 <<if $PC.boobs >= 1000 || $PC.pregKnown == 1 || $playerAging != 0>>
-	<br><br>
-	<<include "Personal Notes">>
+	<<includeDOM App.EndWeek.personalNotes()>>
 <</if>>
 
 <<else>>
@@ -125,7 +124,7 @@
 <<if $PC.boobs >= 1000 || $PC.pregKnown == 1 || $playerAging != 0>>
 	<div id="Personal" class="tab-content">
 		<div class="content">
-			<<include "Personal Notes">>
+			<<includeDOM App.EndWeek.personalNotes()>>
 		</div>
 	</div>
 <</if>>
-- 
GitLab