diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee381d15942283a2e35e7293de311a7c24fb0e06..aebf4da5d4e0aab7de4045895e06039f9eafc282 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## Unreleased
+* added torture PA
+* refsArtifact events
+* fixes
+
## 0.10.7.1-4.0.0-alpha.25 - 2023-03-12
* fixes
diff --git a/FCHost/Building_FCHost.txt b/FCHost/Building_FCHost.txt
index b9cb2862e85472288fa676a366b15ae53d529b41..cc373a515c0c8db34cdd36478f7b7775f5edd130 100644
--- a/FCHost/Building_FCHost.txt
+++ b/FCHost/Building_FCHost.txt
@@ -2,7 +2,7 @@ BUILD REQUIREMENTS
The below requirements must be met to build this project.
- - Chromium Embedded Framework (CEF) 111.2.1 or newer. The windows build is
+ - Chromium Embedded Framework (CEF) 112.0.1 or newer. The windows build is
currently configured to operate with the X64 binary distribution of CEF.
- CMake version 2.8.12.1 or newer.
@@ -24,6 +24,7 @@ If you are running Windows and meet the above requirements then within the root
execute cmake_vs2019.bat which will generate FCHost.sln in the same location.
Now open FCHost.sln in Visual Studio 2019
and build from there via tool bar -> Build -> Build Solution or Ctrl + Shift + B.
+If using Visual Studio 2022, simply use cmake_vs2022.bat instead.
The resulting binary and supporting files will be in
FCHost/fchost/Debug, or FCHost/fchost/Release depending on the configuration
diff --git a/FCHost/cmake_vs2022.bat b/FCHost/cmake_vs2022.bat
new file mode 100644
index 0000000000000000000000000000000000000000..73f1cbe67a7171ee950a067c64c323fe623e594c
--- /dev/null
+++ b/FCHost/cmake_vs2022.bat
@@ -0,0 +1,5 @@
+@ECHO OFF
+REM Quickly rebuild 64-bit VS2022 solution/project files from the CMake files.
+
+cmake -G "Visual Studio 17" -A x64
+pause
\ No newline at end of file
diff --git a/FCHost/fchost/fchost_win.cc b/FCHost/fchost/fchost_win.cc
index 69eddcf46ae7bcec1af78d456a936527d6f2f8dd..2cbb42c124601f09e78e5f3b6c76961620c2aadc 100644
--- a/FCHost/fchost/fchost_win.cc
+++ b/FCHost/fchost/fchost_win.cc
@@ -25,9 +25,6 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
UNREFERENCED_PARAMETER(hPrevInstance);
UNREFERENCED_PARAMETER(lpCmdLine);
- // Enable High-DPI support on Windows 7 or newer.
- CefEnableHighDPISupport();
-
// Provide CEF with command-line arguments.
CefMainArgs main_args(hInstance);
diff --git a/compile.sh b/compile.sh
index bede064779d42c0a1ca7dd21e4c9093b541de923..b3b903a7461b3bb9545bccc3ba8a303799260ab2 100755
--- a/compile.sh
+++ b/compile.sh
@@ -1,6 +1,7 @@
#!/bin/bash
output=/dev/stdout
+name=FC_pregmod
# displays help text
function displayHelp() {
@@ -16,6 +17,7 @@ Options:
-t, --themes Generate theme files
-m, --minify Minify output files
--ci CI mode
+ -f, --f Final file name
HelpText
}
@@ -77,7 +79,7 @@ function compile() {
fi
fi
- file="bin/FC_pregmod.html"
+ file="bin/${name}.html"
# Find and insert current commit
if [[ "$ci" ]]; then
@@ -85,7 +87,7 @@ function compile() {
elif [[ -d .git ]]; then
COMMIT=$(git rev-parse --short HEAD)
if [[ "$usehash" ]]; then
- file="bin/FC_pregmod_${COMMIT}.html"
+ file="bin/${name}${COMMIT}.html"
fi
fi
if [[ "$minify" ]]; then
@@ -158,6 +160,10 @@ else
--ci)
ci="true"
;;
+ -f | --file)
+ name=$2
+ shift
+ ;;
*)
echoError "Unknown argument $1."
displayHelp
diff --git a/devTools/PreCompile.sh b/devTools/PreCompile.sh
deleted file mode 100755
index 248695a23d80fe295aac79642a6ead3109d96943..0000000000000000000000000000000000000000
--- a/devTools/PreCompile.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/ksh
-mega-login $1 $2 #U=$1 P=$2 rDir=$3 lDir=$4 Reqs:MEGAcmd,git
-while true;do gen=0;cd $4;
- if [[ `echo $?` -gt 0 ]];then mkdir -p $4&&git clone -q --depth 1 https://gitgud.io/pregmodfan/fc-pregmod.git $4&&cd $4
- if [[ ! `mega-ls $3|cut -c21-24|paste -sd,` =~ `git log|head -1|cut -c8-11` ]];then gen=1;fi #stackoverflow.com/a/15394738
- fi
- git fetch -q && if [ `git rev-list ...origin|wc -l` -gt 0 ];then git pull -q&&gen=1;fi #stackoverflow.com/a/17192101
- if [[ $gen > 0 ]];then rm bin/*;./compile.sh -q&&cd bin/
- mv *.h* FC-`git log -1 --format=%cd --date=format:%m-%d-%Y-%H-%M`-`git log|head -1|cut -c8-11`.html
- mega-put -c *.h* $3&&mega-rm $3`mega-ls $3|head -n 1`
- fi
-clear;sleep 15m;done
\ No newline at end of file
diff --git a/devTools/switchBranch.sh b/devTools/switchBranch.sh
index bca3f4fb8e95acb059433eb9d912d747dd9ebfb2..3df09c640c616f225f6abc326940861441aeb615 100644
--- a/devTools/switchBranch.sh
+++ b/devTools/switchBranch.sh
@@ -1,21 +1,109 @@
+#!/bin/bash
# git push --set-upstream origin origin/pregmod-master / git checkout -b pregmod-master --track origin/pregmod-master
+mainBranch="pregmod-master"
previousBranch="Not found"
+
+function displayHelp() {
+cat <<HelpText
+Usage: $0 [OPTION]...
+Always pushes commit(s) / the current branch
+Order of operation: new (if enabled) -> push (if not closed after creating a new branch) -> sync (if enabled) -> change branch (if enabled)
+ -> delete previous branch (if enabled)
+
+Options:
+ -s, --sync : Sync upstream/$mainBranch
+ -d, --delete : Delete previous branch
+ -m, --move : Change current branch to either;
+ supplied / previous, the choice currently
+ follows the flow as written i.e supplied -> previous
+ -b, --branch X : Set supplied branch to X
+ -c, --create Y : Create the new branch Y
+ -h, --help : Show this help text
+
+ e.g.
+ Before:
+ git status
+ On branch XYZ
+ Your branch is ahead of 'origin/XYZ' by 5 commits.
+
+ git branch --list
+ * XYZ
+ $mainBranch
+ .....
+
+ During:
+ $0 -b $mainBranch -c -d
+ Branches: Supplied ($mainBranch) / previous (XYZ)
+ Sync Master? Y/N: N
+
+ After:
+ git branch --list
+ * $mainBranch
+ .....
+
+ All five new commits for branch XYZ were pushed prior to the switch over and
+ then afterwards the local copy of branch XYZ was deleted.
+HelpText
+}
+
if [[ $(git rev-parse --quiet --abbrev-ref @{-1} 2>/dev/null) && $? -eq 0 ]]; then
previousBranch=$(git rev-parse --abbrev-ref @{-1})
fi
-read -p "Push commits/branch? Y/N: " commit
-read -p "Sync Master? Y/N: " sync
-read -p "Switch to supplied branch ($1) / previous ($previousBranch)? Y/N: " switch
+if [[ "$#" -eq 0 ]]; then echo "For more options see $0 -h."; fi
+while [[ "$1" ]]; do
+ case $1 in
+ -s | --sync)
+ sync="true"
+ ;;
+ -d | --delete)
+ delete="true"
+ ;;
+ -m | --move)
+ change="true"
+ ;;
+ -b | --branch)
+ tgtBranch=$2
+ shift
+ ;;
+ -c | --create)
+ newBranch=$2
+ shift
+ ;;
+ -h | --help)
+ displayHelp
+ exit 0
+ ;;
+ *)
+ echo "Unknown argument $1."
+ displayHelp
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+if [[ "$newBranch" ]]; then
+ if [[ $(git stash show 2>/dev/null | echo $?) -gt 0 ]]; then git stash save *; fi
+ git checkout -qb $newBranch
+ if [[ $(git stash show 2>/dev/null | echo $?) -gt 0 ]];then
+ git stash show
+ read -p "Pop the latest stash? (y/n): " stash
+ [ "$stash" == "y" ] && git stash pop;
+ fi
+ read -p "Exit? (y/n): " exit
+ [ "$exit" == "y" ] && exit;
+fi
+
+git push -q 2>/dev/null || git push -qu "origin" HEAD 1>/dev/null
+echo "Branches: Supplied ($tgtBranch) / previous ($previousBranch)"
-if [[ $commit == "Y" ]]; then
- git push -q 2>/dev/null || git push -qu origin $(git rev-parse --abbrev-ref HEAD) 1>/dev/null
+if [[ "$sync" ]]; then
+ if [[ $(git stash show 2>/dev/null | echo $?) -gt 0 ]]; then git stash save *; fi
+ git checkout -q origin/$mainBranch && git reset --hard upstream/$mainBranch -q && git push -q && git checkout -q @{-1}
+ if [[ $(git stash show 2>/dev/null | echo $?) -gt 0 ]]; then git stash pop; fi
fi
-if [[ $sync == "Y" ]]; then
- git stash save * && git checkout -q pregmod-master && git reset --hard upstream/pregmod-master -q && git push -q && git checkout -q @{-1} && git stash pop
+if [[ "$change" ]]; then
+ if [[ "$tgtBranch" ]]; then git checkout -q origin/$tgtBranch; else git checkout -q @{-1}; fi
fi
-if [[ $switch == "Y" ]]; then
- if [[ -n $1 ]];then git checkout -q $1; else git checkout -q @{-1}; fi
-fi
-read -p "Delete previous branch ($(git rev-parse --abbrev-ref @{-1}))? Y/N: " del
-if [[ $del == "Y" ]]; then git branch -qD @{-1}; fi
+if [[ "$delete" ]]; then git branch -qD @{-1}; fi
diff --git a/devTools/updateTool.sh b/devTools/updateTool.sh
index e2a3cb46c45c8f75e6ef7c4bb30ff36529fc3bd9..1eef102895c05b7231cd0d2e1ab6e8225eaf214f 100644
--- a/devTools/updateTool.sh
+++ b/devTools/updateTool.sh
@@ -1,8 +1,30 @@
-git fetch upstream -q
-check=$(git rev-list HEAD..upstream/pregmod-master) # https://adamj.eu/tech/2020/01/18/a-git-check-for-missing-commits-from-a-remote/
-if [[ $check ]];then echo "Updated: Yes"; else echo "Updated: No"; fi
-if [[ ($1 || $check) && $(git rev-parse --abbrev-ref HEAD) = "pregmod-master" ]];then
- git reset --hard upstream/pregmod-master -q
-elif [[ ($1 || $check) && $(git rev-parse --abbrev-ref HEAD) != "pregmod-master" ]]; then
- git merge upstream/pregmod-master -q
+#!/bin/bash
+repo=upstream
+branch=pregmod-master
+while [[ "$1" ]]; do
+ case $1 in
+ -r | --repo)
+ repo=$2
+ shift
+ ;;
+ -b | --branch)
+ branch=$2
+ shift
+ ;;
+ *)
+ echo "Unknown argument $1."
+ displayHelp
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+git fetch $repo -q
+check=$(git rev-list HEAD..$repo/$branch) # https://adamj.eu/tech/2020/01/18/a-git-check-for-missing-commits-from-a-remote/
+if [[ $check && $(git rev-parse --abbrev-ref HEAD) = "$branch" ]]; then
+ git reset --hard $repo/$branch -q
+elif [[ $check && $(git rev-parse --abbrev-ref HEAD) != "$branch" ]]; then
+ git merge $repo/$branch -q
fi
+echo "Updated: $(if [ $check ]; then echo "Yes" && exit 1; else echo "No" && exit 0; fi)" # stackoverflow.com/a/73539272
diff --git a/devTools/upload.sh b/devTools/upload.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0c2ff82689786842cee2fc38537da33184ebea74
--- /dev/null
+++ b/devTools/upload.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+email=xyz1256@corp.com
+password=12345678
+local=fc/
+remote=FC/
+gen=0;
+runstep=0
+hash=$(git log --oneline|head -n 1|cut -c1-7)
+
+function displayHelp() {
+cat <<HelpText
+Packages required: git, megacmd
+
+Usage: $0 [OPTION]...
+Options:
+ -s, --step X : Step # to manually execute e.g. 1 to run "Applying WebGL decensor patch."
+ -e, --email X : Set MEGA email to X. Default: $email
+ -p, --password X : Set MEGA password to X. Default: $password
+ -l, --local X : Set local (File System) folder/directory to X. Default: $local
+ -r, --remote X : Set remote (MEGA) folder/directory to X. Default: $remote
+ -h, --help : Show this help text
+HelpText
+}
+
+if [[ "$#" -eq 0 ]]; then echo -e "For more options see $0 -h.\n"; fi
+while [[ "$1" ]]; do
+ case $1 in
+ -s | --step)
+ runstep=$2
+ shift
+ ;;
+ -e | --email)
+ email=$2
+ shift
+ ;;
+ -p | --password)
+ password=$2
+ shift
+ ;;
+ -l | --local)
+ local=$2
+ shift
+ ;;
+ -r | --remote)
+ remote=$2
+ shift
+ ;;
+ -h | --help)
+ displayHelp
+ exit 0
+ ;;
+ *)
+ echo "Unknown argument $1."
+ displayHelp
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+find $local > /dev/null
+if [[ `echo $?` > 0 ]]; then
+ git clone -q https://gitgud.io/pregmodfan/fc-pregmod.git --depth 1 $local
+ if [[ ! `mega-ls $remote|grep .html|cut -c21-29|paste -sd,` =~ $hash ]];then
+ gen=1;
+ fi # stackoverflow.com/a/15394738
+fi
+cd $local
+
+find js/000-browserSupport.js > /dev/null
+if [[ `echo $?` > 0 ]]; then
+ echo "creating file to work with browsers that do not support globalThis."
+ echo "const globalThis = eval.call(undefined, 'this');" > js/000-browserSupport.js
+fi
+
+git fetch -q && if [[ $runstep == 0 && $(./devTools/updateTool.sh -r origin) && `echo $?` > 0 ]]; then
+ git reset --hard HEAD -q && git pull -q && gen=1;
+fi # stackoverflow.com/a/17192101
+
+if [[ $gen > 0 || $runstep == 1 ]]; then
+ echo "Applying WebGL decensor patch."
+ sed -i '1,/p.applyPanty = true/ s/p.applyPanty = true/p.applyPanty = false/' src/art/webgl/art.js
+ sed -i 's/p.underage = slave.age < 18 || slave.visualAge < 18/p.underage = false/' src/art/webgl/art.js
+ sed -i 's#p.height = Math.max(slave.height, 140); // clamp underage#p.height = slave.height;#' src/art/webgl/art.js
+ sed -i 's#morphs.push(["physicalAgeYoung", -(Math.max(slave.visualAge, 18)-20)/10]) // clamp underage#morphs.push(["physicalAgeYoung", -(slave.visualAge-20)/10])#' src/art/webgl/art.js
+fi
+
+if [[ $gen > 0 || $runstep == 2 ]]; then
+ rm bin/*.html > /dev/null 2>&1 ; ./compile.sh -q -m -f preCompiled-FC-`git log -1 --format=%cd --date=format:%Y-%m-%d-%H-%M`-$hash
+fi
+
+mega-login $email $password > /dev/null 2>&1
+if [[ $gen > 0 || $runstep == 3 ]]; then mega-put -c bin/*.html $remote; fi
+if [[ $gen > 0 || $runstep == 4 ]]; then
+ if [[ `mega-ls $remote|grep .html|grep -v revert-RA|wc -l` > 2 ]]; then
+ mega-rm $remote`mega-ls $remote|grep .html|grep -v revert-RA|head -n 1`
+ fi
+fi
diff --git a/js/002-config/fc-js-init.js b/js/002-config/fc-js-init.js
index f5bb39f1186c8e06fbc8a25c533b19ce7425af5f..407f9dd4adc13e131087ec84b1da83487340ef04 100644
--- a/js/002-config/fc-js-init.js
+++ b/js/002-config/fc-js-init.js
@@ -73,6 +73,7 @@ App.Medicine.Surgery.Procedures = {};
App.Medicine.Surgery.Reactions = {};
App.Mods = {};
App.Mods.DinnerParty = {};
+App.Mods.Drugs = {};
App.Mods.SecExp = {};
App.Mods.SF = {};
App.Neighbor = {};
diff --git a/js/003-data/drugs/002-moddedDrugsData.js b/js/003-data/drugs/002-moddedDrugsData.js
new file mode 100644
index 0000000000000000000000000000000000000000..3cd446b65ac765be9acf52cac4e2c83b527157b4
--- /dev/null
+++ b/js/003-data/drugs/002-moddedDrugsData.js
@@ -0,0 +1,13 @@
+//A new array is added to store the name and types of new drugs. Mods would add new objects to this array.
+App.Mods.Drugs.list = [];
+//See mods/custom drugs.md for documentation
+
+//An optional function to act as the middle man between the user and App.Mods.Drugs.list, to add optional parameters and for potential future compatibility purposes.
+App.Mods.Drugs.add = function (...drugs) {
+ drugs.forEach(drug => {
+ drug.isSlaveDrug ??= true;
+ drug.isPCDrug ??= false;
+ drug.isConsumerGrade ??= false;
+ App.Mods.Drugs.list.push(drug);
+ });
+};
\ No newline at end of file
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index cdcd2fc67c15a09698143e0dcefddab8c17ff9b0..42f05255f653cc801abf427e3aba014a528378bd 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -519,13 +519,7 @@ App.Data.resetOnNGPlus = {
rulesToApplyOnce: {},
raDefaultMode : 0,
- REFeminizationCheckinIDs: [],
- REMILFCheckinIDs: [],
- REOrientationCheckinIDs: [],
- REUglyCheckinIDs: [],
- REButtholeCheckinIDs: [],
- REFutaSisterCheckinIDs: [],
- REReductionCheckinIDs: [],
+ RECheckInIDs: [],
deathIDs: {
health: [],
@@ -1253,8 +1247,6 @@ App.Data.resetOnNGPlus = {
huskSlave: null,
huskSlaveOrdered: 0,
- targetAge: 18, // non-vanilla shit
-
/* Job Fulfillment Center */
JFC: {
/** @type {FC.Bool} */
diff --git a/js/003-data/miscData.js b/js/003-data/miscData.js
index 8def570b2c9f9ed8f12b7e9eb00299ed23a49420..303deed0ff329550ad2f3358f6181e41bc8a8f92 100644
--- a/js/003-data/miscData.js
+++ b/js/003-data/miscData.js
@@ -110,6 +110,32 @@ App.Data.misc = {
sizeType: 2
},
+ tentacleN: {
+ type: "tentacleN",
+ normalOvaMin: 1,
+ normalOvaMax: 1,
+ normalBirth: 3,
+ minLiveBirth: 1,
+ drugsEffect: 0,
+ fetusWeek: [0, 1, 2, 3, 4, 5, 6, 99999],
+ fetusSize: [100, 500, 1000, 2000, 5000, 10000, 25000, 100000],
+ fetusRate: [4, 4, 4, 4, 4, 4, 4, 4],
+ sizeType: 2
+ },
+
+ slime: {
+ type: "slime",
+ normalOvaMin: 1,
+ normalOvaMax: 1,
+ normalBirth: 2,
+ minLiveBirth: 0,
+ drugsEffect: 0,
+ fetusWeek: [0, 99999],
+ fetusSize: [10000, 10000],
+ fetusRate: [4, 4, 4, 4, 4, 4, 4, 4],
+ sizeType: 2
+ },
+
insect: {
type: "insect",
normalOvaMin: 50,
diff --git a/js/003-data/slaveProstheticsData.js b/js/003-data/slaveProstheticsData.js
index 2da990f1fce2820dfa01c69ae0a05b52c827cfb0..40dbc1118f8be8d4894b09869452f372e7fcc4ea 100644
--- a/js/003-data/slaveProstheticsData.js
+++ b/js/003-data/slaveProstheticsData.js
@@ -19,7 +19,7 @@ App.Data.prostheticIDs =
*/
/**
- * @type {Object<FC.prostheticID, prosthetics>}
+ * @type {Record<FC.prostheticID, prosthetics>}
*/
App.Data.prosthetics = {
interfaceP1: {
diff --git a/js/medicine/surgery/exotic/retrogradeVirusInjectionNCS.js b/js/medicine/surgery/exotic/retrogradeVirusInjectionNCS.js
index 73f3f4144f49e3276cda2c3cdb54ae5835eb931b..7d4537d688f87e8c81d5bce2f2f5f9424f82f072 100644
--- a/js/medicine/surgery/exotic/retrogradeVirusInjectionNCS.js
+++ b/js/medicine/surgery/exotic/retrogradeVirusInjectionNCS.js
@@ -97,10 +97,10 @@ App.Medicine.Surgery.Reactions.RetrogradeVirusInjectionNCS = class extends App.M
slave.hips -= 1;
}
if (slave.visualAge < 18) {
- const averageHeight = Height.mean(slave);
- const heightDelta = slave.height - averageHeight;
+ const nonsurgicalHeight = slave.height - 10 * slave.heightImplant;
+ const heightDelta = nonsurgicalHeight - slave.natural.height;
let shrinkage;
- if (slave.height > 126 || heightDelta > 0) {
+ if (nonsurgicalHeight > 126 || heightDelta > 0) {
if (heightDelta > 15) {
shrinkage = 5;
} else if (heightDelta > 5) {
diff --git a/js/rulesAssistant/conditionEvaluation.js b/js/rulesAssistant/conditionEvaluation.js
index ab3cc47e65f66653426b140d748851c45e77ed5d..8c6539b26d04e5b695b78b6c83f3b4a729daea9d 100644
--- a/js/rulesAssistant/conditionEvaluation.js
+++ b/js/rulesAssistant/conditionEvaluation.js
@@ -589,6 +589,11 @@ App.RA.Activation.populateGetters = function() {
description: "Side effects from drug use. If greater than 10 will have negative consequences.",
val: c => c.slave.chem
});
+ gm.addNumber("addict", {
+ name: "Aphrodisiac Addiction",
+ description: "No addiction: 0, Minor addiction: 1-2, Serious addiction: 3 and above",
+ val: c => c.slave.addict
+ });
gm.addNumber("boobs", {
name: "Breasts",
description: "0-299: Flat, 300-399: A-cup, 400-499: B-cup, 500-649: C-cup, 650-799: D-cup, 00-999: DD-cup, " +
diff --git a/mods/custom drugs.md b/mods/custom drugs.md
new file mode 100644
index 0000000000000000000000000000000000000000..9d7870a7b2a2d4aaeab2205ce9f3bdf99626a0f0
--- /dev/null
+++ b/mods/custom drugs.md
@@ -0,0 +1,69 @@
+# Custom Drugs
+
+To add custom drugs through modding, pass object(s) with the following properties to the `App.Mods.Drug.add` function. More than one drug can be added at a time by using multiple arguments.
+
+## Custom Drug Object Properties
+
+- `name` (String): The name of the drug, should be unique(however a PC and a slave drug under the same name will be fine) and not conflict with existing drugs. This is displayed in menus.
+- `text` (String): The text used in the link to select the drug. Typically the first letter is in upper case.
+- `type` (String): The category of the drug, used in the slave interaction menu. Can be an existing vanilla category(`Lips`, `Breasts`, `Nipples`, `Butt`, `Dick`/`Clit`(Will change automatically depending on slave genital type), `Fertility`, `Hormoes`, `Psych`, `Misc`), or entirely new. Not required for PC drugs.
+- `isPCDrug` (Boolean, optional): If the drug is for PC instead of slaves, default to `false`.
+- `isConsumerGrade` (Boolean, optional): Lists the drug as consumer grade in manage personal affairs if true, other wise listed as slave grade, default to `false`. Only used is the drug is for PC.
+- `available` (Function → *boolean*): If the drug should be displayed at all. The slave object will be passed as the first parameter.
+- `enable` (Function → true or *string*): If the drug link should be enabled. The slave object will be passed as the first parameter. If the drug is allowed, return `true`. If not, return a string, which will be displayed to the player as a tool tip.
+- `effect` (Function → *string* or *object*): The effect of the drug. The slave object will be passed as the first parameter. The returned string will be displayed in end week report.
+
+## Example:
+```js
+App.Mods.Drugs.add(
+ {
+ name: "hip enhancer",
+ text: "Hip enhancer",
+ type: "Structural",
+ available: function (slave) {
+ return slave.indentureRestrictions < 2;
+ },
+ enable: function (slave) {
+ //Disable if the slave's hip is already very wide or wider.
+ if (slave.hips < 2) return true;
+ else return "Hips are already too wide";
+ },
+ effect: function (slave) {
+ //Get the pronouns of the slaves to be used in end week report.
+ const { he, him, his, himself, He, His } = getPronouns(slave);
+ if (slave.hips >= 2) {
+ //If the slave's hips is already very wide, stop the drug regimen, notify in end week report.
+ slave.drugs = "no drugs";
+ return ` ${His} hips is already as wide is possible, <span class="yellow">${his} drug regimen has been ended.</span>`;
+ } else {
+ //If not, widen hips and notify in end week report.
+ slave.hips++;
+ return ` The hip enhancer <span class="lime">widens ${his} hip</span>.`;
+ }
+ }
+ },
+ /* More than one drug can be added at a time */
+ {
+ //Drug name should be unique, but two drug with identical name is okay if one is for PC and one is for slaves.
+ name: "hip enhancer",
+ text: "Hip enhancer",
+ //PC Drugs do not require type
+ isPCDrug: true,
+ isConsumerGrade: true,
+ available: () => true,
+ enable: function (slave) {
+ if (slave.hips < 2) return true;
+ else return "Your hips are already too wide";
+ },
+ effect: function (slave) {
+ if (slave.hips >= 2) {
+ slave.drugs = "no drugs";
+ return "Your hips is already as wide is possible, <span class=\"yellow\">your drug regimen has ended.</span>";
+ } else {
+ slave.hips++;
+ return "The hip enhancer <span class=\"lime\">widens your hip</span>.";
+ }
+ }
+ }
+);
+```
\ No newline at end of file
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index 3cfa9e416b8be37d55c49f13ad9cebc8ea1a3cad..3e4661e463b89db0703ca061ed5fb03374e63338 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -2,5 +2,5 @@ App.Version = {
base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
pmod: "4.0.0-alpha.25",
commitHash: null,
- release: 1193, // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js.
+ release: 1196, // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js.
};
diff --git a/src/005-passages/interactPassages.js b/src/005-passages/interactPassages.js
index 23695dd9e171d3c7db6290b4392dda96910bd9e4..ed27f32e8c1ebbd27a518a0d492b1db259a6571c 100644
--- a/src/005-passages/interactPassages.js
+++ b/src/005-passages/interactPassages.js
@@ -396,3 +396,27 @@ new App.DomPassage("Dinner Party Execution",
return App.Mods.DinnerParty.Execution();
}
);
+
+new App.DomPassage("Inspect Tank Settings",
+ () => {
+ V.nextButton = "Continue";
+ V.nextLink = "Incubator";
+ return App.UI.inspectTankSettings(false);
+ }, ["jump-from-safe"]
+);
+
+new App.DomPassage("Inspect Fetus Tank Settings",
+ () => {
+ V.nextButton = "Continue";
+ V.nextLink = "Analyze Pregnancy";
+ return App.UI.inspectTankSettings(true);
+ }, ["jump-from-safe"]
+);
+
+new App.DomPassage("Inspect PC Fetus Tank Settings",
+ () => {
+ V.nextButton = "Continue";
+ V.nextLink = "Analyze PC Pregnancy";
+ return App.UI.inspectTankSettings(true, true);
+ }, ["jump-from-safe"]
+);
\ No newline at end of file
diff --git a/src/Mods/SecExp/js/reportingRelatedFunctions.js b/src/Mods/SecExp/js/reportingRelatedFunctions.js
index 18df9e073df31f8c6484d60bb7ef4e7fad4db4fe..b85a1506892846e57e57d93d0c8bca38110431a3 100644
--- a/src/Mods/SecExp/js/reportingRelatedFunctions.js
+++ b/src/Mods/SecExp/js/reportingRelatedFunctions.js
@@ -290,7 +290,7 @@ App.Mods.SecExp.commanderEffectiveness = function(passage) {
} else if (V.PC.career === "escort") {
r.push(`Your past, however, does not help you. Many still remember your past career as an escort and doubt you'll be of any use during the fighting.`);
} else if (V.PC.career === "mercenary") {
- r.push(`Your past mercenary work does carries some weight, and many look forward to fight alongside a battle hardened name.`);
+ r.push(`Your past mercenary work does carry some weight, and many look forward to fight alongside a battle hardened name.`);
}
}
}
diff --git a/src/arcologyBuilding/ManageArcology.js b/src/arcologyBuilding/ManageArcology.js
index 3670dbe0946d5a62a2c632462ea26e63a31d70cc..a55cbfe253345fb67623040bed9784e092baf0d1 100644
--- a/src/arcologyBuilding/ManageArcology.js
+++ b/src/arcologyBuilding/ManageArcology.js
@@ -478,7 +478,7 @@ App.UI.manageArcology = function() {
choices.push(link(`Decrease`, "rent", 1, 1, 10 / 9));
} else if (V.rent[classStr] > V.rentDefaults[classStr] * 0.5) {
frag.append(`Average. `);
- choices.push(link(`Increase`, "rent", 1.5, 0.94, 9 / 8));
+ choices.push(link(`Increase`, "rent", 1.5, 0.94, 9 / 10));
choices.push(link(`Decrease`, "rent", 0.5, 1.04, 11 / 10));
} else if (V.rent[classStr] > 0) {
frag.append(`Low. `);
diff --git a/src/budget/loans.js b/src/budget/loans.js
index 8c0e1cf421432ec3c0eb411adeb05af29bdbfb89..abdada09a5b27aa796ecae0b4c1e70440e617360 100644
--- a/src/budget/loans.js
+++ b/src/budget/loans.js
@@ -192,7 +192,7 @@ App.Budget.loans = function() {
*/
function terms(lender, loan) {
if (lender === 'bank') {
- return `You will pay about ${cashFormat(Math.trunc(loan.full / loan.deadline - V.week))} per week for ${num(loan.deadline - V.week)} weeks until you have paid off the entire balance. You will end up paying back about ${cashFormat(Math.trunc(loan.full))} after interest.`;
+ return `You will pay about ${cashFormat(Math.trunc(loan.full / (loan.deadline - V.week)))} per week for ${num(loan.deadline - V.week)} weeks until you have paid off the entire balance. You will end up paying back about ${cashFormat(Math.trunc(loan.full))} after interest.`;
} else {
return `You will have ${num(loan.deadline - V.week)} weeks to pay off the full amount. You will end up paying back about ${cashFormat(Math.trunc(loan.full))} after interest.`;
}
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 2dc7841c1270fadb344c725b13b4f14590396ea6..d61345e80f3631bed4a2f2ed3d7bade58c0a2379 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -217,6 +217,7 @@ App.Update.globalVariables = function(node) {
V.incubator.name = V.incubator.name || V.incubatorName || "the Incubator";
V.incubator.organs = V.incubator.organs || V.incubatorOrgans || [];
V.incubator.readySlaves = V.incubator.readySlaves || V.readySlaves || 0;
+ V.incubator.bulkRelease = V.incubator.bulkRelease || V.incubator.setting.bulkRelease || V.incubatorBulkRelease || 0;
V.incubator.upgrade = V.incubator.upgrade || {};
V.incubator.upgrade.speed = V.incubator.upgrade.speed || V.incubatorUpgradeSpeed || 5;
@@ -227,18 +228,49 @@ App.Update.globalVariables = function(node) {
V.incubator.upgrade.pregAdaptation = V.incubator.upgrade.pregAdaptation || V.incubatorUpgradePregAdaptation || 0;
V.incubator.upgrade.organs = V.incubator.upgrade.organs || V.incubatorUpgradeOrgans || 0;
- V.incubator.setting = V.incubator.setting || {};
- V.incubator.setting.bulkRelease = V.incubator.setting.bulkRelease || V.incubatorBulkRelease || 0;
+ V.incubator.maleSetting = V.incubator.maleSetting || {...V.incubator.setting} || {};
+ V.incubator.maleSetting.targetAge = V.incubator.maleSetting.targetAge || V.targetAge || V.minimumSlaveAge || 18;
if (V.incubatorImprintSetting === 0) {
- V.incubator.setting.imprint = "trust";
+ V.incubator.maleSetting.imprint = "trust";
+ }
+ V.incubator.maleSetting.imprint = V.incubator.maleSetting.imprint || V.incubator.setting.imprint || V.incubatorImprintSetting || "trust";
+ V.incubator.maleSetting.weight = V.incubator.maleSetting.weight || V.incubator.setting.weight || V.incubatorWeightSetting || 0;
+ V.incubator.maleSetting.muscles = V.incubator.maleSetting.muscles || V.incubator.setting.muscles || V.incubatorMusclesSetting || 0;
+ V.incubator.maleSetting.growthStims = V.incubator.maleSetting.growthStims || V.incubator.setting.growthStims || V.incubatorGrowthStimsSetting || 0;
+ V.incubator.maleSetting.reproduction = V.incubator.maleSetting.reproduction || V.incubator.setting.reproduction || V.incubatorReproductionSetting || 0;
+ let provisionalPregAdaptation = (V.incubator.setting.pregAdaptation || V.incubatorPregAdaptationSetting || 0);
+ V.incubator.maleSetting.pregAdaptation = V.incubator.maleSetting.pregAdaptation || ((provisionalPregAdaptation === 2 || provisionalPregAdaptation === 3) ? 1 : 0); //Convert to boolean
+ V.incubator.maleSetting.pregAdaptationPower = V.incubator.maleSetting.pregAdaptationPower || V.incubator.setting.pregAdaptationPower || V.incubatorPregAdaptationPower || 0;
+
+ V.incubator.femaleSetting = V.incubator.femaleSetting || {...V.incubator.setting} || {};
+ V.incubator.femaleSetting.targetAge = V.incubator.femaleSetting.targetAge || V.targetAge || V.minimumSlaveAge || 18;
+ if (V.incubatorImprintSetting === 0) {
+ V.incubator.femaleSetting.imprint = "trust";
+ }
+ V.incubator.femaleSetting.imprint = V.incubator.femaleSetting.imprint || V.incubator.setting.imprint || V.incubatorImprintSetting || "trust";
+ V.incubator.femaleSetting.weight = V.incubator.femaleSetting.weight || V.incubator.setting.weight || V.incubatorWeightSetting || 0;
+ V.incubator.femaleSetting.muscles = V.incubator.femaleSetting.muscles || V.incubator.setting.muscles || V.incubatorMusclesSetting || 0;
+ V.incubator.femaleSetting.growthStims = V.incubator.femaleSetting.growthStims || V.incubator.setting.growthStims || V.incubatorGrowthStimsSetting || 0;
+ V.incubator.femaleSetting.reproduction = V.incubator.femaleSetting.reproduction || V.incubator.setting.reproduction || V.incubatorReproductionSetting || 0;
+ V.incubator.femaleSetting.pregAdaptation = V.incubator.femaleSetting.pregAdaptation || ((provisionalPregAdaptation === 1 || provisionalPregAdaptation === 3) ? 1 : 0);
+ V.incubator.femaleSetting.pregAdaptationPower = V.incubator.femaleSetting.pregAdaptationPower || V.incubator.setting.pregAdaptationPower || V.incubatorPregAdaptationPower || 0;
+
+ for (let i = 0; i < V.incubator.tanks.length; i++) {
+ if (!("incubatorSettings" in V.incubator.tanks[i])) {
+ const setting = (V.incubator.tanks[i].genes === "XX" ? V.incubator.femaleSetting : V.incubator.maleSetting);
+ V.incubator.tanks[i].incubatorSettings = {
+ imprint: setting.imprint,
+ weight: setting.weight,
+ muscles: setting.muscles,
+ growthStims: setting.growthStims,
+ reproduction: setting.reproduction,
+ growTime: V.incubator.tanks[i].growTime,
+ pregAdaptation: setting.pregAdaptation,
+ pregAdaptationPower: V.incubator.tanks[i].incubatorPregAdaptationPower,
+ pregAdaptationInWeek: V.incubator.tanks[i].incubatorPregAdaptationInWeek
+ }
+ }
}
- V.incubator.setting.imprint = V.incubator.setting.imprint || V.incubatorImprintSetting || "trust";
- V.incubator.setting.weight = V.incubator.setting.weight || V.incubatorWeightSetting || 0;
- V.incubator.setting.muscles = V.incubator.setting.muscles || V.incubatorMusclesSetting || 0;
- V.incubator.setting.growthStims = V.incubator.setting.growthStims || V.incubatorGrowthStimsSetting || 0;
- V.incubator.setting.reproduction = V.incubator.setting.reproduction || V.incubatorReproductionSetting || 0;
- V.incubator.setting.pregAdaptation = V.incubator.setting.pregAdaptation || V.incubatorPregAdaptationSetting || 0;
- V.incubator.setting.pregAdaptationPower = V.incubator.setting.pregAdaptationPower || V.incubatorPregAdaptationPower || 0;
}
if (Array.isArray(V.nationalities)) {
@@ -2444,6 +2476,31 @@ App.Update.oldVersions = function(node) {
}
}
+ if (V.releaseID < 1195) {
+ V.RECheckInIDs = [];
+ if (V.REFeminizationCheckinIDs.length > 0) {
+ V.REFeminizationCheckinIDs.forEach((s) => { V.RECheckInIDs.push({ID: s, type: "feminization"}); });
+ }
+ if (V.REMILFCheckinIDs.length > 0) {
+ V.REMILFCheckinIDs.forEach((s) => { V.RECheckInIDs.push({ID: s, type: "MILF"}); });
+ }
+ if (V.REOrientationCheckinIDs.length > 0) {
+ V.REOrientationCheckinIDs.forEach((s) => { V.RECheckInIDs.push({ID: s, type: "orientation"}); });
+ }
+ if (V.REUglyCheckinIDs.length > 0) {
+ V.REUglyCheckinIDs.forEach((s) => { V.RECheckInIDs.push({ID: s, type: "ugly"}); });
+ }
+ if (V.REButtholeCheckinIDs.length > 0) {
+ V.REButtholeCheckinIDs.forEach((s) => { V.RECheckInIDs.push({ID: s, type: "butthole"}); });
+ }
+ if (V.REFutaSisterCheckinIDs.length > 0) {
+ V.REFutaSisterCheckinIDs.forEach((s) => { V.RECheckInIDs.push({ID: s, type: "futa"}); });
+ }
+ if (V.REReductionCheckinIDs.length > 0) {
+ V.REReductionCheckinIDs.forEach((s) => { V.RECheckInIDs.push({ID: s, type: "reduction"}); });
+ }
+ }
+
if ((typeof V.familyTesting === "undefined") && V.releaseID < 1065) {
// possibly vanilla FC; compel V.familyTesting to 0 so that the family upgrade will run on slaves
V.familyTesting = 0;
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index cd8c4176e4b9c77fa830bf5d93ee0f03c068211c..ed63addf0d235213749801522bd07d97727333ec 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -985,6 +985,8 @@ globalThis.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
slave.counter.slavesKnockedUp = Math.max(+slave.counter.slavesKnockedUp, 0) || 0;
slave.counter.PCKnockedUp = Math.max(+slave.counter.PCKnockedUp, 0) || 0;
slave.counter.bestiality = Math.max(+slave.counter.bestiality, 0) || 0;
+ slave.counter.PCChildrenBeared = Math.max(+slave.counter.PCChildrenBeared, 0) || 0;
+ slave.counter.timesBred = Math.max(+slave.counter.timesBred, 0) || 0;
slave.bodySwap = Math.max(+slave.bodySwap, 0) || 0;
}
diff --git a/src/descriptions/arcologyDescription.js b/src/descriptions/arcologyDescription.js
index b05d4d493f41ba0894fb17f06071944aabf57d7b..c7e00a59c485ae6f896d48475069ab138d645b4e 100644
--- a/src/descriptions/arcologyDescription.js
+++ b/src/descriptions/arcologyDescription.js
@@ -670,20 +670,40 @@ App.Desc.playerArcology = function(lastElement) {
}
if (A.FSRomanRevivalistDecoration >= 60) {
buffer.push(`The central plaza is decorated to look like a thriving Roman forum on market day.`);
+ if (V.eventResults.artifactsBought?.includes("roman")) {
+ buffer.push(`A small museum dedicated to the history of the Roman legions can be found just off the plaza; its main attraction is Julius Caesar's legendary sword, the Crocea Mors.`);
+ }
} else if (A.FSNeoImperialistDecoration >= 60) {
buffer.push(`The central plaza is a brightly-colored mix between an Imperial marketplace and a crowded, futuristic forum, with street peddlers advertising fine nanolinens and advanced medicinal syringes between granite statues of stoic, proud Knights.`);
} else if (A.FSAztecRevivalistDecoration >= 60) {
- buffer.push(`The central plaza is decorated to look like a tribute to the gods, with huge statues, all looking in awe at the central temple. Many merchants peddle the goods of the new millennium.`);
+ buffer.push(`The central plaza is decorated to look like a tribute to the gods, with huge statues, all looking in awe at the central temple.`);
+ if (V.eventResults.artifactsBought?.includes("aztec")) {
+ buffer.push(`Rows of stone steps lead up toward the ancient stone platform used for sacrifices.`);
+ }
+ buffer.push(`Around the plaza, many merchants peddle the goods of the new millennium.`);
} else if (A.FSEgyptianRevivalistDecoration >= 60) {
buffer.push(`The central plaza is decorated to look like a thriving ancient Egyptian market on a festival day.`);
+ if (V.eventResults.artifactsBought?.includes("egyptian")) {
+ buffer.push(`Near the center of the plaza, a pillar supports a large bust of Cleopatra, whose sultry gaze overlooks the slave markets.`);
+ }
} else if (A.FSEdoRevivalistDecoration >= 60) {
buffer.push(`The central plaza is decorated to look like a vision of urban Edo Japan, with strings of lanterns crisscrossing the space and the petals from cherry blossoms floating gently through the air.`);
+ // The Edo artifact is kept in your office, not displayed on the promenade.
} else if (A.FSArabianRevivalistDecoration >= 60) {
buffer.push(`The central plaza is decorated to look like a thriving Arabian slave market.`);
+ if (V.eventResults.artifactsBought?.includes("arabian")) {
+ buffer.push(`A black stone stele inscribed with the Code of Hammurabi stands in a prominent position to one side of the plaza.`);
+ }
} else if (A.FSChineseRevivalistDecoration >= 60) {
buffer.push(`The central plaza is constructed as a Chinese water market, with stalls set up to serve customers passing by on boats riding on shallow canals.`);
+ if (V.eventResults.artifactsBought?.includes("chinese")) {
+ buffer.push(`Through a window near one entrance to the plaza, a large wooden statue of the Guan Yin Bodhisattva can be clearly seen.`);
+ }
} else if (A.FSAntebellumRevivalistDecoration >= 60) {
buffer.push(`The central plaza is decorated to look like an enormous plantation garden, with elegant colonnades and hedgerows to direct foot traffic throughout the arcology. A paved square lies at the center with a platform for slave auctions.`);
+ if (V.eventResults.artifactsBought?.includes("antebellum")) {
+ buffer.push(`A small museum dedicated to the history of the Antebellum South can be found just off the plaza; its main attraction is General Robert E. Lee's Colt Model 1855 revolver.`);
+ }
}
return buffer.join(" ");
}
diff --git a/src/endWeek/economics/arcmgmt.js b/src/endWeek/economics/arcmgmt.js
index b91ad546909652c7bcdf4680ccc80876d5b2cea9..bfa7862d04b7ebd80d44b1343402d550a4407419 100644
--- a/src/endWeek/economics/arcmgmt.js
+++ b/src/endWeek/economics/arcmgmt.js
@@ -1112,7 +1112,8 @@ App.EndWeek.arcManagement = function() {
if (V.policies.proRefugees === 1) {
slaveDemandU *= 1.1;
slaveDemandT *= 1.125;
- r.push(`Some desperate people filtered into the arcology during the week: as owner, you were able to enslave a handful of them.`);
+ V.menialSupplyFactor += 1000; // actually a supply change, not a demand change...
+ r.push(`Some refugees and desperate people filtered into the arcology during the week, increasing the supply of slaves.`);
}
if (V.policies.immigrationCash === 1) {
lowerClass += 200;
diff --git a/src/endWeek/economics/neighborsDevelopment.js b/src/endWeek/economics/neighborsDevelopment.js
index 7c82e29e0f53090077fadb4b5aacc94e7fd294b1..a08c9868ba83b03fa13a5c96a17b21ad82ef1aa2 100644
--- a/src/endWeek/economics/neighborsDevelopment.js
+++ b/src/endWeek/economics/neighborsDevelopment.js
@@ -56,7 +56,9 @@ App.EndWeek.neighborsDevelopment = function() {
const agent = App.currentAgent(i);
if (arc.government === "your agent") {
const {He} = getPronouns(agent);
- r.push(`is being run by your agent <span class="deeppink">${SlaveFullName(agent)}.</span>`);
+ const popup = App.UI.DOM.slaveDescriptionDialog(agent, SlaveFullName(agent) + ".");
+ popup.classList.add("slave-name", "bold");
+ r.push(`is being run by your agent`, popup);
if (agent && agent.assignment !== "be your agent") {
r.push(`<span class="red">BUG: ${agent} also was ${agent.assignment}!</span>`);
assignJob(agent, "be your agent");
@@ -374,7 +376,7 @@ App.EndWeek.neighborsDevelopment = function() {
/* FUTURE SOCIETY PROGRESS */
const societiesAdopted = FutureSocieties.activeCount(arc);
- let efficiency;
+ let efficiency = random(-3, 3);
switch (arc.government) {
case "elected officials":
efficiency = random(-2, 2);
@@ -395,8 +397,6 @@ App.EndWeek.neighborsDevelopment = function() {
case "a corporation":
efficiency = random(1, 2);
break;
- default:
- efficiency = random(-3, 3);
}
if (arc.rival === 1) {
diff --git a/src/endWeek/events/death.js b/src/endWeek/events/death.js
index d53393b31286ba73b7d6a1ba22049c494e8d341b..8d5e3a2f9f1ed126d2604ca46416615fe85b77e3 100644
--- a/src/endWeek/events/death.js
+++ b/src/endWeek/events/death.js
@@ -50,7 +50,7 @@ App.Events.SEDeath = class SEDeath extends App.Events.BaseEvent {
const r = [];
const {
He, His,
- he, his
+ he, his, him
} = getPronouns(slave);
if (artRenderer) {
App.UI.DOM.appendNewElement("div", el, artRenderer.render(slave), ["imageRef", "tinyImg"]);
@@ -82,6 +82,8 @@ App.Events.SEDeath = class SEDeath extends App.Events.BaseEvent {
r.push(`suddenly, unrelated to`);
}
r.push(`${his} living conditions. Thankfully the suit notifies its owner of such things; especially with the rumors of earlier models and necrophilia you hear occasionally.`);
+ } else if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true)) {
+ r.push(`After taking a break from beating <span class="pink bold">${slave.slaveName}</span> to freshen up, you return to find ${him} dead. Age claimed ${his} life before you could; you can't help but feel a little cheated.`);
} else {
r.push(`<span class="pink bold">${slave.slaveName}</span> failed to report in for a routine inspection, something that rarely occurs under your watch. It doesn't take long to track down the wayward slave.`);
const deathSeed = random(1, 100);
@@ -125,6 +127,9 @@ App.Events.SEDeath = class SEDeath extends App.Events.BaseEvent {
r.push(`You are notified by ${V.dairyName} staff that one of the occupied milkers has ceased producing. Upon inspection, it would seem <span class="pink bold">${slave.slaveName},</span> the cow restrained in it, died of an aphrodisiac overdose. How ${he} managed to get them is unknown, but ${he} was a good cow; ${he} gave milk up until ${his} death.`);
} else if (slave.fuckdoll > 0) {
r.push(`One of your Fuckdolls' monitoring systems alerts you that the slave contained within has died. It would seem <span class="pink bold">${slave.slaveName}</span> has died of an aphrodisiac overdose. Thankfully the suit notifies its owner of such things; especially with the rumors of earlier models and necrophilia you hear occasionally. It does little to deal with the resulting mess of the orgasm ${he} died during, however.`);
+ } else if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true)) {
+ r.push(`While taking a break from beating <span class="pink bold">${slave.slaveName}</span> to enjoy a little raping, ${he} seizes up in a particularly strong orgasm due to all the aphrodiasiacs you've been pumping into ${him}. As you finish up, you can't help but notice that ${he} as gone completely limp. A brief inspection reveals you've fucked the life out of ${him}.`);
+ SimpleSexAct.Player(slave);
} else {
r.push(`<span class="pink bold">${slave.slaveName}</span> failed to report in for a routine inspection, something that rarely occurs under your watch. It doesn't take long to track down the wayward slave.`);
r.push(`${He} is found dead in ${his} bed, having died sometime earlier. Judging by the mess and the expression on ${his} face, ${he} died of a heart attack during a particularly intense orgasm bought about by the massive amount of aphrodisiacs in ${his} system. ${slave.slaveName} died at the age of ${slave.actualAge};`);
@@ -154,6 +159,12 @@ App.Events.SEDeath = class SEDeath extends App.Events.BaseEvent {
r.push(`You are notified by ${V.dairyName} staff that one of the occupied milkers has ceased producing. Upon inspection, it would seem <span class="pink bold">${slave.slaveName},</span> the cow restrained in it, died to poor health caused by ${his} living conditions. ${He} was a good cow; ${he} gave milk up until ${his} death.`);
} else if (slave.fuckdoll > 0) {
r.push(`One of your Fuckdolls' monitoring systems alerts you that the slave contained within has died. It would seem <span class="pink bold">${slave.slaveName}</span> has died of general poor health. Thankfully the suit notifies its owner of such things; especially with the rumors of earlier models and necrophilia you hear occasionally. Clean up is easy enough, however.`);
+ } else if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true)) {
+ r.push(`As you begin to work <span class="pink bold">${slave.slaveName}</span> over, you find ${he} is quickly becomes unresponsive to your strikes, so you do the only logical thing; hit ${him} harder. When ${he} still ignores your efforts, you decide to give ${him} a cursory inspection. Turns out you managed to beat the life out of ${him}.`);
+ if (V.arcologies[0].FSPaternalist !== "unset") {
+ r.push(`Literally bludgeoning a slave to death for your amusement <span class="red">completely ruins</span> your image as a caring slaveowner and <span class="red">calls into question</span> if you even have paternalistic values.`);
+ FutureSocieties.Change("Paternalist", -40);
+ }
} else {
r.push(`<span class="pink bold">${slave.slaveName}</span> failed to report in for a routine inspection, something that rarely occurs under your watch. It doesn't take long to track down the wayward slave.`);
r.push(`${He} is found dead in ${his} bed, having died sometime during the night. ${He} has been in very poor health lately, so you knew this was a possibility. ${slave.slaveName} died at the age of ${slave.actualAge};`);
diff --git a/src/endWeek/player/prDiet.js b/src/endWeek/player/prDiet.js
index 094cf8a9f4d59be193a1b9ccf15113e616053ceb..0e82981ad335676908cda8c005fdbef450f229a3 100644
--- a/src/endWeek/player/prDiet.js
+++ b/src/endWeek/player/prDiet.js
@@ -538,6 +538,9 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
break;
case "weaning":
r.push(`You stick to your prescription diet with the intent to free yourself from slave food dependency.`);
+ if (!PC.weaningDuration) {
+ PC.weaningDuration = 0; // ugly hack, probably shouldn't initialize this here
+ }
if (PC.weaningDuration < 5) {
healthDamage(PC, 100);
r.push(`It gels into a dense paste in your stomach, giving you <span class="health dec">intense cramps</span> as it slowly digests.`);
@@ -564,6 +567,7 @@ App.EndWeek.Player.diet = function(PC = V.PC) {
PC.weight -= (-2 * PC.weaningDuration) + 28;
PC.muscles -= (-2 * PC.weaningDuration) + 28;
r.push(`More importantly, it is now <span class="change positive">regularly coming out the other end.</span> You're not far off from a healthy gastrointestinal tract.`);
+ PC.bellyFluid = 0; // needed because deflate() and SetBellySize() don't handle undigested food
deflate(PC);
} else {
r.push(`Your body is now capable of fully digesting your food and getting rid of its waste.`);
diff --git a/src/endWeek/player/prDrugs.js b/src/endWeek/player/prDrugs.js
index 0b810405d5db945d30d4ccf11021759153c57009..587a11fa1b740e60df127987d7a500aeb82c0fd1 100644
--- a/src/endWeek/player/prDrugs.js
+++ b/src/endWeek/player/prDrugs.js
@@ -64,7 +64,7 @@ App.EndWeek.Player.drugs = function(PC = V.PC) {
break;
case "hip wideners":
r.push(`The tablets aid your body with preparing for childbirth, at the cost of <span class="health dec">leaving you ill</span> from the excess hormones.`);
- healthDamage(PC, random(3, 5))
+ healthDamage(PC, random(3, 5));
break;
case "priapism agents":
if (PC.dick === 0) {
@@ -1258,7 +1258,7 @@ App.EndWeek.Player.drugs = function(PC = V.PC) {
}
galactorrheaTriggerCheck();
if (PC.energy < 85 && random(0, 10) < PC.health.condition) {
- r.push(`You are frequently beset by intrusive thoughts<span class="libido inc">centered around being fucked raw.</span>`);
+ r.push(`You are frequently beset by intrusive thoughts <span class="libido inc">centered around being fucked raw.</span>`);
PC.energy += 2;
}
break;
@@ -1484,7 +1484,7 @@ App.EndWeek.Player.drugs = function(PC = V.PC) {
if (V.injectionUpgrade !== 0) {
r.push(`enhanced`);
}
- r.push(`atrophiers into your nipples before bed each night. Your body sets to work pulling resources from`);
+ r.push(`atrophiers into your lips before bed each night. Your body sets to work pulling resources from`);
if (PC.geneMods.NCS === 1) {
r.push(`them, amplified by your <span class="ncs">NCS.</span>`);
} else {
@@ -1593,6 +1593,18 @@ App.EndWeek.Player.drugs = function(PC = V.PC) {
}
r.push(induceLactation(PC, 2));
break;
+
+ // Adds a default to handle unexpected(modded) drugs
+ default:
+ {
+ const drug = App.Mods.Drugs.list.filter(drug => drug.isPCDrug).find(e => e.name === PC.drugs);
+ if (drug) {
+ r.push(drug.effect(PC));
+ } else {
+ console.error(`Drug effect of ${PC.drugs} not found!`);
+ PC.drugs = "no drugs";
+ }
+ }
}
if (["hyper breast injections", "hyper butt injections", "growth stimulants", "hyper penis enhancement", "hyper testicle enhancement", "super fertility drugs"].includes(PC.drugs)) {
if (!canEatFood(PC)) {
diff --git a/src/endWeek/player/prInflation.js b/src/endWeek/player/prInflation.js
index 148651dfa966488572d2b7a97e6002e66f8bc5e0..0289850ef371e6511219c15939e9478672b5d6ce 100644
--- a/src/endWeek/player/prInflation.js
+++ b/src/endWeek/player/prInflation.js
@@ -84,7 +84,12 @@ App.EndWeek.Player.inflation = function(PC = V.PC) {
r.push(`you at all. <span class="yellow">You are unable continue to inflate yourself by this means.</span>`);
}
} else if (PC.inflationType === "undigested food" && PC.diet !== "weaning") {
- r.push(`Since you started eating slave food again, the food backing up in your system has broken down, once again <span class="yellow">leaving you with a flat belly.</span>`);
+ if (PC.digestiveSystem === "normal") { // successfully weaned - backup in case cheating player skips weaningDuration 10-13 period
+ r.push(`Having weaned yourself from slave food, your strengthened digestive system is finally able to break down the mass of undigested food inside you, <span class="yellow">leaving you with a flat belly.</span>.`);
+ } else { // gave up on weaning
+ r.push(`Since you started eating slave food again, the food backing up in your system has broken down, once again <span class="yellow">leaving you with a flat belly.</span>`);
+ }
+ PC.bellyFluid = 0; // necessary because deflate() and SetBellySize() don't handle undigested food
deflate(PC);
PC.weaningDuration = 0;
}
diff --git a/src/endWeek/player/prLongTermPhysicalEffects.js b/src/endWeek/player/prLongTermPhysicalEffects.js
index 9dd2ab558d75b77afbf9f6412e177cd0028468a6..fb0c82e8a57f0667a428cad8412178279a3af7fd 100644
--- a/src/endWeek/player/prLongTermPhysicalEffects.js
+++ b/src/endWeek/player/prLongTermPhysicalEffects.js
@@ -520,9 +520,10 @@ App.EndWeek.Player.longTermPhysicalEffects = function(PC = V.PC) {
** over 126 cm
** or over height (30% chance)
*/
- const heightDelta = PC.height - Height.mean(PC);
+ const nonsurgicalHeight = PC.height - 10 * PC.heightImplant;
+ const heightDelta = PC.height - PC.natural.height;
let shrinkage;
- if ((PC.height > 176) || (heightDelta > 5) || ((PC.NCSyouthening >= 6) && ((PC.height > 126) || (heightDelta > 0)) && (random(1, 100) < 30))) {
+ if ((nonsurgicalHeight > 176) || (heightDelta > 5) || ((PC.NCSyouthening >= 6) && ((nonsurgicalHeight > 126) || (heightDelta > 0)) && (random(1, 100) < 30))) {
if (heightDelta > 15) {
shrinkage = 5;
} else if (heightDelta > 5) {
diff --git a/src/endWeek/reports/brothelReport.js b/src/endWeek/reports/brothelReport.js
index 6f892e08af84933c383cb70d8ba9984873ce06bb..20dbb1e76b45c3b5ff3e874be78bc6577a31a7a0 100644
--- a/src/endWeek/reports/brothelReport.js
+++ b/src/endWeek/reports/brothelReport.js
@@ -1,6 +1,5 @@
App.EndWeek.brothelReport = function() {
const el = document.createElement("p");
- let r;
const brothelStats = document.createElement("span");
el.append(brothelStats);
diff --git a/src/endWeek/reports/clinicReport.js b/src/endWeek/reports/clinicReport.js
index 40578cc069c5b1340908fd0803de0d9ae9a99a40..a4e77056d1b8747c84a34d3fe441d1d23eaa76aa 100644
--- a/src/endWeek/reports/clinicReport.js
+++ b/src/endWeek/reports/clinicReport.js
@@ -396,13 +396,6 @@ App.EndWeek.clinicReport = function() {
r.push(`so ${he} has returned to rest.`);
}
} else {
- // This needs to be set here or else it freaks out and returns errors. It also can't be defaulted without hiding issues, so we set something here.
- if (slave.assignment === Job.WHORE || slave.assignment === Job.BROTHEL) {
- slave.sexAmount = Math.trunc(Beauty(slave) / 5);
- slave.sexQuality = FResult(slave);
- App.EndWeek.saVars.effectiveWhoreClass[slave.ID] = effectiveWhoreClass(slave);
- App.EndWeek.saVars.maxWhoreClass[slave.ID] = App.EndWeek.saVars.effectiveWhoreClass[slave.ID];
- }
r.push(`so ${he} goes back to ${slave.assignment}.`);
}
} else {
diff --git a/src/endWeek/reports/incubatorReport.js b/src/endWeek/reports/incubatorReport.js
index a3f138fee6a7cd656f86d76022ac9c5339471aaa..42da5fd2f32bde9c66615af1d36de7065d54b495 100644
--- a/src/endWeek/reports/incubatorReport.js
+++ b/src/endWeek/reports/incubatorReport.js
@@ -18,13 +18,13 @@ App.EndWeek.incubatorReport = function() {
tank.ovaryAge++;
}
}
- if (tank.growTime > 0) {
- tank.growTime -= V.incubator.upgrade.speed;
+ if (tank.incubatorSettings.growTime > 0) {
+ tank.incubatorSettings.growTime -= V.incubator.upgrade.speed;
r.push(`<span class="pink">${tank.slaveName}'s</span> growth is currently being accelerated. ${He}`);
- if (Math.round(tank.growTime/V.incubator.upgrade.speed) <= 0) {
+ if (Math.round(tank.incubatorSettings.growTime/V.incubator.upgrade.speed) <= 0) {
r.push(`is <span class="lime">ready for release.</span> ${He} will be ejected from ${his} tank upon your approach.`);
} else {
- r.push(`will be ready for release in about ${Math.round(tank.growTime/V.incubator.upgrade.speed)} weeks.`);
+ r.push(`will be ready for release in about ${Math.round(tank.incubatorSettings.growTime/V.incubator.upgrade.speed)} weeks.`);
}
} else {
r.push(`<span class="pink">${tank.slaveName}</span> is <span class="lime">ready for release.</span> ${He} will be ejected from ${his} tank upon your approach.`);
@@ -34,7 +34,7 @@ App.EndWeek.incubatorReport = function() {
r = [];
if (V.incubator.upgrade.weight === 1) {
- if (V.incubator.setting.weight === 1) {
+ if (tank.incubatorSettings.weight === 1) {
if (tank.weight < 200) {
if (V.incubator.upgrade.speed === 52) {
tank.weight += 70;
@@ -49,7 +49,7 @@ App.EndWeek.incubatorReport = function() {
}
}
r.push(`The weight monitoring systems are overloading ${his} intake causing <span class="red">rapid weight gain.</span>`);
- } else if (V.incubator.setting.weight === 2) {
+ } else if (tank.incubatorSettings.weight === 2) {
if (tank.weight > 10) {
if (V.incubator.upgrade.speed === 52) {
tank.weight -= 30;
@@ -79,7 +79,7 @@ App.EndWeek.incubatorReport = function() {
} else {
r.push(`${He} is <span class="lime">currently at a healthy weight;</span> efforts will be made to maintain it.`);
}
- } else if (V.incubator.setting.weight === 0) {
+ } else if (tank.incubatorSettings.weight === 0) {
if (tank.weight > -100) {
r.push(`${His} developing body <span class="red">quickly sheds its gained weight.</span>`);
tank.weight -= 40;
@@ -95,7 +95,7 @@ App.EndWeek.incubatorReport = function() {
r = [];
if (V.incubator.upgrade.muscles === 1) {
- if (V.incubator.setting.muscles === 2) {
+ if (tank.incubatorSettings.muscles === 2) {
if (tank.muscles < 100) {
if (V.incubator.upgrade.speed === 52) {
tank.muscles += 70;
@@ -110,7 +110,7 @@ App.EndWeek.incubatorReport = function() {
}
}
r.push(`The strength monitoring systems are overloading ${him} with steroids causing <span class="green">rapid muscle development.</span>`);
- } else if (V.incubator.setting.muscles === 1) {
+ } else if (tank.incubatorSettings.muscles === 1) {
if (tank.muscles > 10) {
if (V.incubator.upgrade.speed === 52) {
tank.muscles -= 30;
@@ -140,7 +140,7 @@ App.EndWeek.incubatorReport = function() {
} else {
r.push(`${He} has <span class="lime">a healthy musculature;</span> efforts will be made to maintain it.`);
}
- } else if (V.incubator.setting.muscles === 0) {
+ } else if (tank.incubatorSettings.muscles === 0) {
if (tank.muscles > -100) {
r.push(`${His} developing body <span class="red">quickly loses its gained muscle.</span>`);
tank.muscles -= 40;
@@ -155,7 +155,7 @@ App.EndWeek.incubatorReport = function() {
App.Events.addNode(entry, r, "div");
r = [];
- if (V.incubator.upgrade.growthStims === 1 && V.incubator.setting.growthStims !== 0) {
+ if (V.incubator.upgrade.growthStims === 1 && tank.incubatorSettings.growthStims !== 0) {
let heightLimit = Math.clamp((Height.forAge(tank.natural.height, tank) * 1.25), 0, 274);
let heightLimitAge = Height.forAge(tank.natural.height, tank);
if (tank.geneticQuirks.dwarfism === 2 && tank.geneticQuirks.gigantism !== 2) {
@@ -178,12 +178,12 @@ App.EndWeek.incubatorReport = function() {
if (tank.height >= heightLimit) {
r.push(`The monitoring system detects ${his} body is not able to support further increases in height, so it carefully regulates stimulant injections to <span class="yellow">maintain ${his} current stature.</span>`);
tank.height = heightLimit;
- } else if (V.incubator.setting.growthStims === 2) {
+ } else if (tank.incubatorSettings.growthStims === 2) {
if (tank.geneMods.NCS === 1) {
r.push(`The monitoring system floods ${his} body with growth stimulants, but ${his} <span class="orange">NCS prevents an increase in ${his} growth rate.</span>`);
tank.height = heightLimitAge;
} else {
- if (V.incubator.setting.weight >= 1 && V.incubator.setting.muscles <= 1 && V.incubator.setting.reproduction <= 1) {
+ if (tank.incubatorSettings.weight >= 1 && tank.incubatorSettings.muscles <= 1 && tank.incubatorSettings.reproduction <= 1) {
r.push(`The monitoring system floods ${his} body with growth stimulants. ${His} caloric intake and expenditure rates are ideal for maximum response, causing <span class="green">explosive growth.</span>`);
if (V.incubator.upgrade.speed === 52) {
tank.height += random(3, 6);
@@ -211,7 +211,7 @@ App.EndWeek.incubatorReport = function() {
}
}
}
- } else if (V.incubator.setting.growthStims === 1) {
+ } else if (tank.incubatorSettings.growthStims === 1) {
if (tank.geneMods.NCS === 1) {
r.push(`The monitoring system detects ${he} is near the expected height for ${his} <span class="orange">NCS</span> condition, so it carefully regulates stimulant injections to <span class="yellow">maintain ${his} current stature.</span>`);
tank.height = heightLimitAge;
@@ -254,9 +254,9 @@ App.EndWeek.incubatorReport = function() {
r = [];
if (V.incubator.upgrade.reproduction === 1) {
const rearQuirk = tank.geneticQuirks.rearLipedema === 2 ? 2 : 1;
- if (V.incubator.setting.reproduction === 2) {
+ if (tank.incubatorSettings.reproduction === 2) {
r.push(`${His} developing body is being flooded with hormones.`);
- if (V.incubator.setting.weight === 1) {
+ if (tank.incubatorSettings.weight === 1) {
r.push(`Combined with the abundant food provided to ${him}, ${his} body grows rapidly.`);
if (tank.ovaries === 1) {
tank.pubertyXX = 1;
@@ -388,7 +388,7 @@ App.EndWeek.incubatorReport = function() {
}
}
}
- } else if (V.incubator.setting.weight === 2) {
+ } else if (tank.incubatorSettings.weight === 2) {
r.push(`Combined with the healthy food provided to ${him}, ${his} body grows readily.`);
if (tank.ovaries === 1) {
tank.pubertyXX = 1;
@@ -653,7 +653,7 @@ App.EndWeek.incubatorReport = function() {
}
}
}
- } else if (V.incubator.setting.reproduction === 1) {
+ } else if (tank.incubatorSettings.reproduction === 1) {
r.push(`${His} hormone levels are being carefully managed, <span class="green">encouraging early puberty.</span>`);
if (tank.ovaries === 1) {
tank.pubertyXX = 1;
@@ -750,10 +750,10 @@ App.EndWeek.incubatorReport = function() {
}
App.Events.addNode(entry, r, "div");
- if (V.incubator.setting.reproduction === 2) {
+ if (tank.incubatorSettings.reproduction === 2) {
tank.energy = 80;
tank.need = 100;
- } else if (V.incubator.setting.reproduction === 1) {
+ } else if (tank.incubatorSettings.reproduction === 1) {
tank.energy = 50;
tank.need = 20;
} else {
@@ -762,24 +762,24 @@ App.EndWeek.incubatorReport = function() {
}
r = [];
- if (((V.incubator.setting.pregAdaptation === 1 && tank.genes === "XX") || (V.incubator.setting.pregAdaptation === 2 && tank.genes === "XY") || V.incubator.setting.pregAdaptation === 3) && tank.growTime > 0) {
- if (tank.incubatorPregAdaptationInWeek <= 0) {
+ if (tank.incubatorSettings.pregAdaptation > 0 && tank.incubatorSettings.growTime > 0) {
+ if (tank.incubatorSettings.pregAdaptationInWeek <= 0) {
r.push(`${His} physique will be mature enough on release that the incubator's reproductive capacity system would have no effect on ${him} at current settings, so it is unused.`);
} else {
r.push(`The incubator is working on adapting ${his} abdomen and reproductive organs for future pregnancies.`);
- let weekAdapt = tank.incubatorPregAdaptationInWeek * V.incubator.upgrade.speed;
+ let weekAdapt = tank.incubatorSettings.pregAdaptationInWeek * V.incubator.upgrade.speed;
if (isNaN(weekAdapt)) {
/* NaN check AFTER multiply operation, against it result is critical here. Need to be absolutely sure about this operation, not about just tank property itself. This give me two very unpleasant hours to catch this */
- tank.incubatorPregAdaptationInWeek = (15000 / 2000 - tank.pregAdaptation) / tank.growTime;
+ tank.incubatorSettings.pregAdaptationInWeek = (15000 / 2000 - tank.pregAdaptation) / tank.incubatorSettings.growTime;
}
- weekAdapt = tank.incubatorPregAdaptationInWeek * V.incubator.upgrade.speed;
+ weekAdapt = tank.incubatorSettings.pregAdaptationInWeek * V.incubator.upgrade.speed;
/* Now it should be fine */
- weekAdapt *= 1 + (V.incubator.setting.reproduction / 5);
+ weekAdapt *= 1 + (tank.incubatorSettings.reproduction / 5);
weekAdapt *= 1 + (tank.hormoneBalance / 1500);
tank.pregAdaptation += weekAdapt;
/* here goes side effect from intense and extreme settings: */
- if (random(1, 100) <= (tank.incubatorPregAdaptationPower - 1) * (V.incubator.upgrade.speed / 2 + 1)) {
+ if (random(1, 100) <= (tank.incubatorSettings.pregAdaptationPower - 1) * (V.incubator.upgrade.speed / 2 + 1)) {
switch (random(1, 9)) { /* side effect selection*/
case 1:
if (tank.preg > -2) {
@@ -788,7 +788,7 @@ App.EndWeek.incubatorReport = function() {
}
break;
case 2:
- if (((tank.ovaries === 1 || tank.mpreg === 1) && tank.preg > -3) || (tank.balls > 0 && tank.ballType != "sterile")) {
+ if (((tank.ovaries === 1 || tank.mpreg === 1) && tank.preg > -3) || (tank.balls > 0 && tank.ballType !== "sterile")) {
if (tank.ovaries === 1 || tank.mpreg === 1) {
tank.preg = -3;
}
diff --git a/src/endWeek/reports/masterSuiteReport.js b/src/endWeek/reports/masterSuiteReport.js
index a7a0e0d895478d02e5840b34790645fb88e8a4ee..c7b03dd2dd475692c7f1e3d306399d2bc0722a02 100644
--- a/src/endWeek/reports/masterSuiteReport.js
+++ b/src/endWeek/reports/masterSuiteReport.js
@@ -278,7 +278,7 @@ App.EndWeek.masterSuiteReport = function() {
slave.boobsMilk = 0;
}
if (slave.energy.isBetween(40, 95)) {
- r.push(`Being a constant part of the fuckpit orgy <span class="green">greatly heightens ${his} libido.</span>`);
+ r.push(`Being a constant part of the fuckpit orgy <span class="libido inc">greatly heightens ${his} libido.</span>`);
slave.energy += 2;
}
slave.need -= 50;
diff --git a/src/endWeek/reports/personalAttention.js b/src/endWeek/reports/personalAttention.js
index 872108b692a8bd7c98e7d80b602a245e0fd7288f..0618134572e983442874eb5329211e9953de3287 100644
--- a/src/endWeek/reports/personalAttention.js
+++ b/src/endWeek/reports/personalAttention.js
@@ -81,6 +81,15 @@ App.PersonalAttention.slaveReport = function(slave) {
r.push(App.UI.DOM.makeElement("span", `You care for`, ["bold"]));
} else if (pa.objective === "spar") {
r.push(App.UI.DOM.makeElement("span", `You train with`, ["bold"]));
+ } else if (pa.objective === "torture") {
+ if (isAmputee(slave)) {
+ r.push(`You strap down and`);
+ } else if (hasBothArms(slave)) {
+ r.push(`You chain up and`);
+ } else {
+ r.push(`You tightly bind and`);
+ }
+ r.push(App.UI.DOM.makeElement("span", `brutally torment`, ["bold"]));
} else {
r.push(App.UI.DOM.makeElement("span", `You train`, ["bold"]));
}
@@ -1570,6 +1579,92 @@ App.PersonalAttention.slaveReport = function(slave) {
currentSlaveValue = 1.4;
slave.training = 0;
break;
+ case "torture": {
+ let FSApproves = 0;
+ // Effectively sacrifices a slave's health to terrify your penthouse slaves. Does not affect deaf slaves. Mute slaves give no benefit.
+ r.push(`When you have pent up energy, you beat ${him}. When you're bored, you lash ${him}. If you even see ${him} passing out from exhaustion or pain, you shock ${him} back awake. If ${he} isn't moaning in despair, that's all the reason you need to make ${him} bleed.`);
+ if (V.PC.energy > 20) {
+ r.push(`As an added insult, you opt to violently rape ${him} throughout the day; some by surprise, others drawn out so the fear of what's to come can supplement ${his} anguish.`);
+ }
+ r.push(`You spare ${him} no amount of`);
+ r.push(App.UI.DOM.makeElement("span", `suffering;`, "mediumorchid"));
+ r.push(`every second spent in your presence is one spent`);
+ r.push(App.UI.DOM.makeElement("span", `dreading`, "gold"));
+ r.push(`your next assault.`);
+ if (App.EndWeek.saVars.slaveTortured === "broken") {
+ if (slave.fetish !== Fetish.MINDBROKEN) {
+ r.push(`You can't wait to hear ${him} properly scream next week now that ${he}'s regained ${his} senses. You have to wonder how long ${he}'ll manage to keep them for.`);
+ } else {
+ r.push(`It's good stress release, but since ${he} shows no reaction to it, you quickly get bored.`);
+ if (slave.kindness) {
+ slave.kindness = 0;
+ }
+ }
+ } else if (App.EndWeek.saVars.slaveTortured === "mute") {
+ r.push(`It's good stress release, but since ${he} is mute and can't cry out in agony, it only really serves to lower ${his} resale value.`);
+ } else if (App.EndWeek.saVars.slaveTortured === "self hating") {
+ r.push(`The way ${he}`);
+ r.push(App.UI.DOM.makeElement("span", `enjoys and encourages it`, ["hotpink"]));
+ r.push(`is uncanny and takes some of the fun out of it`);
+ slave.devotion += 5;
+ slave.trust -= 1;
+ } else if (App.EndWeek.saVars.slaveTortured === "fetish") {
+ if (slave.fetish !== Fetish.MASOCHIST) {
+ r.push(`It seems you've beaten the masochist out of ${him}. Perhaps next week ${his} screams will be more genuine.`);
+ } else {
+ r.push(`Unfortunately, ${he} gets off on it a bit too much, so the only thing echoing through the penthouse halls are`);
+ r.push(App.UI.DOM.makeElement("span", `screams of pleasure,`, ["hotpink"]));
+ r.push(`and that isn't exactly out of the ordinary.`);
+ if (slave.fetishStrength > random(80, 180)) {
+ r.push(`Beset by your constant torment, ${his} masochistic tendencies darken into sexual appreciation for ${his} life as a human punching bag. <span class="paraphilia gain">${He}'s descended into true self hatred.</span>`);
+ FSApproves = 1;
+ slave.sexualFlaw = "self hating";
+ slave.fetishStrength = 100;
+ }
+ slave.devotion += 3;
+ slave.trust -= 5;
+ }
+ } else if (App.EndWeek.saVars.slaveTortured === "love") {
+ r.push(`The baleful cries of a ${girl} betrayed are especially poignant and should help keep your other slaves feeling uneasy.`);
+ } else {
+ r.push(`${His} anguished cries ringing through the penthouse halls at all hours of the day should remind your other slaves what you are capable of.`);
+ if (slave.devotion + slave.trust < -195) {
+ r.push(`${He} falls so deeply into hopelessness that ${he} becomes completely unresponsive. You can't seem to provoke anything more than a physical reflex from ${him} no matter what you try; it seems <span class="mindbreak">${his} mind gave out</span> before ${his} body did.`);
+ applyMindbroken(slave);
+ } else if (slave.fetish === Fetish.MASOCHIST) {
+ r.push(`You can't help be feel ${he} is starting to enjoy this.`);
+ }
+ }
+ if (slave.fetish !== Fetish.MINDBROKEN && slave.fetish !== Fetish.MASOCHIST) {
+ slave.trust -= 30;
+ slave.devotion -= 30;
+ }
+ healthDamage(slave, 50);
+ if (V.PC.energy > 20) {
+ SimpleSexAct.Player(slave, Math.max(Math.round(V.PC.need / 10), 1)); // review with .need
+ V.PC.need = 0;
+ }
+ slave.minorInjury = either("black eye", "bruise", "split lip");
+ // App.Medicine.Modification.addScourged(slave); Needs improvement first.
+ r.push(`${He} ends ${his} week thoroughly`);
+ r.push(App.UI.DOM.makeElement("span", `beaten`, ["health", "dec"]));
+ r.push(`and`);
+ r.push(App.UI.DOM.makeElement("span", `exhausted.`, "red"));
+ if (slave.health.tired < 120) {
+ slave.health.tired = 120;
+ }
+ if (slave.pregKnown === 1 && slave.fetish !== Fetish.MINDBROKEN) {
+ r.push(`You took care to not harm ${his} pregnancy, but ${he} doesn't need to know that. If you really wanted to abort it in such a manner, you'd make more a show of it to ${him}.`);
+ }
+ if (FSApproves) {
+ if (V.arcologies[0].FSHedonisticDecadence !== "unset") {
+ r.push(`Indulging in ${his} fetish until ${he} becomes obsessed with it advances hedonism and <span class="reputation inc">bolsters your reputation.</span>`);
+ FutureSocieties.Change("Hedonistic", 2);
+ }
+ }
+ // add slave death here
+ break;
+ }
case "fix behavioral flaw":
if (slave.behavioralFlaw === "arrogant") {
r.push(`${slave.slaveName} seems to think ${he}'s better than everyone else. Naturally, as ${his} owner you have the means to correct this sad misapprehension. As you train ${him} during the week, you ensure that ${he} submits to anyone and everyone. ${He} is rarely permitted to enjoy sex under your tutelage, but is instead required to use ${his} mouth and hands to get others off. ${He} cleans, washes, and serves.`);
diff --git a/src/endWeek/reports/schoolroomReport.js b/src/endWeek/reports/schoolroomReport.js
index 1c774990af0d3df0a3e822bd45399d960c9e7d4b..4a6260553a4db4e85e536590e382951320202aaf 100644
--- a/src/endWeek/reports/schoolroomReport.js
+++ b/src/endWeek/reports/schoolroomReport.js
@@ -218,13 +218,6 @@ App.EndWeek.schoolroomReport = function() {
r.push(`so ${he} has returned to rest.`);
}
} else {
- // This needs to be set here or else it freaks out and returns errors. It also can't be defaulted without hiding issues, so we set something here.
- if (slave.assignment === Job.WHORE || slave.assignment === Job.BROTHEL) {
- slave.sexAmount = Math.trunc(Beauty(slave) / 5);
- slave.sexQuality = FResult(slave);
- App.EndWeek.saVars.effectiveWhoreClass[slave.ID] = effectiveWhoreClass(slave);
- App.EndWeek.saVars.maxWhoreClass[slave.ID] = App.EndWeek.saVars.effectiveWhoreClass[slave.ID];
- }
r.push(`so ${he} goes back to ${slave.assignment}.`);
}
} else {
diff --git a/src/endWeek/saBeYourHeadGirl.js b/src/endWeek/saBeYourHeadGirl.js
index 4e9991c201a36e68ca8618cfb6f88a3ae5f77247..4b8e0c8c8297d11352fa7b7572a96a38577ff073 100644
--- a/src/endWeek/saBeYourHeadGirl.js
+++ b/src/endWeek/saBeYourHeadGirl.js
@@ -88,7 +88,7 @@ App.SlaveAssignment.beYourHeadGirl = function saBeYourHeadGirl(slave) {
}
} else {
if (totalRelatives(slave) > 0) {
- let relation = getSlave(slave.relationshipTarget);
+ const relation = getSlave(slave.relationshipTarget);
const relationPronouns = getPronouns(relation);
if (relation.mother === slave.ID || relation.father === slave.ID) {
r.push(`Your Consort has a ${relationPronouns.daughter}-${relationPronouns.wife}. This is <span class="green">as it should be.</span>`);
diff --git a/src/endWeek/saDevotion.js b/src/endWeek/saDevotion.js
index 70754d8d13427027e4b42cc1528f4a0ed2da568c..a0102b6a5fc86dab5922930e195e08061331837b 100644
--- a/src/endWeek/saDevotion.js
+++ b/src/endWeek/saDevotion.js
@@ -685,6 +685,58 @@ App.SlaveAssignment.devotion = function saDevotion(slave) {
r.push(`${He} knows some of your other slaves meet terrible, industrial fates, but ${he} loves you so much that ${he} tries not to think about it.`);
}
}
+ if (App.EndWeek.saVars.slaveTortured !== "none") {
+ if (!getPersonalAttention(slave.ID, "torture")) {
+ if (canSee(slave) && slave.assignment === Job.FUCKTOY) {
+ if (slave.fetish === Fetish.SADIST) {
+ r.push(`${He} has <span class="devotion dec">fun</span> watching you spend your free time brutalizing a helpless slave. On the other hand, that ${he} could be next was a <span class="trust dec">little worrying.</span>`);
+ slave.devotion++;
+ slave.trust -= 5;
+ } else {
+ if (App.EndWeek.saVars.slaveTortured === "broken") {
+ r.push(`Being forced to watch you brutalize a helpless slave <span class="trust dec">frightens</span> ${him} deeply.`);
+ slave.trust -= 5;
+ } else {
+ r.push(`${He} is <span class="trust dec">horrified</span> to have to watch you carry out such brutality on another slave.`);
+ slave.trust -= 10;
+ }
+ }
+ } else if (App.EndWeek.saVars.slaveTortured !== "broken" && App.EndWeek.saVars.slaveTortured !== "mute" && canHear(slave)) {
+ if (App.EndWeek.saVars.slaveTortured === "self hating") {
+ if (slave.sexualFlaw === "self hating") {
+ r.push(`${He} can't help but feel a <span class="devotion dec">little jealous</span> of the slave being beaten to death in your office.`);
+ slave.devotion -= 2;
+ } else {
+ r.push(`What ${(slave.hears === -1) ? "little" : ""} ${he} hears coming out of your office is <span class="devotion dec">deeply unsettling;</span> a brutalized slave should not be begging for more with such desperation.`);
+ if (slave.hears === -1) {
+ slave.devotion -= 5;
+ } else {
+ slave.devotion -= 10;
+ }
+ }
+ } else if (slave.fetish === Fetish.SADIST) {
+ r.push(`The sounds of terror emanating from your office give such a <span class="devotion inc">delightfully sadistic</span> ambiance to your penthouse.`);
+ slave.devotion++;
+ } else if (App.EndWeek.saVars.slaveTortured === "love") {
+ r.push(`The chilling cries of a deeply trusting slave being callously beaten echoing throughout the penthouse are enough to utterly horrify ${him}.`);
+ if (slave.hears === -1) {
+ r.push(`If only ${he} could hear just how bad it really is.`);
+ slave.trust -= 10;
+ } else {
+ slave.trust -= 15;
+ }
+ } else if (App.EndWeek.saVars.slaveTortured === "normal") {
+ r.push(`The sounds of terror emanating from your office keep ${him} <span class="trust dec">perpetually on edge.</span>`);
+ if (slave.hears === -1) {
+ r.push(`If only ${he} could hear just how bad they really are.`);
+ slave.trust -= 5;
+ } else {
+ slave.trust -= 10;
+ }
+ }
+ }
+ }
+ }
}
}
diff --git a/src/endWeek/saDrugs.js b/src/endWeek/saDrugs.js
index 192ad70dec2447f333e6ffbe0556b769c38639e9..7cc21da5fb143c05381d9179e98c4d0107359e45 100644
--- a/src/endWeek/saDrugs.js
+++ b/src/endWeek/saDrugs.js
@@ -1536,6 +1536,17 @@ App.SlaveAssignment.drugs = function saDrugs(slave) {
r += ` ${He} is required to frequently <span class="coral">massage sag-B-gone into ${his} breasts,</span> which, while enjoyable to watch, doesn't seem to be doing much.`;
}
break;
+
+ // Adds a default to handle unexpected(modded) drugs
+ default: {
+ const drug = App.Mods.Drugs.list.filter(drug => !drug.isPCDrug).find(e => e.name === slave.drugs);
+ if (drug) {
+ r += drug.effect(slave);
+ } else {
+ console.error(`Drug effect of ${slave.drugs} not found!`);
+ slave.drugs = "no drugs";
+ }
+ }
}
if (slave.drugs !== "no drugs" && slave.drugs !== "appetite suppressors") {
if (V.arcologies[0].FSBodyPuristLaw === 0) {
diff --git a/src/endWeek/saLongTermEffects.js b/src/endWeek/saLongTermEffects.js
index 43af7c32169a0a34bf9e4313419bc67a88ef2091..0d8652208636f2f77e46dfa3d2d17eeefd48b885 100644
--- a/src/endWeek/saLongTermEffects.js
+++ b/src/endWeek/saLongTermEffects.js
@@ -1517,7 +1517,7 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
if (slave.fuckdoll > 50) {
r.push(`Denied all stimulation other than sexual use for longer than a human mind can bear, <span class="mindbreak">${he} has been irretrievably broken.</span>`);
applyMindbroken(slave);
- } else {
+ } else if (!getPersonalAttention(slave.ID, "torture") || App.EndWeek.saVars.slaveTortured === "none") { // exception handled in personalAttention
if (random(1, 5) === 1) {
r.push(`${He} has been used as a sexual slave for so long, and is so hopeless that ${his} future as a slave will be anything but torment, that ${his} mind finally slips. <span class="mindbreak">${He} has been irretrievably broken.</span>`);
applyMindbroken(slave);
@@ -2536,6 +2536,9 @@ App.SlaveAssignment.longTermEffects = function saLongTermEffects(slave) {
if (slave.curatives === 1) {
deathSeed += 200;
}
+ if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true)) {
+ deathSeed -= 200;
+ }
if (random(1, 1000) > (400 + deathSeed)) {
planDeath(slave, "lowHealth");
}
diff --git a/src/endWeek/saLongTermMentalEffects.js b/src/endWeek/saLongTermMentalEffects.js
index 48fba18bcc805bfb60612c917d0ae47e766ca242..f88f0b91043d03f90dd43b63582297e260b16e8b 100644
--- a/src/endWeek/saLongTermMentalEffects.js
+++ b/src/endWeek/saLongTermMentalEffects.js
@@ -2134,22 +2134,24 @@ App.SlaveAssignment.longTermMentalEffects = function saLongTermMentalEffects(sla
break;
case "masochist":
if (slave.sexualFlaw !== "self hating") {
- if ([Job.GLORYHOLE, Job.ARCADE].includes(slave.assignment)) {
- r.push(`Condemned to serve as a public fuckhole, ${his} masochistic tendencies darken into sexual appreciation for ${his} life as a human sex toy. <span class="paraphilia gain">${He}'s descended into true self hatred.</span>`);
- slave.sexualFlaw = "self hating";
- slave.fetishStrength = 100;
- FSApproves = 1;
- } else if (slave.assignment === Job.DAIRY && V.dairyRestraintsSetting >= 2) {
- r.push(`Strapped into a milking machine's tender, penetrative embrace, ${his} masochistic tendencies darken into sexual appreciation for ${his} life as a human factory. <span class="paraphilia gain">${He}'s descended into true self hatred.</span>`);
- slave.sexualFlaw = "self hating";
- slave.fetishStrength = 100;
- FSApproves = 1;
- } else if (slave.aphrodisiacs > 0 || slave.inflationType === "aphrodisiac") {
- if (slave.addict > 2) {
- r.push(`${His} aphrodisiac addiction makes ${him} dependent on sexual self harm. <span class="paraphilia gain">${He}'s descended into true self hatred.</span>`);
+ if (!getPersonalAttention(slave.ID, "torture") || App.EndWeek.saVars.slaveTortured === "none") { // exception handled in personalAttention
+ if ([Job.GLORYHOLE, Job.ARCADE].includes(slave.assignment)) {
+ r.push(`Condemned to serve as a public fuckhole, ${his} masochistic tendencies darken into sexual appreciation for ${his} life as a human sex toy. <span class="paraphilia gain">${He}'s descended into true self hatred.</span>`);
slave.sexualFlaw = "self hating";
slave.fetishStrength = 100;
FSApproves = 1;
+ } else if (slave.assignment === Job.DAIRY && V.dairyRestraintsSetting >= 2) {
+ r.push(`Strapped into a milking machine's tender, penetrative embrace, ${his} masochistic tendencies darken into sexual appreciation for ${his} life as a human factory. <span class="paraphilia gain">${He}'s descended into true self hatred.</span>`);
+ slave.sexualFlaw = "self hating";
+ slave.fetishStrength = 100;
+ FSApproves = 1;
+ } else if (slave.aphrodisiacs > 0 || slave.inflationType === "aphrodisiac") {
+ if (slave.addict > 2) {
+ r.push(`${His} aphrodisiac addiction makes ${him} dependent on sexual self harm. <span class="paraphilia gain">${He}'s descended into true self hatred.</span>`);
+ slave.sexualFlaw = "self hating";
+ slave.fetishStrength = 100;
+ FSApproves = 1;
+ }
}
}
}
diff --git a/src/endWeek/saLongTermPhysicalEffects.js b/src/endWeek/saLongTermPhysicalEffects.js
index d10561f0bb15f9f69098efbb85df3a61cdde45cf..6ca5a0e660dfbc807b06bd11f05d2416899366e7 100644
--- a/src/endWeek/saLongTermPhysicalEffects.js
+++ b/src/endWeek/saLongTermPhysicalEffects.js
@@ -762,9 +762,10 @@ App.SlaveAssignment.longTermPhysicalEffects = function saLongTermPhysicalEffects
** over 126 cm
** or over height (30% chance)
*/
- const heightDelta = slave.height - Height.mean(slave);
+ const nonsurgicalHeight = slave.height - 10 * slave.heightImplant;
+ const heightDelta = nonsurgicalHeight - slave.natural.height;
let shrinkage;
- if ((slave.height > 176) || (heightDelta > 5) || ((slave.NCSyouthening >= 6) && ((slave.height > 126) || (heightDelta > 0)) && (random(1, 100) < 30))) {
+ if ((nonsurgicalHeight > 176) || (heightDelta > 5) || ((slave.NCSyouthening >= 6) && ((nonsurgicalHeight > 126) || (heightDelta > 0)) && (random(1, 100) < 30))) {
if (heightDelta > 15) {
shrinkage = 5;
} else if (heightDelta > 5) {
diff --git a/src/endWeek/saPleaseYou.js b/src/endWeek/saPleaseYou.js
index 5f0f97fd7a37c59d1def007951724906c6921ac8..72c9367a4db3da7fd98b39ccbed6bf0ed499efdf 100644
--- a/src/endWeek/saPleaseYou.js
+++ b/src/endWeek/saPleaseYou.js
@@ -1609,8 +1609,8 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
*/
function familyBonus(slave) {
let multiplier = 0;
- let children;
const isFucktoy = (s) => [Job.CONCUBINE, Job.MASTERSUITE, Job.FUCKTOY].includes(s.assignment);
+ const fucktoys = V.slaves.filter(s => isFucktoy(s));
if (areRelated(V.PC, slave)) {
r.push(`Keeping your own ${relativeTerm(V.PC, slave)} as a personal ${canFuck ? `fucktoy` : `bedwarmer`} leaves quite a public impression.`);
@@ -1634,20 +1634,24 @@ App.SlaveAssignment.pleaseYou = function saPleaseYou(slave) {
}
}
- children = V.slaves.filter(s => (s.father === slave.ID || s.mother === slave.ID) && isFucktoy(s));
+ const children = fucktoys.filter(s => s.father === slave.ID || s.mother === slave.ID);
if (children.length > 1) {
- r.push(`Since you are also keeping ${his} daughters, ${toSentence(children.map(s => s.slaveName))}, as sexual servants, you often enjoy them all at once, which leaves quite a public impression.`);
+ const childPronouns = getPronouns(children[0]);
+ const groupNoun = children.every(s => getPronouns(s).daughter === childPronouns.daughter) ? asPlural(childPronouns.daughter) : "children"; // daughters, sons, or children, as appropriate
+ r.push(`Since you are also keeping ${his} ${groupNoun}, ${toSentence(children.map(s => s.slaveName))}, as sexual servants, you often enjoy them all at once, which leaves quite a public impression.`);
} else if (children.length > 0) {
const childPronouns = getPronouns(children[0]);
- r.push(`Since you are also keeping ${his} ${childPronouns.daughter} as a sexual servant, you often use them together, which leaves quite a public impression.`);
+ r.push(`Since you are also keeping ${his} ${childPronouns.daughter}, ${children[0].slaveName}, as a sexual servant, you often use them together, which leaves quite a public impression.`);
}
- children = V.slaves.filter((s) => (areSisters(slave, s) > 0) && isFucktoy(s));
- if (children.length > 1) {
- r.push(`Since you are also keeping ${his} sisters, ${toSentence(children.map(s => s.slaveName))}, as sexual servants, you often enjoy them all at once, which leaves quite a public impression.`);
- } else if (children.length > 0) {
- const childPronouns = getPronouns(children[0]);
- r.push(`Since you are also keeping ${his} ${childPronouns.sister} as a sexual servant, you often use them together, which leaves quite a public impression.`);
+ const siblings = fucktoys.filter(s => areSisters(slave, s) > 0);
+ if (siblings.length > 1) {
+ const sibPronouns = getPronouns(siblings[0]);
+ const groupNoun = siblings.every(s => getPronouns(s).sister === sibPronouns.sister) ? asPlural(sibPronouns.sister) : "siblings"; // sisters, brothers, or siblings, as appropriate
+ r.push(`Since you are also keeping ${his} ${groupNoun}, ${toSentence(siblings.map(s => s.slaveName))}, as sexual servants, you often enjoy them all at once, which leaves quite a public impression.`);
+ } else if (siblings.length > 0) {
+ const sibPronouns = getPronouns(siblings[0]);
+ r.push(`Since you are also keeping ${his} ${sibPronouns.sister}, ${siblings[0].slaveName}, as a sexual servant, you often use them together, which leaves quite a public impression.`);
}
return multiplier;
diff --git a/src/endWeek/saRules.js b/src/endWeek/saRules.js
index f98145dffa352f86d42f5981ce9c6d5edcf3ca31..a316945fd47777fc6ebea44032a1575d343c0123 100644
--- a/src/endWeek/saRules.js
+++ b/src/endWeek/saRules.js
@@ -1084,7 +1084,7 @@ App.SlaveAssignment.rules = function(slave) {
r.push(`is frigid and has little interest in getting off.`);
slave.need = 0;
} else if (App.EndWeek.saVars.flSex.has(slave.ID)) {
- r.push(`is routinely relieved of any built up tension by ${S.Attendant.slaveName} and ${his}`);
+ r.push(`is routinely relieved of any built up tension by ${S.Attendant.slaveName}'s`);
if (canPenetrate(slave) && S.Attendant.boobs >= 500) {
r.push(`luscious breasts.`);
actX(S.Attendant, "mammary", 14);
@@ -1113,7 +1113,7 @@ App.SlaveAssignment.rules = function(slave) {
slave.devotion += 1;
break;
case "Antebellum Revivalist":
- r.push(`The thick air of the greenhouse brings ${his} a deep, if temporary, class="mediumaquamarine">calm.</span>`);
+ r.push(`The thick air of the greenhouse brings ${his} a deep, if temporary, <span class="mediumaquamarine">calm.</span>`);
slave.trust += 2;
break;
case "Chattel Religionist":
@@ -1157,7 +1157,7 @@ App.SlaveAssignment.rules = function(slave) {
slave.devotion += 1;
break;
case "Antebellum Revivalist":
- r.push(`The thick air of the greenhouse brings ${his} a deeper, more serene, class="mediumaquamarine">calm.</span> now that ${his} mind is free from doubts about being your slave.`);
+ r.push(`The thick air of the greenhouse brings ${his} a deeper, more serene, <span class="mediumaquamarine">calm.</span> now that ${his} mind is free from doubts about being your slave.`);
slave.trust += 4;
break;
case "Chattel Religionist":
@@ -1296,7 +1296,7 @@ App.SlaveAssignment.rules = function(slave) {
r.push(`is frigid and has little interest in getting off.`);
slave.need = 0;
} else if (App.EndWeek.saVars.flSex.has(slave.ID)) {
- r.push(`is routinely relieved of any built up tension by ${S.Matron.slaveName} and ${his}`);
+ r.push(`is routinely relieved of any built up tension by ${S.Matron.slaveName}'s`);
if (canPenetrate(slave) && S.Matron.boobs >= 500) {
r.push(`luscious breasts.`);
actX(S.Matron, "mammary", 14);
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index a4da21e76b877ccf0d91a8126ad1912106f7dbc6..56215d47e1eceb86a9b832669f11d61ae68460df 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -581,7 +581,7 @@ App.SlaveAssignment.serveThePublic = function saServeThePublic(slave) {
if (children.length > 1) {
r += ` Since ${his} relatives, ${toSentence(children.map(s => s.slaveName))}, are public sluts too, ${he} earns extra attention.`;
} else if (children.length > 0) {
- r += ` Since ${his} relative, ${children[0].slaveName}, is a public slut too, ${he} earns extra attention.`;
+ r += ` Since ${his} ${relativeTerm(slave, children[0])}, ${children[0].slaveName}, is a public slut too, ${he} earns extra attention.`;
}
if (children.length > 0) {
if (arcology.FSEgyptianRevivalist > 20) {
diff --git a/src/endWeek/saSharedVariables.js b/src/endWeek/saSharedVariables.js
index d8bfd62d4f2de74da7a1813a828653449e27c31d..678e86acba73b09191e91d9a5e6018a76e01811e 100644
--- a/src/endWeek/saSharedVariables.js
+++ b/src/endWeek/saSharedVariables.js
@@ -62,6 +62,8 @@ App.EndWeek.SASharedVariables = class {
* @type {Array<number>}
*/
this.maxWhoreClass = [];
+ /** How was a slave tortured, if one was. */
+ this.slaveTortured = "none";
}
/** Compute shared subslave ratio (subslaves per ordinary slave) */
diff --git a/src/endWeek/saSocialEffects.js b/src/endWeek/saSocialEffects.js
index 545447a98257ce4b5a3330029ca9c345d0e45962..335d0121f5c14072d94efc207dc66f1c5d44fff4 100644
--- a/src/endWeek/saSocialEffects.js
+++ b/src/endWeek/saSocialEffects.js
@@ -625,12 +625,16 @@ App.SlaveAssignment.saSocialEffects = function(slave) {
`Society <span class="red">is disgusted</span> by ${his} feline nature.`));
}
if (slave.faceImplant <= 5 && slave.race === slave.origRace) {
- t.push(new SocialEffect("Body Purist", 1, `Unaltered`,
+ t.push(new SocialEffect("Body Purist", 1, `Unaltered appearance`,
`Society <span class="green">approves</span> of ${his} natural, untouched appearance, advancing the fashion for unaltered slaves.`));
} else {
- t.push(new SocialEffect("Body Purist", -2, `Surgically altered`,
+ t.push(new SocialEffect("Body Purist", -2, `Surgically altered appearance`,
`Society <span class="red">disapproves</span> of ${slave.slaveName}'s surgical beautification; this holds back acceptance of the idea that a natural slave is a beautiful slave.`));
}
+ if (slave.heightImplant < -1 || slave.heightImplant > 1 || (slave.hipsImplant > 0 && slave.hips > 2)) {
+ t.push(new SocialEffect("Body Purist", -2, `Inhuman proportions`,
+ `Society <span class="red">is disgusted</span> of ${his} clearly unnatural, surgically-altered proportions.`));
+ }
if (slave.fuckdoll === 0) {
if (slave.vagina === 0 && slave.anus === 0 && slave.counter.vaginal === 0 && slave.counter.anal === 0) {
t.push(new SocialEffect("Body Purist", 3, `Total virgin`,
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 319d99a4d65cc7f98db816dd719c127192926cf0..89bc93980aab1e3160c9025647f91c71a5806d27 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -665,7 +665,7 @@ App.SlaveAssignment.whore = function(slave) {
r += ` Since ${his} relatives, ${toSentence(children.map(s => s.slaveName))}, are selling themselves too, ${he} earns extra ¤ by working with them.`;
} else if (children.length > 0) {
const relativePronouns = getPronouns(children[0]);
- r += ` Since ${his} relative, ${children[0].slaveName}, is selling ${relativePronouns.objectReflexive} too, ${he} earns extra ¤ by working with ${relativePronouns.object}.`;
+ r += ` Since ${his} ${relativeTerm(slave, children[0])}, ${children[0].slaveName}, is selling ${relativePronouns.objectReflexive} too, ${he} earns extra ¤ by working with ${relativePronouns.object}.`;
}
if (children.length > 0) {
if (arcology.FSEgyptianRevivalist > 20) {
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index 54a996fc5d422123134e15195e45cd12ef9d3ee1..59ef9bae4769ce96b6da53b9030e2d5b99bc4f75 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -160,6 +160,25 @@ App.EndWeek.slaveAssignmentReport = function() {
if (slave.assignment === Job.AGENT || slave.assignment === Job.AGENTPARTNER) {
App.SlaveAssignment.agent(slave);
}
+
+ // Set up torturing
+ if (getPersonalAttention(slave.ID, "torture")) {
+ if (!onBedRest(V.PC, true)) {
+ if (slave.fetish === Fetish.MINDBROKEN) {
+ App.EndWeek.saVars.slaveTortured = "broken";
+ } else if (!canTalk(slave)) {
+ App.EndWeek.saVars.slaveTortured = "mute";
+ } else if (slave.sexualFlaw === "self hating") {
+ App.EndWeek.saVars.slaveTortured = "self hating";
+ } else if (slave.fetish === Fetish.MASOCHIST) {
+ App.EndWeek.saVars.slaveTortured = "fetish";
+ } else if (slave.devotion + slave.trust > 195) {
+ App.EndWeek.saVars.slaveTortured = "love";
+ } else {
+ App.EndWeek.saVars.slaveTortured = "normal";
+ }
+ }
+ }
} // for (const slave of V.slaves)
// Optimized sperm slaves cumming up the spa pool.
diff --git a/src/events/Elites/eliteTakeOver.js b/src/events/Elites/eliteTakeOver.js
index 1de93f3e08bc108f9e2623b0eca5fcb44635b82f..616d0c05641dcffc4cf1b0d2e3d636b4f0172865 100644
--- a/src/events/Elites/eliteTakeOver.js
+++ b/src/events/Elites/eliteTakeOver.js
@@ -58,7 +58,7 @@ App.Events.eliteTakeOver = class eliteTakeOver extends App.Events.BaseEvent {
App.Events.addNode(container, r, "div");
r = [];
if (S.Bodyguard) {
- r.push(`A sharp pain and a rush of adrenaline drags you back to your senses. Sneaking a peak, you witness ${S.Bodyguard.slaveName} valiantly trying to protect you, despite`);
+ r.push(`A sharp pain and a rush of adrenaline drags you back to your senses. Sneaking a peek, you witness ${S.Bodyguard.slaveName} valiantly trying to protect you, despite`);
if (hasAnyProstheticLimbs(S.Bodyguard)) {
r.push(`${his} cybernetics being locked down.`);
} else {
diff --git a/src/events/Elites/pInsemination.js b/src/events/Elites/pInsemination.js
index bfaa4eb1a8d1336c0c86a264f779476ff1997f8c..2c134734773b16a47e93e1dbf0b5c5eafb15ea71 100644
--- a/src/events/Elites/pInsemination.js
+++ b/src/events/Elites/pInsemination.js
@@ -30,7 +30,7 @@ App.Events.PInsemination = class PInsemination extends App.Events.BaseEvent {
case "quick":
if (V.PC.counter.quick === 0) {
r.push(`You arrive at the apartment of the very wealthy fuel baron who is to sire your child. He is eagerly waiting for you and quickly hurries you inside. He wastes no time, practically ripping your clothes off and forcing you over the edge of his bed. He hastily mounts you and roughly fucks your cunt — until he quickly finishes, that is, leaving you unsatisfied as he shoves you out the door, clothes in`);
- if (V.PC.dick !== -1) {
+ if (V.PC.dick !== 0) {
r.push(`one hand and raging boner in the other.`);
} else {
r.push(`hand.`);
diff --git a/src/events/PE/peHeadgirlConcubine.js b/src/events/PE/peHeadgirlConcubine.js
index 7083da4d2ab02b10da214ebc73b011e295c13f9d..2953641ca85c86356db351f3b234cb6238d72749 100644
--- a/src/events/PE/peHeadgirlConcubine.js
+++ b/src/events/PE/peHeadgirlConcubine.js
@@ -97,7 +97,7 @@ App.Events.PEHeadgirlConcubine = class PEHeadgirlConcubine extends App.Events.Ba
r.push(`increasingly large baby bump and motherly waddle`);
} else if (S.HeadGirl.fetish === "cumslut" && V.PC.balls >= 20) {
r.push(`over-burdened scrotum in motion as you walk`);
- } else if (S.HeadGirl.attrXX > 65 && S.HeadGirl.attrXY > 65 && V.PC.dick !== -1 && (V.PC.boobs >= 650 || V.PC.title === 0 || V.PC.vagina !== -1)) {
+ } else if (S.HeadGirl.attrXX > 65 && S.HeadGirl.attrXY > 65 && V.PC.dick !== 0 && (V.PC.boobs >= 650 || V.PC.title === 0 || V.PC.vagina !== -1)) {
r.push(`dangling penis`);
if (V.PC.boobs >= 650) {
r.push(`and bouncing boobs`);
diff --git a/src/events/RE/REBusyBrothel.js b/src/events/RE/REBusyBrothel.js
index 7c67c8de9318ef77bf65b5cf027b17443a7f6599..326a1891aa016193dd7e7f36052655cd95d463c0 100644
--- a/src/events/RE/REBusyBrothel.js
+++ b/src/events/RE/REBusyBrothel.js
@@ -19,7 +19,7 @@ App.Events.REBusyBrothel = class REBusyBrothel extends App.Events.BaseEvent {
function rest() {
cashX(-1000, "event");
- for (const slave of V.slaves.filter(s => s.assignment === Job.Brothel)) {
+ for (const slave of V.slaves.filter(s => s.assignment === Job.BROTHEL)) {
slave.devotion += 4;
slave.health.tired = 0;
}
@@ -27,7 +27,7 @@ App.Events.REBusyBrothel = class REBusyBrothel extends App.Events.BaseEvent {
}
function lessons() {
cashX(-2000, "event");
- for (const slave of V.slaves.filter(s => s.assignment === Job.Brothel)) {
+ for (const slave of V.slaves.filter(s => s.assignment === Job.BROTHEL)) {
slave.lastWeeksCashIncome += 250;
slave.lifetimeCashIncome += 250;
if (slave.skill.whoring < 100) {
@@ -41,7 +41,7 @@ App.Events.REBusyBrothel = class REBusyBrothel extends App.Events.BaseEvent {
function promote() {
repX(1000, "event");
cashX(-2000, "event");
- for (const slave of V.slaves.filter(s => s.assignment === Job.Brothel)) {
+ for (const slave of V.slaves.filter(s => s.assignment === Job.BROTHEL)) {
healthDamage(slave, 10);
if (canDoVaginal(slave)) {
seX(slave, "vaginal", "public", "penetrative", 5);
diff --git a/src/events/RE/reBoomerang.js b/src/events/RE/reBoomerang.js
index 2fb0b66c4164485542a71387ffbb2f6ae2f14b6b..52d9d01eb17ba431e8aa785491bb99bd18f56f4f 100644
--- a/src/events/RE/reBoomerang.js
+++ b/src/events/RE/reBoomerang.js
@@ -155,7 +155,7 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
slave.lactation = 2;
slave.lactationDuration = 2;
slave.lactationAdaptation = 100;
- slave.boobs = Math.clamp(slave.boobs + 2000 + 50 * random(-20, 20), 0, 10000);
+ slave.boobs = Math.clamp(slave.boobs + 2000 + 50 * random(-20, 20), 0, 50000);
slave.boobShape = "saggy";
if (V.seePreg !== 0) {
if (slave.ovaries) {
@@ -168,9 +168,9 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
}
}
if (slave.balls) {
- slave.balls = Math.clamp(slave.balls + random(1, 2), 0, 10);
+ slave.balls = Math.clamp(slave.balls + random(1, 2), 0, 125);
if (slave.dick) {
- slave.dick = Math.clamp(slave.dick + random(1, 2), 0, 10);
+ slave.dick = Math.clamp(slave.dick + random(1, 2), 0, 30);
}
}
slave.intelligence = Math.clamp(slave.intelligence - 50, -100, 100);
@@ -311,7 +311,7 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
r.push(Spoken(slave, `"Naked, so everyone could use my ass. Please, I don't want to be an entire arcology's bitch."`));
slave.balls = 0;
if (slave.dick) {
- slave.dick = Math.clamp(slave.dick - random(1, 2), 0, 10);
+ slave.dick = Math.clamp(slave.dick - random(1, 2), 0, 30);
}
break;
case "gender fundamentalist arcology":
@@ -365,7 +365,7 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
slave.nipples = "flat";
}
slave.buttImplant = random(2, 4);
- slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 10);
+ slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 20);
slave.buttImplantType = "normal";
slave.lipsImplant = 10 * random(1, 3);
slave.lips = Math.clamp(slave.lips + slave.lipsImplant, 0, 100);
@@ -374,11 +374,11 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
r.push(Spoken(slave, `"It was horrible."`));
r.push(`You sold ${him} to an Asset Expansionist arcology; it's nothing short of incredible that ${he} managed to get back here. ${He} must have sold and traded ${himself} without hesitation.`);
if (slave.hips > 0) {
- slave.butt = Math.clamp(slave.butt + random(2, 4), 0, 10);
+ slave.butt = Math.clamp(slave.butt + random(2, 4), 0, 20);
r.push(Spoken(slave, `"They said, since I've got broad hips, I'd be a 'buttslave'."`));
r.push(`The meaning is obvious; ${his} ass has grown unbelievably.`);
} else {
- slave.boobs = Math.clamp(slave.boobs + 50 * random(20, 40), 0, 10000);
+ slave.boobs = Math.clamp(slave.boobs + 50 * random(20, 40), 0, 50000);
r.push(Spoken(slave, `"They said they'd start with my boobs."`));
r.push(`It's true; they've grown unbelievably.`);
}
@@ -465,7 +465,7 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
slave.nipples = "flat";
}
slave.buttImplant = random(2, 4);
- slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 10);
+ slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 20);
slave.buttImplantType = "normal";
slave.lipsImplant = 10 * random(1, 3);
slave.lips = Math.clamp(slave.lips + slave.lipsImplant, 0, 100);
@@ -503,7 +503,7 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
slave.nipples = "flat";
}
slave.buttImplant = random(2, 4);
- slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 10);
+ slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 20);
slave.buttImplantType = "normal";
slave.lipsImplant = 10 * random(1, 3);
slave.lips = Math.clamp(slave.lips + slave.lipsImplant, 0, 100);
@@ -528,7 +528,7 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
slave.buttImplantType = "none";
slave.lips -= slave.lipsImplant;
slave.lipsImplant = 0;
- slave.boobs = Math.clamp(slave.boobs + 50 * random(20, 40), 0, 10000);
+ slave.boobs = Math.clamp(slave.boobs + 50 * random(20, 40), 0, 50000);
break;
case "D startled the witch":
r.push(`You sold ${him} to a buyer interested in ${him} because of ${his} sharp teeth, among other things.`);
@@ -544,14 +544,14 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
r.push(`${he} whispers. Then ${he} gags, dry heaves, and vomits slightly. ${He} wipes ${his} mouth with the back of ${his} hand, staring upward vacantly.`);
r.push(Spoken(slave, `"Horrible."`));
slave.behavioralFlaw = "odd";
- slave.weight = Math.clamp(slave.weight - 75, -100, 100);
+ slave.weight = Math.clamp(slave.weight - 75, -100, 200);
break;
case "slimming trainer":
r.push(Spoken(slave, `"It's horrible."`));
r.push(`You sold ${him} to a trainer who specializes in slimming slaves down, and if anything, they seem to have gone too far. ${He}'s emaciated.`);
r.push(Spoken(slave, `"I'm h-hungry all the time, and when I'm not p-perfect, I d-don't get to eat at all."`));
- slave.boobs = Math.clamp(slave.boobs - 50 * random(5, 10), 0, 10000);
- slave.butt = Math.clamp(slave.butt - random(1, 2), 0, 10);
+ slave.boobs = Math.clamp(slave.boobs - 50 * random(5, 10), 0, 50000);
+ slave.butt = Math.clamp(slave.butt - random(1, 2), 0, 20);
slave.waist = Math.clamp(slave.waist - random(20, 50), -100, 100);
slave.weight = -100;
break;
@@ -575,8 +575,8 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
r.push(`You sold ${him} to a trainer who specializes in fattening slaves up, and if anything, they seem to have gone too far. ${He}'s bloated, and ${his} stomach is distended.`);
r.push(Spoken(slave, `"T-they beat me if I ever stop eating, and they feed my butt too. I'm gross and ugly."`));
}
- slave.boobs = Math.clamp(slave.boobs + 50 * random(5, 10), 0, 10000);
- slave.butt = Math.clamp(slave.butt + random(1, 2), 0, 10);
+ slave.boobs = Math.clamp(slave.boobs + 50 * random(5, 10), 0, 50000);
+ slave.butt = Math.clamp(slave.butt + random(1, 2), 0, 20);
slave.waist = Math.clamp(slave.waist - random(20, 50), -100, 100);
slave.weight = Math.clamp(slave.weight + random(50, 100), -100, 200);
break;
@@ -591,14 +591,14 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
slave.boobShape = "spherical";
}
slave.buttImplant = random(1, 2);
- slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 10);
+ slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 20);
slave.buttImplantType = "normal";
slave.lipsImplant = 10 * random(1, 2);
slave.lips = Math.clamp(slave.lips + slave.lipsImplant, 0, 100);
slave.waist = Math.clamp(slave.waist + random(20, 50), -100, 100);
slave.balls = 0;
slave.scrotum = 0;
- slave.dick = Math.clamp(slave.dick - random(1, 2), 0, 10);
+ slave.dick = Math.clamp(slave.dick - random(1, 2), 0, 30);
slave.behavioralFlaw = "hates men";
slave.sexualFlaw = "hates anal";
if (slave.faceShape === "masculine") {
@@ -613,7 +613,7 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
slave.boobs += slave.boobsImplant;
slave.boobsImplantType = "normal";
slave.buttImplant = random(1, 2);
- slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 10);
+ slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 20);
slave.buttImplantType = "normal";
slave.lipsImplant = 10 * random(1, 2);
slave.lips = Math.clamp(slave.lips + slave.lipsImplant, 0, 100);
@@ -695,8 +695,8 @@ App.Events.REBoomerang = class REBoomerang extends App.Events.BaseEvent {
}
r.push(`allowing ${his} grotesquely sagging belly to hang free.`);
r.push(Spoken(slave, `"I'm gross. I'm fat, saggy, and gross."`));
- slave.boobs = Math.clamp(slave.boobs + 50 * random(5, 10), 0, 10000);
- slave.butt = Math.clamp(slave.butt + random(1, 2), 0, 10);
+ slave.boobs = Math.clamp(slave.boobs + 50 * random(5, 10), 0, 50000);
+ slave.butt = Math.clamp(slave.butt + random(1, 2), 0, 20);
slave.waist = Math.clamp(slave.waist - random(20, 50), -100, 100);
slave.weight = Math.clamp(slave.weight + random(50, 100), -100, 200);
slave.bellySag = 80;
diff --git a/src/events/RE/reBusyMasterSuite.js b/src/events/RE/reBusyMasterSuite.js
index 11f7ccc633a8ede9d721ec9fd0ea49a59003c951..87062e381e3f16c27c592c73eb340b2c1a0f360d 100644
--- a/src/events/RE/reBusyMasterSuite.js
+++ b/src/events/RE/reBusyMasterSuite.js
@@ -106,7 +106,7 @@ App.Events.REBusyMasterSuite = class REBusyMasterSuite extends App.Events.BaseEv
if (nextSlave.dick > 3) {
t += "painfully big";
} else {
- t = "hard";
+ t += "hard";
}
t += " dick";
} else {
diff --git a/src/events/RE/reDrunkenTourist.js b/src/events/RE/reDrunkenTourist.js
index a9de9618eb847f7bc62cee6920754e8824e15c14..3f41e2210165c4a2758bf70f292e63884b4219e2 100644
--- a/src/events/RE/reDrunkenTourist.js
+++ b/src/events/RE/reDrunkenTourist.js
@@ -46,7 +46,7 @@ App.Events.REDrunkenTourist = class REDrunkenTourist extends App.Events.BaseEven
App.Events.addParagraph(frag, [
"You escort the drunken woman back to her hotel, and she asks you how long you've lived in the arcology.",
"When you tell her you own the arcology, she thanks you profusely for taking the time to lead her back to her suite and presses herself up against you, trying her best to be sexy despite her impaired state.",
- "She promises to spread a good word about you, and lets you know that you can come up to her room any time."
+ `She promises to <span class="rep inc">spread a good word about you,</span> and lets you know that you can come up to her room any time.`
]);
repX(500, "event");
return frag;
diff --git a/src/events/RE/reMalefactor.js b/src/events/RE/reMalefactor.js
index 25ddae1dc9ca869a5cc802904d7b5cd55c729b7a..46866b331714d8833acaf11b52dffbdac28d8d9a 100644
--- a/src/events/RE/reMalefactor.js
+++ b/src/events/RE/reMalefactor.js
@@ -130,8 +130,7 @@ App.Events.REMalefactor = class REMalefactor extends App.Events.BaseEvent {
const cost = slaveCost(slave) - 1000;
App.Events.addParagraph(node, r);
- App.UI.DOM.appendNewElement("p", node, `Applying enslavement as punishment will cost ${cashFormat(contractCost)}. Doing so and then selling ${him} immediately will bring in approximately ${cashFormat(cost)}.`, "note");
-
+ App.UI.DOM.appendNewElement("p", node, `Applying enslavement as punishment will cost ${cashFormat(contractCost)}. Doing so and then selling ${him} immediately will bring in approximately ${cashFormat(cost)}.`, ["note"]);
node.append(App.Desc.longSlave(slave, {market: "generic"}));
const choices = [];
@@ -176,7 +175,6 @@ App.Events.REMalefactor = class REMalefactor extends App.Events.BaseEvent {
function enslave() {
const frag = document.createDocumentFragment();
-
r = [];
cashX(forceNeg(contractCost), "slaveTransfer", slave);
@@ -211,7 +209,6 @@ App.Events.REMalefactor = class REMalefactor extends App.Events.BaseEvent {
function stocks() {
const frag = document.createDocumentFragment();
-
r = [];
healthDamage(slave, 10);
@@ -272,7 +269,6 @@ App.Events.REMalefactor = class REMalefactor extends App.Events.BaseEvent {
function arcade() {
const frag = document.createDocumentFragment();
-
r = [];
r.push(assignJob(slave, "be confined in the arcade"));
@@ -481,6 +477,9 @@ App.Events.REMalefactor = class REMalefactor extends App.Events.BaseEvent {
slave.devotion = 25;
slave.trust = 25;
+ V.RECheckInIDs.push({ID: slave.ID, type: "adoptFollowUp"});
+ slave.origin = "$He was an orphan forced to live and steal on the streets until you adopted $him.";
+
cashX(forceNeg(contractCost), "slaveTransfer", slave);
r.push(`You sit down and talk to the exhausted ${girl}, handing ${him} a contract cleverly altered to resemble adoption papers. Once ${he} comprehends what ${he} is looking at, ${he} eagerly signs it. Only once ${he} has reached the penthouse and been introduced to the slave life does ${he} realize ${he} willingly signed away ${his} freedom. Though ${he} can't complain. A warm cot and plenty of food await, which to ${him} is a huge improvement over a slow death on the streets. The public`);
if (V.arcologies[0].FSPaternalist !== "unset") {
@@ -536,6 +535,7 @@ App.Events.REMalefactor = class REMalefactor extends App.Events.BaseEvent {
function flog() {
const frag = document.createDocumentFragment();
r = [];
+
switch (malefactor) {
case "addict":
r.push(`Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The twitching, begging malefactor is stripped and flogged on the promenade before being escorted bleeding, and still twitching from withdrawal, out of the arcology. The public <span class="reputation inc">approves of this harshness.</span>`);
@@ -571,6 +571,7 @@ App.Events.REMalefactor = class REMalefactor extends App.Events.BaseEvent {
function ownerFlog() {
const frag = document.createDocumentFragment();
r = [];
+
r.push(`An example must be made. Slaveownership is the cornerstone of the society you're building in your arcology, and this ${woman} attempted to undermine it. ${He} is stripped and the slaveowner whose property ${he} tried to free is handed the leathern instrument. It seems the escapee was a favorite he does not wish to mangle, so he flogs the criminal mercilessly instead. ${He} is flung out of the arcology, nearly dead. The public <span class="reputation inc">approves of this harshness,</span> and small slaveholders are <span class="green">encouraged to do business with your arcology</span> after word of the incident gets around.`);
repX(500, "event", slave);
V.arcologies[0].prosperity += 10;
@@ -581,6 +582,7 @@ App.Events.REMalefactor = class REMalefactor extends App.Events.BaseEvent {
function sell() {
const frag = document.createDocumentFragment();
r = [];
+
cashX(cost, "slaveTransfer");
if (V.policies.cash4Babies === 1 && malefactor === "anchorBaby") {
cashX(random(20, 30), "slaveTransfer");
@@ -709,7 +711,7 @@ App.Events.REMalefactor = class REMalefactor extends App.Events.BaseEvent {
break;
case "orphanloli":
slave = GenerateNewSlave(null, {minAge: V.minimumSlaveAge, maxAge: 12, disableDisability: 1});
- slave.origin = "$He was an orphan forced to live and steal on the streets until you adopted $him.";
+ slave.origin = "You sentenced $him to enslavement as a punishment for suspected escapism.";
slave.career = "an orphan";
slave.devotion = random(-15, 0);
slave.trust = random(-75, -60);
diff --git a/src/events/RE/reNickname.js b/src/events/RE/reNickname.js
index 9dbccf69a815f00f68c23cd22a13a40a119bec59..71799366ead4e1237b75c552f3ab117fac7035ad 100644
--- a/src/events/RE/reNickname.js
+++ b/src/events/RE/reNickname.js
@@ -1171,10 +1171,10 @@ App.Events.RENickname = class RENickname extends App.Events.BaseEvent {
applyDesc: `knows that you've noticed all ${his} hard work. Getting fucked day in and day out is harder than digging ditches, and ${he}'s a veteran ditchdigger.`,
notApplyDesc: `understands that even though ${he}'s been fucked so much, ${he}'s still just meat; ${he} isn't special.`,
});
- if (slave.energy > 95) {
+ if (slave.intelligence + slave.intelligenceImplant > 50) {
nickMap.set("smartveteran", {
nicknameArray: ["Cumdump Library", "Cumbucket Dictionary", "Dr. Whore-Pussy", "Professor Loosepussy", "Geeky Cumguzzler", "Nerdy Cumdump", "Cumguzzling Dweeb", "Public Fanny-Book", "Scholarly Cumhole", "Straight-A Cumbucket", "Veteran Sex Disciple", "Cum Beaker", "Lascivious Sage"],
- situationDesc: `has been with you for a while, and ${he}'s gotten fucked hundreds of times over several weeks. ${He} treats every sexual encounter seems like an academic challenge. By researching and experimenting with the anatomy of ${his} body, ${he} has greater understanding of satisfying the sexual cravings of others. Other slaves tease ${him} for ${his} unusually academic approcach to sexual servitude.`,
+ situationDesc: `has been with you for a while, and ${he}'s gotten fucked hundreds of times over several weeks. ${He} treats every sexual encounter seems like an academic challenge. By researching and experimenting with the anatomy of ${his} body, ${he} has greater understanding of satisfying the sexual cravings of others. Other slaves tease ${him} for ${his} unusually academic approach to sexual servitude.`,
applyDesc: `is delighted that you've noticed ${his} hard work in learning about the pleasures of the flesh. ${He} recognizes that the best way to expand ${his} knowledge is through experience, ${his} mind and body are the perfect apparatus to obtain plenty of sexual experience.`,
notApplyDesc: `understands that despite ${his} intelligence and sexual experience, ${he} isn't special.`,
});
diff --git a/src/events/RECI/adoptFollowUp.js b/src/events/RECI/adoptFollowUp.js
new file mode 100644
index 0000000000000000000000000000000000000000..a4fa9b9fc477161927bb0b67acf927264df2e281
--- /dev/null
+++ b/src/events/RECI/adoptFollowUp.js
@@ -0,0 +1,86 @@
+App.Events.RECIAdoptFollowUp = class RECIAdoptFollowUp extends App.Events.BaseEvent {
+ eventPrerequisites() {
+ return []; // always valid if sufficient actors can be cast successfully
+ }
+
+ actorPrerequisites() { // single event slave
+ return [
+ [
+ s => s.fetish !== Fetish.MINDBROKEN,
+ s => this.validSlave(s),
+ s => s.devotion >= 50,
+ s => s.trust >= 50,
+ ]
+ ];
+ };
+
+ validSlave(slave) {
+ return V.RECheckInIDs.some((a) => (a.ID === slave.ID && a.type === "adoptFollowUp"));
+ }
+
+ get weight() { return 5; }; // given the very restrictive qualifiers, give it a bit more weight.
+
+ execute(node) {
+ /** @type {Array<App.Entity.SlaveState>} */
+ const [eventSlave] = this.actors.map(a => getSlave(a));
+ const { title: Master } = getEnunciation(eventSlave);
+ const { He, he, His, his, him } = getPronouns(eventSlave);
+ V.RECheckInIDs.deleteWith((s) => s.ID === eventSlave.ID && s.type === "adoptFollowUp");
+ App.Events.drawEventArt(node, eventSlave);
+
+ App.Events.addNode(node, [
+ `While in your office, you receive an unscheduled visit from ${eventSlave.slaveName}.`,
+ `${He} seems a bit nervous and before you can ask ${him} what ${he} wants,`,
+ `${he} suddenly ${canTalk(eventSlave) ? `blurts out`: `attempts to convey via sign language`} a speech that seems half-prepared and half-rambling.`,
+ ], "p");
+
+ if (canTalk(eventSlave)) {
+ App.Events.addNode(node, [`"${Spoken(eventSlave,
+ `Thank you for adopting me, ${Master}!
+ I'm so grateful that you took me in!
+ Everything was bad before, I could barely get food and didn't know where I was or what to do.
+ You have taught me so much!
+ At first I thought doing the things you wanted was horrible and disgusting, but you gave me such a good life!
+ I don't care if I have to get fucked all the time, it's fun anyway!
+ I love being with you ${Master}, you made my life so much better!
+ You're... you're everything to me!`
+ )}"`], "p");
+ } else {
+ App.Events.addNode(node, [`Profusely thanking you for adopting ${him} and how ${his} life has improved since then, despite a rocky start.`], "p");
+ }
+
+ App.Events.addResponses(node, [
+ new App.Events.Result(`Reward ${him} with a loving fuck`, love, (eventSlave.anus === 0 || eventSlave.vagina === 0) ? App.UI.DOM.makeElement("span", `Virginity will be lost`, ["yellow"]) : ``),
+ new App.Events.Result(`This slave has forgotten ${his} place`, rape, (eventSlave.anus === 0 || eventSlave.vagina === 0) ? App.UI.DOM.makeElement("span", `Virginity will be lost`, ["yellow"]) : ``),
+ ]);
+
+ function love() {
+ SimpleSexAct.Player(eventSlave);
+ eventSlave.devotion += 5;
+ eventSlave.trust += 5;
+ return App.Events.addNode(node, [
+ VCheck.Simple(eventSlave),
+ `Wordlessly, you move towards ${eventSlave.slaveName}, who flinches slightly at your sudden presence.`,
+ `You grip ${his} hips, pulling ${him} in close.`,
+ `${His} face is beet red, and you can feel ${his} heart beating against your chest.`,
+ `You kiss ${him} deeply before pressing ${his} against a nearby wall and lifting ${him} so you can hilt your ${V.PC.dick > 0 ? 'cock' : 'strap-on'} deep inside.`,
+ `You make <span class="trust inc">slow and gentle love</span> to ${him}, savoring every moment.`,
+ `When you finally cum inside and gently lower ${him} back down onto the floor, ${he} hugs you and ${canTalk(eventSlave) ? `whispers,`: `stares`}`,
+ `"<span class="devotion inc">${canTalk(eventSlave) ? Spoken(eventSlave, `I love you, ${Master}.`) : `into your eyes lovingly.`}</span>"`,
+ ]);
+ };
+
+ function rape() {
+ SimpleSexAct.Player(eventSlave);
+ eventSlave.devotion -= 5;
+ eventSlave.trust -= 5;
+ return App.Events.addNode(node, [
+ VCheck.Simple(eventSlave),
+ `You abruptly stand up from your desk and explain to ${eventSlave.slaveName} that you didn't adopt ${him}... You enslaved ${him}, and that ${he} needs to learn ${his} place and the difference.`,
+ `You grab ${him} and <span class="trust dec">roughly throw</span> ${him} onto the nearby couch before grabbing ${him} by the neck and shoving ${his} head into the cushions.`,
+ `You penetrate ${him} hard, without warning, and proceed to rape ${him} like ${he}'s never been raped before.`,
+ `<span class="devotion dec">By the time you are done,</span> ${he} is a whimpering, sobbing mess with a gaped out hole.`,
+ ]);
+ };
+ };
+};
diff --git a/src/events/RECI/butthole.js b/src/events/RECI/butthole.js
index 75e80fdd25cd7502b8ed5da5c6fcf35455a60bd8..418dbbded824b017eae28eae433815a192840770 100644
--- a/src/events/RECI/butthole.js
+++ b/src/events/RECI/butthole.js
@@ -7,7 +7,7 @@ App.Events.RECIButthole = class RECIButthole extends App.Events.BaseEvent {
return [
[ // single event slave
s => s.fetish !== Fetish.MINDBROKEN,
- s => V.REButtholeCheckinIDs.includes(s.ID),
+ s => this.validSlave(s),
s => s.assignment !== Job.QUARTER,
s => s.devotion > 50,
s => s.trust > 50,
@@ -21,6 +21,10 @@ App.Events.RECIButthole = class RECIButthole extends App.Events.BaseEvent {
];
}
+ validSlave(slave) {
+ return V.RECheckInIDs.some((a) => (a.ID === slave.ID && a.type === "butthole"));
+ }
+
execute(node) {
let [eventSlave] = this.actors.map(a => getSlave(a));
const {
@@ -35,7 +39,7 @@ App.Events.RECIButthole = class RECIButthole extends App.Events.BaseEvent {
? "dark brown"
: "brown";
- V.REButtholeCheckinIDs.deleteWith((s) => s === eventSlave.ID);
+ V.RECheckInIDs.deleteWith((s) => s.ID === eventSlave.ID && s.type === "butthole");
let artDiv = document.createElement("div"); // named container so we can replace it later
App.Events.drawEventArt(artDiv, eventSlave, "no clothing");
diff --git a/src/events/RECI/feminization.js b/src/events/RECI/feminization.js
index 354db278cf88d92de3df8704b883506619305c4c..96b987a66a7d67c86d8b15a146fa8437f1290816 100644
--- a/src/events/RECI/feminization.js
+++ b/src/events/RECI/feminization.js
@@ -7,7 +7,7 @@ App.Events.RECIFeminization = class RECIFeminization extends App.Events.BaseEven
return [
[ // single event slave
s => s.fetish !== Fetish.MINDBROKEN,
- s => V.REFeminizationCheckinIDs.includes(s.ID),
+ s => this.validSlave(s),
s => s.assignment !== Job.QUARTER,
s => s.devotion >= 10,
s => s.dick > 0,
@@ -29,6 +29,10 @@ App.Events.RECIFeminization = class RECIFeminization extends App.Events.BaseEven
];
}
+ validSlave(slave) {
+ return V.RECheckInIDs.some((a) => (a.ID === slave.ID && a.type === "feminization"));
+ }
+
execute(node) {
const [eventSlave] = this.actors.map(a => getSlave(a));
const {He, he, His, his, him, himself, girl} = getPronouns(eventSlave);
@@ -36,7 +40,7 @@ App.Events.RECIFeminization = class RECIFeminization extends App.Events.BaseEven
const desc = SlaveTitle(eventSlave);
const legs = hasBothLegs(eventSlave) ? "legs" : "leg";
- V.REFeminizationCheckinIDs.deleteWith((s) => s === eventSlave.ID);
+ V.RECheckInIDs.deleteWith((s) => s.ID === eventSlave.ID && s.type === "feminization");
let artDiv = document.createElement("div"); // named container so we can replace it later
App.Events.drawEventArt(artDiv, eventSlave, "no clothing");
diff --git a/src/events/RECI/futa.js b/src/events/RECI/futa.js
index f7b3c8251ad68114d7c514605c51d25c02785c91..ce8018057f5c423b62a3f99669f59e4cc5b29aa9 100644
--- a/src/events/RECI/futa.js
+++ b/src/events/RECI/futa.js
@@ -7,7 +7,7 @@ App.Events.RECIFuta = class RECIFuta extends App.Events.BaseEvent {
return [
[ // single event slave
s => s.fetish !== Fetish.MINDBROKEN,
- s => V.REFutaSisterCheckinIDs.includes(s.ID),
+ s => this.validSlave(s),
s => s.assignment !== Job.QUARTER,
s => s.trust >= 10,
s => s.dick > 0,
@@ -22,6 +22,10 @@ App.Events.RECIFuta = class RECIFuta extends App.Events.BaseEvent {
];
}
+ validSlave(slave) {
+ return V.RECheckInIDs.some((a) => (a.ID === slave.ID && a.type === "futa"));
+ }
+
execute(node) {
const [eventSlave] = this.actors.map(a => getSlave(a));
const {
@@ -30,7 +34,7 @@ App.Events.RECIFuta = class RECIFuta extends App.Events.BaseEvent {
const {title: Master, say: say} = getEnunciation(eventSlave);
const belly = bellyAdjective(eventSlave);
- V.REFutaSisterCheckinIDs.deleteWith((s) => s === eventSlave.ID);
+ V.RECheckInIDs.deleteWith((s) => s.ID === eventSlave.ID && s.type === "futa");
App.Events.drawEventArt(node, eventSlave, "no clothing");
diff --git a/src/events/RECI/milf.js b/src/events/RECI/milf.js
index 25d1dd749b600ec4ed0cb05de881e593827ae234..e29a58a27e5fdab2adc721dde85ee0241cf51bbf 100644
--- a/src/events/RECI/milf.js
+++ b/src/events/RECI/milf.js
@@ -7,7 +7,7 @@ App.Events.RECIMilf = class RECIMilf extends App.Events.BaseEvent {
return [
[ // single event slave
s => s.fetish !== Fetish.MINDBROKEN,
- s => V.REMILFCheckinIDs.includes(s.ID),
+ s => this.validSlave(s),
s => s.assignment !== Job.QUARTER,
s => s.devotion >= 10,
s => s.energy > 60,
@@ -22,6 +22,10 @@ App.Events.RECIMilf = class RECIMilf extends App.Events.BaseEvent {
];
}
+ validSlave(slave) {
+ return V.RECheckInIDs.some((a) => (a.ID === slave.ID && a.type === "MILF"));
+ }
+
execute(node) {
const [eventSlave] = this.actors.map(a => getSlave(a));
const {
@@ -35,7 +39,7 @@ App.Events.RECIMilf = class RECIMilf extends App.Events.BaseEvent {
const legs = hasBothLegs(eventSlave) ? "legs" : "leg";
const ankles = hasBothLegs(eventSlave) ? "ankles" : "ankle";
- V.REMILFCheckinIDs.deleteWith((s) => s === eventSlave.ID);
+ V.RECheckInIDs.deleteWith((s) => s.ID === eventSlave.ID && s.type === "MILF");
let artDiv = document.createElement("div"); // named container so we can replace it later
App.Events.drawEventArt(artDiv, eventSlave, "no clothing");
diff --git a/src/events/RECI/orientation.js b/src/events/RECI/orientation.js
index 1b785e848af316b15fa97e46dc58ddb0d2e49d86..84b9d7ef886f17c8cf5e87cdb69c3dd79577ebd1 100644
--- a/src/events/RECI/orientation.js
+++ b/src/events/RECI/orientation.js
@@ -7,7 +7,7 @@ App.Events.RECIOrientation = class RECIOrientation extends App.Events.BaseEvent
return [
[ // single event slave
s => s.fetish !== Fetish.MINDBROKEN,
- s => V.REOrientationCheckinIDs.includes(s.ID),
+ s => this.validSlave(s),
s => s.assignment !== Job.QUARTER,
s => s.attrXY > 50,
s => s.anus !== 0,
@@ -22,6 +22,10 @@ App.Events.RECIOrientation = class RECIOrientation extends App.Events.BaseEvent
];
}
+ validSlave(slave) {
+ return V.RECheckInIDs.some((a) => (a.ID === slave.ID && a.type === "orientation"));
+ }
+
execute(node) {
const [eventSlave] = this.actors.map(a => getSlave(a));
const {He, he, his, him, himself, girl} = getPronouns(eventSlave);
@@ -29,7 +33,7 @@ App.Events.RECIOrientation = class RECIOrientation extends App.Events.BaseEvent
const belly = bellyAdjective(eventSlave);
const desc = SlaveTitle(eventSlave);
- V.REOrientationCheckinIDs.deleteWith((s) => s === eventSlave.ID);
+ V.RECheckInIDs.deleteWith((s) => s.ID === eventSlave.ID && s.type === "orientation");
App.Events.drawEventArt(node, eventSlave, "no clothing");
diff --git a/src/events/RECI/ugly.js b/src/events/RECI/ugly.js
index f889fe3eac9cc79c00e7d5d32c574509e5387f6a..f2e1fc8569b899ade39fc70f08b1efa863d18b1f 100644
--- a/src/events/RECI/ugly.js
+++ b/src/events/RECI/ugly.js
@@ -7,7 +7,7 @@ App.Events.RECIUgly = class RECIUgly extends App.Events.BaseEvent {
return [
[ // single event slave
s => s.fetish !== Fetish.MINDBROKEN,
- s => V.REUglyCheckinIDs.includes(s.ID),
+ s => this.validSlave(s),
s => s.face >= -10,
s => (s.assignment === Job.PUBLIC || s.assignment === Job.WHORE),
s => s.devotion >= 10,
@@ -23,13 +23,17 @@ App.Events.RECIUgly = class RECIUgly extends App.Events.BaseEvent {
];
}
+ validSlave(slave) {
+ return V.RECheckInIDs.some((a) => (a.ID === slave.ID && a.type === "ugly"));
+ }
+
execute(node) {
const [eventSlave] = this.actors.map(a => getSlave(a));
const {He, he, His, his, him, himself, girl} = getPronouns(eventSlave);
const {title: Master, say: say} = getEnunciation(eventSlave);
const freeMovement = (canWalk(eventSlave) || (canMove(eventSlave) && eventSlave.rules.mobility === "permissive"));
- V.REUglyCheckinIDs.deleteWith((s) => s === eventSlave.ID);
+ V.RECheckInIDs.deleteWith((s) => s.ID === eventSlave.ID && s.type === "ugly");
let artDiv = document.createElement("div"); // named container so we can replace it later
App.Events.drawEventArt(artDiv, eventSlave, "no clothing");
diff --git a/src/events/REFS/refsAntebellumArtifact.js b/src/events/REFS/refsAntebellumArtifact.js
new file mode 100644
index 0000000000000000000000000000000000000000..c22196f1051bf6147e651aa90f1d4861730dd196
--- /dev/null
+++ b/src/events/REFS/refsAntebellumArtifact.js
@@ -0,0 +1,51 @@
+App.Events.refsAntebellumArtifact = class refsAntebellumArtifact extends App.Events.BaseEvent {
+ eventPrerequisites() {
+ return [
+ () => V.FSAnnounced === 1,
+ () => V.arcologies[0].FSAntebellumRevivalist > 25,
+ () => V.cash > 2 * this.cost, // flush with cash
+ () => !V.eventResults.artifactsBought?.includes("antebellum") // haven't bought already
+ ];
+ }
+
+ get cost() { return 100000; }
+
+ execute(node) {
+ const cost = this.cost;
+
+ App.Events.addParagraph(node, [`You are contacted by an arcology owner outside of Richmond whose culture is just taking shape. Ironically, despite his location he has no interest in Antebellum Revivalism, and is building a new Edo empire. As a consequence, many items of Confederate fame have been acquired and put up for sale by him. One of these items is particularly desirable: a Colt Model 1855 revolver, the personal sidearm of Robert E. Lee, with custom engravings that announce it as such.`]);
+
+ const choices = [];
+ choices.push(new App.Events.Result(`Ignore the offer. You have plenty of weapons already, and could buy a whole shipment for that price.`, ignore));
+ choices.push(new App.Events.Result(`Buy the revolver. It belongs in a museum. Your museum.`, display, `Costs ${cashFormat(cost)}`));
+ choices.push(new App.Events.Result(`Buy the revolver to try to resell it. There is no shortage of plantations that would be a good fit.`, resell, `Results may vary`));
+ App.Events.addResponses(node, choices);
+
+ function ignore() {
+ return `You let the arcology owner know that you're not interested in wasting money on overpriced pistols, even Antebellum ones, and move on with your day.`;
+ }
+
+ function display() {
+ repX(5000, "event");
+ cashX(-cost, "event");
+ // @ts-ignore - event gating prevents reported type problem
+ V.arcologies[0].FSAntebellumRevivalist = Math.clamp(V.arcologies[0].FSAntebellumRevivalist + 10, 0, 100);
+ if (!V.eventResults.artifactsBought) {
+ V.eventResults.artifactsBought = ["antebellum"];
+ } else {
+ V.eventResults.artifactsBought.push("antebellum");
+ }
+ const frag = new DocumentFragment();
+ App.Events.addParagraph(frag, [`You buy the antique revolver and put it on prominent display as the centerpiece of your Museum of the Antebellum South. Visitors and citizens alike are <span class="reputation inc">wowed</span> in the presence of a genuine artifact, and you find growing support for your vision of a new Dixieland.`]);
+ App.Events.addParagraph(frag, [`You also have an exact replica made, and place it in the display case behind your desk, as a constant reminder of your heritage.`]);
+ addTrinket("a Colt Model 1855 revolver that once belonged to Robert E. Lee");
+ return frag;
+ }
+
+ function resell() {
+ const r = [`You buy the antique revolver and start calling around to your numerous contacts who are Sons and Daughters of the Confederacy, hoping for a quick and profitable resale.`];
+ r.push(App.Events.auctionREFSArtifact(cost));
+ return r;
+ }
+ }
+};
diff --git a/src/events/REFS/refsArabianArtifact.js b/src/events/REFS/refsArabianArtifact.js
new file mode 100644
index 0000000000000000000000000000000000000000..1b8a606777c0f30fa68b38ffca6f2ba15d01fb33
--- /dev/null
+++ b/src/events/REFS/refsArabianArtifact.js
@@ -0,0 +1,51 @@
+App.Events.refsArabianArtifact = class refsArabianArtifact extends App.Events.BaseEvent {
+ eventPrerequisites() {
+ return [
+ () => V.FSAnnounced === 1,
+ () => V.arcologies[0].FSArabianRevivalist > 25,
+ () => V.cash > 2 * this.cost, // flush with cash
+ () => !V.eventResults.artifactsBought?.includes("arabian") // haven't bought already
+ ];
+ }
+
+ get cost() { return 100000; }
+
+ execute(node) {
+ const cost = this.cost;
+
+ App.Events.addParagraph(node, [`An arcology in France has raided the Louvre, killing and enslaving several squatters in the process. While they intend to keep most of what they have found, a few items have gone up for sale. ${capFirstChar(V.assistant.name)} has flagged one that could be useful to you: the black stone stele that bears the Code of Hammurabi.`]);
+
+ const choices = [];
+ choices.push(new App.Events.Result(`Ignore the offer. You have your own rules, and they are law.`, ignore));
+ choices.push(new App.Events.Result(`Buy the stele and put it on display.`, display, `Costs ${cashFormat(cost)}`));
+ choices.push(new App.Events.Result(`Buy the stele to try to resell it at a profit.`, resell, `Results may vary`));
+ App.Events.addResponses(node, choices);
+
+ function ignore() {
+ return `You let ${V.assistant.name} know that you're not interested in wasting money on dead Old World laws when your very word is law, and move on with your day.`;
+ }
+
+ function display() {
+ repX(5000, "event");
+ cashX(-cost, "event");
+ // @ts-ignore - event gating prevents reported type problem
+ V.arcologies[0].FSArabianRevivalist = Math.clamp(V.arcologies[0].FSArabianRevivalist + 10, 0, 100);
+ if (!V.eventResults.artifactsBought) {
+ V.eventResults.artifactsBought = ["arabian"];
+ } else {
+ V.eventResults.artifactsBought.push("arabian");
+ }
+ const frag = new DocumentFragment();
+ App.Events.addParagraph(frag, [`You buy the stele and put it on prominent display in your promenade. Visitors and citizens alike are <span class="reputation inc">wowed</span> in the presence of the ancient Code, and you find growing support for your vision of a new Arabian Sultanate.`]);
+ App.Events.addParagraph(frag, [`You also have a small replica made, and place it in the display case behind your desk, to remind your visitors of your heritage as a lawgiver.`]);
+ addTrinket("a small replica of the black stone stele engraved with the Code of Hammurabi which stands in your promenade");
+ return frag;
+ }
+
+ function resell() {
+ const r = [`You buy the ancient stele and start calling around to anyone who might be interested, hoping for a quick and profitable resale.`];
+ r.push(App.Events.auctionREFSArtifact(cost));
+ return r;
+ }
+ }
+};
diff --git a/src/events/REFS/refsAztecArtifact.js b/src/events/REFS/refsAztecArtifact.js
new file mode 100644
index 0000000000000000000000000000000000000000..c1d00c1e598bd8908580a30927cabeafdbfd42bb
--- /dev/null
+++ b/src/events/REFS/refsAztecArtifact.js
@@ -0,0 +1,81 @@
+App.Events.refsAztecArtifact = class refsAztecArtifact extends App.Events.BaseEvent {
+ eventPrerequisites() {
+ return [
+ () => V.FSAnnounced === 1,
+ () => V.arcologies[0].FSAztecRevivalist > 25,
+ () => V.cash > 2 * this.cost, // flush with cash
+ () => !V.eventResults.artifactsBought?.includes("aztec") // haven't bought already
+ ];
+ }
+
+ get cost() { return 100000; }
+
+ execute(node) {
+ const cost = this.cost;
+
+ App.Events.addParagraph(node, [`You are contacted by a very dour looking arcology owner who is set up near Mexico City. In a monotone voice, he explains that several months ago his construction crews found a large stone object with stairs carved into it, leading to an upper platform. It was determined to be a sacrificial stone, and a survey of the area was conducted, which led to the discovery of an ornate obsidian dagger believed to be intended for use on the platform. The arcology owner explains that he and his people have grown tired of sacrificing slaves on the platform, and have moved onto other things. He is willing to sell and transport both the platform and knife to you for a large fee.`]);
+
+ const choices = [];
+ choices.push(new App.Events.Result(`Ignore the offer. For that price you could build your own platform, or several.`, ignore));
+ choices.push(new App.Events.Result(`Buy the platform and dagger for your own use.`, buy, `Costs ${cashFormat(cost)}`));
+ App.Events.addResponses(node, choices);
+
+ function ignore() {
+ return `You let the arcology owner know that you're not interested in wasting money on transporting a huge block of stone, even if it is an Aztec altar, and move on with your day.`;
+ }
+
+ function buy() {
+ repX(5000, "event");
+ cashX(-cost, "event");
+ // @ts-ignore - event gating prevents reported type problem
+ V.arcologies[0].FSAztecRevivalist = Math.clamp(V.arcologies[0].FSAztecRevivalist + 10, 0, 100);
+ if (!V.eventResults.artifactsBought) {
+ V.eventResults.artifactsBought = ["aztec"];
+ } else {
+ V.eventResults.artifactsBought.push("aztec");
+ }
+ const frag = new DocumentFragment();
+ App.Events.addParagraph(frag, [`You buy the ancient Aztec altar and have it hauled in and set up in the center of your sacrifice room. It's sure a pain to move, but you're sure you'll find some use for it.`]);
+ const t = [`You find a place for the obsidian tecpatl safe in the display case behind your desk, where it can serve as a constant reminder of your heritage.`];
+ if (V.arcologies[0].FSPaternalist === "unset") { // no blood sacrifice allowed for paternalists
+ t.push(`Conveniently, it's also easy to access when you feel the need to sacrifice a slave.`);
+ }
+ App.Events.addParagraph(frag, t);
+ addTrinket("an ancient obsidian tecpatl, stained with the blood of slave sacrifices");
+ if (V.arcologies[0].FSPaternalist === "unset") {
+ App.Events.addResponses(frag, [new App.Events.Result(`Choose a slave and let the tecpatl taste blood again.`, sacrifice, `The slave you choose will die.`)]);
+ }
+ return frag;
+ }
+
+ function sacrifice() {
+ // always register the full impact from this sacrifice, even if we've already sacrificed slaves earlier this week
+ V.slavesSacrificedThisWeek = 0;
+
+ App.Events.addNode(node, [chooseSlave()]);
+
+ return `You notify ${V.assistant.name} to prepare for a sacrifice.`;
+
+ function chooseSlave() {
+ const frag = App.UI.DOM.makeElement("div", null, ['margin-top']);
+
+ frag.append(`Choose a slave to sacrifice. This slave will die.`);
+
+ V.slaves
+ .filter(s => (s.breedingMark === 0 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset"))
+ .forEach(slave => {
+ App.Events.addNode(frag, [
+ App.UI.DOM.link(`Sacrifice ${SlaveFullName(slave)}`, () => {
+ App.UI.DOM.replace(frag, App.UI.SlaveInteract.aztecSlaveSacrificeLife(slave));
+ }),
+ slave.custom.label ? App.UI.DOM.makeElement('span', `(${slave.custom.label})`, ["custom-label"]) : ``,
+ isShelterSlave(slave) ? App.UI.DOM.makeElement("span", "(Shelter)", ["red"]) : ``,
+ App.UI.DOM.slaveDescriptionDialog(slave, "(Inspect)"),
+ ], "div", ['indent']);
+ });
+
+ return frag;
+ }
+ }
+ }
+};
diff --git a/src/events/REFS/refsChineseArtifact.js b/src/events/REFS/refsChineseArtifact.js
new file mode 100644
index 0000000000000000000000000000000000000000..b69ca748034901cc6a192f4b5f3944f721a36604
--- /dev/null
+++ b/src/events/REFS/refsChineseArtifact.js
@@ -0,0 +1,51 @@
+App.Events.refsChineseArtifact = class refsChineseArtifact extends App.Events.BaseEvent {
+ eventPrerequisites() {
+ return [
+ () => V.FSAnnounced === 1,
+ () => V.arcologies[0].FSChineseRevivalist > 25,
+ () => V.cash > 2 * this.cost, // flush with cash
+ () => !V.eventResults.artifactsBought?.includes("chinese") // haven't bought already
+ ];
+ }
+
+ get cost() { return 100000; }
+
+ execute(node) {
+ const cost = this.cost;
+
+ App.Events.addParagraph(node, [`An arcology owner in China has contacted you with an offer to buy a large wooden statue of the Guan Yin Bodhisattva. He says it has no place in the society he is forming, but he cannot bring himself to destroy the Jin Dynasty relic, as it is said to provide calming and peace to those who view it. Whether the statue is magical or not, he is willing to sell it to fund further expansion of his arcology.`]);
+
+ const choices = [];
+ choices.push(new App.Events.Result(`Ignore the offer. You're not going to pay that for a hunk of wood.`, ignore));
+ choices.push(new App.Events.Result(`Buy the statue. Maybe it will calm down new slaves during inspection.`, display, `Costs ${cashFormat(cost)}`));
+ choices.push(new App.Events.Result(`Buy the statue to try to resell it at a profit.`, resell, `Results may vary`));
+ App.Events.addResponses(node, choices);
+
+ function ignore() {
+ return `You let the arcology owner know that you're not interested in subsidizing his social experiments by buying his rejected artifacts, and move on with your day.`;
+ }
+
+ function display() {
+ repX(5000, "event");
+ cashX(-cost, "event");
+ // @ts-ignore - event gating prevents reported type problem
+ V.arcologies[0].FSChineseRevivalist = Math.clamp(V.arcologies[0].FSChineseRevivalist + 10, 0, 100);
+ if (!V.eventResults.artifactsBought) {
+ V.eventResults.artifactsBought = ["chinese"];
+ } else {
+ V.eventResults.artifactsBought.push("chinese");
+ }
+ const frag = new DocumentFragment();
+ App.Events.addParagraph(frag, [`You buy the ancient statue and put it on prominent display in the room where you conduct new slave intakes, making sure that it's clearly visible through the glass windows when the room is not in use. Visitors and citizens alike are <span class="reputation inc">reassured</span> by the relic, and you find growing support for your claim on the Mandate of Heaven.`]);
+ App.Events.addParagraph(frag, [`You also have a small replica made, and place it in the display case behind your desk, as a constant reminder of your blessing.`]);
+ addTrinket("a small wooden statue of the Guan Yin Bodhisattva");
+ return frag;
+ }
+
+ function resell() {
+ const r = [`You buy the ancient statue and start calling around to your Chinese contacts, hoping for a quick and profitable resale.`];
+ r.push(App.Events.auctionREFSArtifact(cost));
+ return r;
+ }
+ }
+};
diff --git a/src/events/REFS/refsEdoArtifact.js b/src/events/REFS/refsEdoArtifact.js
new file mode 100644
index 0000000000000000000000000000000000000000..1a702ce3a45629e00e1224b82be117adb0919870
--- /dev/null
+++ b/src/events/REFS/refsEdoArtifact.js
@@ -0,0 +1,50 @@
+App.Events.refsEdoArtifact = class refsEdoArtifact extends App.Events.BaseEvent {
+ eventPrerequisites() {
+ return [
+ () => V.FSAnnounced === 1,
+ () => V.arcologies[0].FSEdoRevivalist > 25,
+ () => V.cash > 2 * this.cost, // flush with cash
+ () => !V.eventResults.artifactsBought?.includes("edo") // haven't bought already
+ ];
+ }
+
+ get cost() { return 100000; }
+
+ execute(node) {
+ const cost = this.cost;
+
+ App.Events.addParagraph(node, [`Recently, looters in Japan raided the tomb of Miyamoto Musashi, and attempted to take his famed swords. The looters were struck down by a mysterious swordsman, who now seeks to find a place where Musashi's weapons will be safe and honored. He is offering them to you as a set for a steep fee, with the intention of using the proceeds to fortify the area around the tomb.`]);
+
+ const choices = [];
+ choices.push(new App.Events.Result(`Ignore the strange man's offer. The swords may not even be genuine for all you know.`, ignore));
+ choices.push(new App.Events.Result(`Buy the swords. Perhaps one day you'll be able to wield them in concert, but for now they will make a symbolic display piece.`, display, `Costs ${cashFormat(cost)}`));
+ choices.push(new App.Events.Result(`Buy the swords to try to resell them to a master samurai at a profit.`, resell, `Results may vary`));
+ App.Events.addResponses(node, choices);
+
+ function ignore() {
+ return `You let the strange man know that you're not interested in wasting money on trinkets of questionable authenticity, and move on with your day.`;
+ }
+
+ function display() {
+ repX(5000, "event");
+ cashX(-cost, "event");
+ // @ts-ignore - event gating prevents reported type problem
+ V.arcologies[0].FSEdoRevivalist = Math.clamp(V.arcologies[0].FSEdoRevivalist + 10, 0, 100);
+ if (!V.eventResults.artifactsBought) {
+ V.eventResults.artifactsBought = ["edo"];
+ } else {
+ V.eventResults.artifactsBought.push("edo");
+ }
+ const frag = new DocumentFragment();
+ App.Events.addParagraph(frag, [`You buy the ancient katana and wakizashi, and put them on prominent display in your office, happy to support the strange man's honorable goal of protecting the Miyamoto tomb. Visitors are <span class="reputation inc">wowed</span> in the presence of genuine history, and you find growing support for your vision of a revived Edo Japan.`]);
+ addTrinket("Miyamoto Musashi's legendary katana and wakizashi");
+ return frag;
+ }
+
+ function resell() {
+ const r = [`You buy the ancient katana and wakizashi and start calling around to your Edo Revivalist contacts, hoping to find a master samurai worthy of wielding them...and willing to pay.`];
+ r.push(App.Events.auctionREFSArtifact(cost));
+ return r;
+ }
+ }
+};
diff --git a/src/events/REFS/refsEgyptianArtifact.js b/src/events/REFS/refsEgyptianArtifact.js
new file mode 100644
index 0000000000000000000000000000000000000000..dd5da516d708158ded9333d99326cd293d065795
--- /dev/null
+++ b/src/events/REFS/refsEgyptianArtifact.js
@@ -0,0 +1,51 @@
+App.Events.refsEgyptianArtifact = class refsEgyptianArtifact extends App.Events.BaseEvent {
+ eventPrerequisites() {
+ return [
+ () => V.FSAnnounced === 1,
+ () => V.arcologies[0].FSEgyptianRevivalist > 25,
+ () => V.cash > 2 * this.cost, // flush with cash
+ () => !V.eventResults.artifactsBought?.includes("egyptian") // haven't bought already
+ ];
+ }
+
+ get cost() { return 100000; }
+
+ execute(node) {
+ const cost = this.cost;
+
+ App.Events.addParagraph(node, [`An arcology owner attempting to recreate ancient Egyptian culture (with his arcology fittingly located in the desert outside of Cairo) has explored and raided a series of tombs and gathered a mass of artifacts. With his surplus of rare artifacts, he is willing to let go of other globally-acquired pieces for a fee. He is offering the Bust of Cleopatra, originally purchased overseas from a crumbling museum near Ontario and painstakingly restored. He is no doubt overcharging, but this could be a boon for your blooming Egyptian society.`]);
+
+ const choices = [];
+ choices.push(new App.Events.Result(`Ignore the offer. Let the new Pharaoh drown in his mass of artifacts.`, ignore));
+ choices.push(new App.Events.Result(`Buy the bust and put it on display.`, display, `Costs ${cashFormat(cost)}`));
+ choices.push(new App.Events.Result(`Buy the bust to try to resell it at a profit.`, resell, `Results may vary`));
+ App.Events.addResponses(node, choices);
+
+ function ignore() {
+ return `You let the self-styled Pharaoh know that you're not interested in subsidizing his tomb raiding by buying his rejects, and move on with your day.`;
+ }
+
+ function display() {
+ repX(5000, "event");
+ cashX(-cost, "event");
+ // @ts-ignore - event gating prevents reported type problem
+ V.arcologies[0].FSEgyptianRevivalist = Math.clamp(V.arcologies[0].FSEgyptianRevivalist + 10, 0, 100);
+ if (!V.eventResults.artifactsBought) {
+ V.eventResults.artifactsBought = ["egyptian"];
+ } else {
+ V.eventResults.artifactsBought.push("egyptian");
+ }
+ const frag = new DocumentFragment();
+ App.Events.addParagraph(frag, [`You buy the ancient bust and put it on display in your arcology promenade. Visitors and citizens alike are <span class="reputation inc">inspired</span> as they walk under the sultry gaze of Cleopatra, and you find growing support for your vision of a new Egypt.`]);
+ App.Events.addParagraph(frag, [`You also have a smaller replica made, and place it in the display case behind your desk, as a constant reminder of your heritage.`]);
+ addTrinket("a bust of Cleopatra");
+ return frag;
+ }
+
+ function resell() {
+ const r = [`You buy the ancient bust and start calling around to your Egyptian Revivalist contacts, hoping for a quick and profitable resale.`];
+ r.push(App.Events.auctionREFSArtifact(cost));
+ return r;
+ }
+ }
+};
diff --git a/src/events/REFS/refsFeast.js b/src/events/REFS/refsNeoImperialistFeast.js
similarity index 98%
rename from src/events/REFS/refsFeast.js
rename to src/events/REFS/refsNeoImperialistFeast.js
index 483932720a2d78834a54a975a0bab40e6f70cb7d..b1fd7f2bd770b6c884beb1f7510002a649ba1454 100644
--- a/src/events/REFS/refsFeast.js
+++ b/src/events/REFS/refsNeoImperialistFeast.js
@@ -1,4 +1,4 @@
-App.Events.refsFeast = class refsFeast extends App.Events.BaseEvent {
+App.Events.refsNeoImperialistFeast = class refsNeoImperialistFeast extends App.Events.BaseEvent {
eventPrerequisites() {
return [
() => V.arcologies[0].FSNeoImperialist > random(25, 100) || (V.debugMode > 0 && V.debugModeEventSelection > 0),
@@ -56,7 +56,7 @@ App.Events.refsFeast = class refsFeast extends App.Events.BaseEvent {
App.Events.addResponses(node, choices);
function enormous() {
- repX(7000, "event");
+ repX(5000, "event");
V.arcologies[0].prosperity -= 1;
cashX(-enormousCash, "event");
return `The feast you organize would put Norse raiders and ancient Kings alike to shame; you <span class="cash dec">spend more money</span> in the first few days of planning than most of them would have ever seen in their lives. The Barons arrive at your penthouse on time and are immediately mystified by the overwhelming variety of foods put out on your eloquent tables, served by stunning girls in thin silks that barely conceal their perfect bodies. Entertainers of every stripe lead around flaming swords and well-trained lions, transforming your penthouse into a temporary circus of debauchery and hedonism; there are so many that you can't even remember all those you hired, and every room contains a new wonder or waiting beauty. You deliver a short speech to the Barons, Knights, and other elite you've granted the honor of attending, welcoming the lot to your home; one of your Barons claps loudly the moment you finish and <span class="reputation inc">shouts your name</span> in celebration, which is quickly taken up by the rest of the room. From then on, the next few days are an absolute blur of sex, drink, drugs and food, casting aside all worries and indulging alongside the wealthiest of your arcology in a true display of ultra-hedonism. The hours blend into days of the endless celebration you've organized, until, finally, the Barons and Knights begin to shuffle out in a drunken, exhausted haze, leaving behind a trail of bones and knocked-up slavegirls. No one, yourself included, seems to be able to remember exactly what happened during those days of wild celebration, but everyone agrees that it was <span class="prosperity inc">one of the greatest parties ever held in the Free Cities.</span>`;
diff --git a/src/events/REFS/refsRomanArtifact.js b/src/events/REFS/refsRomanArtifact.js
new file mode 100644
index 0000000000000000000000000000000000000000..1c5d57cc88f805c945bf78577e6637d209197f22
--- /dev/null
+++ b/src/events/REFS/refsRomanArtifact.js
@@ -0,0 +1,51 @@
+App.Events.refsRomanArtifact = class refsRomanArtifact extends App.Events.BaseEvent {
+ eventPrerequisites() {
+ return [
+ () => V.FSAnnounced === 1,
+ () => V.arcologies[0].FSRomanRevivalist > 25,
+ () => V.cash > 2 * this.cost, // flush with cash
+ () => !V.eventResults.artifactsBought?.includes("roman") // haven't bought already
+ ];
+ }
+
+ get cost() { return 100000; }
+
+ execute(node) {
+ const cost = this.cost;
+
+ App.Events.addParagraph(node, [`A group of Italian refugees ravaged by earthquakes recently made a historically significant find while attempting to seek shelter in a newly-created ravine. The desperate people came across the Crocea Mors, or "Yellow Death", Julius Caesar's legendary sword. Word of this discovery came to you from an aspiring Free Cities archaeologist after his mercenary escort gunned down the group. He is willing to sell the artifact to an arcology that he believes would revere such a find and keep it safe: an arcology like yours.`]);
+
+ const choices = [];
+ choices.push(new App.Events.Result(`Ignore the offer. Your city is Roman enough without pricey ancient artifacts.`, ignore));
+ choices.push(new App.Events.Result(`Buy the weapon and put it on display.`, display, `Costs ${cashFormat(cost)}`));
+ choices.push(new App.Events.Result(`Buy the weapon to try to resell it at a profit.`, resell, `Results may vary`));
+ App.Events.addResponses(node, choices);
+
+ function ignore() {
+ return `You let the archaeologist know that you're not interested in wasting money on trinkets, even Roman ones, and move on with your day.`;
+ }
+
+ function display() {
+ repX(5000, "event");
+ cashX(-cost, "event");
+ // @ts-ignore - event gating prevents reported type problem
+ V.arcologies[0].FSRomanRevivalist = Math.clamp(V.arcologies[0].FSRomanRevivalist + 10, 0, 100);
+ if (!V.eventResults.artifactsBought) {
+ V.eventResults.artifactsBought = ["roman"];
+ } else {
+ V.eventResults.artifactsBought.push("roman");
+ }
+ const frag = new DocumentFragment();
+ App.Events.addParagraph(frag, [`You buy the ancient sword and put it on prominent display as the centerpiece of a new Museum of Roman Warfare. Visitors and citizens alike are <span class="reputation inc">wowed</span> in the presence of genuine history, and you find growing support for your vision of a new Rome.`]);
+ App.Events.addParagraph(frag, [`You also have a replica made from a plaster mold, and place it in the display case behind your desk, as a constant reminder of your heritage.`]);
+ addTrinket("a replica of Julius Caesar's famous sword, the Crocea Mors");
+ return frag;
+ }
+
+ function resell() {
+ const r = [`You buy the ancient sword and start calling around to your Roman Revivalist contacts, hoping for a quick and profitable resale.`];
+ r.push(App.Events.auctionREFSArtifact(cost));
+ return r;
+ }
+ }
+};
diff --git a/src/events/RESS/prostheticsPlease.js b/src/events/RESS/prostheticsPlease.js
new file mode 100644
index 0000000000000000000000000000000000000000..08d5c6dd156df41b2c7e3a724fcfc799a505a714
--- /dev/null
+++ b/src/events/RESS/prostheticsPlease.js
@@ -0,0 +1,71 @@
+App.Events.RESSProstheticsPlease = class RESSProstheticsPlease extends App.Events.BaseEvent {
+ eventPrerequisites() {
+ return [
+ () => V.researchLab.level >= 1,
+ () => V.researchLab.speed >= 300
+ ];
+ }
+
+ actorPrerequisites() {
+ return [
+ [
+ s => s.fetish !== Fetish.MINDBROKEN,
+ s => canTalk(s),
+ s => s.devotion > 50,
+ s => s.trust > 20,
+ s => isAmputee(s),
+ ]
+ ];
+ }
+
+ execute(node) {
+ const [eventSlave] = this.actors.map(a => getSlave(a));
+ const {He, he, his, him, himself} = getPronouns(eventSlave);
+ const {title: Master} = getEnunciation(eventSlave);
+ App.Events.drawEventArt(node, eventSlave);
+
+ App.Events.addNode(node, [
+ `As you are inspecting ${eventSlave.slaveName}, you notice ${he} seems distant and lost in thought.`,
+ `This isn't unusual, however ${eventSlave.slaveName} is quite devoted and trusting of you, so tends to be willing to speak ${his} mind.`,
+ `You ask ${him} if there's something the disabled slave would like to tell you.`,
+ `${He} pretends there isn't anything wrong, so you make telling you an order.`
+ ], "p");
+ App.Events.addNode(node, [
+ `"${Spoken(eventSlave, `Well, ${Master}, I'm very happy being with you, and you're a such good master, but I don't know well I can serve you like this...`)}`,
+ `${Spoken(eventSlave, `I-I just think that it would be a lot easier, and I would be able to do so much better, if you gave me some prosthetics.`)}`,
+ `${Spoken(eventSlave, `Then I could pleasure you without you having to do all the work. Can I please have prosthetics, ${Master}?`)}"`
+ ], "p");
+
+ const interfaces = App.Data.prosthetics.interfaceP3.costs * 2 + App.Data.prosthetics.interfaceP3.adjust * 50; // borrowed from src\interaction\prostheticConfig.js
+ const limbs = App.Data.prosthetics.basicL.costs * 2 + App.Data.prosthetics.basicL.adjust * 50; // borrowed from src\interaction\prostheticConfig.js
+ const totalCost = interfaces + limbs;
+
+ App.Events.addResponses(node, [
+ new App.Events.Result(`Grant ${his} request`, grant, `Costs ${cashFormat(totalCost)}`),
+ new App.Events.Result(`Deny ${his} request`, deny),
+ ]);
+
+ function grant() {
+ cashX(totalCost, "capEx");
+ configureLimbs(eventSlave, "all", 2);
+ eventSlave.devotion += 5;
+ eventSlave.trust += 15;
+ App.Events.addNode(node, [
+ `You have ${eventSlave.slaveName} taken down to the prosthetic lab, to be immediately fitted for ${his} new appendages.`,
+ `${He} smiles throughout the process of measuring and choosing ${his} prosthetics, and can barely contain ${himself} once the anchors are implanted in ${him} and ${his} new limbs installed.`,
+ `Tentatively, ${he} uses them for the first time, and almost breaks into tears when ${he} <span class="trust inc">realizes the gift</span> you have given ${him} by doing this.`,
+ `${He} is <span class="devotion inc">overwhelmingly happy</span> with you.`
+ ], "p");
+ }
+
+ function deny() {
+ eventSlave.devotion -= 5;
+ eventSlave.trust -= 5;
+ App.Events.addNode(node, [
+ `You tell ${eventSlave.slaveName} that <span class="trust dec">no, you will not</span> be fitting ${him} for prosthetics.`,
+ `The way ${he} is now is the way you want ${him}, and unless you desire to change ${him}, ${he} will remain that way.`,
+ `${He} looks dejected, but ${he}'s <span class="devotion dec">devoted enough</span> to understand that you know what's best for ${him}.`
+ ], "p");
+ }
+ }
+};
diff --git a/src/events/RESS/review/breastExpansionBlues.js b/src/events/RESS/review/breastExpansionBlues.js
index 3f8a250c2a058502af301d9a09950e6c5e166a97..1cba9e4142b6e4df0a13eef9d3bc95315bcce3a9 100644
--- a/src/events/RESS/review/breastExpansionBlues.js
+++ b/src/events/RESS/review/breastExpansionBlues.js
@@ -76,11 +76,11 @@ App.Events.RESSBreastExpansionBlues = class RESSBreastExpansionBlues extends App
} else {
r.push(`rivulet of cream running from`);
}
- r.push(`it right now`);
+ r.push(`it right now.`);
} else if (eventSlave.preg > eventSlave.pregData.normalBirth/2.66) {
- r.push(`${He} complained of feeling like a cow without detectable irony, despite the fact that ${he} is pregnant and likely to begin lactating soon`);
+ r.push(`${He} complained of feeling like a cow without detectable irony, despite the fact that ${he} is pregnant and likely to begin lactating soon.`);
}
- r.addToLast(`. ${He} waits anxiously for your response, wondering if ${he}'ll be punished for expressing reservations about your expansion of ${his} breasts and, comically, still cradling ${his} heavy udders as ${he} does so.`);
+ r.push(`${He} waits anxiously for your response, wondering if ${he}'ll be punished for expressing reservations about your expansion of ${his} breasts and, comically, still cradling ${his} heavy udders as ${he} does so.`);
r.toParagraph();
App.Events.addResponses(node, [
diff --git a/src/events/RESS/review/gapedAsshole.js b/src/events/RESS/review/gapedAsshole.js
index 03545eb1baf486ef54e3e99a7a0bc4758672a3b1..21664f768d10354bff1656cce7dc01681181fc4a 100644
--- a/src/events/RESS/review/gapedAsshole.js
+++ b/src/events/RESS/review/gapedAsshole.js
@@ -186,7 +186,7 @@ App.Events.RESSGapedAsshole = class RESSGapedAsshole extends App.Events.BaseEven
r.push(`swiftly pull on a strap-on and aim it`);
}
r.push(`at ${his} face, ${he} realizes that ${his} spit is going to be the only relief ${his} fucked-out butt is going to have for whatever you're planning. ${He} blows you with desperate eagerness, doing ${his} absolute best to coat your`);
- if (V.PC.dick !== 1) {
+ if (V.PC.dick === 0) {
r.push(`weapon's`);
}
r.push(`shaft with as much saliva as ${he} can. You pull it free of ${his} mouth with a wet pop, and ${he} immediately faces the floor, cocking ${his} hips and spreading ${his} huge asspussy for you.`);
diff --git a/src/events/RESS/review/gorging.js b/src/events/RESS/review/gorging.js
index 48c8e81ee36773f72bde446c55ff0202ad9a709e..a396cae09e19450317d273ab739b03d78dd74c0d 100644
--- a/src/events/RESS/review/gorging.js
+++ b/src/events/RESS/review/gorging.js
@@ -262,7 +262,7 @@ App.Events.RESSGorging = class RESSGorging extends App.Events.BaseEvent {
r.push(`You have seen enough and don't have the time, nor the energy to deal with this, so you return to bed. You manage to wake up early the next day and make some extra profits with your heightened productivity, but your good spirits are soured that evening when you see ${eventSlave.slaveName} ${canWalk(eventSlave) ? `waddle past your office door with ${his} taut, food-bloated belly leading the way` : `scrape past your office door with ${his} taut, food-bloated belly dragging along beneath ${him}`}.`);
if (V.arcologies[0].FSHedonisticDecadence !== "unset") {
- r.push(`A <span class="devotion inc">smile</span> lights up ${his} face as ${he} delights in the <span class="trust inc">knowledge that ${he} has been given free reign to gorge ${himself},</span> and that ${his} gluttony will only make ${him} more popular in your indulgent society. ${eventSlave.slaveName} delights in how ${his} hugely distended gut is admired as ${he} goes about ${his} duties. ${He} had quite the good day today and is headed off to the kitchen to make tomorrow a good one as well.`);
+ r.push(`A <span class="devotion inc">smile</span> lights up ${his} face as ${he} delights in the <span class="trust inc">knowledge that ${he} has been given free rein to gorge ${himself},</span> and that ${his} gluttony will only make ${him} more popular in your indulgent society. ${eventSlave.slaveName} delights in how ${his} hugely distended gut is admired as ${he} goes about ${his} duties. ${He} had quite the good day today and is headed off to the kitchen to make tomorrow a good one as well.`);
if (eventSlave.devotion > 50 && canSee(eventSlave) && canWalk(eventSlave)) {
r.push(`As ${eventSlave.slaveName} walks past the open door, ${he} catches you admiring ${his} turgid form. Striking a pose, ${he} ${hasBothArms(eventSlave) ? `locks ${his} hands under his belly and shakes it,` : `bounces on ${his} heels,`} winking at you as a cacophony of sloshing radiates out from ${his} food-filled gut.`);
}
diff --git a/src/events/RESS/review/sexySuccubus.js b/src/events/RESS/review/sexySuccubus.js
index 794d83e57610f18bb8af1655b5ae6bb90f2f6b1c..815400448c3393aaab91e25713c5cbc223bb556e 100644
--- a/src/events/RESS/review/sexySuccubus.js
+++ b/src/events/RESS/review/sexySuccubus.js
@@ -28,7 +28,7 @@ App.Events.RESSSexySuccubus = class RESSSexySuccubus extends App.Events.BaseEven
const PC = V.PC;
const {heP, himP, womanP, hisP} = getPronouns(PC).appendSuffix("P");
- App.Events.drawEventArt(node, eventSlave, "no clothing");
+ App.Events.drawEventArt(node, eventSlave);
let r = [];
r.push(
diff --git a/src/events/RESS/waistlineWoes.js b/src/events/RESS/waistlineWoes.js
index e0d872d5d25f5cb8c4e4b574dae6bcb6f9165204..b85188d1a07a26187ba79f0131189c10a7399859 100644
--- a/src/events/RESS/waistlineWoes.js
+++ b/src/events/RESS/waistlineWoes.js
@@ -39,15 +39,183 @@ App.Events.RESSWaistlineWoes = class RESSWaistlineWoes extends App.Events.BaseEv
} else {
t.push(`${He} gestures at ${his} middle and`);
}
- /* WIP specific clothing stuff, right now clothed slaves are not final so don't worry about how little sense it makes */
switch (eventSlave.clothes) {
- case "clothes":
+ case "a slutty maid outfit":
+ case "a nice maid outfit":
+ case "a military uniform":
+ case "a schutzstaffel uniform":
+ case "a slutty schutzstaffel uniform":
+ case "a mounty outfit":
+ case "lederhosen":
+ case "a red army uniform":
+ case "a police uniform":
+ case "battlearmor":
+ case "Imperial Plate":
+ case "a biyelgee costume":
+ case "battledress":
+ case "a gothic lolita dress":
+ case "a hanbok":
if (canTalk(eventSlave)) {
- t.push(Spoken(eventSlave, `"This ${eventSlave.clothes} feels tight around my middle, I feel like it fit last week..."`));
+ t.push(Spoken(eventSlave, `"This outfit feels tight around my middle, I feel like it fit last week..."`));
t.push(He);
}
t.push(`adjusts ${his} clothing, clearly uncomfortable.`);
break;
+ case "a cheerleader outfit":
+ case "cutoffs and a t-shirt":
+ case "a slutty outfit":
+ case "conservative clothing":
+ case "a nice nurse outfit":
+ case "a bimbo outfit":
+ case "stretch pants and a crop-top":
+ case "a schoolgirl outfit":
+ case "leather pants and a tube top":
+ case "a t-shirt":
+ case "a t-shirt and thong":
+ case "a t-shirt and panties":
+ case "sport shorts and a t-shirt":
+ case "a t-shirt and jeans":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"These clothes feel tighter than I remember, I mean, look how much of me is spilling out of them..."`));
+ t.push(He);
+ }
+ t.push(`pinches ${his} belly, clearly grabbing hold of more of ${himself} than ${he} wants to.`);
+ break;
+ case "a huipil":
+ case "a chattel habit":
+ case "harem gauze":
+ case "a slutty nurse outfit":
+ case "a burkini":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"I feel really exposed, like the this used to cover more of me..."`));
+ t.push(He);
+ }
+ t.push(`tugs at ${his} clothing, clearly uncomfortable.`);
+ break;
+ case "a slutty qipao":
+ case "a halter top dress":
+ case "an evening dress":
+ case "a ball gown":
+ case "a long qipao":
+ case "a mini dress":
+ case "a maternity dress":
+ case "a courtesan dress":
+ case "a Santa dress":
+ case "a slave gown":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"I swear this fit me last week, but I feel like a sausage right now..."`));
+ t.push(He);
+ }
+ t.push(`tugs at ${his} dress, clearly uncomfortable.`);
+ break;
+ case "attractive lingerie":
+ case "kitty lingerie":
+ case "attractive lingerie for a pregnant woman":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"This lingerie feels tight all over, I feel like they fit better last week..."`));
+ t.push(He);
+ }
+ t.push(`adjusts ${his} panties, clearly uncomfortable.`);
+ break;
+ case "a succubus outfit":
+ case "a fallen nuns habit":
+ case "a dirndl":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"I swear I was able to lace this just last week..."`));
+ t.push(He);
+ }
+ t.push(`pinches ${his} belly, clearly grabbing hold of more of ${himself} than ${he} wants to.`);
+ break;
+ case "slutty business attire":
+ case "Western clothing":
+ case "nice business attire":
+ case "a confederate army uniform":
+ case "a button-up shirt and panties":
+ case "a button-up shirt":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"I feel like this fit me fine last week, yet now..."`));
+ t.push(He);
+ }
+ t.push(`attempts to button ${his} top, before exhaling and giving up.`);
+ break;
+ case "a toga":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"This feels really tight, I mean, look how much of me is spilling out of it..."`));
+ t.push(He);
+ }
+ t.push(`adjusts ${his} toga, clearly uncomfortable.`);
+ break;
+ case "restrictive latex":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"I know it's supposed to be tight, but I feel like a sausage..."`));
+ t.push(He);
+ }
+ t.push(`tugs at the restrictive latex, clearly uncomfortable for reasons outside their intent.`);
+ break;
+ case "a penitent nuns habit":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"I know it's supposed to be tight, but I feel like a sausage..."`));
+ t.push(He);
+ }
+ t.push(`gingerly tugs at ${his} coarse habit, clearly uncomfortable for reasons other than the chafing.`);
+ break;
+ case "a scalemail bikini":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"This feels really tight, I mean, look how much of me is spilling out of it..."`));
+ t.push(He);
+ }
+ t.push(`picks at ${his} scalemail, clearly uncomfortable.`);
+ break;
+ case "clubslut netting":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"This feels really tight, I mean, look how much of me is spilling out all over it..."`));
+ t.push(He);
+ }
+ t.push(`pokes at the flesh bulging through the mesh, clearly uncomfortable.`);
+ break;
+ case "spats and a tank top":
+ case "a comfortable bodysuit":
+ case "a latex catsuit":
+ case "a cybersuit":
+ case "a tight Imperial bodysuit":
+ case "a kimono":
+ case "a burqa":
+ case "an oversized t-shirt and boyshorts":
+ case "an oversized t-shirt":
+ case "a sweater":
+ case "a sweater and cutoffs":
+ case "a sweater and panties":
+ case "a nice pony outfit":
+ case "a slutty pony outfit":
+ case "a hijab and abaya":
+ case "a niqab and abaya":
+ case "a klan robe":
+ case "a slutty klan robe":
+ case "a hijab and blouse":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"This outfit is showing off more of me than I remember, and I swear I wasn't so bulgy last week..."`));
+ t.push(He);
+ }
+ t.push(`pokes at ${his} belly, clearly doubting ${himself}.`);
+ break;
+ case "an apron":
+ case "overalls":
+ case "a monokini":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"There's just so much of me hanging out of it, and I'm pretty sure this didn't shrink in the wash..."`));
+ t.push(He);
+ }
+ t.push(`pinches ${his} belly, clearly grabbing hold of more of ${himself} than ${he} wants to.`);
+ break;
+ case "a bunny outfit":
+ case "a leotard":
+ case "a one-piece swimsuit":
+ if (canTalk(eventSlave)) {
+ t.push(Spoken(eventSlave, `"There's just so much of me poking out of it, I swear it fit right last week..."`));
+ t.push(He);
+ }
+ t.push(`pinches at the folds of flesh peeking out around ${his} outfit, clearly bothered by it.`);
+ break;
default:
if (canTalk(eventSlave)) {
t.push(Spoken(eventSlave, `"I feel like I wasn't this soft last week..."`));
diff --git a/src/events/RETS/reFucktoyPrefersRelative.js b/src/events/RETS/reFucktoyPrefersRelative.js
index 9cc5a37c17dce51c85ff2c7d907931f055d2b49c..b6be3e3034fe318cb094a77865e409945f71b38d 100644
--- a/src/events/RETS/reFucktoyPrefersRelative.js
+++ b/src/events/RETS/reFucktoyPrefersRelative.js
@@ -63,6 +63,10 @@ App.Events.RETSFucktoyPrefersRelative = class RETSFucktoyPrefersRelative extends
fuckhole = "mouth";
}
}
+ if (fuckhole === "dick" && V.PC.vagina <= 0 && V.PC.anus === 0) {
+ // prevent loss of player virginity from this scene
+ fuckhole = "mouth";
+ }
let t = [];
t.push(`You're enjoying`, contextualIntro(V.PC, fucktoy, true), `one evening in your office when`, contextualIntro(fucktoy, relative, true), `passes by stark naked (probably on ${his2} way to or from the shower). The glass walls of your office are designed to let you, and by extension everyone else inside, clearly see everything that happens in the rest of the Penthouse, as well as the comings and goings of all your slaves.`);
@@ -77,6 +81,7 @@ App.Events.RETSFucktoyPrefersRelative = class RETSFucktoyPrefersRelative extends
} else {
t.push(`thrusting a strap-on deep into ${his} pussy. You pause your thrusts as ${he} gasps and twitches, cumming hard.`);
}
+ seX(V.PC, "penetrative", fucktoy, "vaginal");
break;
case "ass":
if (V.PC.dick > 0) {
@@ -84,6 +89,7 @@ App.Events.RETSFucktoyPrefersRelative = class RETSFucktoyPrefersRelative extends
} else {
t.push(`thrusting a strap-on deep into ${his} ass. You pause your thrusts as ${he} gasps and twitches, cumming hard.`);
}
+ seX(V.PC, "penetrative", fucktoy, "anal");
break;
case "mouth":
if (V.PC.dick > 0) {
@@ -91,6 +97,7 @@ App.Events.RETSFucktoyPrefersRelative = class RETSFucktoyPrefersRelative extends
} else {
t.push(`thrusting a strap-on deep into ${his} throat. ${His} motions waver as ${he} twitches, cumming hard.`);
}
+ seX(V.PC, "penetrative", fucktoy, "oral");
break;
case "boobs":
if (V.PC.dick > 0) {
@@ -100,6 +107,7 @@ App.Events.RETSFucktoyPrefersRelative = class RETSFucktoyPrefersRelative extends
} else {
t.push(`teasing ${his} flat chest. ${He} gasps and twitches, cumming hard.`);
}
+ seX(V.PC, "penetrative", fucktoy, "mammary");
break;
case "dick":
t.push(`riding ${him}. ${He} groans as ${he} unexpectedly cums hard, filling you up.`);
@@ -108,6 +116,9 @@ App.Events.RETSFucktoyPrefersRelative = class RETSFucktoyPrefersRelative extends
t.push(`You wonder briefly if ${he} might have just gotten you pregnant.`);
knockMeUp(V.PC, 5, 0, fucktoy.ID);
}
+ seX(V.PC, "vaginal", fucktoy, "penetrative");
+ } else {
+ seX(V.PC, "anal", fucktoy, "penetrative");
}
break;
default:
diff --git a/src/events/eventUtils.js b/src/events/eventUtils.js
index 72020d4c5219dc89debd600f8f0541e9d9e9bbc7..c3245d1ea5014fa985ba628de0604478113edcf9 100644
--- a/src/events/eventUtils.js
+++ b/src/events/eventUtils.js
@@ -213,7 +213,7 @@ App.Events.addNode = function(node, sentences, element, classNames) {
/** result handler callback - process the result and return an array of mixed strings and DOM nodes, or a single string or DOM node
* @callback resultHandler
- * @returns {Array<string|HTMLElement|DocumentFragment>|string|HTMLElement|DocumentFragment}
+ * @returns {Array<string|HTMLElement|DocumentFragment>|string|HTMLElement|DocumentFragment|Void}
*/
/** a response to an event, and its result */
App.Events.Result = class {
@@ -428,6 +428,28 @@ App.Events.qualifiesForREFIsubSlave = function(slave, fetish) {
return slave.fetishKnown === 1 && slave.fetishStrength > 95 && isSlaveAvailable(slave) && slave.fetish === fetish;
};
+/** Auction the artifact from an REFS Artifact event
+ * @param {number} basePrice price of artifact
+ * @returns {string}
+ */
+App.Events.auctionREFSArtifact = function(basePrice) {
+ const result = jsRandom(0, 100);
+ const tradeRatio = 1 + V.PC.skill.trading / 400; // 0.75 at -100 trading skill, 1.0 at 0, 1.25 at +100
+ if (result < 25) { // lost a little money
+ const loss = Math.trunc(basePrice * 0.1 * (1 / tradeRatio));
+ cashX(-loss, "event");
+ return `Unfortunately, you have trouble finding an interested buyer, and overall you end up losing ${cashFormatColor(loss, true)} on the deal.`;
+ } else if (result < 75) { // small profit
+ const profit = Math.trunc(basePrice * 0.1 * tradeRatio);
+ cashX(profit, "event");
+ return `You quickly find a buyer, and make a modest commission of ${cashFormatColor(profit)}.`;
+ } else { // windfall profit
+ const windfall = Math.trunc(basePrice * 0.5 * tradeRatio);
+ cashX(windfall, "event");
+ return `Luckily, you manage to get two potential buyers into a bidding war, and walk off ${cashFormatColor(windfall)} richer.`;
+ }
+};
+
/** Queue an event for scheduled execution on a later week. Queued events are executed automatically at the end of Nonrandom Event on the chosen week.
* @param {number} weeks - the number of weeks to wait before executing the event. 0 means execute this week, 1 execute next week, etc. Note that events generally cannot safely queue other events for the same week; they should always pass 1 or more in this parameter. Other parts of the game (Slave Interact, etc) can safely queue events for this week (i.e. the upcoming End Week cycle) by passing 0.
* @param {App.Events.BaseEvent} event - the event to execute. note that this event is serialized normally, so changes to the class name or parameter structure will break the event in saved games!
diff --git a/src/events/intro/acquisition.js b/src/events/intro/acquisition.js
index a27ad28d5a1ced8ccabad67d8477aea502d62cc6..4cd319a4378b44ee8447cf66fbd65586e2197d13 100644
--- a/src/events/intro/acquisition.js
+++ b/src/events/intro/acquisition.js
@@ -21,7 +21,6 @@ App.Intro.acquisition = function() {
V.arcologies.reduce((acc, val) => (val.direction !== 0 && val.prosperity > acc.prosperity) ? val : acc, V.arcologies[1]).rival = 1;
V.rival.state = 2;
}
- V.targetAge = V.minimumSlaveAge;
V.targetAgeNursery = V.minimumSlaveAge;
resetFamilyCounters();
diff --git a/src/events/nonRandom/rival/pHostageAcquisition.js b/src/events/nonRandom/rival/pHostageAcquisition.js
index 107e777b166d5786e0687dd26c290cf43231a1d5..da218b77324c9ac8eb539b5be4120652ec1df171 100644
--- a/src/events/nonRandom/rival/pHostageAcquisition.js
+++ b/src/events/nonRandom/rival/pHostageAcquisition.js
@@ -1078,7 +1078,7 @@ App.Events.pHostageAcquisition = class pHostageAcquisition extends App.Events.Ba
r.push(`the ground`);
}
r.push(`and begins praying`);
- r.push(Spoken(V.hostage, `"Please pardon this arcology's sins! They know naught what they do!"`));
+ r.push(Spoken(V.hostage, `"Please pardon this arcology's sins! They know not what they do!"`));
r.push(`While ${he} looks the same as you remember, ${he} definitely doesn't think the same anymore.`);
} else {
V.hostage.trust = 80;
diff --git a/src/events/nonRandom/shootResult.js b/src/events/nonRandom/shootResult.js
index 3e539ceb61352ffe0b37053c1a69f6b3133ccaff..d44df9612f788dcbc27e15a1cdffadc4ae2a9288 100644
--- a/src/events/nonRandom/shootResult.js
+++ b/src/events/nonRandom/shootResult.js
@@ -20,7 +20,7 @@ App.Events.PShootResult = class PShootResult extends App.Events.BaseEvent {
r.push(`He leads the party towards a broad lawn with a long table along one side, and indicates the handsome single-barrel shotguns lined up on the table. He continues, "In a few moments, some really choice livestock are going to be led up onto this lawn. They have been told that if they can run from one side to the other, they'll be freed." He winks. "Those guns are loaded with taser slugs, of course. Whatever you drop and fuck, you get to take home."`);
App.Events.addParagraph(node, r);
r =[];
- r.push(`The crowd of nude slaves led up to the lawn and chained to rings along one edge all have pale skin — the better to show impacts, perhaps. But besides that, they are extremely varied, and all physically extraordinary in some way. After you and your fellow partiers are ready, your host fires an old-fashioned revolver in the air and the chained slaves are all released at once. You could easily hit any of them, but you only have one shot.`);
+ r.push(`The crowd of nude slaves led up to the lawn and chained to rings along one edge all have pale or light skin — the better to show impacts, perhaps. But besides that, they are extremely varied, and all physically extraordinary in some way. After you and your fellow partiers are ready, your host fires an old-fashioned revolver in the air and the chained slaves are all released at once. You could easily hit any of them, but you only have one shot.`);
App.Events.addParagraph(node, r);
IncreasePCSkills('warfare', 2);
@@ -37,6 +37,37 @@ App.Events.PShootResult = class PShootResult extends App.Events.BaseEvent {
App.Events.addResponses(node, responses);
+ function adjustSkin(slave) {
+ switch (slave.race) {
+ case "black":
+ slave.origSkin = "light brown";
+ break;
+ case "white":
+ slave.origSkin = either("pale", "very pale");
+ break;
+ case "latina":
+ case "indo-aryan":
+ case "malay":
+ case "middle eastern":
+ case "semitic":
+ slave.origSkin = "light";
+ break;
+ case "pacific islander":
+ case "amerindian":
+ slave.origSkin = "light olive";
+ break;
+ case "asian":
+ slave.origSkin = either("light", "fair", "pale", "very pale");
+ break;
+ case "southern european":
+ slave.origSkin = either("light", "fair");
+ break;
+ default:
+ slave.origSkin = "light";
+ }
+ applyGeneticColor(slave);
+ }
+
function muscle() {
const el = new DocumentFragment();
let r = [];
@@ -44,6 +75,7 @@ App.Events.PShootResult = class PShootResult extends App.Events.BaseEvent {
disableDisability: 1, ageOverridesPedoMode: 1, mixAge: 18, maxAge: 28
});
slave.origin = "You won $him at a shotgun match against other arcology owners.";
+ adjustSkin(slave);
slave.lips = random(5, 25);
slave.anus = 1;
slave.skill.vaginal = 15;
@@ -86,6 +118,7 @@ App.Events.PShootResult = class PShootResult extends App.Events.BaseEvent {
disableDisability: 1, ageOverridesPedoMode: 1, minAge: 8, maxAge: 8
});
slave.origin = "You won $him at a shotgun match against other arcology owners.";
+ adjustSkin(slave);
slave.lips = random(5, 25);
slave.anus = 0;
slave.skill.whoring = 0;
@@ -137,6 +170,7 @@ App.Events.PShootResult = class PShootResult extends App.Events.BaseEvent {
disableDisability: 1, ageOverridesPedoMode: 1, minAge: 36, maxAge: 42
});
slave.origin = "You won $him at a shotgun match against other arcology owners.";
+ adjustSkin(slave);
slave.vagina = 1;
slave.skill.vaginal = 15;
slave.skill.oral = 15;
@@ -183,6 +217,7 @@ App.Events.PShootResult = class PShootResult extends App.Events.BaseEvent {
disableDisability: 1, ageOverridesPedoMode: 1, minAge: 18, maxAge: 24
});
slave.origin = "You won $him at a shotgun match against other arcology owners.";
+ adjustSkin(slave);
slave.skill.vaginal = 15;
slave.skill.oral = 15;
slave.skill.whoring = 0;
diff --git a/src/events/randomEvent.js b/src/events/randomEvent.js
index e6dc58ce9979ea384d640fea3ed00c5e4a002df5..448e75a74401df3ec809e00d3304fb1ceccd0f47 100644
--- a/src/events/randomEvent.js
+++ b/src/events/randomEvent.js
@@ -113,6 +113,7 @@ App.Events.getIndividualEvents = function() {
new App.Events.RESSPermittedMasturbation(),
new App.Events.RESSPlimbHelp(),
new App.Events.RESSPlugDisobedience(),
+ new App.Events.RESSProstheticsPlease(),
new App.Events.RESSRebelliousArrogant(),
new App.Events.RESSRefreshmentDelivery(),
new App.Events.RESSResistantAnalVirgin(),
@@ -154,6 +155,7 @@ App.Events.getIndividualEvents = function() {
new App.Events.RESSWetDreams(),
new App.Events.RESSWhoreRebellious(),
+ new App.Events.RECIAdoptFollowUp(),
new App.Events.RECIButthole(),
new App.Events.RECIFeminization(),
new App.Events.RECIFuta(),
@@ -281,16 +283,23 @@ App.Events.getNonindividualEvents = function() {
new App.Events.REBusyMasterSuite(),
// refs
+ new App.Events.refsAntebellumArtifact(),
+ new App.Events.refsArabianArtifact(),
+ new App.Events.refsAztecArtifact(),
new App.Events.refsBaronDemand(),
new App.Events.refsBodyPurismEncounter(),
+ new App.Events.refsChineseArtifact(),
new App.Events.refsDeadBaron(),
new App.Events.refsDegradationistEncounter(),
- new App.Events.refsFeast(),
+ new App.Events.refsEdoArtifact(),
+ new App.Events.refsEgyptianArtifact(),
new App.Events.refsKnightlyDuel(),
new App.Events.refsMaturityPreferentialistEncounter(),
+ new App.Events.refsNeoImperialistFeast(),
new App.Events.refsPastoralistEncounter(),
new App.Events.refsPaternalistEncounter(),
new App.Events.refsPhysicalIdealistEncounter(),
+ new App.Events.refsRomanArtifact(),
new App.Events.refsRomanStoicism(),
new App.Events.refsTotallyLegitCatgirls(),
new App.Events.refsTransformationFetishismEncounter(),
diff --git a/src/events/reRecruit/blessedVessel.js b/src/events/reRecruit/blessedVessel.js
index e669ab0aa810726e3105c02728328ed5970b7ad6..ad9269762cbd0113c1fd6d29dc230241e9c7df2a 100644
--- a/src/events/reRecruit/blessedVessel.js
+++ b/src/events/reRecruit/blessedVessel.js
@@ -23,7 +23,7 @@ App.Events.recBlessedVessel = class recBlessedVessel extends App.Events.BaseEven
} = getPronouns(slave);
let r = [];
- r.push(`As a minor point of information on your daily news download, you see that yet another of the new religions (cults really) that tend to spring up like weeds in the Free Cities has met its almost inevitable fate. Even with the most charismatic leader, starry-eyed idealism or boundless greed in milking the followers usually put a sudden end to the various self-declared churches, temples and holy places. In this case, the cult leader successfully made a hasty getaway, leaving his creditors and conned believers behind. Repo men are sent out in force, carting off the contents of the 'house of worship' and the luxurious apartment the man kept.`);
+ r.push(`As a minor point of information on your daily news download, you see that yet another of the new religions (cults really) that tend to spring up like weeds in the Free Cities has met its almost inevitable fate. Even with the most charismatic leader, starry-eyed idealism or boundless greed in milking the followers usually put a sudden end to the various self-declared churches, temples, and holy places. In this case, the cult leader successfully made a hasty getaway, leaving his creditors and conned believers behind. Repo men are sent out in force, carting off the contents of the 'house of worship' and the luxurious apartment the man kept.`);
App.Events.addParagraph(node, r);
r = [];
r.push(`Wondering what sorts of strange paraphernalia or weird sex toys the grifter might have kept himself amused with, you casually select the feed of one of the surveillance cameras that overlooks the area. And indeed, the contents of many boxes being carried out of there do have a certain perverted look to them, prompting you to zoom in — which is when the obscenely child-filled body of a`);
diff --git a/src/events/reRecruit/blessedVirgin.js b/src/events/reRecruit/blessedVirgin.js
index eb1624bcc466b55744903d1cffb38578b1e4206e..a6cb1427c08520c76fefe9a96d88603949b83fcd 100644
--- a/src/events/reRecruit/blessedVirgin.js
+++ b/src/events/reRecruit/blessedVirgin.js
@@ -22,7 +22,7 @@ App.Events.recBlessedVirgin = class recBlessedVirgin extends App.Events.BaseEven
} = getPronouns(slave);
let r = [];
- r.push(`As a minor point of information on your daily news download, you see that yet another of the new religions (cults really) that tend to spring up like weeds in the Free Cities has met its almost inevitable fate. Even with the most charismatic leader, starry-eyed idealism or boundless greed in milking the followers usually put a sudden end to the various self-declared churches, temples and holy places. In this case, the cult leader successfully made a hasty getaway, leaving his creditors and conned believers behind. Repo men are sent out in force, carting off the contents of the 'house of worship' and the luxurious apartment the man kept.`);
+ r.push(`As a minor point of information on your daily news download, you see that yet another of the new religions (cults really) that tend to spring up like weeds in the Free Cities has met its almost inevitable fate. Even with the most charismatic leader, starry-eyed idealism or boundless greed in milking the followers usually put a sudden end to the various self-declared churches, temples, and holy places. In this case, the cult leader successfully made a hasty getaway, leaving his creditors and conned believers behind. Repo men are sent out in force, carting off the contents of the 'house of worship' and the luxurious apartment the man kept.`);
App.Events.addParagraph(node, r);
r = [];
r.push(`Wondering what sorts of strange paraphernalia or weird sex toys the grifter might have kept himself amused with, you casually select the feed of one of the surveillance cameras that overlooks the area. And indeed, the contents of many boxes being carried out of there do have a certain perverted look to them, prompting you to zoom in — which is when a pretty, young, naked and extremely pregnant`);
diff --git a/src/events/reRecruit/ccsAngel.js b/src/events/reRecruit/ccsAngel.js
index 5500db205743dc5cc370c7f384cc829edd33faea..c760b849c318635a493df163ae45187db8486d63 100644
--- a/src/events/reRecruit/ccsAngel.js
+++ b/src/events/reRecruit/ccsAngel.js
@@ -21,7 +21,7 @@ App.Events.recCcsAngel = class recCcsAngel extends App.Events.BaseEvent {
} = getPronouns(slave);
let r = [];
- r.push(`As a minor point of information on your daily news download, you see that yet another of the new religions (cults really) that tend to spring up like weeds in the Free Cities has met its almost inevitable fate. Even with the most charismatic leader, starry-eyed idealism or boundless greed in milking the followers usually put a sudden end to the various self-declared churches, temples and holy places. In this case, the cult leader successfully made a hasty getaway, leaving his creditors and conned believers behind. Repo men are sent out in force, carting off the contents of the 'house of worship' and the luxurious apartment the man kept.`);
+ r.push(`As a minor point of information on your daily news download, you see that yet another of the new religions (cults really) that tend to spring up like weeds in the Free Cities has met its almost inevitable fate. Even with the most charismatic leader, starry-eyed idealism or boundless greed in milking the followers usually put a sudden end to the various self-declared churches, temples, and holy places. In this case, the cult leader successfully made a hasty getaway, leaving his creditors and conned believers behind. Repo men are sent out in force, carting off the contents of the 'house of worship' and the luxurious apartment the man kept.`);
App.Events.addParagraph(node, r);
r = [];
r.push(`Wondering what sorts of strange paraphernalia or weird sex toys the grifter might have kept himself amused with, you casually select the feed of one of the surveillance cameras that overlooks the area. And indeed, the contents of many boxes being carried out of there do have a certain perverted look to them, prompting you to zoom in — which is when a pretty, young and almost naked`);
diff --git a/src/events/reRecruit/ccsDA.js b/src/events/reRecruit/ccsDA.js
index 771918d7db4d079716d14df69f31ca9d58e6656b..ea7d8f8091c00a2ddf65e1603e604bc44e774f09 100644
--- a/src/events/reRecruit/ccsDA.js
+++ b/src/events/reRecruit/ccsDA.js
@@ -21,7 +21,7 @@ App.Events.recCcsDA = class recCcsDA extends App.Events.BaseEvent {
} = getPronouns(slave);
let r = [];
- r.push(`As a minor point of information on your daily news download, you see that yet another of the new religions (cults really) that tend to spring up like weeds in the Free Cities has met its almost inevitable fate. Even with the most charismatic leader, starry-eyed idealism or boundless greed in milking the followers usually put a sudden end to the various self-declared churches, temples and holy places. In this case, the cult leader successfully made a hasty getaway, leaving his creditors and conned believers behind. Repo men are sent out in force, carting off the contents of the 'house of worship' and the luxurious apartment the man kept.`);
+ r.push(`As a minor point of information on your daily news download, you see that yet another of the new religions (cults really) that tend to spring up like weeds in the Free Cities has met its almost inevitable fate. Even with the most charismatic leader, starry-eyed idealism or boundless greed in milking the followers usually put a sudden end to the various self-declared churches, temples, and holy places. In this case, the cult leader successfully made a hasty getaway, leaving his creditors and conned believers behind. Repo men are sent out in force, carting off the contents of the 'house of worship' and the luxurious apartment the man kept.`);
App.Events.addParagraph(node, r);
r = [];
r.push(`Wondering what sorts of strange paraphernalia or weird sex toys the grifter might have kept himself amused with, you casually select the feed of one of the surveillance cameras that overlooks the area. And indeed, the contents of many boxes being carried out of there do have a certain perverted look to them, prompting you to zoom in — which is when a pretty, young and almost naked`);
diff --git a/src/events/reRecruit/repoMilfHousekeeper.js b/src/events/reRecruit/repoMilfHousekeeper.js
index 9dc0b1f1566a1b9dc93c906d9d2d183fb0f487fa..9f5727b39de16fcf2e6cfda528eccea5f9e5deb1 100644
--- a/src/events/reRecruit/repoMilfHousekeeper.js
+++ b/src/events/reRecruit/repoMilfHousekeeper.js
@@ -53,7 +53,7 @@ App.Events.recRepoMilfHousekeeper = class recRepoMilfHousekeeper extends App.Eve
}
function makeSlave() {
- const slave = GenerateNewSlave(null, {
+ const slave = GenerateNewSlave("XX", {
minAge: 35, maxAge: 43,
ageOverridesPedoMode: 1, disableDisability: 1
});
diff --git a/src/events/scheduled/burst/burst.js b/src/events/scheduled/burst/burst.js
index fc7de3835ca1f686f2bee62b75483293f109c0e9..cd54aefeaefcf8e0882da38fc1256938e242c412 100644
--- a/src/events/scheduled/burst/burst.js
+++ b/src/events/scheduled/burst/burst.js
@@ -18,6 +18,8 @@ App.Events.SEBurst = class SEBurst extends App.Events.BaseEvent {
for (const slave of this.actors.map(id => getSlave(id))) {
if (slave.womb.length > 0) {
node.append(birth(slave, {artRenderer}));
+ } else if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true)) {
+ node.append(torture(slave));
} else {
node.append(pop(slave));
}
@@ -61,6 +63,38 @@ App.Events.SEBurst = class SEBurst extends App.Events.BaseEvent {
return el;
}
+ /**
+ *
+ * @param {App.Entity.SlaveState} slave
+ * @returns {DocumentFragment}
+ */
+ function torture(slave) {
+ const el = new DocumentFragment();
+ const r = [];
+ const {
+ he, his, him
+ } = getPronouns(slave);
+ if (artRenderer) {
+ App.UI.DOM.drawOneSlaveRight(el, slave, artRenderer);
+ }
+ r.push(`${slave.slaveName} belly is positively bursting`);
+ if (slave.inflation !== 0) {
+ r.push(`with ${slave.inflationType},`);
+ } else {
+ r.push(`as is,`);
+ }
+ r.push(`so it's extra fun to punch and strike at it to see ${his} pained reactions. You land a solid blow to ${his} straining gut and, like the world's worst piniata, ${he} bursts, showering the area around ${him} with`);
+ if (slave.inflation !== 0) {
+ r.push(`blood, guts and ${slave.inflationType}.`);
+ } else {
+ r.push(`blood and guts.`);
+ }
+ r.push(`It seems you'll need a new toy to play with.`);
+ el.append(r.join(" "));
+ el.append(horrifiedSlaves(slave));
+ return el;
+ }
+
function sectionBreak() {
const hr = document.createElement("hr");
hr.style.margin = "0";
diff --git a/src/events/scheduled/sePlayerBirth.js b/src/events/scheduled/sePlayerBirth.js
index dbb6ab0a0a264ca24305d4369afce116af7a8b7f..6f3e3db780c8fb2cd78af0bdb42bba694591bc5c 100644
--- a/src/events/scheduled/sePlayerBirth.js
+++ b/src/events/scheduled/sePlayerBirth.js
@@ -798,7 +798,7 @@ App.Events.SEPlayerBirth = class SEPlayerBirth extends App.Events.BaseEvent {
}
r.push(`aside for incubation.</span>`);
if (V.incubator.tanks.length < V.incubator.capacity) {
- App.Facilities.Incubator.newChild(generateChild(V.PC, birthed[0], true));
+ App.Facilities.Incubator.newChild(generateChild(V.PC, birthed[0], true), birthed[0].tankSetting);
}
} else if (birthed[0].reserve === "nursery") {
r.push(`<span class="pink">You set`);
@@ -905,7 +905,7 @@ App.Events.SEPlayerBirth = class SEPlayerBirth extends App.Events.BaseEvent {
}
r.push(`aside for incubation.</span>`);
if (V.incubator.tanks.length < V.incubator.capacity) {
- App.Facilities.Incubator.newChild(generateChild(V.PC, birthed[p], true));
+ App.Facilities.Incubator.newChild(generateChild(V.PC, birthed[p], true), birthed[p].tankSetting);
}
birthed.splice(birthed[p], 1);
p--;
diff --git a/src/events/schools/resFailure.js b/src/events/schools/resFailure.js
index 1692dd4cfbbd4c32e50bdc4535f647ad0d6d01bc..7db163ac6802a05e8bedbfb2d3e1ee8ab56f567c 100644
--- a/src/events/schools/resFailure.js
+++ b/src/events/schools/resFailure.js
@@ -252,7 +252,7 @@ App.Events.RESFailure = class RESFailure extends App.Events.BaseEvent {
for (const slave of slaveArray) {
newSlave(slave);
if (failedSchool === "TFS") {
- V.REFutaSisterCheckinIDs.push(slave.ID);
+ V.RECheckInIDs.push({ID: slave.ID, type: "futa"});
}
}
return `${capFirstChar(SCH.slaveNoun)} acquired.`;
diff --git a/src/facilities/brothel/brothel.js b/src/facilities/brothel/brothel.js
index 3da97050d2eb3e941ee66d3c06d68f03d40a6922..5fc1122f4760a117878132a2619995a6c8938c4f 100644
--- a/src/facilities/brothel/brothel.js
+++ b/src/facilities/brothel/brothel.js
@@ -40,6 +40,7 @@ App.Facilities.Brothel.brothel = class Brothel extends App.Facilities.Facility {
"Edo Revivalist": `is furnished as an Edo period pleasure house, seedy by the standards of the time. Still, girls usually keep their clothes on until they lead patrons back behind the sliding paper screens, though this does not stop silhouettes of the activities within from being visible on them.`,
"Arabian Revivalist": `is furnished as an Arabian fleshmarket, with the merchandise standing on little platforms, prices visible. Customers are permitted to fondle before making a decision and dragging a girl back behind a curtain.`,
"Chinese Revivalist": `is furnished as an old Chinese pleasure house, with each girl set up in her own low room. They stand outside the doors, luring customers back one by one.`,
+ "Antebellum Revivalist": `is furnished as an old-fashioned Southern bordello, all dark wood and red velvet. Corseted courtesans fan themselves languidly in the foyer as they entice their customers.`, // quick fix, feel free to rewrite
"Chattel Religionist": `is decorated as a place of carnal worship. The air is scented by censers, and the slaves here maintain an air of holiness even when being sodomized in public.`,
"Degradationist": `is decorated to look like a dungeon. The décor involves a lot of black leather and burnished steel, and the slaves on offer are mostly chained to beds and walls.`,
"Repopulationist": `is clean and full of soft couches and chairs for its pregnant whores to lounge upon while showing off their assets. Several of the rooms are prepped to allow a whore to give birth in front of an audience. A supply of freshly squeezed breast milk is available on tap.`,
diff --git a/src/facilities/incubator/incubatorInteract.js b/src/facilities/incubator/incubatorInteract.js
index a12235ab1e82952a107e3fbb2376a897182967cd..8f0adabf99a22d2b861d81c1e354ca87712a8682 100644
--- a/src/facilities/incubator/incubatorInteract.js
+++ b/src/facilities/incubator/incubatorInteract.js
@@ -28,7 +28,7 @@ App.UI.incubator = function() {
tabBar.addTab("You", "pc", pcContent);
}
tabBar.addTab("Tanks", "tanks", tanksContent);
- tabBar.addTab("Settings", "settings", settingsContent);
+ tabBar.addTab("Default Settings", "settings", settingsContent);
el.append(tabBar.render());
introDiv.after(release()); // run me late.
@@ -123,7 +123,38 @@ App.UI.incubator = function() {
el.append(tankP);
+ /* Bulk or individual release */
+ let section = document.createElement("p");
+ if (V.incubator.bulkRelease === 1) {
+ section.append(`Released children will be handled in bulk and not receive personal attention. `);
+ section.append(
+ App.UI.DOM.link(
+ `Individual release`,
+ () => {
+ V.incubator.bulkRelease = 0;
+ refresh();
+ }
+ )
+ );
+ } else {
+ section.append(`Released children will be seen to personally. `);
+ section.append(
+ App.UI.DOM.link(
+ `Bulk release`,
+ () => {
+ V.incubator.bulkRelease = 1;
+ refresh();
+ }
+ )
+ );
+ }
+ el.append(section);
+
return el;
+
+ function refresh() {
+ jQuery(introDiv).empty().append(intro());
+ }
}
function mothers() {
@@ -250,6 +281,7 @@ App.UI.incubator = function() {
} else {
r.push(`baby.`);
}
+
if (reservedIncubator > 0) {
childrenReserved = 1;
if (WL === 1) {
@@ -765,7 +797,7 @@ App.UI.incubator = function() {
r.push(`as it appears ${his} womb is sterile.`);
}
}
- if ((V.incubator.setting.pregAdaptation === 1 && V.incubator.tanks[i].genes === "XX") || (V.incubator.setting.pregAdaptation === 2 && V.incubator.tanks[i].genes === "XY") || V.incubator.setting.pregAdaptation === 3) {
+ if (V.incubator.tanks[i].incubatorSettings.pregAdaptation === 1) {
r.push(`There are probes and tubes inserted inside ${his} reproductive organs so ${V.incubator.name} may work on them.`);
const safeCC = (V.incubator.tanks[i].pregAdaptation - 5) * 2000;
if (safeCC > 300000) {
@@ -790,11 +822,11 @@ App.UI.incubator = function() {
}
}
App.Events.addNode(p, r, "div");
- if (V.incubator.tanks[i].growTime <= 0) {
+ if (V.incubator.tanks[i].incubatorSettings.growTime <= 0) {
V.incubator.readySlaves = 1;
appendRow(p, `${He} is ready to be released from ${his} tank.`);
} else {
- const weekDisplay = Math.ceil(V.incubator.tanks[i].growTime / V.incubator.upgrade.speed);
+ const weekDisplay = Math.ceil(V.incubator.tanks[i].incubatorSettings.growTime / V.incubator.upgrade.speed);
appendRow(p, `${His} growth is currently being accelerated. ${He} will be ready for release in about ${weekDisplay} ${(weekDisplay > 1) ? `weeks` : `week`}.`);
}
@@ -813,49 +845,49 @@ App.UI.incubator = function() {
if (V.incubator.upgrade.weight === 1) {
- if (V.incubator.setting.weight === 1) {
+ if (V.incubator.tanks[i].incubatorSettings.weight === 1) {
appendRow(p, `${His} weight is not being properly managed, saving costs but likely causing excessive weight gain.`);
- } else if (V.incubator.setting.weight === 2) {
+ } else if (V.incubator.tanks[i].incubatorSettings.weight === 2) {
appendRow(p, `${His} weight is being carefully managed; ${he} will be released at a healthy weight.`);
- } else if (V.incubator.setting.weight === 0) {
+ } else if (V.incubator.tanks[i].incubatorSettings.weight === 0) {
appendRow(p, `Weight management systems are offline; ${he} will likely be malnourished.`);
}
}
if (V.incubator.upgrade.muscles === 1) {
- if (V.incubator.setting.muscles === 2) {
+ if (V.incubator.tanks[i].incubatorSettings.muscles === 2) {
appendRow(p, `${His} strength levels are purposefully set higher than recommended; ${he} is likely to have excessive musculature.`);
- } else if (V.incubator.setting.muscles === 1) {
+ } else if (V.incubator.tanks[i].incubatorSettings.muscles === 1) {
appendRow(p, `${His} musculature is being carefully managed; ${he} will be released with near normal strength.`);
- } else if (V.incubator.setting.muscles === 0) {
+ } else if (V.incubator.tanks[i].incubatorSettings.muscles === 0) {
appendRow(p, `Strength management systems are offline; ${he} will likely be released extremely weak.`);
}
}
if (V.incubator.upgrade.growthStims === 1) {
- if (V.incubator.setting.growthStims === 2) {
+ if (V.incubator.tanks[i].incubatorSettings.growthStims === 2) {
appendRow(p, `${He} is being injected with higher than recommended doses of stimulants; ${he} is likely to be much taller than expected.`);
- } else if (V.incubator.setting.growthStims === 1) {
+ } else if (V.incubator.tanks[i].incubatorSettings.growthStims === 1) {
appendRow(p, `${He} is injected with the recommended dosage of stimulants; ${he} will grow to ${his} full expected height.`);
- } else if (V.incubator.setting.growthStims === 0) {
+ } else if (V.incubator.tanks[i].incubatorSettings.growthStims === 0) {
appendRow(p, `Growth stimulant injection systems are offline; ${he} will develop normally.`);
}
}
if (V.incubator.upgrade.reproduction === 1) {
- if (V.incubator.setting.reproduction === 2) {
+ if (V.incubator.tanks[i].incubatorSettings.reproduction === 2) {
appendRow(p, `${His} hormone levels are purposefully set higher than recommended; ${his} reproductive systems are likely to be over-active.`);
- } else if (V.incubator.setting.reproduction === 1) {
+ } else if (V.incubator.tanks[i].incubatorSettings.reproduction === 1) {
appendRow(p, `${His} hormone levels are being carefully managed; ${he} will be released with fully functional reproductive organs.`);
- } else if (V.incubator.setting.reproduction === 0) {
+ } else if (V.incubator.tanks[i].incubatorSettings.reproduction === 0) {
appendRow(p, `Reproduction management systems are offline; ${he} will undergo normal puberty.`);
}
- if ((V.incubator.setting.pregAdaptation === 1 && V.incubator.tanks[i].genes === "XX") || (V.incubator.setting.pregAdaptation === 2 && V.incubator.tanks[i].genes === "XY") || V.incubator.setting.pregAdaptation === 3) {
+ if (V.incubator.tanks[i].incubatorSettings.pregAdaptation === 1) {
/* Should be visible only after incubator.setting.reproduction is installed and activated*/
r = [];
r.push(`${His} reproductive organs are getting`);
- if (V.incubator.setting.pregAdaptationPower === 1) {
+ if (V.incubator.tanks[i].incubatorSettings.pregAdaptationPower === 1) {
r.push(`an advanced`);
- } else if (V.incubator.setting.pregAdaptationPower === 2) {
+ } else if (V.incubator.tanks[i].incubatorSettings.pregAdaptationPower === 2) {
r.push(`an intensive`);
- } else if (V.incubator.setting.pregAdaptationPower === 3) {
+ } else if (V.incubator.tanks[i].incubatorSettings.pregAdaptationPower === 3) {
r.push(`an extreme`);
} else {
r.push(`a standard`);
@@ -888,6 +920,7 @@ App.UI.incubator = function() {
() => {
V.readySlave = V.incubator.tanks[i];
V.incubator.tanks.splice(i, 1);
+ release();
},
[],
"Incubator Retrieval Workaround"
@@ -1012,6 +1045,20 @@ App.UI.incubator = function() {
App.Events.addNode(p, r, "div");
}
}
+
+ App.UI.DOM.appendNewElement(
+ "div",
+ p,
+ App.UI.DOM.link(
+ `Inspect tank settings`,
+ () => {
+ V.AS = i;
+ },
+ [],
+ `Inspect Tank Settings`
+ )
+ );
+
el.append(p);
}
}
@@ -1033,91 +1080,9 @@ App.UI.incubator = function() {
function tankSettings() {
const el = new DocumentFragment();
- let div;
- let r = [];
- let section;
- let linkArray;
- r.push("Target age for release:");
- r.push(
- App.UI.DOM.makeTextBox(
- V.targetAge,
- (v) => {
- V.targetAge = v || V.minimumSlaveAge;
- V.targetAge = Math.clamp(V.targetAge, V.minimumSlaveAge, V.retirementAge);
- refresh();
- },
- true
- )
- );
- linkArray = [];
- linkArray.push(
- App.UI.DOM.link(
- `Minimum Legal Age`,
- () => {
- V.targetAge = V.minimumSlaveAge;
- refresh();
- }
- )
- );
- linkArray.push(
- App.UI.DOM.link(
- `Average Age of Fertility`,
- () => {
- V.targetAge = V.fertilityAge;
- refresh();
- }
- )
- );
- linkArray.push(
- App.UI.DOM.link(
- `Average Age of Potency`,
- () => {
- V.targetAge = V.potencyAge;
- refresh();
- }
- )
- );
- linkArray.push(
- App.UI.DOM.link(
- `Legal Adulthood`,
- () => {
- V.targetAge = 18;
- refresh();
- }
- )
- );
- r.push(App.UI.DOM.generateLinksStrip(linkArray));
- r.push(App.UI.DOM.makeElement("span", `Setting will not be applied to tanks in use.`, ["note"]));
- App.Events.addNode(el, r, "p");
-
- section = document.createElement("p");
- if (V.incubator.setting.bulkRelease === 1) {
- section.append(`Released children will be handled in bulk and not receive personal attention. `);
- section.append(
- App.UI.DOM.link(
- `Individual release`,
- () => {
- V.incubator.setting.bulkRelease = 0;
- refresh();
- }
- )
- );
- } else {
- section.append(`Released children will be seen to personally. `);
- section.append(
- App.UI.DOM.link(
- `Bulk release`,
- () => {
- V.incubator.setting.bulkRelease = 1;
- refresh();
- }
- )
- );
- }
- el.append(section);
-
- section = document.createElement("div");
+ /* Growth acceleration */
+ let section = document.createElement("p");
if (V.incubator.upgrade.speed === 52) {
section.append(`It has been upgraded with perfected growth accelerants; children grow at the rate of 1 week to 1 year.`);
} else if (V.incubator.upgrade.speed === 18) {
@@ -1169,34 +1134,13 @@ App.UI.incubator = function() {
})
);
}
-
el.append(section);
- div = document.createElement("div");
- section = document.createElement("div");
+
+ /* Weight monitoring */
+ section = document.createElement("p");
if (V.incubator.upgrade.weight === 1) {
section.append(`Advanced caloric monitoring systems have been installed in the tanks to monitor and maintain a developing child's weight.`);
- div.append(section);
- section = document.createElement("div");
- linkArray = [];
- if (V.incubator.setting.weight === 1) {
- section.append(`Weight is not being properly managed; excessive weight gain is likely.`);
- } else {
- linkArray.push(makeLink(`Estimate only`, () => { V.incubator.setting.weight = 1; }, refresh));
- }
-
- if (V.incubator.setting.weight === 2) {
- section.append(`Weight is being carefully managed; children will be released at a healthy weight.`);
- } else {
- linkArray.push(makeLink(`Activate`, () => { V.incubator.setting.weight = 2; }, refresh));
- }
-
- if (V.incubator.setting.weight === 0) {
- section.append(`Weight management systems are offline; children will likely be malnourished.`);
- } else {
- linkArray.push(makeLink(`Disable`, () => { V.incubator.setting.weight = 0; }, refresh));
- }
- section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
} else {
const cost = Math.trunc(20000 * V.upgradeMultiplierArcology);
section.append(`There are no systems in place to control a growing child's weight; they will likely come out emaciated from the rapid growth.`);
@@ -1210,37 +1154,13 @@ App.UI.incubator = function() {
})
);
}
+ el.append(section);
- div.append(section);
- el.append(div);
-
- div = document.createElement("div");
- section = document.createElement("div");
+ /* Muscles */
+ section = document.createElement("p");
if (V.incubator.upgrade.muscles === 1) {
section.append(`Advanced monitoring and steroid injection systems have been installed in the tanks to monitor and maintain a developing child's musculature.`);
- div.append(section);
- section = document.createElement("div");
- linkArray = [];
- if (V.incubator.setting.muscles === 2) {
- section.append(`Strength levels are purposefully set higher than recommended; excessive muscle gain is likely.`);
- } else {
- linkArray.push(makeLink(`Overload`, () => { V.incubator.setting.muscles = 2; }, refresh));
- }
-
- if (V.incubator.setting.muscles === 1) {
- section.append(`Musculature is being carefully managed; children will be released with near normal strength.`);
- } else {
- linkArray.push(makeLink(`Activate`, () => { V.incubator.setting.muscles = 1; }, refresh));
- }
-
- if (V.incubator.setting.muscles === 0) {
- section.append(`Strength management systems are offline; children will likely be released extremely weak.`);
- } else {
- linkArray.push(makeLink(`Disable`, () => { V.incubator.setting.muscles = 0; }, refresh));
- }
-
- section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
} else {
const cost = Math.trunc(20000 * V.upgradeMultiplierArcology);
section.append(`There are no systems in place to control a growing child's musculature; they will likely come out frail and weak from the rapid growth.`);
@@ -1254,106 +1174,35 @@ App.UI.incubator = function() {
})
);
}
+ el.append(section);
- div.append(section);
- el.append(div);
- div = document.createElement("div");
- section = document.createElement("div");
+ /* Height */
+ section = document.createElement("p");
+ if (V.incubator.upgrade.growthStims === 1) {
+ section.append(`Advanced monitoring and stimulant injection systems have been installed in the tanks to monitor and maintain a developing child's height.`);
+ } else if (V.growthStim === 1) {
+ const cost = Math.trunc(20000 * V.upgradeMultiplierArcology);
+ section.append(`There are no systems in place to control a growing child's height.`);
+ section.append(
+ makePurchase(`Upgrade the growth tanks with stimulants injection systems`, cost, "capEx", {
+ handler: () => {
+ V.incubator.upgrade.growthStims = 1;
+ refresh();
+ },
+ notes: [`will increase upkeep costs`]
+ })
+ );
+ } else {
+ App.UI.DOM.appendNewElement("span", section, `There are no systems in place to control a growing child's height and you lack the capability to fabricate growth stimulants.`, ["note"]);
+ }
+ el.append(section);
+
+ /* Reproductive system */
+ section = document.createElement("p");
if (V.incubator.upgrade.reproduction === 1) {
section.append(`Advanced monitoring and hormone injection systems have been installed in the tanks to influence a developing child's reproductive organs.`);
- div.append(section);
- section = document.createElement("div");
- linkArray = [];
- if (V.incubator.setting.reproduction === 2) {
- section.append(`Hormone levels are purposefully set higher than recommended; over-active reproductive systems are likely.`);
- } else {
- linkArray.push(makeLink(`Overload`, () => { V.incubator.setting.reproduction = 2; }, refresh));
- }
-
- if (V.incubator.setting.reproduction === 1) {
- section.append(`Hormone levels are being carefully managed; children will be released with fully functional reproductive organs.`);
- } else {
- linkArray.push(makeLink(`Limit`, () => { V.incubator.setting.reproduction = 1; }, refresh));
- }
-
- if (V.incubator.setting.reproduction === 0) {
- section.append(`Reproduction management systems are offline; children will undergo normal puberty.`);
- } else {
- linkArray.push(makeLink(`Disable`, () => { V.incubator.setting.reproduction = 0; }, refresh));
- }
- section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
- div.append(section);
- el.append(div);
-
- if (V.incubator.upgrade.pregAdaptation === 1) {
- // Should be visible only after incubator.upgrade.reproduction is installed
- div = document.createElement("div");
- section = document.createElement("div");
- linkArray = [];
- if (V.incubator.setting.pregAdaptation === 3) {
- section.append(`Pregnancy adaptation system online: All.`);
- } else {
- linkArray.push(makeLink(`All`, () => { V.incubator.setting.pregAdaptation = 3; }, refresh));
- }
-
- if (V.incubator.setting.pregAdaptation === 2) {
- section.append(`Pregnancy adaptation system online: Males only.`);
- } else {
- linkArray.push(makeLink(`Males`, () => { V.incubator.setting.pregAdaptation = 2; }, refresh));
- }
-
- if (V.incubator.setting.pregAdaptation === 1) {
- section.append(`Pregnancy adaptation system online: Females only.`);
- } else {
- linkArray.push(makeLink(`Females`, () => { V.incubator.setting.pregAdaptation = 1; }, refresh));
- }
-
- if (V.incubator.setting.pregAdaptation === 0) {
- section.append(`Pregnancy adaptation system offline.`);
- } else {
- linkArray.push(makeLink(`Disable`, () => { V.incubator.setting.pregAdaptation = 0; }, refresh));
- }
- section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
-
- if (V.incubator.upgrade.pregAdaptation === 1 && V.incubator.setting.pregAdaptation > 0) {
- // Should be visible only after incubator.upgrade.reproduction is installed and turned on
- div.append(section);
- section = document.createElement("div");
- linkArray = [];
- if (V.incubator.setting.pregAdaptationPower === 1) {
- section.append(`Pregnancy adaptation programmed to advanced procedures. Up to triplet pregnancy should be safe for the subjects.`);
- } else {
- linkArray.push(makeLink(`Advanced`, () => { V.incubator.setting.pregAdaptationPower = 1; }, refresh));
- }
-
- if (V.incubator.setting.pregAdaptationPower === 2) {
- section.append(`Pregnancy adaptation programmed to intensive procedures. Up to octuplet pregnancy should be possible for the subjects. Warning! Side effects may occur to health and mental condition.`);
- } else {
- linkArray.push(makeLink(`Intensive`, () => { V.incubator.setting.pregAdaptationPower = 2; }, refresh));
- }
-
- if (V.incubator.setting.pregAdaptationPower === 3) {
- section.append(`Pregnancy adaptation programmed to extreme procedures. Normally unsustainable pregnancies may be possible for some subjects. Actual capacity will vary with genetic and other individual conditions. WARNING! Extreme side effects may occur to health and mental condition! `);
- } else {
- linkArray.push(makeLink(`Extreme`, () => { V.incubator.setting.pregAdaptationPower = 3; }, refresh));
- }
-
- if (V.incubator.setting.pregAdaptationPower === 0) {
- section.append(`Pregnancy adaptation programmed to standard procedures. Normal pregnancy should be safe for subjects.`);
- } else {
- linkArray.push(makeLink(`Standard`, () => { V.incubator.setting.pregAdaptationPower = 0; }, refresh));
- }
- section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
- div.append(section);
-
- section = document.createElement("div");
- App.UI.DOM.appendNewElement("span", section, `Due to the high complexity and steep risks of the procedure, settings will not be changed on tanks in use.`, "note");
- }
- }
- div.append(section);
- el.append(div);
} else {
const cost = Math.trunc(50000 * V.upgradeMultiplierArcology);
section.append(`There are no systems in place to control a growing child's reproductive capability.`);
@@ -1366,13 +1215,53 @@ App.UI.incubator = function() {
notes: [`will increase upkeep costs`]
})
);
+ }
+ el.append(section);
+
+
+ /* Preg adaptation */
+ if (V.minimumSlaveAge <= 6 && (V.arcologies[0].FSRepopulationFocus >= 60 || V.BlackmarketPregAdaptation === 1)) {
+ /* Main prerequisite - stable repopulation FS OR documentation purchased from black market. And age gate. */
+ let div = document.createElement("div");
+ section = document.createElement("div");
+ if (V.incubator.upgrade.pregAdaptation === 1) {
+ section.append(`The incubators have been upgraded with special set of manipulators, probes, nozzles and syringes coupled together with specific programs to take advantage of the accelerated growth to heighten viable reproductive capacity. These include injections of specialized serums and mechanical manipulation of the reproductive system and associated tissues, organs, muscles and bones.`);
+ } else {
+ section.append(`The highly controlled environment inside incubation tube coupled with the greatly accelerated growth process is the perfect opportunity to push the boundaries of a body's ability to sustain pregnancy. This will include injections of specialized serums and mechanical manipulation of their reproductive system through a special set of manipulators, probes, nozzles and syringes supervised by a powerful monitoring program. Costly to maintain.`);
+ div.append(section);
+
+ section = document.createElement("div");
+ if (V.incubator.upgrade.reproduction < 1) {
+ /* Now with reports - what is lacking for construction */
+ section.append(`${incubatorNameCaps} lacks advanced monitoring and hormone injection systems. Construction not possible.`);
+ } else if (V.incubator.upgrade.organs < 1) {
+ section.append(`${incubatorNameCaps} lacks the ability to extract tissue samples. Construction not possible.`);
+ } else if (V.dispensaryUpgrade < 1) {
+ section.append(`${incubatorNameCaps} lacks a connection to an advanced pharmaceutical fabricator. Cutting-edge targeted serums production needed as integral part. Construction not possible.`);
+ } else if (V.bellyImplants < 1) {
+ section.append(`${incubatorNameCaps} lacks a connection with an implant manufacturing to construct fillable abdominal implants to simulate expansion. Construction not possible.`);
+ } else if (V.incubator.upgrade.growthStims < 1) {
+ section.append(`${incubatorNameCaps} lacks advanced monitoring and stimulant injection systems. Construction not possible.`);
+ } else {
+ const cost = Math.trunc(2000000 * V.upgradeMultiplierArcology);
+ section.append(
+ makePurchase(`Manufacture and install this subsystem`, cost, "capEx", {
+ handler: () => {
+ V.incubator.upgrade.pregAdaptation = 1;
+ refresh();
+ },
+ notes: [`will increase upkeep costs`]
+ })
+ );
+ }
+ }
div.append(section);
el.append(div);
}
- section = section = App.UI.DOM.makeElement("div", null, ["margin-top"]);
-
+ /* Tissue sampling */
+ section = document.createElement("p");
if (V.incubator.upgrade.organs === 1) {
section.append(`Surgical tools have been added to the tank to be able to extract tissue samples from the occupant.`);
} else if (V.organFarmUpgrade >= 1) {
@@ -1390,102 +1279,270 @@ App.UI.incubator = function() {
} else {
App.UI.DOM.appendNewElement("span", section, `The tanks lack the ability to extract tissue samples and the dispensary lacks the ability to make use of them to fabricate organs.`, ["note"]);
}
+ el.append(section);
+
+ /* Rename */
+ section = document.createElement("p");
+ section.append(App.Facilities.rename(App.Entity.facilities.incubator, () => refresh()));
el.append(section);
- div = document.createElement("div");
- section = document.createElement("div");
+ const tabBar = new App.UI.Tabs.TabBar("SettingsGender");
+ tabBar.addTab("Male Settings", "male", tankSettingsContent("XY"));
+ tabBar.addTab("Female Settings", "female", tankSettingsContent("XX"));
+ el.append(tabBar.render());
+
+ return el;
+
+ function refresh() {
+ jQuery(settingsContent).empty().append(tankSettings());
+ jQuery(introDiv).empty().append(intro());
+ jQuery(tanksContent).empty().append(tankBabies());
+ }
+ }
+
+ function tankSettingsContent(genes) {
+ const el = new DocumentFragment();
+ let r = [];
+ let section;
+ let linkArray;
+ const setting = (genes === "XX" ? V.incubator.femaleSetting : V.incubator.maleSetting);
+ /* Release age */
+ r.push("Target age for release:");
+ r.push(
+ App.UI.DOM.makeTextBox(
+ setting.targetAge,
+ (v) => {
+ setting.targetAge = v || V.minimumSlaveAge;
+ setting.targetAge = Math.clamp(setting.targetAge, V.minimumSlaveAge, V.retirementAge);
+ refresh();
+ },
+ true
+ )
+ );
+ linkArray = [];
+ linkArray.push(
+ App.UI.DOM.link(
+ `Minimum Legal Age`,
+ () => {
+ setting.targetAge = V.minimumSlaveAge;
+ refresh();
+ }
+ )
+ );
+ linkArray.push(
+ App.UI.DOM.link(
+ `Average Age of Fertility`,
+ () => {
+ setting.targetAge = V.fertilityAge;
+ refresh();
+ }
+ )
+ );
+ linkArray.push(
+ App.UI.DOM.link(
+ `Average Age of Potency`,
+ () => {
+ setting.targetAge = V.potencyAge;
+ refresh();
+ }
+ )
+ );
+ linkArray.push(
+ App.UI.DOM.link(
+ `Legal Adulthood`,
+ () => {
+ setting.targetAge = 18;
+ refresh();
+ }
+ )
+ );
+ r.push(App.UI.DOM.generateLinksStrip(linkArray));
+ r.push(App.UI.DOM.makeElement("div", `Cannot be modified after a tank's first week.`, "note"));
+ App.Events.addNode(el, r, "p");
+
+
+ /* Weight */
+ if (V.incubator.upgrade.weight === 1) {
+ section = document.createElement("p");
+ linkArray = [];
+
+ if (setting.weight === 1) {
+ section.append(`Weight is not being properly managed; excessive weight gain is likely.`);
+ } else {
+ linkArray.push(makeLink(`Estimate only`, () => { setting.weight = 1; }, refresh));
+ }
+
+ if (setting.weight === 2) {
+ section.append(`Weight is being carefully managed; children will be released at a healthy weight.`);
+ } else {
+ linkArray.push(makeLink(`Activate`, () => { setting.weight = 2; }, refresh));
+ }
+
+ if (setting.weight === 0) {
+ section.append(`Weight management systems are offline; children will likely be malnourished.`);
+ } else {
+ linkArray.push(makeLink(`Disable`, () => { setting.weight = 0; }, refresh));
+ }
+
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
+ el.append(section);
+ }
+
+
+ /* Muscles */
+ if (V.incubator.upgrade.muscles === 1) {
+ section = document.createElement("p");
+ linkArray = [];
+
+ if (setting.muscles === 2) {
+ section.append(`Strength levels are purposefully set higher than recommended; excessive muscle gain is likely.`);
+ } else {
+ linkArray.push(makeLink(`Overload`, () => { setting.muscles = 2; }, refresh));
+ }
+
+ if (setting.muscles === 1) {
+ section.append(`Musculature is being carefully managed; children will be released with near normal strength.`);
+ } else {
+ linkArray.push(makeLink(`Activate`, () => { setting.muscles = 1; }, refresh));
+ }
+
+ if (setting.muscles === 0) {
+ section.append(`Strength management systems are offline; children will likely be released extremely weak.`);
+ } else {
+ linkArray.push(makeLink(`Disable`, () => { setting.muscles = 0; }, refresh));
+ }
+
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
+ el.append(section);
+ }
+
+
+ /* Height */
if (V.incubator.upgrade.growthStims === 1) {
- section.append(`Advanced monitoring and stimulant injection systems have been installed in the tanks to monitor and maintain a developing child's height.`);
- section = document.createElement("div");
+ section = document.createElement("p");
linkArray = [];
- if (V.incubator.setting.growthStims === 2) {
- section.append(`Children are injected with higher than recommended doses of stimulants; exceeding expected final height is likely.`);
+
+ if (setting.growthStims === 2) {
+ section.append(`Children are injected with higher than recommended doses of stimulants; exceeding expected final height is likely. `);
} else {
- linkArray.push(makeLink(`Overload`, () => { V.incubator.setting.growthStims = 2; }, refresh));
+ linkArray.push(makeLink(`Overload`, () => { setting.growthStims = 2; }, refresh));
}
- if (V.incubator.setting.growthStims === 1) {
- section.append(`Children are injected with the recommended dosage of stimulants; they will grow to their full expected height.`);
+ if (setting.growthStims === 1) {
+ section.append(`Children are injected with the recommended dosage of stimulants; they will grow to their full expected height. `);
} else {
- linkArray.push(makeLink(`Limit`, () => { V.incubator.setting.growthStims = 1; }, refresh));
+ linkArray.push(makeLink(`Limit`, () => { setting.growthStims = 1; }, refresh));
}
- if (V.incubator.setting.growthStims === 0) {
- section.append(`Growth stimulant injection systems are offline; children will develop normally.`);
+ if (setting.growthStims === 0) {
+ section.append(`Growth stimulant injection systems are offline; children will develop normally. `);
} else {
- linkArray.push(makeLink(`Disable`, () => { V.incubator.setting.growthStims = 0; }, refresh));
+ linkArray.push(makeLink(`Disable`, () => { setting.growthStims = 0; }, refresh));
}
+
section.append(App.UI.DOM.generateLinksStrip(linkArray));
- } else if (V.growthStim === 1) {
- const cost = Math.trunc(20000 * V.upgradeMultiplierArcology);
- section.append(`There are no systems in place to control a growing child's height.`);
- section.append(
- makePurchase(`Upgrade the growth tanks with stimulants injection systems`, cost, "capEx", {
- handler: () => {
- V.incubator.upgrade.growthStims = 1;
- refresh();
- },
- notes: [`will increase upkeep costs`]
- })
- );
- } else {
- App.UI.DOM.appendNewElement("span", section, `There are no systems in place to control a growing child's height and you lack the capability to fabricate growth stimulants.`, ["note"]);
+ el.append(section);
}
- div.append(section);
- el.append(div);
- if (V.minimumSlaveAge <= 6 && (V.arcologies[0].FSRepopulationFocus >= 60 || V.BlackmarketPregAdaptation === 1)) {
- /* Main prerequisite - stable repopulation FS OR documentation purchased from black market. And age gate. */
- div = document.createElement("div");
+
+ /* Reproductive system */
+ if (V.incubator.upgrade.reproduction === 1) {
+ section = document.createElement("p");
+ linkArray = [];
+
+ if (setting.reproduction === 2) {
+ section.append(`Hormone levels are purposefully set higher than recommended; over-active reproductive systems are likely.`);
+ } else {
+ linkArray.push(makeLink(`Overload`, () => { setting.reproduction = 2; }, refresh));
+ }
+
+ if (setting.reproduction === 1) {
+ section.append(`Hormone levels are being carefully managed; children will be released with fully functional reproductive organs.`);
+ } else {
+ linkArray.push(makeLink(`Limit`, () => { setting.reproduction = 1; }, refresh));
+ }
+
+ if (setting.reproduction === 0) {
+ section.append(`Reproduction management systems are offline; children will undergo normal puberty.`);
+ } else {
+ linkArray.push(makeLink(`Disable`, () => { setting.reproduction = 0; }, refresh));
+ }
+
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
+ el.append(section);
+ }
+
+
+ /* Preg adaptation */
+ if (V.incubator.upgrade.reproduction === 1 && V.incubator.upgrade.pregAdaptation === 1) {
section = document.createElement("div");
- if (V.incubator.upgrade.pregAdaptation === 1) {
- section.append(`The incubators have been upgraded with special set of manipulators, probes, nozzles and syringes coupled together with specific programs to take advantage of the accelerated growth to heighten viable reproductive capacity. These include injections of specialized serums and mechanical manipulation of the reproductive system and associated tissues, organs, muscles and bones.`);
+ linkArray = [];
+
+ if (setting.pregAdaptation === 1) {
+ section.append(`Pregnancy adaptation system online for ${genes === "XX" ? `females` : `males`}.`);
} else {
- section.append(`The highly controlled environment inside incubation tube coupled with the greatly accelerated growth process is the perfect opportunity to push the boundaries of a body's ability to sustain pregnancy. This will include injections of specialized serums and mechanical manipulation of their reproductive system through a special set of manipulators, probes, nozzles and syringes supervised by a powerful monitoring program. Costly to maintain.`);
- div.append(section);
+ linkArray.push(makeLink(`Enable`, () => { setting.pregAdaptation = 1; }, refresh));
+ }
+
+ if (setting.pregAdaptation === 0) {
+ section.append(`Pregnancy adaptation system offline for ${genes === "XX" ? `females` : `males`}.`);
+ } else {
+ linkArray.push(makeLink(`Disable`, () => { setting.pregAdaptation = 0; }, refresh));
+ }
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
+ el.append(section);
+
+ if (setting.pregAdaptation > 0) {
section = document.createElement("div");
- if (V.incubator.upgrade.reproduction < 1) {
- /* Now with reports - what is lacking for construction */
- section.append(`${incubatorNameCaps} lacks advanced monitoring and hormone injection systems. Construction not possible.`);
- } else if (V.incubator.upgrade.organs < 1) {
- section.append(`${incubatorNameCaps} lacks the ability to extract tissue samples. Construction not possible.`);
- } else if (V.dispensaryUpgrade < 1) {
- section.append(`${incubatorNameCaps} lacks a connection to an advanced pharmaceutical fabricator. Cutting-edge targeted serums production needed as integral part. Construction not possible.`);
- } else if (V.bellyImplants < 1) {
- section.append(`${incubatorNameCaps} lacks a connection with an implant manufacturing to construct fillable abdominal implants to simulate expansion. Construction not possible.`);
- } else if (V.incubator.upgrade.growthStims < 1) {
- section.append(`${incubatorNameCaps} lacks advanced monitoring and stimulant injection systems. Construction not possible.`);
+ linkArray = [];
+
+ if (setting.pregAdaptationPower === 0) {
+ section.append(`Pregnancy adaptation programmed to standard procedures. Normal pregnancy should be safe for subjects.`);
} else {
- const cost = Math.trunc(2000000 * V.upgradeMultiplierArcology);
- section.append(
- makePurchase(`Manufacture and install this subsystem`, cost, "capEx", {
- handler: () => {
- V.incubator.upgrade.pregAdaptation = 1;
- refresh();
- },
- notes: [`will increase upkeep costs`]
- })
- );
+ linkArray.push(makeLink(`Standard`, () => { setting.pregAdaptationPower = 0; }, refresh));
+ }
+
+ if (setting.pregAdaptationPower === 1) {
+ section.append(`Pregnancy adaptation programmed to advanced procedures. Up to triplet pregnancy should be safe for the subjects.`);
+ } else {
+ linkArray.push(makeLink(`Advanced`, () => { setting.pregAdaptationPower = 1; }, refresh));
+ }
+
+ if (setting.pregAdaptationPower === 2) {
+ section.append(`Pregnancy adaptation programmed to intensive procedures. Up to octuplet pregnancy should be possible for the subjects. Warning! Side effects may occur to health and mental condition.`);
+ } else {
+ linkArray.push(makeLink(`Intensive`, () => { setting.pregAdaptationPower = 2; }, refresh));
}
+
+ if (setting.pregAdaptationPower === 3) {
+ section.append(`Pregnancy adaptation programmed to extreme procedures. Normally unsustainable pregnancies may be possible for some subjects. Actual capacity will vary with genetic and other individual conditions. WARNING! Extreme side effects may occur to health and mental condition! `);
+ } else {
+ linkArray.push(makeLink(`Extreme`, () => { setting.pregAdaptationPower = 3; }, refresh));
+ }
+
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
+ el.append(section);
}
- div.append(section);
- el.append(div);
+
+ section = document.createElement("div");
+ App.UI.DOM.appendNewElement("div", section, `Due to the high complexity and steep risks of this procedure, these settings cannot be changed after a tank's first week.`, "note");
+ el.append(section);
}
- div = document.createElement("div");
- section = App.UI.DOM.makeElement("div", null, ["margin-top"]);
- if (V.incubator.setting.imprint === "terror") {
- section.append(`The imprinting system is currently focused on making them devoted but fearful of you. The imprinting cycle is locked upon incubation start. `);
- App.UI.DOM.appendNewElement("span", section, `Only affects new infants`, ["note"]);
+
+ /* Imprinting */
+ section = document.createElement("p");
+ if (setting.imprint === "terror") {
+ section.append(`The imprinting system is currently focused on making them devoted but fearful of you. The imprinting cycle is locked after a tank's first week. `);
if (V.bodyswapAnnounced === 1) {
section.append(
choice(
`Switch the system to focus on preparation for body-swapping`,
() => {
- V.incubator.setting.imprint = "husk";
+ setting.imprint = "husk";
refresh();
}
)
@@ -1495,19 +1552,19 @@ App.UI.incubator = function() {
choice(
`Switch the system to focus on attachment`,
() => {
- V.incubator.setting.imprint = "trust";
+ setting.imprint = "trust";
refresh();
}
)
);
- } else if (V.incubator.setting.imprint === "trust") {
- section.append(`The imprinting system is currently focused on making them devoted and trusting of you. The imprinting cycle is locked upon incubation start.`);
+ } else if (setting.imprint === "trust") {
+ section.append(`The imprinting system is currently focused on making them devoted and trusting of you. The imprinting cycle is locked after a tank's first week.`);
if (V.bodyswapAnnounced === 1) {
section.append(
choice(
`Switch the system to focus preparation for body-swapping`,
() => {
- V.incubator.setting.imprint = "husk";
+ setting.imprint = "husk";
refresh();
}
)
@@ -1517,18 +1574,18 @@ App.UI.incubator = function() {
choice(
`Switch the system to focus on dependence`,
() => {
- V.incubator.setting.imprint = "terror";
+ setting.imprint = "terror";
refresh();
}
)
);
} else {
- section.append(`The imprinting system is currently focused on producing complete vegetables ready to be used as hosts for body swapping. The imprinting cycle is locked upon incubation start.`);
+ section.append(`The imprinting system is currently focused on producing complete vegetables ready to be used as hosts for body swapping. The imprinting cycle is locked after a tank's first week.`);
section.append(
choice(
`Switch the system to focus on dependence`,
() => {
- V.incubator.setting.imprint = "terror";
+ setting.imprint = "terror";
refresh();
}
)
@@ -1537,19 +1594,13 @@ App.UI.incubator = function() {
choice(
`Switch the system to focus on attachment`,
() => {
- V.incubator.setting.imprint = "trust";
+ setting.imprint = "trust";
refresh();
}
)
);
}
- div.append(section);
- el.append(div);
-
- section = document.createElement("div");
- section.append(App.Facilities.rename(App.Entity.facilities.incubator, () => refresh()));
el.append(section);
-
return el;
function refresh() {
@@ -1560,12 +1611,12 @@ App.UI.incubator = function() {
}
function release() {
- const multiple = (V.incubator.setting.bulkRelease === 1) && V.incubator.tanks.filter(t => t.growTime <= 0).length > 1;
+ const multiple = (V.incubator.bulkRelease === 1) && V.incubator.tanks.filter(t => t.incubatorSettings.growTime <= 0).length > 1;
const getTanks = () => {
if (multiple) {
- V.newSlavePool = V.incubator.tanks.deleteWith(t => t.growTime <= 0);
+ V.newSlavePool = V.incubator.tanks.deleteWith(t => t.incubatorSettings.growTime <= 0);
} else {
- const baby = V.incubator.tanks.find(t => t.growTime <= 0);
+ const baby = V.incubator.tanks.find(t => t.incubatorSettings.growTime <= 0);
V.incubator.tanks.delete(baby);
V.readySlave = baby;
}
diff --git a/src/facilities/incubator/incubatorUtils.js b/src/facilities/incubator/incubatorUtils.js
index 4b258a4c771db338cd39aacf5f3335f4fc030a86..ea4cb934abc264e4076bf5f21d1f82993d964bf8 100644
--- a/src/facilities/incubator/incubatorUtils.js
+++ b/src/facilities/incubator/incubatorUtils.js
@@ -2,21 +2,32 @@
* Sends a child to the Incubator if it has room
* @param {App.Entity.SlaveState} child
*/
-App.Facilities.Incubator.newChild = function(child) {
+App.Facilities.Incubator.newChild = function(child, settingsOverride = null) {
let fullAdapt;
- child.growTime = Math.trunc(V.targetAge * 52);
- child.incubatorPregAdaptationPower = V.incubator.setting.pregAdaptationPower;
- if (V.incubator.setting.pregAdaptationPower === 1) {
- fullAdapt = 45000 / 2000; //22.5
- } else if (V.incubator.setting.pregAdaptationPower === 2) {
- fullAdapt = 100000 / 2000; //50
- } else if (V.incubator.setting.pregAdaptationPower === 3) {
- fullAdapt = 150000 / 2000; //75
+ const setting = settingsOverride !== null ? settingsOverride : (child.genes === "XX" ? V.incubator.femaleSetting : V.incubator.maleSetting);
+
+ if (setting.pregAdaptationPower === 1) {
+ fullAdapt = 45000 / 2000; // 22.5
+ } else if (setting.pregAdaptationPower === 2) {
+ fullAdapt = 100000 / 2000; // 50
+ } else if (setting.pregAdaptationPower === 3) {
+ fullAdapt = 150000 / 2000; // 75
} else {
- fullAdapt = 15000 / 2000; //7.5
+ fullAdapt = 15000 / 2000; // 7.5
}
- child.incubatorPregAdaptationInWeek = Math.max(((fullAdapt - child.pregAdaptation) / child.growTime), 0);
+
V.incubator.tanks.push(child);
+ child.incubatorSettings = {
+ imprint: setting.imprint,
+ weight: setting.weight,
+ muscles: setting.muscles,
+ growthStims: setting.growthStims,
+ reproduction: setting.reproduction,
+ growTime: Math.trunc(setting.targetAge * 52),
+ pregAdaptation: setting.pregAdaptation,
+ pregAdaptationPower: setting.pregAdaptationPower,
+ pregAdaptationInWeek: Math.max(((fullAdapt - child.pregAdaptation) / Math.trunc(setting.targetAge * 52)), 0)
+ };
};
App.Facilities.Incubator.init = function(state) {
@@ -27,6 +38,7 @@ App.Facilities.Incubator.init = function(state) {
V.incubator = {
capacity: 1,
tanks: [],
+ bulkRelease: 0,
name: "the Incubator",
organs: [],
readySlaves: 0,
@@ -39,13 +51,23 @@ App.Facilities.Incubator.init = function(state) {
organs: 0,
pregAdaptation: 0,
},
- setting: {
+ maleSetting: {
+ imprint: "trust",
+ targetAge: V.minimumSlaveAge,
+ weight: 0,
+ muscles: 0,
+ growthStims: 0,
+ reproduction: 0,
+ pregAdaptation: 0,
+ pregAdaptationPower: 0,
+ },
+ femaleSetting: {
imprint: "trust",
+ targetAge: V.minimumSlaveAge,
weight: 0,
muscles: 0,
growthStims: 0,
reproduction: 0,
- bulkRelease: 0,
pregAdaptation: 0,
pregAdaptationPower: 0,
},
diff --git a/src/facilities/incubator/inspectTankSettings.js b/src/facilities/incubator/inspectTankSettings.js
new file mode 100644
index 0000000000000000000000000000000000000000..d18fb381a9f8eca633c1e63f18a0fc057dc7efb0
--- /dev/null
+++ b/src/facilities/incubator/inspectTankSettings.js
@@ -0,0 +1,417 @@
+App.UI.inspectTankSettings = function(isFetus, isPCMother = false) {
+
+ // V.nextLink = "Incubator";
+ // V.storedLink = "Incubator";
+ let tankSetting;
+ let child;
+ let fetus;
+
+ if (!isFetus) {
+ child = V.incubator.tanks[V.AS];
+ tankSetting = child.incubatorSettings;
+ } else {
+ if (isPCMother) {
+ fetus = V.PC.womb[V.activeFetus];
+ } else {
+ fetus = getSlave(V.AS).womb[V.activeFetus];
+ }
+ if ("tankSetting" in fetus === false) {
+ fetus.tankSetting = fetus.genetics.gender === "XX" ? {...V.incubator.femaleSetting} : {...V.incubator.maleSetting};
+ }
+ tankSetting = fetus.tankSetting;
+ }
+ const {
+ He, His,
+ he, him, his
+ } = (isFetus ? getPronouns(fetus.age >= 2 ? (fetus.genetics.gender === "XX" ? {pronoun: 0} : {pronoun: 1}) : {pronoun: 3}) : getPronouns(child));
+
+ const container = App.UI.DOM.makeElement('span', content());
+
+ return container;
+
+ /**
+ * @returns {DocumentFragment}
+ */
+ function content() {
+ const node = new DocumentFragment();
+ let section;
+ let linkArray;
+
+ App.UI.DOM.appendNewElement("h2", node, "Tank settings:");
+
+ /* Age */
+ if (isFetus) {
+ let target = Math.round(tankSetting.targetAge); //This is fine because it will only be displayed when growTime has not been depeleted
+ let r = [];
+ r.push("Target age for release:");
+ r.push(
+ App.UI.DOM.makeTextBox(
+ target,
+ (v) => {
+ target = v || V.minimumSlaveAge;
+ target = Math.clamp(target, V.minimumSlaveAge, V.retirementAge);
+ tankSetting.targetAge = target;
+ jQuery(container).empty().append(content());
+ },
+ true
+ )
+ );
+
+ linkArray = [];
+ linkArray.push(
+ App.UI.DOM.link(
+ `Minimum Legal Age`,
+ () => {
+ target = V.minimumSlaveAge;
+ tankSetting.targetAge = target;
+ jQuery(container).empty().append(content());
+ }
+ )
+ );
+ linkArray.push(
+ App.UI.DOM.link(
+ `Average Age of Fertility`,
+ () => {
+ target = V.fertilityAge;
+ tankSetting.targetAge = target;
+ jQuery(container).empty().append(content());
+ }
+ )
+ );
+ linkArray.push(
+ App.UI.DOM.link(
+ `Average Age of Potency`,
+ () => {
+ target = V.potencyAge;
+ tankSetting.targetAge = target;
+ jQuery(container).empty().append(content());
+ }
+ )
+ );
+ linkArray.push(
+ App.UI.DOM.link(
+ `Legal Adulthood`,
+ () => {
+ target = 18;
+ tankSetting.targetAge = target;
+ jQuery(container).empty().append(content());
+ }
+ )
+ );
+ r.push(App.UI.DOM.generateLinksStrip(linkArray));
+
+ App.Events.addNode(node, r, "p");
+ } else {
+ section = App.UI.DOM.makeElement("p");
+ if (isFetus) {
+ section.append(`Target age for release: ${tankSetting.targetAge}`);
+ } else {
+ section.append(`Target age for release: ${child.physicalAge}`); //This is already set, apparently
+ }
+ section.append(App.UI.DOM.makeElement("div", `Cannot be changed on tanks in use`));
+ node.append(section);
+ }
+
+ /* Weight */
+ section = App.UI.DOM.makeElement("p");
+ if (V.incubator.upgrade.weight === 1) {
+ linkArray = [];
+
+ if (tankSetting.weight === 1) {
+ section.append(`Weight ${isFetus ? `will not be` : `is not being`} properly managed; excessive weight gain is likely.`);
+ } else {
+ linkArray.push(makeLink(`Estimate only`, () => { tankSetting.weight = 1; }));
+ }
+
+ if (tankSetting.weight === 2) {
+ section.append(`Weight ${isFetus ? `will be` : `is`} being carefully managed; ${he} will be released at a healthy weight.`);
+ } else {
+ linkArray.push(makeLink(`Activate`, () => { tankSetting.weight = 2; }));
+ }
+
+ if (tankSetting.weight === 0) {
+ section.append(`Weight management systems ${isFetus ? `will be` : `are`} offline; ${he} will likely be malnourished.`);
+ } else {
+ linkArray.push(makeLink(`Disable`, () => { tankSetting.weight = 0; }));
+ }
+
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
+ } else {
+ section.append(`There are no systems in place to control a growing child's weight; ${he} will likely come out emaciated from the rapid growth.`);
+ }
+ node.append(section);
+
+
+ /* Muscles */
+ section = App.UI.DOM.makeElement("p");
+ if (V.incubator.upgrade.muscles === 1) {
+ linkArray = [];
+
+ if (tankSetting.muscles === 2) {
+ section.append(`Strength levels ${isFetus ? `will be` : `are`} purposefully set higher than recommended; excessive muscle gain is likely.`);
+ } else {
+ linkArray.push(makeLink(`Overload`, () => { tankSetting.muscles = 2; }));
+ }
+
+ if (tankSetting.muscles === 1) {
+ section.append(`Musculature ${isFetus ? `will be` : `is`} being carefully managed; ${he} will be released with near normal strength.`);
+ } else {
+ linkArray.push(makeLink(`Activate`, () => { tankSetting.muscles = 1; }));
+ }
+
+ if (tankSetting.muscles === 0) {
+ section.append(`Strength management systems ${isFetus ? `will be` : `are`} offline; ${he} will likely be released extremely weak.`);
+ } else {
+ linkArray.push(makeLink(`Disable`, () => { tankSetting.muscles = 0; }));
+ }
+
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
+ } else {
+ section.append(`There are no systems in place to control a growing child's musculature; ${he} will likely come out frail and weak from the rapid growth.`);
+ }
+ node.append(section);
+
+
+ /* Height */
+ section = App.UI.DOM.makeElement("p");
+ if (V.incubator.upgrade.growthStims === 1) {
+ linkArray = [];
+
+ if (tankSetting.growthStims === 2) {
+ section.append(`${He} will be injected with higher than recommended doses of stimulants; exceeding expected final height is likely. `);
+ } else {
+ linkArray.push(makeLink(`Overload`, () => { tankSetting.growthStims = 2; }));
+ }
+
+ if (tankSetting.growthStims === 1) {
+ section.append(`${He} will be injected with the recommended dosage of stimulants; ${he} will grow to their full expected height. `);
+ } else {
+ linkArray.push(makeLink(`Limit`, () => { tankSetting.growthStims = 1; }));
+ }
+
+ if (tankSetting.growthStims === 0) {
+ section.append(`Growth stimulant injection systems ${isFetus ? `will be` : `are`} offline; ${he} will develop normally. `);
+ } else {
+ linkArray.push(makeLink(`Disable`, () => { tankSetting.growthStims = 0; }));
+ }
+ section.append(App.UI.DOM.generateLinksStrip(linkArray));
+ } else {
+ section.append(`There are no systems in place to control a growing child's height.`);
+ }
+ node.append(section);
+
+
+ /* Reproduction */
+ section = App.UI.DOM.makeElement("p");
+ if (V.incubator.upgrade.reproduction === 1) {
+ linkArray = [];
+
+ if (tankSetting.reproduction === 2) {
+ section.append(`Hormone levels ${isFetus ? `will be` : `are`} purposefully set higher than recommended; an over-active reproductive system is likely.`);
+ } else {
+ linkArray.push(makeLink(`Overload`, () => { tankSetting.reproduction = 2; }));
+ }
+
+ if (tankSetting.reproduction === 1) {
+ section.append(`Hormone levels ${isFetus ? `will be` : `are`} being carefully managed; ${he} will be released with fully functional reproductive organs.`);
+ } else {
+ linkArray.push(makeLink(`Limit`, () => { tankSetting.reproduction = 1; }));
+ }
+
+ if (tankSetting.reproduction === 0) {
+ section.append(`Reproduction management systems ${isFetus ? `will be` : `are`} offline; ${he} will undergo normal puberty.`);
+ } else {
+ linkArray.push(makeLink(`Disable`, () => { tankSetting.reproduction = 0; }));
+ }
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
+ } else {
+ section.append(`There are no systems in place to control a growing child's reproductive capability.`);
+ }
+ node.append(section);
+
+
+ /* Pregnancy Adaptation */
+ if (V.incubator.upgrade.reproduction === 1 && V.incubator.upgrade.pregAdaptation === 1) {
+ section = App.UI.DOM.makeElement("div");
+ linkArray = [];
+
+ if (tankSetting.pregAdaptation === 1) {
+ section.append(`Pregnancy adaptation system online.`);
+ } else {
+ linkArray.push(makeLink(`Enable`, () => { tankSetting.pregAdaptation = 1; }));
+ }
+
+ if (tankSetting.pregAdaptation === 0) {
+ section.append(`Pregnancy adaptation system offline.`);
+ } else {
+ linkArray.push(makeLink(`Disable`, () => { tankSetting.pregAdaptation = 0; }));
+ }
+
+ if (isFetus) {
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
+ }
+ node.append(section);
+ }
+
+ section = App.UI.DOM.makeElement("div");
+ if (V.incubator.upgrade.reproduction === 1 && V.incubator.upgrade.pregAdaptation === 1 && tankSetting.pregAdaptation === 1) {
+ linkArray = [];
+
+ if (tankSetting.pregAdaptationPower === 0) {
+ section.append(`Pregnancy adaptation programmed to standard procedures. Normal pregnancy should be safe for ${him}.`);
+ } else {
+ linkArray.push(makeLink(`Standard`, () => { tankSetting.pregAdaptationPower = 0; }));
+ }
+
+ if (tankSetting.pregAdaptationPower === 1) {
+ section.append(`Pregnancy adaptation programmed to advanced procedures. Up to triplet pregnancy should be safe for ${him}.`);
+ } else {
+ linkArray.push(makeLink(`Advanced`, () => { tankSetting.pregAdaptationPower = 1; }));
+ }
+
+ if (tankSetting.pregAdaptationPower === 2) {
+ section.append(`Pregnancy adaptation programmed to intensive procedures. Up to octuplet pregnancy should be possible for ${him}. Warning! Side effects may occur to health and mental condition.`);
+ } else {
+ linkArray.push(makeLink(`Intensive`, () => { tankSetting.pregAdaptationPower = 2; }));
+ }
+
+ if (tankSetting.pregAdaptationPower === 3) {
+ section.append(`Pregnancy adaptation programmed to extreme procedures. Normally unsustainable pregnancies may be possible for ${him}. Actual capacity will vary with genetic and other individual conditions. WARNING! Extreme side effects may occur to health and mental condition! `);
+ } else {
+ linkArray.push(makeLink(`Extreme`, () => { tankSetting.pregAdaptationPower = 3; }));
+ }
+
+ if (isFetus) {
+ section.append(" ", App.UI.DOM.generateLinksStrip(linkArray));
+ }
+
+ }
+
+ if ( V.incubator.upgrade.reproduction === 1 && V.incubator.upgrade.pregAdaptation === 1 && !isFetus) {
+ section.append(App.UI.DOM.makeElement("div", `Due to the high complexity and steep risks of the procedure, these settings cannot be changed on tanks in use.`));
+ }
+ node.append(section);
+
+ /* Imprinting */
+ section = App.UI.DOM.makeElement("p");
+ linkArray = [];
+ if (tankSetting.imprint === "terror") {
+ section.append(`The imprinting system ${isFetus ? `will be` : `is`} focused on making ${him} devoted but fearful of you.`);
+ if (isFetus) {
+ if (V.bodyswapAnnounced === 1) {
+ section.append(
+ choice(
+ `Switch the system to focus on preparation for body-swapping`,
+ () => {
+ tankSetting.imprint = "husk";
+ jQuery(container).empty().append(content());
+ }
+ )
+ );
+ }
+ section.append(
+ choice(
+ `Switch the system to focus on attachment`,
+ () => {
+ tankSetting.imprint = "trust";
+ jQuery(container).empty().append(content());
+ }
+ )
+ );
+ } else {
+ section.append(App.UI.DOM.makeElement("div", `You cannot alter this setting after ${he} has started growing.`));
+ }
+ } else if (tankSetting.imprint === "trust") {
+ section.append(`The imprinting system ${isFetus ? `will be` : `is`} focused on making ${him} devoted and trusting of you.`);
+ if (isFetus) {
+ if (V.bodyswapAnnounced === 1) {
+ section.append(
+ choice(
+ `Switch the system to focus preparation for body-swapping`,
+ () => {
+ tankSetting.imprint = "husk";
+ jQuery(container).empty().append(content());
+ }
+ )
+ );
+ }
+ section.append(
+ choice(
+ `Switch the system to focus on dependence`,
+ () => {
+ tankSetting.imprint = "terror";
+ jQuery(container).empty().append(content());
+ }
+ )
+ );
+ } else {
+ section.append(App.UI.DOM.makeElement("div", `You cannot alter this setting after the ${he} has started growing.`));
+ }
+ } else {
+ section.append(`The imprinting system ${isFetus ? `will be` : `is`} focused on producing a complete vegetable ready to be used as a host for body swapping.`);
+ if (isFetus) {
+ section.append(
+ choice(
+ `Switch the system to focus on dependence`,
+ () => {
+ tankSetting.imprint = "terror";
+ jQuery(container).empty().append(content());
+ }
+ )
+ );
+ section.append(
+ choice(
+ `Switch the system to focus on attachment`,
+ () => {
+ tankSetting.imprint = "trust";
+ jQuery(container).empty().append(content());
+ }
+ )
+ );
+ } else {
+ section.append(App.UI.DOM.makeElement("div", `You cannot alter this setting after the ${he} has started growing.`));
+ }
+ }
+ node.append(section);
+
+ return node;
+ }
+
+ /**
+ *
+ * @param {string} title
+ * @param {function():void} func
+ * @param {string} [passage=""]
+ * @param {string} [note=""]
+ * @returns {HTMLElement}
+ */
+ function choice(title, func, passage = "", note = "") {
+ const div = document.createElement("div");
+ div.classList.add("choices");
+ div.append(
+ App.UI.DOM.link(
+ title,
+ func,
+ [],
+ passage,
+ note
+ )
+ );
+ return div;
+ }
+
+ /**
+ *
+ * @param {string} title
+ * @param {function():void} func
+ */
+ function makeLink(title, func) {
+ return App.UI.DOM.link(
+ title,
+ () => {
+ func();
+ jQuery(container).empty().append(content());
+ }
+ );
+ }
+}
\ No newline at end of file
diff --git a/src/facilities/pit/fights/0_lethalRandom.js b/src/facilities/pit/fights/0_lethalRandom.js
index eab901979224e8e270f269fdd1041716139e36d9..a5320f29d2585d525eb3b2917a966f30ec26dd81 100644
--- a/src/facilities/pit/fights/0_lethalRandom.js
+++ b/src/facilities/pit/fights/0_lethalRandom.js
@@ -690,11 +690,13 @@ App.Facilities.Pit.Fights.LR1v1 = class extends App.Facilities.Pit.Fights.BaseFi
/** @returns {boolean} Returns true if slave1 won */
function getWinner() {
// at equal deadliness, the fighters each have a 50% chance to win
- // deadliness difference of 0.5: 67% chance of the stronger fighter winning
- // deadliness difference of 1.0: 75% for the stronger fighter
- // deadliness difference of 2.0 or more: 80% for the stronger fighter
- const limit = 80;
- const steepness = 2.5;
+ // deadliness difference of 0.5: 60% chance of the stronger fighter winning
+ // deadliness difference of 1.0: 70% for the stronger fighter
+ // deadliness difference of 2.0: 80% for the stronger fighter
+ // deadliness difference of 4.0: 95% for the stronger fighter
+ // deadliness difference of 7.0 or higher: 99% for the stronger fighter
+ const limit = 99;
+ const steepness = 0.8;
// roll against the probability that the first fighter wins
return random(1, 100) < fightProbability(deadliness(slave1).value, deadliness(slave2).value, limit, steepness);
diff --git a/src/facilities/pit/fights/0_nonLethalRandom.js b/src/facilities/pit/fights/0_nonLethalRandom.js
index fbb8a5446d2249b4f689fa99261168e785f1d410..c1beea4c3c96a3ebe097a2fd8b2564369561a08c 100644
--- a/src/facilities/pit/fights/0_nonLethalRandom.js
+++ b/src/facilities/pit/fights/0_nonLethalRandom.js
@@ -1160,11 +1160,13 @@ App.Facilities.Pit.Fights.NlR1v1 = class extends App.Facilities.Pit.Fights.BaseF
/** @returns {boolean} Returns true if slave1 won */
function getWinner() {
// at equal deadliness, the fighters each have a 50% chance to win
- // deadliness difference of 0.5: 67% chance of the stronger fighter winning
- // deadliness difference of 1.0: 75% for the stronger fighter
- // deadliness difference of 2.0 or more: 80% for the stronger fighter
- const limit = 80;
- const steepness = 2.5;
+ // deadliness difference of 0.5: 60% chance of the stronger fighter winning
+ // deadliness difference of 1.0: 70% for the stronger fighter
+ // deadliness difference of 2.0: 80% for the stronger fighter
+ // deadliness difference of 4.0: 95% for the stronger fighter
+ // deadliness difference of 7.0 or higher: 99% for the stronger fighter
+ const limit = 99;
+ const steepness = 0.8;
// roll against the probability that the first fighter wins
return random(1, 100) < fightProbability(deadliness(slave1).value, deadliness(slave2).value, limit, steepness);
diff --git a/src/facilities/spa/spa.js b/src/facilities/spa/spa.js
index cc7be1176e218569236a3381d6f152dc26e8efdd..a60d2cf1aac8954bc9ee5384272a04f736e6ee1c 100644
--- a/src/facilities/spa/spa.js
+++ b/src/facilities/spa/spa.js
@@ -133,7 +133,7 @@ App.Facilities.Spa.spa = class Spa extends App.Facilities.Facility {
return `${S.Attendant.slaveName} is not following any special orders and is tending to your slaves as ${he} sees fit.`;
},
- link: `Free reign`,
+ link: `Free rein`,
value: 0,
},
{
@@ -167,7 +167,7 @@ App.Facilities.Spa.spa = class Spa extends App.Facilities.Facility {
get text() {
return `${S.Attendant.slaveName} is to allow all slaves into the main pool, regardless of genetic modifications.`;
},
- link: `Free reign`,
+ link: `Free rein`,
value: 0,
},
{
diff --git a/src/facilities/surgery/analyzePregnancy.js b/src/facilities/surgery/analyzePregnancy.js
index 2691400ac985d2cfb9b2e51522e9862985471e79..39533ebfd4494a2fdbfde7144a08e42e07ac2aa0 100644
--- a/src/facilities/surgery/analyzePregnancy.js
+++ b/src/facilities/surgery/analyzePregnancy.js
@@ -157,10 +157,42 @@ globalThis.analyzePregnancies = function(mother, cheat) {
`Don't keep this child in ${V.incubator.name}`,
() => {
fetus.reserve = "";
+ delete fetus.tankSetting;
},
[],
passage()
));
+ let linkArray = [];
+ if ("tankSetting" in fetus) {
+ linkArray.push(App.UI.DOM.link(
+ `Inspect incubator settings`,
+ () => {
+ V.AS = mother.ID; // Undefined if mother is PC, but harmlessly so
+ V.activeFetus = i;
+ },
+ [],
+ (mother === V.PC ? `Inspect PC Fetus Tank Settings` : `Inspect Fetus Tank Settings`)
+ ));
+ linkArray.push(App.UI.DOM.link(
+ `Clear custom incubator settings`,
+ () => {
+ delete fetus.tankSetting;
+ },
+ [],
+ passage()
+ ));
+ } else {
+ linkArray.push(App.UI.DOM.link(
+ `Set custom incubator settings`,
+ () => {
+ V.AS = mother.ID;
+ V.activeFetus = i;
+ },
+ [],
+ (mother === V.PC ? `Inspect PC Fetus Tank Settings` : `Inspect Fetus Tank Settings`)
+ ));
+ }
+ App.UI.DOM.appendNewElement("div", el, App.UI.DOM.generateLinksStrip(linkArray));
} else if ((V.incubator.capacity - V.incubator.tanks.length) - FetusGlobalReserveCount("incubator") > 0) {
App.UI.DOM.appendNewElement("div", el, App.UI.DOM.link(
`Keep this child in ${V.incubator.name}`,
@@ -189,6 +221,7 @@ globalThis.analyzePregnancies = function(mother, cheat) {
`Keep this child in ${V.nurseryName}`,
() => {
fetus.reserve = "nursery";
+ delete fetus.tankSetting;
},
[],
passage()
@@ -215,6 +248,7 @@ globalThis.analyzePregnancies = function(mother, cheat) {
}
}
el.append(options.render());
+
return el;
function fetusAbnormalities() {
@@ -358,14 +392,14 @@ App.UI.analyzePregnancy = function() {
App.UI.DOM.appendNewElement("p", node, analyzePregnancies(slave, false));
} else if (slave.preg === -3) { // special states
App.UI.DOM.appendNewElement("div", node, `Failure to locate any ova. Subject is infertile.`);
- } else if (slave.pregWeek < 0) { // special states
- App.UI.DOM.appendNewElement("div", node, `Subject is in the postpartum period.`);
} else if (slave.ovaryAge >= 47) {
App.UI.DOM.appendNewElement("div", node, `${His} infertility is due to menopausal ovaries.`);
} else if (slave.ovaries === 0 && slave.mpreg === 0 && slave.vagina > -1) {
App.UI.DOM.appendNewElement("div", node, `${His} infertility is due to missing ovaries.`);
} else if (slave.preg === -2) { // special states
App.UI.DOM.appendNewElement("div", node, `${His} infertility is due to sterilization; ${his} ovaries could still work.`);
+ } else if (slave.pregWeek < 0) { // special states
+ App.UI.DOM.appendNewElement("div", node, `Subject is in the postpartum period, and will regain fertility in ${num(slave.pregWeek * -1)} ${slave.pregWeek === -1 ? `week` : `weeks`}.`);
} else if (slave.preg === -1) { // special states
App.UI.DOM.appendNewElement("div", node, `Contraceptive agents detected in subject.`);
}
diff --git a/src/facilities/wardrobe/wardrobeShoppingData.js b/src/facilities/wardrobe/wardrobeShoppingData.js
index 5de7828c6c6121cb64c88d3259d8b758682645c0..6bcdc526062483fc696c797cca614b32228d1252 100644
--- a/src/facilities/wardrobe/wardrobeShoppingData.js
+++ b/src/facilities/wardrobe/wardrobeShoppingData.js
@@ -150,7 +150,7 @@ App.Data.WardrobeShopping.Clothing = {
"cultural": {
title: "a shipment of cultural outfits",
cost: 15000,
- contains: ["a biyelgee costume", "a dirndl", "a hanbok", "a mounty outfit", "lederhosen"],
+ contains: ["a biyelgee costume", "a dirndl", "a hanbok", "a long qipao", "a mounty outfit", "lederhosen"],
owned: "You are well stocked with a variety of signature outfits from a variety of countries.",
},
"middleEastern": {
diff --git a/src/futureSocieties/aztec/slaveSacrificeLife.js b/src/futureSocieties/aztec/slaveSacrificeLife.js
index 21ea173981161e57a75a80877c601e5d806d9c02..6a84909756aac23cf294d0f651d41ffdd7ea64db 100644
--- a/src/futureSocieties/aztec/slaveSacrificeLife.js
+++ b/src/futureSocieties/aztec/slaveSacrificeLife.js
@@ -1,10 +1,42 @@
/** @param {App.Entity.SlaveState} sacrifice */
App.UI.SlaveInteract.aztecSlaveSacrificeLife = function(sacrifice) {
const frag = new DocumentFragment();
- const {He, his} = getPronouns(sacrifice);
+ const {He, His, his, him} = getPronouns(sacrifice);
const activeSlaveRepSacrifice = repGainSacrifice(sacrifice, V.arcologies[0]);
+ const havePlatform = V.eventResults.artifactsBought?.includes("aztec");
+
let r = [];
- r.push(`${sacrifice.slaveName} dies screaming as ${his} still beating heart is ripped out of ${his} body.`);
+ r.push(`Two of the local devotees of Huitzilopochtli drag ${contextualIntro(V.PC, sacrifice, false)}`);
+ if (havePlatform) {
+ r.push(`up the steps to the sacrificial platform.`);
+ } else {
+ r.push(`into the large room designated for the sacrifice.`);
+ }
+ r.push(`${He} has been drugged in preparation for this and can hardly move on ${his} own. ${sacrifice.slaveName} is placed on`);
+ if (havePlatform) {
+ r.push(`the ancient stone platform,`);
+ } else {
+ r.push(`a suitable improvised altar,`);
+ }
+ r.push(`lying on ${his} back.`);
+ App.Events.addParagraph(frag, r);
+
+ r = [];
+ r.push(`You raise the ceremonial dagger over ${sacrifice.slaveName},`);
+ if (sacrifice.fetish === Fetish.MINDBROKEN) {
+ r.push(`who has no reaction.`);
+ } else if (canSee(sacrifice)) {
+ r.push(`whose eyes beg you not to do this.`);
+ } else {
+ r.push(`who grimaces anxiously in expectation.`);
+ }
+ r.push(`You plunge the dagger into ${his} chest cavity, and cut a vertical line across ${his} chest. You reach into ${his} body, grab hold of ${his} beating heart, and tear it out of ${him} before presenting it to the crowd.`);
+ if (havePlatform) {
+ r.push(`${His} body is thrown off the sacrifice platform and rolls down the steps towards the spectators, leaving a blood trail between you and your people.`);
+ }
+ App.Events.addParagraph(frag, r);
+
+ r = [];
if (activeSlaveRepSacrifice <= 0) {
r.push(`Nobody cares.`);
} else if (activeSlaveRepSacrifice < 10) {
diff --git a/src/interaction/artificialInsemination.js b/src/interaction/artificialInsemination.js
index e5feacfe5549696c5beda4b405f2d63fecc85039..a272b9a26f6f7060cdeb27f20d2376a748bfe500 100644
--- a/src/interaction/artificialInsemination.js
+++ b/src/interaction/artificialInsemination.js
@@ -37,19 +37,21 @@ App.UI.SlaveInteract.artificialInsemination = function() {
App.UI.DOM.appendNewElement("p", f, "You have no slaves with potent sperm.", "note");
}
- if (V.incubator.tanks.length > 0 && V.incubator.setting.reproduction === 2) {
- App.UI.DOM.appendNewElement("h2", f, "Select an eligible incubatee to milk for semen");
- App.UI.DOM.appendNewElement("p", f, "Incubator settings are resulting in large-scale fluid secretion.", "scene-intro");
+ if (V.incubator.tanks.length > 0 && V.incubator.upgrade.reproduction === 1) {
r = [];
any = false;
for (const tank of V.incubator.tanks) {
- if (tank.balls > 0 && tank.dick > 0 && canBreed(getSlave(V.AS), tank)) {
+ if (tank.balls > 0 && tank.dick > 0 && tank.incubatorSettings.reproduction === 2 && canBreed(getSlave(V.AS), tank)) {
+ if (any === false) {
+ App.UI.DOM.appendNewElement("h2", f, "Select an eligible incubatee to milk for semen");
+ App.UI.DOM.appendNewElement("p", f, "Incubator settings are resulting in large-scale fluid secretion.", "scene-intro");
+ any = true;
+ }
r.push(App.UI.DOM.makeElement("div",
App.Medicine.Surgery.makeLink(
new App.Medicine.Surgery.Procedures.Insemination(getSlave(V.AS), `Use ${tank.slaveName}'s sperm.`, tank),
exit, false)
));
- any = true;
}
}
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index 9898e16458f5964e1405a728109f3150883941f3..be96ecaa4fa3a03b7e061875c405c78c336b5110 100644
--- a/src/interaction/main/walkPast.js
+++ b/src/interaction/main/walkPast.js
@@ -233,6 +233,8 @@ globalThis.walkPast = (function() {
t += `having some casual fun with each other in the penthouse of ${arc.name}. ${V.assistant.name} has helpfully put a live feed of their activities up on one of the large screens in your office.`;
} else if (partnerSlave.assignment === Job.ARCADE) {
t += `trying their best to maintain their relationship with ${partnerName} being nothing more than a hole in ${V.arcadeName}.`;
+ } else {
+ t += `trying their best to maintain any sort of relationship as you beat the life out of ${partnerName}.`;
}
} else if (seed >= 66) { /* SEXY TIMES */
let fuckSpot = "";
diff --git a/src/interaction/siPhysicalRegimen.js b/src/interaction/siPhysicalRegimen.js
index 3749f789bb35874ee882a50664be31639bb83e20..d2e2a5e0154f046eaafa3be56dc548d59cd92be0 100644
--- a/src/interaction/siPhysicalRegimen.js
+++ b/src/interaction/siPhysicalRegimen.js
@@ -266,6 +266,36 @@ App.UI.SlaveInteract.physicalRegimen = function(slave, refresh) {
title.appendChild(App.UI.SlaveInteract.generateRows(drugLevelOptions, slave, "", false, refresh));
el.append(title);
+ // Put mod added drugs into categories:
+ const modDrugs = new Map();
+ App.Mods.Drugs.list.filter(drug => !drug.isPCDrug && drug.available(slave)).forEach(drug => {
+ let typeArray;
+ // Allow drugs to be added to vanilla categories
+ switch (drug.type) {
+ case "Lips": typeArray = lips; break;
+ case "Breasts": typeArray = breasts; break;
+ case "Nipples": typeArray = nipples; break;
+ case "Butt": typeArray = butt; break;
+ case "Dick":
+ case "Clit": typeArray = dick; break;
+ case "Fertility": typeArray = fertility; break;
+ case "Hormones": typeArray = hormones; break;
+ case "Psych": typeArray = psych; break;
+ case "Misc": typeArray = misc; break;
+ default:
+ if (!modDrugs.has(drug.type)) {
+ modDrugs.set(drug.type, []);
+ }
+ typeArray = modDrugs.get(drug.type);
+ }
+ // Test if drug should be enabled and push to array
+ if (drug.enable(slave) === true) {
+ typeArray.push({text: drug.text, updateSlave: {drugs: drug.name}});
+ } else {
+ typeArray.push({text: drug.text, disabled: drug.enable(slave)});
+ }
+ });
+
appendLabeledChoiceRow("Lips", lips, el);
appendLabeledChoiceRow("Breasts", breasts, el);
appendLabeledChoiceRow("Nipples", nipples, el);
@@ -277,6 +307,9 @@ App.UI.SlaveInteract.physicalRegimen = function(slave, refresh) {
appendLabeledChoiceRow("Psych", psych, el);
appendLabeledChoiceRow("Misc", misc, el);
+ // Add modded rows
+ modDrugs.forEach((drugArray, drugType) => appendLabeledChoiceRow(drugType, drugArray, el));
+
return el;
}
diff --git a/src/interaction/siRules.js b/src/interaction/siRules.js
index 7c09c37b2d57dd9b52e9a157effe316af8a242f3..cc69840747c5a2b3ee0f73ed889fc0ce33ad3ce8 100644
--- a/src/interaction/siRules.js
+++ b/src/interaction/siRules.js
@@ -240,10 +240,10 @@ App.UI.SlaveInteract.rules = function(slave, refresh) {
{value: "restrictive"},
{value: "permissive"},
];
- if (slave.accent > 0) {
- choices.push({value: "accent elimination"});
- } else if (slave.accent > 3) {
+ if (slave.accent > 3) {
choices.push({value: "language lessons"});
+ } else if (slave.accent > 0) {
+ choices.push({value: "accent elimination"});
}
div.append(listChoices(choices, "speech"));
p.append(div);
diff --git a/src/interaction/siWardrobe.js b/src/interaction/siWardrobe.js
index 3d6cfbcad230034b65b71782ed282a4fd57b2c9a..8a1180cc3ab1a48a32beb722af656e2bb710feee 100644
--- a/src/interaction/siWardrobe.js
+++ b/src/interaction/siWardrobe.js
@@ -281,7 +281,7 @@ App.UI.SlaveInteract.wardrobe = function(slave, contentRefresh) {
links.appendChild(colorOptions("glassesColor"));
let note = document.createElement('span');
note.className = "note";
- note.textContent = ` Only glasses and porcelain masks support a custom color. If both are worn, they will share the same color.`;
+ note.textContent = ` Glasses and porcelain masks share the same custom color.`;
links.appendChild(note);
el.appendChild(links);
}
diff --git a/src/interaction/siWork.js b/src/interaction/siWork.js
index ace2930085002012d3e631638dc5710024348c74..7d296747d3fbb1626520558eec12bdf52c35508e 100644
--- a/src/interaction/siWork.js
+++ b/src/interaction/siWork.js
@@ -638,7 +638,7 @@ App.UI.SlaveInteract.work = function(slave, refresh) {
}
}
if (slave.rivalryTarget !== 0 && hasAllLimbs(slave)) {
- const rival = getSlave(slave.relationshipTarget);
+ const rival = getSlave(slave.rivalryTarget);
if (isSlaveAvailable(rival) && hasAnyLegs(rival)) {
sexOptions.push({text: `Abuse ${his} rival with ${him}`, scene: () => App.Interact.fRival(slave)});
}
diff --git a/src/interaction/subordinateTargeting.js b/src/interaction/subordinateTargeting.js
index 608e9ef2e8604963a36745223c88e2645a3ee5f8..4689ec6952b671ba966446a8e03c9cdd81bd0e04 100644
--- a/src/interaction/subordinateTargeting.js
+++ b/src/interaction/subordinateTargeting.js
@@ -30,7 +30,7 @@ App.UI.subordinateTargeting = function() {
if (slave.subTarget === -1) {
App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
- `Reign ${him} in`,
+ `Rein ${him} in`,
() => {
slave.subTarget = 0;
V.StudID = 0;
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index d2ef634224c6b2861778d863ef3d3d46a90ee271..38db8b14537090775b60512bfdbd50b3b2e09048 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -342,6 +342,10 @@ App.Entity.SlaveActionsCountersState = class {
this.slavesKnockedUp = 0;
/** How many times she has knocked you up. */
this.PCKnockedUp = 0;
+ /** How many times you've knocked her up. */
+ this.timesBred = 0;
+ /** How many of your children has she borne. */
+ this.PCChildrenBeared = 0;
}
};
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 0b52b32bbd4e9b143d7f5f370e047ec55a348d1d..a02704fa165aab30ffbf6c06b488a728e6cb1dff 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -455,6 +455,11 @@ globalThis.assignJobSafely = function(slave, assignmentStr) {
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);
+ if (App.EndWeek.saVars) { // during the endweek reports, if a slave gets reassigned to whoring, we have to make her whore class valid
+ if (assignmentStr === Job.WHORE || assignmentStr === Job.BROTHEL) {
+ setReassignedWhoreClass(slave);
+ }
+ }
} else {
assignJob(slave, Job.REST);
}
diff --git a/src/js/birth/birth.js b/src/js/birth/birth.js
index 449c50278e4c1c743979c0b4ae04178736747edc..cae2738ff836b97c9fc6d8aaf0ce93e9169d3d43 100644
--- a/src/js/birth/birth.js
+++ b/src/js/birth/birth.js
@@ -1012,7 +1012,7 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
// did she make it to her birthing area?
r.push(birthDescription());
} else { // did not make it to birthing area
- if (((birthDamage > 15 && random(1, 100) > 50) || (birthDamage > 20)) && (slave.assignment !== Job.NURSE && slave.assignment !== Job.CLINIC)) {
+ if (((birthDamage > 15 && random(1, 100) > 50) || (birthDamage > 20)) && (slave.assignment !== Job.NURSE && slave.assignment !== Job.CLINIC && (!getPersonalAttention(slave.ID, "torture") || onBedRest(V.PC, true)))) {
r.push(deadlyBirthScene());
} else {
r.push(suddenBirthScene());
@@ -3990,7 +3990,9 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
} else {
// add extra events here (moving between jobs | after work)
- if (!canWalk(slave)) {
+ if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true)) {
+ r.push(`${He}'s given birth during your torture sessions enough times for you to start making games of it; perhaps you see how hard you can hit ${him} before you cause ${his} water to break, or maybe you try to break it yourself. The best part is, no matter how many come out of ${him}, ${he} never loses that exploitable baby bump.`);
+ } else if (!canWalk(slave)) {
if (slave.fetish === Fetish.MINDBROKEN) {
if (random(1, 20) > suddenBirth) {
r.push(`${He} is helped back to ${his} bed and stripped before slipping into it. Instinctively, ${he} begins to push out ${firstText} baby. ${His} child is promptly taken and ${he} is encouraged to keep resting.`);
@@ -4900,7 +4902,9 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
} else {
// add extra events here (moving between jobs | after work)
- if (!canWalk(slave)) {
+ if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true)) {
+ r.push(`${He}'s given birth during your torture sessions enough times for you to start making games of it; perhaps you see how hard you can hit ${him} before you cause ${his} water to break, or maybe you try to break it yourself. If you time it right, it's even possible to force ${him} to pop out two babies at once! The best part is, no matter how many come out of ${him}, ${he} never loses the huge target that is ${his} gravid middle.`);
+ } else if (!canWalk(slave)) {
if (slave.fetish === Fetish.MINDBROKEN) {
r.push(`While stroking ${his} pregnancy absentmindedly, ${slave.slaveName}'s body begins to birth another of ${his} brood. ${He} carries on until the contractions drag ${him} onto ${his} swollen belly.`);
r.push(clothingBirth());
@@ -4996,7 +5000,12 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
}
} else {
if (V.clinic !== 0) {
- r.push(`${He} is lead to ${V.clinicName} since ${he} is likely to face complications with childbirth. ${He} is helped from ${his} clothes and into a comfortable hospital bed to relax until ${he} is ready. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}, fully aware of ${his} watching helpers.`);
+ if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true)) {
+ r.push(`You know ${he} is going to struggle with childbirth, so you see no reason to interrupt your torture session just yet. You enjoy the sight of ${his} futile attempts to become a mother until the pooling blood reminds you that letting ${him} die so soon would cut short your fun. You send ${him} off to ${V.clinicName}, where ${he} is helped`);
+ } else {
+ r.push(`${He} is lead to ${V.clinicName} since ${he} is likely to face complications with childbirth. ${He} is helped from ${his} clothes and`);
+ }
+ r.push(`into a comfortable hospital bed to relax until ${he} is ready. ${He} makes ${himself} comfortable and begins working on birthing ${his} ${babies}, fully aware of ${his} watching helpers.`);
if (slave.geneticQuirks.uterineHypersensitivity === 2) {
r.push(`${His} body is so sensitive that even difficult birth is an intensely pleasurable experience for ${him}.`);
}
@@ -5013,7 +5022,12 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${His} ${childrenAre} promptly taken and ${he} is left under observation to make sure ${he} recovers.`);
} else {
cSection = true;
- r.push(`${He} is lead to the autosurgery, since ${he} is likely to face complications with childbirth. ${He} is stripped from ${his} clothes and set up on the operating table. ${He} is quickly sedated and subjected to a c-section in order to avoid potential problems. The surgery is quick, and ${he} is moved to a bed to recover. When ${he} awakes, ${his} ${children}`);
+ if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true)) {
+ r.push(`You know ${he} is going to struggle with childbirth, so you see no reason to interrupt your torture session just yet. You enjoy the sight of ${his} futile attempts to become a mother until the pooling blood reminds you that letting ${him} die so soon would cut short your fun. You send ${him} off to the autosurgery, to be`);
+ } else {
+ r.push(`${He} is lead to the autosurgery, since ${he} is likely to face complications with childbirth. ${He} is stripped from ${his} clothes and`);
+ }
+ r.push(`set up on the operating table. ${He} is quickly sedated and subjected to a c-section in order to avoid potential problems. The surgery is quick, and ${he} is moved to a bed to recover. When ${he} awakes, ${his} ${children}`);
if (slave.pregType > 1) {
r.push(`have`);
} else {
@@ -5022,6 +5036,8 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`already been taken away.`);
}
}
+ } else if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true) && random(1, 100) > 50) {
+ r.push(`A little thing like childbirth isn't going to stop you from beating ${him}, however, so you focus your efforts on timing your strikes in-between ${his} contractions, never truly giving ${his} body a chance to rest. You keep at it until ${his} belly is fully deflated and ${his} ${newborns} collected, and once they are, try to find just how much of a gut-punch it takes to dislodge a placenta.`);
} else {
const animals = [];
@@ -5668,7 +5684,12 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
if (birthDamage > 5) {
cSection = true;
if (V.clinic !== 0) {
- r.push(`${He} is carried to ${V.clinicName}, since ${he} is likely to face complications with childbirth. ${He} is stripped from ${his} clothes and set up in a comfortable hospital bed to relax until ${he} is ready. ${He} wiggles ${himself} into a comfortable spot and begins working on birthing ${his} ${babies}, fully aware of ${his} watching helpers.`);
+ if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true)) {
+ r.push(`You know ${he} is going to struggle with childbirth, so you see no reason to interrupt your torture session just yet. You enjoy the sight of ${his} futile attempts to become a mother until the pooling blood reminds you that letting ${him} die so soon would cut short your fun. You send ${him} off to ${V.clinicName}, where ${he} is`);
+ } else {
+ r.push(`${He} is carried to ${V.clinicName}, since ${he} is likely to face complications with childbirth. ${He} is stripped from ${his} clothes and`);
+ }
+ r.push(`set up in a comfortable hospital bed to relax until ${he} is ready. ${He} wiggles ${himself} into a comfortable spot and begins working on birthing ${his} ${babies}, fully aware of ${his} watching helpers.`);
if (slave.geneticQuirks.uterineHypersensitivity === 2) {
r.push(`${His} body is so sensitive that even difficult birth is an intensely pleasurable experience for ${him}.`);
}
@@ -5685,7 +5706,12 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
r.push(`${His} ${childrenAre} promptly taken and ${he} is left under observation to make sure ${he} recovers.`);
} else {
cSection = true;
- r.push(`${He} is carried to the autosurgery, since ${he} is likely to face complications with childbirth. ${He} is stripped from ${his} clothes and set up on the operating table. ${He} is quickly sedated and subjected to a c-section in order to avoid potential problems. The surgery is quick and ${he} is moved to a bed to recover. When ${he} awakes, ${his} ${slave.pregType > 1 ? `children have` : `child has`} already been taking away.`);
+ if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true)) {
+ r.push(`You know ${he} is going to struggle with childbirth, so you see no reason to interrupt your torture session just yet. You enjoy the sight of ${his} futile attempts to become a mother until the pooling blood reminds you that letting ${him} die so soon would cut short your fun. You send ${him} off to the autosurgery, to be`);
+ } else {
+ r.push(`${He} is carried to the autosurgery, since ${he} is likely to face complications with childbirth. ${He} is stripped from ${his} clothes and`);
+ }
+ r.push(`set up on the operating table. ${He} is quickly sedated and subjected to a c-section in order to avoid potential problems. The surgery is quick and ${he} is moved to a bed to recover. When ${he} awakes, ${his} ${slave.pregType > 1 ? `children have` : `child has`} already been taking away.`);
}
} else {
switch (slave.assignment) {
@@ -6054,7 +6080,9 @@ globalThis.birth = function(slave, {birthStorm = false, cSection = false, artRen
const newborns = slave.pregType > 1 ? `newborns` : `newborn`;
const UH = (slave.geneticQuirks.uterineHypersensitivity === 2) ? `, convulsing with orgasms in the process` : ``;
- if (random(1, 2) === 1 && canWalk(slave)) {
+ if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true) && random(1, 2) === 2) {
+ r.push(`${slave.slaveName} rudely interrupts your torture session by releasing ${his} water all over your office floor. A little thing like childbirth isn't going to stop you from beating ${him}, however, so you focus your efforts on timing your strikes in-between ${his} contractions, never truly giving ${his} body a chance to rest. You keep at it until ${his} belly is fully deflated and ${his} ${newborns} collected, and once they are, try to find just how much of a gut-punch it takes to dislodge a placenta.`);
+ } else if (random(1, 2) === 1 && canWalk(slave)) {
// at assignment else in halls/etc, only if able to move
const rival = slave.rivalry > 0 ? getSlave(slave.rivalryTarget) : null;
@@ -9191,7 +9219,7 @@ globalThis.sendNewbornsToFacility = function(mom, babiesBeingBorn, sendAll) {
const remainingBabies = [];
for (const ovum of babiesBeingBorn) {
if ((ovum.reserve === "incubator" || sendAll) && V.incubator.tanks.length < V.incubator.capacity) {
- App.Facilities.Incubator.newChild(generateChild(mom, ovum, true));
+ App.Facilities.Incubator.newChild(generateChild(mom, ovum, true), "tankSetting" in ovum ? ovum.tankSetting : null);
} else if ((ovum.reserve === "nursery" || sendAll) && V.cribs.length < V.nurseryCribs) {
App.Facilities.Nursery.newChild(generateChild(mom, ovum));
} else {
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index b29d3885d390345361dd93afeab196980a70db54..41d46b4307fd718f34f13c2e8b7e7ee80341a79b 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -642,9 +642,12 @@ globalThis.calculateCosts = (function() {
}
function getIncubatorSlavesCosts() {
- return ((V.incubator.upgrade.weight + V.incubator.upgrade.muscles + V.incubator.upgrade.reproduction +
- V.incubator.upgrade.growthStims + V.incubator.upgrade.organs + V.incubator.setting.pregAdaptationPower) *
- 500 * V.incubator.tanks.length);
+ let sum = 0;
+ for (const tank of V.incubator.tanks) {
+ sum += ((V.incubator.upgrade.weight + V.incubator.upgrade.muscles + V.incubator.upgrade.reproduction +
+ V.incubator.upgrade.growthStims + V.incubator.upgrade.organs + tank.incubatorSettings.pregAdaptationPower) * 500);
+ }
+ return sum;
}
function getServantsQuartersCosts() {
@@ -2317,6 +2320,19 @@ globalThis.effectiveWhoreClass = function(s) {
return result;
};
+/**
+ * When a slave gets reassigned from a development facility to a whoring job during the week end,
+ * we have to set her whore class to something valid to prevent errors. This method is non-ideal
+ * and will skew class loads, but it's not really noticeable by the player.
+ * @param {App.Entity.SlaveState} slave
+ */
+globalThis.setReassignedWhoreClass = function(slave) {
+ slave.sexAmount = Math.trunc(Beauty(slave) / 5);
+ slave.sexQuality = FResult(slave);
+ App.EndWeek.saVars.effectiveWhoreClass[slave.ID] = effectiveWhoreClass(slave);
+ App.EndWeek.saVars.maxWhoreClass[slave.ID] = App.EndWeek.saVars.effectiveWhoreClass[slave.ID];
+};
+
/**
* End week function to handle the (menial) slave market prices through supply and demand
* @returns {void}
diff --git a/src/js/main.js b/src/js/main.js
index e577fee479c272087ca1c528ccdbd84845c50a40..20e9b31a7bac8cb9d7a772b413ce245192ffa311 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -261,7 +261,7 @@ App.MainView.full = function() {
const outerDiv = document.createElement("div");
outerDiv.id = "walkpast";
- const slave = V.slaves.filter(s => ![Job.BODYGUARD, Job.FUCKTOY].includes(s.assignment)).random();
+ const slave = V.slaves.filter(s => ![Job.BODYGUARD, Job.FUCKTOY].includes(s.assignment) && (!getPersonalAttention(s.ID, "torture") || onBedRest(V.PC, true))).random();
if (slave) {
App.UI.DOM.appendNewElement("span", outerDiv, globalThis.walkPast(slave), "scene-intro");
}
diff --git a/src/js/personalAttentionFunctions.js b/src/js/personalAttentionFunctions.js
index 2ad338d07bbbf4d17de04b5feca43e38490b317e..5483eed7e4a528880ace4efc57e45e97f4c0fc22 100644
--- a/src/js/personalAttentionFunctions.js
+++ b/src/js/personalAttentionFunctions.js
@@ -82,7 +82,7 @@ App.PersonalAttention.getText = function(objective, slave) {
case "learn skills":
return `teach ${him}`;
case "combat training":
- return `train ${him} in combat`;
+ return `teach ${him} combat`;
case "spar":
return `spar with ${him}`;
case "explore sexuality":
@@ -95,3 +95,32 @@ App.PersonalAttention.getText = function(objective, slave) {
// settings for inducing flaws/paraphilias can be printed as-is
return objective;
};
+
+globalThis.getPersonalAttention = function(ID, objective = null) {
+ if (typeof V.personalAttention.slaves === "undefined") {
+ return false;
+ } else if (!ID) {
+ if (objective) {
+ return (V.personalAttention.slaves[0].objective === objective || V.personalAttention.slaves[1]?.objective === objective);
+ }
+ } else {
+ if (!objective) {
+ return (V.personalAttention.slaves[0].ID === ID || V.personalAttention.slaves[1]?.ID === ID);
+ } else {
+ return ((V.personalAttention.slaves[0].ID === ID && V.personalAttention.slaves[0].objective === objective) || (V.personalAttention.slaves[1]?.ID === ID && V.personalAttention.slaves[1]?.objective === objective));
+ }
+ }
+};
+
+globalThis.getPersonalAttentionType = function(ID) {
+ if (typeof V.personalAttention.slaves === "undefined") {
+ return "none";
+ } else {
+ if (V.personalAttention.slaves[0].ID === ID) {
+ return V.personalAttention.slaves[0].objective;
+ } else if (V.personalAttention.slaves[1]?.ID === ID) {
+ return V.personalAttention.slaves[1].objective;
+ }
+ }
+ return "none";
+};
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 41b9b55ec25c856922c84c7bc7c4935187b5a6d7..dd404079c1eb4186042eeac78bd0abd95bbbb4f8 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -2759,7 +2759,7 @@ App.RA.options = (function() {
constructor() {
const pairs = [
["permissive"],
- ["suppress accents", "accent elimination"],
+ ["accent elimination"],
["restrictive"]
];
super("Speech rules", pairs, true);
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 9fffd617d0d16c6a1650e4bc71d7ec7ba0bbec2e..4838f4b54f04a19d33471bc6b3fe8f089645f445 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -705,9 +705,9 @@ globalThis.BeautyArray = function(slave) {
break;
case 3:
if (slave.butt <= 8) {
- adjustBeauty("Hips: Small Butt", (slave.butt - 8));
+ adjustBeauty("Hips/Butt Ratio", (slave.butt - 8));
} else {
- adjustBeauty("Hips: Small Butt", 1);
+ adjustBeauty("Hips/Butt Ratio", 1);
}
break;
}
@@ -2066,7 +2066,7 @@ globalThis.FResultArray = (function() {
if (!canSee(slave)) {
adjustFResult(`Eyes: Blind`, -3);
} else if (!canSeePerfectly(slave)) {
- adjustFResult(`Eyes: Perfect vision`, -1);
+ adjustFResult(`Eyes: Impaired vision`, -1);
}
}
diff --git a/src/js/statsChecker/statsChecker.js b/src/js/statsChecker/statsChecker.js
index c37ed827c9d5920ff2dfa50a6d18ffff538089e1..2e9cbb7df129c67cbeb0279d33aeb50f73ade739 100644
--- a/src/js/statsChecker/statsChecker.js
+++ b/src/js/statsChecker/statsChecker.js
@@ -24,6 +24,8 @@ globalThis.isSlaveAvailable = function(slave) {
return false;
} else if (slave.assignment === Job.DAIRY && V.dairyRestraintsSetting >= 2) {
return false;
+ } else if (getPersonalAttention(slave.ID, "torture") && !onBedRest(V.PC, true)) {
+ return false;
}
return true;
};
diff --git a/src/js/utilsAssessSlave.js b/src/js/utilsAssessSlave.js
index 92acf147d04f30a2e72567b6308033efe807aa7f..2006095d862d07cc579082dac7ff961bd953bbe4 100644
--- a/src/js/utilsAssessSlave.js
+++ b/src/js/utilsAssessSlave.js
@@ -115,7 +115,7 @@ globalThis.canImproveIntelligence = function(slave) {
* @returns {number}
*/
globalThis.maxHeight = function(slave) {
- let max = Math.clamp(((Height.mean(slave) * 1.25) + slave.heightImplant * 10), 0, 274); /* max achievable height is expected height plus 25% */
+ let max = Math.clamp(((slave.natural.height * 1.25) + slave.heightImplant * 10), 0, 274); /* max achievable height is expected height plus 25% */
if (slave.geneticQuirks.neoteny === 2 && slave.physicalAge > 12) { /* Limit neoteny slaves to 12 year old max height */
max = Math.clamp(((Height.mean(slave.nationality, slave.race, slave.genes, 12) * 1.25) + slave.heightImplant * 10), 0, 274);
diff --git a/src/js/utilsSlave.js b/src/js/utilsSlave.js
index 883cc0333bf05c0fbffed4249946cbb3eb90cd4a..bda591463bd278851a894ec6c5eb7abb23d67db1 100644
--- a/src/js/utilsSlave.js
+++ b/src/js/utilsSlave.js
@@ -1517,22 +1517,22 @@ globalThis.newSlave = function(slave) {
slave.attrXY <= 35 &&
slave.boobs < 400 &&
slave.hormoneBalance < 0) {
- V.REFeminizationCheckinIDs.push(slave.ID);
+ V.RECheckInIDs.push({ID: slave.ID, type: "feminization"});
}
if (slave.actualAge > 35 && slave.face <= 10 && slave.faceImplant === 0 && slave.energy <= 60) {
- V.REMILFCheckinIDs.push(slave.ID);
+ V.RECheckInIDs.push({ID: slave.ID, type: "MILF"});
}
if (slave.attrXY <= 35 && slave.attrXX > 65) {
- V.REOrientationCheckinIDs.push(slave.ID);
+ V.RECheckInIDs.push({ID: slave.ID, type: "orientation"});
}
if (slave.face < -10) {
- V.REUglyCheckinIDs.push(slave.ID);
+ V.RECheckInIDs.push({ID: slave.ID, type: "ugly"});
}
if (slave.anus < 2) {
- V.REButtholeCheckinIDs.push(slave.ID);
+ V.RECheckInIDs.push({ID: slave.ID, type: "butthole"});
}
if (slave.boobs < 800) {
- V.REReductionCheckinIDs.push(slave.ID);
+ V.RECheckInIDs.push({ID: slave.ID, type: "reduction"});
}
/* special case for MB slave genetic intelligence in slave acquisition */
@@ -2833,7 +2833,7 @@ globalThis.DeadlinessTooltip = function(slave) {
* @param {number} [steepness] the steepness of the probability gradient when fighters are closely matched (1 reaches the limit in about 5 points of deadliness, while 10 reaches the limit in about 1/2 point)
* @returns {number} the probability that the first fighter wins
*/
-globalThis.fightProbability = function(deadliness1, deadliness2, limit = 80, steepness = 2.5) {
+globalThis.fightProbability = function(deadliness1, deadliness2, limit = 99, steepness = 0.8) {
// generate results with the probability selected by a smooth symmetric sigmoid curve (c/(1+e^-kx)+d) centered at (0,50).
// diff is the difference in fighter strength. positive favors fighter1, negative favors fighter2.
diff --git a/src/js/wombJS.js b/src/js/wombJS.js
index 694197b34f9e7a5487938e976e1567c4f584c9d6..0037b11b04c6434b04008b9f72577b59eb142aee 100644
--- a/src/js/wombJS.js
+++ b/src/js/wombJS.js
@@ -736,6 +736,9 @@ globalThis.WombSetGenericReserve = function(actor, type, count) {
if ((ft.reserve === "" || ft.reserve === type) && count > 0) {
// console.log ("!trigger");
ft.reserve = type;
+ if (type !== "incubator") {
+ delete ft.tankSetting;
+ }
count--;
}
});
@@ -751,6 +754,9 @@ globalThis.WombChangeReserveType = function(actor, oldType, newType) {
actor.womb.forEach(function(ft) {
if (ft.reserve === oldType) {
ft.reserve = newType;
+ if (newType !== "incubator") {
+ delete ft.tankSetting;
+ }
count++;
}
});
@@ -762,6 +768,7 @@ globalThis.WombCleanGenericReserve = function(actor, type, count) {
actor.womb.forEach(function(ft) {
if (ft.reserve === type && count > 0) {
ft.reserve = "";
+ delete ft.tankSetting;
count--;
}
});
@@ -814,6 +821,7 @@ globalThis.WombRemoveReservedFetuses = function(actor, type) {
globalThis.WombCleanAllReserve = function(actor) {
actor.womb.forEach(function(ft) {
ft.reserve = "";
+ delete fetus.tankSetting;
});
};
diff --git a/src/npc/descriptions/belly/belly.js b/src/npc/descriptions/belly/belly.js
index 0e0f8b7a71f59fc4da6ef63ffa6f021caf69de4d..51ff59bdc9d00b123bc55fa394ba740456e5b909 100644
--- a/src/npc/descriptions/belly/belly.js
+++ b/src/npc/descriptions/belly/belly.js
@@ -9428,7 +9428,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
if (slave.boobs > (slave.belly + 250)) {
r.push(`${slave.slaveName}'s big breasts push out ${his} overalls so far that ${his} rounded belly is left uncovered.`);
} else {
- r.push(`There is a slight curve to ${slave.slaveName}'s from ${his} belly.`);
+ r.push(`There is a slight curve to ${slave.slaveName}'s overalls from ${his} belly.`);
}
} else if (slave.muscles > 30) {
if (slave.boobs > (slave.belly + 250)) {
@@ -12179,7 +12179,7 @@ App.Desc.belly = function(slave, descType = DescType.NORMAL) {
if (slave.bellyAccessory === "a medium empathy belly") {
r.push(`${slave.slaveName}'s teddy is filled by ${his} pregnant belly. ${His} popped navel prominently pokes through the material.`);
} else if (isBellyFluidLargest) {
- r.push(`${slave.slaveName}'s teddy is uncomfortably tight around ${his} jiggling ${slave.inflationType}-filled belly, forcing the material to bulge around the sloshing bulge.`);
+ r.push(`${slave.slaveName}'s teddy is uncomfortably tight around ${his} jiggling ${slave.inflationType}-filled belly, forcing the material to stretch around the sloshing bulge.`);
} else if (slave.bellyImplant > 0) {
r.push(`${slave.slaveName}'s teddy is filled by ${his} implant-filled belly. ${His} popped navel prominently pokes through the material.`);
} else {
diff --git a/src/npc/descriptions/butt/buttplug.js b/src/npc/descriptions/butt/buttplug.js
index b11aaa8696242846f9994f9330efcd21c6f00c2e..185739f24ede86e14eff025431e2c4478a0d239d 100644
--- a/src/npc/descriptions/butt/buttplug.js
+++ b/src/npc/descriptions/butt/buttplug.js
@@ -394,7 +394,7 @@ App.Desc.buttplug = function(slave, descType = DescType.NORMAL) {
} else {
r.push(`hips`);
}
- r.push(`are so thin that ${his} anal chastity accessory is clearly visible underneath.`);
+ r.push(`is so thin that ${his} anal chastity accessory is clearly visible underneath.`);
} else {
r.push(`${his} buttocks are so thin and snug that the outline of ${his} anus is clearly`);
if (slave.butt > 3) {
diff --git a/src/npc/descriptions/describePiercings.js b/src/npc/descriptions/describePiercings.js
index df122da9df061cbf8f776420309af4eb2da22603..55715424dad3b45828626b01e3759708420c0b62 100644
--- a/src/npc/descriptions/describePiercings.js
+++ b/src/npc/descriptions/describePiercings.js
@@ -1,7 +1,7 @@
/**
* @param {App.Entity.SlaveState} slave
* @param {string} surface
- * @returns {string} Relevant slave tattoo, if present
+ * @returns {string} Relevant slave piercing, if present
*/
App.Desc.piercing = function(slave, surface) {
"use strict";
@@ -11,7 +11,7 @@ App.Desc.piercing = function(slave, surface) {
} = getPronouns(slave);
if (V.showBodyMods !== 1) {
return;
- } else if (slave.piercing[surface] && slave.piercing[surface].desc) {
+ } else if (slave.piercing[surface] && slave.piercing[surface].weight > 0 && slave.piercing[surface].desc) {
return `${pronounsForSlaveProp(slave, slave.piercing[surface].desc)}.`;
}
switch (surface) {
@@ -186,6 +186,7 @@ App.Desc.piercing = function(slave, surface) {
break;
case "a confederate army uniform":
r.push(`${He}'s wearing a little, unobtrusive stud earring in the shape of a Fleur-de-lis.`);
+ break;
case "slutty jewelry":
r.push(`${He}'s wearing gold earrings in the shape of a pair of`);
if (slave.dick > 0 && slave.balls === 0) {
diff --git a/src/npc/descriptions/describeTattoos.js b/src/npc/descriptions/describeTattoos.js
index 05067d9a357fc4690e316e82aeeec4e5395c54eb..b821b8be6a8c5dbb4b7945761e88d074ac5f41ae 100644
--- a/src/npc/descriptions/describeTattoos.js
+++ b/src/npc/descriptions/describeTattoos.js
@@ -657,15 +657,15 @@ App.Desc.tattoo = function(slave, surface) {
if (slave.dick !== 0) {
r.push(`a downward-pointing arrow which reads 'Bounces When Buttfucked.'`);
} else {
- r.push(`gothic script that reads '`);
+ r.push(`gothic script that reads`);
if (V.PC.dick !== 0) {
if (V.PC.vagina !== -1) {
- r.push(`Futa`);
+ r.push(`'Futa`);
} else {
- r.push(`Cock`);
+ r.push(`'Cock`);
}
} else {
- r.push(`Cunt`);
+ r.push(`'Cunt`);
}
r.push(`Pleaser.'`);
}
diff --git a/src/npc/descriptions/relationRival.js b/src/npc/descriptions/relationRival.js
index bfda67478e96cd0bd38b21d9274eb4ee2433f87f..eff958bd12face94c6a2cd72df4440fdcab80f14 100644
--- a/src/npc/descriptions/relationRival.js
+++ b/src/npc/descriptions/relationRival.js
@@ -21,18 +21,20 @@ App.Desc.relationRival = function(slave, links) {
if (slave.relationship >= 3 && totalRelatives(slave) > 0) {
const lover = getSlave(slave.relationshipTarget);
if (lover) {
- if (relativeTerm(slave, lover) !== null) {
+ const term = relativeTerm(slave, lover);
+ if (term !== null) {
const s = [];
s.push(`${He} is in an`);
- const span = App.UI.DOM.makeElement("span", `incestuous relationship with ${his} ${relativeTerm(slave, lover)}, `, ["si-family"]);
+ const span = App.UI.DOM.makeElement("span", `incestuous relationship with ${his} ${term}, `, ["si-family"]);
span.append(slaveReference(lover), ".");
s.push(span);
return s;
}
}
} else if (slave.relationship <= -2) {
- if (relativeTerm(slave, V.PC) !== null) {
- return [`${He} is in an <span class="si-family">incestuous relationship with ${his} ${relativeTerm(slave, V.PC)}, you.</span>`];
+ const term = relativeTerm(slave, V.PC);
+ if (term !== null) {
+ return [`${He} is in an <span class="si-family">incestuous relationship with ${his} ${term}, you.</span>`];
}
}
return [];
@@ -43,13 +45,14 @@ App.Desc.relationRival = function(slave, links) {
*/
function rival() {
if (slave.rivalry !== 0) {
- if (getSlave(slave.rivalryTarget)) {
+ const rival = getSlave(slave.rivalryTarget);
+ if (rival) {
if (slave.rivalry <= 1) {
- return [`${He} <span class="si-rival">dislikes</span>`, App.UI.DOM.combineNodes(slaveReference(getSlave(slave.rivalryTarget)), `.`)];
+ return [`${He} <span class="si-rival">dislikes</span>`, App.UI.DOM.combineNodes(slaveReference(rival), `.`)];
} else if (slave.rivalry <= 2) {
- return [`${He} is`, App.UI.DOM.combineNodes(slaveReference(getSlave(slave.rivalryTarget)), `'s`), `<span class="si-rival">rival.</span>`];
+ return [`${He} is`, App.UI.DOM.combineNodes(slaveReference(rival), `'s`), `<span class="si-rival">rival.</span>`];
} else {
- return [`${He} <span class="si-rival">bitterly hates</span>`, App.UI.DOM.combineNodes(slaveReference(getSlave(slave.rivalryTarget)), `.`)];
+ return [`${He} <span class="si-rival">bitterly hates</span>`, App.UI.DOM.combineNodes(slaveReference(rival), `.`)];
}
}
}
diff --git a/src/npc/generate/generateGenetics.js b/src/npc/generate/generateGenetics.js
index 738eff615368476782229069dac9b3333db282f7..5f0b207a5392a21ca379643f2c3713447d53fd2e 100644
--- a/src/npc/generate/generateGenetics.js
+++ b/src/npc/generate/generateGenetics.js
@@ -1223,9 +1223,10 @@ globalThis.generateChild = function(mother, ovum, incubator = false) {
}
}
} else {
+ const incubatorSetting = ("tankSetting" in ovum) ? ovum.tankSetting : (genes.gender === "XX" ? V.incubator.femaleSetting : V.incubator.maleSetting);
const fixedAge = {
- minAge: V.targetAge,
- maxAge: V.targetAge,
+ minAge: incubatorSetting.targetAge,
+ maxAge: incubatorSetting.targetAge,
ageOverridesPedoMode: 1,
mature: 0
};
@@ -1369,10 +1370,10 @@ globalThis.generateChild = function(mother, ovum, incubator = false) {
child.canRecruit = 0;
child.hStyle = "messy";
child.hLength = 300;
- if (V.incubator.setting.imprint === "terror") {
+ if (incubatorSetting.imprint === "terror") {
child.origin = "$He was conditioned from birth into mindless terror in an aging tank.";
child.tankBaby = 2;
- } else if (V.incubator.setting.imprint === "trust") {
+ } else if (incubatorSetting.imprint === "trust") {
child.origin = "$He was conditioned from birth into trusting obedience in an aging tank.";
child.tankBaby = 1;
} else {
diff --git a/src/npc/generate/generateMarketSlave.js b/src/npc/generate/generateMarketSlave.js
index 2d21a5d30db01b65de8f57f761927f7394b2ef7b..587c62b25505fc4817b6a6da543072d4826a1e60 100644
--- a/src/npc/generate/generateMarketSlave.js
+++ b/src/npc/generate/generateMarketSlave.js
@@ -285,10 +285,10 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.vaginaLube = Math.clamp(slave.vaginaLube + 1, 0, 2);
}
if ((slave.butt - slave.buttImplant) < 2) {
- slave.butt = Math.clamp(slave.butt + 1, 0, 10);
+ slave.butt = Math.clamp(slave.butt + 1, 0, 20);
}
if (((slave.boobs - slave.boobsImplant) < 500)) {
- slave.boobs = Math.clamp(slave.boobs + 400, 0, 10000);
+ slave.boobs = Math.clamp(slave.boobs + 400, 0, 50000);
}
if (slave.face <= 95) {
slave.face = Math.clamp(slave.face + 20, -100, 100);
@@ -331,8 +331,8 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
if ((slave.vagina > -1) && (slave.vaginaLube > 0)) {
slave.vaginaLube = Math.clamp(slave.vaginaLube - 1, 0, 2);
}
- slave.butt = Math.clamp(slave.butt - 1, 0, 10);
- slave.boobs = Math.clamp(slave.boobs - 400, 0, 10000);
+ slave.butt = Math.clamp(slave.butt - 1, 0, 20);
+ slave.boobs = Math.clamp(slave.boobs - 400, 0, 50000);
if (slave.face > 10) {
slave.face = Math.clamp(slave.face - 20, -100, 100);
}
@@ -428,10 +428,10 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
if (V.corp.SpecImplants === 1) {
r += `Slaves are given tasteful breast, butt, and lip implants. `;
slave.buttImplant = 1;
- slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 10);
+ slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 20);
slave.buttImplantType = "normal";
slave.boobsImplant = 600;
- slave.boobs = Math.clamp(slave.boobs + slave.boobsImplant, 0, 10000);
+ slave.boobs = Math.clamp(slave.boobs + slave.boobsImplant, 0, 50000);
slave.boobsImplantType = "normal";
slave.lipsImplant = 20;
slave.lips = Math.clamp(slave.lips + slave.lipsImplant, 0, 55);
@@ -439,12 +439,12 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
r += `Slaves are given absurd breast, butt, and lip implants. `;
slave.buttImplant = 4;
slave.buttImplantType = "fillable";
- slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 10);
+ slave.butt = Math.clamp(slave.butt + slave.buttImplant, 0, 20);
slave.boobsImplant = 2400;
slave.boobsImplantType = "advanced fillable";
- slave.boobs = Math.clamp(slave.boobs + slave.boobsImplant, 0, 10000);
+ slave.boobs = Math.clamp(slave.boobs + slave.boobsImplant, 0, 50000);
slave.lipsImplant = 60;
- slave.lips = Math.clamp(slave.lipsImplant + slave.buttImplant, 0, 100);
+ slave.lips = Math.clamp(slave.lips + slave.lipsImplant, 0, 100);
} else {
r += `Slaves are not given breast, butt, or lip implants. `;
}
@@ -1351,7 +1351,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.skill.oral = jsRandom(15, 100);
slave.skill.anal = jsRandom(15, 100);
slave.anus = jsRandom(1, 3);
- slave.weight = Math.clamp(-25, 25, slave.weight);
+ slave.weight = Math.clamp(slave.weight, -25, 25);
slave.behavioralFlaw = jsEither(["anorexic", "arrogant", "bitchy", "devout", "gluttonous", "hates men", "hates women", "hates women", "liberated", "odd"]);
slave.sexualFlaw = jsEither(["apathetic", "crude", "hates anal", "hates oral", "hates penetration", "idealistic", "judgemental", "repressed", "shamefast"]);
if (jsRandom(1, 2) === 1) {
diff --git a/src/npc/generate/newChildIntro.js b/src/npc/generate/newChildIntro.js
index fd26b1ccd280c58f53d65e62225e3b39cc4f0c65..7ecf1c8c1754408d266fe5ac338d64e3563c5b94 100644
--- a/src/npc/generate/newChildIntro.js
+++ b/src/npc/generate/newChildIntro.js
@@ -27,7 +27,7 @@ App.UI.newChildIntro = function(slave) {
} else if (slave.geneticQuirks.neoteny && slave.actualAge > 12 && V.geneticMappingUpgrade === 0) {
r.push(`you have to make sure the right ${girl} was released. ${He} was supposed to be ${slave.actualAge}, not this child sitting before you. You double check the machine's logs to be certain and it turns out ${he} really is ${slave.actualAge}, just abnormally young looking for ${his} age.`);
} else {
- r.push(`you help ${him} to ${his} feet${(V.incubator.setting.reproduction > 1) ? `, making sure to feel up ${his} overdeveloped body,` : ``} and walk ${him} to your penthouse.`);
+ r.push(`you help ${him} to ${his} feet${slave.incubatorSettings.reproduction > 1 ? `, making sure to feel up ${his} overdeveloped body,` : ``} and walk ${him} to your penthouse.`);
}
r.push(`Though first you must decide upon a name for the new ${girl}; it won't take long to reach your office, so you have only <span class="orange">one chance to name ${him}</span> before you arrive.`);
App.Events.addParagraph(el, r);
@@ -736,7 +736,7 @@ App.UI.newChildIntro = function(slave) {
} else if (V.PC.dick !== 0) {
r.push(`${He} notices your privates differ from ${hers}, and thanks to the tank's teachings, <span class="devotion inc">can't look away.</span>`);
slave.devotion += 4;
- if (V.incubator.setting.reproduction > 0) {
+ if (slave.incubatorSettings.reproduction > 0) {
r.push(`${He} seems a little alarmed at ${his} nipples and clit stiffening to the`);
if (canSee(slave)) {
r.push(`sight`);
@@ -753,7 +753,7 @@ App.UI.newChildIntro = function(slave) {
} else if (V.PC.vagina !== -1) {
r.push(`${He} notices your privates differ from ${hers}, and thanks to the tank's teachings, <span class="devotion inc">can't look away.</span>`);
slave.devotion += 4;
- if (V.incubator.setting.reproduction > 0) {
+ if (slave.incubatorSettings.reproduction > 0) {
r.push(`${He} seems a little alarmed at ${his} dick`);
if (canAchieveErection(slave)) {
r.push(`rapidly stiffening`);
@@ -771,7 +771,7 @@ App.UI.newChildIntro = function(slave) {
}
}
- if (V.incubator.setting.reproduction > 0) {
+ if (slave.incubatorSettings.reproduction > 0) {
if (((slave.attrXX > 50) || (slave.behavioralQuirk === "adores women")) && (slave.behavioralFlaw !== "hates women") && (slave.trust >= -20)) {
if (V.PC.boobs >= 900) {
r.push(`${He} seems to think you're pretty, and is more willing to <span class="devotion inc">try for your approval</span> than ${he} would otherwise be. ${He} openly ogles your rack at every opportunity.`);
diff --git a/src/npc/generate/newSlaveIntro.js b/src/npc/generate/newSlaveIntro.js
index 29d31a9c3144f72749f5946fab52a337983f1603..9b8354445cb52400c4f7c7e2dfb0879ebd28a9c8 100644
--- a/src/npc/generate/newSlaveIntro.js
+++ b/src/npc/generate/newSlaveIntro.js
@@ -823,6 +823,20 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
slave.devotion += 4;
}
+ if (canSee(slave) && V.eventResults.artifactsBought?.includes("chinese") && ["Chinese", "Taiwanese", "Mongolian", "Vietnamese"].includes(slave.nationality)) {
+ r.push(`${He} stares for a moment at the large, ancient wooden statue of the benevolent Guan Yin Bodhisattva. As far as you know, it doesn't actually have any supernatural power, but ${he}'s still <span class="trust inc">reassured</span> by the nearby presence of the "Goddess of Mercy and Compassion."`);
+ slave.trust += 2;
+ if (slave.intelligence + slave.intelligenceImplant > 50) {
+ if (V.arcologies[0].FSPaternalist >= 50) {
+ r.push(`The fact that you seem to earnestly follow Guan Yin in your compassion makes ${him} <span class="devotion inc">like you more.</span>`);
+ slave.devotion += 2;
+ } else if (V.arcologies[0].FSDegradationist >= 50) {
+ r.push(`The place of honor for Guan Yin does not square with your distinct lack of compassion for your slaves, though, and ${he} begins to think of you as <span class="devotion dec">unfaithful and deceitful.</span>`);
+ slave.devotion -= 2;
+ }
+ }
+ }
+
if (slave.devotion < -50 && slave.rudeTitle !== 1) {
if (jsRandom(-100, 0) >= slave.devotion) {
slave.rudeTitle = 1;
@@ -3271,7 +3285,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
}
if (tankBorn) {
r.push(`${He} accepts your groping, even becoming aroused by it, but might not be a breast fetishist, though ${he} <span class="hotpink">certainly enjoys the attention.</span> By the feel of ${his} nipples between your fingers, ${he} may certainly develop into one.`);
- if (V.incubator.setting.reproduction === 2 && slave.boobs > 400) {
+ if (slave.incubatorSettings.reproduction > 1 && slave.boobs > 400) {
r.push(`A loud moan and a distinct wetness in your hand quickly draw your attention to ${him}. It seems <span class="green">${he} is lactating!</span>`);
slave.lactation = 1;
slave.lactationDuration = 2;
@@ -3441,9 +3455,12 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
}
r.push(`As ${he} begins to moan with lust, you grip down tightly and force ${him} to the floor. You straddle ${him} and lower your dripping pussy onto ${his} face${PC.dick !== 0 ? `, your erect cock coming to rest on ${his} forehead` : ``}. You continue stroking your toy's rod as ${he} eagerly begins eating you out. As ${his} cock begins to throb, anticipating ${his} upcoming orgasm,`);
- if (tankBorn && (overpowerCheck(slave, V.PC) < random(1, 100)) && (V.incubator.setting.reproduction > 0)) {
- r.push(`${he} shoves you onto your back and deeply penetrates you. Before you can kick ${him} off, ${he} thrusts twice and unloads ${his} pent up orgasm deep into your pussy. ${He} pulls out with a huge smile on ${his} face and a <span class="hotpink">deep love</span> for ${his} mate. You glower at ${him} as cum pools from your stretched cunt; ${he} might not be a dom now, but ${he} may certainly become one.`);
+ if (tankBorn && (overpowerCheck(slave, V.PC) < random(1, 100)) && slave.incubatorSettings.reproduction > 0) {
+ r.push(`${he} shoves you onto your back and deeply penetrates you${PC.vagina === 0 ? `, painfully <span class="virginity loss">piercing your maidenhead</span> in the process` : ``}. Before you can kick ${him} off, ${he} thrusts twice and unloads ${his} pent up orgasm deep into your pussy. ${He} pulls out with a huge smile on ${his} face and a <span class="hotpink">deep love</span> for ${his} mate. You glower at ${him} as cum pools from your stretched cunt; ${he} might not be a dom now, but ${he} may certainly become one.`);
slave.devotion += 5;
+ if (V.PC.vagina === 0) {
+ V.PC.vagina = 1;
+ }
seX(slave, "penetrative", V.PC, "vaginal");
if (random(1, 100) > 60 && slave.fetish === Fetish.NONE) {
slave.fetish = "dom";
@@ -3835,7 +3852,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`grumbling unhappily when ${he} finds no milk within.`);
}
- if ((overpowerCheck(slave, V.PC) < random(1, 100)) && slave.muscles > 30 && V.incubator.setting.reproduction > 0 && canAchieveErection(slave)) {
+ if ((overpowerCheck(slave, V.PC) < random(1, 100)) && slave.muscles > 30 && slave.incubatorSettings.reproduction > 0 && canAchieveErection(slave)) {
r.push(`Suddenly, ${he} shoves you onto your back and begins enthusiastically fucking your breasts. Before you can push ${him} off, ${he} thrusts hard and unloads ${his} pent-up orgasm deep into your cleavage and across your face. ${He} sits back with a huge smile on ${his} face and a <span class="hotpink">new connection to you.</span> ${He} <span class="gold">recoils in surprise and fear</span> when you respond by slapping ${him} across the face for ${his} impudence. ${He} might not look like a dom, but ${he} may turn into one.`);
slave.devotion += 5;
slave.trust -= 5;
diff --git a/src/npc/interaction/FSuckle.js b/src/npc/interaction/FSuckle.js
index 95305395d154b56dc330d5948a5d7d4e9e43cb60..bec8e22614404262a778579203dd10b106365479 100644
--- a/src/npc/interaction/FSuckle.js
+++ b/src/npc/interaction/FSuckle.js
@@ -443,7 +443,7 @@ App.Interact.fSuckle = function(slave) {
r.push(`beside the groaning container of ${slave.inflationType} within ${him} and`);
}
} else if (slave.weight > 95) {
- r.push(`getting familiar with ${his} fat belly as`);
+ r.push(`${his} fat belly softly cushioning your cheek and`);
}
r.push(`${his} over-productive bosoms dripping sweet cream on your face${(slave.nipples === "inverted") ? `, the milk waiting to be sucked from the tight inverted holes above you` : ``}${(V.PC.belly >= 10000) ? ` and your belly brushing the undersides of ${his} tits` : ``}. You`);
if (mood === 2) {
diff --git a/src/npc/interaction/fAbuse.js b/src/npc/interaction/fAbuse.js
index cd7fdbee231e6e36d089121b04c5d084abff828d..c442522ebdb2c819dbc1a4d190ec72d013a056b6 100644
--- a/src/npc/interaction/fAbuse.js
+++ b/src/npc/interaction/fAbuse.js
@@ -744,7 +744,7 @@ App.Interact.fAbuse = function(slave) {
} else if (seed === 7 && slave.sexualFlaw !== "judgemental") {
r.push(`<span class="red">sexually judgemental,</span> out of an unconscious desire to disqualify people from being good enough to have sex with ${him}.`);
slave.sexualFlaw = "judgemental";
- } else if (V.PC.dick !== -1) {
+ } else if (V.PC.dick !== 0) {
r.push(`<span class="red">hating men,</span> since you forced your cock on ${him}.`);
slave.behavioralFlaw = "hates men";
} else {
diff --git a/src/npc/startingGirls/startingGirls.js b/src/npc/startingGirls/startingGirls.js
index be1959bbe77ca385f3df0a373eb09458d2eb3c69..a7dc89943513cc21fdc524db54d077938b553cc6 100644
--- a/src/npc/startingGirls/startingGirls.js
+++ b/src/npc/startingGirls/startingGirls.js
@@ -194,7 +194,9 @@ App.StartingGirls.applyCareerBonus = function(slave) {
case "hoodlum":
case "street urchin":
improveCondition(slave, 5);
- slave.skill.combat = 20;
+ if (slave.skill.combat < 60) {
+ slave.skill.combat += 20;
+ }
break;
case "BlackHat":
case "hacker":
@@ -2174,7 +2176,9 @@ App.StartingGirls.stats = function(slave) {
["PCChildrenFathered", "PC's children fathered"],
["slavesKnockedUp", "Slaves knocked up"],
["PCKnockedUp", "Times knocked up PC"],
- ["bestiality", "Bestiality"]
+ ["bestiality", "Bestiality"],
+ ["timesBred", "Times Bred"],
+ ["PCChildrenBeared", "PC's children carried"]
]);
options.addOption("Set all counters to 0", "counter", slave).customButton("Reset", () => slave.counter = new App.Entity.SlaveActionsCountersState(), "");
for (const key of counters) {
diff --git a/src/npc/surgery/surrogacyWorkaround.js b/src/npc/surgery/surrogacyWorkaround.js
index 5c028eaf38478fa74e604c7da24648a09f124725..1b87c8a98f32059b12ee0b7330356319fb5205ed 100644
--- a/src/npc/surgery/surrogacyWorkaround.js
+++ b/src/npc/surgery/surrogacyWorkaround.js
@@ -72,11 +72,13 @@ App.UI.surrogacyWorkaround = function() {
App.UI.DOM.appendNewElement("div", node, "You have no slaves with potent sperm.");
}
- if (V.incubator.tanks.length > 0 && V.incubator.setting.reproduction === 2) {
- App.UI.DOM.appendNewElement("h2", node, `Incubator settings are resulting in large-scale fluid secretion. Select an eligible incubatee to milk for semen:`);
-
+ if (V.incubator.tanks.length > 0 && V.incubator.upgrade.reproduction === 1) {
for (const tank of V.incubator.tanks) {
- if (tank.balls > 0 && tank.dick > 0 && canBreed(donatrix, tank)) {
+ if (tank.balls > 0 && tank.dick > 0 && tank.incubatorSettings.reproduction === 2 && canBreed(donatrix, tank)) {
+ if (eligibilityI === 0) {
+ App.UI.DOM.appendNewElement("h2", node, `Incubator settings are resulting in large-scale fluid secretion. Select an eligible incubatee to milk for semen:`);
+ eligibilityI = 1;
+ }
App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
tank.slaveName,
() => {
@@ -84,7 +86,6 @@ App.UI.surrogacyWorkaround = function() {
App.UI.reload();
}
));
- eligibilityI = 1;
}
}
if (eligibilityI === 0) {
diff --git a/src/player/desc/pLongBoobs.js b/src/player/desc/pLongBoobs.js
index 753223aa33d0ec620cde130d6fd7ff61af121fb4..c94ae65490091f53a2204ca19f96872c31436b27 100644
--- a/src/player/desc/pLongBoobs.js
+++ b/src/player/desc/pLongBoobs.js
@@ -506,7 +506,7 @@ App.Desc.Player.boobs = function(PC = V.PC) {
r.push(obviousImplants);
} else {
r.push(boobShape());
- r.push(`They tend bounce everywhere when you fuck your slaves.`);
+ r.push(`They tend to bounce everywhere when you fuck your slaves.`);
}
r.push(boobVolume());
} else if (PC.boobs >= 1000) {
diff --git a/src/player/desc/pNotesBoobs.js b/src/player/desc/pNotesBoobs.js
index 83ebfdbb00988015b527468551ebe36a713bc551..71d28bb73e8e4c6594cc17fd09ad95b1097686fd 100644
--- a/src/player/desc/pNotesBoobs.js
+++ b/src/player/desc/pNotesBoobs.js
@@ -46,9 +46,9 @@ App.Desc.Player.pNotesBoobs = function(PC = V.PC) {
} else if (PC.boobs >= 1200) {
r.push(`Your top strains against your big`);
if (PC.markings === "freckles") {
- r.push(`breasts, revealing a peak of freckled cleavage.`);
+ r.push(`breasts, revealing a peek of freckled cleavage.`);
} else if (PC.markings === "heavily freckled") {
- r.push(`breasts, revealing a peak of densely freckled cleavage.`);
+ r.push(`breasts, revealing a peek of densely freckled cleavage.`);
} else {
r.push(`breasts.`);
}
diff --git a/src/player/desc/pShortBelly.js b/src/player/desc/pShortBelly.js
index 38ec814225ee04b4f3cfd4056e6b690085a39561..96973d4aef7963868cfdf45f609924ebdfce336e 100644
--- a/src/player/desc/pShortBelly.js
+++ b/src/player/desc/pShortBelly.js
@@ -17,7 +17,7 @@ App.Desc.Player.officeBelly = function(PC = V.PC) {
} else if (PC.belly >= 60000) {
r.push(`You're definitely having multiples; there is no denying it at this point. All you can do is try to relax and keep trying to stave off the stretch marks.`);
} else if (PC.belly >= 45000) {
- r.push(`You both look and feel enormous; your belly juts out so much now. You stand no chance of sitting at your desk normally and have taken to angling you chair and belly to the side instead.`);
+ r.push(`You both look and feel enormous; your belly juts out so much now. You stand no chance of sitting at your desk normally and have taken to angling your chair and belly to the side instead.`);
} else if (PC.belly >= 30000) {
r.push(`Your chair has taken to creaking ominously whenever you shift your pregnant bulk while you've taken to keeping your belly uncovered to give it room.`);
} else if (PC.belly >= 14000) {
diff --git a/src/player/js/PlayerState.js b/src/player/js/PlayerState.js
index c7ac6fc2bd9b9c7b3a960c4e8aad06eee81729d0..69b54359cc484b3f615db634b944eeeb85c4599d 100644
--- a/src/player/js/PlayerState.js
+++ b/src/player/js/PlayerState.js
@@ -1353,6 +1353,8 @@ App.Entity.PlayerState = class PlayerState {
* * "atrophied"
*/
this.digestiveSystem = "normal";
+ /** progress until .digestiveSystem is swapped to "normal". Completes at 20.*/
+ this.weaningDuration = 0;
/**
* * -2: heavy male hormones
* * -1: male hormones
@@ -1523,6 +1525,13 @@ App.Entity.PlayerState = class PlayerState {
* 0: sated
*/
this.need = 0;
+ /**
+ * If sexual need is not met, apply punishment for following week.
+ *
+ * 1: overtly horny
+ * 0: sated
+ */
+ this.lusty = 0;
/**
* A list of IDs of anyone the PC has ever slept with.
*
diff --git a/src/player/js/enslavePlayer.js b/src/player/js/enslavePlayer.js
index b91146ac0b39b2fc7e7f8a20bba2bc37bac26687..aa1d2becfbbbfc5e21620ae2577781eb2b8fd846 100644
--- a/src/player/js/enslavePlayer.js
+++ b/src/player/js/enslavePlayer.js
@@ -44,6 +44,8 @@ globalThis.convertPlayerToSlave = function(player, badEnd = "boring") {
slave.counter.PCKnockedUp = 0;
slave.counter.slavesFathered = 0;
slave.counter.slavesKnockedUp = 0;
+ slave.counter.timesBred = 0;
+ slave.counter.PCChildrenBeared = 0;
slave.custom = new App.Entity.SlaveCustomAddonsState();
slave.weekAcquired = 0;
slave.origin = "A former arcology owner that made some poor decisions in $his life.";
@@ -126,6 +128,7 @@ globalThis.convertPlayerToSlave = function(player, badEnd = "boring") {
delete slave.rumor;
delete slave.physicalImpairment;
delete slave.forcedFertDrugs;
+ delete slave.lusty;
/* badEnd will be used here to apply unique effects depending on the ending */
diff --git a/src/player/managePersonalAffairs.js b/src/player/managePersonalAffairs.js
index eaff820a60f6a813acca2b0c3476387fe6238578..cd0e04ff5d4d2e8d68944781ff96965c9441f9b6 100644
--- a/src/player/managePersonalAffairs.js
+++ b/src/player/managePersonalAffairs.js
@@ -1077,6 +1077,20 @@ App.UI.managePersonalAffairs = function() {
}));
}
+ // Modded consumer grade PC drugs
+ App.Mods.Drugs.list.filter(drug => drug.isPCDrug && drug.isConsumerGrade && drug.available(PC)).forEach(drug => {
+ if (PC.drugs !== drug.name) {
+ if (drug.enable(PC) === true) {
+ links.push(App.UI.DOM.link(drug.text, () => {
+ PC.drugs = drug.name;
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(drug.text, [drug.enable(PC)]));
+ }
+ }
+ });
+
text.push(App.UI.DOM.generateLinksStrip(links));
App.Events.addNode(consumerDrugsDiv, text);
@@ -1498,6 +1512,20 @@ App.UI.managePersonalAffairs = function() {
}
}
+ // Modded slave grade PC drugs
+ App.Mods.Drugs.list.filter(drug => drug.isPCDrug && !drug.isConsumerGrade && drug.available(PC)).forEach(drug => {
+ if (PC.drugs !== drug.name) {
+ if (drug.enable(PC) === true) {
+ links.push(App.UI.DOM.link(drug.text, () => {
+ PC.drugs = drug.name;
+ App.UI.DOM.replace(drugsDiv, drugs);
+ }));
+ } else {
+ links.push(App.UI.DOM.disabledLink(drug.text, [drug.enable(PC)]));
+ }
+ }
+ });
+
text.push(App.UI.DOM.generateLinksStrip(links));
App.Events.addNode(slaveDrugsDiv, text);
diff --git a/src/player/personalAttentionSelect.js b/src/player/personalAttentionSelect.js
index 57e5b4694cc33116311fd1dfad6db85a50da3fe1..0d9f8514599153d0373dadbf57d0d9520f72d3c2 100644
--- a/src/player/personalAttentionSelect.js
+++ b/src/player/personalAttentionSelect.js
@@ -647,6 +647,15 @@ App.UI.Player.personalAttention = function() {
healthText(slave),
]);
links.push(attentionLink(i, `Care for ${him}`, "health"));
+ if (V.arcologies[0].FSPaternalist === "unset") {
+ if (getPersonalAttention(null, "torture")) {
+ links.push(App.UI.DOM.disabledLink(`Make ${him} suffer`, [
+ `You can only torture one slave at a time`
+ ]));
+ } else {
+ links.push(attentionLink(i, `Make ${him} suffer`, "torture"));
+ }
+ }
// Behavioral Flaws
if (slave.behavioralFlaw !== "none") {
@@ -889,13 +898,6 @@ App.UI.Player.personalAttention = function() {
} else {
App.UI.DOM.appendNewElement("div", div, `Paraphilias can be induced from a strong fetish.`, ['note', 'margin-left']);
}
-
- // sadism
- /*
- if (V.arcologies[0].FSPaternalist === "unset") {
- links.push(attentionLink(i, `Make ${him} suffer`, "torture"));
- }
- */
}
}
diff --git a/src/pregmod/blackMarket.js b/src/pregmod/blackMarket.js
index 9260b8426b2e2785d9fcdcf0ed24eac627a0758f..1843fb90b01af4b3b994e9d84f23fd1cb4f37ec0 100644
--- a/src/pregmod/blackMarket.js
+++ b/src/pregmod/blackMarket.js
@@ -335,6 +335,7 @@ App.UI.blackMarket = function() {
r.push(`"I'm sorry, I can't sell this product to you, even if I wanted to," he says. "I have this technology, which if applied, would make slaves appear younger than the legal age of majority. I picked it up from an exotics dealer, who picked it up from some old world government research center. And yes, I know, this is a black market, and I would be happy to sell it to you, except, you see, too many of the wrong people know I have it, and while the knowledge isn't illegal, selling or using it is. See if I sell this to you, you'd start getting younger looking slaves, and those people would try to take us both down, and since I'm not the master of an arcology, I would probably end up enslaved, and I'm not interested in that. If only the laws were more open about who could have sex with who, I could sell this to anyone interested."`);
r.push(`Since the agreed upon minimum age in your Free City is greater than eight, it would draw way too much attention for you to make use of the research recipe for the Childhood Fertility <span class="orange">Induced NCS</span> (genetic engineering and hormonal blend).`);
App.Events.addNode(node, r, "div");
+ r = [];
} else {
if (V.geneticMappingUpgrade === 0) {
r.push(`You lack the facilities required for such a treatment to be effective on specific individuals.`);
@@ -365,6 +366,7 @@ App.UI.blackMarket = function() {
if (V.cash >= NCSCash) {
r.push(r.pop() + `"`);
App.Events.addNode(node, r, "div");
+ r = [];
App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
"Purchase childhood fertility induced NCS",
() => {
@@ -380,6 +382,7 @@ App.UI.blackMarket = function() {
} else {
r.push(`Or, you know, come back with money."`);
App.Events.addNode(node, r, "div");
+ r = [];
r.push(`You cannot afford the asking price of <span class="cash dec">${(cashFormat(NCSCash))}</span> for the Childhood Fertility <span class="orange">Induced NCS</span> (genetic engineering and hormonal blend) research recipe.`);
}
} else {
@@ -394,6 +397,7 @@ App.UI.blackMarket = function() {
App.UI.DOM.combineNodes(App.Encyclopedia.link("Childhood Fertility Induced NCS"), ".")
);
App.Events.addNode(node, r, "div");
+ r = [];
if (V.minimumSlaveAge <= 15 && V.minimumSlaveAge > 8) {
V.merchantIllegalWares.delete("childhoodFertilityInducedNCS");
}