src/events/nonRandom/pRaped.js

@@ -43,6 +43,7 @@ App.Events.pRaped = class pRaped extends App.Events.BaseEvent {
 			rapist.preg = 0;
 			rapist.weight = random(-20, 30);
 			rapist.waist = -20;
+			slave.fertPeak = 0;
 		}
 		rapist.muscles = Math.max(rapist.muscles, 10);
 		rapist.origin = `You sentenced $him to enslavement for the attempted rape of a free ${womanP} – you, to be exact.`;

src/events/reRecruit/desperateBirth.js

@@ -98,6 +98,8 @@ App.Events.recDesperateBirth = class recDesperateBirth extends App.Events.BaseEv
 			slave.geneticQuirks.uterineHypersensitivity = 0;
 			slave.preg = 0;
 			slave.pregWeek = -4;
+			slave.fertPeak = 2;
+			slave.fertKnown = 1;
 			slave.counter.births = 1;
 			slave.counter.birthsTotal = 1;
 			slave.bellySag = 5;

src/events/reRecruit/farmVirginCow.js

@@ -70,6 +70,7 @@ App.Events.recFarmVirginCow = class recFarmVirginCow extends App.Events.BaseEven
 			slave.vaginaLube = 1;
 			slave.labia = 2;
 			slave.ovaries = 1;
+			slave.fertKnown = 1;
 			slave.pubicHStyle = "waxed";
 			slave.underArmHStyle = "waxed";
 			slave.hips = random(0, 2);

src/events/recFS/recfsRepopulationEfforts.js

@@ -28,6 +28,7 @@ App.Events.recFSRepopulationEfforts = class recFSRepopulationEfforts extends App
 		slave.trueVirgin = 1;
 		slave.preg = 0;
 		slave.pregType = 0;
