.vscode/extensions.json

@@ -13,6 +13,7 @@
         "esbenp.prettier-vscode",
         "gruntfuggly.todo-tree",
         "wayou.vscode-todo-highlight",
-        "cyrusfirheir.twee3-language-tools"
+        "cyrusfirheir.twee3-language-tools",
+        "gitlab.gitlab-workflow"
     ]
 }
\ No newline at end of file

CONTRIBUTING.md

@@ -28,7 +28,7 @@ These tools are not required, but are suggested and will make working on FC easi
 4. Follow the install steps until you get to the `Welcome to FC development!...` menu and then select `Exit`
 5. Open the directory in your preferred editor/IDE
 
-**Make sure you have ESLint, TypeScript, and spell checking (preferably with cSpell compatiblity) support installed and enabled (if avaliable) in your preferred editor/IDE to catch formatting, type def, and spelling errors**
+**Make sure you have ESLint, TypeScript, and spell checking (preferably with cSpell compatibility) support installed and enabled (if available) in your preferred editor/IDE to catch formatting, type def, and spelling errors**
 
 <details><summary>Recommended editor/IDE plugins/extensions</summary>
 

build.config.json

@@ -16,6 +16,7 @@
 			"css": ["src/**/*.css"],
 			"twee": ["src/**/*.tw"],
 			"media": [
+				"src/art/map",
 				"src/art/vector/layers/",
 				"src/art/vector_revamp/layers/"
 			]

cspell.json

@@ -17,6 +17,7 @@
         "devTools/minify",
         "devTools/tweeGo",
         "devTools/types/tippy",
+        "js/001-lib/idb.js",
         "js/003-data/arcologyNames.js",
         "js/003-data/miscDataNames.js",
         "js/003-data/poses.js",
@@ -33,6 +34,7 @@
         "src/npc/databases/dSlavesDatabase.js",
         "src/npc/databases/ddSlavesDatabase.js",
         "src/npc/databases/cheatmodeDatabase.js",
+        "submodules",
         "*.min.js",
         "*.json",
         "*.svg",
@@ -221,6 +223,7 @@
         "fanbase",
         "façade",
         "fcfa",
+        "fchost",
         "fcnn",
         "fctv",
         "felidae",
@@ -337,6 +340,7 @@
         "preggos",
         "pregmod",
         "prereqs",
+        "prising",
         "progeria",
         "pudge",
         "qipao",
@@ -421,4 +425,4 @@
         "xochiquetzal",
         "école"
     ]
-}
+}
\ No newline at end of file

css/art/genAI.css

@@ -49,7 +49,7 @@
     transition: opacity 300ms ease-in-out;
 }
 
-.spinner {
+.ai-spinner {
     display: none;
     position: absolute;
     top: 50%;
@@ -83,7 +83,7 @@
     object-fit: contain;
 }
 
-.ai-art-container.refreshing .spinner {
+.ai-art-container.refreshing .ai-spinner {
     display: block;
 }
 
@@ -164,3 +164,44 @@
         transform: translate(-50%, -50%) rotate(360deg);
     }
 }
+
+.ai-queue-overlay {
+    position: fixed;
+    right: 0;
+    bottom: 0;
+    background-color: #1a1a1a;
+    border-left: #333 2px solid;
+    border-top: #333 2px solid;
+    border-top-left-radius: 1em;
+    padding: 0.5em;
+
+}
+
+.ai-queue-overlay.hidden {
+    display: none;
+}
+
+.ai-queue-overlay .spinner {
+    display: inline-block;
+    width: 2.3em;
+}
+
+.ai-queue-overlay .spinner::after {
+    font-family: 'sc-icons';
+    content: "\f110";
+    position: absolute;
+    top: 50%;
+    left: 0.9em;
+    font-size: 25px;
+    animation: spin 3s linear infinite;
+}
+
+.ai-queue-overlay button {
+    font-family: 'sc-icons';
+    background-color: var(--button-color);
+    border: solid 2px var(--button-border-color);
+}
+
+.ai-queue-overlay button:hover {
+    background-color: var(--button-hover-color);
+}

css/general/textColors.css

@@ -131,7 +131,7 @@
 
 /* generally between red and green, and a lot of other places */
 .orange, .orange a, .stupid, .stupid a, .change.negative, .change.negative a, .defiant.careful, .defiant.careful a,
-.ncs, .ncs a, .miscarriage, .miscarriage a, .hindrance.mid, .intro.question {
+.ncs, .ncs a, .miscarriage, .miscarriage a, .period, .period a, .hindrance.mid, .intro.question {
 	color: orange
 }
 

css/gui/options.css

@@ -122,6 +122,29 @@ div.options-group input.full-width {
 	}
 }
 
