diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index e639053791b04514b0e1c8e483103bc576957af9..448fdd8ed629a29651c5e1e400d0d646f72617bf 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -6918,11 +6918,28 @@ window.newSlave = function newSlave(slave) {
slave.origEye = slave.eyeColor;
break;
}
- slave.origRace = slave.race;
- slave.origHColor = slave.hColor;
- slave.underArmHColor = slave.hColor;
- slave.pubicHColor = slave.hColor;
- slave.origSkin = slave.skin;
+
+ if (V.override_Race != 1) {
+ slave.origRace = slave.race;
+ }
+ if (V.override_H_Color != 1) {
+ slave.origHColor = slave.hColor;
+ }
+ if (V.override_Arm_H_Color != 1) {
+ slave.underArmHColor = slave.hColor;
+ }
+ if (V.override_Pubic_H_Color != 1) {
+ slave.pubicHColor = slave.hColor;
+ }
+ if (V.override_Skin != 1) {
+ slave.origSkin = slave.skin;
+ }
+
+ slave.override_Race = 0;
+ slave.override_H_Color = 0;
+ slave.override_Arm_H_Color = 0;
+ slave.override_Pubic_H_Color = 0;
+ slave.override_Skin = 0;
if (V.surnamesForbidden === 1) {
slave.slaveSurname = 0;
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 0f846b4e34877a441bd54205fe728bb5bfd08e86..e8f8c7bad59a7fbc85d209abd4f1995a23bb688c 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:
@@ -2944,6 +2944,7 @@ What species of sperm she produces.
"dog"
"pig"
"horse"
+"cow"
eggType:
@@ -2952,6 +2953,7 @@ What species of ovum she produces.
"dog"
"pig"
"horse"
+"cow"
reservedChildren:
@@ -3132,6 +3134,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 +3195,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 +3210,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 +3231,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 +3242,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 827d480d55a643191e0a41d48d878c766c5c330f..3d2459367ee3827a3d90f76cd7f9824aba799bc9 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/js/assayJS.tw b/src/js/assayJS.tw
index 978032cbc207dd40c65656236ecda9f5a2490c4c..ed9ac3929550be2b16c1248e5a13644af307b869 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -251,11 +251,28 @@ window.newSlave = function newSlave(slave) {
slave.origEye = slave.eyeColor;
break;
}
- slave.origRace = slave.race;
- slave.origHColor = slave.hColor;
- slave.underArmHColor = slave.hColor;
- slave.pubicHColor = slave.hColor;
- slave.origSkin = slave.skin;
+
+ if (slave.override_Race != 1) {
+ slave.origRace = slave.race;
+ }
+ if (slave.override_H_Color != 1) {
+ slave.origHColor = slave.hColor;
+ }
+ if (slave.override_Arm_H_Color != 1) {
+ slave.underArmHColor = slave.hColor;
+ }
+ if (slave.override_Pubic_H_Color != 1) {
+ slave.pubicHColor = slave.hColor;
+ }
+ if (slave.override_Skin != 1) {
+ slave.origSkin = slave.skin;
+ }
+
+ slave.override_Race = 0;
+ slave.override_H_Color = 0;
+ slave.override_Arm_H_Color = 0;
+ slave.override_Pubic_H_Color = 0;
+ slave.override_Skin = 0;
if (V.surnamesForbidden === 1) {
slave.slaveSurname = 0;
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index 456445284054a69c0f14411822a504369ca5dce3..ba6a9a0835bed34109a100fccfd714725d852c89 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -532,7 +532,7 @@
<<if $seePreg != 0>>
<<set _HS = {}>>
-<<set _HS.slaveName = "'Fucknugget' Pillow", _HS.birthName = "Anika", _HS.origin = "She sold herself into slavery to escape life on the streets.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 37, _HS.physicalAge = 37, _HS.visualAge = 37, _HS.ovaryAge = 37, _HS.health = 80, _HS.devotion = 100, _HS.weight = 40, _HS.origRace = "white", _HS.race = "latina", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _HS.amp = 1, _HS.boobs = 6260, _HS.boobsImplant = 4200, _HS.nipplesPiercing = 2, _HS.areolae = 3, _HS.boobsTat = "flowers", _HS.lactation = 2, _HS.butt = 12, _HS.buttImplant = 1, _HS.buttTat = "flowers", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.lipsPiercing = 2, _HS.lipsTat = "flowers", _HS.tonguePiercing = 2, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.vaginaTat = "flowers", _HS.preg = 37, _HS.pregType = 1, _HS.pregWeek = 37, _HS.pregKnown = 1, _HS.belly = 13000, _HS.bellyPreg = 13000, _HS.births = 2, _HS.birthsTotal = 2, _HS.clitPiercing = 3, _HS.clitSetting = "boobs", _HS.anus = 2, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "flowers", _HS.makeup = 3, _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "advertisements", _HS.stampTat = "flowers", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 15, _HS.aphrodisiacs = 1, _HS.addict = 99, _HS.clothes = "restrictive latex", _HS.collar = "leather with cowbell", _HS.intelligence = -2, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
+<<set _HS.slaveName = "'Fucknugget' Pillow", _HS.birthName = "Anika", _HS.origin = "She sold herself into slavery to escape life on the streets.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 37, _HS.physicalAge = 37, _HS.visualAge = 37, _HS.ovaryAge = 37, _HS.health = 80, _HS.devotion = 100, _HS.weight = 40, _HS.origRace = "white", _HS.override_Race = 1, _HS.race = "latina", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _HS.amp = 1, _HS.boobs = 6260, _HS.boobsImplant = 4200, _HS.nipplesPiercing = 2, _HS.areolae = 3, _HS.boobsTat = "flowers", _HS.lactation = 2, _HS.butt = 12, _HS.buttImplant = 1, _HS.buttTat = "flowers", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.lipsPiercing = 2, _HS.lipsTat = "flowers", _HS.tonguePiercing = 2, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.vaginaTat = "flowers", _HS.preg = 37, _HS.pregType = 1, _HS.pregWeek = 37, _HS.pregKnown = 1, _HS.belly = 13000, _HS.bellyPreg = 13000, _HS.births = 2, _HS.birthsTotal = 2, _HS.clitPiercing = 3, _HS.clitSetting = "boobs", _HS.anus = 2, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "flowers", _HS.makeup = 3, _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "advertisements", _HS.stampTat = "flowers", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 15, _HS.aphrodisiacs = 1, _HS.addict = 99, _HS.clothes = "restrictive latex", _HS.collar = "leather with cowbell", _HS.intelligence = -2, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
<</if>>
diff --git a/src/pregmod/organFarmOptions.tw b/src/pregmod/organFarmOptions.tw
index 480a1ef6a6f7f3398e18cad467e89ca12eee2b36..bb383d9f46278ef74ab7fdf517a7b091e4007c0a 100644
--- a/src/pregmod/organFarmOptions.tw
+++ b/src/pregmod/organFarmOptions.tw
@@ -8,6 +8,7 @@
pigTesticles: 0,
dogTesticles: 0,
horseTesticles: 0,
+ cowTesticles: 0,
foreskin: 0,
ovaries: 0,
freshOvaries: 0,
@@ -15,13 +16,15 @@
pigOvaries: 0,
dogOvaries: 0,
horseOvaries: 0,
+ cowOvaries: 0,
eyes: 0,
cochleae: 0,
voicebox: 0,
mpreg: 0,
mpregPig: 0,
mpregDog: 0,
- mpregHorse: 0}>>
+ mpregHorse: 0,
+ mpregCow: 0}>>
<<for _i = 0; _i < $organs.length; _i++>>
<<if $activeSlave.ID == $organs[_i].ID>>
<<if $organs[_i].type == "penis">>
@@ -36,6 +39,8 @@
<<set $slaveOrgans.dogTesticles = 1>>
<<elseif $organs[_i].type == "horseTesticles">>
<<set $slaveOrgans.horseTesticles = 1>>
+ <<elseif $organs[_i].type == "cowTesticles">>
+ <<set $slaveOrgans.cowTesticles = 1>>
<<elseif $organs[_i].type == "foreskin">>
<<set $slaveOrgans.foreskin = 1>>
<<elseif $organs[_i].type == "ovaries">>
@@ -48,6 +53,8 @@
<<set $slaveOrgans.dogOvaries = 1>>
<<elseif $organs[_i].type == "horseOvaries">>
<<set $slaveOrgans.horseOvaries = 1>>
+ <<elseif $organs[_i].type == "cowOvaries">>
+ <<set $slaveOrgans.cowOvaries = 1>>
<<elseif $organs[_i].type == "eyes">>
<<set $slaveOrgans.eyes = 1>>
<<elseif $organs[_i].type == "cochleae">>
@@ -62,6 +69,8 @@
<<set $slaveOrgans.mpregDog = 1>>
<<elseif $organs[_i].type == "mpregHorse">>
<<set $slaveOrgans.mpregHorse = 1>>
+ <<elseif $organs[_i].type == "mpregCow">>
+ <<set $slaveOrgans.mpregCow = 1>>
<<elseif $organs[_i].type == "freshOvaries">>
<<set $slaveOrgans.freshOvaries = 1>>
<</if>>
@@ -133,6 +142,16 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<<goto "Remote Surgery">>
<</link>> //Costs <<print cashFormat(5000)>> and requires a penis for successful implantation//
<</if>>
+ <<if $slaveOrgans.cowTesticles != 1>>
+ <br>
+ <<link "Cow testicles">>
+ <<set $cash -= 5000>>
+ <<set _newOrgan = {type: "cowTesticles", weeksToCompletion: "10", ID: 0}>>
+ <<set _newOrgan.ID = $activeSlave.ID>>
+ <<set $organs.push(_newOrgan)>>
+ <<goto "Remote Surgery">>
+ <</link>> //Costs <<print cashFormat(5000)>> and requires a penis for successful implantation//
+ <</if>>
<</if>>
<<if $slaveOrgans.foreskin != 1>>
<<if $activeSlave.foreskin <= 0>>
@@ -198,6 +217,16 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<<goto "Remote Surgery">>
<</link>> //Costs <<print cashFormat(10000)>> and requires a vagina for successful implantation//
<</if>>
+ <<if $slaveOrgans.cowOvaries != 1>>
+ <br>
+ <<link "Cow ovaries">>
+ <<set $cash -= 10000>>
+ <<set _newOrgan = {type: "cowOvaries", weeksToCompletion: "10", ID: 0}>>
+ <<set _newOrgan.ID = $activeSlave.ID>>
+ <<set $organs.push(_newOrgan)>>
+ <<goto "Remote Surgery">>
+ <</link>> //Costs <<print cashFormat(10000)>> and requires a vagina for successful implantation//
+ <</if>>
<</if>>
<<if $youngerOvaries == 1>>
<<if $slaveOrgans.freshOvaries != 1>>
@@ -289,6 +318,16 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<<goto "Remote Surgery">>
<</link>> //Costs <<print cashFormat(20000)>> and the slave must not have female reproductive organs for successful implantation//
<</if>>
+ <<if $slaveOrgans.mpregCow != 1>>
+ <br>
+ <<link "Anal cow womb and ovaries">>
+ <<set $cash -= 20000>>
+ <<set _newOrgan = {type: "mpregCow", weeksToCompletion: "10", ID: 0}>>
+ <<set _newOrgan.ID = $activeSlave.ID>>
+ <<set $organs.push(_newOrgan)>>
+ <<goto "Remote Surgery">>
+ <</link>> //Costs <<print cashFormat(20000)>> and the slave must not have female reproductive organs for successful implantation//
+ <</if>>
<</if>>
<</if>>
@@ -308,6 +347,8 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
dog testicles are
<<case "horseTesticles">>
horse testicles are
+ <<case "cowTesticles">>
+ cow testicles are
<<case "freshOvaries">>
revitalized ovaries are
<<case "pigOvaries">>
@@ -316,6 +357,8 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
dog ovaries are
<<case "horseOvaries">>
horse ovaries are
+ <<case "cowOvaries">>
+ cow ovaries are
<<case "mpreg">>
anal womb and ovaries are
<<case "mpregPig">>
@@ -324,6 +367,8 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
anal womb and dog ovaries are
<<case "mpregHorse">>
anal womb and horse ovaries are
+ <<case "mpregCow">>
+ anal womb and cow ovaries are
<</switch>>
expected to be ready in <<if $organFarmUpgrade == 1>><<print $organs[_i].weeksToCompletion>><<elseif $organFarmUpgrade == 2>><<print Math.ceil($organs[_i].weeksToCompletion/2)>><<elseif $organFarmUpgrade == 3>><<print Math.ceil($organs[_i].weeksToCompletion/4)>><</if>> weeks.
<</if>>
@@ -750,6 +795,98 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</link>>
<</if>>
+ <<elseif $completedOrgans[_i].type == "cowTesticles">>
+ <<if $activeSlave.balls > 0>>
+ <br>
+ ERROR: this slave already has testicles.
+ <<link "Discard" "Remote Surgery">>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "cowTesticles"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <</link>>
+ <<elseif $activeSlave.dick == 0>>
+ <br>
+ ERROR: this slave lacks the penis necessary to accept testicles.
+ <<link "Discard" "Remote Surgery">>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "cowTesticles"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <</link>>
+ <br>You can forgo standard procedure and implant testicles directly into $his abdomen.
+ <<link "Implant" "Surgery Degradation">>
+ <<set $cash -= $surgeryCost>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "cowTesticles"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <<if $activeSlave.prostate < 1>><<set $activeSlave.prostate = 1>><</if>>
+ <<set $activeSlave.balls = 2>>
+ <<set $activeSlave.ballType = "cow">>
+ <<set $activeSlave.health -= 20>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
+ <<if $activeSlave.pubertyXY == 0>>
+ <<if $precociousPuberty == 1>>
+ <<if $activeSlave.physicalAge >= $potencyAge>>
+ <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>>
+ <</if>>
+ <<else>>
+ <<if $activeSlave.physicalAge >= $potencyAge>>
+ <<set $activeSlave.pubertyXY = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set $surgeryType = "addCowBalls">>
+ <</link>>
+ <<else>>
+ <br>
+ <<link "Implant" "Surgery Degradation">>
+ <<set $cash -= $surgeryCost>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "cowTesticles"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <<set $activeSlave.balls = 3>>
+ <<set $activeSlave.scrotum = 3>>
+ <<set $activeSlave.ballType = "cow">>
+ <<set $activeSlave.health -= 20>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
+ <<if $activeSlave.pubertyXY == 0>>
+ <<if $precociousPuberty == 1>>
+ <<if $activeSlave.physicalAge >= $potencyAge>>
+ <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>>
+ <</if>>
+ <<else>>
+ <<if $activeSlave.physicalAge >= $potencyAge>>
+ <<set $activeSlave.pubertyXY = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set $surgeryType = "addCowBalls">>
+ <</link>>
+ |
+ <<link "Discard" "Remote Surgery">>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "cowTesticles"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <</link>>
+ <</if>>
<<elseif $completedOrgans[_i].type == "scrotum">>
<<if $activeSlave.scrotum > 0>>
<br>
@@ -1139,6 +1276,80 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
<</if>>
<</link>>
<</if>>
+ <<elseif $completedOrgans[_i].type == "cowOvaries">>
+ <<if $activeSlave.ovaries > 0>>
+ <br>
+ ERROR: this slave already has ovaries.
+ <<link "Discard" "Remote Surgery">>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "cowOvaries"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <</link>>
+ <<elseif $activeSlave.vagina < 0>>
+ <br>
+ ERROR: this slave lacks the vagina necessary to accept ovaries.
+ <<link "Discard" "Remote Surgery">>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "cowOvaries"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <</link>>
+ <<elseif $activeSlave.mpreg != 0 || $activeSlave.bellyImplant != -1>>
+ <br>
+ ERROR: this slave's body cavity is filled with another organ.
+ <<link "Discard" "Remote Surgery">>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "cowOvaries"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <</link>>
+ <<else>>
+ <br>
+ <<link "Implant" "Surgery Degradation">>
+ <<set $cash -= $surgeryCost>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "cowOvaries"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <<set $activeSlave.ovaries = 1>>
+ <<set $activeSlave.eggType = "cow">>
+ <<set $activeSlave.preg = 0>>
+ <<set $activeSlave.health -= 20>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
+ <<if $activeSlave.pubertyXX == 0>>
+ <<if $precociousPuberty == 1>>
+ <<if $activeSlave.physicalAge >= $fertilityAge>>
+ <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>>
+ <</if>>
+ <<else>>
+ <<if $activeSlave.physicalAge >= $fertilityAge>>
+ <<set $activeSlave.pubertyXX = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set $surgeryType = "addCowOvaries">>
+ <</link>>
+ |
+ <<link "Discard" "Remote Surgery">>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "cowOvaries"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <</link>>
+ <</if>>
<<elseif $completedOrgans[_i].type == "freshOvaries">>
<<if ($activeSlave.mpreg == 0 && $activeSlave.ovaries == 0) || $activeSlave.bellyImplant != -1>>
<br>
@@ -1589,8 +1800,60 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi
@@.red;Organ not found for deletion!@@
<</if>>
<</link>>
+ <</if>>
+ <<elseif $completedOrgans[_i].type == "mpregCow">>
+ <<if ($activeSlave.ovaries != 0) && ($activeSlave.vagina > -1) && ($activeSlave.mpreg != 0)>>
+ <br>
+ ERROR: this slave has existing reproductive Organs.
+ <<link "Discard" "Remote Surgery">>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "mpregCow"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <</link>>
+ <<else>>
+ <br>
+ <<link "Implant" "Surgery Degradation">>
+ <<set $cash -= $surgeryCost>>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "mpregCow"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <<set $activeSlave.mpreg = 1>>
+ <<set $activeSlave.eggType = "cow">>
+ <<set $activeSlave.preg = 0>>
+ <<set $activeSlave.health -= 40>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
+ <<if $activeSlave.pubertyXX == 0>>
+ <<if $precociousPuberty == 1>>
+ <<if $activeSlave.physicalAge >= $fertilityAge>>
+ <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>>
+ <</if>>
+ <<else>>
+ <<if $activeSlave.physicalAge >= $fertilityAge>>
+ <<set $activeSlave.pubertyXX = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set $surgeryType = "mpregCow">>
+ <</link>>
+ |
+ <<link "Discard" "Remote Surgery">>
+ <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "mpregCow"; })>>
+ <<if _ofo != -1>>
+ <<set $completedOrgans.deleteAt(_ofo)>>
+ <<else>>
+ @@.red;Organ not found for deletion!@@
+ <</if>>
+ <</link>>
<</if>>
- <<else>>
+ <<elseif $completedOrgans[_i].type == "voicebox">>
<<if $activeSlave.voice > 0 && $activeSlave.electrolarynx != 1>>
<br>
ERROR: this slave is not mute.
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index cc2df0cb0886934216b81c83fcd9f3cd13cbc6a4..3ba9da09896d6a3288665d9498b83f091bdaeb9a 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -1045,8 +1045,10 @@ The offered price is <<print cashFormat($slaveCost)>>.
<<set $lastShow = 15, $showFifteen++>>
<<if $showFifteen == 3>><<set $showFifteen = 1>><</if>>
<<if $showFifteen == 1>>
+ /*
You awaken one morning, just before the break of dawn, and find yourself unable to go back to sleep. Giving up on the idea of returning to slumber, you idly flip through the channels on your TV, finding mostly static or early morning infomercials, until you finally land on a channel broadcasting so early in the morning.
<br><br>
+ */
You're greeted by a man with an eyepatch, a bushy black beard, and a crimson bandanna around his head. He's sitting behind a crude looking bamboo desk. Behind him is the backdrop of a sun rising over the ocean and two slaves in tight revealing sailor outfits swabbing the deck. The whole set looks like some sort of tropical pirate theme and you almost change the channel mistaking the show for a kids show when it catches up to you what the pirate is talking about.
<br><br>
"-An that be concludin' our special report on the dangers o' dealin' with old world customs agencies an how to find a scallywag'll right proper let you sneak a bound wench through fer the right bribe. If'n you missed it or be needin' a refresher, catch our rebroadcast in 12 bells time. Now afore the turn of the hourglass we go to our weatherwench Lusty Pearl who's been keepin' a weather eye on the horizon. Lusty?"
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index c399a4db89a779749aa04ff96c7d2cd28c0ee02c..707e8fab21b4ca8883628a7fb9d43b98b163158b 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -949,7 +949,7 @@ As $he enjoys $himself, $his loose sphincter relaxes still further until it's ba
<<set $activeSlave.devotion += 4>>
<<EventNameLink $activeSlave>> is in solitary. $He's let out whenever required for a slave task, but unless $he's serving, $he spends $his days in a featureless cell. It's clean and dry, but designed to totally deny any mental stimulation. Careful monitoring is necessary to prevent mental damage.
<br><br>
-As you pass by $his cell on other business, there is a faint stirring within. <<if canHear($activeSlave)>>$He must have heard the dim sound of your footsteps through the door.<<elseif canSee($activeSlave)>>$He must have been ooking for you through a small opening in $his cell door.<<else>>$He must have placed $himself against the door just in case you stopped by.<</if>> There's a small port for meals to be inserted into the cell, and $he shouts at it, clearly with $his mouth right against it, "Plea<<s>>e don't go! I'll do anything if you ju<<s>>t <<s>>tay a bit, whoever you are! I ju<<s>>t need <<s>>ome time with <<s>>omeone! Plea<<s>>e!"
+As you pass by $his cell on other business, there is a faint stirring within. <<if canHear($activeSlave)>>$He must have heard the dim sound of your footsteps through the door.<<elseif canSee($activeSlave)>>$He must have been looking for you through a small opening in $his cell door.<<else>>$He must have placed $himself against the door just in case you stopped by.<</if>> There's a small port for meals to be inserted into the cell, and $he shouts at it, clearly with $his mouth right against it, "Plea<<s>>e don't go! I'll do anything if you ju<<s>>t <<s>>tay a bit, whoever you are! I ju<<s>>t need <<s>>ome time with <<s>>omeone! Plea<<s>>e!"
<<case "scrubbing">>
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/multiImplant.tw b/src/uncategorized/multiImplant.tw
index 3acad5038d355c6756972064f78804e4cd3e3b32..e9e15fc983ecd24782533d2fa9dedcacc71e51ec 100644
--- a/src/uncategorized/multiImplant.tw
+++ b/src/uncategorized/multiImplant.tw
@@ -12,6 +12,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
pigTesticles: 0,
dogTesticles: 0,
horseTesticles: 0,
+ cowTesticles: 0,
foreskin: 0,
ovaries: 0,
freshOvaries: 0,
@@ -19,13 +20,15 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
pigOvaries: 0,
dogOvaries: 0,
horseOvaries: 0,
+ cowOvaries: 0,
eyes: 0,
cochleae: 0,
voicebox: 0,
mpreg: 0,
mpregPig: 0,
mpregDog: 0,
- mpregHorse: 0
+ mpregHorse: 0,
+ mpregCow: 0
}>>
<<for _j = 0; _j < $completedOrgans.length; _j++>>
<<if $activeSlave.ID == $completedOrgans[_j].ID>>
@@ -47,6 +50,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<elseif $completedOrgans[_j].type == "horseTesticles">>
<<set _slaveOrgans.horseTesticles = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
+ <<elseif $completedOrgans[_j].type == "cowTesticles">>
+ <<set _slaveOrgans.cowTesticles = $completedOrgans[_j]>>
+ <<set $completedOrgans.deleteAt(_j),_j-->>
<<elseif $completedOrgans[_j].type == "foreskin">>
<<set _slaveOrgans.foreskin = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
@@ -68,6 +74,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<elseif $completedOrgans[_j].type == "horseOvaries">>
<<set _slaveOrgans.horseOvaries = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
+ <<elseif $completedOrgans[_j].type == "cowOvaries">>
+ <<set _slaveOrgans.cowOvaries = $completedOrgans[_j]>>
+ <<set $completedOrgans.deleteAt(_j),_j-->>
<<elseif $completedOrgans[_j].type == "eyes">>
<<set _slaveOrgans.eyes = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
@@ -89,6 +98,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<elseif $completedOrgans[_j].type == "mpregHorse">>
<<set _slaveOrgans.mpregHorse = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
+ <<elseif $completedOrgans[_j].type == "mpregCow">>
+ <<set _slaveOrgans.mpregCow = $completedOrgans[_j]>>
+ <<set $completedOrgans.deleteAt(_j),_j-->>
<<else>>
<br>Error: unrecognized organ.
<</if>>
@@ -394,6 +406,49 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<set $completedOrgans.push(_slaveOrgans.horseOvaries)>>
<</if>>
<</if>>
+ /* cow ovaries */
+ <<if _slaveOrgans.cowOvaries != 0>>
+ <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina >= 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == -1)>>
+ <<set $cash -= $surgeryCost>>
+ <<set $activeSlave.ovaries = 1>>
+ <<set $activeSlave.eggType = "cow">>
+ <<set $activeSlave.preg = 0>>
+ <<set $activeSlave.health -= 20>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
+ <<if $activeSlave.pubertyXX == 0>>
+ <<if $precociousPuberty == 1>>
+ <<if $activeSlave.physicalAge >= $fertilityAge>>
+ <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>>
+ <</if>>
+ <<else>>
+ <<if $activeSlave.physicalAge >= $fertilityAge>>
+ <<set $activeSlave.pubertyXX = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set $surgeryType = "addCowOvaries">>
+ <br><hr>
+ <<include "Surgery Degradation">>
+ <<elseif $activeSlave.ovaries == 1>>
+ <br><hr>
+ @@.red;Could not implant cow ovaries on $activeSlave.slaveName: she already has ovaries.@@
+ <<set $completedOrgans.push(_slaveOrgans.cowOvaries)>>
+ <<elseif $activeSlave.vagina < 0>>
+ <br><hr>
+ @@.red;Could not implant cow ovaries on $activeSlave.slaveName: she lacks a vagina.@@
+ <<set $completedOrgans.push(_slaveOrgans.cowOvaries)>>
+ <<elseif $activeSlave.bellyImplant >= 0>>
+ <br><hr>
+ @@.red;Could not implant cow ovaries on $activeSlave.slaveName: she has a fillable abdominal implant.@@
+ <<set $completedOrgans.push(_slaveOrgans.cowOvaries)>>
+ <<elseif $activeSlave.mpreg != 0>>
+ <br><hr>
+ @@.red;Could not implant cow ovaries on $activeSlave.slaveName: she has an anal womb.@@
+ <<set $completedOrgans.push(_slaveOrgans.cowOvaries)>>
+ <</if>>
+ <</if>>
/* male preg */
<<if _slaveOrgans.mpreg != 0>>
<<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == -1)>>
@@ -566,6 +621,49 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<set $completedOrgans.push(_slaveOrgans.mpregHorse)>>
<</if>>
<</if>>
+ /* male cow preg */
+ <<if _slaveOrgans.mpregCow != 0>>
+ <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == -1)>>
+ <<set $cash -= $surgeryCost>>
+ <<set $activeSlave.mpreg = 1>>
+ <<set $activeSlave.eggType = "cow">>
+ <<set $activeSlave.preg = 0>>
+ <<set $activeSlave.health -= 40>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
+ <<if $activeSlave.pubertyXX == 0>>
+ <<if $precociousPuberty == 1>>
+ <<if $activeSlave.physicalAge >= $fertilityAge>>
+ <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>>
+ <</if>>
+ <<else>>
+ <<if $activeSlave.physicalAge >= $fertilityAge>>
+ <<set $activeSlave.pubertyXX = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set $surgeryType = "mpregCow">>
+ <br><hr>
+ <<include "Surgery Degradation">>
+ <<elseif $activeSlave.ovaries == 1>>
+ <br><hr>
+ @@.red;Could not implant cow anal womb on $activeSlave.slaveName: she has ovaries.@@
+ <<set $completedOrgans.push(_slaveOrgans.mpregCow)>>
+ <<elseif $activeSlave.vagina < 0>>
+ <br><hr>
+ @@.red;Could not implant cow anal womb on $activeSlave.slaveName: she has a vagina.@@
+ <<set $completedOrgans.push(_slaveOrgans.mpregCow)>>
+ <<elseif $activeSlave.bellyImplant >= 0>>
+ <br><hr>
+ @@.red;Could not implant cow anal womb on $activeSlave.slaveName: she has a fillable abdominal implant.@@
+ <<set $completedOrgans.push(_slaveOrgans.mpregCow)>>
+ <<elseif $activeSlave.mpreg != 0>>
+ <br><hr>
+ @@.red;Could not implant cow anal womb on $activeSlave.slaveName: she already has an anal womb.@@
+ <<set $completedOrgans.push(_slaveOrgans.mpregCow)>>
+ <</if>>
+ <</if>>
/* ovary renewal */
<<if _slaveOrgans.freshOvaries != 0>>
<<if (($activeSlave.ovaries == 1) || ($activeSlave.mpreg == 1)) && ($activeSlave.bellyImplant == -1) && ($activeSlave.physicalAge < 60)>>
@@ -768,6 +866,41 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<set $completedOrgans.push(_slaveOrgans.horseTesticles)>>
<</if>>
<</if>>
+ /* cow testicles */
+ <<if _slaveOrgans.cowTesticles != 0>>
+ <<if ($activeSlave.dick >= 1) && ($activeSlave.balls == 0)>>
+ <<set $cash -= $surgeryCost>>
+ <<set $activeSlave.balls = 3>>
+ <<set $activeSlave.scrotum = 3>>
+ <<set $activeSlave.ballType = "cow">>
+ <<set $activeSlave.health -= 20>>
+ <<if $organFarmUpgrade == 2>>
+ <<set $activeSlave.chem += 20>>
+ <</if>>
+ <<if $activeSlave.pubertyXY == 0>>
+ <<if $precociousPuberty == 1>>
+ <<if $activeSlave.physicalAge >= $potencyAge>>
+ <<set $activeSlave.pubertyAgeXY = ($activeSlave.physicalAge+1)>>
+ <</if>>
+ <<else>>
+ <<if $activeSlave.physicalAge >= $potencyAge>>
+ <<set $activeSlave.pubertyXY = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set $surgeryType = "addCowBalls">>
+ <br><hr>
+ <<include "Surgery Degradation">>
+ <<elseif $activeSlave.dick == 0>>
+ <br><hr>
+ @@.red;Could not implant cow testicles on $activeSlave.slaveName: she lacks a penis.@@
+ <<set $completedOrgans.push(_slaveOrgans.cowTesticles)>>
+ <<else>>
+ <br><hr>
+ @@.red;Could not implant cow testicles on $activeSlave.slaveName: she already has testicles.@@
+ <<set $completedOrgans.push(_slaveOrgans.cowTesticles)>>
+ <</if>>
+ <</if>>
/* scrotum */
<<if _slaveOrgans.scrotum != 0>>
<<if ($activeSlave.scrotum == 0) && ($activeSlave.balls >= 1)>>
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/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 9aa09fa2d2e546ed06b39d6943aefd6cd4f3353b..70eefd3ef7c4f0123acbe818c7eacc990bee8478 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -84,7 +84,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
A blood test reveals that $he was originally $activeSlave.origRace, not $activeSlave.race<<if $PC.medicine >= 50 || $PC.slaving >= 50>>, just as you suspected<</if>>.
<</if>>
<</if>>
-<<if $activeSlave.race != $activeSlave.origRace>>
+<<if $activeSlave.skin != $activeSlave.origSkin>>
An epidermis scan reveals that $his skin was originally $activeSlave.origSkin, not $activeSlave.skin<<if $PC.medicine >= 75 || $PC.slaving >= 75>>, just as you suspected<</if>>.
<</if>>
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/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 8d2a26def24bde61e7866a6611f5db11b2f0f5e1..f817d8704c29943eb1659e300349288701aa66ba 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -527,6 +527,10 @@
<<set $activeSlave.vaginaPiercing = 1>>
<<set $activeSlave.eyebrowPiercing = 1>>
<<set $activeSlave.navelPiercing = 1>>
+<<set $activeSlave.override_H_Color = 1>>
+<<set $activeSlave.override_Arm_H_Color = 1>>
+<<set $activeSlave.override_Pubic_H_Color = 1>>
+<<set $activeSlave.hColor = either("purple", "blue", "green")>>
<<case "female SE">>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index e95838968c2deec05eee306cc3b8330e9d0e8f68..e7a017014a6d9677443805a7f7c159bf1b6539c5 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -272,7 +272,7 @@
<<set $activeSlave.hStyle = "tails">>
<<set $activeSlave.hColor = "blonde">>
<<set $activeSlave.pubicHColor = "blonde">>
- <<if $activeSlave.race != "white">><<set $activeSlave.race = "surgically altered to look white">><</if>>
+ <<set $activeSlave.race = "white">>
<<set $activeSlave.skin = "tanned">>
<<set $activeSlave.customTat = "She has the coat of arms of St. Claver Preparatory tattooed on her left cheek.">>
<<AddSlave $activeSlave>> /* skip New Slave Intro */
@@ -744,6 +744,8 @@
<<AddSlave $activeSlave>> /* skip New Slave Intro */
<</if>>
+<<setLocalPronouns $activeSlave>>
+
<<if $RESFailure == "TSS">>
You receive a personal call from a senior representative of The Slavegirl School, as you've been expecting since their second missed rent payment. "I apologize," he says with some embarrassment, "but it seems our expansion into your arcology was a mistake. It's strange - the business climate seemed excellent, and other corporations are doing well." He sighs. "Nevertheless, nothing ever seemed to go as planned. We'll be shutting our branch campus down immediately. In fact, it should be shut down within the hour. I regret to add," he says nervously, "that we're experiencing continued difficulty finding the liquidity to pay what we owe you. The branch campus we're closing has five recent graduates. We'd like to transfer them to you in lieu of payment." He hurriedly ends the call.
<<elseif $RESFailure == "GRI">>
@@ -759,9 +761,9 @@
<<elseif $RESFailure == "TCR">>
You receive a personal call from a senior representative of the Cattle Ranch, as you've been expecting since their second missed rent payment. "I apologize," he says with some embarrassment, "but it seems our expansion into your arcology was a mistake. It's strange - the business climate seemed excellent, and other corporations are doing well." He sighs. "Nevertheless, nothing ever seemed to go as planned. We'll be shutting our farm down immediately. In fact, it should be shut down within the hour. However, we lack the funds to remove some of our finest cattle and since we still owe you a little... We'd like to you to have them; we'll even have them delivered to your penthouse with the last of our credits." He hurriedly ends the call.
<<else>>
- The senior Sister of the community of Futanari Sisters in your arcology appears at your penthouse, as you've been expecting since their second missed rent payment. This is quite the occasion, since they never leave their little nest. She's delightfully nude, and it occurs to you that the Sisters probably do not own clothing at all. She has obviously been crying; puffy eyes and a sniffling nose mar her gorgeous face. She must have caused quite the sensation as she made her way here, in tears, gigantic tits and huge cock bouncing around. To your surprise, she flings herself at your feet, her dick making a painful-sounding slap against the floor and her breasts squashing out to either side of her.
+ The senior Sister of the community of Futanari Sisters in your arcology appears at your penthouse, as you've been expecting since their second missed rent payment. This is quite the occasion, since they never leave their little nest. $He's delightfully nude, and it occurs to you that the Sisters probably do not own clothing at all. $He has obviously been crying; puffy eyes and a sniffling nose mar $his gorgeous face. $He must have caused quite the sensation as $he made $his way here, in tears, gigantic tits and huge cock bouncing around. To your surprise, $he flings herself at your feet, $his dick making a painful-sounding slap against the floor and $his breasts squashing out to either side of $him.
<br><br>
- "Please," she cries to your feet. "Please take us as slaves. We're indebted, and we'll all be enslaved. You're our friend, you'll treat us better than anyone." Then she whispers, "Please, <<if $PC.surname>><<if $PC.title>>Mr.<<else>>Ms.<</if>> <<print $PC.surname>>,<<else>><<print $PC.name>>,<</if>> don't make me beg." You tell the prostrate futa you accept. Her mood does not improve: she scrabbles around to face away from you, plush body jiggling submissively, and raises her buttocks to spread her pussy and anus for you. "Thank you," she weeps. "Now please rape me, <<Master>>. I deserve it. My mismanagement stole my Sisters' years of idyll from them. Please, rape me."
+ "Please," $he cries to your feet. "Please take us as slaves. We're indebted, and we'll all be enslaved. You're our friend, you'll treat us better than anyone." Then $he whispers, "Please, <<if $PC.surname>><<if $PC.title>>Mr.<<else>>Ms.<</if>> <<print $PC.surname>>,<<else>><<print $PC.name>>,<</if>> don't make me beg." You tell the prostrate futa you accept. $His mood does not improve: $he scrabbles around to face away from you, plush body jiggling submissively, and raises $his buttocks to spread $his pussy and anus for you. "Thank you," $he weeps. "Now please rape me, <<Master>>. I deserve it. My mismanagement stole my Sisters' years of idyll from them. Please, rape me."
<</if>>
<br><br>
The failure of a prominent organization within your arcology has @@.red;affected your reputation@@ and @@.red;your arcology's prosperity@@ slightly, but you've come out a long way ahead. You've acquired excellent slaves for a pitiful fraction of their fair price.
@@ -770,7 +772,7 @@ The failure of a prominent organization within your arcology has @@.red;affected
<span id="result">
<<if $RESFailure == "TFS">>
-<<link "Rape her">>
+<<link "Rape $him">>
<<replace "#result">>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if ($slaves[$i].origin == "She was the leader of your arcology's Futanari Sisters until you engineered her community's failure and enslavement.")>>
@@ -781,7 +783,7 @@ The failure of a prominent organization within your arcology has @@.red;affected
<<set $vaginalTotal += 1>>
<</if>>
<</for>>
- You <<if $PC.dick == 1>>whip out your dick<<else>>pull on a strap-on, the one you use for disobedient slaves,<</if>> and kneel down behind the sobbing futa matron. When she feels it touching her pussylips, she whispers "Thank you, <<Master>>," through her tears. She's very, very sexually experienced, so it's harder to make her feel it than it would be for a girl with tighter holes. But you're an expert. You calibrate your pounding to pull just barely too far out, so that she feels you ramming mercilessly into her with each stroke, and so that the slightest mistake from her sends <<if $PC.dick == 1>>your cock<<else>>the phallus<</if>> right up the other hole. Despite her anguish and the brutal fuck, or perhaps because of them, she slowly manages to get hard, and orgasms painfully when you do. She @@.hotpink;can't seem to stop thanking you,@@ but is quiet when you tell her to be.
+ You <<if $PC.dick == 1>>whip out your dick<<else>>pull on a strap-on, the one you use for disobedient slaves,<</if>> and kneel down behind the sobbing futa matron. When $he feels it touching $his pussylips, $he whispers "Thank you, <<Master>>," through $his tears. $He's very, very sexually experienced, so it's harder to make $him feel it than it would be for a girl with tighter holes. But you're an expert. You calibrate your pounding to pull just barely too far out, so that $he feels you ramming mercilessly into $him with each stroke, and so that the slightest mistake from $him sends <<if $PC.dick == 1>>your cock<<else>>the phallus<</if>> right up the other hole. Despite $his anguish and the brutal fuck, or perhaps because of them, $he slowly manages to get hard, and orgasms painfully when you do. $He @@.hotpink;can't seem to stop thanking you,@@ but is quiet when you tell $him to be.
<</replace>>
<</link>>
<br>
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/uncategorized/salon.tw b/src/uncategorized/salon.tw
index eb48da27845ede570c8373b8d55df5b21ba93f19..ad4b39426d6db096804150bccd67be479b7d7d1d 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -272,7 +272,7 @@
<<if $primaryHairColor != 0>>
<br>
- [["Dye " + $his + " hair|Salon][$activeSlave.hColor = ($primaryHairColor + $secondaryHairColor),$cash -= $modCost, $primaryHairColor = 0, $secondaryHairColor = ""]] $primaryHairColor $secondaryHairColor now?
+ [["Dye " + $his + " hair"|Salon][$activeSlave.hColor = ($primaryHairColor + $secondaryHairColor),$cash -= $modCost, $primaryHairColor = 0, $secondaryHairColor = ""]] $primaryHairColor $secondaryHairColor now?
<</if>>
<br><br>$His $activeSlave.hStyle hair is <<= lengthToEitherUnit($activeSlave.hLength)>> long. //General hairstyles will conform to hair length and clothing choices.//
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>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index bb52e7193f184b30b0114019def0f8c43e70b77d..6d8405b59345477818f180808ce736ac5bf89b6d 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -3101,6 +3101,7 @@
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
+ <<set $fixedRace = "white">>
<<include "Generate XX Slave">>
<<set $activeSlave.origin = "You bought her from St. Claver Preparatory after she served as a plastic surgeon's passing final exam.">>
<<set $activeSlave.chem = 20>>
@@ -3160,8 +3161,8 @@
<<set $activeSlave.hStyle = "tails">>
<<set $activeSlave.hColor = "blonde">>
<<set $activeSlave.pubicHColor = "blonde">>
+ <<set $activeSlave.override_Skin = 1>>
<<set $activeSlave.underArmHColor = "blonde">>
- <<set $activeSlave.race = "white">>
<<set $activeSlave.skin = "tanned">>
<<set $activeSlave.customTat = "She has the coat of arms of St. Claver Preparatory tattooed on her left cheek.">>