+		slave.fertKnown = 1;
 		slave.fetish = "pregnancy";
 
 		const {

src/events/scheduled/burst/burst.js

@@ -26,7 +26,7 @@ App.Events.SEBurst = class SEBurst extends App.Events.BaseEvent {
 				node.append(pop(slave));
 			}
 			removeSlave(slave, {dead: true});
-			node.append(sectionBreak());
+			node.append(App.UI.sectionBreak());
 		}
 
 		/**
@@ -137,12 +137,6 @@ App.Events.SEBurst = class SEBurst extends App.Events.BaseEvent {
 			el.append(horrifiedSlaves(slave));
 			return el;
 		}
-
-		function sectionBreak() {
-			const hr = document.createElement("hr");
-			hr.style.margin = "0";
-			return hr;
-		}
 	}
 };
 

src/events/scheduled/seHuskSlaveDelivery.js

@@ -15,6 +15,8 @@ App.Events.SEHuskSlaveDelivery = class SEHuskSlaveDelivery extends App.Events.Ba
 		if (V.huskSlave.race !== "not important") {
 			pram.race = V.huskSlave.race;
 		}
+
+		/** @type {FC.SlaveState} */
 		let husk;
 		if (V.huskSlave.sex === 2) {
 			husk = GenerateNewSlave("XY", pram);
@@ -73,7 +75,7 @@ App.Events.SEHuskSlaveDelivery = class SEHuskSlaveDelivery extends App.Events.Ba
 		App.Events.addResponses(node, choices);
 
 		function accept() {
-			V.temp.activeSlave = husk;
+			V.temp.husk = husk;
 			V.returnTo = V.nextLink;
 			Engine.play("Husk Slave Swap Workaround");
 			return ``;

src/facilities/geneLab.js

@@ -162,21 +162,27 @@ App.UI.geneLab = function() {
 	App.UI.DOM.appendNewElement("h2", node, `Genetic Harvesting`);
 
 	const humanCloning = 100000 * PCSkillCheck;
-	if (V.cloningSystem !== 1 && V.rep <= 18000 * PCSkillCheck) {
-		App.UI.DOM.appendNewElement("div", node, `You lack the reputation needed to access methods for human cloning`, ["note"]);
-	} else if ((V.cloningSystem !== 1) && (V.rep > 18000 * PCSkillCheck)) {
-		if (V.organFarmUpgrade === 0) {
-			App.UI.DOM.appendNewElement("div", node, `An organ farm is needed to grow the blank embryo to serve as a clone base`, ["note"]);
+	if (V.cloningSystem === 0) {
+		if (V.rep <= 18000 * PCSkillCheck) {
+			if (V.rep >= 20_000) {
+				App.UI.DOM.appendNewElement("div", node, `You have heard rumors of human cloning, but such technology is too advanced for your understanding. Perhaps you should invest into your own education.`, ["note"]);
+			} else {
+				App.UI.DOM.appendNewElement("div", node, `You lack the reputation needed to access methods for human cloning`, ["note"]);
+			}
 		} else {
-			App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
-				"Purchase methods for human cloning",
-				() => {
-					cashX(forceNeg(humanCloning), "capEx");
-					V.cloningSystem = 1;
-					App.UI.reload();
-				}, [], "",
-				`Costs ${cashFormat(humanCloning)}. Will allow children to be created with identical base genetics as the source DNA`
-			));
+			if (V.organFarmUpgrade === 0) {
+				App.UI.DOM.appendNewElement("div", node, `An organ farm is needed to grow the blank embryo to serve as a clone base`, ["note"]);
+			} else {
+				App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
+					"Purchase methods for human cloning",
+					() => {
+						cashX(forceNeg(humanCloning), "capEx");
+						V.cloningSystem = 1;
+						App.UI.reload();
+					}, [], "",
+					`Costs ${cashFormat(humanCloning)}. Will allow children to be created with identical base genetics as the source DNA`
+				));
+			}
 		}
 	} else if (V.cloningSystem > 0) {
 		App.UI.DOM.appendNewElement("div", node, `The gene lab is capable of implanting a slave's genetic sequence into a blank embryo to produce a basic clone.`);

src/facilities/nursery/utils/nurseryUtils.js

@@ -15,10 +15,8 @@ App.Facilities.Nursery.childList = function childList() {
 			const weeksOwned = V.week - child.weekAcquired;
 			const weeksLeft = (V.targetAgeNursery * 52) - weeksOwned;
 			const {he, him, He} = getPronouns(child);
-			const hr = document.createElement("hr");
 
-			hr.style.margin = "0";
-			list.appendChild(hr);
+			list.appendChild(App.UI.sectionBreak());
 
 			if (child.actualAge < 3) {
 				$(list).append(App.UI.DOM.link(SlaveFullName(child), (id) => V.activeChild = getInfant(id), [child.ID], "Infant Interact"));

src/facilities/pit/pit.js

@@ -60,6 +60,8 @@ App.Facilities.Pit.pit = function() {
 
 				App.UI.reload();
 			}), ['indent']);
+		} else if (bodyguard !== null) {
+			V.pit.slaveFightingBodyguard = null;
 		}
 		return el;
 	}

src/facilities/studio/studio.js

