js/artInfrastructure.js

@@ -31,6 +31,7 @@ App.Art.cacheArtData = function() {
 
 	App.Data.Art.Vector = makeCache(document.querySelectorAll('[tags="Twine.image"][name^="Art_Vector"]:not([name^="Art_Vector_Revamp"])'));
 	App.Data.Art.VectorRevamp = makeCache(document.querySelectorAll('[tags="Twine.image"][name^="Art_Vector_Revamp"]'));
+	App.Data.Art.OtherSVG = makeCache(document.querySelectorAll('[tags="Twine.image"][name="world"]'));
 };
 
 App.Art.URLIDMatcher = /url\(#(.*)\)/g;

js/countries.js

+// The smaller, the more global
+App.Data.World.TravelFrictionExponent = -0.6;
+// The smaller, the more are large nationalities downscaled
+App.Data.World.PopScaleFactor = 23;
+
+/**
+ * @typedef {Record<number, number>} gridPoint
+ * Not intended for manual handling, use one of the functions below to get the data behind it.
+ *
+ * If gridPoint[0] >= 0: Point in the world data grids. (X, Y)
+ * Otherwise           : Encodes a small territory
+ */
+
+/**
+ * @returns {Generator<gridPoint, void, *>}
+ */
+App.Data.World.gridPoints = function*() {
+	for (let x = 0; x < App.Data.World.GridDimensions.width; x++) {
+		for (let y = 0; y < App.Data.World.GridDimensions.height; y++) {
+			yield [x, y];
+		}
+	}
+	for (let i = 0; i < App.Data.World.SmallTerritories.length; i++) {
+		yield [-1, i];
+	}
+};
+
+/**
+ * Turn a grid cell into a global coordinate.
+ * @param {gridPoint} p
+ * @returns {[number, number]} Latitude, Longitude
+ */
+App.Data.World.gridPointToCoordinate = function(p) {
+	if (p[0] === -1) {
+		const st = App.Data.World.SmallTerritories[p[1]];
+		return [st[2], st[3]];
+	}
+
+	const width = App.Data.World.GridDimensions.width;
+	const height = App.Data.World.GridDimensions.height;
+
+	const lon = p[0] / App.Data.World.GridDimensions.width * 360 - 180;
+	const lat = p[1] / App.Data.World.GridDimensions.height * -180 + 90;
+
+	const lonCell = 360 / width;
+	const latCell = 180 / height;
+
+	return [lat - latCell / 2, lon + lonCell / 2];
+};
+
+/**
+ * Return the grid cell that encloses the given coordinates
+ * @param {number} lat
+ * @param {number} lon
+ * @returns {gridPoint}
+ */
+App.Data.World.coordinateToGridPoint = function(lat, lon) {
+	const width = App.Data.World.GridDimensions.width;
+	const height = App.Data.World.GridDimensions.height;
+
+	const lonCell = 360 / width;
+	const latCell = 180 / height;
+
+	const x = Math.floor((lon + 180) / lonCell);
+	const y = Math.floor((-lat + 90) / latCell);
+
+	return [x, y];
+};
+
+/**
+ * @param {gridPoint} p
+ * @returns {number}
+ */
+App.Data.World.populationAt = function(p) {
+	if (p[0] === -1) {
+		const st = App.Data.World.SmallTerritories[p[1]];
+		return st[1];
+	}
+	return App.Data.World.PopGrid[p[1]][p[0]];
+};
+
+/**
+ * @param {gridPoint} p
+ * @returns {number}
+ */
+App.Data.World.nationIdAt = function(p) {
+	if (p[0] === -1) {
+		const st = App.Data.World.SmallTerritories[p[1]];
+		return st[0];
+	}
+	return App.Data.World.NationGrid[p[1]][p[0]];
+};
+
+/**
+ * @param {gridPoint} p
+ * @returns {string}
+ */
+App.Data.World.nationAt = function(p) {
+	const nationId = App.Data.World.nationIdAt(p);
+	return App.Data.World.Nations[nationId] || "Stateless";
+};

js/dynamicJSLoading.js

@@ -23,7 +23,7 @@ App.Loader = (function() {
 	 * To make sure the scripts are loaded series, keep a queue of scripts to be loaded and only load the next once the
 	 * previous one is finished.
 	 *
-	 * @see nextScript
+	 * see {@link nextScript}
 	 *
 	 * @type {Array<()=>void>}
 	 */

js/rulesAssistant/conditionEditorSimple.js

@@ -100,7 +100,7 @@ App.RA.Activation.SimpleEditor = (function() {
 		// add bool
 		if (currentRule.activeRuleType === "boolean") {
 			const boolDiv = document.createElement("div");
-			boolDiv.classList.add("button-group");
+			boolDiv.classList.add("condition-row", "button-group");
 			outerDiv.append(boolDiv);
 			/**
 			 * @type {selectOption[]}
@@ -128,6 +128,7 @@ App.RA.Activation.SimpleEditor = (function() {
 			};
 		} else if (currentRule.activeRuleType === "number") {
 			const numberDiv = document.createElement("div");
+			numberDiv.classList.add("condition-row");
 			outerDiv.append(numberDiv);
 			/**
 			 * @type {selectOption[]}
@@ -172,6 +173,7 @@ App.RA.Activation.SimpleEditor = (function() {
 			}
 		} else if (currentRule.activeRuleType === "string") {
 			const stringDiv = document.createElement("div");
+			stringDiv.classList.add("condition-row");
 			outerDiv.append(stringDiv);
 			/**
 			 * @type {selectOption[]}
@@ -215,8 +217,12 @@ App.RA.Activation.SimpleEditor = (function() {
 		}
 
 		// Assignments
-		outerDiv.append("Assignments: ");
-		outerDiv.append(App.UI.DOM.makeSelect(
+		const assignmentDiv = document.createElement("div");
+		outerDiv.append(assignmentDiv);
+
+		assignmentDiv.append("Assignments: ");
+		assignmentDiv.classList.add("condition-assignment");
+		assignmentDiv.append(App.UI.DOM.makeSelect(
 			[{key: "ignore", name: "Ignored"}, {key: "include", name: "Include"}, {key: "exclude", name: "Exclude"}],
 			currentRule.assignmentMode, key => {
 				currentRule.assignmentMode = key;
@@ -224,6 +230,8 @@ App.RA.Activation.SimpleEditor = (function() {
 			}
 		));
 		if (currentRule.assignmentMode !== "ignore") {
+			const div = document.createElement("div");
+			div.classList.add("condition-assignment-grid");
 			for (const [key, getter] of App.RA.Activation.getterManager.assignmentGetters) {
 				if (getter.enabled && !getter.enabled()) {
 					continue;
@@ -239,8 +247,16 @@ App.RA.Activation.SimpleEditor = (function() {
 						currentRule.assignments.splice(index, 1);
 					}
 				};
-				outerDiv.append(` ${getter.name}: `, checkbox);
+				const span = document.createElement("span");
+
+				const innerSpan = document.createElement("span");
+				innerSpan.append(` ${getter.name}`);
+				innerSpan.onclick = () => checkbox.click();
+				span.append(checkbox, innerSpan);
+
+				div.append(span);
 			}
+			assignmentDiv.append(div);
 		}
 
 		return outerDiv;

js/rulesAssistant/conditionEvaluation.js

@@ -390,7 +390,7 @@ App.RA.Activation.populateGetters = function() {
 		val: c => c.slave.assignment === Job.MADAM
 	});
 	gm.addAssignment("brothel", {
-		name: "Brothel whoring?", description: "Working in the brothel.",
+		name: "Brothel whoring", description: "Working in the brothel.",
 		requirements: "Brothel is built.", enabled: ()=>App.Entity.facilities.brothel.established,
 		val: c => c.slave.assignment === Job.BROTHEL
 	});
@@ -400,7 +400,7 @@ App.RA.Activation.populateGetters = function() {
 		val: c => c.slave.assignment === Job.WARDEN
 	});
 	gm.addAssignment("cellblock", {
-		name: "Confined in cellblock?", description: "Confined in the cellblock.",
+		name: "Confined in cellblock", description: "Confined in the cellblock.",
 		requirements: "Cellblock is built.", enabled: ()=>App.Entity.facilities.cellblock.established,
 		val: c => c.slave.assignment === Job.CELLBLOCK
 	});

js/rulesAssistant/z1-conditionEditorController.js

@@ -27,6 +27,7 @@ App.RA.Activation.Editor = (function() {
 		advanced = args.advancedMode;
 		let editorNode = document.createElement("div");
 		let switchNode = document.createElement("div");
+		switchNode.classList.add("condition-switch");
 		outerNode.append(switchNode);
 		if (advanced) {
 			switchNode.append(App.UI.DOM.link("Reset to simple mode", () => {
@@ -57,7 +58,7 @@ App.RA.Activation.Editor = (function() {
 			}));
 			App.RA.Activation.SimpleEditor.build(args.activation, editorNode);
 		}
-		switchNode.append(" / ", App.Encyclopedia.link("Help", "RA Condition Editor"));
+		switchNode.append(" | ", App.Encyclopedia.link("Help", "RA Condition Editor"));
 		outerNode.append(editorNode);
 	}
 

js/utils.js

 /* eslint no-unused-vars: [2, { "vars": "local" }] */
-// cSpell:ignore yxxx
+// cSpell:ignore yxxx, ØSTER
 
 /* This file contains only JS functions without dependencies on FC specific variables/conventions and do not rely on
  * custom functions outside this file

src/002-config/fc-version.js

@@ -4,11 +4,11 @@ App.Version = {
 	commitHash: null,
 	/**
 	 * @type {number} used for patching via BC
-	 * @see App.Patch.applyAll
+	 * See {@link App.Patch.applyAll}
 	 *
 	 * When you get to release 2000, use 2001 instead.
 	 * The release numbers got messed up, this is corrected in `src/js/eventHandlers.js` and `/src/data/patches/patch.js`.
 	 * The two line above and this line should be safe to remove after release 2001.
 	 */
-	release: 1279,
+	release: 1280,
 };

src/004-base/arcologyBuilding.js

@@ -176,9 +176,9 @@ App.Arcology.Cell.BaseCell = class extends App.Entity.Serializable {
 					span.append(App.Arcology.getCellLink("Sell", that.name, () => that.cellPassage(containingBuilding),
 						() => {
 							cashX(price(false), "capEx");
-							App.Arcology.updateOwnership();
 							A.demandFactor -= DEMAND_FACTOR_DIFF;
 							cell.owner = 0;
+							App.Arcology.updateOwnership();
 						}));
 					fragment.append(" ", span);
 				}
@@ -192,8 +192,8 @@ App.Arcology.Cell.BaseCell = class extends App.Entity.Serializable {
 						() => {
 							cashX(-(price(true) + 10000), "capEx");
 							A.demandFactor += DEMAND_FACTOR_DIFF;
-							App.Arcology.updateOwnership();
 							cell.owner = 1;
+							App.Arcology.updateOwnership();
 						}));
 					fragment.append(" ", buySpan);
 
@@ -207,8 +207,8 @@ App.Arcology.Cell.BaseCell = class extends App.Entity.Serializable {
 								() => {
 									repX(-(repPrice), "capEx");
 									A.demandFactor += DEMAND_FACTOR_DIFF;
-									App.Arcology.updateOwnership();
 									cell.owner = 1;
+									App.Arcology.updateOwnership();
 								}));
 						fragment.append(repDiv);
 					}

src/005-passages/facilitiesPassages.js

@@ -29,8 +29,8 @@ new App.DomPassage("Servants' Quarters", () => { return new App.Facilities.Serva
 
 new App.DomPassage("Spa", () => { return new App.Facilities.Spa.spa().render(); }, ["jump-to-safe", "jump-from-safe"]);
 
-new App.DomPassage("Transport Hub", () => { return App.Mods.SecExp.transportHub.GUI(); });
-new App.DomPassage("Weapons Manufacturing", () => { return App.Mods.SecExp.weapManu.GUI(); }, ["jump-to-safe", "jump-from-safe"]);
+new App.DomPassage("Transport Hub", () => { return App.Mods.SecExp.transportHub.GUI(); }, ["jump-to-safe", "jump-hidden", "jump-from-safe"]);
+new App.DomPassage("Weapons Manufacturing", () => { return App.Mods.SecExp.weapManu.GUI(); }, ["jump-to-safe", "jump-hidden", "jump-from-safe"]);
 new App.DomPassage("securityHQ", () => { return App.Mods.SecExp.secHub.GUI(); }, ["jump-to-safe", "jump-from-safe"]);
 new App.DomPassage("secBarracks", () => { return App.Mods.SecExp.barracks.GUI(); }, ["jump-to-safe", "jump-from-safe"]);
 new App.DomPassage("riotControlCenter", () => { return App.Mods.SecExp.riotCenter.GUI(); }, ["jump-to-safe", "jump-from-safe"]);
@@ -225,9 +225,12 @@ new App.DomPassage("Matron Select",
 
 new App.DomPassage("Rules Assistant",
 	() => {
-		const div = document.createElement("div");
-		App.RA.options(div);
-		return div;
+		V.nextButton = "Back to Main";
+		V.nextLink = "Main";
+		V.returnTo = "Main";
+		App.UI.StoryCaption.encyclopedia = "Rules Assistant";
+
+		return App.RA.options();
 	}, ["jump-to-safe", "jump-from-safe"]
 );
 

src/005-passages/interactPassages.js

@@ -33,17 +33,17 @@ new App.DomPassage(
 	"Husk Slave Swap Workaround",
 	() => {
 		V.nextButton = "Abort Operation";
-		if (!V.temp.activeSlave) {
-			throw new Error(`V.temp.activeSlave is not set`);
+		if (!V.temp.husk) {
+			throw new Error(`V.temp.husk is not set`);
 		}
-		if (V.temp.activeSlave.tankBaby !== 3) {
+		if (V.temp.husk.tankBaby !== 3) {
 			V.nextLink = "Scheduled Event";
 			V.returnTo = "Scheduled Event";
 		} else {
 			V.nextLink = "Main";
 			V.returnTo = "Incubator";
 		}
-		return huskSwapSelection(V.temp.activeSlave);
+		return huskSwapSelection(V.temp.husk);
 	}
 );
 

src/Mods/SecExp/js/secExpObject.js

@@ -421,6 +421,10 @@ App.Mods.SecExp.Obj = (function() {
 			V.SecExp = {};
 			return;
 		}
+		// if `V.SecExp` already has keys we return because there is no work to do
+		if (Object.values(V.SecExp).length > 0) {
+			return;
+		}
 		V.SecExp = {
 			war: {},
 			battles: {

src/Mods/SpecialForce/upgrades/SpecialForceUpgradeText.js

@@ -222,9 +222,9 @@ App.Mods.SF.UnitText = function(input) {
 					barracks = `The majority of weapons, armor, and ammunition have been separated from the soldiers' cots into their own armory.`;
 					garage = `A section near the outer wall of the arcology has been converted to a garage with an adjoining vehicle maintenance bay`;
 					drone = `.`;
-				}
-				if (V.terrain === "oceanic") {
-					garage += ` for inter-arcology travel`;
+					if (V.terrain === "oceanic") {
+						garage += ` for inter-arcology travel`;
+					}
 				}
 				if (S.Firebase >= 2) {
 					barracks = `A barracks has been constructed near the armory, allowing soldiers a quieter place to sleep and store their personal spoils.`;

src/arcologyBuilding/penthouse.js

@@ -69,7 +69,7 @@ App.Arcology.Cell.Penthouse = class extends App.Arcology.Cell.BaseCell {
 					(tankSlaveCount() + FetusGlobalReserveCount("incubator")), "empty tank")})`;
 
 				if (App.Facilities.Incubator.readySlaves() > 0) {
-					wrapper.append(createFacilityDiv(link, App.UI.DOM.combineNodes(desc, App.UI.DOM.makeElement("span", "[!]", ["noteworthy"]))));
+					wrapper.append(createFacilityDiv(link, App.UI.DOM.combineNodes(desc, App.UI.DOM.makeElement("span", "\uf06a", ["noteworthy", "icons"]))));
 				} else {
 					wrapper.append(createFacilityDiv(link, desc));
 				}

src/art/artJS.js

-/** <<SlaveArt>> SugarCube macro. For parameter details, @see App.Art.SlaveArtElement */
+/** <<SlaveArt>> SugarCube macro. For parameter details see {@link App.Art.SlaveArtElement} */
 Macro.add("SlaveArt", {
 	handler() {
 		if (typeof (this.args[0]) === "string") {
@@ -183,6 +183,7 @@ App.Art.SlaveArtElement = function(slave, artSize, UIDisplay, isEventImage = nul
 
 /**
  * Add art-pack specific css, needs to be updated when options change
+ * @param newState
  */
 App.Art.setDynamicCSS = function(newState) {
 	if (newState.imageChoice === 4) { /* Elohiem's Webgl */
@@ -546,7 +547,6 @@ App.Art.aiArtElement = function(slave, imageSize, isEventImage = null) {
 				const lightboxBackground = App.UI.DOM.appendNewElement('div', lightbox, null, ['lightbox-background']);
 				lightboxBackground.addEventListener('click', (ev) => {
 					if (ev.target === lightboxBackground) {
-						console.log('background clicked');
 						lightbox.remove();
 						document.removeEventListener('keydown', keys);
 					}
@@ -599,7 +599,7 @@ App.Art.aiArtElement = function(slave, imageSize, isEventImage = null) {
 
 	// Loading spinner
 	// eslint-disable-next-line no-unused-vars
-	spinner = App.UI.DOM.appendNewElement('div', container, '⟳', ['spinner']);
+	spinner = App.UI.DOM.appendNewElement('div', container, '⟳', ['ai-spinner']);
 
 
 	const reactiveSpecific = {
@@ -644,7 +644,11 @@ App.Art.aiArtElement = function(slave, imageSize, isEventImage = null) {
 						progress.style.setProperty("--progress", progressNum * 100 + "%");
 					}
 				})
-				.then((imageData) => {
+				.then((/** @type {(App.Art.GenAI.EventStore.Entry & { data: App.Art.GenAI.EventStore.OverviewData} | undefined)} */ imageData) => {
+					if (!imageData) {
+						return;
+					}
+
 					reactiveSpecific.setImage(imageData?.data?.images?.lowRes, imageData?.id?.toString() || `unknownId-${Math.random()}`);
 				})
 				.catch(e => console.error("Unexpected refresh error", e))

src/art/genAI/ponyPrompts/demographicsPromptPart.js

@@ -16,8 +16,10 @@ App.Art.GenAI.DemographicsPromptPart = class DemographicsPromptPart extends App.
 		}
 
 		if (this.isFeminine) {
-			if ((slave?.visualAge < 18) && !V.aiAgeFilter) {
-				parts.push(height + 'young girl, loli');
+			if ((slave?.visualAge < 16) && !V.aiAgeFilter) {
+				parts.push(height + 'young girl', 'loli');
+			} else if ((slave?.visualAge < 18) && !V.aiAgeFilter) {
+				parts.push(height + 'young woman', 'teenager');
 			} else if (slave?.visualAge <= 20) {
 				parts.push(height + 'young woman');
 			} else if (slave?.visualAge <= 40) {
@@ -34,8 +36,10 @@ App.Art.GenAI.DemographicsPromptPart = class DemographicsPromptPart extends App.
 				parts.push("catgirl");
 			}
 		} else if (this.isMasculine) {
-			if ((slave?.visualAge < 18) && !V.aiAgeFilter) {
+			if ((slave?.visualAge < 16) && !V.aiAgeFilter) {
 				parts.push(height + 'young boy', 'shota');
+			} else if ((slave?.visualAge < 18) && !V.aiAgeFilter) {
+				parts.push(height + 'young man', 'teenager');
 			} else if (slave?.visualAge <= 20) {
 				parts.push(height + 'young man');
 			} else if (slave?.visualAge <= 40) {
@@ -65,10 +69,6 @@ App.Art.GenAI.DemographicsPromptPart = class DemographicsPromptPart extends App.
 			parts.push('elderly');
 		}
 
-		if (this.censored) {
-			parts.push('teenager');
-		}
-
 		if ((slave?.visualAge < 10) && !V.aiAgeFilter) {
 			parts.push('kid');
 		} else if ((slave?.visualAge < 6) && !V.aiAgeFilter) {
@@ -95,15 +95,15 @@ App.Art.GenAI.DemographicsPromptPart = class DemographicsPromptPart extends App.
 			breastShape += this.helper.isPony() ? 'flat chested' : 'flat chest'; // Pony uses a slightly different tag
 		} else if (slave?.boobs < 400) {
 			breastShape += 'tiny ';
-		} else if (slave?.boobs < 500) {
+		} else if (slave?.boobs < 500 || this.censored) {
 			breastShape += 'small ';
-		} else if (slave?.boobs < 650 || (this.slave.visualAge < 6 && !this.censored)) {
+		} else if (slave?.boobs < 650 || this.slave.visualAge < 6) {
 			breastShape += 'medium ';
-		} else if (slave?.boobs < 800 || (this.slave.visualAge < 10 && !this.censored)) {
+		} else if (slave?.boobs < 800 || this.slave.visualAge < 10) {
 			breastShape += 'large ';
-		} else if (slave?.boobs < 1000 || (!this.censored)) {
+		} else if (slave?.boobs < 1000 || this.slave.visualAge < 18) {
 			breastShape += 'huge ';
-		} else if (slave?.boobs < 1400) {
+		} else {//if (slave?.boobs < 1400) {
 			breastShape += 'giant breasts, huge ';
 		}
 
@@ -147,7 +147,7 @@ App.Art.GenAI.DemographicsPromptPart = class DemographicsPromptPart extends App.
 			}
 		}
 
-		parts.push(breastShape += clothingBreastParts.join(', '));
+		parts.push(breastShape + clothingBreastParts.join(', '));
 
 		// display nipple if uncovered, or covered nipples if large
 		// nipple piercings also handled here

src/art/genAI/prompts/clothesPromptPart.js

@@ -402,6 +402,10 @@ App.Art.GenAI.ClothesPromptPart = class ClothesPromptPart extends App.Art.GenAI.
 			"positive": "military uniform, shirt, necktie, skirt",
 			"negative": "jeans, shorts, pussy, nipples",
 		},
+		"a red army uniform": { // not red army, but soviet is at least close
+			"positive": "soviet uniform, military uniform, shirt, necktie, skirt",
+			"negative": "jeans, shorts, pussy, nipples",
+		},
 		"battledress": {
 			"positive": "military fatigues, camouflage pants, tank top",
 			"negative": "shorts, pussy, nipples",
@@ -693,6 +697,7 @@ App.Art.GenAI.ClothesPromptPart = class ClothesPromptPart extends App.Art.GenAI.
 	getClothes() {
 		let clothes = this.slave.clothes;
 		if (!this.clothesPrompts.hasOwnProperty(clothes) && !V.customClothesPrompts.hasOwnProperty(clothes)) {
+			console.error("AI Art: Missing clothing:", clothes);
 			clothes = "no clothing";
 		}
 		if (this.slave.race === "catgirl") {

src/art/genAI/prompts/eyePromptPart.js

@@ -47,7 +47,7 @@ App.Art.GenAI.EyePromptPart = class EyePromptPart extends App.Art.GenAI.PromptPa
 		if (this.slave.eyewear === "corrective glasses" || this.slave.eyewear === "blurring glasses" || this.slave.eyewear === "glasses"){
 			positive.push(`glasses`);
 		}
-		return positive.join(`, `);
+		return positive.filter(p => !!p).join(`, `);
 	}
 
 	/**

src/art/genAI/prompts/skinPromptPart.js

@@ -3,62 +3,82 @@ App.Art.GenAI.SkinPromptPart = class SkinPromptPart extends App.Art.GenAI.Prompt
 	 * @override
 	 */
 	positive() {
+		let skinDesc = "";
+
+		// Albinism takes full priority
 		if (this.slave.geneticQuirks.albinism === 2) {
-			return "albino";
+			skinDesc = "albino";
+		// Furry races override standard skin
+		} else if (this.slave.race === "catgirl") {
+			skinDesc = `covered in ${this.slave.skin} fur`;
+		// Otherwise, determine based on skin tone
+		} else {
+			switch (this.slave.skin) {
+				case "pure white":
+				case "ivory":
+				case "white":
+				case "extremely fair":
+					skinDesc = "white skin";
+					break;
+				case "extremely pale":
+				case "very pale":
+				case "pale":
+				case "light beige":
+				case "very fair":
+					skinDesc = this.helper.isIll() ? "fair skin" : "pale skin";
+					break;
+				case "fair":
+				case "light":
+				case "beige":
+					skinDesc = "fair skin";
+					break;
+				case "light olive":
+				case "sun tanned":
+				case "spray tanned":
+				case "tan":
+					skinDesc = "tan skin";
+					break;
+				case "olive":
+				case "bronze":
+				case "dark beige":
+					skinDesc = this.helper.isXLOrPony() ? "olive skin" : "tan skin";
+					break;
+				case "dark olive":
+				case "light brown":
+				case "brown":
+					skinDesc = this.helper.isXLBased() ? "brown skin" : "tan skin";
+					break;
+				case "dark":
+				case "dark brown":
+				case "black":
+				case "ebony":
+					skinDesc = this.helper.lora("melanin", 0.8, ", melanin, ") + "dark skin";
+					break;
+				case "pure black":
+					skinDesc = this.helper.lora("melanin", 1, ", melanin, ") + "black skin";
+					break;
+				default:
+					skinDesc = `${this.slave.skin} skin`;
+			}
 		}
 
-		if (this.slave.race === "catgirl") {
-			return `covered in ${this.slave.skin} fur`;
+		// ─── MARKINGS ───
+		const marking = this.slave.markings?.toLowerCase?.();
+		if (marking && marking !== "none") {
+			if (marking === "beauty mark") {
+				skinDesc += ", a small beauty mark";
+			} else if (marking === "birthmark") {
+				skinDesc += ", a subtle birthmark";
+			} else if (marking === "freckles") {
+				skinDesc += ", light freckles across her skin";
+			} else if (marking === "heavily freckled") {
+				skinDesc += ", heavily freckled skin";
+			} else {
+				skinDesc += `, with body markings: ${marking}`;
+			}
 		}
 
-		switch (this.slave.skin) {
-			case "pure white":
-			case "ivory":
-			case "white":
-			case "extremely fair":
-				return "white skin";
-			case "extremely pale":
-			case "very pale":
-			case "pale":
-			case "light beige":
-			case "very fair":
-				if (this.helper.isIll()) {
-					return "fair skin"; // pale skin makes the skin almost pure white
-				}
-				return "pale skin";
-			case "fair":
-			case "light":
-			case "beige":
-				return "fair skin";
-			case "light olive":
-			case "sun tanned":
-			case "spray tanned":
-			case "tan":
-				return "tan skin";
-			case "olive":
-			case "bronze":
-			case "dark beige":
-				if (this.helper.isXLOrPony()) {
-					return "olive skin";
-				}
-				return "tan skin";
-			case "dark olive":
-			case "light brown":
-			case "brown":
-				if (this.helper.isXLBased()) {
-					return "brown skin";
-				}
-				return "tan skin";
-			case "dark":
-			case "dark brown":
-			case "black":
-			case "ebony":
-				return this.helper.lora("melanin", .8, ", melanin, ") + "dark skin";
-			case "pure black":
-				return this.helper.lora("melanin", 1, ", melanin, ") + "black skin";
-			default:
-				return `${this.slave.skin} skin`;
-		}
+		return skinDesc;
 	}
 
 	/**
@@ -105,7 +125,6 @@ App.Art.GenAI.SkinPromptPart = class SkinPromptPart extends App.Art.GenAI.Prompt
 		}
 	}
 
-
 	/**
 	 * @override
 	 */
@@ -113,4 +132,3 @@ App.Art.GenAI.SkinPromptPart = class SkinPromptPart extends App.Art.GenAI.Prompt
 		return this.positive();
 	}
 };
-