.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

.vscode/settings.template.jsonc

@@ -41,6 +41,13 @@
     "files.associations": {
         "*.tw": "twee3-sugarcube-2"
     },
+    "gitlens.integrations.enabled": true,
+    "gitlens.remotes": [
+        {
+            "domain": "gitgud.io",
+            "type": "GitLab"
+        }
+    ],
     "todo-tree.regex.regex": "(//|#|--|<!--|;|/\\*|^|^[ \\t]*(-|\\d+.))\\s*($TAGS)",
     "twee3LanguageTools.storyformat.current": "sugarcube-2"
 }
\ No newline at end of file

CHANGELOG.md

@@ -5,17 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) with the difference that every version is prefixed with the vanilla version it is based on. Format is: `vanilla-pregmod`
 
 ## Unreleased
+* WARNING - FCHost users need to update or rebuild FCHost before running alpha.36 or it WILL DELETE YOUR LOCAL SAVES!!! Download info is at https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/FCHost/README.md?ref_type=heads#fchost and build info is at https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/FCHost/HowToBuild.md#how-to-build
+* WARNING - JoiPlay users need to export any saves they care about (using the Save to Clipboard option) before updating from alpha.33 or earlier. Any saves that aren't exported will be lost!
+* the customized slave trade now has a 'Dynamic World' feature that lets you pick locations on a map
+* a new retirement option that lets slaves be retired based off the profits they earned
+* better AI image caching
+* experimental AI chat tab in slave interact
+* fertility cycles and menstruation
+* fixes
 
 ## 0.10.7.1-4.0.0-alpha.35 - 2025-02-04
 
-* WARNING - FCHost users need to update or rebuild FCHost before running alpha.34 or it WILL DELETE YOUR LOCAL SAVES!!! Download info is at https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/FCHost/README.md?ref_type=heads#fchost and build info is at https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/FCHost/HowToBuild.md#how-to-build
-* WARNING - JoiPlay eating saves! Export any saves you care about from alpha.33 using the Save to Clipboard option and then import them into alpha.34 or alpha.35
+* WARNING - FCHost users need to update or rebuild FCHost before running alpha.35 or it WILL DELETE YOUR LOCAL SAVES!!! Download info is at https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/FCHost/README.md?ref_type=heads#fchost and build info is at https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/FCHost/HowToBuild.md#how-to-build
+* WARNING - JoiPlay users need to export any saves they care about (using the Save to Clipboard option) before updating from alpha.33 or earlier. Any saves that aren't exported will be lost!
 * fixes
 
 ## 0.10.7.1-4.0.0-alpha.34 - 2025-02-03
 
 * WARNING - FCHost users need to update or rebuild FCHost before running alpha.34 or it WILL DELETE YOUR LOCAL SAVES!!! Download info is at https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/FCHost/README.md?ref_type=heads#fchost and build info is at https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/FCHost/HowToBuild.md#how-to-build
-* WARNING - JoiPlay eating saves! Export any saves you care about from alpha.33 using the Save to Clipboard option and then import them into alpha.34 or alpha.35
+* WARNING - JoiPlay users need to export any saves they care about (using the Save to Clipboard option) before updating from alpha.33 or earlier. Any saves that aren't exported will be lost!
 * leave personal notes for yourself
 * missing parent names are now shown by default for new playthroughs
 * the farmyard and food system have both been moved back to experimental and are disabled by default on new playthroughs

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>
 
@@ -122,9 +122,9 @@ export interface FOO {
 }
 ```
 
-* Enum members should be `ALLCAPS`.
+* Typescript enum members should be `ALLCAPS`.
 
-```js
+```ts
 // good
 enum Foo {
   BAR = 'bar',
@@ -143,24 +143,24 @@ This also applies to JavaScript objects that are used as enums.
 ```js
 // good
 /** @enum {string} */
-const Foo = {
+const Foo = Object.freeze({
   BAR: 'bar',
   BAZ: 'baz',
-}
+});
 
 // bad
 /** @enum {string} */
-const foo = {
+const foo = Object.freeze({
   BAR: 'bar',
   BAZ: 'baz',
-}
+});
 
 // worse
 /** @enum {string} */