@@ -152,9 +152,7 @@ App.UI.mediaStudio = function() {
 		if (V.slavePanelStyle === 0) {
 			res.appendChild(document.createElement("br"));
 		} else if (V.slavePanelStyle === 1) {
-			const hr = document.createElement("hr");
-			hr.style.margin = "0";
-			res.appendChild(hr);
+			res.appendChild(App.UI.sectionBreak());
 		}
 
 		if (batchRenderer && (!V.seeCustomImagesOnly || (V.seeCustomImagesOnly && slave.custom.image))) {

src/facilities/surgery/surgeryPassageExotic.js

@@ -35,6 +35,7 @@ App.UI.surgeryPassageExotic = function(slave, refresh, cheat = false) {
 
 		return frag;
 		function geneTesting() {
+			const geneRecord = getGenePoolRecord(slave);
 			const el = new DocumentFragment();
 			const slaveGeneTest = App.UI.DOM.appendNewElement("ul", el);
 
@@ -45,8 +46,8 @@ App.UI.surgeryPassageExotic = function(slave, refresh, cheat = false) {
 			App.UI.DOM.appendNewElement("li", slaveGeneTest, `Nationality: ${slave.nationality}`);
 			// App.UI.DOM.appendNewElement("li", slaveGeneTest, `Race: ${capFirstChar(slave.origRace)}`); this is already present lower down in race()
 			App.UI.DOM.appendNewElement("li", slaveGeneTest, `Skin tone: ${capFirstChar(slave.origSkin)}`);
-			App.UI.DOM.appendNewElement("li", slaveGeneTest, `Intelligence index: ${slave.intelligence} out of 100`);
-			App.UI.DOM.appendNewElement("li", slaveGeneTest, `Face index: ${slave.face} out of 100`);
+			App.UI.DOM.appendNewElement("li", slaveGeneTest, `Genetic intelligence index: ${geneRecord.intelligence} out of 100`);
+			App.UI.DOM.appendNewElement("li", slaveGeneTest, `Genetic face index: ${geneRecord.face} out of 100`);
 			App.UI.DOM.appendNewElement("li", slaveGeneTest, `Expected height: ${heightToEitherUnit(slave.natural.height)}`);
 			App.UI.DOM.appendNewElement("li", slaveGeneTest, `Expected breast size: ${slave.natural.boobs}cc`);
 			App.UI.DOM.appendNewElement("li", slaveGeneTest, `Eye color: ${capFirstChar(slave.eye.origColor)}`);

src/facilities/wardrobe/wardrobeShopping.js

@@ -22,6 +22,9 @@ App.UI.WardrobeShopping = function() {
 	} else if (V.boughtItem.clothing.dildos === 1 || V.boughtItem.toys.gags === 1 || V.boughtItem.clothing.buttPlugs === 1 || V.boughtItem.clothing.buttPlugTails === 1 || V.boughtItem.clothing.vaginalAttachments === 1) {
 		r.push(`Some sex toys line the shelves.`);
 	}
+	if (V.scenarios.contraceptivesBan === 1 && V.boughtItem.toys.chastity === 1) {
+		r.push(`A box of massively overvalued chastity devices sits in the corner.`);
+	}
 	if (V.boughtItem.toys.buckets === 1) {
 		r.push(`Several buckets of various sizes and a sturdy cup have been set aside for you in feeding slaves to their limit.`);
 	}

src/facilities/wardrobe/wardrobeShoppingData.js

@@ -287,6 +287,14 @@ App.Data.WardrobeShopping.Accessories = {
 		contains: [],
 		owned: "You are well stocked with massive dildo gags.",
 	},
+	"toys.chastity": {
+		title: "a shipment of various chastity devices",
+		note: `Due to unusual market conditions, the price has reached a completely unacceptable price.`,
+		cost: 500000,
+		contains: [],
+		get requirements() { return (V.scenarios.contraceptivesBan !== 0); },
+		owned: "You are well stocked with chastity devices.",
+	},
 	"toys.buckets": {
 		title: "everything you need to force-feed slaves",
 		note: `Some supplies from the cafeteria and a slight adjustment to the feeder settings is all it would take.`,

src/gui/Encyclopedia/encyclopediaGuide.js

@@ -384,7 +384,7 @@ App.Encyclopedia.addArticle("Design Your Master", function() {
 		}
 		r.push("Your starting slaves will have free");
 		r.push(App.Encyclopedia.link("trust", "Trust", "trust careful"));
-		r.push("available. Strength requirements impart a hightened starting musculature. Starts having already mastered");
+		r.push("available. Strength requirements impart a heightened starting musculature. Starts having already mastered");
 		r.push(App.UI.DOM.combineNodes(App.Encyclopedia.link("Warfare", "PC Skills"), "."));
 		App.Events.addNode(ul, r, "li");
 

src/gui/options/options.js

-// cSpell:ignore SSAA
+// cSpell:ignore SSAA, Oobabooga
 
 App.UI.optionsPassage = function() {
 	const el = new DocumentFragment();
@@ -135,7 +135,8 @@ App.UI.optionsPassage = function() {
 		options.addOption("The Security Expansion mod is", "secExpEnabled")
 			.addValue("Enabled", 1).on()
 			.addValue("Disabled", 0).off()
-			.addComment("<div>The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late in the game.</div><span class='yellow'>After enabling mid-game please run re-run BC Update.</span>");
+			.addGlobalCallback(() => { App.Mods.SecExp.Obj.Init(); })
+			.addComment("<div>The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late in the game.");
 
 		option = options.addOption("Catmod is currently", "seeCats")
 			.addValue("Enabled", 1).on().addValue("Disabled", 0).off();
@@ -773,7 +774,7 @@ App.UI.optionsPassage = function() {
 
 		options.addOption("Experimental AI chat tab in slave interact is ", "aiChat")
 			.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
-			.addComment("This will enable a chat tab in slave interact. It uses an LLM OpenAPI endpoint of your choice. (DONT USE OPENAI, use Oobabooga, KoboldCPP, etc)");
+			.addComment("This will enable a chat tab in slave interact. It uses an LLM OpenAPI endpoint of your choice. (DON'T USE OPENAI, use Oobabooga, KoboldCPP, etc)");
 
 		if (V.aiChat === 1){
 			options.addOption("API URL", "aiChatUrl").showTextBox().addComment("The URL of the OpenAI-compatible, self-hosted endpoint.");
@@ -824,9 +825,21 @@ App.UI.optionsPassage = function() {
 			.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
 			.addComment("This will sort rule assistant output. You may benefit if you have a lot of rules, but only want to look out for a specific portion of it.");
 
-		options.addOption("Slave Fertility Cycles", "menstruation")
-			.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
-			.addComment("Adds slave fertility cycles. Slaves can only get pregnant on their fertile week. Fertility drugs can force slaves into a fertile week.");
+		options.addOption("Fertility Cycles", "menstruation")
+			.addValue("Enabled", 1).on()
+			.addValue("Disabled", 0, () => { V.menstruationKnown = 0; V.policies.contraceptivesBan = 0; }).off()
+			.addComment("Adds fertility cycles and menstruation. Pregnancy can only occur on a fertile week.");
+
+		if (V.menstruation) {
+			options.addOption("Fertility Cycle Awareness", "menstruationKnown")
+				.addValue("Always", 0).on().addValue("Discoverable", 1).on().addValue("Never", 2).off()
+				.addComment("Are fertility cycles known? Discoverable will make the fertility cycle known after a slave's period.");
+			/*
+			options.addOption("Pregnancy Awareness", "pregnancyKnown")
+				.addValue("Always", 0).on().addValue("Discoverable", 1).off()
+				.addComment("Is pregnancy immediately known?");
+			*/
+		}
 
 		options.addOption("Random slave events repeat control", "level", V.eventControl)
 			.addValue("No control", 0, () => V.eventControl.RIEPerWeek = Math.min(V.eventControl.RIEPerWeek, 3))
@@ -967,6 +980,9 @@ App.Intro.display = function(isIntro) {
 	options.addOption("Condense special slaves into their own tab", "useSlaveSummaryOverviewTab")
 		.addValue("Enabled", 1).on().addValue("Disabled", 0).off();
 
+	options.addOption("Main Menu category with all slaves", "useSlaveArcologyTab")
+		.addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+
 	options.addOption("Interactions with your fucktoys are", "fucktoyInteractionsPosition")
 		.addValueList([["next to them", 1], ["at page bottom", 0]]);
 
@@ -1188,6 +1204,26 @@ App.Intro.contentAndFlavor = function(isIntro) {
 		option.addComment("Will not affect existing precocious puberty cases already in-game.");
 	}
 
+	// move me exclusively here once cleared from experimental
+	if (isIntro) {
+		options.addOption("Menstrual cycles are currently", "menstruation")
+			.addValue("Enabled", 1).on()
+			.addValue("Disabled", 0, () => V.menstruationKnown = 0).off()
+			.addComment("Pregnancy can only occur on a fertile week. EXPERIMENTAL!");
+
+		if (V.menstruation) {
+			options.addOption("Slave menstrual cycles are", "menstruationKnown")
+				.addValue("Always known", 0).on().addValue("Trackable after discovery", 1).on().addValue("A mystery", 2).off()
+				.addComment("You are always aware of your own cycle. EXPERIMENTAL!");
+
+			/*
+			options.addOption("Pregnancy Awareness", "pregnancyKnown")
+				.addValue("Always", 0).on().addValue("Discoverable", 1).off()
+				.addComment("Is pregnancy immediately known?");
+			*/
+		}
+	}
+
 	options.addOption("Proportion of slave girls with exotic hair colors", "seeRandomHair")
 		.addValueList([
 			["None (0%)", 0],

src/gui/options/optionsGroup.js

@@ -451,7 +451,6 @@ App.UI.OptionsGroup = (function() {
 		constructor(comment) {
 			super();
 			this.comment = comment;
-			this.long = false;
 		}
 
 		/**
@@ -489,6 +488,116 @@ App.UI.OptionsGroup = (function() {
 		}
 	}
 
+	class SliderRow extends Row {
+		/**
+		 * Warning: Due to limitations to sliders this updates values in real time WITHOUT calling refresh.
+		 * The Caller has to implement their own submit functionality if required
+		 *
+		 * @param {string} description
+		 * @param {number} min Minimum allowed value
+		 * @param {number} max Maximum allowed value
+		 * @param {string} property
+		 * @param {object} object
+		 */
+		constructor(description, min, max, property, object) {
+			super();
+			this.description = description;
+			this.min = min;
+			this.max = max;
+			this.step = -1;
+			this.property = property;
+			this.object = object;
+
+			this.textbox = false;
+			/**
+			 * @type {null|Array<string>}
+			 */
+			this.endLabels = null;
+		}
+
+		/**
+		 * Set the step size (default = unlimited)
+		 * @param {number} step
+		 */
+		setStep(step) {
+			this.step = step;
+			return this;
+		}
+
+		/**
+		 * Show a textbox to allow manual inputs.
+		 */
+		addTextBox() {
+			this.textbox = true;
+			return this;
+		}
+
+		/**
+		 * Add Labels to the ends of the slider
+		 * @param {string} left
+		 * @param {string} right
+		 */
+		addEndLabels(left, right) {
+			this.endLabels = [left, right];
+			return this;
+		}
+
+		render(container, _) {
+			/* left side */
+			App.UI.DOM.appendNewElement("div", container, this.description, ["description"]);
+
+			/* right side */
+			const div = document.createElement("div");
+			div.classList.add("button-group", "slider-div");
+
+			if (this.endLabels !== null) {
+				App.UI.DOM.appendNewElement("span", div, this.endLabels[0]);
+			}
+
+			// Create slider first, so textbox can reference it
+			const slider = document.createElement("input");
+
+			let textbox = null;
+			if (this.textbox) {
+				// Create textbox, using reference to slider
+				textbox = App.UI.DOM.makeTextBox(this.object[this.property], input => {
+					// Run input through slider to ensure it's a valid value.
+					slider.value = String(input);
+					this.object[this.property] = parseFloat(slider.value);
+					textbox.value = this.object[this.property];
+				}, true);
+				textbox.classList.add("number");
+			}
+
+			// Finish of slider, using reference to textbox
+			slider.type = "range";
+			slider.step = (this.step <= 0) ? "any" : `${this.step}`;
+			slider.min = String(this.min);
+			slider.max = String(this.max);
+			slider.value = String(this.object[this.property]);
+
+			slider.oninput = () => {
+				this.object[this.property] = parseFloat(slider.value);
+				if (textbox !== null) {
+					textbox.value = this.object[this.property];
+				}
+			};
+
+			// Now append everything
+			div.append(slider);
+
+			if (this.endLabels !== null) {
+				App.UI.DOM.appendNewElement("span", div, this.endLabels[1]);
+			}
+
+			if (textbox !== null) {
+				div.append(textbox);
+			}
+
+			container.append(div);
+		}
+	}
+
 	return class OptionsGroup {
 		constructor() {
 			/**
@@ -567,6 +676,17 @@ App.UI.OptionsGroup = (function() {
 			return this._addRow(new CustomRow(element));
 		}
 
+		/**
+		 * @param {string} description
+		 * @param {number} min Minimum allowed value
+		 * @param {number} max Maximum allowed value
+		 * @param {string} property
+		 * @param {object} [object=V]
+		 */
+		addSlider(description, min, max, property, object = V) {
+			return this._addRow(new SliderRow(description, min, max, property, object));
+		}
+
 		/**
 		 * @returns {HTMLDivElement}
 		 */

src/gui/options/stableDiffusionInstallationGuide.js

@@ -111,7 +111,7 @@ Restart ComfyUI
 
 <h3>Setup FC for ComfyUI integration</h3>
 <p>Switch AI User Interface from A1111 to ComfyUI.</p>
-<p>Select your checkpoint model, sampling mathod, and scheduling method.</p>
+<p>Select your checkpoint model, sampling method, and scheduling method.</p>
 
 <h3>Confirm successful generation</h3>
 <p>If the preview image is not being generated and the preview is:</p>

src/gui/quicklinks.js

@@ -119,7 +119,6 @@ App.UI.quickMenu = (function() {
 		"Servants' Quarters": () => !App.Entity.facilities.servantsQuarters.established,
 		"Spa": () => !V.spa,
 		"The Black Market": () => V.rep < 10000,
-		"Weapons Manufacturing": () => true,
 	});
 
 	// show different names than the actual passage name, can be a function

src/interaction/main/mainLinks.js

@@ -114,9 +114,6 @@ App.UI.View.mainLinks = function() {
 				}
 				break;
 		}
-	}
-
-	if (V.PC.health.shortDamage < 30) {
 		const link = App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Change plans", "Personal Attention Select"), "major-link");
 		link.id = "managePA";
 		fragment.append(" ", link, " ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("Personal Attention Select"), "hotkey"));

src/interaction/siPhysicalRegimen.js

@@ -381,6 +381,9 @@ App.UI.SlaveInteract.physicalRegimen = function(slave, refresh) {
 				note += `${He} has been sterilized`;
 			} else if (slave.preg < -1) {
 				note += `${He} is sterile`;
+			} else if (V.menstruation && !fertKnown(slave) && slave.pubertyXX === 1 && slave.physicalAge <= V.fertilityAge) {
+				// First ovulation
+				note += `${He} is not yet fertile`;
 			} else if (slave.pubertyXX === 0 && slave.preg < 1) {
 				note += `${He} is not yet fertile`;
 			} else if (slave.ovaryAge >= 47 && slave.preg < 1) {
@@ -415,7 +418,11 @@ App.UI.SlaveInteract.physicalRegimen = function(slave, refresh) {
 					fertility = "using contraceptives";
 				} else if (slave.pregWeek < 0) {
 					fertility = "postpartum";
-				} else if (V.menstruation === 1 && slave.fertPeak > 0 && slave.preg === 0) {
+				} else if (V.menstruation === 1 && V.menstruationKnown === 1 && slave.fertLate < 0 && !slave.pregKnown) {
+					// use me once false contraceptives are added for .pregKnown
+					// fertility = "may be pregnant";
+					fertility = "late";
+				} else if (V.menstruation === 1 && V.menstruationKnown !== 2 && slave.fertPeak > 0 && slave.preg === 0) {
 					fertility = "safe";
 				} else if (slave.preg === 0) {
 					fertility = "fertile";
@@ -432,7 +439,7 @@ App.UI.SlaveInteract.physicalRegimen = function(slave, refresh) {
 				fertility += ". ";
 				App.UI.DOM.appendNewElement("span", fertilityBlock, fertility, "bold");
 
-				if (slave.preg === 0) {
+				if (slave.preg === 0 && V.policies.contraceptivesBan === 0) {
 					linkArray.push(App.UI.DOM.link(
 						`Use contraceptives`,
 						() => {
@@ -500,6 +507,9 @@ App.UI.SlaveInteract.physicalRegimen = function(slave, refresh) {
 						[],
 						"Abort"
 					));
+					if (V.scenarios.contraceptivesBan) {
+						note += `Will cost ${(cashFormat(50000))}`;
+					}
 				}
 			}
 			App.UI.DOM.appendNewElement("span", fertilityBlock, note, "note");