diff --git a/.gitignore b/.gitignore
index 89e2504c2075cba958a853609860f0c38e96590f..230dd8b9dad5b733597bafbf1ee212e504b8f5e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,3 +135,4 @@ fc-pregmod
TODO.txt
temp.*
*.temp
+src/002-config/fc-version.js.commitHash.js
diff --git a/Changelog.txt b/Changelog.txt
index fca166bd7af3a43f169a14bbcc21d1ddb099550c..e659993c4e32290493cd9dcea210671831b20498 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -2,6 +2,9 @@ Pregmod
0.10.7.1-3.5.x
+ 3
+ -custom hotkeys
+
6/06/2020
2
diff --git a/Makefile b/Makefile
index deeeed4e2d7138732efe4675dfa9811960505aa3..e1bee417127f5b00a480ce5923ec21aa3d9b6423 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ bin/resources: resources
test -L "$@" || ln -s "../$<" bin/
bin/%.html: bin/tmp
- git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw
+ rm src/002-config/fc-version.js.commitHash.js
mv $< $@
bin/fc.js: bin/
@@ -41,7 +41,7 @@ bin/tmp: bin/fc.js injectGitCommitHash
rm -f bin/fc.js
injectGitCommitHash:
- sed -Ei "s/build: .releaseID/\0, commit $(COMMIT)/" src/gui/mainMenu/AlphaDisclaimer.tw
+ printf "App.Version.commitHash = '%s';\n" $(COMMIT) > src/002-config/fc-version.js.commitHash.js
bin/:
mkdir -p $@
diff --git a/build.config.json b/build.config.json
new file mode 100644
index 0000000000000000000000000000000000000000..53df91f839f39eaa1e6a83b4fc521639ec8f7d10
--- /dev/null
+++ b/build.config.json
@@ -0,0 +1,34 @@
+{
+ "dirs": {
+ "intermediate": "build",
+ "output": "bin"
+ },
+ "output": "FC_pregmod.html",
+ "twineformat": "sugarcube-2",
+ "gitVersionFile": "src/002-config/fc-version.js.commitHash.js",
+ "sources": {
+ "module": {
+ "js": ["js/**/*.js"]
+ },
+ "story": {
+ "css": ["src/**/*.css"],
+ "js": ["src/**/*.js"],
+ "twee": ["src/**/*.tw"],
+ "media": [
+ "src/art/vector/layers",
+ "src/art/vector_revamp/layers"
+ ]
+ },
+ "head": "devTools/head.html"
+ },
+ "options": {
+ "css": {
+ "autoprefix": true
+ },
+ "twee": {
+ "environment": {
+ "TWEEGO_PATH": "devTools/tweeGo/storyFormats"
+ }
+ }
+ }
+}
diff --git a/compile.bat b/compile.bat
index d91b67280d69782543c0faf24b4cc5683b099907..c45ac210f0969a67af76b21fdc116e53f388dbe2 100644
--- a/compile.bat
+++ b/compile.bat
@@ -3,6 +3,31 @@
:: Set working directory
pushd %~dp0
+
+:: See if we can find a git installation
+setlocal enabledelayedexpansion
+
+set GITFOUND=no
+for %%k in (HKCU HKLM) do (
+ for %%w in (\ \Wow6432Node\) do (
+ for /f "skip=2 delims=: tokens=1*" %%a in ('reg query "%%k\SOFTWARE%%wMicrosoft\Windows\CurrentVersion\Uninstall\Git_is1" /v InstallLocation 2^> nul') do (
+ for /f "tokens=3" %%z in ("%%a") do (
+ set GIT=%%z:%%b
+ set GITFOUND=yes
+ goto FOUND
+ )
+ )
+ )
+)
+:FOUND
+if %GITFOUND% == yes (
+ set "PATH=%GIT%bin;%PATH%"
+ echo|set /p out="App.Version.commitHash = " > "%~dp0src\002-config\fc-version.js.commitHash.js"
+ git rev-parse --sq --short HEAD >> "%~dp0src\002-config\fc-version.js.commitHash.js" 2>NUL
+ if errorlevel 1 echo|set /p out="null" >> "%~dp0src\002-config\fc-version.js.commitHash.js"
+ echo|set /p out=";" >> "%~dp0src\002-config\fc-version.js.commitHash.js"
+)
+
if not exist "bin\resources" mkdir bin\resources
CALL devTools/concatFiles.bat js\ "*.js" bin\fc.js
:: Run the appropriate compiler for the user's CPU architecture.
@@ -12,6 +37,7 @@ if %PROCESSOR_ARCHITECTURE% == AMD64 (
CALL "%~dp0devTools\tweeGo\tweego_win86.exe" -o "%~dp0bin/FC_pregmod.html" --module=bin/fc.js --head devTools/head.html "%~dp0src"
)
DEL bin\fc.js
+IF EXIST "%~dp0src\002-config\fc-version.js.commitHash.js" DEL "%~dp0src\002-config\fc-version.js.commitHash.js"
popd
ECHO Done
diff --git a/compile.sh b/compile.sh
index ef62d7c3edce75b714e1f945e7458859a794a834..b692df31e8c0a83832be58e45fc61a255f9abfaf 100755
--- a/compile.sh
+++ b/compile.sh
@@ -64,16 +64,13 @@ function compile() {
esac
fi
+ file="bin/FC_pregmod.html"
if [[ -d .git ]]; then
COMMIT=$(git rev-parse --short HEAD) # Find and insert current commit
+ printf "App.Version.commitHash = '%s';\n" $(COMMIT) > src/002-config/fc-version.js.commitHash.js
if [[ "$usehash" ]]; then
file="bin/FC_pregmod_${COMMIT}.html"
- else
- sed -Ei "s/build: .releaseID/\0, commit: $COMMIT/" src/gui/mainMenu/AlphaDisclaimer.tw
- file="bin/FC_pregmod.html"
fi
- else
- file="bin/FC_pregmod.html"
fi
devTools/concatFiles.sh js/ '*.js' bin/fc.js
@@ -84,10 +81,8 @@ function compile() {
exit 1
fi
- #Make the output prettier, replacing \t with a tab and \n with a newline
- sed -i -e '/^.*<div id="store-area".*$/s/\\t/\t/g' -e '/^.*<div id="store-area".*$/s/\\n/\n/g' $file
if [[ -d .git ]]; then
- git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw # Revert AlphaDisclaimer for next compilation
+ rm src/002-config/fc-version.js.commitHash.js
fi
echoMessage "Saved to $file."
}
diff --git a/compile_debug+sanityCheck.bat b/compile_debug+sanityCheck.bat
index 3e95998da4dd6d15710cd9b747f8dc01cb7f79c8..0eb2efb2b96238402e7b1cbc25e8ed66ec66ccd0 100644
--- a/compile_debug+sanityCheck.bat
+++ b/compile_debug+sanityCheck.bat
@@ -7,6 +7,7 @@ pushd %~dp0
:: See if we can find a git installation
setlocal enabledelayedexpansion
+set GITFOUND=no
for %%k in (HKCU HKLM) do (
for %%w in (\ \Wow6432Node\) do (
for /f "skip=2 delims=: tokens=1*" %%a in ('reg query "%%k\SOFTWARE%%wMicrosoft\Windows\CurrentVersion\Uninstall\Git_is1" /v InstallLocation 2^> nul') do (
@@ -27,13 +28,5 @@ if %GITFOUND% == yes (
:: Compile the game
call "%~dp0compile.bat"
-if %GITFOUND% == yes (
- :: Make the output prettier, replacing \t with a tab and \n with a newline
- bash -c "sed -i -e '/^.*<div id=\"store-area\".*$/s/\\\t/\t/g' -e '/^.*<div id=\"store-area\".*$/s/\\\n/\n/g' bin/FC_pregmod.html"
-
- :: Revert ./src/init/storyInit.tw for next compilation
- git checkout -- ./src/init/storyInit.tw
-)
-
popd
PAUSE
diff --git a/devTools/FC.targets b/devTools/FC.targets
index 55d1d19f4bb25c18e409c1df30054d429beecb7e..da1098baed0c5192c06133fda1768b6cc9fda611 100644
--- a/devTools/FC.targets
+++ b/devTools/FC.targets
@@ -25,6 +25,7 @@
</UsingTask>
<!-- https://stackoverflow.com/questions/7837644/how-to-replace-string-in-file-using-msbuild -->
+<!-- Unused
<UsingTask TaskName="ReplaceFileText" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
<ParameterGroup>
<InputFilename ParameterType="System.String" Required="true" />
@@ -46,7 +47,7 @@
</Code>
</Task>
</UsingTask>
-
+-->
<!-- https://stackoverflow.com/questions/3524317/regex-to-strip-line-comments-from-c-sharp/3524689#3524689 -->
<UsingTask TaskName="StripComments" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
<ParameterGroup>
diff --git a/devTools/FC.ts b/devTools/FC.ts
index a3125ee3a5ec7815ea39d6a05b111eb68da4d2dc..36c899b9169ff5c84097c4634ea8c8fdb6b7c93c 100644
--- a/devTools/FC.ts
+++ b/devTools/FC.ts
@@ -255,6 +255,7 @@ namespace App {
declare function makeElement<K extends keyof HTMLElementTagNameMap>(tag: K, content: string | Node, classNames?: string | string[]): HTMLElementTagNameMap[K];
declare function appendNewElement<K extends keyof HTMLElementTagNameMap>(tag: K, parent: ParentNode, content?: string | Node, classNames?: string | string[]): HTMLElementTagNameMap[K];
}
+ namespace Hotkeys { }
namespace View { }
namespace SlaveSummary {
type AppendRenderer = (slave: FC.SlaveState, parentNode: Node) => void;
diff --git a/fc-pregmod.proj b/fc-pregmod.proj
index c9b9ea7d66fcd9ef2200e45a7c115a0993c415f3..31ecdd3bb6cd06294d6f05c5b5cdc53330e88dca 100644
--- a/fc-pregmod.proj
+++ b/fc-pregmod.proj
@@ -50,24 +50,23 @@
<ConcatFiles Inputs="@(jsSCripts)" BaseDir="$(MSBuildProjectDirectory)" Output="$(OutputDirectory)\$(JSMoudleFileName)"/>
</Target>
- <Target Name="AlphaDisclaimer" DependsOnTargets="CollectGitInfo" Condition=" '$(GitExeFound)'" >
- <ReplaceFileText
- InputFilename="$(MSBuildProjectDirectory)\src\gui\mainMenu\AlphaDisclaimer.tw"
- OutputFilename="$(MSBuildProjectDirectory)\src\gui\mainMenu\AlphaDisclaimer.tw"
- MatchExpression="(build: \$releaseID)"
- ReplacementText="$1, git commit: $(GitHash)"
- />
+ <Target Name="InjectGitHash" DependsOnTargets="CollectGitInfo" Condition=" '$(GitExeFound)'" >
+ <WriteLinesToFile
+ File="src/002-config/fc-version.js.commitHash.js"
+ Lines="App.Version.commitHash = '$(GitHash)'%3B"
+ Overwrite="true"
+ Encoding="UTF-8"/>
</Target>
- <Target Name="ResetAlphaDisclaimer" DependsOnTargets="FindGit" Condition=" '$(GitExeFound)'" >
- <Exec Command="$(GitExe) checkout -- src/gui/mainMenu/AlphaDisclaimer.tw" />
+ <Target Name="RemoveGeneratedFiles" DependsOnTargets="FindGit" Condition=" '$(GitExeFound)'" >
+ <Delete Files="src/002-config/fc-version.js.commitHash.js"/>
</Target>
- <Target Name="tmpOutput" DependsOnTargets="JSModule;AlphaDisclaimer">
+ <Target Name="tmpOutput" DependsOnTargets="JSModule;InjectGitHash">
<Exec Command="devTools\tweeGo\$(TweeGoExe) --module=$(OutputDirectory)\$(JSMoudleFileName) --head devTools\head.html -o $(OutputDirectory)\tmp.html src\" />
</Target>
- <Target Name="FinalHTML" DependsOnTargets="tmpOutput;ResetAlphaDisclaimer">
+ <Target Name="FinalHTML" DependsOnTargets="tmpOutput;RemoveGeneratedFiles">
<Delete Files="$(OutputDirectory)\$(JSMoudleFileName)" />
<Move SourceFiles="$(OutputDirectory)\tmp.html" DestinationFiles="$(OutputDirectory)\FC_pregmod.html" />
</Target>
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..295949532d6678e29695dc51bbf452414a0ebc51
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,186 @@
+const gulp = require('gulp'),
+ concat = require('gulp-concat'),
+ git = require('gulp-git'),
+ log = require('fancy-log-levels'),
+ noop = require('gulp-noop'),
+ postcss = require('gulp-postcss'),
+ shell = require('gulp-shell'),
+ sort = require('gulp-sort'),
+ sourcemaps = require('gulp-sourcemaps'),
+ autoprefixer = require('autoprefixer'),
+ which = require('which'),
+ fs = require('fs'),
+ path = require('path'),
+ os = require('os'),
+ yargs = require('yargs'),
+ cfg = require('./build.config.json');
+
+const args = yargs.options({
+ verbosity: {type: 'number', default: 0},
+ release: {type: 'boolean', default: false},
+ embedsourcemaps: {type: 'boolean', default: false},
+ sourcemapsincludecontent: {type: 'boolean', default: false}
+}).argv;
+
+const htmlOut = "tmp.html";
+
+log(args.verbosity);
+
+function tweeCompilerExecutable() {
+ const systemTweego = which.sync('tweego', {nothrow: true});
+ if (systemTweego) {
+ log.info('Found system tweego at ', systemTweego);
+ return systemTweego;
+ }
+ const archSuffix = os.arch() === 'x64' ? '64' : '86';
+ const platformSuffix = {
+ 'Darwin': 'osx',
+ 'Linux': 'nix',
+ 'Windows_NT': 'win'
+ }[os.type()];
+ const extension = os.type() === 'Windows_NT' ? '.exe' : '';
+ const res = path.join('.', 'devTools', 'tweeGo', `tweego_${platformSuffix}${archSuffix}${extension}`);
+ log.info('Using bundled tweego at ', res);
+ return res;
+}
+
+function concatFiles(srcGlob, destDir, destFileName) {
+ return gulp.src(srcGlob)
+ .pipe(sort())
+ .pipe(concat(destFileName))
+ .pipe(gulp.dest(destDir));
+}
+
+function processScripts(srcGlob, destDir, destFileName) {
+ const addSourcemaps = !args.release;
+ const prefix = path.relative(destDir, srcGlob.substr(0, srcGlob.indexOf('*')));
+ return gulp.src(srcGlob)
+ .pipe(sort())
+ .pipe(addSourcemaps ? sourcemaps.init() : noop())
+ .pipe(concat(destFileName))
+ .pipe(addSourcemaps ?
+ sourcemaps.write(args.embedsourcemaps ? undefined : '.', {includeContent: args.sourcemapsincludecontent, sourceRoot: prefix}) :
+ noop())
+ .pipe(gulp.dest(destDir));
+}
+
+function processStylesheets(srcGlob, destDir, destFileName) {
+ const addSourcemaps = !args.release;
+ const prefix = path.relative(destDir, srcGlob.substr(0, srcGlob.indexOf('*')));
+ return gulp.src(srcGlob)
+ .pipe(sort())
+ .pipe(addSourcemaps ? sourcemaps.init() : noop())
+ .pipe(concat(destFileName))
+ .pipe(cfg.options.css.autoprefix ?
+ postcss([autoprefixer({overrideBrowserslist: ['last 2 versions']})]) :
+ noop())
+ .pipe(addSourcemaps ?
+ sourcemaps.write(args.embedsourcemaps ? undefined : '.', {includeContent: args.sourcemapsincludecontent, sourceRoot: prefix}) :
+ noop())
+ .pipe(gulp.dest(destDir));
+}
+
+function processSrc(name, processorFunc, globs, destDir, destFileName, ...args) {
+ let tasks = [];
+ if (!Array.isArray(globs) || globs.length === 1) {
+ const src = Array.isArray(globs) ? globs[0] : globs;
+ tasks.push(() => processorFunc(src, destDir, destFileName, args));
+ tasks[tasks.length - 1].displayName = "process-" + name;
+ } else { // many globs
+ const ext = path.extname(destFileName);
+ const bn = path.basename(destFileName, ext);
+ for (let i = 0; i < globs.length; ++i) {
+ tasks.push(() => processorFunc(globs[i], destDir, `${bn}-${i}${ext}`, args));
+ tasks[tasks.length - 1].displayName = `process-${name}-${i}`;
+ }
+ }
+ const res = gulp.parallel(...tasks);
+ res.displayName = name;
+ return res;
+}
+
+function injectGitCommit(cb) {
+ git.revParse({args: '--short HEAD'}, function(err, hash) {
+ if (!err) {
+ log.info('current git hash: ', hash);
+ fs.writeFile(cfg.gitVersionFile, `App.Version.commitHash = '${hash}';\n`, cb);
+ } else {
+ cb();
+ }
+ });
+}
+
+function cleanupGit(cb) {
+ fs.unlink(cfg.gitVersionFile, cb);
+}
+
+function compileStory() {
+ let sources = [path.join(cfg.dirs.intermediate, "story")];
+ sources.push(...cfg.sources.story.media);
+
+ let modules = [path.join(cfg.dirs.intermediate, "module")];
+ let moduleArgs = modules.map(fn => `--module=${fn}`);
+ const cmdLine = `${tweeCompilerExecutable()} -f ${cfg.twineformat} --head=${cfg.sources.head} -o ${path.join(cfg.dirs.intermediate, htmlOut)} ${moduleArgs.join(' ')} ${sources.join(' ')}`;
+
+ log.info(cmdLine);
+ return gulp.src(sources, {read: false})
+ .pipe(shell(cmdLine, {env: cfg.options.twee.environment}));
+}
+
+const processors = {
+ "css": {
+ func: processStylesheets,
+ output: "styles.css"
+ },
+ "js": {
+ func: processScripts,
+ output: "script.js"
+ },
+ "twee": {
+ func: concatFiles,
+ output: "story.twee"
+ },
+ "media": {
+ func: null
+ }
+};
+
+function prepareComponent(name) {
+ const c = cfg.sources[name];
+ const outDir = path.join(cfg.dirs.intermediate, name);
+ const subTasks = [];
+ for (const srcType in c) {
+ const proc = processors[srcType];
+ if (proc.func) {
+ subTasks.push(processSrc(`${name}-${srcType}`, proc.func, c[srcType], outDir, proc.output, cfg.options[srcType]));
+ }
+ }
+ let r = gulp.parallel(subTasks);
+ r.displayName = "prepare-" + name;
+ return r;
+}
+
+function moveHTMLInPlace(cb) {
+ fs.rename(path.join(cfg.dirs.intermediate, htmlOut), path.join(cfg.dirs.output, cfg.output), cb);
+}
+
+function clean(cb) {
+ if (fs.existsSync(cfg.gitVersionFile)) {
+ fs.unlinkSync(cfg.gitVersionFile);
+ }
+ fs.rmdirSync(cfg.dirs.intermediate, {recursive: true});
+ cb();
+}
+
+function prepare(cb) {
+ return gulp.series(clean, injectGitCommit, gulp.parallel(prepareComponent("module"), prepareComponent("story")))(cb);
+}
+
+if (fs.statSync('.git').isDirectory()) {
+ gulp.task('buildHTML', gulp.series(prepare, compileStory, cleanupGit));
+} else {
+ gulp.task('buildHTML', gulp.series(prepare, compileStory));
+}
+
+exports.clean = clean;
+exports.default = gulp.series('buildHTML', moveHTMLInPlace);
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 0270b02f7eaeeab9640de1504f751fc5ad502d2e..ba49c027fd77f18a7d131d2e2e281edfbe50f497 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -170,7 +170,7 @@ App.Data.defaultGameStateVariables = {
universalRulesImpregnation: "none",
universalRulesNewSlavesRA: 1,
universalRulesRest: 0,
- useAccordion: 0,
+ useAccordion: 1,
useFSNames: 1,
useSlaveListInPageJSNavigation: 0,
useSlaveSummaryOverviewTab: 0,
diff --git a/src/001-lib/mousetrap/mousetrap.js b/src/001-lib/mousetrap/0_mousetrap.js
similarity index 100%
rename from src/001-lib/mousetrap/mousetrap.js
rename to src/001-lib/mousetrap/0_mousetrap.js
diff --git a/src/001-lib/mousetrap/1_mousetrap-record.min.js b/src/001-lib/mousetrap/1_mousetrap-record.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..76a7d7d8d532e8c43fc6471e6bc897c12f090691
--- /dev/null
+++ b/src/001-lib/mousetrap/1_mousetrap-record.min.js
@@ -0,0 +1 @@
+!function(n){var t=[],e=null,r=[],i=!1,o=null,l=n.prototype.handleKey;function u(n){var t;for(t=0;t<r.length;++t)if(r[t]===n)return;r.push(n),1===n.length&&(i=!0)}function p(){t.push(r),i=!(r=[]),clearTimeout(o),o=setTimeout(h,1e3)}function h(){e&&(function(n){var t;for(t=0;t<n.length;++t)n[t].sort(function(n,t){return!(1<n.length&&1===t.length)&&(1===n.length&&1<t.length||t<n)?1:-1}),n[t]=n[t].join("+")}(t),e(t)),t=[],e=null,r=[]}n.prototype.record=function(n){var t=this;t.recording=!0,e=function(){t.recording=!1,n.apply(t,arguments)}},n.prototype.handleKey=function(){(function(n,t,e){var o;if(this.recording)if("keydown"===e.type){for(e.preventDefault(),1===n.length&&i&&p(),o=0;o<t.length;++o)u(t[o]);u(n)}else"keyup"===e.type&&0<r.length&&p();else l.apply(this,arguments)}).apply(this,arguments)},n.init()}(Mousetrap);
diff --git a/src/002-config/colors.css b/src/002-config/colors.css
index 1bc976b0aff1e786bef78e119eb8c6c8c2857d7f..5ec1f2b54f102e6c637684c805e5730a01aff6ee 100644
--- a/src/002-config/colors.css
+++ b/src/002-config/colors.css
@@ -3,6 +3,7 @@
--button-border-color: #333333;
--button-selected-color: #050505;
--button-hover-color: #414141;
+ --button-disabled-color: #1a1a1a;
--link-color: #68D;
}
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index bd057a26dea01fdd353ae6ce52e103a1473f1dde..88d1b12cba6f9a716cc394072396baa8c88d9b12 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -1,7 +1,8 @@
App.Version = {
base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
pmod: "3.5.2",
- release: 1072,
+ commitHash: null,
+ release: 1072
};
/* Use release as save version */
diff --git a/src/002-config/mousetrapConfig.js b/src/002-config/mousetrapConfig.js
index df31dc5fb398961e29312bfaca764e0dab3ac096..c82ac4be193661aef007b894ecbb0a50630f938a 100644
--- a/src/002-config/mousetrapConfig.js
+++ b/src/002-config/mousetrapConfig.js
@@ -1,29 +1,305 @@
-/* eslint-disable */
-Mousetrap.bind("enter", function() {
- $("#story-caption #endWeekButton a.macro-link").trigger("click");
+/**
+ * Expand mousetrap with multiple binds per key, passage dependent bindings and a menu for custom rebinding.
+ */
+App.UI.Hotkeys = (function() {
+ /**
+ * @typedef action
+ * @property {Function} callback
+ * @property {Array<string>} combinations 0 <= length <= 2
+ * @property {Array<string>} [passages] not existing means everywhere
+ * @property {string|function(): string} [uiName] allow different name in hotkey settings
+ */
+
+ /**
+ * The key is used in the hotkey settings to describe the action
+ * @type {object.<string, action>}
+ */
+ const actions = {};
+
+ /**
+ * Contains the default combinations for every action
+ * @type {object.<string, Array<string>>}
+ */
+ const defaultCombinations = {};
+
+ /**
+ * References a key combination to a set of actions
+ * @type {object.<string, Array<string>>}
+ */
+ const bindings = {};
+
+ /**
+ * To ensure we only record one at at time
+ * @type {boolean}
+ */
+ let recording = false;
+
+ /**
+ * @param {string} name used as key
+ * @param {action} action
+ */
+ function addDefault(name, action) {
+ actions[name] = action;
+ for (const binding of action.combinations) {
+ addBinding(name, binding);
+ }
+ defaultCombinations[name] = [...action.combinations];
+ }
+
+ /**
+ * @param {string} actionKey
+ * @param {string} combination
+ */
+ function addBinding(actionKey, combination) {
+ if (bindings[combination]) {
+ bindings[combination].push(actionKey);
+ } else {
+ bindings[combination] = [actionKey];
+ Mousetrap.bind(combination, e => {
+ e.preventDefault();
+ for (const binding of bindings[combination]) {
+ const action = actions[binding];
+ // only activate callback if we are on the right passage
+ if (!action.passages || action.passages.includes(State.passage)) {
+ action.callback();
+ }
+ }
+ });
+ }
+ }
+
+ /**
+ * @param {string} actionKey
+ * @param {string} combination
+ */
+ function removeBinding(actionKey, combination) {
+ if (bindings[combination]) {
+ const index = bindings[combination].indexOf(actionKey);
+ if (index > -1) {
+ bindings[combination].splice(index, 1);
+ if (bindings[combination].length === 0) {
+ delete bindings[combination];
+ Mousetrap.unbind(combination);
+ }
+ }
+ }
+ }
+
+ /**
+ * @param {string} name
+ * @returns {string}
+ */
+ function hotkeysForAction(name) {
+ if (!actions[name]) {
+ return "";
+ }
+ const c = actions[name].combinations;
+ if (c.length === 0) {
+ return "";
+ }
+ if (c.length === 1) {
+ return `[${formatHotkey(c[0])}]`;
+ }
+ return `[${formatHotkey(c[0])},${formatHotkey(c[1])}]`;
+ }
+
+ /**
+ * @param {string} combination
+ * @returns {string}
+ */
+ function formatHotkey(combination) {
+ const parts = combination.split("+");
+
+ for (let i = 0; i < parts.length; i++) {
+ parts[i] = capFirstChar(parts[i]);
+ }
+
+ return parts.join("+");
+ }
+
+ /**
+ * @returns {HTMLDivElement}
+ */
+ function settingsMenu() {
+ const div = document.createElement("div");
+ div.className = "hotkey-settings";
+
+ for (const actionsKey in actions) {
+ settingsRow(div, actionsKey);
+ }
+
+ return div;
+ }
+
+ /**
+ * @param {HTMLDivElement} container
+ * @param {string} actionKey
+ */
+ function settingsRow(container, actionKey) {
+ const action = actions[actionKey];
+ // get correct name
+ let name = actionKey;
+ if (action.uiName) {
+ if (typeof action.uiName === "string") {
+ name = action.uiName;
+ } else {
+ name = action.uiName();
+ }
+ }
+ App.UI.DOM.appendNewElement("div", container, name, "description");
+
+ settingsCell(container, actionKey, 0);
+ settingsCell(container, actionKey, 1);
+
+ const button = App.UI.DOM.appendNewElement("button", container, "Reset");
+ if (isDefault(actionKey)) {
+ button.className = "inactive";
+ } else {
+ button.onclick = () => {
+ action.combinations = [...defaultCombinations[actionKey]];
+ saveToStorage();
+ App.UI.reload();
+ };
+ }
+ }
+
+ /**
+ * Checks if the combinations assigned to an action are the default ones.
+ * @param {string} actionKey
+ * @returns {boolean}
+ */
+ function isDefault(actionKey) {
+ if (defaultCombinations[actionKey].length !== actions[actionKey].combinations.length) {
+ return false;
+ }
+ if (defaultCombinations[actionKey].length === 0) {
+ return true;
+ }
+ if (defaultCombinations[actionKey][0] !== actions[actionKey].combinations[0]) {
+ return false;
+ }
+ if (defaultCombinations[actionKey].length === 1) {
+ return true;
+ }
+ return defaultCombinations[actionKey][1] === actions[actionKey].combinations[1];
+ }
+
+ /**
+ * @param {HTMLDivElement} container
+ * @param {string} actionKey
+ * @param {number} index
+ */
+ function settingsCell(container, actionKey, index) {
+ const action = actions[actionKey];
+ const button = App.UI.DOM.appendNewElement("button", container,
+ action.combinations[index] ? formatHotkey(action.combinations[index]) : "", "combination");
+ button.onclick = () => {
+ if (recording) { return; }
+ recording = true;
+
+ $(button).empty();
+ Mousetrap.record(function(sequence) {
+ // sequence is an array like ['ctrl+k', 'c']
+ const combination = sequence.join(" ");
+ if (action.combinations[index]) {
+ removeBinding(actionKey, action.combinations[index]);
+ }
+ action.combinations[index] = combination;
+ addBinding(actionKey, combination);
+ saveToStorage();
+ App.UI.reload();
+ recording = false;
+ });
+ };
+ }
+
+ /**
+ * Saves custom hotkeys to browser storage
+ */
+ function saveToStorage() {
+ const save = {};
+
+ for (const actionsKey in actions) {
+ if (!isDefault(actionsKey)) {
+ save[actionsKey] = actions[actionsKey].combinations;
+ }
+ }
+
+ SugarCube.storage.set("hotkeys", save);
+ }
+
+ /**
+ * Loads custom hotkeys from browser storage
+ */
+ function loadFromStorage() {
+ const save = SugarCube.storage.get("hotkeys");
+
+ for (const saveKey in save) {
+ // discard obsolete hotkeys
+ if (actions[saveKey]) {
+ actions[saveKey].combinations = save[saveKey];
+ }
+ }
+ }
+
+ /**
+ * Initialize custom hotkeys
+ */
+ function init() {
+ loadFromStorage();
+ // :storyready is to late to influence the page, but it's the earliest where SugarCube.storage is available so
+ // we refresh the passage if we happen to be on the settings passage.
+ if (State.passage === "Hotkey Settings") {
+ App.UI.reload();
+ }
+ }
+
+ return {
+ add: addDefault,
+ hotkeys: hotkeysForAction,
+ init: init,
+ settings: settingsMenu,
+ };
+})();
+
+// add hotkeys
+App.UI.Hotkeys.add("endWeek", {
+ callback: function() {
+ $("#story-caption #endWeekButton a.macro-link").trigger("click");
+ }, combinations: ["enter"], uiName: "Next Week"
});
-Mousetrap.bind("space", function() {
- $("#story-caption #nextButton a.macro-link").trigger("click");
+App.UI.Hotkeys.add("nextLink", {
+ callback: function() {
+ $("#story-caption #nextButton a.macro-link").trigger("click");
+ }, combinations: ["space"], uiName: "Continue/Back"
});
-Mousetrap.bind("left", function() {
- $("#prevSlave a.macro-link").trigger("click");
- $("#prevChild a.macro-link").trigger("click");
+App.UI.Hotkeys.add("prevSlave", {
+ callback: function() {
+ $("#prevSlave a.macro-link").trigger("click");
+ }, combinations: ["left", "q"], uiName: "Previous Slave"
});
-Mousetrap.bind("q", function() {
- $("#prevSlave a.macro-link").trigger("click");
- $("#prevChild a.macro-link").trigger("click");
+App.UI.Hotkeys.add("nextSlave", {
+ callback: function() {
+ $("#nextSlave a.macro-link").trigger("click");
+ }, combinations: ["right", "e"], uiName: "Next Slave"
});
-Mousetrap.bind("right", function() {
- $("#nextSlave a.macro-link").trigger("click");
- $("#nextChild a.macro-link").trigger("click");
+App.UI.Hotkeys.add("prevChild", {
+ callback: function() {
+ $("#prevChild a.macro-link").trigger("click");
+ }, combinations: ["left", "q"], uiName: "Previous Child"
});
-Mousetrap.bind("e", function() {
- $("#nextSlave a.macro-link").trigger("click");
- $("#nextChild a.macro-link").trigger("click");
+App.UI.Hotkeys.add("nextChild", {
+ callback: function() {
+ $("#nextChild a.macro-link").trigger("click");
+ }, combinations: ["right", "e"], uiName: "Next Child"
});
-Mousetrap.bind("f", function() {
- $("#walkpast a.macro-link").trigger("click");
+App.UI.Hotkeys.add("walkpast", {
+ callback: function() {
+ $("#walkpast a.macro-link").trigger("click");
+ }, combinations: ["f"]
});
-Mousetrap.bind("h", function() {
- $("#manageHG a").trigger("click");
+App.UI.Hotkeys.add("HG Select", {
+ callback: function() {
+ $("#manageHG a").trigger("click");
+ }, combinations: ["h"]
});
diff --git a/src/Corporation/corporateMarket.tw b/src/Corporation/corporateMarket.tw
index 47706c426413fa25b79aab001b2297ba05ed6634..285a7aece6d72f6d7d9afe4a1961dc30489d7f21 100644
--- a/src/Corporation/corporateMarket.tw
+++ b/src/Corporation/corporateMarket.tw
@@ -95,7 +95,7 @@ while you browse.
<br><br>
-<<set _slaveCost = slaveCost($activeSlave)>>
+<<set _slaveCost = slaveCost($activeSlave, false, true)>>
<<if $slavesSeen > $slaveMarketLimit>><<set _slaveCost += _slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1)>><</if>>
<<if $corp.Market == 1>>
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index 205e8ee1df8a2656e75f1a5a034982bd40889e2f..66d6dd0d2a7242233299df78e9ad1926f17c9963 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -1,7 +1,10 @@
// T=SugarCube.State.temporary;
App.SF.Caps = function() {
- return capFirstChar(V.SF.Lower);
-}
+ if (V.SF.Lower) {
+ return capFirstChar(V.SF.Lower);
+ }
+ return "no one";
+};
App.SF.Init = function() {
V.SF.Toggle = V.SF.Toggle || 0;
diff --git a/src/arcologyBuilding/penthouse.js b/src/arcologyBuilding/penthouse.js
index f4d9e75ca14cfddc5bb908064c603dc88f2c4463..89c3126993199518f6beb71b0535d4894a520fb7 100644
--- a/src/arcologyBuilding/penthouse.js
+++ b/src/arcologyBuilding/penthouse.js
@@ -25,7 +25,7 @@ App.Arcology.Cell.Penthouse = class extends App.Arcology.Cell.BaseCell {
const fragment = document.createDocumentFragment();
const link = App.UI.DOM.passageLink("Penthouse", "Manage Penthouse");
- const hotkey = App.UI.DOM.makeElement("span", "[P]", "hotkey");
+ const hotkey = App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("Manage Penthouse"), "hotkey");
if (V.verticalizeArcologyLinks === 0) {
const div = document.createElement("div");
div.append(link, " ", hotkey);
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 7c87d009f1e3d08ced0be68c58b3d595c97910c4..4a37982a50aecc22e18309411ecf3bbbde1c2565 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -1248,7 +1248,7 @@ App.Update.slaveRecords = function(node) {
// note that some infants have been *converted into* corrupted slaves by bad old BCs...no attempt is made to fix them here
App.Facilities.Nursery.InfantDatatypeCleanup(child);
} else {
- App.Update.Slave(slave);
+ App.Update.Slave(child);
App.Entity.Utils.SlaveDataSchemeCleanup(child, true);
App.Facilities.Nursery.ChildDatatypeCleanup(child);
}
diff --git a/src/endWeek/saDrugs.js b/src/endWeek/saDrugs.js
index 37504c2890d44ddb7bb6b71bf6111128ff76a18b..ee40ac4a5775becca185531c84087b654162b0a9 100644
--- a/src/endWeek/saDrugs.js
+++ b/src/endWeek/saDrugs.js
@@ -1672,9 +1672,11 @@ App.SlaveAssignment.drugs = (function() {
r += ` ${He} <span class="mediumaquamarine">trusts you more</span> for giving ${him} access to expensive modern medicine.`;
slave.trust += 1;
}
- improveCondition(slave, 6);
- improveCondition(slave, V.curativeUpgrade * 6);
- slave.chem += 1;
+ if (slave.curatives === 2) {
+ improveCondition(slave, 6);
+ improveCondition(slave, V.curativeUpgrade * 6);
+ slave.chem += 1;
+ }
}
/**
diff --git a/src/endWeek/saHormonesEffects.js b/src/endWeek/saHormonesEffects.js
index b1d485a5482ea6dcd7ce4f471766b31a23fbe1a3..c98212c56689ec1a19d37a9b90da232a94fcf81d 100644
--- a/src/endWeek/saHormonesEffects.js
+++ b/src/endWeek/saHormonesEffects.js
@@ -173,11 +173,10 @@ App.SlaveAssignment.hormonesEffects = (function() {
} else if (slave.faceShape === "androgynous" && slave.geneticQuirks.androgyny !== 2) {
r.push(`Hormonal effects cause <span class="lime">${his} face to soften into`);
if (slave.geneMods.NCS === 1) {
- r.push(`childlike normalcy`);
+ r.push(`childlike normalcy.</span>`);
} else {
- r.push(`femininity`);
+ r.push(`femininity.</span>`);
}
- r.push(`. < /span>`);
slave.faceShape = "normal";
} else if (slave.geneMods.NCS === 1 && jsRandom(1, 100) > 50 && slave.faceShape === "normal") {
r.push(`Hormonal effects cause <span class="lime">${his} face to soften into childlike cuteness.</span>`);
diff --git a/src/endWeek/saInflation.js b/src/endWeek/saInflation.js
index 10ea153a1306a13259732e9cccdc2f831144c523..cb4a3d9983666ac2449ab35ce156442c8f78e6a4 100644
--- a/src/endWeek/saInflation.js
+++ b/src/endWeek/saInflation.js
@@ -424,7 +424,7 @@ App.SlaveAssignment.inflation = (function() {
cow.boobsMilk = 0;
}
if (slave.inflation === 3) {
- r.push(`two gallons of milk, `);
+ r.push(`two gallons of milk,`);
} else if (slave.inflation === 2) {
r.push(`four liters of milk,`);
} else if (slave.inflation === 1) {
@@ -535,7 +535,7 @@ App.SlaveAssignment.inflation = (function() {
r.push(`sucks ${cow.slaveName}'s ${(cow.dick > 0) ? `cock` : `cum hole`} until ${he} is filled with nearly`);
}
if (slave.inflation === 3) {
- r.push(`two gallons of cum, `);
+ r.push(`two gallons of cum,`);
} else if (slave.inflation === 2) {
r.push(`four liters of cum,`);
} else if (slave.inflation === 1) {
diff --git a/src/endWeek/saPleaseYou.js b/src/endWeek/saPleaseYou.js
index 44b834c80f8ddfdcb77d7dd7c2e9f9262b5063fd..351b644217e763232430745b0211b3ce8cfe71e8 100644
--- a/src/endWeek/saPleaseYou.js
+++ b/src/endWeek/saPleaseYou.js
@@ -1260,7 +1260,7 @@ App.SlaveAssignment.pleaseYou = (function() {
}
r.push(`and, since ${his} pussy is covered by ${his} chastity belt, asshole`);
} else {
- r.push(`mouth `);
+ r.push(`mouth`);
if (V.PC.dick !== 0 && slave.nipples === "fuckable") {
r.push(`and nipples`);
}
@@ -1335,7 +1335,7 @@ App.SlaveAssignment.pleaseYou = (function() {
}
r.push(`and, since ${his} pussy is covered by ${his} chastity belt, asshole`);
} else {
- r.push(`mouth `);
+ r.push(`mouth`);
if (V.PC.dick !== 0 && slave.nipples === "fuckable") {
r.push(`and nipples`);
}
diff --git a/src/endWeek/saServeYourOtherSlaves.js b/src/endWeek/saServeYourOtherSlaves.js
index b14d8ab1ff6ab16f3019871236626cf6ffc921ee..00589d7984c3c52ffc9d8c253f112047a8444b5f 100644
--- a/src/endWeek/saServeYourOtherSlaves.js
+++ b/src/endWeek/saServeYourOtherSlaves.js
@@ -166,7 +166,7 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
}
}
} else {
- r.push(`obediently seeds your fertile slaves. Being used as a stud <span class="hotpink">keeps ${him} in a good frame of mind</span> and <span class="mediumaquamarine">builds ${his} trust in you.</span> `);
+ r.push(`obediently seeds your fertile slaves. Being used as a stud <span class="hotpink">keeps ${him} in a good frame of mind</span> and <span class="mediumaquamarine">builds ${his} trust in you.</span>`);
slave.devotion += 2;
slave.trust += 2;
if (slave.fetishKnown === 1) {
@@ -682,7 +682,7 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
} else {
r.push(`${domName} carefully uses gestures to communicate to ${him} that ${he} might as well scream.`);
}
- r.push(` ${subName}'s struggles to escape become desperate at this, and more desperate still when the week's first <span class="red">beating</span> starts. Later, ${he} tries going limp and unresistant, but that just makes the annoyed ${domName} beat ${his2} pain slave all the harder until ${he2} gets a reaction again. It's a long and <span class="hotpink">will breaking</span> week for ${subName}, and ${domName} certainly <span class="hotpink">enjoys torturing ${his2} toy.</span>`);
+ r.push(`${subName}'s struggles to escape become desperate at this, and more desperate still when the week's first <span class="red">beating</span> starts. Later, ${he} tries going limp and unresistant, but that just makes the annoyed ${domName} beat ${his2} pain slave all the harder until ${he2} gets a reaction again. It's a long and <span class="hotpink">will breaking</span> week for ${subName}, and ${domName} certainly <span class="hotpink">enjoys torturing ${his2} toy.</span>`);
slave.devotion += 1;
healthDamage(slave, 3);
if (slave.need && slave.fetish === "masochist") {
@@ -1776,7 +1776,23 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
* @param {App.Entity.SlaveState} slave
* */
function mentalEffects(slave) {
- if (jobType === "sub") {
+ if (jobType === "stud") {
+ if (slave.behavioralFlaw === "hates women") {
+ if (slave.devotion > 20 && jsRandom(1, 100) > 70) {
+ r.push(`Spending so much time in close proximity to pussies <span class="green">reconciles ${him} to sex with girls.</span>`);
+ slave.behavioralFlaw = "none";
+ }
+ }
+ } else if (jobType === "cumdump") {
+ if ((V.dormitoryPopulation + V.roomsPopulation - V.subSlaves) > 5 && load <= 0.8) {
+ if (slave.sexualFlaw === "repressed") {
+ if (slave.devotion > 20 && jsRandom(1, 100) > (100 - fuckCount)) {
+ r.push(`After being brought to orgasm so many times, <span class="green">${he} begins to enjoy having sex.</span>`);
+ slave.sexualFlaw = "none";
+ }
+ }
+ }
+ } else if (jobType === "sub") {
if (slave.devotion <= 20) {
if (slave.trust >= -20) {
r.push(`${subName} <span class="gold">is further habituated to subservience</span> by ${domName}.`);
@@ -1876,6 +1892,57 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
* @param {App.Entity.SlaveState} slave
* */
function slaveSkills(slave) {
- // WIP
+ if (jobType === "stud") {
+ // Penetrative skill goes here.
+ } else if (jobType === "cumdump") {
+ if (oralUse > 0) {
+ if (slave.skill.oral < 30) {
+ r.push(`${SkillIncrease.Oral(slave, (Math.floor((oralUse / 2) + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32))))}`);
+ } else if (slave.skill.oral < 100) {
+ r.push(`${SkillIncrease.Oral(slave, (Math.floor((oralUse / 4) + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32))))}`);
+ }
+ }
+ if (vaginalUse > 0) {
+ if (slave.skill.vaginal < 30) {
+ r.push(`${SkillIncrease.Vaginal(slave, (Math.floor((vaginalUse / 2) + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32))))}`);
+ } else if (slave.skill.vaginal < 100) {
+ r.push(`${SkillIncrease.Vaginal(slave, (Math.floor((vaginalUse / 4) + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32))))}`);
+ }
+ }
+ if (analUse > 0) {
+ if (slave.skill.anal < 30) {
+ r.push(`${SkillIncrease.Anal(slave, (Math.floor((analUse / 2) + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32))))}`);
+ } else if (slave.skill.anal < 100) {
+ r.push(`${SkillIncrease.Anal(slave, (Math.floor((analUse / 4) + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32))))}`);
+ }
+ }
+ } else if (jobType === "sub") {
+ if ((slave.rivalry === 0 || slave.rivalryTarget !== domSlave.ID) && slave.devotion > 20 && domSlave.devotion > 20) {
+ if (oralUse > 0) {
+ if (slave.skill.oral < domSlave.skill.oral) {
+ r.push(`${domName} is better at oral than ${subName} and lets ${him} in on some of ${his2} techniques.`);
+ r.push(`${SkillIncrease.Oral(slave, (Math.floor(oralUse + Math.floor(slave.intelligence + slave.intelligenceImplant) / 32)))}`);
+ } else if (slave.skill.oral < 30) {
+ r.push(`${SkillIncrease.Vaginal(slave, (Math.floor((vaginalUse / 4) + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32))))}`);
+ }
+ }
+ if (vaginalUse > 0) {
+ if (slave.skill.vaginal < domSlave.skill.vaginal && domSlave.vagina >= 0) {
+ r.push(`${domName} knows how to use ${his2} pussy better than ${subName} does and passes on some of ${his2} knowledge.`);
+ r.push(`${SkillIncrease.Vaginal(slave, (Math.floor(vaginalUse + Math.floor(slave.intelligence + slave.intelligenceImplant) / 32)))}`);
+ } else if (slave.skill.vaginal < 30) {
+ r.push(`${SkillIncrease.Vaginal(slave, (Math.floor((vaginalUse / 2) + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32))))}`);
+ }
+ }
+ if (analUse > 0) {
+ if (slave.skill.anal < domSlave.skill.anal) {
+ r.push(`${domName} is more familiar with anal sex than ${subName} is and lets some of ${his2} skill rub off on ${him}.`);
+ r.push(`${SkillIncrease.Anal(slave, (Math.floor(analUse + Math.floor(slave.intelligence + slave.intelligenceImplant) / 32)))}`);
+ } else if (slave.skill.anal < 30) {
+ r.push(`${SkillIncrease.Vaginal(slave, (Math.floor((vaginalUse / 2) + Math.floor((slave.intelligence + slave.intelligenceImplant) / 32))))}`);
+ }
+ }
+ }
+ }
}
})();
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index de174c7a7da10a0d8203342428b4d56dab3f3fa9..6b2330cf3a1c9dbf6e5d30f9f14f103c07a7e55d 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -297,18 +297,19 @@ App.EndWeek.slaveAssignmentReport = function() {
* Multidimensional temporary array
* 0: The passage name for the facility's report
* 1: The facility name capitalized (@see todo)
- * 2: max number of slaves allowed in facility - > 0 implies open
- * 3: number of slaves assigned to facility
- * 4: ID of the slave assigned to run the facility ("Boss")
- * 5: Text title of the Boss
- *
- * @todo This is a proof of concept construct, if it works and cuts overhead, intended to create an object
- * for deeper use in multiple locations, including streamlining reports/facilities code to one widget
- * @todo Figure out if this would be better as an object rather than an array for overhead
- * StoryInit also?
- * @todo Figure out why we're not using ndef/-1 for a bunch of these story variables. Leaky conditionals
- * @todo Figure out why we're using variable space with capitalized facility names when we can parse it from true name
- */
+ * 2: max number of slaves allowed in facility - > 0 implies open
+ * 3: number of slaves assigned to facility
+ * 4: ID of the slave assigned to run the facility ("Boss")
+ * 5: Text title of the Boss
+ *
+ * @todo This is a proof of concept construct, if it works and cuts overhead, intended to create an object
+ * for deeper use in multiple locations, including streamlining reports/facilities code to one widget
+ * @todo Figure out if this would be better as an object rather than an array for overhead
+ * StoryInit also?
+ * @todo Figure out why we're not using ndef/-1 for a bunch of these story variables. Leaky conditionals
+ * @todo Figure out why we're using variable space with capitalized facility names when we can parse it from true
+ * name
+ */
const facListArr = [
["Arcade Report", App.Entity.facilities.arcade],
@@ -360,42 +361,39 @@ App.EndWeek.slaveAssignmentReport = function() {
}
}
- const buttonClasses = V.useAccordion > 0 ? ["buttonBar", "accordion"] : ["buttonBar"]; // Is Accordion turned on?
- const disTxt = V.useAccordion > 0 ? "" : " disabled='disabled'"; // Chunk the row from our array we're working on to make reading code easier, null some text vars we'll need
for (const facSubArr of facListArr) {
const reportContent = document.createElement("div");
App.UI.DOM.includePassage(reportContent, facSubArr[0]);
- if (V.useAccordion === 1) {
- reportContent.className = "accHidden";
- }
- const stats = _getReportElementStats(facSubArr); // needs to be inside the loop after the report passage to get the employees number after re-assignments
-
- const str = facSubArr[0].replace(/\W+/g, '-').toLowerCase(); // Normalize the passage name to use as an element ID
- if (stats.established) { /** Do we have one of these facilities? */
- if (stats.entriesNumber === 0 && !stats.manager) { // Is there anyone inside the facility?
- // No — it's empty, so we display the heading without a button and with a thinner bar under it
- App.UI.DOM.appendNewElement("strong", res, `${stats.name} Report`);
- App.UI.DOM.appendNewElement("hr", res).style.margin = "0";
- App.UI.DOM.appendNewElement("span", res, `${stats.name} is currently empty`, "gray");
- App.UI.DOM.appendNewElement("br", res);
- App.UI.DOM.appendNewElement("br", res);
- /** Old code: <<= '<div id="button-' + _str + '" class="unStaffed">' + _facSubArr[1] + ' is currently unstaffed</div>'>> */
+ // needs to be inside the loop after the report passage to get the employees number after re-assignments
+ const stats = _getReportElementStats(facSubArr);
+
+ if (stats.established) { // Do we have one of these facilities?
+ const header = document.createDocumentFragment();
+ App.UI.DOM.appendNewElement("span", header, `${stats.name} Report`, "title");
+
+ if (stats.entriesNumber > 0) {
+ // Display the bar with information
+ const diffNum = stats.entriesNumber - stats.entriesNumberInitial;
+ let diffText = diffNum === 0 ? "" : (diffNum > 0 ? ` (+${diffNum})` : ` (${diffNum})`);
+ App.UI.DOM.appendNewElement("span", header,
+ `${stats.entriesNumber}${diffText} slave${stats.entriesNumber !== 1 ? "s" : ""} ${
+ stats.manager && stats.manager.currentEmployee ? `and ${capFirstChar(stats.manager.desc.position)}` : ""
+ } in ${stats.name}`, ["info", "green"]);
+ } else if (stats.manager && stats.manager.currentEmployee) {
+ App.UI.DOM.appendNewElement("span", header,
+ `Only ${capFirstChar(stats.manager.desc.position)} in ${stats.name}`, ["info", "orange"]);
} else {
- const btn = App.UI.DOM.appendNewElement("button", res, `${stats.name} Report`, buttonClasses);
- btn.type = "button" + disTxt;
- btn.id = `button-${str}`;
- if (_.isNil(stats.entriesNumber)) {
- // Yes, display the bar with information
- btn.setAttribute("data-after", '');
- } else {
- // Yes, display the bar with information
- const diffNum = stats.entriesNumber - stats.entriesNumberInitial;
- let diffText = diffNum === 0 ? "" : (diffNum > 0 ? ` (+${diffNum})` : ` (${diffNum})`);
- btn.setAttribute("data-after", `${stats.entriesNumber}${diffText} slave${stats.entriesNumber !== 1 ? 's' : ''} in ${stats.name}`);
- }
+ App.UI.DOM.appendNewElement("span", header, `${stats.name} is empty`,
+ ["info", "gray"]);
+ }
+
+ // Is there anyone inside the facility?
+ if (stats.entriesNumber > 0 || (stats.manager && stats.manager.currentEmployee)) {
+ res.append(App.UI.DOM.accordion(header, reportContent, V.useAccordion > 0));
+ } else {
+ res.append(App.UI.DOM.accordion(header));
}
- res.appendChild(reportContent);
}
}
@@ -749,6 +747,19 @@ App.EndWeek.slaveAssignmentReport = function() {
slave.subTarget = 0;
}
}
+ break;
+ case Job.AGENT:
+ {
+ const arc = V.arcologies.find((a) => a.leaderID === slave.ID);
+ if (!arc) {
+ _printSlaveUnassignedNote(slave, "is not assigned to an arcology");
+ removeJob(slave, Job.AGENT);
+ } else if (arc.government !== "your agent") {
+ _printSlaveUnassignedNote(slave, "is assigned to an arcology that is not lead by an agent");
+ removeJob(slave, Job.AGENT);
+ }
+ break;
+ }
}
if (slave.ID === V.LurcherID) {
@@ -803,13 +814,14 @@ App.EndWeek.slaveAssignmentReport = function() {
["@Stud", "cannot serve as a Stud any more"],
[Job.NURSE, "cannot serve as your Nurse any more"],
[Job.MATRON, "cannot serve as your Matron any more"],
- [Job.LURCHER, "cannot course as a lurcher"]
+ [Job.LURCHER, "cannot course as a lurcher"],
+ [Job.AGENT, "cannot serve as an Agent any more"]
]);
const warningLine = App.UI.DOM.appendNewElement("div", res);
App.UI.DOM.appendNewElement("span", warningLine, slave.slaveName, 'slave-name');
warningLine.appendChild(document.createTextNode(' ' + condition + ' '));
- App.UI.DOM.appendNewElement("span", warningLine, outcome ? outcome : `and ${cantServeNotes[assignment || slave.assignment]}`, "yellow");
+ App.UI.DOM.appendNewElement("span", warningLine, outcome ? outcome : `and ${cantServeNotes.get(assignment || slave.assignment)}`, "yellow");
warningLine.appendChild(document.createTextNode("."));
}
};
diff --git a/src/events/RESS/moistPussy.js b/src/events/RESS/moistPussy.js
index 7cda22b7ae5ff55b60bec651b8daa4edc739e999..64ba06ba39609f48d1df82b3b0aaf41a8861f690 100644
--- a/src/events/RESS/moistPussy.js
+++ b/src/events/RESS/moistPussy.js
@@ -246,13 +246,13 @@ App.Events.RESSMoistPussy = class RESSMoistPussy extends App.Events.BaseEvent {
} else {
t.push(`You're careful not to penetrate ${his} virgin slit with your middle finger, but you draw it up the exterior of ${his} channel, gathering a healthy amount of pussyjuice.`);
}
- t.push(`Then you remove your hand, though the horny ${SlaveTitle(eventSlave)} unconsciously tries to follow the withdrawing digits. `);
+ t.push(`Then you remove your hand, though the horny ${SlaveTitle(eventSlave)} unconsciously tries to follow the withdrawing digits.`);
if (canSee(eventSlave)) {
t.push(`${He} stares at you, waiting to see what you're going to do, and a blush begins to rise on ${his} ${eventSlave.skin} cheeks as ${he} sees you reaching for ${his} mouth. ${His}`);
} else if (canHear(eventSlave)) {
t.push(`${He} listens carefully to your movements, waiting to see what you're going to do, and a blush begins to rise on ${his} ${eventSlave.skin} cheeks as ${he} feels you reaching for ${his} mouth. ${His}`);
} else {
- t.push(`stays as still as ${he} can, until ${his} ${eventSlave.skin} cheeks blush as ${he} feels you reaching for ${his} mouth. ${His}`);
+ t.push(`${He} stays as still as ${he} can, until ${his} ${eventSlave.skin} cheeks blush as ${he} feels you reaching for ${his} mouth. ${His}`);
}
if (eventSlave.lips > 95) {
t.push(`facepussy`);
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 81a39ea1e5d527c0921ed35627cdfbacfb3b0183..a7a13edac35a3ae704000912c0d4d48c16370285 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -113,8 +113,8 @@ You may review your settings before clicking "Continue" to begin.<br>
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
.addComment("This is mostly for new players. @@.exampleTooltip.noteworthy;Colored text@@ can have tooltips.")>>
- <<run _options.addOption("Accordion effects on weekly reports are", "useAccordion")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
+ <<run _options.addOption("Accordion on week end defaults to", "useAccordion")
+ .addValue("Open", 0).on().addValue("Collapsed", 1).off()>>
<<run _options.addOption("Economic Tabs on weekly reports are", "useTabs")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
diff --git a/src/events/reRelativeRecruiter.js b/src/events/reRelativeRecruiter.js
index 05e53a0498205fb2764f6cc39233bbbf8b351776..0a1e9893aa061cbfb9a5d862e55d618211e9bc85 100644
--- a/src/events/reRelativeRecruiter.js
+++ b/src/events/reRelativeRecruiter.js
@@ -154,6 +154,8 @@ App.Events.RERelativeRecruiter = class RERelativeRecruiter extends App.Events.Ba
App.Events.drawEventArt(artDiv, eventSlave);
node.appendChild(artDiv);
+ // re-choose the relative (a valid one was assigned during her casting, but the last slave to go through casting might not have been the one selected)
+ this._chooseTargetRelative(eventSlave);
// pick a random background for the selected relative
this.params.background = this._getRelativeBackgrounds(this.params.relative).random();
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index db203972cd30f9a6dc2811261df9ee9d49be7cde..eac1877bcd5b558ddd48419e6a4672e5ec0af104 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -18,7 +18,9 @@
<</if>>
<center>
-@@.cyan;[â†,Q] @@
+<span class="hotkey">
+ <<print App.UI.Hotkeys.hotkeys("prevChild")>>
+</span>
<span id="prevChild">
<b>
<<link "Prev" "Previous Child In Line">><</link>>
@@ -30,7 +32,9 @@
<<link "Next" "Next Child In Line">><</link>>
</b>
</span>
-@@.cyan; [E,→]@@
+<span class="hotkey">
+ <<print App.UI.Hotkeys.hotkeys("nextChild")>>
+</span>
</center>
<br>
diff --git a/src/facilities/nursery/nurseryDatatypeCleanup.js b/src/facilities/nursery/nurseryDatatypeCleanup.js
index e57f1d4a33976617e7f8b804ae54668bad2da2ba..682238b05facf044ee8952150c23cbcdba730980 100644
--- a/src/facilities/nursery/nurseryDatatypeCleanup.js
+++ b/src/facilities/nursery/nurseryDatatypeCleanup.js
@@ -154,7 +154,7 @@ App.Facilities.Nursery.ChildDatatypeCleanup = function(child) {
function childPregnancyDatatypeCleanup(child) {
child.induce = Math.clamp(+child.induce, 0, 1) || 0;
child.labor = Math.clamp(+child.labor, 0, 1) || 0;
- if (child.hasOwnProperyty("cSec")) {
+ if (child.hasOwnProperty("cSec")) {
if (child.cSec > 0) {
App.Medicine.Modification.addScar(child, "belly", "c-section");
}
@@ -344,24 +344,24 @@ App.Facilities.Nursery.ChildDatatypeCleanup = function(child) {
if (typeof child.backAccessory !== "string") {
child.backAccessory = "none";
}
- if (typeof slave.faceAccessory !== "string") {
- slave.faceAccessory = "none";
+ if (typeof child.faceAccessory !== "string") {
+ child.faceAccessory = "none";
}
- if (typeof slave.mouthAccessory !== "string") {
- slave.mouthAccessory = "none";
+ if (typeof child.mouthAccessory !== "string") {
+ child.mouthAccessory = "none";
}
- switch(slave.collar) {
+ switch(child.collar) {
case "porcelain mask":
- slave.faceAccessory = slave.collar;
- slave.collar = "none";
+ child.faceAccessory = child.collar;
+ child.collar = "none";
break;
case "bit gag":
case "dildo gag":
case "massive dildo gag":
case "ball gag":
case "ring gag":
- slave.mouthAccessory = slave.collar;
- slave.collar = "none";
+ child.mouthAccessory = child.collar;
+ child.collar = "none";
break;
}
}
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index fee830050b37af21e4fef9856c5a5f74636a0a99..f59c24bc62c284aa386f2b9307412d21a90d2b09 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -798,7 +798,7 @@ SLAVE ASSIGNMENTS:
<<case "Attendant">>
- An ''Attendant'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Spa", "Spa")>> facility has been built. Attendants provide emotional help to slaves in the spa, and can also soften flaws and even fix mindbroken slaves. Good Attendants are free of fetishes or submissive, have a calm libido, older than 35, a motherly air, @@.cyan;intelligent,@@ and naturally female.
+ An ''Attendant'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Spa", "Spa")>> facility has been built. Attendants provide emotional help to slaves in the spa, and can also soften flaws and even fix mindbroken slaves. Good Attendants are free of fetishes or submissive, have a calm libido, appear older than 35, a motherly air, @@.cyan;intelligent,@@ and naturally female.
/* TODO: will still need more updating */
<<case "Matron">>
@@ -847,7 +847,7 @@ SLAVE ASSIGNMENTS:
<br><br>A ''Head Girl'' can be selected from among your @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("devoted", "From Rebellious to Devoted")>>@@ slaves immediately. Duties are numerous, but mostly involve training slaves. They will generally train whichever girls they think appropriate, but can be given some direction on the same menu used to select one. Giving your <<= App.Encyclopedia.Dialog.linkSC("Head Girl a suite", "Head Girl Suite")>> and a personal slave will allow her to train an extra slave each week, an extremely powerful ability.
- @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("Devotion", "From Rebellious to Devoted")>>,@@ @@.cyan;intelligence,@@ and age over 35 all help Head Girls do well. Head Girls will do better if they are comfortable with the arcology's <<= App.Encyclopedia.Dialog.linkSC("lingua franca", "Lingua Franca")>>. Skills are required when teaching that skill, meaning that slaves without vaginas cannot teach vaginal skills. Conversely, slaves with functional dicks are better at teaching other sexual skills. Also having max sex skills, dom as their fetish and being your wife provide more boosts.
+ @@.hotpink;<<= App.Encyclopedia.Dialog.linkSC("Devotion", "From Rebellious to Devoted")>>,@@ @@.cyan;intelligence,@@ and age over 30 all help Head Girls do well. Head Girls will do better if they are comfortable with the arcology's <<= App.Encyclopedia.Dialog.linkSC("lingua franca", "Lingua Franca")>>. Skills are required when teaching that skill, meaning that slaves without vaginas cannot teach vaginal skills. Conversely, slaves with functional dicks are better at teaching other sexual skills. Also having max sex skills, dom as their fetish and being your wife provide more boosts.
<<case "Madam">>
@@ -905,7 +905,7 @@ SLAVE ASSIGNMENTS:
<<case "Schoolteacher">>
- A ''schoolteacher'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Schoolroom", "Schoolroom")>> facility is built. Schoolteachers increase the rate at which students in the schoolroom learn. Good schoolteachers are older than 35, beautiful, @@.cyan;intelligent,@@ and educated.
+ A ''schoolteacher'' can be selected once the <<= App.Encyclopedia.Dialog.linkSC("Schoolroom", "Schoolroom")>> facility is built. Schoolteachers increase the rate at which students in the schoolroom learn. Good schoolteachers appear older than 35, beautiful, @@.cyan;intelligent,@@ and educated.
<<case "Stewardess">>
@@ -2792,7 +2792,7 @@ LORE: INTERVIEWS
<br>''ezsh'' for bugfixing and creating a tool to build twineJS and twineCSS for me. Set up a revised SC update process as well. Has contributed massive revisions to the game's structure. Keeps the RA in line.
<br>''Sonofrevvan'' for making slaves beg and dance.
<br>''skriv'' for fixes and endless code cleaning.
- <br>''Arkerthan'' for various additions including merging cybermod and vanilla prosthetics. Java sanity check. Limbs and reworked amputation. Eye rework. Has begun overhauling various systems including the building layout. Dick tower. Worked on user themes.
+ <br>''Arkerthan'' for various additions including merging cybermod and vanilla prosthetics. Java sanity check. Limbs and reworked amputation. Eye rework. Has begun overhauling various systems including the building layout. Dick tower. Work on user themes. Custom hotkeys.
<br>''MouseOfLight'' for overhauling the corporation. V proxy, nuff said. Added better safeguards to the RA.
<br>''svornost'': A great asset. Various fixes and tools, including FCHost. Gave players the ability to find that one slave they are looking for. The 'Scope' macro. Optimized porn so beautifully I can't even think. Has continued his reign of optimization. Got extended family mode so smooth it supplanted vanilla. Laid the groundwork for the new event layout system.
<br>''Trashman1138'' for various tweaks and fixes.
diff --git a/src/gui/css/accordianStyleSheet.css b/src/gui/css/accordianStyleSheet.css
deleted file mode 100644
index 280882ddfece85479b2989815e70bc447e2b71a6..0000000000000000000000000000000000000000
--- a/src/gui/css/accordianStyleSheet.css
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Accordion 000-250-006 */
-
-button.accordion {
- cursor: pointer;
- padding: 5px;
- width: 100%;
- margin-bottom: 10px;
- border-bottom: 3px double;
- border-right: 3px double;
- border-left: none;
- border-top: none;
- text-align: left;
- outline: none;
- transition: 0.2s;
- background-color: transparent;
-}
-
-button.accordion.active, button.accordion:hover {
- background-color: transparent;
-}
-
-button.accordion:before {
- content: '\002B';
- color: #777;
- font-weight: bold;
- float: left;
- margin-right: 5px;
-}
-
-.unStaffed {
- background-color: transparent;
- padding: .5em .2em;
- margin-bottom: 1em;
- border-bottom: thin inset grey;
-}
-
-.unStaffed:before {
- content: '\00D7';
- color: #777;
- font-weight: bold;
- color: red;
- float: left;
- margin-right: 5px;
-}
-
-.unStaffed:after {
- content: attr(data-after);
- float: right;
- margin-left: 2em;
- font-weight: strong;
- color: green;
-}
-
-button.accordion:after {
- content: attr(data-after);
- float: right;
- margin-left: 2em;
- font-weight: normal;
- color: green;
-}
-
-button.accordion.active:before {
- content: "\2212";
-}
-
-.accHidden {
- padding: 0 18px;
- margin-top: 5px;
- margin-bottom: 5px;
- max-height: 0;
- overflow: hidden;
-}
-
-div.accordion:before {
- content: '\002B';
- color: #777;
- font-weight: bold;
- float: left;
- margin-right: 5px;
-}
-div.accordion.active:before {
- content: "\2212";
-}
diff --git a/src/gui/css/accordion.css b/src/gui/css/accordion.css
new file mode 100644
index 0000000000000000000000000000000000000000..18afe84877c3117cba07ff730f7596977ad735fd
--- /dev/null
+++ b/src/gui/css/accordion.css
@@ -0,0 +1,58 @@
+/* style button */
+button.accordion {
+ width: 100%;
+ margin: 5px 0;
+ border: 2px solid var(--button-border-color);
+ padding: 10px;
+ padding-left: 2.2em;
+ background-color: var(--button-color);
+ /* for the absolute positioned elements */
+ position: relative;
+}
+
+button.accordion.open {
+ background-color: var(--button-selected-color);
+}
+
+button.accordion.empty {
+ background-color: var(--button-disabled-color);
+ cursor: default;
+}
+
+button.accordion:hover:not(.empty) {
+ background-color: var(--button-hover-color);
+}
+
+/* open/close symbol */
+button.accordion::before {
+ font-family: "tme-fa-icons";
+ position: absolute;
+ left: 10px;
+ content: "\e81e";
+}
+
+button.accordion.open::before {
+ content: "\e81c";
+}
+
+button.accordion.empty::before {
+ content: none;
+}
+
+/* hide content */
+div.accordion-content {
+ margin: 0 15px;
+}
+
+div.accordion-content.hidden {
+ display: none;
+}
+
+/* modifiers for the toggle button */
+button.accordion span.title {
+ float: left;
+}
+
+button.accordion span.info {
+ float: right;
+}
\ No newline at end of file
diff --git a/src/gui/css/mainStyleSheet.css b/src/gui/css/mainStyleSheet.css
index e380ff8791f1bc0c60203b6c2562700912828939..a48a978db6fed407fe344251cfd7515804ac7854 100644
--- a/src/gui/css/mainStyleSheet.css
+++ b/src/gui/css/mainStyleSheet.css
@@ -351,6 +351,11 @@ div.double-choices, p.double-choices {
text-decoration-color: white;
}
+.slave-name-simple {
+ color: pink;
+ font-weight: bold;
+}
+
.name {
font-weight: bold;
}
diff --git a/src/gui/css/optionsMacro.css b/src/gui/css/optionsMacro.css
deleted file mode 100644
index 9b36c43e5724f58bbabe2bf7f02cc3f012978842..0000000000000000000000000000000000000000
--- a/src/gui/css/optionsMacro.css
+++ /dev/null
@@ -1,124 +0,0 @@
-.optionMacro {
- margin-top: 8px;
- display: flex;
-}
-
-.optionDescription {
- display: inline-block;
- width: 50%;
- margin-right: 10px;
- text-align: right;
-}
-
-.optionValue {
- display: inline-flex;
- flex-wrap: wrap;
- width: 50%;
-}
-
-@media only screen and (max-width: 1200px) {
- .optionDescription {
- display: block;
- width: unset;
- text-align: left;
- }
-
- .optionValue {
- width: unset;
- }
-
- .optionMacro {
- margin-top: 30px;
- }
-
-}
-
-.optionMacroOption {
- border: #555 solid 0.5px;
- border-top-width: 0;
- vertical-align: top;
- -moz-user-select: none;
- min-width: 79px; /* 80px - 1px for border */
- max-height: 30px;
- display: inline-block;
- text-align: center;
-}
-
-.optionComment {
- vertical-align: top;
- color: gray;
-}
-
-/* But don't add the | after the last one */
-.optionMacroOption:last-child {
- border-top-right-radius: 6px;
- border-bottom-right-radius: 6px;
- border-right-width: 0;
-}
-
-.optionMacroOption:first-child {
- border-top-left-radius: 6px;
- border-bottom-left-radius: 6px;
-}
-
-.optionMacroOption a {
- padding: 0 10px;
- box-sizing: border-box;
- width: 100%;
- display: block;
-}
-
-.optionMacroOption:hover {
- background: #2F2F2F;
-}
-
-body.lightTheme .optionMacroOption:hover {
- background: #DDDDDD;
-}
-
-body.lightTheme .optionMacroSelected {
- background: #DDDDDD;
-}
-
-.optionMacroSelected {
- background: #2F2F2F;
- padding: 0 10px;
- min-width: 80px;
- cursor: pointer;
- box-sizing: border-box;
-}
-
-.optionValue input {
- padding: 3px 3px 3px 10px;
- background: transparent;
- border: #555 solid 0.5px;
- border-top-width: 0;
- min-width: unset;
- width: 140px;
- height: 22px;
-}
-
-.optionMacroNumber input {
- width: 50px;
-}
-
-.optionValue input:last-child {
- border-top-right-radius: 6px;
- border-bottom-right-radius: 6px;
- border-right-width: 0;
-}
-
-.optionValue input:first-child {
- border-top-left-radius: 6px;
- border-bottom-left-radius: 6px;
-}
-
-.optionMacroSelected.optionMacroEnable {
- color: rgb(230,255,230);
- background-image: linear-gradient(rgba(0, 255,0, 0.12), transparent);
-}
-
-.optionMacroSelected.optionMacroDisable {
- color: rgb(255,240,240);
- background-image: linear-gradient(rgba(255, 100, 0, 0.2), transparent);
-}
diff --git a/src/gui/css/quickListCSS.css b/src/gui/css/quickListCSS.css
index dfa45ef12f69dab58614dd8cfd456f21d69b374e..56c833939d2f8a922a172d6dc194cd66249f5477 100644
--- a/src/gui/css/quickListCSS.css
+++ b/src/gui/css/quickListCSS.css
@@ -1,4 +1,4 @@
-.hidden
+.ql-hidden
{
display:none;
}
diff --git a/src/gui/mainMenu/AlphaDisclaimer.tw b/src/gui/mainMenu/AlphaDisclaimer.tw
index 661fb76ccc73929ddeaffd64fe906a12d4a0396b..717c8b16c4e77e4162f5949f2685a6a065f55d41 100644
--- a/src/gui/mainMenu/AlphaDisclaimer.tw
+++ b/src/gui/mainMenu/AlphaDisclaimer.tw
@@ -30,7 +30,7 @@
Pregmod is a modification of the original <i>Free Cities</i> created by FCdev, which can be seen at https://freecitiesblog.blogspot.com/.
</div>
<div class="note">
- version: $ver, mod version: $pmodVer, build: $releaseID
+ version: $ver, mod version: $pmodVer, build: $releaseID <<if App.Version.commitHash>>commit: <<= App.Version.commitHash>><</if>>
</div>
<div id="version">
<<link "More version info">>
@@ -59,4 +59,4 @@
<p>
[[I am 18 or more years of age, I understand, and I wish to continue|Economy Intro]]
-</p>
\ No newline at end of file
+</p>
diff --git a/src/uncategorized/descriptionOptions.tw b/src/gui/options/descriptionOptions.tw
similarity index 100%
rename from src/uncategorized/descriptionOptions.tw
rename to src/gui/options/descriptionOptions.tw
diff --git a/src/gui/options/hotkeySettings.css b/src/gui/options/hotkeySettings.css
new file mode 100644
index 0000000000000000000000000000000000000000..08df500e4bc6e6c637c2739c4ff61c1f29494414
--- /dev/null
+++ b/src/gui/options/hotkeySettings.css
@@ -0,0 +1,42 @@
+div.hotkey-settings {
+ display: grid;
+ grid-template-columns: repeat(3, max-content) auto;
+}
+
+@media only screen and (min-width: 1600px) {
+ div.hotkey-settings {
+ grid-template-columns: repeat(3, max-content) auto repeat(3, max-content) auto;
+ }
+}
+
+div.hotkey-settings div.description {
+ margin-right: 10px;
+ /* center text vertically */
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
+}
+
+div.hotkey-settings button {
+ margin: 5px;
+ border-width: 2px;
+ background-color: var(--button-color);
+ border-color: var(--button-border-color);
+ width: 70px;
+}
+
+div.hotkey-settings button.combination {
+ min-width: 150px;
+ border-width: 0;
+}
+
+div.hotkey-settings button.inactive, div.hotkey-settings button.inactive:hover {
+ background-color: var(--button-selected-color);
+ cursor: default;
+
+}
+
+div.hotkey-settings button:hover {
+ background-color: var(--button-hover-color);
+ border-color: var(--button-border-color);
+}
diff --git a/src/gui/options/hotkeySettings.tw b/src/gui/options/hotkeySettings.tw
new file mode 100644
index 0000000000000000000000000000000000000000..b1bf6388eacc1f4df01bd3ee5d965dceab84e39e
--- /dev/null
+++ b/src/gui/options/hotkeySettings.tw
@@ -0,0 +1,27 @@
+:: Hotkey Settings [nobr jump-to-safe jump-from-safe]
+
+<<set $nextButton = "Back", $nextLink = "Main">>
+
+<h1>Hotkey Settings</h1>
+
+<p>
+ <ul>
+ <li>
+ On keyboard layouts other than the <a href="https://en.wikipedia.org/wiki/File:KB_United_States.svg"
+ target="_blank">US-QWERTY layout</a> there may be keys or combinations of keys where the recorded key is
+ different from the key used to listen to key events. You will have to find these keys yourself through trial
+ and error.
+ </li>
+ <li>
+ Custom hotkeys are browser specific and are not part of your save.
+ </li>
+ <li>
+ While we try not to overwrite browser or OS level key combinations it is possible to do so with custom
+ hotkeys. This also means that during recording of custom hotkeys no browser or OS level key combinations are
+ available. There are however keys that cannot be overwritten, the <code>Win key</code> on Windows is an
+ example for this.
+ </li>
+ </ul>
+</p>
+
+<<includeDOM App.UI.Hotkeys.settings()>>
diff --git a/src/gui/options.js b/src/gui/options/options.js
similarity index 100%
rename from src/gui/options.js
rename to src/gui/options/options.js
diff --git a/src/uncategorized/options.tw b/src/gui/options/options.tw
similarity index 99%
rename from src/uncategorized/options.tw
rename to src/gui/options/options.tw
index eca799a9e6bd84e22cd085b80a2d7b3a9638c026..f102bccda0ca8223c5e5f308c564c9d18098a85c 100644
--- a/src/uncategorized/options.tw
+++ b/src/gui/options/options.tw
@@ -96,8 +96,8 @@ This save was created using FC version $ver build $releaseID.
<<run _options.addOption("Master Suite report details such as slave changes are", "verboseDescriptions")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
- <<run _options.addOption("Accordion effects on weekly reports are", "useAccordion")
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
+ <<run _options.addOption("Accordion on week end defaults to", "useAccordion")
+ .addValue("Open", 0).on().addValue("Collapsed", 1).off()>>
<<run _options.addOption("Economic Tabs on weekly reports are", "useTabs")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()>>
@@ -645,7 +645,7 @@ This save was created using FC version $ver build $releaseID.
<<run _option.addComment("Enable cheat mode to edit genetics.")>>
<</if>>
- <<run _options.addOption("Rules Assistant").addCustomElement('<<button "Reset Rules">><<include "Init Rules">><<goto "Rules Assistant">><</button>>')>>
+ <<run _options.addOption("Rules Assistant").addCustomElement('<<button "Reset Rules">><<set $defaultRules=[]>><<include "Init Rules">><<goto "Rules Assistant">><</button>>')>>
<<run _options.addOption("Passage Profiler is", "profiler")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
diff --git a/src/uncategorized/summaryOptions.tw b/src/gui/options/summaryOptions.tw
similarity index 100%
rename from src/uncategorized/summaryOptions.tw
rename to src/gui/options/summaryOptions.tw
diff --git a/src/gui/quicklinks.js b/src/gui/quicklinks.js
index 5fda6b661f6c7dc1a85bb4b9f96c3142d5a7b9de..6a73c3e9734867074562d4cb0cf7972b3fdee4d0 100644
--- a/src/gui/quicklinks.js
+++ b/src/gui/quicklinks.js
@@ -17,7 +17,7 @@ App.UI.quickMenu = (function() {
const noHistory = Story.lookup("tags", "no-history").map(passage => passage.title);
// if property name is a passage name, then it's a link, otherwise only text.
- // category titles are never links to passages
+ // category titles are never links to passages
// Only two values are allowed: true or an object following the same rules
const layout = addOtherCategory({
Main: true,
@@ -37,6 +37,7 @@ App.UI.quickMenu = (function() {
"Future Society": true,
Policies: true,
edicts: true,
+ "Universal Rules": true,
"Neighbor Interact": true,
},
Facilities: {
@@ -76,7 +77,7 @@ App.UI.quickMenu = (function() {
Options: true,
"Summary Options": true,
"Description Options": true,
- "Universal Rules": true,
+ "Hotkey Settings": true,
}
});
@@ -177,49 +178,6 @@ App.UI.quickMenu = (function() {
"Manage Corporation": () => V.corp.SpecToken > 0 && V.corp.SpecTimer === 0,
});
- // setup hotkeys list, upper/lower case is important!
- // Due to limitation to the key capture library keys cannot be used when they are already used in
- // src/002-config/mousetrapConfig.js
- const hotkeys = cleanPassageMapping({
- "BG Select": "b",
- "Buy Slaves": "s",
- edicts: "E",
- Firebase: "z",
- "Future Society": "f",
- Main: "m",
- "Manage Arcology": "c",
- "Manage Corporation":"C",
- "Manage Penthouse": "p",
- "Manage Personal Affairs": "x",
- "Neighbor Interact": "d",
- Options: "o",
- "Personal assistant options": "t",
- "Personal Attention Select": "a",
- Policies: "y",
- propagandaHub: "H",
- "Recruiter Select": "u",
- riotControlCenter: "R",
- "Rules Assistant": "r",
- secBarracks: "A",
- securityHQ: "S",
- "Universal Rules": "v",
- // Facilities
- Brothel: "1",
- Club: "2",
- Arcade: "3",
- Dairy: "4",
- Farmyard: "5",
- "Servants' Quarters": "6",
- "Master Suite": "7",
- Schoolroom: "8",
- Spa: "9",
- Nursery: "0",
- Clinic: "shift+1",
- Cellblock: "shift+2",
- Incubator: "shift+3",
- Pit: "shift+4",
- });
-
/**
* The DOM element of name of the currently played passage or any of it's parents. Used during generation to
* uncollapse the category with the current passage.
@@ -235,14 +193,75 @@ App.UI.quickMenu = (function() {
let hotkeysEnabled = false;
// register hotkeys
- for (const passage in hotkeys) {
- Mousetrap.bind(hotkeys[passage], () => {
- if (hotkeysEnabled
- // the passage is accessible
- && !(hiddenPassages[passage] && hiddenPassages[passage]())) {
- Engine.play(passage);
- }
+ // this is in it's own scope as we can forget the hotkeys object immediately afterwards
+ {
+ // setup hotkeys list, upper/lower case is important!
+ const hotkeys = cleanPassageMapping({
+ "BG Select": "b",
+ "Buy Slaves": "s",
+ edicts: "shift+e",
+ Firebase: "z",
+ "Future Society": "f",
+ Main: "m",
+ "Manage Arcology": "c",
+ "Manage Corporation": "shift+c",
+ "Manage Penthouse": "p",
+ "Manage Personal Affairs": "x",
+ "Neighbor Interact": "d",
+ Options: "o",
+ "Personal assistant options": "t",
+ "Personal Attention Select": "a",
+ Policies: "y",
+ propagandaHub: "shift+h",
+ "Recruiter Select": "u",
+ riotControlCenter: "shift+r",
+ "Rules Assistant": "r",
+ secBarracks: "shift+a",
+ securityHQ: "shift+s",
+ "Universal Rules": "v",
+ // Facilities
+ Brothel: "1",
+ Club: "2",
+ Arcade: "3",
+ Dairy: "4",
+ Farmyard: "5",
+ "Servants' Quarters": "6",
+ "Master Suite": "7",
+ Schoolroom: "8",
+ Spa: "9",
+ Nursery: "0",
+ Clinic: "shift+1",
+ Cellblock: "shift+2",
+ Incubator: "shift+3",
+ Pit: "shift+4",
});
+
+ // register
+ for (const passage of jumpTo) {
+ if (!hidden.includes(passage)) {
+ const action = {
+ callback: () => {
+ if (hotkeysEnabled
+ // we are not already on the passage
+ && State.passage !== passage
+ // the passage is accessible
+ && !(hiddenPassages[passage] && hiddenPassages[passage]())) {
+ Engine.play(passage);
+ }
+ },
+ combinations: [],
+ };
+ // add hotkey if there is one
+ if (hotkeys[passage]) {
+ action.combinations.push(hotkeys[passage]);
+ }
+ // custom ui text
+ if (uiNames[passage]) {
+ action.uiName = uiNames[passage];
+ }
+ App.UI.Hotkeys.add(passage, action);
+ }
+ }
}
// setup history
@@ -268,10 +287,7 @@ App.UI.quickMenu = (function() {
history.shift();
}
});
- Mousetrap.bind("backspace", () => {
- // jump back in history
- goBack();
- });
+ App.UI.Hotkeys.add("historyBack", {callback: goBack, combinations: ["backspace"], uiName: "Back in history"});
/**
* Goes back in history if possible.
@@ -294,7 +310,10 @@ App.UI.quickMenu = (function() {
const a = document.createElement("a");
a.append("Return");
a.onclick = goBack;
- div.append(a, " ", App.UI.DOM.makeElement("span", "[backspace]", "hotkey"));
+ const hotkey = App.UI.Hotkeys.hotkeys("historyBack");
+ if (hotkey !== "") {
+ div.append(a, " ", App.UI.DOM.makeElement("span", hotkey, "hotkey"));
+ }
// insert at second position
linkList.splice(1, 0, div);
}
@@ -447,8 +466,9 @@ App.UI.quickMenu = (function() {
Engine.play(passage);
};
div.prepend(a);
- if (hotkeys[passage]) {
- div.append(" ", App.UI.DOM.makeElement("span", `[${hotkeys[passage]}]`, "hotkey"));
+ const hotkeyString = App.UI.Hotkeys.hotkeys(passage);
+ if (hotkeyString !== "") {
+ div.append(" ", App.UI.DOM.makeElement("span", hotkeyString, "hotkey"));
}
}
diff --git a/src/gui/storyCaptionWidgets.tw b/src/gui/storyCaptionWidgets.tw
index a8616c836cd97a0ccaa8c7a5a96f418853a33889..3242e2b91f508d773fa094bc13b6f1a8f560b3f0 100644
--- a/src/gui/storyCaptionWidgets.tw
+++ b/src/gui/storyCaptionWidgets.tw
@@ -7,7 +7,14 @@
<<if _Pass != "End Week">>
<<if _Pass == "Main">>
<strong>
- <div id="endWeekButton"><<link "END WEEK">><<run endWeek()>><</link>> @@.cyan;[Ent]@@</div>
+ <div id="endWeekButton">
+ <<link "END WEEK">>
+ <<run endWeek()>>
+ <</link>>
+ <span class="hotkey">
+ <<print App.UI.Hotkeys.hotkeys("endWeek")>>
+ </span>
+ </div>
</strong>
<<if $rulesAssistantAuto == 1 && DefaultRulesError()>>
<div>@@.yellow;WARNING: Rules Assistant has rules with errors!@@</div>
@@ -17,7 +24,10 @@
<<if $nextButton != " ">>
<<link "$nextButton">>
<<goto $nextLink>>
- <</link>> @@.cyan;[Space]@@
+ <</link>>
+ <span class="hotkey">
+ <<print App.UI.Hotkeys.hotkeys("nextLink")>>
+ </span>
<</if>>
</div></strong>
<</if>>
diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js
index a41eff26a9c25f0eebc58391665fbfcca9973862..d2be8893bee20de2008b2bc227d5a8d62731d11f 100644
--- a/src/interaction/main/mainLinks.js
+++ b/src/interaction/main/mainLinks.js
@@ -85,7 +85,7 @@ App.UI.View.mainLinks = function() {
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", "[A]", "hotkey"));
+ fragment.append(" ", link, " ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("Personal Attention"), "hotkey"));
}
if (V.useSlaveSummaryOverviewTab === 0) {
@@ -97,7 +97,7 @@ App.UI.View.mainLinks = function() {
}
div.append(". ",
App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Manage Head Girl", "HG Select"), "major-link"),
- " ", App.UI.DOM.makeElement("span", "[H]", "hotkey"));
+ " ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("HG Select"), "hotkey"));
div.id = "manageHG";
} else if (V.slaves.length > 1) {
div.append(`You have not selected a Head Girl`);
@@ -106,7 +106,7 @@ App.UI.View.mainLinks = function() {
}
div.append(". ",
App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Select One", "HG Select"), "major-link"),
- " ", App.UI.DOM.makeElement("span", "[H]", "hotkey"));
+ " ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("HG Select"), "hotkey"));
div.id = "manageHG";
} else {
div.append(App.UI.DOM.makeElement("span", "You do not have enough slaves to keep a Head Girl", "note"));
@@ -121,7 +121,7 @@ App.UI.View.mainLinks = function() {
div.append("You have not selected a Recruiter. ",
App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Select one", "Recruiter Select"), "major-link"));
}
- div.append(" ", App.UI.DOM.makeElement("span", "[U]", "hotkey"));
+ div.append(" ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("Recruiter Select"), "hotkey"));
div.id = "manageRecruiter";
fragment.append(div);
@@ -134,7 +134,7 @@ App.UI.View.mainLinks = function() {
div.append("You have not selected a Bodyguard. ",
App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Select one", "BG Select"), "major-link"));
}
- div.append(" ", App.UI.DOM.makeElement("span", "[B]", "hotkey"));
+ div.append(" ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("BG Select"), "hotkey"));
div.id = "manageBG";
fragment.append(div);
}
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index dd329a392210a6e6b31406c50ed4575281ef6187..a16fedbda3932538defd7d1a4977e90791351fb8 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -176,6 +176,7 @@ App.UI.SlaveInteract.work = function(slave) {
const links = [];
const {
He,
+ him
} = getPronouns(slave);
function appendLink(text, whoreClass, enabled, disabledText) {
@@ -189,9 +190,17 @@ App.UI.SlaveInteract.work = function(slave) {
}
p = document.createElement('p');
- if ([Job.AGENT, Job.AGENTPARTNER].includes(slave.assignment)) {
+ if (slave.assignment === Job.AGENT) {
+ const arc = V.arcologies.find((a) => a.leaderID === slave.ID);
p.className = "scene-intro";
- p.textContent = `Recall your agent to modify them.`;
+ p.textContent = `${He} is serving as your Agent${arc ? ` leading ${arc.name}` : ` but is not currently assigned to an arcology`}. `;
+ p.appendChild(App.UI.DOM.link(`Recall and reenslave ${him}`, () => { removeJob(slave, slave.assignment, false); App.UI.SlaveInteract.work(slave); }));
+ } else if (slave.assignment === Job.AGENTPARTNER) {
+ const agent = getSlave(slave.relationshipTarget);
+ const arc = agent ? V.arcologies.find((a) => a.leaderID === agent.ID) : null;
+ p.className = "scene-intro";
+ p.textContent = `${He} is living with your Agent ${SlaveFullName(agent)}${arc ? ` in ${arc.name}` : ``}. `;
+ p.appendChild(App.UI.DOM.link(`Recall ${him}`, () => { removeJob(slave, slave.assignment, false); App.UI.SlaveInteract.work(slave); }));
} else {
div = document.createElement('div');
div.id = "miniscene";
@@ -1165,16 +1174,14 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
const lover = getSlave(slave.relationshipTarget);
if (isSlaveAvailable(lover)) {
sexOptions.push({text: `Fuck ${him} with ${his} ${relationshipTermShort(slave)} ${SlaveFullName(lover)}`, scene: `FRelation`, update: {partner: "relationship"}});
- } else {
- if (lover.assignment === Job.AGENT) {
- if (slave.broodmother < 2) {
- sexOptions.push({text: `Send ${him} to live with your agent ${SlaveFullName(lover)}`, goto: `Agent Company`, update: {subSlave: lover}});
- } else {
- sexOptions.push({text: `A hyper-broodmother cannot be sent to live with your agent`});
- }
+ } else if (lover.assignment === Job.AGENT) {
+ if (slave.broodmother < 2) {
+ sexOptions.push({text: `Send ${him} to live with your agent ${SlaveFullName(lover)}`, goto: `Agent Company`, update: {subSlave: lover}});
} else {
- sexOptions.push({text: `${SlaveFullName(lover)} is unavailable`});
+ sexOptions.push({text: `A hyper-broodmother cannot be sent to live with your agent`});
}
+ } else {
+ sexOptions.push({text: `${SlaveFullName(lover)} is unavailable`});
}
}
if (slave.rivalryTarget !== 0 && hasAllLimbs(slave)) {
diff --git a/src/js/accordianJS.js b/src/js/accordianJS.js
deleted file mode 100644
index 9c6ae8a420ec9c37c99f796c9eb80070228a642d..0000000000000000000000000000000000000000
--- a/src/js/accordianJS.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Accordion 000-250-006 */
-/* no-usedOnce */
-
-/*
- * We're making changes to the DOM, so we need to make them *after* everything has been generated
- * Sticking this all in postdisplay calls reduces the chance of there being a timing conflict
- * with other scripts, since anything poking the DOM here will be done last
- *
- * Dev Note: The accordion mod should be able to turn *anything* into an accordion. This iteration
- * is configured tightly for the end of week report runs, but it shouldn't be that hard to adapt for
- * other uses, like character bios. For now, I'll see what other extra-long passages of cosmetic text
- * might benefit.
- *
- * 000-250-006 03092017
- */
-
-postdisplay.doAccordionSet = function() {
- if (variables().useAccordion === 1) {
- Array.prototype.slice.call(document.querySelectorAll(".macro-include"))
- .forEach(function(element) {
- element.classList.add("accHidden");
- });
- }
-};
-
-postdisplay.doAccordion = function() {
- const acc = document.getElementsByClassName("accordion");
-
- for (let i = 0; i < acc.length; i += 1) {
- acc[i].onclick = function() {
- this.classList.toggle("active");
- let panel = this.nextElementSibling;
- if (panel === null || panel === undefined) {
- panel = document.getElementById(`${this.id}accHidden`);
- if (panel.style.display === "none") {
- panel.style.display = "";
- } else {
- panel.style.display = "none";
- }
- } else {
- if (panel.style.maxHeight) {
- panel.style.maxHeight = null;
- } else {
- panel.style.maxHeight = `${2 * panel.scrollHeight}px`;
- }
- }
- };
- }
-};
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index a79213523cab2231a372807a8bda25c85a24d73f..130bd855d4008e6d24d0c198ee7567629e0c092a 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -388,8 +388,18 @@ globalThis.assignJob = function(slave, job) {
WombCleanGenericReserve(slave, 'incubator', 9999);
WombCleanGenericReserve(slave, 'nursery', 9999);
if (job === Job.AGENT) {
- App.activeArcology().leaderID = slave.ID;
- App.activeArcology().government = "your agent";
+ if (App.activeArcology().direction !== 0) { // never assign an agent to the player's arcology
+ if (App.activeArcology().leaderID !== 0) {
+ const oldAgent = getSlave(App.activeArcology().leaderID);
+ if (oldAgent && oldAgent.assignment === Job.AGENT) {
+ // this is an error...you should never be able to assign an agent over the top of another
+ // but in order to prevent game state corruption, we are going to remove the old agent
+ removeJob(oldAgent, oldAgent.assignment, false);
+ }
+ }
+ App.activeArcology().leaderID = slave.ID;
+ App.activeArcology().government = "your agent";
+ }
}
break;
@@ -436,6 +446,8 @@ globalThis.assignJobSafely = function(slave, assignmentStr) {
if (V.assignmentRecords[slave.ID] === Job.CHOICE) {
assignJob(slave, Job.REST);
slave.choosesOwnAssignment = 1;
+ } else if ([Job.AGENT, Job.AGENTPARTNER].includes(V.assignmentRecords[slave.ID])) { // it is NEVER safe to auto-reassign agents (we don't know which arcology they came from)
+ assignJob(slave, Job.REST);
} else if (!App.Utils.jobForAssignment(assignmentStr).canEmploy(slave).length) { // If nothing complains about job requirements not being met
assignJob(slave, assignmentStr);
} else {
@@ -629,15 +641,17 @@ globalThis.removeJob = function(slave, assignment, saveRecord = false) {
case Job.AGENTPARTNER:
if (slave.assignment === Job.AGENT) {
const arc = V.arcologies.find((a) => a.leaderID === slave.ID);
- arc.leaderID = 0;
- arc.government = "your trustees";
+ if (arc) {
+ arc.leaderID = 0;
+ arc.government = "your trustees";
+ }
}
slave.assignment = Job.REST;
if (slave.relationshipTarget > 0) {
/* following code assumes there can be at most one companion */
- const _lover = V.slaves.findIndex(s => haveRelationshipP(s, slave) && s.assignment === Job.AGENTPARTNER);
- if (_lover !== -1) {
- V.slaves[_lover].assignment = Job.REST;
+ const lover = V.slaves.find(s => haveRelationshipP(s, slave) && s.assignment === Job.AGENTPARTNER);
+ if (lover) {
+ removeJob(lover, Job.AGENTPARTNER, saveRecord);
}
}
break;
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 085777c08158676bca1c51cd639e0a3c50f3ae84..7c70eda174437621a4632e5e0499c3ec633a0d34 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -762,7 +762,7 @@ globalThis.calculateCosts = (function() {
const currentPA = V.personalAttention;
let costs = 0;
if (V.PC.actualAge >= V.IsInPrimePC && V.PC.actualAge < V.IsPastPrimePC) {
- if (PA.includes(currentPA) && currentPA !== PersonalAttention.MAID) {
+ if (PA.includes(currentPA) && currentPA !== PersonalAttention.MAID && currentPA !== PersonalAttention.SUPPORTHG) {
costs += 10000 * V.AgeEffectOnTrainerPricingPC;
}
}
diff --git a/src/js/main.js b/src/js/main.js
index 1854c4e6343b57ee130cb45a5faad2fcb66b0a0e..2dea7157fec6271d7db5200973c606b85d512b5d 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -225,7 +225,7 @@ App.MainView.full = function() {
const raLink = document.createElement("span");
raLink.id = "RAButton";
raLink.append(" | ", App.UI.DOM.passageLink("Rules Assistant Options", "Rules Assistant"),
- " ", App.UI.DOM.makeElement("span", "[R]", ["clear-formatting", "hotkey"]));
+ " ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("Rules Assistant"), ["clear-formatting", "hotkey"]));
span.append(raLink);
if (V.rulesAssistantAuto !== 1) {
diff --git a/src/js/modification.js b/src/js/modification.js
index 6240b073b6fc81f9c85aaddf8aaf1664d7767495..97033fee73f9ec7b0f85721333a7042530171dfc 100644
--- a/src/js/modification.js
+++ b/src/js/modification.js
@@ -3,7 +3,7 @@
* @param {App.Entity.SlaveState} slave
* @param {string} scar
* @param {string} design
- * @param {number} weight
+ * @param {number} [weight]
*/
App.Medicine.Modification.addScar = function(slave, scar, design, weight) {
/*
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index c16dd5d33808bf0d56e4d505652c24b3a48ef97b..b986d9b41b0b2cf975066e846ff1c7cb6d41e051 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -571,7 +571,10 @@ globalThis.rulesAssistantOptions = (function() {
}
setValue(what) {
- this.radios_.get(what === null ? noDefaultSetting.value : what).checked = true;
+ const option = this.radios_.get(what === null ? noDefaultSetting.value : what);
+ if (option) {
+ option.checked = true;
+ }
}
inputEdited() {
@@ -3930,8 +3933,8 @@ globalThis.rulesAssistantOptions = (function() {
class SemenSurgeryList extends RadioSelector {
constructor() {
const items = [
- ["implanted", 1],
- ["removed", 0],
+ ["implanted", 2],
+ ["removed", 1],
];
super("Prostate production enhancing drug implants", items, true);
this.setValue(current_rule.set.surgery.prostate);
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 80fdc094750671a602ae7c94b26e1e869443772e..0ae8f7f69287548db871e05ef298dc80a9ba536b 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -299,9 +299,9 @@ globalThis.rulesAutosurgery = (function() {
});
}
- if (slave.prostate === 2 && thisSurgery.prostate === 0) {
- commitProcedure(`surgery to remove ${his} prostate implant`, s => { s.prostate = 0; });
- } else if (slave.prostate === 1 && thisSurgery.prostate === 1) {
+ if (slave.prostate === 2 && thisSurgery.prostate === 1) {
+ commitProcedure(`surgery to remove ${his} prostate implant`, s => { s.prostate = 1; });
+ } else if (slave.prostate === 1 && thisSurgery.prostate === 2) {
commitProcedure("a precum production enhancing drug implant", s => { s.prostate = 2; });
} else if (slave.balls > 0 && slave.vasectomy === 0 && thisSurgery.vasectomy === true) {
commitProcedure("vasectomy", s => { s.vasectomy = 1; });
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 8746c0a8ad9c3b97e57acf3a8de15451be901e3a..c8c1bd2d769e90d408406ad2e802115e83dedf80 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1,4 +1,8 @@
-globalThis.minimumSlaveCost = function() {
+/** Calculate the minimum slave cost for a given market
+ * @param {boolean} includeLaws
+ * @returns {number}
+ */
+globalThis.minimumSlaveCost = function(includeLaws) {
let value = 3000;
if (V.terrain === "urban") {
@@ -10,55 +14,57 @@ globalThis.minimumSlaveCost = function() {
value -= 1000;
}
- if (V.policies.SMR.basicSMR === 1) {
- value += 500;
- }
- if (V.policies.SMR.healthInspectionSMR === 1) {
- value += 500;
- }
- if (V.policies.SMR.educationSMR === 1) {
- value += 500;
- }
- if (V.policies.SMR.frigiditySMR === 1) {
- value += 500;
- }
- if (V.policies.SMR.honestySMR === 1) {
- value += 500;
- }
- value += policies.countEugenicsSMRs() * 500;
+ if (includeLaws) {
+ if (V.policies.SMR.basicSMR === 1) {
+ value += 500;
+ }
+ if (V.policies.SMR.healthInspectionSMR === 1) {
+ value += 500;
+ }
+ if (V.policies.SMR.educationSMR === 1) {
+ value += 500;
+ }
+ if (V.policies.SMR.frigiditySMR === 1) {
+ value += 500;
+ }
+ if (V.policies.SMR.honestySMR === 1) {
+ value += 500;
+ }
+ value += policies.countEugenicsSMRs() * 500;
- if (V.policies.SMR.weightSMR === 1) {
- value += 3000;
- }
- if (V.policies.SMR.beauty.basicSMR === 1) {
- value += 3000;
- }
- if (V.policies.SMR.beauty.qualitySMR === 1) {
- value += 10000;
- }
- if (V.policies.SMR.height.basicSMR !== 0) {
- value += 5000;
- }
- if (V.policies.SMR.height.advancedSMR !== 0) {
- value += 10000;
- }
- if (V.policies.SMR.intelligence.basicSMR === 1) {
- value += 2000;
- }
- if (V.policies.SMR.intelligence.qualitySMR === 1) {
- value += 10000;
- }
+ if (V.policies.SMR.weightSMR === 1) {
+ value += 3000;
+ }
+ if (V.policies.SMR.beauty.basicSMR === 1) {
+ value += 3000;
+ }
+ if (V.policies.SMR.beauty.qualitySMR === 1) {
+ value += 10000;
+ }
+ if (V.policies.SMR.height.basicSMR !== 0) {
+ value += 5000;
+ }
+ if (V.policies.SMR.height.advancedSMR !== 0) {
+ value += 10000;
+ }
+ if (V.policies.SMR.intelligence.basicSMR === 1) {
+ value += 2000;
+ }
+ if (V.policies.SMR.intelligence.qualitySMR === 1) {
+ value += 10000;
+ }
- const FS = [
- 'FSPaternalistSMR', 'FSBodyPuristSMR', 'FSTransformationFetishistSMR',
- 'FSYouthPreferentialistSMR', 'FSMaturityPreferentialistSMR', 'FSSlimnessEnthusiastSMR',
- 'FSAssetExpansionistSMR', 'FSPastoralistSMR', 'FSPhysicalIdealistSMR',
- 'FSHedonisticDecadenceSMR', 'FSEgyptianRevivalistSMR', 'FSEdoRevivalistSMR',
- 'FSArabianRevivalistSMR', 'FSChineseRevivalistSMR'
- ];
- for (const key of FS) {
- if (V.arcologies[0][key]) {
- value += 500;
+ const FS = [
+ 'FSPaternalistSMR', 'FSBodyPuristSMR', 'FSTransformationFetishistSMR',
+ 'FSYouthPreferentialistSMR', 'FSMaturityPreferentialistSMR', 'FSSlimnessEnthusiastSMR',
+ 'FSAssetExpansionistSMR', 'FSPastoralistSMR', 'FSPhysicalIdealistSMR',
+ 'FSHedonisticDecadenceSMR', 'FSEgyptianRevivalistSMR', 'FSEdoRevivalistSMR',
+ 'FSArabianRevivalistSMR', 'FSChineseRevivalistSMR'
+ ];
+ for (const key of FS) {
+ if (V.arcologies[0][key]) {
+ value += 500;
+ }
}
}
@@ -1608,28 +1614,13 @@ globalThis.BeautyTooltip = function(slave) {
let el = document.createElement('div');
el.className = "clear-formatting";
- let textNode = document.createTextNode(`Sort by: `);
- el.appendChild(textNode);
-
- el.appendChild(App.UI.DOM.link("Text", () => { criteria = "text", jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []));
-
- textNode = document.createTextNode(` | `);
- el.appendChild(textNode);
-
- el.appendChild(App.UI.DOM.link("Value", () => { criteria = "value", jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []));
-
- textNode = document.createTextNode(` | `);
- el.appendChild(textNode);
-
- el.appendChild(App.UI.DOM.link("Ascending", () => { direction = "ascending", jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []));
-
- textNode = document.createTextNode(` | `);
- el.appendChild(textNode);
-
- el.appendChild(App.UI.DOM.link("Descending", () => { direction = "descending", jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []));
-
- textNode = document.createTextNode(` | `);
- el.appendChild(textNode);
+ el.appendChild(document.createTextNode(`Sort by: `));
+ el.appendChild(App.UI.DOM.generateLinksStrip([
+ App.UI.DOM.link("Text", () => { criteria = "text"; jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []),
+ App.UI.DOM.link("Value", () => { criteria = "value"; jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []),
+ App.UI.DOM.link("Ascending", () => { direction = "ascending"; jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []),
+ App.UI.DOM.link("Descending", () => { direction = "descending"; jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, [])
+ ]));
let cheatBeautyContents = document.createElement('div');
cheatBeautyContents.id = "cheatBeautyContents";
@@ -2072,11 +2063,11 @@ globalThis.FResultArray = (function() {
*/
function calcAge(slave) {
if ((V.arcologies[0].FSRepopulationFocus !== "unset" || V.arcologies[0].FSGenderFundamentalist !== "unset") && slave.physicalAge === V.minimumSlaveAge && slave.physicalAge === V.fertilityAge && canGetPregnant(slave)) {
- adjustFResult(`Young and Fertile: Repopulationist /Gender Fundamentalist`, 1);
+ adjustFResult(`Young and Fertile: Repopulationist/Gender Fundamentalist`, 1);
if (slave.birthWeek === 0) {
- adjustFResult(`Newborn and Fertile: Repopulationist /Gender Fundamentalist`, result);
+ adjustFResult(`Newborn and Fertile: Repopulationist/Gender Fundamentalist`, result);
} else if (slave.birthWeek < 4) {
- adjustFResult(`Very Young and Fertile: Repopulationist /Gender Fundamentalist`, 0.2 * result);
+ adjustFResult(`Very Young and Fertile: Repopulationist/Gender Fundamentalist`, 0.2 * result);
}
} else if (slave.physicalAge === V.minimumSlaveAge) {
adjustFResult(`Young`, 1);
@@ -2086,11 +2077,11 @@ globalThis.FResultArray = (function() {
adjustFResult(`Very Young`, 0.1 * result);
}
} else if ((V.arcologies[0].FSRepopulationFocus !== "unset" || V.arcologies[0].FSGenderFundamentalist !== "unset") && slave.physicalAge === V.fertilityAge && canGetPregnant(slave)) {
- adjustFResult(`Young and Fertile: Repopulationist /Gender Fundamentalist`, 1);
+ adjustFResult(`Young and Fertile: Repopulationist/Gender Fundamentalist`, 1);
if (slave.birthWeek === 0) {
- adjustFResult(`Newborn and Fertile: Repopulationist /Gender Fundamentalist`, 0.5 * result);
+ adjustFResult(`Newborn and Fertile: Repopulationist/Gender Fundamentalist`, 0.5 * result);
} else if (slave.birthWeek < 4) {
- adjustFResult(`Very Young and Fertile: Repopulationist /Gender Fundamentalist`, 0.1 * result);
+ adjustFResult(`Very Young and Fertile: Repopulationist/Gender Fundamentalist`, 0.1 * result);
}
}
}
@@ -2156,28 +2147,13 @@ globalThis.FResultTooltip = function(slave) {
let el = document.createElement('div');
el.className = "clear-formatting";
- let textNode = document.createTextNode(`Sort by: `);
- el.appendChild(textNode);
-
- el.appendChild(App.UI.DOM.link("Text", () => { criteria = "text", jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []));
-
- textNode = document.createTextNode(` | `);
- el.appendChild(textNode);
-
- el.appendChild(App.UI.DOM.link("Value", () => { criteria = "value", jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []));
-
- textNode = document.createTextNode(` | `);
- el.appendChild(textNode);
-
- el.appendChild(App.UI.DOM.link("Ascending", () => { direction = "ascending", jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []));
-
- textNode = document.createTextNode(` | `);
- el.appendChild(textNode);
-
- el.appendChild(App.UI.DOM.link("Descending", () => { direction = "descending", jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []));
-
- textNode = document.createTextNode(` | `);
- el.appendChild(textNode);
+ el.appendChild(document.createTextNode(`Sort by: `));
+ el.appendChild(App.UI.DOM.generateLinksStrip([
+ App.UI.DOM.link("Text", () => { criteria = "text"; jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []),
+ App.UI.DOM.link("Value", () => { criteria = "value"; jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []),
+ App.UI.DOM.link("Ascending", () => { direction = "ascending"; jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []),
+ App.UI.DOM.link("Descending", () => { direction = "descending"; jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, [])
+ ]));
let cheatFResultContents = document.createElement('div');
cheatFResultContents.id = "cheatFResultContents";
@@ -2234,9 +2210,15 @@ globalThis.FResultTooltip = function(slave) {
}
};
-globalThis.slaveCost = function(slave, isStartingSlave) {
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @param {boolean} [isStartingSlave=false] is the slave a "starting slave"
+ * @param {boolean} [followLaws=false] Apply cost variations from enacted Slave Market Regulations
+ * @returns {number}
+ */
+globalThis.slaveCost = function(slave, isStartingSlave=false, followLaws=false) {
const milked = App.SlaveAssignment.getMilked(slave, true);
- const beauty = slaveCostBeauty(slave, isStartingSlave);
+ const beauty = slaveCostBeauty(slave, isStartingSlave, followLaws);
if ((milked*52) > beauty && !isStartingSlave) { // Arbitrarily, let's say their milk worth is what they would make in a year. Blocking starting slave for now because milk makes so much money, the estimation makes game start impossible.
return milked*52;
} else {
@@ -2253,14 +2235,14 @@ globalThis.slaveCostBeauty = (function() {
/**
* @param {App.Entity.SlaveState} slave
- * @param {number} isStartingSlave
- * @returns {number} Any number here means the slave
- * is a "starting slave"
+ * @param {boolean} isStartingSlave is the slave a "starting slave"
+ * @param {boolean} followLaws Apply cost variations from enacted Slave Market Regulations
+ * @returns {number}
*/
- function slaveCost(slave, isStartingSlave) {
+ function slaveCost(slave, isStartingSlave, followLaws) {
arcology = V.arcologies[0];
multiplier = V.slaveCostFactor;
- cost = Beauty(slave) * FResult(slave, 1);
+ cost = Beauty(slave) * FResult(slave);
calcGenitalsCost(slave);
calcDevotionTrustCost(slave);
@@ -2277,7 +2259,7 @@ globalThis.slaveCostBeauty = (function() {
calcMiscCost(slave);
calcIndentureCost(slave); /* multipliers */
- calcCost();
+ calcCost(followLaws);
if (isStartingSlave) {
calcStartingSlaveCost(slave);
}
@@ -2673,11 +2655,15 @@ globalThis.slaveCostBeauty = (function() {
}
}
- function calcCost( /* slave */ ) {
+ /**
+ * @param {boolean} followLaws
+ */
+ function calcCost(followLaws) {
cost *= multiplier * 50;
cost = Number(cost) || 0;
- if (cost < minimumSlaveCost()) {
- cost = minimumSlaveCost();
+ const minimumCost = minimumSlaveCost(followLaws);
+ if (cost < minimumCost) {
+ cost = minimumCost;
} else if (cost <= 100000) {
/* do nothing */
} else if (cost <= 200000) {
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 09d47f01788c95c72f6eff1d037af2e1ac7842f6..ccd92f5fe26781859a4d46ee98565375022bb360 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -439,12 +439,12 @@ App.UI.SlaveList.render = function() {
quickIndexBtn.onclick = function(ev) {
let which = ev.target.attributes["data-quick-index"].value;
let quick = $("div#list_index" + which);
- quick.toggleClass("hidden");
+ quick.toggleClass("ql-hidden");
};
/*
* we want <div id="list_index3" class=" hidden">...
*/
- const listIndex = makeElement(res, "div", undefined, "hidden");
+ const listIndex = makeElement(res, "div", undefined, "ql-hidden");
listIndex.id = `list_index${listID}`;
for (const sID of IDs) {
@@ -864,7 +864,7 @@ App.UI.SlaveList.penthousePage = function() {
slaveWrapper.append(". ");
const link = App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Manage Head Girl", "HG Select"), "major-link");
link.id = "manageHG";
- slaveWrapper.append(link, " ", App.UI.DOM.makeElement("span", "[H]", "hotkey"));
+ slaveWrapper.append(link, " ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("HG Select"), "hotkey"));
slaveWrapper.append(App.UI.SlaveList.render.listDOM([HG.ID], [],
App.UI.SlaveList.SlaveInteract.penthouseInteract));
} else {
@@ -874,7 +874,7 @@ App.UI.SlaveList.penthousePage = function() {
slaveWrapper.append(" and Consort");
}
slaveWrapper.append(". ", App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Select One", "HG Select"), "major-link"),
- " ", App.UI.DOM.makeElement("span", "[H]", "hotkey"));
+ " ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("HG Select"), "hotkey"));
slaveWrapper.id = "manageHG";
if (V.slavePanelStyle === 2) {
slaveWrapper.classList.add("slaveSummary", "card");
@@ -907,13 +907,13 @@ App.UI.SlaveList.penthousePage = function() {
slaveWrapper.append(". ");
const link = App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Manage Recruiter", "Recruiter Select"), "major-link");
link.id = "manageRecruiter";
- slaveWrapper.append(link, " ", App.UI.DOM.makeElement("span", "[U]", "hotkey"));
+ slaveWrapper.append(link, " ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("Recruiter Select"), "hotkey"));
slaveWrapper.append(App.UI.SlaveList.render.listDOM([RC.ID], [],
App.UI.SlaveList.SlaveInteract.penthouseInteract));
} else {
slaveWrapper.append("You have ", App.UI.DOM.makeElement("span", "not", "warning"), " selected a Recruiter. ",
App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Select one", "Recruiter Select"), "major-link"),
- " ", App.UI.DOM.makeElement("span", "[U]", "hotkey"));
+ " ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("Recruiter Select"), "hotkey"));
slaveWrapper.id = "manageRecruiter";
if (V.slavePanelStyle === 2) {
slaveWrapper.classList.add("slaveSummary", "card");
@@ -930,14 +930,14 @@ App.UI.SlaveList.penthousePage = function() {
" is serving as your bodyguard. ");
const link = App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Manage Bodyguard", "BG Select"), "major-link");
link.id = "manageBG";
- slaveWrapper.append(link, " ", App.UI.DOM.makeElement("span", "[B]", "hotkey"));
+ slaveWrapper.append(link, " ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("BG Select"), "hotkey"));
slaveWrapper.append(App.UI.SlaveList.render.listDOM([BG.ID], [],
App.UI.SlaveList.SlaveInteract.penthouseInteract));
slaveWrapper.append(App.MainView.useGuard());
} else {
slaveWrapper.append("You have ", App.UI.DOM.makeElement("span", "not", "warning"), " selected a Bodyguard. ",
App.UI.DOM.makeElement("span", App.UI.DOM.passageLink("Select one", "BG Select"), "major-link"),
- " ", App.UI.DOM.makeElement("span", "[B]", "hotkey"));
+ " ", App.UI.DOM.makeElement("span", App.UI.Hotkeys.hotkeys("BG Select"), "hotkey"));
slaveWrapper.id = "manageBG";
if (V.slavePanelStyle === 2) {
slaveWrapper.classList.add("slaveSummary", "card");
diff --git a/src/js/utilsDOM.js b/src/js/utilsDOM.js
index 25cbe24234b9c02415a77302d294d5c3c9d62de8..7b8889be1d68e76a982bbae69575f25013469e88 100644
--- a/src/js/utilsDOM.js
+++ b/src/js/utilsDOM.js
@@ -346,6 +346,35 @@ App.UI.DOM.generateLinksStrip = function(links) {
return strip;
};
+/**
+ * @param {Node|string} head
+ * @param {HTMLDivElement} [content]
+ * @param {boolean} [hidden]
+ * @returns {DocumentFragment}
+ */
+App.UI.DOM.accordion = function(head, content, hidden = true) {
+ const fragment = document.createDocumentFragment();
+ const button = App.UI.DOM.appendNewElement("button", fragment, head, "accordion");
+
+ if (content) {
+ content.classList.add("accordion-content");
+ if (hidden) {
+ content.classList.add("hidden");
+ } else {
+ button.classList.add("open");
+ }
+ button.onclick = () => {
+ button.classList.toggle("open");
+ content.classList.toggle("hidden");
+ };
+ fragment.append(content);
+ } else {
+ button.classList.add("empty");
+ }
+
+ return fragment;
+};
+
/*
<<includeDOM element>>
Simply inserts a given DOM element.
diff --git a/src/npc/descriptions/belly/bellyImplant.js b/src/npc/descriptions/belly/bellyImplant.js
index 6e227c48d082e6204d98a0f1f3614f14df3f512b..9730fd178c96911f385597cdefe3f0ecd2d96e5c 100644
--- a/src/npc/descriptions/belly/bellyImplant.js
+++ b/src/npc/descriptions/belly/bellyImplant.js
@@ -2195,7 +2195,7 @@ App.Desc.bellyImplant = function(slave) {
if (slave.birthsTat > 0) {
if (slave.birthsTat > 1) {
- r.push(`${He} has a series of ${slave.birthsTat} baby-shaped tattoos adorning ${his} stomach; one for each successful `);
+ r.push(`${He} has a series of ${slave.birthsTat} baby-shaped tattoos adorning ${his} stomach; one for each successful`);
if (slave.pregKnown === 1) {
r.push(`pregnancy and a temporary one for ${his} current pregnancy.`);
} else {
diff --git a/src/npc/descriptions/butt/anus.js b/src/npc/descriptions/butt/anus.js
index a4e0f47b75b8cf966792f9363bfab7b83ffbbb03..fc1e2376b259bbbff1656535e5707f868a8a2786 100644
--- a/src/npc/descriptions/butt/anus.js
+++ b/src/npc/descriptions/butt/anus.js
@@ -25,17 +25,16 @@ App.Desc.anus = function(slave) {
if (slave.analArea - slave.anus > 3) {
r.push(`but it's surrounded by a massive oval of ${analSkinDesc} ${skinDesc} skin that runs from ${his} tailbone all the way down to the`);
if (slave.vagina > -1) {
- r.push(`bottom of ${his} pussy`);
+ r.push(`bottom of ${his} pussy.`);
} else {
- r.push(`base of ${his} cock`);
+ r.push(`base of ${his} cock.`);
}
- r.push(`.`);
} else if (slave.analArea - slave.anus > 2) {
- r.push(`but it's surrounded by an oval of ${analSkinDesc} ${skinDesc} skin that occupies ${his} entire ${either("asscrack", "buttcrack")} ass`);
+ r.push(`but it's surrounded by an oval of ${analSkinDesc} ${skinDesc} skin that occupies ${his} entire ${either("asscrack", "buttcrack")} ass.`);
} else if (slave.analArea - slave.anus > 1) {
r.push(`but it's surrounded by a big ring of ${analSkinDesc} ${skinDesc} skin.`);
} else if (slave.analArea - slave.anus > 0) {
- r.push(`and it's surrounded by a cute ${either("pucker", "ring", "rosebud")} of ${skinDesc} skin`);
+ r.push(`and it's surrounded by a cute ${either("pucker", "ring", "rosebud")} of ${skinDesc} skin.`);
} else {
r.push(`and the ${skinDesc} skin around it is stretched smooth, since it's been deflowered only recently.`);
}
@@ -69,7 +68,7 @@ App.Desc.anus = function(slave) {
r.push(`base of ${his} cock.`);
}
} else if (slave.analArea - slave.anus > 0) {
- r.push(`and it's surrounded by an oval of ${analSkinDesc} ${skinDesc} skin that occupies ${his} entire ${either("asscrack", "buttcrack")}`);
+ r.push(`and it's surrounded by an oval of ${analSkinDesc} ${skinDesc} skin that occupies ${his} entire ${either("asscrack", "buttcrack")}.`);
} else {
r.push(`and the ${skinDesc} skin around it is stretched smooth, suggesting ${he}'s getting used to having such a cock-hungry rear fuckhole.`);
}
@@ -78,11 +77,10 @@ App.Desc.anus = function(slave) {
if (slave.analArea - slave.anus > 0) {
r.push(`and it's surrounded by a massive oval of ${skinDesc} skin that runs from ${his} tailbone all the way down to the`);
if (slave.vagina > -1) {
- r.push(`bottom of ${his} pussy`);
+ r.push(`bottom of ${his} pussy.`);
} else {
- r.push(`base of ${his} cock`);
+ r.push(`base of ${his} cock.`);
}
- r.push(`.`);
} else {
r.push(`and the ${skinDesc} skin around it is stretched smooth, suggesting ${he}'s only recently had ${his} ass ruined.`);
}
diff --git a/src/npc/descriptions/career.js b/src/npc/descriptions/career.js
new file mode 100644
index 0000000000000000000000000000000000000000..2224b10e803cfc7909255ea961b0094ea112afd1
--- /dev/null
+++ b/src/npc/descriptions/career.js
@@ -0,0 +1,209 @@
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
+App.Desc.career = function(slave) {
+ const r = [];
+ const careersArray = [];
+ const {
+ he, him, his, hers, himself, boy, He, His
+ } = getPronouns(slave);
+ const career = convertCareer(slave);
+
+ if (slave.fuckdoll === 0) {
+ if (slave.career !== 0) {
+ if (slave.career === "a slave") {
+ r.push(`${He} was a slave long before you obtained ${him}.`);
+ } else if (slave.career === "a slave since birth") {
+ r.push(`${He}'s been your slave ${his} entire life.`);
+ } else if (slave.career === "a meat toilet" || slave.career === "a cum dump") {
+ r.push(`${He} sees ${him}self as a cum receptacle.`);
+ } else if (slave.career === "a dairy cow") {
+ r.push(`${He}'s been broken into the belief that ${he} is nothing more than a cow to be milked and bred.`);
+ } else if (slave.career === "a breeding bull") {
+ r.push(`${He}'s been broken into the belief that ${he} is nothing more than a bull destined to fill fertile wombs with calves.`);
+ } else if (slave.career === "a breeder") {
+ r.push(`Before you obtained ${him}, ${he} was a breeding slave.`);
+ } else if (slave.career === "a bioreactor") {
+ r.push(`${He} has spent time as a cow in an industrial dairy, an experience that marked ${him} deeply.`);
+ } else {
+ r.push(`Before ${he} was a slave, ${he} was`);
+ if (setup.bodyguardCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as a Bodyguard.`);
+ } else if (setup.wardenessCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as a Wardeness for`);
+ if (V.cellblock === 0) {
+ r.push(`a Cellblock.`);
+ } else {
+ r.push(`${V.cellblockName}.`);
+ }
+ } else if (setup.attendantCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as an Attendant for`);
+ if (V.spa === 0) {
+ r.push(`a Spa.`);
+ } else {
+ r.push(`${V.spaName}.`);
+ }
+ } else if (setup.matronCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as a Matron for`);
+ if (V.nursery === 0 && V.nurseryNannies === 0) {
+ r.push(`a Nursery.`);
+ } else {
+ r.push(`${V.nurseryName}.`);
+ }
+ } else if (setup.nurseCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as a Nurse for`);
+ if (V.clinic === 0) {
+ r.push(`a Clinic.`);
+ } else {
+ r.push(`${V.clinicName}.`);
+ }
+ } else if (setup.schoolteacherCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as a Schoolteacher for`);
+ if (V.schoolroom === 0) {
+ r.push(`a Schoolroom.`);
+ } else {
+ r.push(`${V.schoolroomName}.`);
+ }
+ } else if (setup.stewardessCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as a Stewardess for`);
+ if (V.servantsQuarters === 0) {
+ r.push(`a Servant's Quarters.`);
+ } else {
+ r.push(`${V.servantsQuartersName}.`);
+ }
+ } else if (setup.milkmaidCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as a Milkmaid for`);
+ if (V.dairy === 0) {
+ r.push(`a Dairy.`);
+ } else {
+ r.push(`${V.dairyName}.`);
+ }
+ } else if (setup.farmerCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as a Farmer for`);
+ if (V.farmyard === 0) {
+ r.push(`a Farmyard.`);
+ } else {
+ r.push(`${V.farmyardName}.`);
+ }
+ } else if (setup.madamCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as a Madam for`);
+ if (V.brothel === 0) {
+ r.push(`a Brothel.`);
+ } else {
+ r.push(`${V.brothelName}.`);
+ }
+ } else if (setup.DJCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as a DJ for`);
+ if (V.club === 0) {
+ r.push(`a Club.`);
+ } else {
+ r.push(`${V.clubName}.`);
+ }
+ } else if (setup.HGCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as a Head Girl.`);
+ } else if (setup.recruiterCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} potential as a recruiter.`);
+ } else if (setup.entertainmentCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} a slight edge at entertainment.`);
+ } else if (setup.whoreCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} a slight edge at sexual commerce.`);
+ } else if (setup.gratefulCareers.includes(slave.career)) {
+ r.push(`${career}, so ${he} can remember what it's like`);
+ if (slave.career === "prisoner") {
+ r.push(`no one looking out for you.`);
+ } else {
+ r.push(`to have the freedom to starve.`);
+ }
+ } else if (setup.menialCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} experience following orders.`);
+ } else if (setup.servantCareers.includes(slave.career)) {
+ r.push(`${career}, giving ${him} a slight edge in housekeeping.`);
+ } else {
+ r.push(`${career}.`);
+ }
+ }
+ }
+ if (V.week - slave.weekAcquired >= 20 && slave.skill.entertainment >= 100) {
+ if (!setup.entertainmentCareers.includes(slave.career)) {
+ r.push(`${He} has gotten enough experience to be as charismatic as any professional`);
+ if (slave.counter.oral + slave.counter.anal + slave.counter.vaginal + slave.counter.mammary + slave.counter.penetrative > 1000) {
+ r.push(`entertainer, and has been fucked so many times that a free sex worker could teach ${him} nothing.`);
+ } else {
+ r.push(`entertainer.`);
+ }
+ }
+ } else if ((slave.counter.oral + slave.counter.anal + slave.counter.vaginal + slave.counter.mammary + slave.counter.penetrative > 1000)) {
+ if (!setup.whoreCareers.includes(slave.career)) {
+ r.push(`${He} has been fucked so many times that a free sex worker could teach ${him} nothing.`);
+ }
+ }
+ }
+
+
+ if (slave.skill.headGirl >= V.masteredXP) {
+ careersArray.push("Head Girl");
+ }
+ if (slave.skill.recruiter >= V.masteredXP) {
+ careersArray.push("Recruiter");
+ }
+ if (slave.skill.bodyguard >= V.masteredXP) {
+ careersArray.push("Bodyguard");
+ }
+ if (slave.skill.madam >= V.masteredXP) {
+ careersArray.push("Madam");
+ }
+ if (slave.skill.DJ >= V.masteredXP) {
+ careersArray.push("DJ");
+ }
+ if (slave.skill.nurse >= V.masteredXP) {
+ careersArray.push("Nurse");
+ }
+ if (slave.skill.teacher >= V.masteredXP) {
+ careersArray.push("Schoolteacher");
+ }
+ if (slave.skill.attendant >= V.masteredXP) {
+ careersArray.push("Attendant");
+ }
+ if (slave.skill.matron >= V.masteredXP) {
+ careersArray.push("Matron");
+ }
+ if (slave.skill.stewardess >= V.masteredXP) {
+ careersArray.push("Stewardess");
+ }
+ if (slave.skill.milkmaid >= V.masteredXP) {
+ careersArray.push("Milkmaid");
+ }
+ if (slave.skill.farmer >= V.masteredXP) {
+ careersArray.push("Farmer");
+ }
+ if (slave.skill.wardeness >= V.masteredXP) {
+ careersArray.push("Wardeness");
+ }
+ if (slave.skill.servant >= V.masteredXP) {
+ careersArray.push("Servant");
+ }
+ if (slave.skill.entertainer >= V.masteredXP) {
+ careersArray.push("Entertainer");
+ }
+ if (slave.skill.whore >= V.masteredXP) {
+ careersArray.push("Whore");
+ }
+ if (careersArray.length > 0) {
+ r.push(`${He} has working experience as a`);
+ if (careersArray.length > 2) {
+ for (let j = 0; j < careersArray.length; j++) {
+ if (j < careersArray.length - 1) {
+ r.push(`${careersArray[j]},`);
+ } else {
+ r.push(`and ${careersArray[j]}.`);
+ }
+ }
+ } else if (careersArray.length > 1) {
+ r.push(`${careersArray[1]} and ${careersArray[0]}.`);
+ } else {
+ r.push(`${careersArray[0]}.`);
+ }
+ }
+ return r.join(" ");
+};
diff --git a/src/npc/descriptions/crotch/dick.js b/src/npc/descriptions/crotch/dick.js
index 169e20f86eaf6e6eceb4e45e2fb44c7671be45a9..8928310140fe82095145a41eec4d60426d838aca 100644
--- a/src/npc/descriptions/crotch/dick.js
+++ b/src/npc/descriptions/crotch/dick.js
@@ -399,7 +399,7 @@ App.Desc.dick = function(slave) {
case 10:
r.push(`and ${he} has an inhuman pair of testicles`);
if (V.showDickCMs === 1) {
- r.push(`testicles, nearly ${ballsToEitherUnit(slave.balls)} long`);
+ r.push(`testicles, nearly ${ballsToEitherUnit(slave.balls)} long.`);
} else {
r.push(`testicles.`);
}
@@ -407,7 +407,7 @@ App.Desc.dick = function(slave) {
case 9:
r.push(`and ${he} has a titanic pair of`);
if (V.showDickCMs === 1) {
- r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long`);
+ r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long.`);
} else {
r.push(`testicles.`);
}
@@ -415,7 +415,7 @@ App.Desc.dick = function(slave) {
case 8:
r.push(`and ${he} has a gigantic pair of`);
if (V.showDickCMs === 1) {
- r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long`);
+ r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long.`);
} else {
r.push(`testicles.`);
}
@@ -423,7 +423,7 @@ App.Desc.dick = function(slave) {
case 7:
r.push(`and ${he} has a monstrous pair of`);
if (V.showDickCMs === 1) {
- r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long`);
+ r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long.`);
} else {
r.push(`testicles.`);
}
@@ -431,7 +431,7 @@ App.Desc.dick = function(slave) {
case 6:
r.push(`and ${he} has an enormous pair of`);
if (V.showDickCMs === 1) {
- r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long`);
+ r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long.`);
} else {
r.push(`testicles.`);
}
@@ -439,7 +439,7 @@ App.Desc.dick = function(slave) {
case 5:
r.push(`and ${he} has a huge pair of`);
if (V.showDickCMs === 1) {
- r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long`);
+ r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long.`);
} else {
r.push(`testicles.`);
}
@@ -447,7 +447,7 @@ App.Desc.dick = function(slave) {
case 4:
r.push(`and ${he} has a big pair of`);
if (V.showDickCMs === 1) {
- r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long`);
+ r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long.`);
} else {
r.push(`testicles.`);
}
@@ -455,7 +455,7 @@ App.Desc.dick = function(slave) {
case 3:
r.push(`and ${he} has an average pair of`);
if (V.showDickCMs === 1) {
- r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long`);
+ r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long.`);
} else {
r.push(`testicles.`);
}
@@ -463,7 +463,7 @@ App.Desc.dick = function(slave) {
case 2:
r.push(`and ${he} has a small pair of testicles`);
if (V.showDickCMs === 1) {
- r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long`);
+ r.push(`testicles, about ${ballsToEitherUnit(slave.balls)} long.`);
} else {
r.push(`testicles.`);
}
@@ -592,7 +592,7 @@ App.Desc.dick = function(slave) {
} else if (scrotalFullness === 0) {
r.push(`${His} soft scrotum allows them to rest comfortably`);
if (hasBothLegs(slave)) {
- r.push(`between ${his} leg.s`);
+ r.push(`between ${his} legs.`);
} else {
r.push(`beneath ${his}`);
if (isAmputee(slave)) {
@@ -1008,9 +1008,11 @@ App.Desc.dick = function(slave) {
if (canAchieveErection(slave)) {
r.push(`goes, along with ${his} shaft`);
if (hasAnyLegs(slave)) {
- r.push(`and leg`);
+ r.push(`and`);
if (hasBothLegs(slave)) {
- r.push(`s`);
+ r.push(`legs`);
+ } else {
+ r.push(`leg`);
}
}
r.push(`whenever ${he} is erect.`);
@@ -1369,11 +1371,11 @@ App.Desc.dick = function(slave) {
} else if (scrotalFullness === 0) {
r.push(`${His} soft scrotum allows them to rest comfortably`);
if (hasAnyLegs(slave)) {
- r.push(`between ${his} leg`);
+ r.push(`between ${his}`);
if (hasBothLegs(slave)) {
- r.push(`s.`);
+ r.push(`legs.`);
} else {
- r.push(`and stump.`);
+ r.push(`leg and stump.`);
}
} else {
r.push(`beneath ${his}`);
diff --git a/src/npc/descriptions/describeTattoos.js b/src/npc/descriptions/describeTattoos.js
index 5d08d394fbc826a4ceeda0d4f5caf7197d824ec2..9ad4b38fc69b7a3b7ffcf1f823b65369656eb26c 100644
--- a/src/npc/descriptions/describeTattoos.js
+++ b/src/npc/descriptions/describeTattoos.js
@@ -474,11 +474,11 @@ App.Desc.tattoo = function(slave, surface) {
case "Asian art":
r.push(`A traditional Asian household scene is tattooed on ${his} lower back, showing a rendition of ${slave.slaveName}, dressed in rich silks, having sex with a`);
if (V.PC.title === 1) {
- r.push(`gentleman`);
+ r.push(`gentleman.`);
} else {
- r.push(`lady`);
+ r.push(`lady.`);
}
- r.push(`. The slave and the`);
+ r.push(`The slave and the`);
if (V.PC.title === 1) {
r.push(`gentleman`);
} else {
diff --git a/src/npc/descriptions/descriptionWidgets.js b/src/npc/descriptions/descriptionWidgets.js
index 2606e331030394e182d96d89d4caf4c160a3a117..01c06dd0e43024e1041e337e0db90e971d5a1382 100644
--- a/src/npc/descriptions/descriptionWidgets.js
+++ b/src/npc/descriptions/descriptionWidgets.js
@@ -798,12 +798,12 @@ App.Desc.mods = function(slave, surface) {
if (slave.fuckdoll !== 0 && !["anus", "lips", "vagina"].includes(surface)) { /* Fuckdoll vulva and anus alone are visible, plus enormous lips */
return App.Desc.piercing(slave, surface); // Most piercings are part of the suit and have appropriate descriptions
}
- return (
- App.Desc.piercing(slave, surface) +
- App.Desc.tattoo(slave, surface) +
- App.Desc.brand(slave, surface) +
+ return [
+ App.Desc.piercing(slave, surface),
+ App.Desc.tattoo(slave, surface),
+ App.Desc.brand(slave, surface),
App.Desc.scar(slave, surface)
- );
+ ].join(' ');
};
/**
diff --git a/src/npc/descriptions/face.js b/src/npc/descriptions/face.js
index 09b39b23203224a0faa91cd1fb9a49270c39a139..c406180eb6b6f750fa6104dc70f1ae60899f9506 100644
--- a/src/npc/descriptions/face.js
+++ b/src/npc/descriptions/face.js
@@ -154,7 +154,7 @@ App.Desc.face = function(slave) {
if (slave.faceImplant > 5) {
r.push(`${He}'s`);
if (slave.faceImplant > 95) {
- r.push(`had so much cosmetic surgery that ${his} face is located at the bottom of the uncanny valley `);
+ r.push(`had so much cosmetic surgery that ${his} face is located at the bottom of the uncanny valley`);
if (slave.face < -10) {
r.push(`in addition to its ugliness.`);
} else if (slave.face <= 10) {
@@ -180,7 +180,7 @@ App.Desc.face = function(slave) {
}
} else if (V.arcologies[0].FSTransformationFetishist !== "unset") {
if (slave.faceImplant > 30) {
- r.push(`Your transformationist society doesn't think this `);
+ r.push(`Your transformationist society doesn't think this`);
if (slave.face >= -10) {
r.push(`reduces ${his} attractiveness.`);
} else {
diff --git a/src/npc/descriptions/heels.js b/src/npc/descriptions/heels.js
index 2f7658c29ec011f0aef7b911c4a92d38becfe01a..bd32fbac219c8884a7ba02f79ff25c142fc2b467 100644
--- a/src/npc/descriptions/heels.js
+++ b/src/npc/descriptions/heels.js
@@ -19,7 +19,7 @@ App.Desc.heels = function(slave) {
if (slave.shoes !== "none" && slave.shoes !== "flats") {
r.push(`${He} is, so ${he} can walk reasonably well.`);
} else {
- r.push(`Since ${he} is without them, ${he}'s crawling on `);
+ r.push(`Since ${he} is without them, ${he}'s crawling on`);
if (!hasAllLimbs(slave)) {
r.push(`the ground.`);
} else {
diff --git a/src/npc/descriptions/lawCompliance.js b/src/npc/descriptions/lawCompliance.js
new file mode 100644
index 0000000000000000000000000000000000000000..ff22f7e5857e5090b94776e796ae3bfb054f24be
--- /dev/null
+++ b/src/npc/descriptions/lawCompliance.js
@@ -0,0 +1,811 @@
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
+App.Desc.lawCompliance = function(slave) {
+ let r = [];
+ const fearList = [];
+ const {
+ he, him, his, hers, himself, boy, He, His, girl
+ } = getPronouns(slave);
+
+ if (V.arcologies[0].FSSlimnessEnthusiastSMR === 1) {
+ r.push(FSSlimnessEnthusiastSMR());
+ }
+ if (V.arcologies[0].FSRepopulationFocusSMR === 1) {
+ r.push(FSRepopulationFocusSMR());
+ }
+ if (V.arcologies[0].FSAssetExpansionistSMR === 1) {
+ r.push(FSAssetExpansionistSMR());
+ }
+ if (V.arcologies[0].FSPhysicalIdealistSMR === 1) {
+ r.push(FSPhysicalIdealistSMR());
+ } else if (V.arcologies[0].FSHedonisticDecadenceSMR === 1) {
+ r.push(FSHedonisticDecadenceSMR());
+ }
+ if (V.arcologies[0].FSGenderFundamentalistSMR === 1) {
+ r.push(FSGenderFundamentalistSMR());
+ } else if (V.arcologies[0].FSSupremacistSMR === 1) {
+ r.push(FSSupremacistSMR());
+ } else if (V.arcologies[0].FSSubjugationistSMR === 1) {
+ r.push(FSSubjugationistSMR());
+ }
+ if (V.arcologies[0].FSRestartSMR === 1) {
+ r.push(FSRestartSMR());
+ }
+ if (V.arcologies[0].FSPaternalistSMR === 1) {
+ r.push(FSPaternalistSMR());
+ }
+ if (V.arcologies[0].FSDegradationistSMR === 1) {
+ r.push(FSDegradationistSMR());
+ }
+ if (V.arcologies[0].FSPetiteAdmirationSMR === 1) {
+ r.push(FSPetiteAdmirationSMR());
+ } else if (V.arcologies[0].FSStatuesqueGlorificationSMR === 1) {
+ r.push(FSStatuesqueGlorificationSMR());
+ }
+ if (V.arcologies[0].FSIntellectualDependencySMR === 1) {
+ r.push(FSIntellectualDependencySMR());
+ } else if (V.arcologies[0].FSSlaveProfessionalismSMR === 1) {
+ r.push(FSSlaveProfessionalismSMR());
+ }
+ if (V.arcologies[0].FSBodyPuristSMR === 1) {
+ r.push(FSBodyPuristSMR());
+ }
+ if (V.arcologies[0].FSTransformationFetishistSMR === 1) {
+ r.push(FSTransformationFetishistSMR());
+ }
+ if (V.arcologies[0].FSYouthPreferentialistSMR === 1) {
+ r.push(FSYouthPreferentialistSMR());
+ }
+ if (V.arcologies[0].FSMaturityPreferentialistSMR === 1) {
+ r.push(FSMaturityPreferentialistSMR());
+ }
+ if (V.arcologies[0].FSPastoralistSMR === 1) {
+ r.push(FSPastoralistSMR());
+ }
+ if (V.arcologies[0].FSChattelReligionistSMR === 1) {
+ r.push(FSChattelReligionistSMR());
+ }
+ if (V.arcologies[0].FSRomanRevivalistSMR === 1) {
+ r.push(FSRomanRevivalistSMR());
+ }
+ if (V.arcologies[0].FSAztecRevivalistSMR === 1) {
+ r.push(FSAztecRevivalistSMR());
+ }
+ if (V.arcologies[0].FSEgyptianRevivalistSMR === 1) {
+ r.push(FSEgyptianRevivalistSMR());
+ }
+ if (V.arcologies[0].FSEdoRevivalistSMR === 1) {
+ r.push(FSEdoRevivalistSMR());
+ }
+ if (V.arcologies[0].FSArabianRevivalistSMR === 1) {
+ r.push(FSArabianRevivalistSMR());
+ }
+ if (V.arcologies[0].FSChineseRevivalistSMR === 1) {
+ r.push(FSChineseRevivalistSMR());
+ }
+
+ if (V.policies.SMR.basicSMR === 0) {
+ r.push(basicSMR());
+ }
+
+ if (V.policies.SMR.healthInspectionSMR === 1) {
+ r.push(healthInspectionSMR());
+ }
+
+ if (V.policies.SMR.educationSMR === 1) {
+ r.push(educationSMR());
+ }
+
+ if (V.policies.SMR.frigiditySMR === 1) {
+ r.push(frigiditySMR());
+ }
+
+ if (V.policies.SMR.beauty.basicSMR === 1) {
+ fearList.push(beautyBasicSMR());
+ }
+
+ if (V.policies.SMR.beauty.qualitySMR === 1) {
+ fearList.push(beautyQualitySMR());
+ }
+
+ if (V.policies.SMR.weightSMR === 1) {
+ fearList.push(weightSMR());
+ }
+
+ if (V.policies.SMR.height.basicSMR === 1) {
+ r.push(heightBasicSMRup());
+ } else if (V.policies.SMR.height.basicSMR === -1) {
+ r.push(heightBasicSMRdown());
+ }
+
+ if (V.policies.SMR.height.advancedSMR === 1) {
+ r.push(heightAdvancedSMRup());
+ } else if (V.policies.SMR.height.advancedSMR === -1) {
+ r.push(heightAdvancedSMRdown());
+ }
+
+ if (V.policies.SMR.intelligence.basicSMR === 1) {
+ fearList.push(intelligenceBasicSMR());
+ }
+
+ if (V.policies.SMR.intelligence.qualitySMR === 1) {
+ fearList.push(intelligenceQualitySMR());
+ }
+
+ r.push(slaveFears(fearList));
+
+ if (policies.countEugenicsSMRs() > 0) {
+ r.push(eugenicsSMRsCount());
+ }
+
+ r.push(checkForGingering()); /* may store a backup of slave and make temporary changes; call removeGingering() to retrieve backup before making changes to slave */
+
+ return r.join(" ");
+
+ function FSSlimnessEnthusiastSMR() {
+ slave.weight = jsRandom(-80, 0);
+ setHealth(slave, jsRandom(50, 90), 0, undefined, 0);
+ return `${He} has been kept on a rigorous diet for sale, has been required to exercise regularly, and has had excellent care taken of ${his} health.`;
+ }
+
+ function FSRepopulationFocusSMR() {
+ if (slave.physicalAge < V.fertilityAge) {
+ if (V.precociousPuberty === 0) {
+ slave.physicalAge = V.fertilityAge;
+ slave.visualAge = V.fertilityAge;
+ slave.actualAge = V.fertilityAge;
+ slave.ovaryAge = V.fertilityAge;
+ }
+ }
+ slave.pubertyXX = 1;
+ if (slave.ovaryAge >= 42) {
+ // corrects menopausal mothers
+ slave.ovaryAge = 40;
+ }
+ if (slave.preg < 1) {
+ // "if" needed here to avoid conflicts with already pregnant slaves from repopulation FS arcologies markets
+ slave.ovaries = 1;
+ slave.vagina = either(0, 0, 1, 1, 1, 1, 1, 2, 2, 3);
+ slave.pregType = either(1, 1, 1, 1, 2, 2, 2, 3, 3, 4, 5);
+ slave.preg = jsRandom(5, 38);
+ slave.pregWeek = slave.preg;
+ slave.pregKnown = 1;
+ SetBellySize(slave);
+ }
+ return `If ${he} was unable to become pregnant before, ${he} has been made to now. ${He} is fertilized surgically to insure a healthy pregnancy.`;
+ }
+
+ function FSAssetExpansionistSMR() {
+ slave.clit = either(0, 0, 0, 1, 1, 2);
+ slave.labia = either(0, 1, 2, 3);
+ slave.boobs += jsRandom(2, 5) * 100;
+ slave.butt += jsRandom(1, 2);
+ slave.lips = jsRandom(15, 55);
+ if (slave.dick > 0) {
+ slave.dick = jsRandom(4, 7);
+ }
+ if (slave.balls > 0) {
+ slave.balls = jsRandom(4, 7);
+ }
+ return `${He} has been on powerful growth hormones for a long time, and has experienced growth in several areas as a result.`;
+ }
+
+ function FSPhysicalIdealistSMR() {
+ const r = [];
+ r.push(`Much of ${his} time before sale was spent`);
+ if (V.arcologies[0].FSPhysicalIdealistLaw === 1) {
+ slave.muscles = jsRandom(20, 50);
+ r.push(`doing cardio,`);
+ } else {
+ slave.muscles = jsRandom(50, 100);
+ r.push(`lifting weights,`);
+ }
+ r.push(`and ${his} health has been raised to an almost unnatural level.`);
+ setHealth(slave, jsRandom(50, 90), 0, undefined, 0);
+ slave.weight = jsRandom(-20, 0);
+ return r.join(" ");
+ }
+
+ function FSHedonisticDecadenceSMR() {
+ const r = [];
+ slave.weight = jsRandom(50, 200);
+ if (V.arcologies[0].FSHedonisticDecadenceStrongFat === 1) {
+ slave.muscles = jsRandom(10, 60);
+ setHealth(slave, jsRandom(10, 40), 0, undefined, 0);
+ } else {
+ setHealth(slave, jsRandom(-30, 10));
+ slave.muscles = jsRandom(-80, 0);
+ }
+ r.push(`Much of ${his} time before sale was spent being fattened up and`);
+ if (V.arcologies[0].FSHedonisticDecadenceStrongFat === 1) {
+ r.push(`pumping iron.`);
+ } else {
+ r.push(`lying around.`);
+ }
+ if (slave.devotion <= 20) {
+ r.push(`${He} had to be force-fed massive amounts of slave food while bound to meet requirements, filling ${him} with <span class="gold">fear</span> and <span class="mediumorchid">disgust.</span>`);
+ slave.trust -= 5;
+ slave.devotion -= 5;
+ }
+ return r.join(" ");
+ }
+
+ function FSGenderFundamentalistSMR() {
+ if (slave.dick > 0) {
+ slave.balls = 0;
+ slave.scrotum = 0;
+ slave.boobs += jsRandom(0, 2) * 100;
+ slave.butt += jsRandom(0, 1);
+ if (slave.face < 95) {
+ slave.face = Math.clamp(slave.face + jsRandom(0, 20), -100, 100);
+ }
+ return `${His} balls were removed as soon as ${he} was enslaved, and ${he}'s been kept on powerful female hormones for long enough to have a general feminizing effect.`;
+ }
+ }
+
+ function FSSupremacistSMR() {
+ if (slave.dick > 0) {
+ if (slave.race !== V.arcologies[0].FSSupremacistRace) {
+ slave.balls = 0;
+ slave.scrotum = 0;
+ return `${His} balls were removed as soon as ${he} was enslaved to prevent ${him} from polluting fertile slaves with ${his} inferior semen.`;
+ }
+ }
+ }
+
+ function FSSubjugationistSMR() {
+ if (slave.dick > 0) {
+ if (slave.race === V.arcologies[0].FSSubjugationistRace) {
+ slave.balls = 0;
+ slave.scrotum = 0;
+ return `${His} balls were removed as soon as ${he} was enslaved to prevent ${him} from polluting fertile slaves with ${his} subhuman semen.`;
+ }
+ }
+ }
+
+ function FSRestartSMR() {
+ const r = [];
+ if (slave.balls > 0 || slave.ovaries > 0) {
+ TerminatePregnancy(slave);
+ slave.counter.abortions++;
+ V.abortionsTotal++;
+ slave.balls = 0;
+ slave.ovaries = 0;
+ r.push(`As a member of the lowest class,`);
+ if (slave.preg > 0) {
+ r.push(`${his} pregnancy is immediately terminated, and`);
+ }
+ r.push(`${he} is promptly sterilized to prevent ${him} from passing on ${his} useless genes.`);
+ }
+ return r.join(" ");
+ }
+
+ function FSPaternalistSMR() {
+ slave.trust += 10;
+ if (slave.devotion <= 20) {
+ return `While ${he} came through the slave markets, ${he} was treated with decency. ${He} has begun to wonder whether ${he} can <span class="mediumaquamarine">get away with</span> being disobedient.`;
+ } else {
+ return `While ${he} came through the slave markets, ${he} was treated with decency. ${He} has begun to hope that ${he} can expect <span class="mediumaquamarine">basic respect</span> despite being a sex slave.`;
+ }
+ }
+
+ function FSDegradationistSMR() {
+ slave.trust -= 10;
+ return `${His} current owners <span class= "gold">brutalized ${him}</span> before putting ${him} on sale, using clever methods to produce agony without seriously damaging ${his} health.`;
+ }
+
+ function FSPetiteAdmirationSMR() {
+ if (!heightPass(slave)) {
+ slave.height = Math.trunc(Height.random(slave, {limitMult: [-4, -2]}));
+ }
+ return `${His} height was meticulously taken before being allowed into the markets.`;
+ }
+
+ function FSStatuesqueGlorificationSMR() {
+ if (!heightPass(slave)) {
+ slave.height = Math.trunc(Height.random(slave, {limitMult: [2, 4]}));
+ }
+ return `${His} height, as well as ${his} potential for growth, were meticulously taken before being allowed into the markets.`;
+ }
+
+ function FSIntellectualDependencySMR() {
+ slave.intelligence = Intelligence.random({limitIntelligence: [-100, -50]});
+ slave.devotion += 5;
+ return `${He} passed the intelligence exam needed to be qualify ${him} for sale. A truly <span class= "hotpink">joyous achievement</span> for ${him}.`;
+ }
+
+ function FSSlaveProfessionalismSMR() {
+ if (slave.vagina >= 0) {
+ slave.skill.vaginal = Math.clamp(slave.skill.vaginal + 50, 50, 100);
+ }
+ slave.skill.anal = Math.clamp(slave.skill.anal + 50, 50, 100);
+ slave.skill.oral = Math.clamp(slave.skill.oral + 50, 50, 100);
+ slave.skill.entertainment = Math.clamp(slave.skill.entertainment + 50, 50, 100);
+ slave.skill.whoring = Math.clamp(slave.skill.whoring + 50, 50, 100);
+ if (slave.accent > 1) {
+ slave.accent = 1;
+ }
+ return `${He} underwent an intense lesson plan to hone ${his} skills to a level appropriate for sale.`;
+ }
+
+ function FSBodyPuristSMR() {
+ slave.nipplesPiercing = 0;
+ slave.areolaePiercing = 0;
+ slave.lipsPiercing = 0;
+ slave.vaginaPiercing = 0;
+ slave.dickPiercing = 0;
+ slave.clitPiercing = 0;
+ slave.anusPiercing = 0;
+ slave.corsetPiercing = 0;
+ slave.earPiercing = 0;
+ slave.eyebrowPiercing = 0;
+ slave.nosePiercing = 0;
+ slave.navelPiercing = 0;
+ slave.lipsTat = 0;
+ slave.buttTat = 0;
+ slave.anusTat = 0;
+ slave.vaginaTat = 0;
+ slave.dickTat = 0;
+ slave.boobsTat = 0;
+ slave.armsTat = 0;
+ slave.legsTat = 0;
+ slave.shouldersTat = 0;
+ slave.backTat = 0;
+ slave.stampTat = 0;
+ if (slave.boobsImplant > 0) {
+ slave.boobs -= slave.boobsImplant;
+ slave.boobsImplant = 0;
+ slave.boobsImplantType = "none";
+ }
+ if (slave.buttImplant > 0) {
+ slave.butt -= slave.buttImplant;
+ slave.buttImplant = 0;
+ slave.buttImplantType = "none";
+ }
+ if (slave.lipsImplant > 0) {
+ slave.lips -= slave.lipsImplant;
+ slave.lipsImplant = 0;
+ }
+ return `In order to qualify for sale, ${he} has been meticulously inspected for implants, tattoos, and piercings, and any present have been removed.`;
+ }
+
+ function FSTransformationFetishistSMR() {
+ const r = [];
+ r.push(`In order to qualify for sale, ${he} has been kitted out with a basic set of breast, buttock, and lip implants.`);
+ if (slave.devotion <= 20) {
+ r.push(`Being turned into an assembly line bimbo fills ${him} with <span class="gold">fear</span> and <span class="mediumorchid">disgust.</span>`);
+ slave.trust -= 5;
+ slave.devotion -= 5;
+ }
+ if (slave.boobsImplant === 0) {
+ slave.boobsImplant = 400;
+ slave.boobs += slave.boobsImplant;
+ slave.boobsImplantType = "normal";
+ }
+ if (slave.buttImplant === 0) {
+ slave.buttImplant = 1;
+ slave.butt += slave.buttImplant;
+ slave.buttImplantType = "normal";
+ }
+ if (slave.lipsImplant === 0) {
+ slave.lipsImplant = 10;
+ slave.lips += slave.lipsImplant;
+ }
+ return r.join(" ");
+ }
+
+ function FSYouthPreferentialistSMR() {
+ if (slave.physicalAge > 35) {
+ slave.trust -= 5;
+ return `${He} was treated as a disposable old bitch in the slave pens, <span class="gold">worrying ${him}.</span>`;
+ } else if (slave.physicalAge <= 25) {
+ slave.trust += 5;
+ return `${He} was treated reasonably well in the slave pens due to ${his} youth, <span class="mediumaquamarine">reassuring ${him}.</span>`;
+ }
+ }
+
+ function FSMaturityPreferentialistSMR() {
+ if (slave.physicalAge > 35) {
+ slave.trust += 5;
+ return `${He} was treated reasonably well in the slave pens due to ${his} maturity, <span class="mediumaquamarine">reassuring ${him}.</span>`;
+ } else if (slave.physicalAge <= 25) {
+ slave.trust -= 5;
+ return `${He} was treated as a disposable little slut in the slave pens, <span class="gold">worrying ${him}.</span>`;
+ }
+ }
+
+ function FSPastoralistSMR() {
+ if (slave.lactation === 0) {
+ slave.lactation = 2;
+ slave.lactationDuration = 2;
+ return `${He} was implanted with permanent lactation drugs in order to qualify for sale, and was kept in the slave pens until ${he} could be put up on the block with dripping nipples.`;
+ }
+ }
+
+ function FSChattelReligionistSMR() {
+ const r = [];
+ r.push(`${He} has been consecrated for sale by being offered to the public for a full night, from sunset to sunrise.`);
+ if (slave.devotion <= 20) {
+ r.push(`Since ${he} was not willing to accept this treatment, ${his} consecration took the form of twelve hours of rape, <span class="gold">terrifying ${him}</span> and <span class="mediumorchid">filling ${him} with hatred.</span>`);
+ slave.trust -= 15;
+ slave.devotion -= 15;
+ } else {
+ r.push(`${He} accepted this treatment, <span class="hotpink">breaking ${him}</span> to sexual slavery.`);
+ slave.devotion += 5;
+ }
+
+ seX(slave, "oral", "public", "penetrative", 10);
+ if (slave.vagina > 0) {
+ seX(slave, "vaginal", "public", "penetrative", 10);
+ if (slave.vagina < 3) {
+ slave.vagina += 1;
+ }
+ } else {
+ seX(slave, "oral", "public", "penetrative", 10);
+ }
+ if (slave.anus > 0) {
+ seX(slave, "anal", "public", "penetrative", 10);
+ if (slave.anus < 3) {
+ slave.anus += 1;
+ }
+ } else {
+ seX(slave, "oral", "public", "penetrative", 10);
+ }
+ return r.join(" ");
+ }
+
+ function FSRomanRevivalistSMR() {
+ slave.trust -= 10;
+ return `As ${he} passed though the slave markets, ${he} saw many less valuable slaves selected to die in gladiatorial combats. ${He} is relieved ${he} wasn't one of them, but <span class="gold">terrified</span> that will be ${his} fate if ${he} makes mistakes.`;
+ }
+
+ function FSAztecRevivalistSMR() {
+ const r = [];
+ r.push(`As ${he} passed though the golden city, ${he} saw a less valuable`);
+ if (V.arcologies[0].FSPaternalist !== "unset") {
+ r.push(`slave's virginity get sacrificed`);
+ } else {
+ r.push(`slave get sacrificed`);
+ }
+ r.push(`on one of the many altars spread throughout the city. ${He} was`);
+ if (V.arcologies[0].FSPaternalist !== "unset") {
+ r.push(`<span class="gold">startled</span>`);
+ } else {
+ r.push(`<span class="gold">mortified</span>`);
+ }
+ r.push(`to learn what befalls lesser slaves here.`);
+ if (V.arcologies[0].FSPaternalist !== "unset") {
+ slave.trust -= 5;
+ } else {
+ slave.trust -= 20;
+ }
+ return r.join(" ");
+ }
+
+ function FSEgyptianRevivalistSMR() {
+ const r = [];
+ r.push(`While ${he} was in the slave pens, ${he} was subjected to Egyptian cultural indoctrination.`);
+ if (slave.skill.entertainment > 10) {
+ r.push(`${He} is now <span class="mediumaquamarine">confident</span> that ${his} entertainment skills will be valued here.`);
+ slave.trust += 10;
+ } else if (slave.intelligenceImplant >= 15) {
+ r.push(`${He} now <span class="mediumaquamarine">hopes</span> that ${his} education will be valued here.`);
+ slave.trust += 5;
+ } else {
+ r.push(`${He} is <span class="gold">concerned</span> that ${he} doesn't have what it takes to fit in.`);
+ slave.trust -= 5;
+ }
+ return r.join(" ");
+ }
+
+ function FSEdoRevivalistSMR() {
+ const r = [];
+ r.push(`While ${he} was in the slave pens, ${he} was subjected to Edo Revivalist cultural indoctrination.`);
+ if (slave.nationality === "Japanese") {
+ r.push(`${He} is now <span class="mediumaquamarine">confident</span> that, as a proper Japanese ${girl}, ${he} will receive preferential treatment.`);
+ slave.trust += 10;
+ } else if (slave.skill.entertainment > 30) {
+ r.push(`${He} now <span class="mediumaquamarine">hopes</span> that ${his} refined entertainment skills will make ${him} culturally as well as sexually valuable.`);
+ slave.trust += 5;
+ } else {
+ r.push(`${He} is <span class="gold">concerned</span> that ${he} doesn't have what it takes to fit in.`);
+ slave.trust -= 5;
+ }
+ return r.join(" ");
+ }
+
+ function FSArabianRevivalistSMR() {
+ const r = [];
+ r.push(`While ${he} was in the slave pens, ${he} was subjected to classical Arabian cultural indoctrination.`);
+ if (slave.face > 40) {
+ r.push(`${He} is now <span class="mediumaquamarine">confident</span> that ${his} great beauty will be valued here.`);
+ slave.trust += 10;
+ } else if (slave.accent <= 1) {
+ r.push(`${He} now <span class="mediumaquamarine">hopes</span> that ${his} linguistic skill will be valued here.`);
+ slave.trust += 5;
+ } else {
+ r.push(`${He} is <span class="gold">concerned</span> that ${he} doesn't have what it takes to fit in.`);
+ slave.trust -= 5;
+ }
+ return r.join(" ");
+ }
+
+ function FSChineseRevivalistSMR() {
+ const r = [];
+ r.push(`While ${he} was in the slave pens, ${he} was subjected to Imperial Chinese cultural indoctrination.`);
+ if (slave.intelligence > 50) {
+ r.push(`${He} is now <span class="mediumaquamarine">confident</span> that ${his} brilliance will be valued here.`);
+ slave.trust += 10;
+ } else if (slave.intelligenceImplant >= 15) {
+ r.push(`${He} now <span class="mediumaquamarine">hopes</span> that ${his} education will be valued here.`);
+ slave.trust += 5;
+ } else {
+ r.push(`${He} is <span class="gold">concerned</span> that ${he} doesn't have what it takes to fit in.`);
+ slave.trust -= 5;
+ }
+ return r.join(" ");
+ }
+
+ function basicSMR() {
+ slave.trust -= 5;
+ return `While ${he} came through the slave markets, ${he} was treated with inhuman callousness. It was very obvious and <span class="gold">very terrifying</span> to ${him} that ${he} is now considered a piece of meat.`;
+ }
+
+ function healthInspectionSMR() {
+ if (slave.health.condition < -10) {
+ improveCondition(slave, 10);
+ return `${His} current owners held ${him} for basic medical care before putting ${him} on sale, resolving some of ${his} health issues.`;
+ }
+ }
+
+ function educationSMR() {
+ if (slave.intelligenceImplant === 0) {
+ slave.intelligenceImplant = 15;
+ return `${He} arrived at ${V.arcologies[0].name} in a pitiably undereducated state, and has been held back until ${he} completed a basic course of slave education.`;
+ }
+ }
+
+ function frigiditySMR() {
+ if (slave.energy > 20) {
+ slave.energy = 20;
+ return `Before reaching the market, ${he} was trained to disregard sex until ${he} showed no interest in sex at all.`;
+ }
+ }
+
+ function beautyBasicSMR() {
+ if (slave.face < 0) {
+ slave.face = jsRandom(0, 60);
+ }
+ slave.trust -= 5;
+ return `beauty`;
+ }
+
+ function beautyQualitySMR() {
+ if (slave.face < 20) {
+ slave.face = jsRandom(20, 100);
+ }
+ slave.trust -= 5;
+ return `beauty`;
+ }
+
+ function weightSMR() {
+ if (slave.weight > 100) {
+ slave.weight = jsRandom(-50, 50);
+ }
+ slave.trust -= 5;
+ return `weight`;
+ }
+
+ function heightBasicSMRup() {
+ if (slave.height < 170) {
+ if (slave.height >= 160) {
+ r.push(`Before ${he} was put up for sale, ${he} underwent height increasing surgery to fulfill your arcology's height SMR. ${He} was <span class="gold">horrified</span> by how drastically ${his} body was altered just for a chance at sale.`);
+ slave.trust -= 10;
+ slave.height += 10;
+ slave.heightImplant = 1;
+ healthDamage(slave, 40);
+ } else {
+ r.push(`While ${he} was in the slave pens, ${he} was treated as nothing more than an unsalvageable slab of meat suitable only for the lowliest of jobs. ${He}'s <span class="hotpink">desperate</span> enough to follow any order in <span class="gold">fear</span> that should ${he} fail, ${he}'ll be discarded like so many other shorties.`);
+ slave.devotion += 10;
+ slave.trust -= 10;
+ }
+ } else {
+ r.push(`While ${he} was in the slave pens, ${he} saw that short and even average sized slaves were commonly designated as menials and Fuckdolls. ${His} tall stature gives ${him} a promising future compared to ${his} shorter peers, leaving ${him} <span class="mediumOrchid">inappropriately proud</span> of ${his} height.`);
+ slave.devotion -= 10;
+ }
+ }
+
+ function heightBasicSMRdown() {
+ if (slave.height >= 160) {
+ if (slave.height <= 169) {
+ r.push(`Before ${he} was put up for sale, ${he} underwent height reduction surgery to fulfill your arcology's height SMR. ${He} was <span class="gold">horrified</span> by how drastically ${his} body was altered just for a chance at sale.`);
+ slave.trust -= 10;
+ slave.height -= 10;
+ slave.heightImplant = -1;
+ healthDamage(slave, 40);
+ } else {
+ r.push(`While ${he} was in the slave pens, ${he} was treated as nothing more than an unsalvageable slab of meat suitable only for the lowliest of jobs. ${He}'s <span class="hotpink">desperate</span> enough to follow any order in <span class="gold">fear</span> that should ${he} fail, ${he}'ll be discarded like all the other tall ${girl}s.`);
+ slave.devotion += 10;
+ slave.trust -= 10;
+ }
+ } else {
+ r.push(`While ${he} was in the slave pens, ${he} saw that tall and even average sized slaves were commonly designated as menials and Fuckdolls. ${His} short stature gives ${him} a promising future compared to ${his} towering peers, leaving ${him} <span class="mediumOrchid">inappropriately proud</span> of ${his} height.`);
+ slave.devotion -= 10;
+ }
+ }
+
+ function heightAdvancedSMRup() {
+ slave.height = Math.round(Height.random(slave, {skew: V.policies.SMR.height.advancedSMR, limitMult: [0, 5 * V.policies.SMR.height.advancedSMR]}));
+ r.push(`While ${he} was in the slave pens, ${he} saw that slaves on the shorter end of the height curve were immediately designated as menials and Fuckdolls.`);
+ if (slave.physicalAge < 16) {
+ r.push(`${He} is <span class="gold">terrified</span> that if ${he} doesn't keep growing, ${he}'ll be reassigned on the spot without a second thought.`);
+ slave.trust -= 5;
+ } else {
+ r.push(`${His} above average stature gives ${him} a promising future compared to ${his} shorter peers, leaving ${him} <span class="mediumOrchid">inappropriately proud</span> of ${his} height.`);
+ slave.devotion -= 10;
+ }
+ }
+
+ function heightAdvancedSMRdown() {
+ slave.height = Math.round(Height.random(slave, {skew: V.policies.SMR.height.advancedSMR, limitMult: [0, 5 * V.policies.SMR.height.advancedSMR]}));
+ r.push(`While ${he} was in the slave pens, ${he} saw that slaves on the taller end of the height curve were immediately designated as menials and Fuckdolls.`);
+ if (slave.physicalAge < 16) {
+ r.push(`${He} is <span class="gold">terrified</span> that if ${he} goes through a growth spurt, ${he}'ll be reassigned on the spot without a second thought.`);
+ slave.trust -= 5;
+ } else {
+ r.push(`${His} below average stature gives ${him} a promising future compared to ${his} taller peers, leaving ${him} <span class="mediumOrchid">inappropriately proud</span> of ${his} height.`);
+ slave.devotion -= 10;
+ }
+ }
+
+
+ function intelligenceBasicSMR() {
+ if (slave.intelligence <= -15) {
+ slave.intelligence = Intelligence.random({limitIntelligence: [0, 40]});
+ }
+ slave.trust -= 5;
+ return `intelligence`;
+ }
+
+ function intelligenceQualitySMR() {
+ if (slave.intelligence <= 15) {
+ slave.intelligence = Intelligence.random({limitIntelligence: [16, 100]});
+ }
+ slave.trust -= 5;
+ return `intelligence`;
+ }
+
+ function slaveFears(fearList) {
+ const r = [];
+ let objectFeared = "";
+ let destination = "";
+ let destinationList = {menials: 1, Fuckdolls: 0, cows: 0}; // Always menials as a fear
+ let lossFeared = "";
+ if (fearList.length === 0) {
+ return;
+ }
+ for (let fear = 0; fear < fearList.length; fear++) {
+ if (fearList[fear] === "intelligence") {
+ objectFeared += "less intelligent";
+ destinationList.Fuckdolls = 1;
+ lossFeared += `if ${he} makes a mistake, `;
+ } else if (fearList[fear] === "beauty") {
+ objectFeared += "less attractive";
+ destinationList.Fuckdolls = 1;
+ lossFeared += `should ${he} lose ${his} beauty, `;
+ } else if (fearList[fear] === "weight") {
+ objectFeared += "obese";
+ destinationList.cows = 1;
+ lossFeared += `should ${he} get fat, `;
+ } else {
+ console.log("error: " + fearList[fear] + " not found.");
+ }
+ if (fearList.length - fear > 2) {
+ objectFeared += ", ";
+ } else if (fearList.length - fear > 1) {
+ objectFeared += " and ";
+ lossFeared += "or ";
+ }
+ }
+
+ if (destinationList.Fuckdolls === 1 && destinationList.cows === 1) {
+ destination = `menials, Fuckdolls, and cows`;
+ } else if (destinationList.Fuckdolls === 1) {
+ destination = `menials and Fuckdolls`;
+ } else if (destinationList.cows === 1) {
+ destination = `menials and cows`;
+ }
+
+ r.push(`While ${he} was in the slave pens, ${he} saw that ${objectFeared} slaves were immediately designated ${destination} and ${he} is <span class="gold">terrified</span> that ${lossFeared} ${he}'ll be considered worthless and be reassigned on the spot.`);
+
+ return r.join(" ");
+ }
+
+ function eugenicsSMRsCount() {
+ const r = [];
+ let eugenicsMarketTest = 1;
+ r.push(`As soon as ${he} arrived in the slave market, ${he} was subjected to a battery of testing:`);
+ if (V.policies.SMR.eugenics.intelligenceSMR === 1) {
+ r.push(`an intelligence test,`);
+ if (slave.intelligence + slave.intelligenceImplant <= 50) {
+ eugenicsMarketTest = 0;
+ }
+ }
+ if (V.policies.SMR.eugenics.heightSMR === 1) {
+ r.push(`rigorous height and bone measurements,`);
+ if (slave.height < (Height.mean(slave) + 15)) {
+ eugenicsMarketTest = 0;
+ }
+ }
+ if (V.policies.SMR.eugenics.faceSMR === 1) {
+ r.push(`strict judgments of ${his} facial attractiveness,`);
+ if (slave.face < 40) {
+ eugenicsMarketTest = 0;
+ }
+ }
+ r.push(`a physical exam, and more.`);
+ if (eugenicsMarketTest === 0) {
+ r.push(`${He} failed, and only then learned that by failing ${he} placed ${himself} under the merciless dictates of eugenic theory.`);
+ if (slave.balls > 0 && (isFertile(slave) || slave.preg > 0)) {
+ r.push(`${His} balls were promptly`);
+ if (V.seeExtreme === 1) {
+ r.push(`removed`);
+ slave.balls = 0;
+ slave.scrotum = 0;
+ } else {
+ r.push(`flooded with chemicals`);
+ slave.ballType = "sterile";
+ }
+ r.push(`to prevent ${him} from passing on ${his} inferior genes, <span class="mediumorchid">infuriating</span> and <span class="gold">terrifying</span> ${him}.`);
+ r.push(`Furthermore, ${his}`);
+ if (slave.preg > 0) {
+ r.push(`pregnancy was terminated and afterwards ${his}`);
+ }
+ r.push(`tubes were promptly tied to prevent ${him} from passing on ${his} inferior genes, <span class="mediumorchid">saddening</span> and <span class="gold">frightening</span> ${him}.`);
+ TerminatePregnancy(slave);
+ slave.counter.abortions++;
+ V.abortionsTotal++;
+ slave.devotion -= 30;
+ slave.trust -= 30;
+ } else if (slave.balls > 0) {
+ r.push(`${His} balls were promptly`);
+ if (V.seeExtreme === 1) {
+ r.push(`removed`);
+ slave.balls = 0;
+ slave.scrotum = 0;
+ } else {
+ r.push(`flooded with chemicals`);
+ slave.ballType = "sterile";
+ }
+ r.push(`to prevent ${him} from passing on ${his} inferior genes, <span class="mediumorchid">infuriating</span> and <span class="gold">terrifying</span> ${him}.`);
+ slave.devotion -= 20;
+ slave.trust -= 20;
+ } else if ((isFertile(slave) || slave.preg > 0)) {
+ r.push(`${His}`);
+ if (slave.preg > 0) {
+ r.push(`pregnancy was terminated and afterwards ${his}`);
+ }
+ r.push(`tubes were promptly tied to prevent ${him} from passing on ${his} inferior genes, <span class="mediumorchid">saddening</span> and <span class="gold">frightening</span> ${him}.`);
+ TerminatePregnancy(slave);
+ slave.counter.abortions++;
+ V.abortionsTotal++;
+ slave.devotion -= 10;
+ slave.trust -= 10;
+ } else {
+ r.push(`Fortunately for ${him}, ${he} was already incapable of passing on ${his} inferior genes.`);
+ }
+ } else {
+ r.push(`${He} passed, and only then learned that passing marked ${him} as fit to pass on ${his} genes, should ${his} owners decide to breed ${him}.`);
+ if (slave.balls > 0 && (isFertile(slave) || slave.preg > 0)) {
+ r.push(`${His} relief that ${he} won't have ${his} balls cut off and ${his} tubes tied is mixed with fear at being introduced to your society in this way.`);
+ } else if ((isFertile(slave) || slave.preg > 0)) {
+ r.push(`${His} relief that ${he} won't have ${his} tubes tied is mixed with fear at being introduced to your society in this way.`);
+ } else {
+ r.push(`This is merely confusing to ${him}, since ${he} isn't able to reproduce as it is. Of course, ${he} doesn't know that you're quite capable of changing that.`);
+ }
+ }
+ return r.join(" ");
+ }
+};
diff --git a/src/npc/descriptions/name.js b/src/npc/descriptions/name.js
new file mode 100644
index 0000000000000000000000000000000000000000..7967f98bdb7c7e61e5c17950bb362ebed43ba516
--- /dev/null
+++ b/src/npc/descriptions/name.js
@@ -0,0 +1,90 @@
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
+App.Desc.name = function(slave) {
+ const r = [];
+ const {
+ he, his, He
+ } = getPronouns(slave);
+ if (slave.slaveName !== slave.birthName || slave.slaveSurname !== slave.birthSurname) {
+ let nameloss = 0;
+ if (slave.fuckdoll === 0) {
+ if (slave.slaveName !== slave.birthName && slave.slaveSurname !== slave.birthSurname) {
+ r.push(`${SlaveFullName(slave)} is not ${his} original full name;`);
+ if (slave.birthName === "" || slave.birthSurname === "") {
+ r.push(`whatever it was, however, has been lost forever.`);
+ nameloss = 1;
+ }
+ } else if (slave.slaveName !== slave.birthName) {
+ r.push(`${slave.slaveName} is not ${his} original given name;`);
+ if (slave.birthName === "") {
+ r.push(`whatever it was, however, has been lost forever.`);
+ nameloss = 1;
+ }
+ } else if (slave.slaveSurname !== slave.birthSurname) {
+ if (slave.slaveSurname === 0 && slave.birthSurname === "") {
+ r.push(`${He} once had a surname; whatever it was, however, has been lost forever.`);
+ nameloss = 1;
+ } else if (slave.slaveSurname !== 0) {
+ r.push(`${slave.slaveSurname} is not ${his} original surname;`);
+ if (slave.birthSurname === "") {
+ r.push(`whatever it was, however, has been lost forever.`);
+ nameloss = 1;
+ }
+ } else {
+ nameloss = 1;
+ }
+ }
+ if (slave.birthName !== "" || slave.birthSurname !== "") {
+ if (nameloss === 1) {
+ r.push(`${He}`);
+ } else {
+ r.push(`${he}`);
+ }
+ if (slave.devotion > 95) {
+ r.push(`adores ${his} slave name and affects to have forgotten that ${he} was ever called`);
+ } else if (slave.devotion > 50) {
+ r.push(`uses ${his} slave name automatically and gives no sign that ${he} was ever called`);
+ } else if (slave.devotion > 20) {
+ r.push(`uses ${his} slave name despite once being known as`);
+ } else if (slave.devotion >= -20) {
+ r.push(`uses ${his} slave name hesitantly since ${he} was once called`);
+ } else if (slave.devotion >= -50) {
+ r.push(`uses ${his} slave name with resentment since ${he} prefers ${his} original name,`);
+ } else {
+ r.push(`uses ${his} slave name only when constantly punished, since ${he} feels ${his} real name is`);
+ }
+ if (slave.slaveName !== slave.birthName && slave.slaveSurname !== slave.birthSurname) {
+ r.push(`${SlaveFullBirthName(slave)}.`);
+ } else if (slave.slaveName !== slave.birthName) {
+ if (slave.slaveName.endsWith(slave.birthName)) {
+ r.push(`just plain`);
+ }
+ r.push(`${slave.birthName}.`);
+ } else if (slave.slaveSurname !== slave.birthSurname) {
+ r.push(`${slave.birthSurname}.`);
+ }
+ } if (slave.slaveSurname === 0) {
+ r.push(`${He} has no surname as a slave, which ${he}`);
+ if (slave.devotion > 95) {
+ r.push(`loves.`);
+ } else if (slave.devotion > 50) {
+ r.push(`likes.`);
+ } else if (slave.devotion > 20) {
+ r.push(`accepts.`);
+ } else if (slave.devotion >= -20) {
+ r.push(`tolerates.`);
+ } else if (slave.devotion >= -50) {
+ r.push(`resents.`);
+ } else {
+ r.push(`hates.`);
+ }
+ }
+ } else {
+ r.push(`${SlaveFullName(slave)} is not ${his} original name: ${he} was once called ${SlaveFullBirthName(slave)}.`);
+ }
+ }
+
+ return r.join(" ");
+};
diff --git a/src/npc/descriptions/sceneIntro.js b/src/npc/descriptions/sceneIntro.js
new file mode 100644
index 0000000000000000000000000000000000000000..2658cd9f3f6349fc7adf4f422d909339236e824a
--- /dev/null
+++ b/src/npc/descriptions/sceneIntro.js
@@ -0,0 +1,297 @@
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
+App.Desc.sceneIntro = function(slave) {
+ const r = [];
+ const {
+ he, him, his, He, His, himself
+ } = getPronouns(slave);
+
+ if (V.eventDescription === 1) {
+ r.push(`${He} is currently involved in an event, but is assigned to ${slave.assignment}.`);
+ if (slave.assignment === "be a subordinate slave") {
+ let lsd = V.slaveIndices[slave.subTarget];
+ if (lsd) {
+ r.push(`${He} has been ordered to serve <span class="slave-name-simple">${SlaveFullName(V.slaves[_lsd])}</span> specifically.`);
+ }
+ }
+ } else if (V.ui !== "start" && V.saleDescription !== 1) {
+ r.push(inspectionIntro());
+ if (slave.sentence > 0) {
+ r.push(sentence());
+ }
+ if (slave.fuckdoll === 0) {
+ if (slave.voice !== 0) {
+ r.push(voice());
+ }
+ }
+ r.push(relationship());
+ if (slave.fuckdoll === 0) {
+ r.push(sleepLoc());
+ }
+ }
+ return r.join(" ");
+
+ function inspectionIntro() {
+ const r = [];
+ if (slave.fuckdoll > 0) {
+ r.push(`You order another slave to bring ${him} before your desk so you can inspect ${him}.`);
+ } else if ((slave.assignment === "work in the dairy") && (V.dairyRestraintsSetting > 1)) {
+ r.push(`You go down to ${V.dairyName} to inspect ${his} heaving body.`);
+ } else if (slave.assignment === "be your agent") {
+ r.push(`You place a call to`);
+ let agentLocation = `${his} current location`;
+ for (let _i = 0; _i < V.arcologies.length; _i++) {
+ if (V.arcologies[_i].leaderID === slave.ID) {
+ agentLocation = V.arcologies[_i].name;
+ break;
+ }
+ }
+ r.push(`${agentLocation}, and ${he} instantly appears on camera.`);
+ } else {
+ r.push(`${He} comes to you for an inspection`);
+ switch (slave.assignment) {
+ case "whore":
+ r.push(`between customers.`);
+ break;
+ case "serve the public":
+ r.push(`from where ${he} was offering ${him}self publicly.`);
+ break;
+ case "work a glory hole":
+ r.push(`straight from confinement in a glory hole.`);
+ break;
+ case "get milked":
+ r.push(`between milkings.`);
+ break;
+ case "work as a farmhand":
+ r.push(`from where ${he} was taking care of crops and animals.`);
+ break;
+ case "rest":
+ r.push(`from where ${he} was resting.`);
+ break;
+ case "work as a nanny":
+ r.push(`from where ${he} was`);
+ if (V.nurseryBabies === 1) {
+ r.push(`taking care of a child.`);
+ } else if (V.nurseryBabies > 0) {
+ r.push(`taking care of children.`);
+ } else {
+ r.push(`keeping ${V.nurseryName} clean.`);
+ }
+ break;
+ case "please you":
+ r.push(`from where ${he} was offering ${himself} to you.`);
+ break;
+ case "be a subordinate slave":
+ if (slave.subTarget === -1) {
+ r.push(`from where ${he} was resting after ${his} latest baby-making session.`);
+ } else {
+ r.push(`straight from orally servicing another slave.`);
+ }
+ break;
+ case "be a servant":
+ r.push(`straight from bathing another slave.`);
+ break;
+ case "train slaves":
+ r.push(`between slave training contracts.`);
+ break;
+ case "stay confined":
+ r.push(`straight from ${his} confinement.`);
+ break;
+ case "guard you":
+ r.push(`armed and alert.`);
+ break;
+ case "recruit girls":
+ if (V.recruiterTarget !== "other arcologies") {
+ r.push(`after ${he} finishes cybering with a prospective recruit.`);
+ } else {
+ if (V.arcologies[0].influenceTarget === -1) {
+ r.push(`right away, since you haven't decided on an arcology to target for cultural influence, leaving ${him} with nothing to do.`);
+ } else {
+ r.push(`from where ${he} was resting after ${his} latest sexually exhausting visit to`);
+ for (let i = 0; i < V.arcologies.length; i++) {
+ if (V.arcologies[i].direction === V.arcologies[0].influenceTarget) {
+ r.push(`${V.arcologies[i].name}.`);
+ break;
+ }
+ }
+ }
+ }
+ break;
+ case "be your Head Girl":
+ r.push(`with updates on your other slaves ready for your review.`);
+ break;
+ default:
+ r.push(`as quickly as ${he} can.`);
+ }
+ }
+ return r.join(" ");
+ }
+
+ function sentence() {
+ const r = [];
+
+ if (slave.assignment === "work a glory hole") {
+ r.push(`${His} sentence lasts another`);
+ if (slave.sentence > 1) {
+ r.push(`${slave.sentence} weeks.`);
+ } else {
+ r.push(`week.`);
+ }
+ } else {
+ r.push(`${His} work assignment lasts another`);
+ if (slave.sentence > 1) {
+ r.push(`${slave.sentence} weeks.`);
+ } else {
+ r.push(`week.`);
+ }
+ }
+
+ return r.join(" ");
+ }
+
+ function voice() {
+ const r = [];
+
+ if (slave.rules.speech === "restrictive") {
+ r.push(`${He} is not allowed to speak unless spoken to, but when allowed, ${he} speaks in a`);
+ } else {
+ r.push(`${He} is allowed to ask questions, and when ${he} speaks, ${he} does so in a`);
+ }
+ if (slave.voice === 1) {
+ if (slave.voiceImplant < 0) {
+ r.push(`ridiculously deep, gravelly voice.`);
+ } else {
+ r.push(`deep, unfeminine voice.`);
+ }
+ } else if (slave.voice === 2) {
+ if (slave.voiceImplant !== 0) {
+ r.push(`slightly artificial feminine voice.`);
+ } else {
+ r.push(`pretty, feminine voice.`);
+ }
+ } else if (slave.voice === 3) {
+ if (slave.voiceImplant > 0) {
+ r.push(`ridiculously high, bubblegum voice.`);
+ } else {
+ r.push(`high, girly voice.`);
+ }
+ }
+
+ if (canTalk(slave, false)) {
+ r.push(App.Desc.accent(slave));
+ }
+
+ return r.join(" ");
+ }
+
+ function relationship() {
+ const r = [];
+ if (slave.relationship === -3) {
+ if (slave.fetish === "mindbroken") {
+ r.push(`${He} is <span class="relationship"> married to you,</span> not that it matters to ${his} broken mind; to ${him}, ${he} is a slave, nothing more.`);
+ } else if (slave.devotion + slave.trust >= 175) {
+ r.push(`${He} is <span class="relationship"> happily married to you,</span> though of course ${he} is still your slave; albeit a loving, devoted one.`);
+ } else if (slave.devotion < -20 && slave.trust > 20) {
+ r.push(`${He} is <span class="relationship"> reluctantly married to you,</span> though of course ${he} is still your slave.`);
+ } else if (slave.devotion < -20) {
+ r.push(`${He} is <span class="relationship"> forcibly married to you,</span> though of course ${he} is still your slave.`);
+ } else {
+ r.push(`${He} is <span class="relationship"> married to you,</span> though of course ${he} is still your slave.`);
+ }
+ } else if (slave.relationship === -1) {
+ r.push(`${He} is an <span class="relationship"> emotional slut,</span> happy to remain officially single and free to treat everyone equally.`);
+ } else if (slave.relationship === -2) {
+ r.push(`${He} is <span class="relationship"> emotionally bound to you;</span> ${his} feelings for you are comparable to those in a healthy, loving relationship.`);
+ } else if (slave.relationship !== 0) {
+ let lsd = V.slaveIndices[slave.relationshipTarget];
+ if (lsd) {
+ r.push(`${He} is`);
+ // TODO: update this with the new relationship rules
+ if (slave.relationship <= 1) {
+ r.push(`<span style="font-weight:bold" class="relationship">friends with ${SlaveFullName(V.slaves[lsd])};</span> the rules`);
+ if (slave.rules.relationship !== "restrictive") {
+ r.push(`encourage`);
+ } else {
+ r.push(`discourage`);
+ }
+ r.push(`their relationship.`);
+ } else if (slave.relationship <= 2) {
+ r.push(`<span style="font-weight:bold" class="relationship">best friends with ${SlaveFullName(V.slaves[lsd])};</span> the rules`);
+ if (slave.rules.relationship !== "restrictive") {
+ r.push(`encourage`);
+ } else {
+ r.push(`discourage`);
+ }
+ r.push(`their close relationship.`);
+ } else if (slave.relationship <= 3) {
+ r.push(`<span style="font-weight:bold" class="relationship">${SlaveFullName(V.slaves[lsd])}'s friend with benefits;</span> the rules`);
+ if (slave.rules.relationship === "permissive") {
+ r.push(`encourage`);
+ } else {
+ r.push(`discourage`);
+ }
+ r.push(`their sexual relationship.`);
+ } else if (slave.relationship <= 4) {
+ r.push(`<span style="font-weight:bold" class="relationship">${SlaveFullName(V.slaves[lsd])}'s lover;</span> the rules`);
+ if (slave.rules.relationship === "permissive") {
+ r.push(`encourage`);
+ } else {
+ r.push(`discourage`);
+ }
+ r.push(`their passionate relationship.`);
+ } else if (V.slaves[lsd].relationship > 4) {
+ r.push(`<span style="font-weight:bold" class="relationship">${SlaveFullName(V.slaves[lsd])}'s slave ${V.wife};</span> the rules`);
+ if (slave.rules.relationship === "permissive") {
+ r.push(`encourage`);
+ } else {
+ r.push(`discourage`);
+ }
+ r.push(`marital bliss.`);
+ }
+ }
+ } else if (slave.fuckdoll === 0) {
+ if (slave.rules.relationship === "restrictive") {
+ r.push(`The rules forbid ${him} from associating freely with other slaves.`);
+ } else if (slave.career === "a Futanari Sister") {
+ r.push(`The rules encourage ${him} to form friendships with other slaves, but ${he} seems disinclined to do so.${He}'s both friendly with them and eagerly sexual with them when allowed, but ${he} seems to be waiting for someone, deep down.`);
+ } else if (slave.rules.relationship === "just friends") {
+ r.push(`The rules encourage ${him} to form friendships with other slaves.`);
+ } else {
+ r.push(`The rules encourage ${him} to form relationships with other slaves.`);
+ }
+ }
+
+ return r.join(" ");
+ }
+
+ function sleepLoc() {
+ const r = [];
+
+ if (slave.ID === V.HeadGirl.ID && V.HGSuite === 1) {
+ r.push(`${He} lives in ${his} own suite within your penthouse,`);
+ } else if ((slave.ID === V.Bodyguard.ID) && (V.dojo > 1)) {
+ r.push(`${He} lives in ${his} own room within the armory,`);
+ } else if ((slave.assignment === "work in the dairy") && (V.dairyRestraintsSetting > 1)) {
+ r.push(`${He} sleeps attached to a milking machine,`);
+ } else if (slave.rules.living === "spare") {
+ r.push(`${He} sleeps on a bedroll,`);
+ } else if (slave.rules.living === "normal") {
+ r.push(`${He} sleeps on a cot,`);
+ } else if (slave.relationship >= 4) {
+ r.push(`${He} has ${his} own room, which ${he} shares with ${his}`);
+ if (slave.relationship === 5) {
+ r.push(getPronouns(slave).wife);
+ } else {
+ r.push(`${getPronouns(slave).girl}friend`);
+ }
+ r.push(`whenever they can manage it,`);
+ } else {
+ r.push(`${He} sleeps in ${his} own little room,`);
+ }
+ r.push(App.Desc.releaseDesc(slave));
+
+ return r.join(" ");
+ }
+};
diff --git a/src/npc/descriptions/skin.js b/src/npc/descriptions/skin.js
index 38ef0d1600be18ad4a772e4f52c261b527c72cdd..31e5547693a9b52b738c676c27d0560c21d623a6 100644
--- a/src/npc/descriptions/skin.js
+++ b/src/npc/descriptions/skin.js
@@ -70,7 +70,7 @@ App.Desc.skin = function(slave) {
function freckles() {
const r = [];
if (slave.markings === "freckles") {
- r.push(`${slave.skin} and lightly `);
+ r.push(`${slave.skin} and lightly`);
if ((skinToneLevel(slave.skin) > 5) && (skinToneLevel(slave.skin) < 10) && (slave.hColor === "red")) {
r.push(`freckled, an attractive combination.`);
} else {
diff --git a/src/npc/descriptions/style/hairClothing.js b/src/npc/descriptions/style/hairClothing.js
index b0b4a402cc8025fde936113b94b0f9407c4aaf84..3d553e04c073a50e93f1739b85605fd93a8484ae 100644
--- a/src/npc/descriptions/style/hairClothing.js
+++ b/src/npc/descriptions/style/hairClothing.js
@@ -1778,16 +1778,17 @@ App.Desc.hairClothing = function(slave) {
r.push(App.Desc.image(slave));
break;
case "spats and a tank top":
- r.push(`is tied back with a scrunchy into a long ponytail that falls down `);
+ r.push(`is tied back with a scrunchy into a long ponytail that falls down`);
if (hasAnyLegs(slave)) {
- r.push(`${his} leg`);
+ r.push(his);
if (hasBothLegs(slave)) {
- r.push(`s`);
+ r.push(`legs.`);
+ } else {
+ r.push(`leg.`);
}
} else {
- r.push(`past ${his} torso`);
+ r.push(`past ${his} torso.`);
}
- r.push(`.`);
break;
case "a huipil":
r.push(`is tied into a huge ponytail, that leaves ${his} long hair to wave in the wind.`);
diff --git a/src/player/desc/playerBoobs.js b/src/player/desc/playerBoobs.js
index 96e8c6de508360b3b22f8e9c3b17114ed4ce1b94..a9d95077f8e05f11674c8b23bacaf4fab43d3cea 100644
--- a/src/player/desc/playerBoobs.js
+++ b/src/player/desc/playerBoobs.js
@@ -109,7 +109,7 @@ App.Desc.Player.boobs = function() {
r.push(`Your chest is covered in dense freckles.`);
}
} else {
- r.push(`</span>you're flat.</span> You have nothing in the breast department.`);
+ r.push(`<span class="orange">you're flat.</span> You have nothing in the breast department.`);
if (V.PC.lactation > 0) {
r.push(`Your nipples cap a pair of painfully swollen bumps; milk beads from them at the slightest provocation.`);
}
@@ -130,21 +130,25 @@ App.Desc.Player.boobs = function() {
}
} else if (V.PC.career === "escort") {
if (V.PC.boobs >= 1400) {
- r.push(`Your top strains as it struggles to cover your nipples, letting your huge`);
+ r.push(`Your top strains as it struggles to cover your nipples, letting your`);
if (V.PC.markings === "freckles") {
- r.push(`, freckled`);
+ r.push(`huge, freckled`);
} else if (V.PC.markings === "heavily freckled") {
- r.push(`, densely freckled`);
+ r.push(`huge, densely freckled`);
+ } else {
+ r.push(`huge`);
}
- r.push(` bust bulge lewdly around it.`);
+ r.push(`bust bulge lewdly around it.`);
} else if (V.PC.boobs >= 1200) {
- r.push(`Your top can barely contain your big`);
+ r.push(`Your top can barely contain your `);
if (V.PC.markings === "freckles") {
- r.push(`, freckled`);
+ r.push(`big, freckled`);
} else if (V.PC.markings === "heavily freckled") {
- r.push(`, heavily freckled`);
+ r.push(`big, heavily freckled`);
+ } else {
+ r.push(`big`);
}
- r.push(` breasts, leaving you looking sluttier than ever.`);
+ r.push(`breasts, leaving you looking sluttier than ever.`);
} else if (V.PC.boobs >= 1000) {
r.push(`Your breasts spill over your slutty`);
if (V.PC.markings === "freckles") {
@@ -290,9 +294,9 @@ App.Desc.Player.boobs = function() {
} else if (V.PC.title === 1) {
r.push(`Your chest is quite`);
if (V.PC.lactation > 0) {
- frag = `masculine, though the pair of wet spots forming over your nipples suggest otherwise,`;
+ frag = ` masculine, though the pair of wet spots forming over your nipples suggest otherwise,`;
} else {
- frag = `masculine`;
+ frag = ` masculine`;
}
if (V.PC.markings === "freckles") {
frag += ` and covered in a light spray of freckles.`;
@@ -310,9 +314,9 @@ App.Desc.Player.boobs = function() {
frag = `non-existent`;
}
if (V.PC.markings === "freckles") {
- frag += ` and covered in a light spray of freckles.`;
+ frag += `and covered in a light spray of freckles.`;
} else if (V.PC.markings === "heavily freckled") {
- frag += ` and covered in dense freckles.`;
+ frag += `and covered in dense freckles.`;
} else {
frag += `.`;
}
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
index 6425a21ac003e5974a6e08e2bad72b219eaf2cb8..17bb7cba4098c861f292f6fa6cc7bdda125ef5db 100644
--- a/src/pregmod/eliteSlave.tw
+++ b/src/pregmod/eliteSlave.tw
@@ -239,7 +239,7 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
<<set $activeSlave.pubertyXX = 1>>
<<set $activeSlave.breedingMark = 1>>
-<<set _slaveCost = slaveCost($activeSlave)>>
+<<set _slaveCost = slaveCost($activeSlave, false, true)>>
<br><br>
@@ -254,6 +254,6 @@ It will take <<print cashFormat(_slaveCost)>> to win the auction.
<br><br>
-<<set $saleDescription = 1>><<include "Long Slave Description">>
+<<set $saleDescription = 1, $applyLaw = 1>><<include "Long Slave Description">>
<</if>>
diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw
index eb87587f3c2dbd68742c0321995bab72f9c8cacb..86263c457f3a620888ee1ad6fb6d58b68a11d6f8 100644
--- a/src/uncategorized/bulkSlaveGenerate.tw
+++ b/src/uncategorized/bulkSlaveGenerate.tw
@@ -85,9 +85,7 @@
<<set _slaveCost = slaveCost($activeSlave)>>
<<else>>
<<set _backup = $activeSlave>> /* backup newly generated slave */
- <<silently>>
- <<include "Law Compliance">> /* includes CheckForGingering — slave stats may change, affecting price */
- <</silently>>
+ <<run App.Desc.lawCompliance($activeSlave)>> /* includes CheckForGingering — slave stats may change, affecting price */
<<set _slaveCost = slaveCost($activeSlave)>>
<<run removeGingering()>> /* remove gingered state, if applied, so we can apply it again later */
<<set $activeSlave = _backup>> /* restore backup so we can apply Law Compliance again later */
diff --git a/src/uncategorized/householdLiquidator.tw b/src/uncategorized/householdLiquidator.tw
index 5d6b023b379ec8aeadb52d483cf8d5a2dfbb8794..0fd17bdcd71e068e08673e52c2d509750072c9c1 100644
--- a/src/uncategorized/householdLiquidator.tw
+++ b/src/uncategorized/householdLiquidator.tw
@@ -29,7 +29,7 @@ The household liquidator is offering a set of siblings for sale. You are permitt
<<set _relativeSlave = generateRelatedSlave($activeSlave, "younger sibling", _oppositeSex)>>
<<run _newSlaves.push($activeSlave), _newSlaves.push(_relativeSlave)>>
-<<set _slaveCost = slaveCost($activeSlave)>>
+<<set _slaveCost = slaveCost($activeSlave, false, true)>>
<<if $slavesSeen > $slaveMarketLimit>><<set _slaveCost += Math.trunc(_slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
<<set _totalCost = _slaveCost*3>>
@@ -67,7 +67,7 @@ The household liquidator is offering a $mother and $his <<if $activeSlave.genes
<<set _relativeSlave = generateRelatedSlave($activeSlave, "child", _oppositeSex)>>
<<run _newSlaves.push($activeSlave), _newSlaves.push(_relativeSlave)>>
-<<set _slaveCost = slaveCost($activeSlave)>>
+<<set _slaveCost = slaveCost($activeSlave, false, true)>>
<<if $slavesSeen > $slaveMarketLimit>><<set _slaveCost += Math.trunc(_slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
<<set _totalCost = _slaveCost*3>>
@@ -90,7 +90,7 @@ The household liquidator is offering something special: identical twins. The mar
<<set _relativeSlave = generateRelatedSlave($activeSlave, "twin")>>
<<run _newSlaves.push($activeSlave), _newSlaves.push(_relativeSlave)>>
-<<set _slaveCost = slaveCost($activeSlave)>>
+<<set _slaveCost = slaveCost($activeSlave, false, true)>>
<<if $slavesSeen > $slaveMarketLimit>><<set _slaveCost += Math.trunc(_slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
<<set _totalCost = _slaveCost*4>>
diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw
deleted file mode 100644
index c00ff1bb8c0f3792cef9d13973b36b46efe4149a..0000000000000000000000000000000000000000
--- a/src/uncategorized/lawCompliance.tw
+++ /dev/null
@@ -1,531 +0,0 @@
-:: Law Compliance [nobr]
-
-<<setLocalPronouns $activeSlave>>
-
-<<if $arcologies[0].FSSlimnessEnthusiastSMR == 1>>
- <<set $activeSlave.weight = random(-80,0)>>
- <<run setHealth($activeSlave, jsRandom(50, 90), 0, undefined, 0)>>
- $He has been kept on a rigorous diet for sale, has been required to exercise regularly, and has had excellent care taken of $his health.
-<</if>>
-<<if $arcologies[0].FSRepopulationFocusSMR == 1>>
- <<if $activeSlave.physicalAge < $fertilityAge>>
- <<if $precociousPuberty == 0>>
- <<set $activeSlave.physicalAge = $fertilityAge>>
- <<set $activeSlave.visualAge = $fertilityAge>>
- <<set $activeSlave.actualAge = $fertilityAge>>
- <<set $activeSlave.ovaryAge = $fertilityAge>>
- <</if>>
- <</if>>
- <<set $activeSlave.pubertyXX = 1>>
- <<if $activeSlave.ovaryAge >= 42>>
- /* corrects menopausal mothers */
- <<set $activeSlave.ovaryAge = 40>>
- <</if>>
- <<if $activeSlave.preg < 1>> /* "if" needed here to avoid conflicts with already pregnant slaves from repopulation FS arcologies markets */
- <<set $activeSlave.ovaries = 1>>
- <<set $activeSlave.vagina = either(0, 0, 1, 1, 1, 1, 1, 2, 2, 3)>>
- <<set $activeSlave.pregType = either(1, 1, 1, 1, 2, 2, 2, 3, 3, 4, 5)>>
- <<set $activeSlave.preg = random(5,38)>>
- <<set $activeSlave.pregWeek = $activeSlave.preg>>
- <<set $activeSlave.pregKnown = 1>>
- <<run SetBellySize($activeSlave)>>
- <</if>>
- If $he was unable to become pregnant before, $he has been made to now. $He is fertilized surgically to insure a healthy pregnancy.
-<</if>>
-<<if $arcologies[0].FSAssetExpansionistSMR == 1>>
- <<set $activeSlave.clit = either(0, 0, 0, 1, 1, 2)>>
- <<set $activeSlave.labia = either(0, 1, 2, 3)>>
- <<set $activeSlave.boobs += random(2,5)*100>>
- <<set $activeSlave.butt += random(1,2)>>
- <<set $activeSlave.lips = random(15,55)>>
- <<if $activeSlave.dick > 0>>
- <<set $activeSlave.dick = random(4,7)>>
- <</if>>
- <<if $activeSlave.balls > 0>>
- <<set $activeSlave.balls = random(4,7)>>
- <</if>>
- $He has been on powerful growth hormones for a long time, and has experienced growth in several areas as a result.
-<</if>>
-<<if $arcologies[0].FSPhysicalIdealistSMR == 1>>
- Much of $his time before sale was spent
- <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>
- <<set $activeSlave.muscles = random(20,50)>>
- doing cardio,
- <<else>>
- <<set $activeSlave.muscles = random(50,100)>>
- lifting weights,
- <</if>>
- and $his health has been raised to an almost unnatural level.
- <<run setHealth($activeSlave, jsRandom(50, 90), 0, undefined, 0)>>
- <<set $activeSlave.weight = random(-20,0)>>
-<<elseif $arcologies[0].FSHedonisticDecadenceSMR == 1>>
- <<set $activeSlave.weight = random(50,200)>>
- <<if $arcologies[0].FSHedonisticDecadenceStrongFat == 1>>
- <<set $activeSlave.muscles = random(10,60)>>
- <<run setHealth($activeSlave, jsRandom(10, 40), 0, undefined, 0)>>
- <<else>>
- <<run setHealth($activeSlave, jsRandom(-30, 10))>>
- <<set $activeSlave.muscles = random(-80,0)>>
- <</if>>
- Much of $his time before sale was spent being fattened up and <<if $arcologies[0].FSHedonisticDecadenceStrongFat == 1>>pumping iron<<else>>lying around<</if>>.
- <<if $activeSlave.devotion <= 20>>
- $He had to be force-fed massive amounts of slave food while bound to meet requirements, filling $him with @@.gold;fear@@ and @@.mediumorchid;disgust.@@
- <<set $activeSlave.trust -= 5>>
- <<set $activeSlave.devotion -= 5>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSGenderFundamentalistSMR == 1>>
- <<if $activeSlave.dick > 0>>
- <<set $activeSlave.balls = 0>>
- <<set $activeSlave.scrotum = 0>>
- <<set $activeSlave.boobs += random(0,2)*100>>
- <<set $activeSlave.butt += random(0,1)>>
- <<if $activeSlave.face < 95>>
- <<set $activeSlave.face = Math.trunc($activeSlave.face+random(0,20),-100,100)>>
- <</if>>
- $His balls were removed as soon as $he was enslaved, and $he's been kept on powerful female hormones for long enough to have a general feminizing effect.
- <</if>>
-<<elseif $arcologies[0].FSSupremacistSMR == 1>>
- <<if $activeSlave.dick > 0>>
- <<if $activeSlave.race != $arcologies[0].FSSupremacistRace>>
- <<set $activeSlave.balls = 0>>
- <<set $activeSlave.scrotum = 0>>
- $His balls were removed as soon as $he was enslaved to prevent $him from polluting fertile slaves with $his inferior semen.
- <</if>>
- <</if>>
-<<elseif $arcologies[0].FSSubjugationistSMR == 1>>
- <<if $activeSlave.dick > 0>>
- <<if $activeSlave.race == $arcologies[0].FSSubjugationistRace>>
- <<set $activeSlave.balls = 0>>
- <<set $activeSlave.scrotum = 0>>
- $His balls were removed as soon as $he was enslaved to prevent $him from polluting fertile slaves with $his subhuman semen.
- <</if>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSRestartSMR == 1>>
- <<if $activeSlave.balls > 0 || $activeSlave.ovaries > 0>>
- <<run TerminatePregnancy($activeSlave)>>
- <<set $activeSlave.counter.abortions++>>
- <<set $abortionsTotal++>>
- <<set $activeSlave.balls = 0>>
- <<set $activeSlave.ovaries = 0>>
- As a member of the lowest class,<<if $activeSlave.preg > 0>> $his pregnancy is immediately terminated, and<</if>> $he is promptly sterilized to prevent $him from passing on $his useless genes.
- <</if>>
-<</if>>
-<<if $arcologies[0].FSPaternalistSMR == 1>>
- <<if $activeSlave.devotion <= 20>>
- While $he came through the slave markets, $he was treated with decency. $He has begun to wonder whether $he can @@.mediumaquamarine;get away with@@ being disobedient.
- <<set $activeSlave.trust += 10>>
- <<else>>
- While $he came through the slave markets, $he was treated with decency. $He has begun to hope that $he can expect @@.mediumaquamarine;basic respect@@ despite being a sex slave.
- <<set $activeSlave.trust += 10>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSDegradationistSMR == 1>>
- $His current owners @@.gold;brutalized $him@@ before putting $him on sale, using clever methods to produce agony without seriously damaging $his health.
- <<set $activeSlave.trust -= 10>>
-<</if>>
-<<if $arcologies[0].FSPetiteAdmirationSMR == 1>>
- $His height was meticulously taken before being allowed into the markets.
- <<if !heightPass($activeSlave)>>
- <<set $activeSlave.height = Math.trunc(Height.random($activeSlave, {limitMult: [-4, -2]}))>>
- <</if>>
-<<elseif $arcologies[0].FSStatuesqueGlorificationSMR == 1>>
- $His height, as well as $his potential for growth, were meticulously taken before being allowed into the markets.
- <<if !heightPass($activeSlave)>>
- <<set $activeSlave.height = Math.trunc(Height.random($activeSlave, {limitMult: [2, 4]}))>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSIntellectualDependencySMR == 1>>
- $He passed the intelligence exam needed to be qualify $him for sale. A truly @@.hotpink;joyous achievement@@ for $him.
- <<set $activeSlave.intelligence = Intelligence.random({limitIntelligence: [-100, -50]})>>
- <<set $activeSlave.devotion += 5>>
-<<elseif $arcologies[0].FSSlaveProfessionalismSMR == 1>>
- $He underwent an intense lesson plan to hone $his skills to a level appropriate for sale.
- <<if $activeSlave.vagina >= 0>>
- <<set $activeSlave.skill.vaginal = Math.clamp($activeSlave.skill.vaginal+50, 50, 100)>>
- <</if>>
- <<set $activeSlave.skill.anal = Math.clamp($activeSlave.skill.anal+50, 50, 100)>>
- <<set $activeSlave.skill.oral = Math.clamp($activeSlave.skill.oral+50, 50, 100)>>
- <<set $activeSlave.skill.entertainment = Math.clamp($activeSlave.skill.entertainment+50, 50, 100)>>
- <<set $activeSlave.skill.whoring = Math.clamp($activeSlave.skill.whoring+50, 50, 100)>>
- <<if $activeSlave.accent > 1>>
- <<set $activeSlave.accent = 1>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSBodyPuristSMR == 1>>
- In order to qualify for sale, $he has been meticulously inspected for implants, tattoos, and piercings, and any present have been removed.
- <<set $activeSlave.nipplesPiercing = 0>>
- <<set $activeSlave.areolaePiercing = 0>>
- <<set $activeSlave.lipsPiercing = 0>>
- <<set $activeSlave.vaginaPiercing = 0>>
- <<set $activeSlave.dickPiercing = 0>>
- <<set $activeSlave.clitPiercing = 0>>
- <<set $activeSlave.anusPiercing = 0>>
- <<set $activeSlave.corsetPiercing = 0>>
- <<set $activeSlave.earPiercing = 0>>
- <<set $activeSlave.eyebrowPiercing = 0>>
- <<set $activeSlave.nosePiercing = 0>>
- <<set $activeSlave.navelPiercing = 0>>
- <<set $activeSlave.lipsTat = 0>>
- <<set $activeSlave.buttTat = 0>>
- <<set $activeSlave.anusTat = 0>>
- <<set $activeSlave.vaginaTat = 0>>
- <<set $activeSlave.dickTat = 0>>
- <<set $activeSlave.boobsTat = 0>>
- <<set $activeSlave.armsTat = 0>>
- <<set $activeSlave.legsTat = 0>>
- <<set $activeSlave.shouldersTat = 0>>
- <<set $activeSlave.backTat = 0>>
- <<set $activeSlave.stampTat = 0>>
- <<if $activeSlave.boobsImplant > 0>>
- <<set $activeSlave.boobs -= $activeSlave.boobsImplant>>
- <<set $activeSlave.boobsImplant = 0>>
- <<set $activeSlave.boobsImplantType = "none">>
- <</if>>
- <<if $activeSlave.buttImplant > 0>>
- <<set $activeSlave.butt -= $activeSlave.buttImplant>>
- <<set $activeSlave.buttImplant = 0>>
- <<set $activeSlave.buttImplantType = "none">>
- <</if>>
- <<if $activeSlave.lipsImplant > 0>>
- <<set $activeSlave.lips -= $activeSlave.lipsImplant>>
- <<set $activeSlave.lipsImplant = 0>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSTransformationFetishistSMR == 1>>
- In order to qualify for sale, $he has been kitted out with a basic set of breast, buttock, and lip implants.
- <<if $activeSlave.devotion <= 20>>
- Being turned into an assembly line bimbo fills $him with @@.gold;fear@@ and @@.mediumorchid;disgust.@@
- <<set $activeSlave.trust -= 5>>
- <<set $activeSlave.devotion -= 5>>
- <</if>>
- <<if $activeSlave.boobsImplant == 0>>
- <<set $activeSlave.boobsImplant = 400>>
- <<set $activeSlave.boobs += $activeSlave.boobsImplant>>
- <<set $activeSlave.boobsImplantType = "normal">>
- <</if>>
- <<if $activeSlave.buttImplant == 0>>
- <<set $activeSlave.buttImplant = 1>>
- <<set $activeSlave.butt += $activeSlave.buttImplant>>
- <<set $activeSlave.buttImplantType = "normal">>
- <</if>>
- <<if $activeSlave.lipsImplant == 0>>
- <<set $activeSlave.lipsImplant = 10>>
- <<set $activeSlave.lips += $activeSlave.lipsImplant>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSYouthPreferentialistSMR == 1>>
- <<if $activeSlave.physicalAge > 35>>
- $He was treated as a disposable old bitch in the slave pens, @@.gold;worrying $him.@@
- <<set $activeSlave.trust -= 5>>
- <<elseif $activeSlave.physicalAge <= 25>>
- $He was treated reasonably well in the slave pens due to $his youth, @@.mediumaquamarine;reassuring $him.@@
- <<set $activeSlave.trust += 5>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSMaturityPreferentialistSMR == 1>>
- <<if $activeSlave.physicalAge > 35>>
- $He was treated reasonably well in the slave pens due to $his maturity, @@.mediumaquamarine;reassuring $him.@@
- <<set $activeSlave.trust += 5>>
- <<elseif $activeSlave.physicalAge <= 25>>
- $He was treated as a disposable little slut in the slave pens, @@.gold;worrying $him.@@
- <<set $activeSlave.trust -= 5>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSPastoralistSMR == 1>>
- <<if $activeSlave.lactation == 0>>
- $He was implanted with permanent lactation drugs in order to qualify for sale, and was kept in the slave pens until $he could be put up on the block with dripping nipples.
- <<set $activeSlave.lactation = 2, $activeSlave.lactationDuration = 2>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSChattelReligionistSMR == 1>>
- $He has been consecrated for sale by being offered to the public for a full night, from sunset to sunrise.
- <<if $activeSlave.devotion <= 20>>
- Since $he was not willing to accept this treatment, $his consecration took the form of twelve hours of rape, @@.gold;terrifying $him@@ and @@.mediumorchid;filling $him with hatred.@@
- <<set $activeSlave.trust -= 15>>
- <<set $activeSlave.devotion -= 15>>
- <<else>>
- $He accepted this treatment, @@.hotpink;breaking $him@@ to sexual slavery.
- <<set $activeSlave.devotion += 5>>
- <</if>>
-
- <<run seX($activeSlave, "oral", "public", "penetrative", 10)>>
- <<if $activeSlave.vagina > 0>>
- <<run seX($activeSlave, "vaginal", "public", "penetrative", 10)>>
- <<if $activeSlave.vagina < 3>>
- <<set $activeSlave.vagina += 1>>
- <</if>>
- <<else>>
- <<run seX($activeSlave, "oral", "public", "penetrative", 10)>>
- <</if>>
- <<if $activeSlave.anus > 0>>
- <<run seX($activeSlave, "anal", "public", "penetrative", 10)>>
- <<if $activeSlave.anus < 3>>
- <<set $activeSlave.anus += 1>>
- <</if>>
- <<else>>
- <<run seX($activeSlave, "oral", "public", "penetrative", 10)>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSRomanRevivalistSMR == 1>>
- As $he passed though the slave markets, $he saw many less valuable slaves selected to die in gladiatorial combats. $He is relieved $he wasn't one of them, but @@.gold;terrified@@ that will be $his fate if $he makes mistakes.
- <<set $activeSlave.trust -= 10>>
-<</if>>
-<<if $arcologies[0].FSAztecRevivalistSMR == 1>>
- As $he passed though the golden city, $he saw a less valuable <<if $arcologies[0].FSPaternalist != "unset">>slave's virginity get sacrificed<<else>>slave get sacrificed<</if>> on one of the many altars spread throughout the city. $He was <<if $arcologies[0].FSPaternalist != "unset">>@@.gold;startled@@<<else>>@@.gold;mortified@@<</if>> to learn what befalls lesser slaves here.
- <<if $arcologies[0].FSPaternalist != "unset">>
- <<set $activeSlave.trust -= 5>>
- <<else>>
- <<set $activeSlave.trust -= 20>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSEgyptianRevivalistSMR == 1>>
- While $he was in the slave pens, $he was subjected to Egyptian cultural indoctrination.
- <<if $activeSlave.skill.entertainment > 10>>
- $He is now @@.mediumaquamarine;confident@@ that $his entertainment skills will be valued here.
- <<set $activeSlave.trust += 10>>
- <<elseif $activeSlave.intelligenceImplant >= 15>>
- $He now @@.mediumaquamarine;hopes@@ that $his education will be valued here.
- <<set $activeSlave.trust += 5>>
- <<else>>
- $He is @@.gold;concerned@@ that $he doesn't have what it takes to fit in.
- <<set $activeSlave.trust -= 5>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSEdoRevivalistSMR == 1>>
- While $he was in the slave pens, $he was subjected to Edo Revivalist cultural indoctrination.
- <<if $activeSlave.nationality == "Japanese">>
- $He is now @@.mediumaquamarine;confident@@ that, as a proper Japanese $girl, $he will receive preferential treatment.
- <<set $activeSlave.trust += 10>>
- <<elseif $activeSlave.skill.entertainment > 30>>
- $He now @@.mediumaquamarine;hopes@@ that $his refined entertainment skills will make $him culturally as well as sexually valuable.
- <<set $activeSlave.trust += 5>>
- <<else>>
- $He is @@.gold;concerned@@ that $he doesn't have what it takes to fit in.
- <<set $activeSlave.trust -= 5>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSArabianRevivalistSMR == 1>>
- While $he was in the slave pens, $he was subjected to classical Arabian cultural indoctrination.
- <<if $activeSlave.face > 40>>
- $He is now @@.mediumaquamarine;confident@@ that $his great beauty will be valued here.
- <<set $activeSlave.trust += 10>>
- <<elseif $activeSlave.accent <= 1>>
- $He now @@.mediumaquamarine;hopes@@ that $his linguistic skill will be valued here.
- <<set $activeSlave.trust += 5>>
- <<else>>
- $He is @@.gold;concerned@@ that $he doesn't have what it takes to fit in.
- <<set $activeSlave.trust -= 5>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSChineseRevivalistSMR == 1>>
- While $he was in the slave pens, $he was subjected to Imperial Chinese cultural indoctrination.
- <<if $activeSlave.intelligence > 50>>
- $He is now @@.mediumaquamarine;confident@@ that $his brilliance will be valued here.
- <<set $activeSlave.trust += 10>>
- <<elseif $activeSlave.intelligenceImplant >= 15>>
- $He now @@.mediumaquamarine;hopes@@ that $his education will be valued here.
- <<set $activeSlave.trust += 5>>
- <<else>>
- $He is @@.gold;concerned@@ that $he doesn't have what it takes to fit in.
- <<set $activeSlave.trust -= 5>>
- <</if>>
-<</if>>
-
-<<if $policies.SMR.basicSMR == 0>>
- While $he came through the slave markets, $he was treated with inhuman callousness. It was very obvious and @@.gold;very terrifying@@ to $him that $he is now considered a piece of meat.
- <<set $activeSlave.trust -= 5>>
-<</if>>
-
-<<if $policies.SMR.healthInspectionSMR == 1>>
- <<if $activeSlave.health.condition < -10>>
- $His current owners held $him for basic medical care before putting $him on sale, resolving some of $his health issues.
- <<run improveCondition($activeSlave, 10)>>
- <</if>>
-<</if>>
-
-<<if $policies.SMR.educationSMR == 1>>
- <<if $activeSlave.intelligenceImplant == 0>>
- $He arrived at $arcologies[0].name in a pitiably undereducated state, and has been held back until $he completed a basic course of slave education.
- <<set $activeSlave.intelligenceImplant = 15>>
- <</if>>
-<</if>>
-
-<<if $policies.SMR.frigiditySMR == 1>>
- <<if $activeSlave.energy > 20>>
- Before reaching the market, $he was trained to disregard sex until $he showed no interest in sex at all.
- <<set $activeSlave.energy = 20>>
- <</if>>
-<</if>>
-
-<<if $policies.SMR.beauty.basicSMR == 1>>
- <<if $activeSlave.face < 0>>
- <<set $activeSlave.face = random(0,60)>>
- <</if>>
- While $he was in the slave pens, $he saw that less attractive slaves were immediately designated as menials and Fuckdolls, and $he is @@.gold;terrified@@ that should $he lose $his beauty, $he'll be considered worthless and be reassigned on the spot.
- <<set $activeSlave.trust -= 5>>
-<</if>>
-
-<<if $policies.SMR.beauty.qualitySMR == 1>>
- <<if $activeSlave.face < 20>>
- <<set $activeSlave.face = random(20,100)>>
- <</if>>
- While $he was in the slave pens, $he saw that less attractive slaves were immediately designated as menials and Fuckdolls, and $he is @@.gold;terrified@@ that should $he lose $his beauty, $he'll be considered worthless and be reassigned on the spot.
- <<set $activeSlave.trust -= 5>>
-<</if>>
-
-<<if $policies.SMR.weightSMR == 1>>
- <<if $activeSlave.weight > 100>>
- <<set $activeSlave.weight = random(-50,50)>>
- <</if>>
- While $he was in the slave pens, $he saw that obese slaves were immediately designated as menials and cows, and $he is @@.gold;terrified@@ that should $he get fat, $he'll be considered worthless and be reassigned on the spot.
- <<set $activeSlave.trust -= 5>>
-<</if>>
-
-<<if $policies.SMR.height.basicSMR == 1>>
- <<if $activeSlave.height < 170>>
- <<if $activeSlave.height >= 160>>
- Before $he was put up for sale, $he underwent height increasing surgery to fulfill your arcology's height SMR. $He was @@.gold;horrified@@ by how drastically $his body was altered just for a chance at sale.
- <<set $activeSlave.trust -= 10>>
- <<set $activeSlave.height += 10, $activeSlave.heightImplant = 1>>
- <<run healthDamage($activeSlave, 40)>>
- <<else>>
- While $he was in the slave pens, $he was treated as nothing more than an unsalvageable slab of meat suitable only for the lowliest of jobs. $He's @@.hotpink;desperate@@ enough to follow any order in @@.gold;fear@@ that should $he fail, $he'll be discarded like so many other shorties.
- <<set $activeSlave.devotion += 10, $activeSlave.trust -= 10>>
- <</if>>
- <<else>>
- While $he was in the slave pens, $he saw that short and even average sized slaves were commonly designated as menials and Fuckdolls. $His tall stature gives $him a promising future compared to $his shorter peers, leaving $him @@.mediumOrchid;inappropriately proud@@ of $his height.
- <<set $activeSlave.devotion -= 10>>
- <</if>>
-<<elseif $policies.SMR.height.basicSMR == -1>>
- <<if $activeSlave.height >= 160>>
- <<if $activeSlave.height <= 169>>
- Before $he was put up for sale, $he underwent height reduction surgery to fulfill your arcology's height SMR. $He was @@.gold;horrified@@ by how drastically $his body was altered just for a chance at sale.
- <<set $activeSlave.trust -= 10>>
- <<set $activeSlave.height -= 10, $activeSlave.heightImplant = -1>>
- <<run healthDamage($activeSlave, 40)>>
- <<else>>
- While $he was in the slave pens, $he was treated as nothing more than an unsalvageable slab of meat suitable only for the lowliest of jobs. $He's @@.hotpink;desperate@@ enough to follow any order in @@.gold;fear@@ that should $he fail, $he'll be discarded like all the other tall <<= $girl>>s.
- <<set $activeSlave.devotion += 10, $activeSlave.trust -= 10>>
- <</if>>
- <<else>>
- While $he was in the slave pens, $he saw that tall and even average sized slaves were commonly designated as menials and Fuckdolls. $His short stature gives $him a promising future compared to $his towering peers, leaving $him @@.mediumOrchid;inappropriately proud@@ of $his height.
- <<set $activeSlave.devotion -= 10>>
- <</if>>
-<</if>>
-
-<<if $policies.SMR.height.advancedSMR == 1>>
- <<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: $policies.SMR.height.advancedSMR, limitMult: [0, 5 * $AdvancedHeightSMR]}))>>
- While $he was in the slave pens, $he saw that slaves on the shorter end of the height curve were immediately designated as menials and Fuckdolls.
- <<if $activeSlave.physicalAge < 16>>
- $He is @@.gold;terrified@@ that if $he doesn't keep growing, $he'll be reassigned on the spot without a second thought.
- <<set $activeSlave.trust -= 5>>
- <<else>>
- $His above average stature gives $him a promising future compared to $his shorter peers, leaving $him @@.mediumOrchid;inappropriately proud@@ of $his height.
- <<set $activeSlave.devotion -= 10>>
- <</if>>
-<<elseif $policies.SMR.height.advancedSMR == -1>>
- <<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: $policies.SMR.height.advancedSMR, limitMult: [0, 5 * $AdvancedHeightSMR]}))>>
- While $he was in the slave pens, $he saw that slaves on the taller end of the height curve were immediately designated as menials and Fuckdolls.
- <<if $activeSlave.physicalAge < 16>>
- $He is @@.gold;terrified@@ that if $he goes through a growth spurt, $he'll be reassigned on the spot without a second thought.
- <<set $activeSlave.trust -= 5>>
- <<else>>
- $His below average stature gives $him a promising future compared to $his taller peers, leaving $him @@.mediumOrchid;inappropriately proud@@ of $his height.
- <<set $activeSlave.devotion -= 10>>
- <</if>>
-<</if>>
-
-<<if $policies.SMR.intelligence.basicSMR == 1>>
- <<if $activeSlave.intelligence <= -15>>
- <<set $activeSlave.intelligence = Intelligence.random({limitIntelligence: [0,40]})>>
- <</if>>
- While $he was in the slave pens, $he saw that less intelligent slaves were immediately designated as menials and Fuckdolls, and $he is @@.gold;terrified@@ that if $he makes a mistake, $he'll be thought stupid and be reassigned on the spot.
- <<set $activeSlave.trust -= 5>>
-<</if>>
-
-<<if $policies.SMR.intelligence.qualitySMR == 1>>
- <<if $activeSlave.intelligence <= 15>>
- <<set $activeSlave.intelligence = Intelligence.random({limitIntelligence: [16,100]})>>
- <</if>>
- While $he was in the slave pens, $he saw that less intelligent slaves were immediately designated as menials and Fuckdolls, and $he is @@.gold;terrified@@ that if $he makes a mistake, $he'll be thought stupid and be reassigned on the spot.
- <<set $activeSlave.trust -= 5>>
-<</if>>
-
-<<if policies.countEugenicsSMRs() > 0>>
- <<set _eugenicsMarketTest = 1>>
- As soon as $he arrived in the slave market, $he was subjected to a battery of testing:
- <<if $policies.SMR.eugenics.intelligenceSMR == 1>>
- an intelligence test,
- <<if $activeSlave.intelligence+$activeSlave.intelligenceImplant <= 50>>
- <<set _eugenicsMarketTest = 0>>
- <</if>>
- <</if>>
- <<if $policies.SMR.eugenics.heightSMR == 1>>
- rigorous height and bone measurements,
- <<if $activeSlave.height < (Height.mean($activeSlave) + 15)>>
- <<set _eugenicsMarketTest = 0>>
- <</if>>
- <</if>>
- <<if $policies.SMR.eugenics.faceSMR == 1>>
- strict judgments of $his facial attractiveness,
- <<if $activeSlave.face < 40>>
- <<set _eugenicsMarketTest = 0>>
- <</if>>
- <</if>>
- a physical exam, and more.
- <<if _eugenicsMarketTest == 0>>
- $He failed, and only then learned that by failing $he placed $himself under the merciless dictates of eugenic theory.
- <<if $activeSlave.balls > 0 && (isFertile($activeSlave) || $activeSlave.preg > 0)>>
- $His balls were promptly
- <<if $seeExtreme == 1>>
- removed
- <<set $activeSlave.balls = 0>>
- <<set $activeSlave.scrotum = 0>>
- <<else>>
- flooded with chemicals
- <<set $activeSlave.ballType = "sterile">>
- <</if>>
- to prevent $him from passing on $his inferior genes, @@.mediumorchid;infuriating@@ and @@.gold;terrifying@@ $him.
- Furthermore, $his <<if $activeSlave.preg > 0>>pregnancy was terminated and afterwards $his <</if>>tubes were promptly tied to prevent $him from passing on $his inferior genes, @@.mediumorchid;saddening@@ and @@.gold;frightening@@ $him.
- <<run TerminatePregnancy($activeSlave)>>
- <<set $activeSlave.counter.abortions++>>
- <<set $abortionsTotal++>>
- <<set $activeSlave.devotion -= 30>>
- <<set $activeSlave.trust -= 30>>
- <<elseif $activeSlave.balls > 0>>
- $His balls were promptly
- <<if $seeExtreme == 1>>
- removed
- <<set $activeSlave.balls = 0>>
- <<set $activeSlave.scrotum = 0>>
- <<else>>
- flooded with chemicals
- <<set $activeSlave.ballType = "sterile">>
- <</if>>
- to prevent $him from passing on $his inferior genes, @@.mediumorchid;infuriating@@ and @@.gold;terrifying@@ $him.
- <<set $activeSlave.devotion -= 20, $activeSlave.trust -= 20>>
- <<elseif (isFertile($activeSlave) || $activeSlave.preg > 0)>>
- $His <<if $activeSlave.preg > 0>>pregnancy was terminated and afterwards $his <</if>>tubes were promptly tied to prevent $him from passing on $his inferior genes, @@.mediumorchid;saddening@@ and @@.gold;frightening@@ $him.
- <<run TerminatePregnancy($activeSlave)>>
- <<set $activeSlave.counter.abortions++>>
- <<set $abortionsTotal++>>
- <<set $activeSlave.devotion -= 10>>
- <<set $activeSlave.trust -= 10>>
- <<else>>
- Fortunately for $him, $he was already incapable of passing on $his inferior genes.
- <</if>>
- <<else>>
- $He passed, and only then learned that passing marked $him as fit to pass on $his genes, should $his owners decide to breed $him.
- <<if $activeSlave.balls > 0 && (isFertile($activeSlave) || $activeSlave.preg > 0)>>
- $His relief that $he won't have $his balls cut off and $his tubes tied is mixed with fear at being introduced to your society in this way.
- <<elseif (isFertile($activeSlave) || $activeSlave.preg > 0)>>
- $His relief that $he won't have $his tubes tied is mixed with fear at being introduced to your society in this way.
- <<else>>
- This is merely confusing to $him, since $he isn't able to reproduce as it is. Of course, $he doesn't know that you're quite capable of changing that.
- <</if>>
- <</if>>
-<</if>>
-
-<<= checkForGingering()>> /* may store a backup of $activeSlave and make temporary changes; call removeGingering() to retrieve backup before making changes to $activeSlave */
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 8a54c682f3ec6a579cba53eea2a19fa097d8f68c..d94d60c5a4c80811714c271b8b99d70a76058303 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -21,7 +21,7 @@
<<elseif $saleDescription == 1>>
<<if $applyLaw == 1>>
has passed inspection to be sold in your arcology.
- <<include "Law Compliance">> /* includes CheckForGingering */
+ <<= App.Desc.lawCompliance($activeSlave)>> /* includes CheckForGingering */
<<else>>
is for sale and is available to inspect.
<<if $prisonCrime>> /* reports a slave's crime in the criminal market */
@@ -82,267 +82,9 @@ is
<</if>>
<</if>>
-<<if $ui == "start">>
-<<elseif $saleDescription == 1>>
-<<elseif $eventDescription == 1>>
- $He is currently involved in an event, but is assigned to $activeSlave.assignment.
- <<if $activeSlave.assignment == "be a subordinate slave">>
- <<set _lsd = $slaveIndices[$activeSlave.subTarget]>>
- <<if def _lsd>>
- $He has been ordered to serve <span style="font-weight:bold"><span class="pink"><<= SlaveFullName($slaves[_lsd])>></span></span> specifically.
- <</if>>
- <</if>>
-<<else>>
-
- <<if $activeSlave.fuckdoll > 0>>
- You order another slave to bring $him before your desk so you can inspect $him.
- <<elseif ($activeSlave.assignment == "work in the dairy") && ($dairyRestraintsSetting > 1)>>
- You go down to $dairyName to inspect $his heaving body.
- <<elseif $activeSlave.assignment == "be your agent">>
- You place a call to
- <<set _agentLocation = "$his current location">>
- <<for _i = 0; _i < $arcologies.length; _i++>>
- <<if $arcologies[_i].leaderID == $activeSlave.ID>>
- <<set _agentLocation = $arcologies[_i].name>>
- <<break>>
- <</if>>
- <</for>>
- <<print _agentLocation>>, and $he instantly appears on camera.
- <<else>>
- $He comes to you for an inspection
- <<switch $activeSlave.assignment>>
- <<case "whore">>
- between customers.
- <<case "serve the public">>
- from where $he was offering $himself publicly.
- <<case "work a glory hole">>
- straight from confinement in a glory hole.
- <<case "get milked">>
- between milkings.
- <<case "work as a farmhand">>
- from where $he was taking care of crops and animals.
- <<case "rest">>
- from where $he was resting.
- <<case "work as a nanny">>
- from where $he was <<if $nurseryBabies > 0>>taking care of children<<else>>keeping $nurseryName clean<</if>>.
- <<case "please you">>
- from where $he was offering $himself to you.
- <<case "be a subordinate slave">>
- <<if $activeSlave.subTarget == -1>>
- from where $he was resting after $his latest baby-making session.
- <<else>>
- straight from orally servicing another slave.
- <</if>>
- <<case "be a servant">>
- straight from bathing another slave.
- <<case "train slaves">>
- between slave training contracts.
- <<case "stay confined">>
- straight from $his confinement.
- <<case "guard you">>
- armed and alert.
- <<case "recruit girls">>
- <<if $recruiterTarget != "other arcologies">>
- after $he finishes cybering with a prospective recruit.
- <<else>>
- <<if $arcologies[0].influenceTarget == -1>>
- right away, since you haven't decided on an arcology to target for cultural influence, leaving $him with nothing to do.
- <<else>>
- from where $he was resting after $his latest sexually exhausting visit to <<for $i = 0; $i < $arcologies.length; $i++>><<if $arcologies[$i].direction == $arcologies[0].influenceTarget>>$arcologies[$i].name<<break>><</if>><</for>>.
- <</if>>
- <</if>>
- <<case "be your Head Girl">>
- with updates on your other slaves ready for your review.
- <<default>>
- as quickly as $he can.
- <</switch>>
- <</if>>
-
- <<if $activeSlave.sentence > 0>>
- <<if $activeSlave.assignment == "work a glory hole">>
- $His sentence lasts another <<if $activeSlave.sentence > 1>>$activeSlave.sentence weeks<<else>>week<</if>>.
- <<else>>
- $His work assignment lasts another <<if $activeSlave.sentence > 1>>$activeSlave.sentence weeks<<else>>week<</if>>.
- <</if>>
- <</if>>
-
- <<if $activeSlave.fuckdoll == 0>>
- <<if $activeSlave.voice != 0>>
- <<if $activeSlave.rules.speech == "restrictive">>
- $He is not allowed to speak unless spoken to, but when allowed, $he speaks in a
- <<else>>
- $He is allowed to ask questions, and when $he speaks, $he does so in a
- <</if>>
- <<if $activeSlave.voice == 1>>
- <<if $activeSlave.voiceImplant < 0>>
- ridiculously deep, gravelly voice.
- <<else>>
- deep, unfeminine voice.
- <</if>>
- <<elseif $activeSlave.voice == 2>>
- <<if $activeSlave.voiceImplant != 0>>
- slightly artificial feminine voice.
- <<else>>
- pretty, feminine voice.
- <</if>>
- <<elseif $activeSlave.voice == 3>>
- <<if $activeSlave.voiceImplant > 0>>
- ridiculously high, bubblegum voice.
- <<else>>
- high, girly voice.
- <</if>>
- <</if>>
-
- <<if canTalk($activeSlave, false)>>
- <<= App.Desc.accent($activeSlave)>>
- <</if>>
-
- <</if>>
- <</if>>
-
- <<if $activeSlave.relationship == -3>>
- <<if $activeSlave.fetish == "mindbroken">>
- $He is <span class="lightgreen">married to you,</span> not that it matters to $his broken mind; to $him, $he is a slave, nothing more.
- <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- $He is <span class="lightgreen">happily married to you,</span> though of course $he is still your slave; albeit a loving, devoted one.
- <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- $He is <span class="lightgreen">reluctantly married to you,</span> though of course $he is still your slave.
- <<elseif $activeSlave.devotion < -20>>
- $He is <span class="lightgreen">forcibly married to you,</span> though of course $he is still your slave.
- <<else>>
- $He is <span class="lightgreen">married to you,</span> though of course $he is still your slave.
- <</if>>
- <<elseif $activeSlave.relationship == -1>>
- $He is an <span class="lightgreen">emotional slut,</span> happy to remain officially single and free to treat everyone equally.
- <<elseif $activeSlave.relationship == -2>>
- $He is <span class="lightgreen">emotionally bound to you;</span> $his feelings for you are comparable to those in a healthy, loving relationship.
- <<elseif $activeSlave.relationship != 0>>
- <<set _lsd = $slaveIndices[$activeSlave.relationshipTarget]>>
- <<if def _lsd>>
- $He is
- /* TODO: update this with the new relationship rules */
- <<if $activeSlave.relationship <= 1>>
- <span style="font-weight:bold" class="lightgreen">friends with <<= SlaveFullName($slaves[_lsd])>>;</span> the rules <<if $activeSlave.rules.relationship != "restrictive">>encourage<<else>> discourage<</if>> their relationship.
- <<elseif $activeSlave.relationship <= 2>>
- <span style="font-weight:bold" class="lightgreen">best friends with <<= SlaveFullName($slaves[_lsd])>>;</span> the rules <<if $activeSlave.rules.relationship != "restrictive">>encourage<<else>> discourage<</if>> their close relationship.
- <<elseif $activeSlave.relationship <= 3>>
- <span style="font-weight:bold" class="lightgreen"><<= SlaveFullName($slaves[_lsd])>>'s friend with benefits;</span> the rules <<if $activeSlave.rules.relationship == "permissive">>encourage<<else>> discourage<</if>> their sexual relationship.
- <<elseif $activeSlave.relationship <= 4>>
- <span style="font-weight:bold" class="lightgreen"><<= SlaveFullName($slaves[_lsd])>>'s lover;</span> the rules <<if $activeSlave.rules.relationship == "permissive">>encourage<<else>> discourage<</if>> their passionate relationship.
- <<elseif $slaves[_lsd].relationship > 4>>
- <span style="font-weight:bold" class="lightgreen"><<= SlaveFullName($slaves[_lsd])>>'s slave $wife;</span> the rules <<if $activeSlave.rules.relationship == "permissive">>encourage<<else>> discourage<</if>> marital bliss.
- <</if>>
- <</if>>
- <<elseif $activeSlave.fuckdoll == 0>>
- <<if $activeSlave.rules.relationship == "restrictive">>
- The rules forbid $him from associating freely with other slaves.
- <<elseif $activeSlave.career == "a Futanari Sister">>
- The rules encourage $him to form friendships with other slaves, but $he seems disinclined to do so. $He's both friendly with them and eagerly sexual with them when allowed, but $he seems to be waiting for someone, deep down.
- <<elseif $activeSlave.rules.relationship == "just friends">>
- The rules encourage $him to form friendships with other slaves.
- <<else>>
- The rules encourage $him to form relationships with other slaves.
- <</if>>
- <</if>>
-
- <<if $activeSlave.fuckdoll == 0>>
- <<set _lover = getSlave($activeSlave.relationshipTarget)>>
- <<if def _lover>>
- <<setLocalPronouns _lover 2>>
- <</if>>
- <<if ($activeSlave.ID == $HeadGirl.ID) && ($HGSuite == 1)>>
- $He lives in $his own suite within your penthouse,
- <<elseif ($activeSlave.ID == $Bodyguard.ID) && ($dojo > 1)>>
- $He lives in $his own room within the armory,
- <<elseif ($activeSlave.assignment == "work in the dairy") && ($dairyRestraintsSetting > 1)>>
- $He sleeps attached to a milking machine,
- <<elseif $activeSlave.rules.living == "spare">>
- $He sleeps on a bedroll,
- <<elseif $activeSlave.rules.living == "normal">>
- $He sleeps on a cot,
- <<elseif $activeSlave.relationship >= 4>>
- $He has $his own room, which $he shares with $his <<if $activeSlave.relationship == 5>>_wife2<<else>><<= _girl2>>friend<</if>> whenever they can manage it,
- <<else>>
- $He sleeps in $his own little room,
- <</if>>
- <<= App.Desc.releaseDesc($activeSlave)>>
- <</if>>
+<<= App.Desc.sceneIntro($activeSlave)>>
-<</if>> /* CLOSES SALE AND EVENT RULES NONDISPLAY */
-
-<<if $activeSlave.slaveName != $activeSlave.birthName || $activeSlave.slaveSurname != $activeSlave.birthSurname>>
- <<set _nameloss = 0>>
- <<if $activeSlave.fuckdoll == 0>>
- <<if $activeSlave.slaveName != $activeSlave.birthName && $activeSlave.slaveSurname != $activeSlave.birthSurname>>
- <<= SlaveFullName($activeSlave)>> is not $his original full name;
- <<if $activeSlave.birthName === "" || $activeSlave.birthSurname === "">>
- whatever it was, however, has been lost forever.
- <<set _nameloss = 1>>
- <</if>>
- <<elseif $activeSlave.slaveName != $activeSlave.birthName>>
- $activeSlave.slaveName is not $his original given name;
- <<if $activeSlave.birthName === "">>
- whatever it was, however, has been lost forever.
- <<set _nameloss = 1>>
- <</if>>
- <<elseif $activeSlave.slaveSurname != $activeSlave.birthSurname>>
- <<if $activeSlave.slaveSurname === 0 && $activeSlave.birthSurname === "">>
- $He once had a surname; whatever it was, however, has been lost forever.
- <<set _nameloss = 1>>
- <<elseif $activeSlave.slaveSurname !== 0>>
- $activeSlave.slaveSurname is not $his original surname;
- <<if $activeSlave.birthSurname === "">>
- whatever it was, however, has been lost forever.
- <<set _nameloss = 1>>
- <</if>>
- <<else>>
- <<set _nameloss = 1>>
- <</if>>
- <</if>>
- <<if $activeSlave.birthName !== "" || $activeSlave.birthSurname !== "">>
- <<if _nameloss == 1>>
- $He
- <<else>>
- $he
- <</if>>
- <<if $activeSlave.devotion > 95>>
- adores $his slave name and affects to have forgotten that $he was ever called
- <<elseif $activeSlave.devotion > 50>>
- uses $his slave name automatically and gives no sign that $he was ever called
- <<elseif $activeSlave.devotion > 20>>
- uses $his slave name despite once being known as
- <<elseif $activeSlave.devotion >= -20>>
- uses $his slave name hesitantly since $he was once called
- <<elseif $activeSlave.devotion >= -50>>
- uses $his slave name with resentment since $he prefers $his original name,
- <<else>>
- uses $his slave name only when constantly punished, since $he feels $his real name is
- <</if>>
- <<if $activeSlave.slaveName !== $activeSlave.birthName && $activeSlave.slaveSurname !== $activeSlave.birthSurname>>
- <<= SlaveFullBirthName($activeSlave)>>.
- <<elseif $activeSlave.slaveName !== $activeSlave.birthName>>
- <<if $activeSlave.slaveName.endsWith($activeSlave.birthName)>>
- just plain
- <</if>>
- $activeSlave.birthName.
- <<elseif $activeSlave.slaveSurname !== $activeSlave.birthSurname>>
- $activeSlave.birthSurname.
- <</if>>
- <</if>>
- <<if $activeSlave.slaveSurname == 0>>
- $He has no surname as a slave, which $he
- <<if $activeSlave.devotion > 95>>loves.
- <<elseif $activeSlave.devotion > 50>>likes.
- <<elseif $activeSlave.devotion > 20>>accepts.
- <<elseif $activeSlave.devotion >= -20>>tolerates.
- <<elseif $activeSlave.devotion >= -50>>resents.
- <<else>>hates.
- <</if>>
- <</if>>
- <<else>>
- <<= SlaveFullName($activeSlave)>> is not $his original name: $he was once called <<= SlaveFullBirthName($activeSlave)>>.
- <</if>>
-<</if>>
+<<= App.Desc.name($activeSlave)>>
<<= App.Desc.ageAndHealth($activeSlave)>>
@@ -433,305 +175,7 @@ is
<</if>>
<</if>>
-<<if $activeSlave.fuckdoll == 0>>
- <<if $activeSlave.career != 0>>
- <<if $activeSlave.career == "a slave">>
- $He was a slave long before you obtained $him.
- <<elseif $activeSlave.career == "a slave since birth">>
- $He's been your slave $his entire life.
- <<elseif $activeSlave.career == "a meat toilet" || $activeSlave.career == "a cum dump">>
- $He sees $himself as a cum receptacle.
- <<elseif $activeSlave.career == "a dairy cow">>
- $He's been broken into the belief that $he is nothing more than a cow to be milked and bred.
- <<elseif $activeSlave.career == "a breeding bull">>
- $He's been broken into the belief that $he is nothing more than a bull destined to fill fertile wombs with calves.
- <<elseif $activeSlave.career == "a breeder">>
- Before you obtained $him, $he was a breeding slave.
- <<elseif $activeSlave.career == "a bioreactor">>
- $He has spent time as a cow in an industrial dairy, an experience that marked $him deeply.
- <<else>>
- Before $he was a slave, $he was
- <<if setup.bodyguardCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as a Bodyguard.
- <<elseif setup.wardenessCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as a Wardeness for <<if $cellblock == 0>>a Cellblock<<else>>$cellblockName<</if>>.
- <<elseif setup.attendantCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as an Attendant for <<if $spa == 0>>a Spa<<else>>$spaName<</if>>.
- <<elseif setup.matronCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as a Matron for <<if $nursery == 0 && $nurseryNannies == 0>>a Nursery<<else>>$nurseryName<</if>>.
- <<elseif setup.nurseCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as a Nurse for <<if $clinic == 0>>a Clinic<<else>>$clinicName<</if>>.
- <<elseif setup.schoolteacherCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as a Schoolteacher for <<if $schoolroom == 0>>a Schoolroom<<else>>$schoolroomName<</if>>.
- <<elseif setup.stewardessCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as a Stewardess for <<if $servantsQuarters == 0>>a Servant's Quarters<<else>>$servantsQuartersName<</if>>.
- <<elseif setup.milkmaidCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as a Milkmaid for <<if $dairy == 0>>a Dairy<<else>>$dairyName<</if>>.
- <<elseif setup.farmerCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as a Farmer for <<if $farmyard == 0>>a Farmyard<<else>>$farmyardName<</if>>.
- <<elseif setup.madamCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as a Madam for <<if $brothel == 0>>a Brothel<<else>>$brothelName<</if>>.
- <<elseif setup.DJCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as a DJ for <<if $club == 0>>a Club<<else>>$clubName<</if>>.
- <<elseif setup.HGCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as a Head Girl.
- <<elseif setup.recruiterCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him potential as a recruiter.
- <<elseif setup.entertainmentCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him a slight edge at entertainment.
- <<elseif setup.whoreCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him a slight edge at sexual commerce.
- <<elseif setup.gratefulCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, so $he can remember what it's like <<if $activeSlave.career == "prisoner">>no one looking out for you<<else>>to have the freedom to starve<</if>>.
- <<elseif setup.menialCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him experience following orders.
- <<elseif setup.servantCareers.includes($activeSlave.career)>>
- <<= convertCareer($activeSlave)>>, giving $him a slight edge in housekeeping.
- <<else>>
- <<= convertCareer($activeSlave)>>.
- <</if>>
- <</if>>
- <</if>>
- <<if ($week-$activeSlave.weekAcquired >= 20) && ($activeSlave.skill.entertainment >= 100)>>
- <<if setup.entertainmentCareers.includes($activeSlave.career)>><<else>>
- $He has gotten enough experience to be as charismatic as any professional entertainer<<if ($activeSlave.counter.oral + $activeSlave.counter.anal + $activeSlave.counter.vaginal + $activeSlave.counter.mammary + $activeSlave.counter.penetrative > 1000)>>, and has been fucked so many times that a free sex worker could teach $him nothing<</if>>.
- <</if>>
- <<elseif ($activeSlave.counter.oral + $activeSlave.counter.anal + $activeSlave.counter.vaginal + $activeSlave.counter.mammary + $activeSlave.counter.penetrative > 1000)>>
- <<if setup.whoreCareers.includes($activeSlave.career)>><<else>>
- $He has been fucked so many times that a free sex worker could teach $him nothing.
- <</if>>
- <</if>>
-<</if>>
-
-<<set _careers = []>>
-<<if ($activeSlave.skill.headGirl >= $masteredXP)>>
- <<set _careers.push("Head Girl")>>
-<</if>>
-<<if ($activeSlave.skill.recruiter >= $masteredXP)>>
- <<set _careers.push("Recruiter")>>
-<</if>>
-<<if ($activeSlave.skill.bodyguard >= $masteredXP)>>
- <<set _careers.push("Bodyguard")>>
-<</if>>
-<<if ($activeSlave.skill.madam >= $masteredXP)>>
- <<set _careers.push("Madam")>>
-<</if>>
-<<if ($activeSlave.skill.DJ >= $masteredXP)>>
- <<set _careers.push("DJ")>>
-<</if>>
-<<if ($activeSlave.skill.nurse >= $masteredXP)>>
- <<set _careers.push("Nurse")>>
-<</if>>
-<<if ($activeSlave.skill.teacher >= $masteredXP)>>
- <<set _careers.push("Schoolteacher")>>
-<</if>>
-<<if ($activeSlave.skill.attendant >= $masteredXP)>>
- <<set _careers.push("Attendant")>>
-<</if>>
-<<if ($activeSlave.skill.matron >= $masteredXP)>>
- <<set _careers.push("Matron")>>
-<</if>>
-<<if ($activeSlave.skill.stewardess >= $masteredXP)>>
- <<set _careers.push("Stewardess")>>
-<</if>>
-<<if ($activeSlave.skill.milkmaid >= $masteredXP)>>
- <<set _careers.push("Milkmaid")>>
-<</if>>
-<<if ($activeSlave.skill.farmer >= $masteredXP)>>
- <<set _careers.push("Farmer")>>
-<</if>>
-<<if ($activeSlave.skill.wardeness >= $masteredXP)>>
- <<set _careers.push("Wardeness")>>
-<</if>>
-<<if ($activeSlave.skill.servant >= $masteredXP)>>
- <<set _careers.push("Servant")>>
-<</if>>
-<<if ($activeSlave.skill.entertainer >= $masteredXP)>>
- <<set _careers.push("Entertainer")>>
-<</if>>
-<<if ($activeSlave.skill.whore >= $masteredXP)>>
- <<set _careers.push("Whore")>>
-<</if>>
-<<if _careers.length > 0>>
- $He has working experience as a
- <<if _careers.length > 2>>
- <<for _j = 0; _j < _careers.length; _j++>>
- <<if _j < _careers.length-1>>
- <<print _careers[_j]>>,
- <<else>>
- and <<print _careers[_j]>>.
- <</if>>
- <</for>>
- <<elseif _careers.length > 1>>
- _careers[1] and <<print _careers[0]>>.
- <<else>>
- <<print _careers[0]>>.
- <</if>>
-<</if>>
-/* old
-<<set _numCareers = 0>>
-<<if ($activeSlave.skill.headGirl >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if ($activeSlave.skill.recruiter >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if ($activeSlave.skill.bodyguard >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if ($activeSlave.skill.madam >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if ($activeSlave.skill.DJ >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if ($activeSlave.skill.nurse >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if ($activeSlave.skill.teacher >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if ($activeSlave.skill.attendant >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if ($activeSlave.skill.matron >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if ($activeSlave.skill.stewardess >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if ($activeSlave.skill.milkmaid >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if ($activeSlave.skill.farmer >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if ($activeSlave.skill.wardeness >= $masteredXP)>>
- <<set _numCareers += 1>>
-<</if>>
-<<if _numCareers > 0>>
- $He has working experience as a
- <<if $activeSlave.skill.headGirl >= $masteredXP>>
- <<if _numCareers == 1>>
- Head Girl.
- <<elseif _numCareers == 2>>
- Head Girl and
- <<else>>
- Head Girl,
- <</if>>
- <<set _numCareers -= 1>>
- <</if>>
- <<if $activeSlave.skill.recruiter >= $masteredXP>>
- <<if _numCareers == 1>>
- Recruiter.
- <<elseif _numCareers == 2>>
- Recruiter and
- <<else>>
- Recruiter,
- <</if>>
- <<set _numCareers -= 1>>
- <</if>>
- <<if $activeSlave.skill.bodyguard >= $masteredXP>>
- <<if _numCareers == 1>>
- Bodyguard.
- <<elseif _numCareers == 2>>
- Bodyguard and
- <<else>>
- Bodyguard,
- <</if>>
- <<set _numCareers -= 1>>
- <</if>>
- <<if $activeSlave.skill.madam >= $masteredXP>>
- <<if _numCareers == 1>>
- Madam.
- <<elseif _numCareers == 2>>
- Madam and
- <<else>>
- Madam,
- <</if>>
- <<set _numCareers -= 1>>
- <</if>>
- <<if $activeSlave.skill.DJ >= $masteredXP>>
- <<if _numCareers == 1>>
- DJ.
- <<elseif _numCareers == 2>>
- DJ and
- <<else>>
- DJ,
- <</if>>
- <<set _numCareers -= 1>>
- <</if>>
- <<if $activeSlave.skill.nurse >= $masteredXP>>
- <<if _numCareers == 1>>
- Nurse.
- <<elseif _numCareers == 2>>
- Nurse and
- <<else>>
- Nurse,
- <</if>>
- <<set _numCareers -= 1>>
- <</if>>
- <<if $activeSlave.skill.teacher >= $masteredXP>>
- <<if _numCareers == 1>>
- Schoolteacher.
- <<elseif _numCareers == 2>>
- Schoolteacher and
- <<else>>
- Schoolteacher,
- <</if>>
- <<set _numCareers -= 1>>
- <</if>>
- <<if $activeSlave.skill.attendant >= $masteredXP>>
- <<if _numCareers == 1>>
- Attendant.
- <<elseif _numCareers == 2>>
- Attendant and
- <<else>>
- Attendant,
- <</if>>
- <<set _numCareers -= 1>>
- <</if>>
- <<if $activeSlave.skill.matron >= $masteredXP>>
- <<if _numCareers == 1>>
- Matron.
- <<elseif _numCareers == 2>>
- Matron and
- <<else>>
- Matron,
- <</if>>
- <<set _numCareers -= 1>>
- <</if>>
- <<if $activeSlave.skill.stewardess >= $masteredXP>>
- <<if _numCareers == 1>>
- Stewardess.
- <<elseif _numCareers == 2>>
- Stewardess and
- <<else>>
- Stewardess,
- <</if>>
- <<set _numCareers -= 1>>
- <</if>>
- <<if $activeSlave.skill.milkmaid >= $masteredXP>>
- <<if _numCareers == 1>>
- Milkmaid.
- <<else>>
- Milkmaid and
- <</if>>
- <<set _numCareers -= 1>>
- <</if>>
- <<if $activeSlave.skill.farmer >= $masteredXP>>
- <<if _numCareers == 1>>
- Farmer.
- <<else>>
- Farmer and
- <</if>>
- <<set _numCareers -= 1>>
- <</if>>
- <<if $activeSlave.skill.wardeness >= $masteredXP>>
- Wardeness.
- <</if>>
-<</if>>
-*/
+<<= App.Desc.career($activeSlave)>>
<<if $activeSlave.prestige > 0>>
<<if $activeSlave.prestigeDesc>>$activeSlave.prestigeDesc<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 5180a98b77c7f45498752185bc35b9a6f2f33f24..5d9b0faa120f425b94686c5fac7099dab6862443 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4399,7 +4399,7 @@
<<set $slaves[_saLTE] = $HeadGirl>>
<</if>>
<</if>> /* closes HG impregnation */
- <<elseif ($slaves[$i].ID != $StudID) && ($universalRulesImpregnation == "Stud")>>
+ <<elseif _Stud && $slaves[$i].ID != $StudID && $universalRulesImpregnation == "Stud">>
<<setLocalPronouns _Stud 2>>
<<if ($slaves[$i].StudExclude == 1 || $slaves[$i].breedingMark == 1) && (_Stud.career != "a breeding bull" || _Stud.fetish != "mindbroken" || !canWalk(_Stud))>>
It's _Stud.slaveName's role to provide sperm for fertile slaves, but $slaves[$i].slaveName is not included on the list.
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 3052912793446c8b4de549988409c765eda39cec..cf227ec2b571e4c7a39ff08961a99d02511d9a85 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -62,8 +62,8 @@
[[Cheat Edit Slave Alternative|MOD_Edit Slave Cheat New][$cheater = 1]]
</div>
<</if>>
- <span class="cyan">
- [â†,Q]
+ <span class="hotkey">
+ <<print App.UI.Hotkeys.hotkeys("prevSlave")>>
</span>
<span id="prevSlave" style="font-weight:bold">
<<link "Prev" "Slave Interact">><<set $activeSlave = getSlave(_slavesInLine[0])>><</link>>
@@ -76,8 +76,8 @@
<span id="nextSlave" style="font-weight:bold">
<<link "Next" "Slave Interact">><<set $activeSlave = getSlave(_slavesInLine[1])>><</link>>
</span>
- <span class="cyan">
- [E,→]
+ <span class="hotkey">
+ <<print App.UI.Hotkeys.hotkeys("nextSlave")>>
</span>
</p>
<div class="tabbar">
@@ -396,7 +396,7 @@
<<if $studio == 1>>
<h3>Media</h3>
<<if getSlave($AS).porn.prestige == 3>>
- //$He is so prestigious in the realm of getSlave($AS).porn.fameType porn that $his fame is self-sustaining.//
+ //$He is so prestigious in the realm of <<= getSlave($AS).porn.fameType>> porn that $his fame is self-sustaining.//
<<elseif getSlave($AS).porn.feed == 0>>
The media hub is not releasing highlights of $his sex life. [[Release|Slave Interact][getSlave($AS).porn.feed = 1]]
<<else>>
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index afa58266093315505f82989dc9f89f1a8981c3c5..a3dd396b858fb36c1695515b77c1adee4e08aba9 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -177,7 +177,7 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<br><br>
-<<set _slaveCost = slaveCost($activeSlave)>>
+<<set _slaveCost = slaveCost($activeSlave, false, !App.Data.misc.lawlessMarkets.includes($slaveMarket))>>
<<if $slavesSeen > $slaveMarketLimit>><<set _slaveCost += _slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1)>><</if>>
<<set _slaveCost = 500*Math.trunc(_slaveCost/500)>>
diff --git a/src/zz1-last/setupEventHandlers.js b/src/zz1-last/setupEventHandlers.js
index 0a6ef4160227ad480de47f3b895c24cc870cd2ba..593787eae840212bd4fdbfc1beb51a72738348e5 100644
--- a/src/zz1-last/setupEventHandlers.js
+++ b/src/zz1-last/setupEventHandlers.js
@@ -4,6 +4,7 @@ Config.saves.onSave = App.EventHandlers.onSave;
$(document).on(':storyready', function() {
App.EventHandlers.storyReady();
+ App.UI.Hotkeys.init();
});
$(document).one(':passagestart', function() {