-const foo = {
+const Object.freeze(foo = {
   bar: 'bar',
   Baz: 'baz',
-}
+});
 ```
 
 * CSS classes are `kebob-case`.

README.md

@@ -8,6 +8,8 @@ Pregmod is a modification of the original [Free Cities](https://freecitiesblog.b
 
 * WARNING - FCHost users need to update or rebuild FCHost before running alpha.34 or later (or the latest build) or it WILL DELETE YOUR LOCAL SAVES!!! Download info is at https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/FCHost/README.md?ref_type=heads#fchost and build info is at https://gitgud.io/pregmodfan/fc-pregmod/-/blob/pregmod-master/FCHost/HowToBuild.md#how-to-build
 
+* WARNING - JoiPlay users need to export any saves they care about (using the Save to Clipboard option) before updating from alpha.33 or earlier. Any saves that aren't exported will be lost!
+
 1. Download the game
    * [Current release](https://gitgud.io/pregmodfan/fc-pregmod/-/releases)
    * [Latest build](https://gitgud.io/pregmodfan/fc-pregmod/-/jobs/artifacts/pregmod-master/download?job=build)

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/002-variables/colors.css

 :root {
+	--background-default: #111;
+	--background-lighter: #1a1a1a;
+	--background-light: #222;
+	--background-highlight: #333;
+
 	--button-color: #252525;
 	--button-border-color: #333333;
 	--button-selected-color: #050505;
 	--button-hover-color: #414141;
-	--button-disabled-color: #1a1a1a;
+	--button-disabled-color: var(--background-lighter);
 
 	--link-color: #68D;
 	--link-hover-color: #8af;
-
-	--background-default: #111;
-	--background-light: #222;
 }

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: var(--background-lighter);
+    border-left: var(--button-border-color) 2px solid;
+    border-top: var(--button-border-color) 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/accordion.css

@@ -38,14 +38,23 @@ button.accordion:hover:not(.empty) {
 }
 
 /* open/close symbol */
-button.accordion::before {
+button.accordion::before, h2.accordion::before {
 	font-family: "sc-icons";
+	content: "\f078";
+}
+
+button.accordion::before {
 	position: absolute;
 	left: 10px;
-	content: "\f078";
 }
 
-button.accordion.closed::before {
+h2.accordion::before {
+	width: 1.3em;
+	display: inline-block;
+	padding-left: 0.2em;
+}
+
+button.accordion.closed::before, h2.accordion.closed::before {
 	content: "\f054";
 }
 

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/gui/slaveList/cardStyle.css

 .card {
-	border: 2px solid #333333;
-	background-color: #1a1a1a;
+	border: 2px solid var(--button-border-color);
+	background-color: var(--background-lighter);
 	padding: 1em;
 	margin-bottom: 1em;
 }

css/gui/tabs.css

@@ -8,7 +8,8 @@ div.tab-bar button {
 	float: left;
 	outline: none;
 	cursor: pointer;
-	padding: 1ex 1ex;
+	--base-padding: 1ex;
+	padding: var(--base-padding);
 	transition: 0.2s;
 	font-size: large;
 }
@@ -25,7 +26,7 @@ div.tab-bar button.card {
 }
 
 div.tab-bar button.card.active {
-	background-color: #1a1a1a;
+	background-color: var(--background-lighter);
 }
 
 div.tab-bar button:hover {
@@ -72,7 +73,7 @@ div.tab-bar a.active {
 
 .tab-content.card {
 	border-radius: 0 8px 8px 8px;
-	background-color: #1a1a1a;
+	background-color: var(--background-lighter);
 	border: 0;
 }
 

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);
 }

css/rulesAssistant/conditionEditor.css

@@ -27,8 +27,8 @@
 .rule-part {
     display: inline-block;
     border-radius: 8px;
-    border: 2px solid #333333;
-    background-color: #1a1a1a;
+    border: 2px solid var(--button-border-color);
+    background-color: var(--background-default);
     padding: 4px;
     margin: 4px;
 }
@@ -50,8 +50,8 @@
 
 .rule-drag-element {
     display: inline-block;
-    background-image: repeating-linear-gradient(0, #1a1a1a, transparent 0.2em, transparent 0.2em, #1a1a1a 0.4em),
-    repeating-linear-gradient(90deg, #1a1a1a, #777 0.2em, #777 0.2em, #1a1a1a 0.4em);
+    background-image: repeating-linear-gradient(0, var(--background-lighter), transparent 0.2em, transparent 0.2em, var(--background-lighter) 0.4em),
+    repeating-linear-gradient(90deg, var(--background-lighter), #777 0.2em, #777 0.2em, var(--background-lighter) 0.4em);
     width: 1.6em;
     height: 2em;
     vertical-align: middle;
@@ -132,10 +132,34 @@
     content: "\f2ed";
 }
 
+.condition-switch {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+}
+
 .condition-custom {
     width: 90%;
 }
 
+.condition-assignment-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(11em, 1fr));
+    grid-column-gap: 0.5em;
+}
+
+.condition-assignment-grid span {
+    cursor: pointer;
+}
+
+.condition-row {
+    margin: 6px 0;
+}
+
+.condition-assignment {
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+
 /* Encyclopedia help entry */
 
 .rule-help-table {

css/rulesAssistant/raLists.css

-:where(.rajs-list-item) {
+.rajs-list-item {
 	display: inline-block;
 	color: var(--link-color);
 	margin-right: 1em;
@@ -31,26 +31,73 @@
 	margin: 0.25em;
 }
 
+.rajs .tab-content {
+	margin-top: -2px;
+	border: 2px solid var(--button-border-color);
+	background: var(--button-selected-color);
+}
+
+
+.rajs .tab-bar button {
+	position: relative;
+	z-index: 100;
+	transition: none;
+}
+
+.rajs .tab-bar .active {
+	border-bottom: none;
+	padding-bottom: calc(var(--base-padding) + 2px);
+}
+
+.rajs-box {
+	border: 2px solid var(--button-border-color);
+	background: var(--background-lighter);
+	padding: 0.5em;
+	margin-bottom: 1em;
+}
+
+.rajs-box h2 {
+	margin-top: 0;
+}
+
+.rajs-box h2.accordion {
+	margin-top: 0;
+}
+
+.rajs-box h2.accordion:hover {
+	text-decoration: underline;
+}
+
+.current-rule-name {
+	font-weight: bold;
+	font-size: 1.5em;
+}
+
 .rajs-rules {
 	display: grid;
-	grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-	gap: 0.5em;
-	align-items: start;
+	grid-template-columns: repeat(auto-fit, minmax(210px, 1fr));
+	margin-top: 0.5em;
+	margin-bottom: 1em;
 }
+
 .rajs-rules .rajs-list-item {
-	line-height: 1.5;
 	overflow-wrap: anywhere;
+	margin: 0;
 }
 
-.rajs-options {
-	margin-top: 2em;
+.rajs-rules .rajs-list-item.selected {
+	color: lightgray;
 }
 
-.rajs-section h1 {
-	border-bottom: 1px solid white;
-	cursor: pointer;
+.rajs-rules .rajs-rules-inner {
+	padding: 0 2px;
+	border: 1px solid #444;
+	margin: 2px;
+	display: inline-block;
+	width: stretch;
 }
 
-.rajs-section h1:hover {
-	text-decoration: underline;
+.rajs-rules .rajs-rules-inner:hover {
+	background-color: var(--background-highlight);
 }
+

devTools/dictionaries/misc.txt

 Engineerix
+ephebophile
+lolifier
+lolify
+lolifying
 ltdrdata
 mcmonkeyprojects
 orthodontal
+reputational
 rgthree
+sdapi
 SDXL
+Svornost
 swinir
 unapprovingly
 uncircumcise
+unsexy
 webui

devTools/types/FC/RA.d.ts

@@ -218,7 +218,7 @@ declare namespace FC {
 			hornColor: string;
 			labelTagsClear: boolean;
 			choosesOwnClothes: 0 | 1;
-			pronoun: number;
+			pronoun: App.Data.Pronouns.Kind;
 			posePrompt: string;
 			expressionPositivePrompt: string;
 			expressionNegativePrompt: string;

devTools/types/FC/common.d.ts

+
 declare namespace FC {
 	type WithNone<T> = T | "none";