+/* slider */
+/* very static styling, won't work well on very small screens */
+.slider-div {
+	display: flex;
+	gap: 1em;
+}
+
+.slider-div input[type="range"] {
+	width: 50%;
+	min-width: 12em;
+}
+
+.slider-div span {
+	width: 100%;
+	max-width: 8em;
+	align-self: center;
+}
+
+.slider-div span:first-child {
+	text-align: end;
+}
+
+
 /* other */
 .subHeading {
 	width: 85%;

css/intro/customizeSlaveTrade.css

@@ -25,40 +25,42 @@
 }
 
 
-.plus-button {
+button.plus-button {
     background: rgba(0, 139, 0, 0.2);
     border-color: rgba(0, 139, 0, 0.3);
 }
 
-.minus-button {
+button.minus-button {
     background: rgba(184, 0, 0, 0.2);
     border-color: rgba(184, 0, 0, 0.3);
 }
 
-.zero-button {
+button.zero-button {
     background: rgba(0, 0, 255, 0.2);
     border-color: rgba(0, 0, 255, 0.3);
 }
-.set-button {
+
+button.set-button {
     background: rgba(255, 210, 0, 0.2);
     border-color: rgba(255, 210, 0, 0.3);
 }
 
-.plus-button:hover {
+button.plus-button:hover {
     background: rgba(0, 139, 0, 0.4);
     border-color: rgba(0, 139, 0, 0.3);
 }
 
-.minus-button:hover {
+button.minus-button:hover {
     background: rgba(184, 0, 0, 0.4);
     border-color: rgba(184, 0, 0, 0.3);
 }
 
-.zero-button:hover {
+button.zero-button:hover {
     background: rgba(0, 0, 255, 0.4);
     border-color: rgba(0, 0, 255, 0.3);
 }
-.set-button:hover {
+
+button.set-button:hover {
     background: rgba(255, 210, 0, 0.4);
     border-color: rgba(255, 210, 0, 0.3);
 }

devTools/dictionaries/misc.txt

@@ -4,6 +4,7 @@ mcmonkeyprojects
 orthodontal
 rgthree
 SDXL
+Svornost
 swinir
 unapprovingly
 uncircumcise

devTools/types/FC/gameState.d.ts

@@ -170,6 +170,9 @@ declare namespace FC {
 		careerBonusNeeded?: HumanID[];
 
 		customLanguage?: string;
+		
+		/** track impreg actions made to slaves */
+		slaveIdsImpregnanted?: Set<number>
 	}
 
 	export interface GameVariables extends DefaultGameStateVariables, ResetOnNGPVariables,

js/002-config/fc-js-init.js

@@ -92,8 +92,7 @@ App.PersonalAttention = {};
 /**
  * The patching system that replaces the legacy BC.
  * Its primary file and instructions are located at `/src/data/patches/patch.js`.
- * @see App.Patch.Patches
- * @see App.Patch.applyAll
+ * See {@link App.Patch.Patches} and {@link App.Patch.applyAll}
  */
 App.Patch = {};
 /**
@@ -132,8 +131,7 @@ App.UI.View = {};
  * While it is depreciated, it should not be removed or modifed as it is used as a patch in the new patching system.
  * Its files are stored in `/src/data/backwardsCompatibility/`.
  * @deprecated Replaced by `App.Patch.applyAll()`.
- * @see App.Patch
- * @see App.Patch.applyAll
+ * See {@link App.Patch} and {@link App.Patch.applyAll}
  */
 App.Update = {};
 App.Utils = {};
@@ -141,13 +139,13 @@ App.Utils.Math = {};
 /**
  * The validation system. This replaces the validation that was done in the legacy BC.
  * Its primary file and instructions are located at `/src/data/verification/zVerify.js`.
- * @see App.Verify.everything
+ * See {@link App.Verify.everything}
  */
 App.Verify = {};
 /**
  * Storage for validation instructions.
  * These are functions that should be added to one or more instruction set(s) in `App.Verify.instructions`.
- * @see App.Verify.instructions
+ * See {@link App.Verify.instructions}
  */
 App.Verify.I = {};
 /**

js/003-data/gameVariableData.js

@@ -3,8 +3,7 @@
 App.Data.defaultGameStateVariables = {
 	/**
 	 * This is used to hold data during passage transitions.
-	 * The contents of this object are reset near the end of `App.EndWeek.nextWeek()` right before autosaving happens
-	 * @see App.EndWeek.nextWeek
+	 * The contents of this object are reset near the end of {@link App.EndWeek.nextWeek}() right before autosaving happens
 	 * @type {FC.TransitionObject}
 	 */
 	temp: {},
@@ -15,8 +14,7 @@ App.Data.defaultGameStateVariables = {
 	/**
 	 * Stores the traveled passages since the "Main" passage.
 	 * Gets reset by the main passage.
-	 * @see lastPassage
-	 * @see App.Utils.passageHistoryCleanup
+	 * See {@link lastPassage} and {@link App.Utils.passageHistoryCleanup}
 	 * @type {string[]}
 	 */
 	passageHistory: [],
@@ -27,7 +25,7 @@ App.Data.defaultGameStateVariables = {
 	commitHash: "",
 	/**
 	 * @type {number} used for patching
-	 * @see App.Patch.applyAll
+	 * See {@link App.Patch.applyAll}
 	 */
 	releaseID: 0,
 
@@ -39,20 +37,17 @@ App.Data.defaultGameStateVariables = {
 	/**
 	 * @readonly
 	 * Each slave and the player gets a genepool record when they are created
-	 * The records stored here are missing default values! Use the `getGenePoolRecord()` function to retreive them
-	 * Do not access this directly. Use `addToGenePool()` to add records
-	 * @see getGenePoolRecord
-	 * @see addToGenePool
+	 * The records stored here are missing default values! Use the {@link getGenePoolRecord}() function to retrieve them
+	 * Do not access this directly. Use {@link addToGenePool}() to add records
 	 * @type {Readonly<{[key: string]: Readonly<Partial<FC.GenePoolRecord>>}>}
 	 */
 	genePool: {},
 	/**
 	 * @readonly
-	 * @type {Readonly<FC.GenePoolRecord>} used by `getGenePoolRecord()` to fill in missing defaults
-	 * @see getGenePoolRecord
-	 * @see addToGenePool
+	 * @type {Readonly<FC.GenePoolRecord>} used by {@link getGenePoolRecord}() to fill in missing defaults
+	 * Also see {@link addToGenePool}
 	 */
-	genePoolDefaults: undefined, // new App.Entity.GenePoolRecord(); App.Entity.GenePoolRecord doesn't exist yet...
+	genePoolDefaults: undefined,
 	/** @type {Record<FC.HumanID, FC.MissingParentRecord>} */
 	missingTable: {},
 	detached: {
@@ -285,6 +280,7 @@ App.Data.defaultGameStateVariables = {
 	aiApiUrl: "http://localhost:7860",
 	aiAutoGen: true,
 	aiAutoGenFrequency: 10,
+	aiQueueOverlay: 1,
 	aiUseRAForEvents: false,
 	aiCfgScale: 5,
 	aiTimeoutPerStep: 5,
@@ -421,6 +417,7 @@ App.Data.defaultGameStateVariables = {
 	useSlaveListInPageJSNavigation: 0,
 	useSlaveSummaryOverviewTab: 0,
 	useSlaveSummaryTabs: 0,
+	useSlaveArcologyTab: 1,
 	useTabs: 0,
 	verboseDescriptions: 0,
 	verticalizeArcologyLinks: 0,
@@ -525,6 +522,11 @@ App.Data.defaultGameStateVariables = {
 			warned: false,
 		}
 	},
+
+	// Scenarios
+	scenarios: {
+		contraceptivesBan: 0,
+	}
 };
 
 // Corp data
@@ -655,7 +657,9 @@ App.Data.resetOnNGPlus = {
 		sexualOpenness: 0,
 		bestialityOpenness: 0,
 		gumjobFetishism: 0,
-		gumjobFetishismSMR: 0
+		gumjobFetishismSMR: 0,
+
+		contraceptivesBan: 0
 	},
 
 	FCTV: {
@@ -735,6 +739,7 @@ App.Data.resetOnNGPlus = {
 	econRate: 0,
 	/** @type {FC.ArcologyState[]} */
 	arcologies: [],
+	/* These variables exist, so skill changes during the week will only influence prizes in the next week */
 	HackingSkillMultiplier: 0,
 	upgradeMultiplierArcology: 0,
 	upgradeMultiplierMedicine: 0,
@@ -1111,6 +1116,7 @@ App.Data.resetOnNGPlus = {
 			smartVibes: 0,
 			smartVaginalAttachments: 0,
 			smartStrapon: 0,
+			chastity: 1,
 		},
 	},
 	dairyPiping: 0,
@@ -1130,6 +1136,8 @@ App.Data.resetOnNGPlus = {
 	bodyswapAnnounced: 0,
 	surnamesForbidden: 0,
 	menstruation: 0,
+	menstruationKnown: 0,
+	pregnancyKnown: 0,
 	FCNNstation: 0,
 	swanSong: 0,
 	failedElite: 0,

js/003-data/policiesData.js

@@ -637,6 +637,15 @@ App.Data.Policies.Selection = {
 				}
 			}
 		],
+		"policies.contraceptivesBan": [ // will change in the future with authority/favor rework
+			{
+				title: "Contraceptives Ban",
+				text: `will ban contraceptives from being sold.`,
+				activatedText: `contraceptives are no longer commercially available.`,
+				activatedNote: `Will greatly increase the prices of abortions and chastity devices. Try not to have any accidents!`, // This will be changed later once this is available outside the scenario start
+				hide: {button: 1, ifActivated: 0}, // Only appears under a specific scenario start
+			}
+		],
 	},
 	EducationPolicies: {
 		"TSS.subsidize": [

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/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,
 };