diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 0f846b4e34877a441bd54205fe728bb5bfd08e86..a69e8807c42303a1aabc98b56327fcfdf4c390e4 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -623,7 +623,7 @@ slave's assignment
"stay confined"
"work a glory hole"
"be a subordinate slave"
-
+
Assigned to facility:
"rest in the spa"
"work as a servant" (Servants' Quarters )
@@ -636,7 +636,7 @@ slave's assignment
"be confined in the arcade"
"get treatment in the clinic"
"live with your Head Girl"
-
+
Leadership positions:
"be the Attendant"
"be the Stewardess"
@@ -650,7 +650,7 @@ slave's assignment
"be your Head Girl"
"guard you"
"recruit girls"
-
+
assignmentVisible:
shows assignment in descriptions
@@ -1155,7 +1155,7 @@ slave hearing
-2 - deaf
-1 - hard of hearing
0 - normal
-
+
earWear:
accepts string
@@ -1685,7 +1685,7 @@ pregnancy time or state. See Pregnancy Control section for more.
21-30 - pregnant
30-35 - very pregnant
-pregSource:
+pregSource:
accepts ID See Pregnancy Control section for more.
Who sired her pregnancy
@@ -1699,7 +1699,7 @@ Number of children. Warning! Should be not changed after initial impregnation se
readyOva:
-Number of ready to be impregnated ova (override normal cases), default - 0. For delayed impregnations with multiples. Used onetime on next call of the SetPregType widget. After SetPregType use it to override .pregType, it set back to 0 automatically.
+Number of ready to be impregnated ova (override normal cases), default - 0. For delayed impregnations with multiples. Used onetime on next call of the SetPregType widget. After SetPregType use it to override .pregType, it set back to 0 automatically.
broodmother
@@ -1708,7 +1708,7 @@ has the slave been turned into a broodmother
1 - standard 1 birth/week
2 - black market 12 births/week
-broodmotherFetuses
+broodmotherFetuses
count of ova that broodmother implant force to release. Should be setted with "broodmother" property together. If broodmother == 0 has no meaning.
broodmotherOnHold
@@ -1716,7 +1716,7 @@ broodmotherOnHold
If broodmother implant set to pause it's work.
1 - implant on pause
!= 1 - working.
-If broodmother birth her last baby and her implant is on pause, she will be in contraception like state.
+If broodmother birth her last baby and her implant is on pause, she will be in contraception like state.
broodmotherCountDown:
@@ -3132,6 +3132,21 @@ Her skill as a wardeness
accepts int
default cap is 200
+skillS:
+Her skill as a servant.
+accepts int
+default cap is 200
+
+skillE:
+Her skill as a entertainer.
+accepts int
+default cap is 200
+
+skillW:
+Her skill as a whore.
+accepts int
+default cap is 200
+
tankBaby:
Whether she was put in the incubator at birth
accepts int
@@ -3178,7 +3193,7 @@ To test if your slave is functioning, start up a normal game, swap to cheat mode
wombJS.tw subsystem:
-This is womb processor/simulator script. It's take care about calculation of belly sizes based on individual fetus sizes,
+This is womb processor/simulator script. It's take care about calculation of belly sizes based on individual fetus sizes,
with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents' data in each individual fetus in future. Should be initialized for all slaves not female only. Currently it's not affect pregnancy mechanic in game directly - it's addon for better sizes calculation, and optional mechanics for future usage.
Design limitations:
- Mother can't gestate children with different speeds at same time. All speed changes apply to all fetuses.
@@ -3193,9 +3208,9 @@ Pregnancy control, best practices ($activeSlave used as sample, can be any slave
Impregnation:
-<<set WombImpregnate($activeSlave, 3, -1, 15)>>
+<<set WombImpregnate($activeSlave, 3, -1, 15)>>
$activeSlave, 3 fetuses, -1 - player is father, 15 week is initial time for fetuses. Can be used on already pregnant slaves (broodmothers use it).
-<<SetSlaveBelly $activeSlave>>
+<<SetSlaveBelly $activeSlave>>
Last line needed only if you need to show description with changed state immediately, an advanced initial pregnancy time set (showing already).
Advancing pregnancy:
@@ -3214,7 +3229,7 @@ Birthing:
In array _babies will be placed all babies from womb of $activeSlave who gestation age at least 34 weeks (can be any). Others will be leaved in womb.
Optionally:
<<set WombFlush($activeSlave)>>
-Will empty womb. You also still should set .preg .pregType .pregSource .pregWeek to 0, or call WombNormalizePreg.
+Will empty womb. You also still should set .preg .pregType .pregSource .pregWeek to 0, or call WombNormalizePreg.
_babies here become normal array - we can do with it as with any other array in sugarcube. _babies.length - size, _babies[0] - first element, etc. Contains all babies object, with their age, sex, volume/size, and father ID. Right now - not used anywhere but useful for possible incubator improvements in future at least.
Usage reference without sugarcube code (samples):
@@ -3225,7 +3240,7 @@ WombImpregnate($Slave, $fetus_count, $fatherID, $initial_age) - should be added
WombProgress($slave, $time_to_add_to_fetuses) - after code that update $slave.preg, time to add should be the same.
-$isReady = WombBirthReady($slave, $birth_ready_age) - how many children ready to be birthed if their time to be ready is $birth_ready_age (40 is for normal length pregnancy). Return int - count of ready to birth children, or 0 if no ready exists.
+$isReady = WombBirthReady($slave, $birth_ready_age) - how many children ready to be birthed if their time to be ready is $birth_ready_age (40 is for normal length pregnancy). Return int - count of ready to birth children, or 0 if no ready exists.
$children = WombBirth($slave, $birth_ready_age) - for actual birth. Return array with fetuses objects that birthed (can be used in future) and remove them from womb array of $slave. Should be called at actual birth code in sugarcube. fetuses that not ready remained in womb (array).
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 1bec34c11a0e4fe156fe7d799a3210be11bdc57c..36b2c97c33cba2ff9d9d668d028c524b7968a7df 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -347,7 +347,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $useSlaveSummaryTabs = 0>>
<<set $useSlaveSummaryOverviewTab = 0>>
<<set $useSlaveListInPageJSNavigation = 0>>
-
+
/* master suite reporting and alternate descriptions */
<<set $verboseDescriptions = 0>>
/* Accordion 000-250-006 */
@@ -375,7 +375,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $weightAffectsAssets = 1>>
<<set $curativeSideEffects = 1>>
-
+
/*non-vanilla shit*/
<<set $pedo_mode = 0>>
<<set $minimumSlaveAge = 18>>
@@ -392,7 +392,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $customRetirementAge = 45>>
<<set $FSCreditCount = 5>>
<<set $FSCreditCountString = "five">>
-
+
<<include "Init Rules">>
<<else>> /* imported save (NG+) */
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index a2e3e917252dd62aaa537a09baa53b1ced6ecf54..94ad281b91b55184d2b3d494a2d05dc245b82d2a 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1345,15 +1345,15 @@ is
<<if ($activeSlave.skillWA >= $masteredXP)>>
<<set _careers.push("Wardeness")>>
<</if>>
+<<if ($activeSlave.skillS >= $masteredXP)>>
+ <<set _careers.push("Servant")>>
+<</if>>
<<if ($activeSlave.skillE >= $masteredXP)>>
<<set _careers.push("Entertainer")>>
<</if>>
<<if ($activeSlave.skillW >= $masteredXP)>>
<<set _careers.push("Whore")>>
<</if>>
-<<if ($activeSlave.skillS >= $masteredXP)>>
- <<set _careers.push("Servant")>>
-<</if>>
<<if _careers.length > 0>>
$He has working experience as a
<<if _careers.length > 2>>
diff --git a/src/uncategorized/newGamePlus.tw b/src/uncategorized/newGamePlus.tw
index 9b2a62feea0393e843686c586f91edb789c5d8d1..aaaef4d4c7f37a844505993d9ac10cb97f46f33b 100644
--- a/src/uncategorized/newGamePlus.tw
+++ b/src/uncategorized/newGamePlus.tw
@@ -49,7 +49,6 @@ You have the funds to bring $slavesToImportMax slaves with you (or your equivale
<<if $cheatMode == 1>><<link "DEBUG: Add all slaves to import list">><<for _ngi = 0; _ngi < $slaves.length; _ngi++>><<= assignJob($slaves[_ngi], "be imported")>><</for>><<goto "New Game Plus">><</link>><br><</if>>
Select up to $slavesToImportMax slaves to be imported into a new game and then [[click here.|init][$saveImported = 1]]
-
<br><br>''These slaves will be imported into the new game:''
<<set $Flag = 1>>
<<include "Slave Summary">>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 521003511022b3e2b1b594714da5861c441676b6..902969300388b724533ed3add7b596accb440083 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -23,7 +23,7 @@ End of week autosaving is currently @@.cyan;ENABLED@@. [[Disable|Options][$autos
<br>
//You can begin a new game with up to five (or more) of your current slaves, although starting resources other than these slaves will be reduced. New Game Plus @@.yellow;MAY@@ work across versions. To attempt to migrate a save across versions://
<br> //1) Save on this screen//
- <br> //2) Use your browser to open the new .html file in this tab//
+ <br> //2) Re-open the .html in a new tab then load the above save.//
<br> //3) [[Activate New Game Plus.|New Game Plus][$ui = "start"]]
<<else>>
//New Game Plus is not available because this game was not started with a compatible version.//
@@ -177,7 +177,7 @@ Main menu slave tabs are
<br />
-The slave Quick list in-page scroll-to is
+The slave Quick list in-page scroll-to is
<<if $useSlaveListInPageJSNavigation != 1>>
@@.red;DISABLED.@@ [[Enable|Options][$useSlaveListInPageJSNavigation = 1]]
<<else>>
@@ -334,8 +334,8 @@ Assignment performance vignettes on the end week report are
Extreme content like amputation is currently @@.red;DISABLED@@. [[Enable|Options][$seeExtreme = 1]]
<<else>>
Extreme content like amputation is currently @@.cyan;ENABLED@@. [[Disable|Options][$seeExtreme = 0]]
-<</if>>
-<br> //Will not affect extreme surgeries already applied already in-game.
+<</if>>
+<br> //Will not affect extreme surgeries already applied already in-game.
<br> More granular control of what appears is in// [[Description Options]].
<br>
@@ -447,7 +447,7 @@ Curative side effects are @@.red;DISABLED@@. [[Enable|Options][$curativeSideEffe
<</link>>
<<else>>
The Security Expansion Mod is currently @@.cyan;ENABLED@@. [[Disable|Options][$secExp = 0]]
-<</if>>
+<</if>>
//The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late in the game.//
<<if def $secExp>>
<<if $secExp == 1>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index aa2115f8e80509beb58b1212ffd9e13483ac1237..bfd7a43ad6bf49c9a94a5f1b0b74b836a1d0b6df 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -390,12 +390,12 @@ $His appearance attracted $beauty members of the public (<<print Math.trunc($bea
<</if>>
<</if>>
-<<if !setup.entertainmentCareers.includes($slaves[$i].career) && $slaves[$i].skillS < $masteredXP>>
- <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>>
+<<if !setup.entertainmentCareers.includes($slaves[$i].career) && $slaves[$i].skillE < $masteredXP>>
+ <<set $slaves[$i].skillE += random(1,($slaves[$i].intelligence+4)*2)>>
<</if>>
<<if setup.entertainmentCareers.includes($slaves[$i].career)>>
$He has experience with entertainment from $his life before $he was a slave, making $him more effective.
-<<elseif $slaves[$i].skillS >= $masteredXP>>
+<<elseif $slaves[$i].skillE >= $masteredXP>>
$He has learned to be entertaining from working for you, making $him more effective.
<</if>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 581fbb708ad4e9651d0245396b25d29cf49ee48d..c48f774e07603d1bdb4f4c4c2e135d1dbbc82153 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -378,12 +378,12 @@ $His appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a d
<</if>>
<</if>>
-<<if !setup.whoreCareers.includes($slaves[$i].career) && $slaves[$i].skillS < $masteredXP>>
- <<set $slaves[$i].skillS += random(1,($slaves[$i].intelligence+4)*2)>>
+<<if !setup.whoreCareers.includes($slaves[$i].career) && $slaves[$i].skillW < $masteredXP>>
+ <<set $slaves[$i].skillW += random(1,($slaves[$i].intelligence+4)*2)>>
<</if>>
<<if setup.whoreCareers.includes($slaves[$i].career)>>
$He has sex work experience from $his life before $he was a slave, making $him more effective.
-<<elseif $slaves[$i].skillS >= $masteredXP>>
+<<elseif $slaves[$i].skillW >= $masteredXP>>
$He has experience as a prostitute from working for you, making $him more effective.
<</if>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 99aeb2001626a124ec0774680547a2000bba7f5e..ede3f40594e04ebd210e89dbce170d7e01dba4ed 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -1517,13 +1517,13 @@
<<if !setup.recruiterCareers.includes($activeSlave.career) && $activeSlave.skillRC >= $masteredXP>>
<<set _slaveMultiplier += 0.1>>
<</if>>
-<<if !setup.entertainmentCareers.includes($activeSlave.career) && $activeSlave.skillE >= $masteredXP>>
+<<if !setup.servantCareers.includes($activeSlave.career) && $activeSlave.skillS >= $masteredXP>>
<<set _slaveMultiplier += 0.05>>
<</if>>
-<<if !setup.whoreCareers.includes($activeSlave.career) && $activeSlave.skillW >= $masteredXP>>
+<<if !setup.entertainmentCareers.includes($activeSlave.career) && $activeSlave.skillE >= $masteredXP>>
<<set _slaveMultiplier += 0.05>>
<</if>>
-<<if !setup.servantCareers.includes($activeSlave.career) && $activeSlave.skillS >= $masteredXP>>
+<<if !setup.whoreCareers.includes($activeSlave.career) && $activeSlave.skillW >= $masteredXP>>
<<set _slaveMultiplier += 0.05>>
<</if>>