diff --git a/Changelog.txt b/Changelog.txt
index 719b1dae36f0aad09394f47c6980dce66e21c0dd..69b109ab5b1567b8666af51c1c0b39542d8f4edb 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -9,9 +9,9 @@ Pregmod
-tweaks to the RA and facility workers
-altered gender fund bimbo law (it now focuses on lack of education instead)
-fixes and cleaning
-
+
8/x/2019
-
+
0
-large update to the nursery beta content
-fixes and cleaning
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 54d5bdc5cb646567a29e9fc87a294631bd842a48..660a1103820e58d1d871db562e10a0044f71f2c0 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -104,7 +104,7 @@ window.Beauty = (function() {
beauty += (slave.intelligence + slave.intelligenceImplant) / 10; /* -10 to 13 */
}
}
-
+
/**
* @param {App.Entity.SlaveState} slave
*/
diff --git a/src/js/vignettes.js b/src/js/vignettes.js
index 78a234adbdedcf15106cbbccb8c920450ec8df41..9873d94d845256f3d23e7bdb8303ca687a23cd3d 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -240,7 +240,7 @@ window.GetVignette = function GetVignette(slave) {
effect: 1,
});
vignettes.push({
- text: `${he} disgusted a customer who didn't know how much butts turned them off until ${he} put ${his} hands on theirs,`,
+ text: `${he} disgusted a customer who didn't know how much butts turned them off until he put his hands on ${hers},`,
type: "rep",
effect: -1,
});
@@ -2133,7 +2133,7 @@ window.GetVignette = function GetVignette(slave) {
effect: 1,
});
vignettes.push({
- text: `${he} disgusted a citizen who didn't know how much butts turned them off until ${he} put ${his} hands on theirs,`,
+ text: `${he} disgusted a citizen who didn't know how much butts turned them off until he put his hands on ${hers},`,
type: "rep",
effect: -1,
});
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 11db72645623c0771e92272e4dce94a64f1a7489..ba109646e0c4612f530ddc9057dcbd4cae8814c9 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -58,7 +58,7 @@
<<run _randShowArray.splice($randShow, 1)>>
<<continue>>
<</if>>
- <<if $seeDicks == 0 && $makeDicks == 0 && [10,16].includes($randShow)>>
+ <<if $seeDicks == 0 && $makeDicks == 0 && [10,16].includes($randShow)>>
There is an audible tone from your screen, which then displays a message: <i>Too many hot dogs detected, changing program.</i><br>
<<run _randShowArray.splice($randShow, 1)>>
<<continue>>
@@ -220,7 +220,7 @@
<<if _usedRemote>>
You choose
<<else>>
- It looks like the random function chose
+ It looks like the random function chose
<</if>>
to play <<if $showTwo < 12>>the newest episode of a<<else>>a repeat of the<</if>> popular competitive reality show<<if $showTwo > 0>>: Next Top Breeder.<<else>> where several female citizens are competing for something.<</if>> The intro sequence shows a succession of beautiful ladies either participating in a mixture of contrived competitions, or talking and going about their lives in a sorority-like setting. The montage is overlaid with a narrator's voice: "12 of Canadia Arcology's most attractive women are all competing for the privilege of having the arcology owner's children. Clint Miles has desirable genes, and these ladies are determined to prove their worth as gestators. And here in Canadia, there are no restrictions on fertility drugs for the winner, so the competition this season is fierce! <<if $showTwo < 12>>_rerun<<else>>$showTwo<</if>> lad<<if $showTwo > 0>>ies have<<else>>y has<</if>> already been sent packing, who will be Canadia's... Next Top Breeder!?" The title finally pops up, redundantly labeling the show as 'Next Top Breeder: Canadia'.
<br><br>
@@ -1150,7 +1150,7 @@
<<else>>
The random function has brought up another episode of that drama series for you.
<</if>>
- <</if>>
+ <</if>>
<<if $showTwelve == 1>>
For a moment you consider changing the channel, but you decide to give it a shot.
<br><br>The woman posed in the mirror. She was tall for a woman, fair skinned, and wore a keyhole sweater dress. Her scarlet hair was done in a braid down her back and her plump lips were covered in ruby red lipstick. She was slender, but not intolerably so; at the very least, she filled out her dress enough to avoid being arrested for indecency. All in all, the woman's reflection made for a pleasant picture. The only thing detracting from this scene was her glare.
@@ -1337,16 +1337,16 @@
<br><br>
The radio crackles to life again. "Everything locked down here. Charlie, get down here and get these supplies. Recon, meet us at the LZ. Over."
"This is Charlie, moving to secure."
- "Recon, moving out."
+ "Recon, moving out."
"Recon, moving out."
- "Recon, moving out."
+ "Recon, moving out."
<br><br>
The screen is closed as the pool of heat in the middle slowly cools. The camera and computer are grabbed and the recon team leaves the vantage point.
<<elseif $showThirteen == 2>>
<<if _usedRemote>>
You jump
<<else>>
- The random function has skipped straight
+ The random function has skipped straight
<</if>>
to the middle of yet another "real life" documentary.
<br><br>
@@ -1393,7 +1393,7 @@
<<if _usedRemote>>
You select
<<else>>
- The random function seems to have selected
+ The random function seems to have selected
<</if>>
a program about the nuances of slave life.
<br><br>
@@ -1660,7 +1660,7 @@
<<if _usedRemote>>
You begin
<<else>>
- The random function begins
+ The random function begins
<</if>>
playing a Free Cities documentary on the benefits of aphrodisiacs, which is almost halfway over. A montage of out-of-context shots of injectors, suppositories, and bottles of liquid interspersed with very horny, sweaty slaves needily grinding on each other plays before cutting back to the presenter, a gorgeous young woman with long, brown hair in a tight one-piece red dress and matching heels. Her dress, practically a second skin, proudly reveals that she definitely isn't wearing a bra or panties of any kind but still leaves plenty up to the imagination increasing her enticing presence. She's with a handsome man in a lab coat, and they're sitting on a couch in an office with a microphone on a coffee table between them.
<br>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 855c01e9c4fa7330bde293816ad67fd564288fab..71e34c16cff2fe3f501d90f5307d20a2fb23089c 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -207,6 +207,8 @@ You arrange yourself to give birth, relaxing until your body urges you to begin
You don't know how _he2 managed to get you here when _his2 balls prevent _him2 from walking<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give the pair a gentle caress as thanks. _He2 returns the kindness with a shudder and a large wet spot forming over _his2 crotch.
<<elseif tooFatSlave($Concubine)>>
You don't know how _he2 managed to get you here when _he2's so fat _he2 can't walk<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give _his2 soft body a gentle caress as thanks.
+ <<elseif !hasAnyLegs($Concubine)>>
+ You don't know how _he2 managed to get you here when _he2 has no legs to walk on<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you give _his2 stumps a gentle caress as thanks.
<<else>>
You don't know how _he2 managed to get you here, since _he2 can't walk<<if $PC.pregType >= 8>>, especially with how heavy your pregnancy was<</if>>, but you're thankful either way.
<</if>>
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index 881d7646dbffc1649beee8b416e30fa806b3b592..bb7274fae62aabe0bbd9151606af2c63362c6cde 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -493,7 +493,9 @@ It seems $he passed by while you were drinking from $subSlave.slaveName and foun
/* 000-250-006 */
$subSlave.slaveName is <<if $subSlave.vagina > 0 || $subSlave.anus > 0>>riding another slave, _his2 hands pinning _himU down<<else>>straddling another slave, _his2 <<if $subSlave.dick > 0>>cock in _hisU mouth<<else>><<if $subSlave.vagina > 0>>pussy<<else>>ass<</if>>pressed to _hisU face<</if>><</if>>. The slave_girlU had been disobedient, and _hisU punishment was to let $subSlave.slaveName dominate _himU. The truth is this is also _his2 reward; _he2 is such a dominant that _he2's prone to lashing out at your other slaves if _he2 isn't given a proper outlet. Sure enough, _his2 moans begin to increase in pitch and frequency, reaching a crescendo as _he2 comes to an orgasm. Once you feel the poor _girlU beneath _him2 has had enough, you give $subSlave.slaveName the order to dismount. _He2 leaves your office with a smile on _his2 face, passing <<EventNameLink $activeSlave>>, who is
-<<if !hasAnyLegs($activeSlave)>>
+<<if isAmputee($activeSlave)>>
+ propped limblessly nearby. $He has
+<<elseif !hasAnyLegs($activeSlave)>>
propped helplessly nearby. $He has
<<elseif !canWalk($activeSlave)>>
kneeling in the doorway with
@@ -550,7 +552,9 @@ It seems $he passed by while $subSlave.slaveName was dominating the other slave<
/* 000-250-006 */
$subSlave.slaveName is lying on the edge of your desk with _his2<<if $subSlave.belly >= 1500>> bloated<</if>> body helpless beneath you, your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> in _him2, and your hands around _his2 neck. It's just breath play, and you're practiced enough that _he2's in no danger. _He2's such a sexual submissive that _he2 sometimes acts out if not managed. This happens when _he2 feels the urge to misbehave in order to access punishment, so you personally ensure that _he2 can indulge _his2 submissiveness when _he2 needs it. _He2 does not orgasm with you, _his2 complete servitude to your pleasure fulfilling a deeper need than that. _He2 leaves your office with a serene look on _his2 face, passing <<EventNameLink>>, who is
-<<if !hasAnyLegs($activeSlave)>>
+<<if isAmputee($activeSlave)>>
+ propped limblessly nearby. $He has
+<<elseif !hasAnyLegs($activeSlave)>>
propped helplessly nearby. $He has
<<elseif !canWalk($activeSlave)>>
kneeling in the doorway with
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index d2ef863fe407a933bb9b58e07f1fbc4d681fc8c4..23e9909d316e71c7a9df56a301559c19fbb62080 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -711,7 +711,7 @@ $researchLab.level > 0>>
<<set _individualCosts += 5>>
<</if>>
<<if ($slaves[$i].assignment != "work in the dairy" || $dairyRestraintsSetting < 2) && ($slaves[$i].assignment != "be confined in the arcade")>>
- <<if (!hasAllNaturalLimbs()$slaves[$i]))>>
+ <<if (!hasAllNaturalLimbs($slaves[$i]))>>
<<if (isAmputee($slaves[$i]))>>
<br> <i>Increased living expenses due to limblessness:</i>
@@.yellowgreen;<<print cashFormat($rulesCost)>>@@
diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw
index e2b573f9867c2ecdbf2df6b85f0f0c933de019f4..210e0eb9a3e3c99a4043d1eabcfc0b81b15dd0b3 100644
--- a/src/uncategorized/multiImplant.tw
+++ b/src/uncategorized/multiImplant.tw
@@ -1007,122 +1007,122 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
/* start prosthetics */
<<if _prostheticCount > 0>>
- <<for _k = 0; _k < $adjustProsthetics.length; _k++>>
- <<set _p = $adjustProsthetics[_k]>>
- <<if _p.slaveID == $activeSlave.ID && _p.workLeft <= 0>>
- <<set $adjustProsthetics.splice(_k, 1), _k-->>
- <<set $activeSlave.readyProsthetics.push({id: _p.id})>>
- <br><hr>
- <<switch _p.id>>
- <<case "ocular">>
- <<if $activeSlave.eyes < -1>>
- <<set $activeSlave.eyesImplant = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "ocular implant">>
- <<include "Surgery Degradation">>
- <<else>>
- //Since $he has working eyes the <<= setup.prosthetics.ocular.name>> will be put into storage.//
- <</if>>
- <<case "cochlear">>
- <<if $activeSlave.hears != 0>>
- <<set $activeSlave.earImplant = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "cochlear implant">>
- <<include "Surgery Degradation">>
- <<else>>
- //Since $he has working ears the <<= setup.prosthetics.cochlear.name>> will be put into storage.//
- <</if>>
- <<case "electrolarynx">>
- <<if $activeSlave.voice <= 0>>
- <<set $activeSlave.electrolarynx = 1, $activeSlave.voice = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "electrolarynx">>
- <<include "Surgery Degradation">>
- <<else>>
- //Since $he has a voice the <<= setup.prosthetics.electrolarynx.name>> will be put into storage.//
- <</if>>
- <<case "interfaceP1">>
- <<if hasAnyNaturalLimbs($activeSlave)>>
- //Since $he has at least one healthy limb the <<= setup.prosthetics.interfaceP1.name>> will be put into storage.//
- <<elseif $activeSlave.PLimb == 2>>
- //Since $he already has <<= addA(setup.prosthetics.interfaceP2.name)>> installed the <<= setup.prosthetics.interfaceP1.name>> will be put into storage.//
- <<else>>
- <<set $activeSlave.PLimb = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "PLimb interface1">>
- <<include "Surgery Degradation">>
- <</if>>
- <<case "interfaceP2">>
- <<if hasAnyNaturalLimbs($activeSlave)>>
- //Since $he has at least ine healthy limb the <<= setup.prosthetics.interfaceP1.name>> will be put into storage.//
- <<elseif $activeSlave.PLimb == 1>>
- <<set $activeSlave.PLimb = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "PLimb interface3">>
- <<include "Surgery Degradation">>
- <<else>>
- <<set $activeSlave.PLimb = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "PLimb interface2">>
- <<include "Surgery Degradation">>
- <</if>>
- <<case "basicL" "sexL" "beautyL" "combatL" "cyberneticL">>
- <<if $activeSlave.fuckdoll != 0>>
- //Since a Fuckdoll can't use prosthetic limbs the <<= setup.prosthetics[_p.id].name>> will be put into storage.//
- <<elseif hasAnyNaturalLimbs($activeSlave)>>
- //Since $he must be a quadruple amputee to attach prosthetic limbs the <<= setup.prosthetics[_p.id].name>> will be put into storage.//
- <<elseif $activeSlave.PLimb == 0>>
- //Since $he must have a prosthetic interface installed to attach prosthetic limbs the <<= setup.prosthetics[_p.id].name>> will be put into storage.//
- <<else>>
- <<if _p.id == "basicL">>
- <<if hasAnyProstheticLimbs($activeSlave)>>
- <<set attachLimbs($activeSlave, "all", 2), $prostheticsConfig = "basicPLimbs">>
- <<include "Prosthetics Configuration">>
+ <<for _k = 0; _k < $adjustProsthetics.length; _k++>>
+ <<set _p = $adjustProsthetics[_k]>>
+ <<if _p.slaveID == $activeSlave.ID && _p.workLeft <= 0>>
+ <<set $adjustProsthetics.splice(_k, 1), _k-->>
+ <<set $activeSlave.readyProsthetics.push({id: _p.id})>>
+ <br><hr>
+ <<switch _p.id>>
+ <<case "ocular">>
+ <<if $activeSlave.eyes < -1>>
+ <<set $activeSlave.eyesImplant = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "ocular implant">>
+ <<include "Surgery Degradation">>
<<else>>
- //Since $he already has more advanced prosthetic limbs attached the <<= setup.prosthetics.basicL.name>> will be put into storage.//
+ //Since $he has working eyes the <<= setup.prosthetics.ocular.name>> will be put into storage.//
<</if>>
- <<elseif _p.id == "sexL">>
- <<if (getLimbCount($activeSlave, 3) + getLimbCount($activeSlave, 4) + getLimbCount($activeSlave, 5) + getLimbCount($activeSlave, 6)) === 0>>
- <<set attachLimbs($activeSlave, "all", 3), $prostheticsConfig = "sexPLimbs">>
- <<include "Prosthetics Configuration">>
+ <<case "cochlear">>
+ <<if $activeSlave.hears != 0>>
+ <<set $activeSlave.earImplant = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "cochlear implant">>
+ <<include "Surgery Degradation">>
<<else>>
- //Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.sexL.name>> will be put into storage.//
+ //Since $he has working ears the <<= setup.prosthetics.cochlear.name>> will be put into storage.//
<</if>>
- <<elseif _p.id == "beautyL">>
- <<if (getLimbCount($activeSlave, 3) + getLimbCount($activeSlave, 4) + getLimbCount($activeSlave, 5) + getLimbCount($activeSlave, 6)) === 0>>
- <<set attachLimbs($activeSlave, "all", 4), $prostheticsConfig = "beautyPLimbs">>
- <<include "Prosthetics Configuration">>
+ <<case "electrolarynx">>
+ <<if $activeSlave.voice <= 0>>
+ <<set $activeSlave.electrolarynx = 1, $activeSlave.voice = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "electrolarynx">>
+ <<include "Surgery Degradation">>
<<else>>
- //Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.beautyL.name>> will be put into storage.//
+ //Since $he has a voice the <<= setup.prosthetics.electrolarynx.name>> will be put into storage.//
<</if>>
- <<elseif _p.id == "combatL">>
- <<if (getLimbCount($activeSlave, 3) + getLimbCount($activeSlave, 4) + getLimbCount($activeSlave, 5) + getLimbCount($activeSlave, 6)) === 0>>
- <<set attachLimbs($activeSlave, "all", 5), $prostheticsConfig = "combatPLimbs">>
- <<include "Prosthetics Configuration">>
+ <<case "interfaceP1">>
+ <<if hasAnyNaturalLimbs($activeSlave)>>
+ //Since $he has at least one healthy limb the <<= setup.prosthetics.interfaceP1.name>> will be put into storage.//
+ <<elseif $activeSlave.PLimb == 2>>
+ //Since $he already has <<= addA(setup.prosthetics.interfaceP2.name)>> installed the <<= setup.prosthetics.interfaceP1.name>> will be put into storage.//
<<else>>
- //Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.combatL.name>> will be put into storage.//
+ <<set $activeSlave.PLimb = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "PLimb interface1">>
+ <<include "Surgery Degradation">>
<</if>>
- <<else>>
- <<if $activeSlave.PLimb == 2>>
- <<set attachLimbs($activeSlave, "all", 6), $prostheticsConfig = "cyberPLimbs">>
- <<include "Prosthetics Configuration">>
+ <<case "interfaceP2">>
+ <<if hasAnyNaturalLimbs($activeSlave)>>
+ //Since $he has at least ine healthy limb the <<= setup.prosthetics.interfaceP1.name>> will be put into storage.//
+ <<elseif $activeSlave.PLimb == 1>>
+ <<set $activeSlave.PLimb = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 5, $surgeryType = "PLimb interface3">>
+ <<include "Surgery Degradation">>
<<else>>
- //Since $he must have <<= addA(setup.prosthetics.interfaceP2.name)>> installed to attach cybernetic limbs the <<= setup.prosthetics.cyberneticL.name>> will be put into storage.//
+ <<set $activeSlave.PLimb = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "PLimb interface2">>
+ <<include "Surgery Degradation">>
<</if>>
- <</if>>
- <</if>>
- <<case "interfaceTail">>
- <<set $activeSlave.PTail = 1, $activeSlave.tail = "none", $activeSlave.tailColor = "none", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "tailInterface">>
- <<include "Surgery Degradation">>
- <<case "modT" "sexT" "combatT">>
- <<if $activeSlave.PTail == 0>>
- //Since $he must have <<= addA(setup.prosthetics.interfaceTail.name)>> installed to attach tails the <<= setup.prosthetics[_p.id].name>> will be put into storage.//
- <<elseif $activeSlave.tail != "none">>
- //Since $he currently has a tail attached the <<= setup.prosthetics[_p.id].name>> will be put into storage.//
- <<elseif _p.id == "modT">>
- //Since installing <<= addA(setup.prosthetics.modT.name)>> is complicated it can't be automated.//
- /*Reason: there are different designs player can choose from.*/
- <<elseif _p.id == "combatT">>
- <<set $prostheticsConfig = "attachTail", $activeSlave.tail = "combat", $activeSlave.tailColor = "jet black">>
- <<include "Prosthetics Configuration">>
- <<elseif _p.id == "sexT">>
- <<set $prostheticsConfig = "attachTail", $activeSlave.tail = "sex", $activeSlave.tailColor = "pink">>
- <<include "Prosthetics Configuration">>
+ <<case "basicL" "sexL" "beautyL" "combatL" "cyberneticL">>
+ <<if $activeSlave.fuckdoll != 0>>
+ //Since a Fuckdoll can't use prosthetic limbs the <<= setup.prosthetics[_p.id].name>> will be put into storage.//
+ <<elseif hasAnyNaturalLimbs($activeSlave)>>
+ //Since $he must be a quadruple amputee to attach prosthetic limbs the <<= setup.prosthetics[_p.id].name>> will be put into storage.//
+ <<elseif $activeSlave.PLimb == 0>>
+ //Since $he must have a prosthetic interface installed to attach prosthetic limbs the <<= setup.prosthetics[_p.id].name>> will be put into storage.//
+ <<else>>
+ <<if _p.id == "basicL">>
+ <<if hasAnyProstheticLimbs($activeSlave)>>
+ <<set attachLimbs($activeSlave, "all", 2), $prostheticsConfig = "basicPLimbs">>
+ <<include "Prosthetics Configuration">>
+ <<else>>
+ //Since $he already has more advanced prosthetic limbs attached the <<= setup.prosthetics.basicL.name>> will be put into storage.//
+ <</if>>
+ <<elseif _p.id == "sexL">>
+ <<if (getLimbCount($activeSlave, 3) + getLimbCount($activeSlave, 4) + getLimbCount($activeSlave, 5) + getLimbCount($activeSlave, 6)) === 0>>
+ <<set attachLimbs($activeSlave, "all", 3), $prostheticsConfig = "sexPLimbs">>
+ <<include "Prosthetics Configuration">>
+ <<else>>
+ //Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.sexL.name>> will be put into storage.//
+ <</if>>
+ <<elseif _p.id == "beautyL">>
+ <<if (getLimbCount($activeSlave, 3) + getLimbCount($activeSlave, 4) + getLimbCount($activeSlave, 5) + getLimbCount($activeSlave, 6)) === 0>>
+ <<set attachLimbs($activeSlave, "all", 4), $prostheticsConfig = "beautyPLimbs">>
+ <<include "Prosthetics Configuration">>
+ <<else>>
+ //Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.beautyL.name>> will be put into storage.//
+ <</if>>
+ <<elseif _p.id == "combatL">>
+ <<if (getLimbCount($activeSlave, 3) + getLimbCount($activeSlave, 4) + getLimbCount($activeSlave, 5) + getLimbCount($activeSlave, 6)) === 0>>
+ <<set attachLimbs($activeSlave, "all", 5), $prostheticsConfig = "combatPLimbs">>
+ <<include "Prosthetics Configuration">>
+ <<else>>
+ //Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.combatL.name>> will be put into storage.//
+ <</if>>
+ <<else>>
+ <<if $activeSlave.PLimb == 2>>
+ <<set attachLimbs($activeSlave, "all", 6), $prostheticsConfig = "cyberPLimbs">>
+ <<include "Prosthetics Configuration">>
+ <<else>>
+ //Since $he must have <<= addA(setup.prosthetics.interfaceP2.name)>> installed to attach cybernetic limbs the <<= setup.prosthetics.cyberneticL.name>> will be put into storage.//
+ <</if>>
+ <</if>>
+ <</if>>
+ <<case "interfaceTail">>
+ <<set $activeSlave.PTail = 1, $activeSlave.tail = "none", $activeSlave.tailColor = "none", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "tailInterface">>
+ <<include "Surgery Degradation">>
+ <<case "modT" "sexT" "combatT">>
+ <<if $activeSlave.PTail == 0>>
+ //Since $he must have <<= addA(setup.prosthetics.interfaceTail.name)>> installed to attach tails the <<= setup.prosthetics[_p.id].name>> will be put into storage.//
+ <<elseif $activeSlave.tail != "none">>
+ //Since $he currently has a tail attached the <<= setup.prosthetics[_p.id].name>> will be put into storage.//
+ <<elseif _p.id == "modT">>
+ //Since installing <<= addA(setup.prosthetics.modT.name)>> is complicated it can't be automated.//
+ /*Reason: there are different designs player can choose from.*/
+ <<elseif _p.id == "combatT">>
+ <<set $prostheticsConfig = "attachTail", $activeSlave.tail = "combat", $activeSlave.tailColor = "jet black">>
+ <<include "Prosthetics Configuration">>
+ <<elseif _p.id == "sexT">>
+ <<set $prostheticsConfig = "attachTail", $activeSlave.tail = "sex", $activeSlave.tailColor = "pink">>
+ <<include "Prosthetics Configuration">>
+ <</if>>
+ <<default>>
+ //Since there is no automated procedure to implant/attach <<= setup.prosthetics[_p.id].name>> it will be put into storage.//
+ <</switch>>
+ <br>
<</if>>
- <<default>>
- //Since there is no automated procedure to implant/attach <<= setup.prosthetics[_p.id].name>> it will be put into storage.//
- <</switch>>
- <br>
- <</if>>
- <</for>>
+ <</for>>
<</if>>
/* end prosthetics */
/* updates the interrogated slave */
diff --git a/src/uncategorized/pMercenaryRomeo.tw b/src/uncategorized/pMercenaryRomeo.tw
index 3316a5cf3aba445424550f62d571f3ad6123bd0a..fa68a5f37fd9d3b4e4e31f705ea75e01a1d61f13 100644
--- a/src/uncategorized/pMercenaryRomeo.tw
+++ b/src/uncategorized/pMercenaryRomeo.tw
@@ -98,10 +98,10 @@ proffered by an attentive slave _girlU, he seems almost bashful.
Since $he returned to slavery, it's only fair to return the credits he paid for $him. He thanks you hollowly before heading on his way.
<<else>>
happened.
- <<if hasBothLegs($activeSlave) && hasAnyArms($activeSlave)>>
+ <<if hasAnyArms($activeSlave) && hasBothLegs($activeSlave)>>
$He hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,
<<else>>
- As he picks up $his limbless form to give $him a hug,
+ As he <<if !isAmputee($activeSlave)>>gives<<else>>picks up $his limbless form to give<</if>> $him a hug,
<</if>>
$he gives the nearest camera a little nod and silently mouths the words "Thank you, <<= WrittenMaster($activeSlave)>>." Soon the romantic story of The Mercenary and the Slave $Girl is being told in bars and brothels across the Free City, with you naturally playing @@.green;a supporting role.@@
<<run cashX($slaveCost, "slaveTransfer")>>
@@ -125,10 +125,10 @@ proffered by an attentive slave _girlU, he seems almost bashful.
"I thought I was giving $him a better life... But $he already had everything $he wanted. I'm sorry for putting you in such a position." You can hear the sadness in his voice. "Thank you for your time. I'm sorry to have bothered you."
<<else>>
happened.
- <<if hasBothLegs($activeSlave) && hasAnyLegs($activeSlave)>>
+ <<if hasAnyArms($activeSlave) && hasAnyLegs($activeSlave)>>
$He hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,
<<else>>
- As he picks up $his limbless form to give $him a hug,
+ As he <<if !isAmputee($activeSlave)>>gives<<else>>picks up $his limbless form to give<</if>> $him a hug,
<</if>>
$he gives the nearest camera a little nod and silently mouths the words "Thank you, <<= WrittenMaster($activeSlave)>>." You smile to yourself; when they get there they'll find flowers and a paid reservation at the arcology's best restaurant. Soon the story is being told in bars and brothels across the Free City, with you naturally playing @@.green;a starring role.@@ Some days later, you hear a dramatization is being filmed, with an aging action star playing the mercenary, a rising starlet playing $activeSlave.slaveName, and a noted character actor playing you.
<<run repX(15000, "event")>>
diff --git a/src/uncategorized/reCitizenHookup.tw b/src/uncategorized/reCitizenHookup.tw
index cfa6984637b25d1e6bab973e2f796f82b0eb6c2f..53bcaf0f727c1a9b47754e9d73f1ea68cc986a40 100644
--- a/src/uncategorized/reCitizenHookup.tw
+++ b/src/uncategorized/reCitizenHookup.tw
@@ -166,7 +166,7 @@ She's yours for the taking, if you want her, and if her praise and proximity wer
<<if _repopHookupPregnant == 1>>
lean back just far enough that her full term, triplets rounded middle splits the front of her overly tight dress.
<<else>>
- press her hips up against your own, before leaning in and whispering
+ press her hips up against your own, before leaning in and whispering
<<if $arcologies[0].FSRepopulationFocusLaw == 1>>
"My womb is ready to do its duty."
<<else>>
diff --git a/src/uncategorized/reFullBed.tw b/src/uncategorized/reFullBed.tw
index 1c24053f4f127519aca600fb78d628902de6360f..2981ba6b0ff693aa4d6d5bf95ad336fc75a61687 100644
--- a/src/uncategorized/reFullBed.tw
+++ b/src/uncategorized/reFullBed.tw
@@ -102,7 +102,7 @@ Today was an unusually relaxing day, and you aren't particularly tired.
<</if>>
<br><<link "Pull up the sheets and wrestle">>
<<replace "#result">>
- Without warning, you jerk the sheets all the way up and pin them at the head of the bed. They giggle as you seize first the one and then the other, groping and tickling. $slaves[_bedSlaveTwo].slaveName and $slaves[_bedSlaveOne].slaveName catch the spirit of fun, and rove around in the soft darkness under the sheets. You're <<if $PC.dick == 1>>rock hard<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>soaking wet<</if>> in no time, wrestling with two naked slaves, and begin to fuck the first one you can grab and hold. When you <<if ($PC.dick == 0)>>finish with $him<<else>>come inside $him<</if>>, you release $him and $he slides out of bed to wash; by the time $he gets back under the sheets, clean and fresh, you're on the point of fucking the other. You switch off with the two of them, fucking them in turn, until everyone falls asleep in an exhausted pile. They have become @@.mediumaquamarine;still more trusting of you.@@
+ Without warning, you jerk the sheets all the way up and pin them at the head of the bed. They giggle as you seize first the one and then the other, groping and tickling. $slaves[_bedSlaveTwo].slaveName and $slaves[_bedSlaveOne].slaveName catch the spirit of fun, and rove around in the soft darkness under the sheets. You're <<if $PC.dick == 1>>rock hard<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>soaking wet<</if>> in no time, wrestling with two naked slaves, and begin to fuck the first one you can grab and hold. When you <<if ($PC.dick == 0)>>finish with $him<<else>>come inside $him<</if>>, you <<if (!isAmputee($slaves[_bedSlaveOne]))>>release $him and $he slides out of bed to wash; by the time $he gets back under the sheets, clean and fresh, you're on the point of fucking<<else>>carry $his limbless, helpless body out of bed to wash $him, and then return to the bed to fuck<</if>> the other. You switch off with the two of them, fucking them in turn, until everyone falls asleep in an exhausted pile. They have become @@.mediumaquamarine;still more trusting of you.@@
<<set $slaves[_bedSlaveOne].trust += 4, $slaves[_bedSlaveTwo].trust += 4>>
<<if canDoVaginal(_bedSlaveOne)>>
<<set $slaves[_bedSlaveOne].counter.vaginal += 2>>
diff --git a/src/uncategorized/reRelationshipAdvice.tw b/src/uncategorized/reRelationshipAdvice.tw
index 80dd811efe359164aa407c80923cd816e1111b15..ce110557525f7ebd0cb3cdba90aeadfd8fd039a2 100644
--- a/src/uncategorized/reRelationshipAdvice.tw
+++ b/src/uncategorized/reRelationshipAdvice.tw
@@ -108,15 +108,15 @@ $He nods $his head quickly, still staring <<if !canSee($activeSlave)>>blankly <<
<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "masochist")>>
you to hurt me. Like, really hurt me." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 pinches one of $activeSlave.slaveName's nipples experimentally.
<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "sadist")>>
- to hold you down." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 steps in close to $activeSlave.slaveName, takes $activeSlave.slaveName's hands, and places them around _his2 own throat.
+ to hold you down." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 steps in close to $activeSlave.slaveName, takes $activeSlave.slaveName's hand<<if hasBothArms($activeSlave)>>s<</if>>, and places them around _his2 own throat.
<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "dom")>>
to be your top." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 sidles up to $activeSlave.slaveName, looking up at $him submissively.
<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "submissive")>>
- to be your bottom." $subSlave.slaveName looks relieved that that's all it is, and says, <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 takes $activeSlave.slaveName's face in _his2 hands and kisses $him dominantly.
+ to be your bottom." $subSlave.slaveName looks relieved that that's all it is, and says, <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 takes $activeSlave.slaveName's face in _his2 hand<<if hasBothArms($subSlave)>>s<</if>> and kisses $him dominantly.
<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "boobs")>>
- to fuck your boob<<s>>." $subSlave.slaveName looks relieved that that's all it is, and says, <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 takes $activeSlave.slaveName's hands and places them right on _his2 breasts.
+ to fuck your boob<<s>>." $subSlave.slaveName looks relieved that that's all it is, and says, <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 takes $activeSlave.slaveName's <<if hasBothArms($activeSlave)>>hands and places them<<else>>hand and places it<</if>> right on _his2 breasts.
<<else>>
- to fuck you." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 takes $activeSlave.slaveName's hands and places them right on _his2 breasts.
+ to fuck you." $subSlave.slaveName looks relieved that that's all it is, and <<if ($subSlave.voice != 0)>>says, "Okay!"<<else>>nods.<</if>> _He2 takes $activeSlave.slaveName's <<if hasBothArms($activeSlave)>>hands and places them<<else>>hand and places it<</if>> right on _his2 breasts.
<</if>>
$activeSlave.slaveName bursts out laughing. They're now @@.lightgreen;friends with benefits.@@
<<elseif $activeSlave.relationship == 3>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index bb2372b5037da8558bd582257979ebd8da011115..75e2f5a1c4a336f7b58329ed37bba0f4d88ddbc5 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -903,7 +903,8 @@ Dye or paint:
| [[Very Bushy|Salon][$activeSlave.pubicHStyle = "very bushy",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]
<<else>>
- <br><br>$His groin is completely hairless.
+ <br><br>
+ $His groin is completely hairless.
<</if>>
/* UNDERARM HAIR */
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index bcce725d487c289d5aad8efed2953e43e5a14882..d1e4ec74157483b333c9df1156d9d167699026c0 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -168,7 +168,7 @@ One 'welcome' for a new slave is to have them branded. Where would you like such
| [[Hand|Universal Rules][$brandTarget.primary = "hand"]]
| [[Buttocks|Universal Rules][$brandTarget.primary = "buttock"]]
| [[Thigh|Universal Rules][$brandTarget.primary = "thigh"]]
- | [[Calf|Universal Rules][$brandTarget.primary = "calve"]]
+ | [[Calf|Universal Rules][$brandTarget.primary = "calf"]]
| [[Ankle|Universal Rules][$brandTarget.primary = "ankle"]]
| [[Feet|Universal Rules][$brandTarget.primary = "foot"]]
| [[Neck|Universal Rules][$brandTarget.primary = "neck"]]
@@ -215,7 +215,7 @@ One 'welcome' for a new slave is to have them branded. Where would you like such
| [[Buttocks|Universal Rules][$brandTarget.secondary = "buttock"]]
/*<<if hasAnyNaturalLegs($activeSlave)>>
| [[Thigh|Universal Rules][$brandTarget.secondary = "thigh"]]
- | [[Calf|Universal Rules][$brandTarget.secondary = "calve"]]
+ | [[Calf|Universal Rules][$brandTarget.secondary = "calf"]]
| [[Ankle|Universal Rules][$brandTarget.secondary = "ankle"]]
| [[Feet|Universal Rules][$brandTarget.secondary = "foot"]]
<</if>>*/
@@ -343,7 +343,7 @@ One 'welcome' for a new slave is to have them scarred. Where would you like such
| [[Hand|Universal Rules][$scarTarget.primary = "hand"]]
| [[Buttocks|Universal Rules][$scarTarget.primary = "buttock"]]
| [[Thigh|Universal Rules][$scarTarget.primary = "thigh"]]
- | [[Calf|Universal Rules][$scarTarget.primary = "calve"]]
+ | [[Calf|Universal Rules][$scarTarget.primary = "calf"]]
| [[Ankle|Universal Rules][$scarTarget.primary = "ankle"]]
| [[Feet|Universal Rules][$scarTarget.primary = "foot"]]
| [[Neck|Universal Rules][$scarTarget.primary = "neck"]]
@@ -390,7 +390,7 @@ One 'welcome' for a new slave is to have them scarred. Where would you like such
| [[Buttocks|Universal Rules][$scarTarget.secondary = "buttock"]]
/*<<if hasAnyNaturalLegs($activeSlave)>>
| [[Thigh|Universal Rules][$scarTarget.secondary = "thigh"]]
- | [[Calf|Universal Rules][$scarTarget.secondary = "calve"]]
+ | [[Calf|Universal Rules][$scarTarget.secondary = "calf"]]
| [[Ankle|Universal Rules][$scarTarget.secondary = "ankle"]]
| [[Feet|Universal Rules][$scarTarget.secondary = "foot"]]
<</if>>*/
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 3db5be8354bb561bd520d157b1ab450956dba1a0..14b6b32a1e9eec144a66aeccff1608f9ca450070 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -258,7 +258,6 @@ $activeSlave.slaveName is
<<case "striped panties">>
a simple garment that hugs $his
-
<<if hasAnyLegs($activeSlave)>>
body closely and comfortably, and
<<footwearDescription>>
@@ -578,7 +577,7 @@ $activeSlave.slaveName is
<<case "a burkini">>
consisting of a polyester tunic and
- <<if !hasAnyLegs($activeSlave)>>
+ <<if hasAnyLegs($activeSlave)>>
pants, and
<<footwearDescription>>
<<else>>
@@ -861,33 +860,31 @@ $activeSlave.slaveName is
<<case "harem gauze">>
<<if hasAnyLegs($activeSlave)>>
- $he is wearing
+ $He is wearing
<<footwearDescription>>
<</if>>
$He's covered and even veiled, but you can see everything straight through the filmy cloth.
<<case "slutty jewelry">>
+ including a belt of thin chain with a lewd ornament (a little
+ <<if ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>>
+ curved golden cock without balls)
+ <<elseif ($activeSlave.dick > 0)>>
+ golden cock and balls)
+ <<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 95)>>
+ pair of golden lips)
+ <<elseif ($activeSlave.boobs > 1000)>>
+ pair of golden breasts)
+ <<elseif ($activeSlave.vagina == -1)>>
+ crinkled anus)
+ <<else>>
+ golden pussy)
+ <</if>>
+ over $his stomach.
<<if hasAnyLegs($activeSlave)>>
$He is wearing
<<footwearDescription>>
- <<else>>
- including a belt of thin chain with a lewd ornament (a little
- <<if ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>>
- curved golden cock without balls)
- <<elseif ($activeSlave.dick > 0)>>
- golden cock and balls)
- <<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 95)>>
- pair of golden lips)
- <<elseif ($activeSlave.boobs > 1000)>>
- pair of golden breasts)
- <<elseif ($activeSlave.vagina == -1)>>
- crinkled anus)
- <<else>>
- golden pussy)
- <</if>>
- over $his stomach.
<</if>>
-
<<= App.Desc.piercing($activeSlave, "chastity")>>
<<case "a Santa dress">>