diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw index 8165b7bcb72d0e085d8d5421399624ab63571981..23bcd8588c8e6e5a1bb2a0296b9a962ea8c921db 100644 --- a/src/cheats/mod_EditSlaveCheat.tw +++ b/src/cheats/mod_EditSlaveCheat.tw @@ -906,6 +906,25 @@ Custom sclera color: <<textbox "$tempSlave.sclerae" $tempSlave.sclerae>> <</if>> <<textbox "$tempSlave.preg" $tempSlave.preg>> +<br> +''Pregnancy adaptation rating (5: prepubescent loli, 20: adult male, 50: adult female, 51+: practiced):'' +<<if $tempSlave.pregAdaptation < 10>> + Critically poor. +<<elseif $tempSlave.pregAdaptation < 30>> + Very poor. +<<elseif $tempSlave.pregAdaptation < 50>> + Poor. +<<elseif $tempSlave.pregAdaptation < 60>> + Normal. +<<elseif $tempSlave.pregAdaptation < 100>> + Well-adapted. +<<elseif $tempSlave.pregAdaptation < 300>> + Astonishingly well-adapted. +<<else>> + Unshakeable broodmother. +<</if>> +<<textbox "$tempSlave.pregAdaptation" $tempSlave.pregAdaptation>> + <br> ''Number of babies (0: none, 1 - 5):'' <<if $tempSlave.pregType == 1>> diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw index 3c5613c98a9352b9d65cecbeef70631a9766e05a..8daeaa606527f4443f6ad2da8e1968faad9fbca0 100644 --- a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw +++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw @@ -29,6 +29,36 @@ <<elseif $tempSlave.lactation == 0 && $tempSlave.lactationDuration > 0>> <<set $tempSlave.lactationDuration = 0>> <</if>> +<<set $tempSlave.pregAdaptation = Number($tempSlave.pregAdaptation) || 0>> +<<if $tempSlave.pregAdaptation <= 0>> + <<if $tempSlave.genes === "XY">> /* copied from GenerateXYPregAdaptation */ + <<if slave.physicalAge <= 6>> + <<set $tempSlave.pregAdaptation = 5>> + <<elseif $tempSlave.physicalAge <= 11>> + <<set $tempSlave.pregAdaptation = $tempSlave.physicalAge - 1>> + <<elseif $tempSlave.physicalAge <= 15>> + <<set $tempSlave.pregAdaptation = 2 * ($tempSlave.physicalAge - 12) + 12>> + <<else>> + <<set $tempSlave.pregAdaptation = 20>> + <</if>> + <<else>> /* copied from GenerateXXPregAdaptation */ + <<if $tempSlave.physicalAge <= 6>> + <<set $tempSlave.pregAdaptation = 5>> + <<elseif $tempSlave.physicalAge <= 11>> + <<set $tempSlave.pregAdaptation = $tempSlave.physicalAge - 1>> + <<elseif $tempSlave.physicalAge <= 14>> + <<set $tempSlave.pregAdaptation = 4 * ($tempSlave.physicalAge - 12) + 14>> + <<elseif $tempSlave.physicalAge <= 15>> + <<set $tempSlave.pregAdaptation = 28>> + <<elseif $tempSlave.physicalAge <= 16>> + <<set $tempSlave.pregAdaptation = 34>> + <<elseif $tempSlave.physicalAge <= 17>> + <<set $tempSlave.pregAdaptation = 42>> + <<else>> + <<set $tempSlave.pregAdaptation = 50>> + <</if>> + <</if>> +<</if>> <<run SlaveDatatypeCleanup($tempSlave)>> /* will break cheated pregnancies if run before the above block of code */ You perform the dark rituals, pray to the dark gods, and sell your soul for the power to change and mold slaves to your will. diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw index 4cf757ee8aca34bef015f416aea65baccc3ac4b9..8ed3ce2ca00e9c057d29edbe15629f4828f6a0c0 100644 --- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw +++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw @@ -35,6 +35,36 @@ <<elseif $tempSlave.preg > 0>> <<set $tempSlave.pregKnown = 1>> <</if>> +<<set $tempSlave.pregAdaptation = Number($tempSlave.pregAdaptation) || 0>> +<<if $tempSlave.pregAdaptation <= 0>> + <<if $tempSlave.genes === "XY">> /* copied from GenerateXYPregAdaptation */ + <<if slave.physicalAge <= 6>> + <<set $tempSlave.pregAdaptation = 5>> + <<elseif $tempSlave.physicalAge <= 11>> + <<set $tempSlave.pregAdaptation = $tempSlave.physicalAge - 1>> + <<elseif $tempSlave.physicalAge <= 15>> + <<set $tempSlave.pregAdaptation = 2 * ($tempSlave.physicalAge - 12) + 12>> + <<else>> + <<set $tempSlave.pregAdaptation = 20>> + <</if>> + <<else>> /* copied from GenerateXXPregAdaptation */ + <<if $tempSlave.physicalAge <= 6>> + <<set $tempSlave.pregAdaptation = 5>> + <<elseif $tempSlave.physicalAge <= 11>> + <<set $tempSlave.pregAdaptation = $tempSlave.physicalAge - 1>> + <<elseif $tempSlave.physicalAge <= 14>> + <<set $tempSlave.pregAdaptation = 4 * ($tempSlave.physicalAge - 12) + 14>> + <<elseif $tempSlave.physicalAge <= 15>> + <<set $tempSlave.pregAdaptation = 28>> + <<elseif $tempSlave.physicalAge <= 16>> + <<set $tempSlave.pregAdaptation = 34>> + <<elseif $tempSlave.physicalAge <= 17>> + <<set $tempSlave.pregAdaptation = 42>> + <<else>> + <<set $tempSlave.pregAdaptation = 50>> + <</if>> + <</if>> +<</if>> <<run SlaveDatatypeCleanup($tempSlave)>> /* will break cheated pregnancies if run before the above block of code */ /* Dependency Check */ diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw index 535ad454374713b10eaf9c168b603c4361298c53..479521e3ac7f981b3fe558a8f3a635bf32a1df66 100644 --- a/src/cheats/mod_editSlaveCheatNew.tw +++ b/src/cheats/mod_editSlaveCheatNew.tw @@ -2812,6 +2812,25 @@ <br> ''Pregnancy Week (Literal number of weeks pregnant):'' <<textbox "$tempSlave.pregWeek" $tempSlave.pregWeek>> + + <br> + ''Pregnancy adaptation rating (5: prepubescent loli, 20: adult male, 50: adult female, 51+: practiced):'' + <<if $tempSlave.pregAdaptation < 10>> + @@.yellow;Critically poor@@. + <<elseif $tempSlave.pregAdaptation < 30>> + @@.yellow;Very poor@@. + <<elseif $tempSlave.pregAdaptation < 50>> + @@.yellow;Poor@@. + <<elseif $tempSlave.pregAdaptation < 60>> + @@.yellow;Normal@@. + <<elseif $tempSlave.pregAdaptation < 100>> + @@.yellow;Well-adapted@@. + <<elseif $tempSlave.pregAdaptation < 300>> + @@.yellow;Astonishingly well-adapted@@. + <<else>> + @@.yellow;Unshakeable broodmother@@. + <</if>> + <<textbox "$tempSlave.pregAdaptation" $tempSlave.pregAdaptation>> <br> ''Number of babies (0: none, 1 - 5):'' diff --git a/src/js/assayJS.js b/src/js/assayJS.js index d13234ff2a45d83d971b5e858c20e021292fc76a..986d7a87c75ab2ba4bc07dacf5ab2e21b62aebdd 100644 --- a/src/js/assayJS.js +++ b/src/js/assayJS.js @@ -222,7 +222,7 @@ window.newSlave = function newSlave(slave) { addSlave(slave); if (slave.origin !== "$He was your slave, but you freed $him, which $he repaid by participating in a coup attempt against you. It failed, and $he is again your chattel." && slave.ID !== V.boomerangSlave.ID) { - V.genePool.push(slave); + V.genePool.push(clone(slave)); /* Store non-albino stats in genePool */ if (slave.geneticQuirks.albinism === 2) { const albInd = V.genePool.findIndex(s => s.ID === slave.ID); diff --git a/src/pregmod/fSlaveSlaveVagConsummate.tw b/src/pregmod/fSlaveSlaveVagConsummate.tw index 1478308340db5747bbd4dcbab5e4be1ac0f6f714..91d144f7f76dd2fd344daed69948b49c513f53d7 100644 --- a/src/pregmod/fSlaveSlaveVagConsummate.tw +++ b/src/pregmod/fSlaveSlaveVagConsummate.tw @@ -240,7 +240,7 @@ Next, you see to $activeSlave.slaveName. invite you into $activeSlave.slaveName's crowded pussy. <<set $activeSlave.counter.vaginal++, $vaginalTotal++>> <</if>> - You take up the offer and penetrate $activeSlave.slaveName with your <<if $PC.dick > 0>>dick<<else>>strap-on<</if>>. With the added stimulus of penetrating a tight hole alongside $his dear <<= WrittenMaster($slaverapistx)>>, $he comes indecently hard, but no where near as hard as the completely overloaded $activeSlave.slaveName. All of you collapse into an exhausted, happy pile of flesh. + You take up the offer and penetrate $activeSlave.slaveName with your <<if $PC.dick > 0>>dick<<else>>strap-on<</if>>. With the added stimulus of penetrating a tight hole alongside _his2 dear <<= WrittenMaster($slaverapistx)>>, $slaverapistx.slaveName comes indecently hard, but no where near as hard as the completely overloaded $activeSlave.slaveName. All of you collapse into an exhausted, happy pile of flesh. <</if>> diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw index d536d42385496c2c12f588a6a975d18c026da744..53a63fb7ac9d90f2bbc8a0748a82de706caf4ca6 100644 --- a/src/pregmod/incubatorReport.tw +++ b/src/pregmod/incubatorReport.tw @@ -233,8 +233,7 @@ <<if $incubatorUpgradeReproduction == 1>> <br> - <<set _rearQuirk = $tanks[_inc].geneticQuirks.rearLipedema == 2 ? 2 : 0>> - <<set _rearQuirkDivider = _rearQuirk == 0 ? 1 : _rearQuirk>> + <<set _rearQuirk = $tanks[_inc].geneticQuirks.rearLipedema == 2 ? 2 : 1>> <<if $incubatorReproductionSetting == 2>> $His developing body is being flooded with hormones. <<if $incubatorWeightSetting == 1>> @@ -261,7 +260,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips += 2>> <</if>> - <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 30/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 30/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt += 4>> <</if>> @@ -274,7 +273,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 50/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 50/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt += 3>> <</if>> @@ -287,7 +286,7 @@ The excess estrogen-laced growth hormones @@.green;causes $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 50/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 50/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear grow fatter.@@ <<set $tanks[_inc].butt += 2>> <</if>> @@ -300,7 +299,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 60/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 60/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -313,7 +312,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 70/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 12*_rearQuirk && random(1,100) > 70/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -397,7 +396,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 50/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 50/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt += 3>> <</if>> @@ -410,7 +409,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 50/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 50/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -423,7 +422,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 60/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 60/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -436,7 +435,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 70/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 70/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -449,7 +448,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 80/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 8*_rearQuirk && random(1,100) > 80/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -533,7 +532,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips += 2>> <</if>> - <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 70/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 70/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt += 2>> <</if>> @@ -546,7 +545,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 70/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 70/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -559,7 +558,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -572,7 +571,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -585,7 +584,7 @@ The excess estrogen-laced growth hormones @@.green;cause $his hips to widen for childbirth.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 6*_rearQuirk && random(1,100) > 90/_rearQuirk>> The excess estrogen-laced growth hormones @@.green;cause $his rear to grow fatter.@@ <<set $tanks[_inc].butt++>> <</if>> @@ -663,7 +662,7 @@ The added estrogen @@.green;causes $his hips to widen.@@ <<set $tanks[_inc].hips++>> <</if>> - <<if $tanks[_inc].butt < 5*_rearQuirk && random(1,100) > 80/_rearQuirkDivider>> + <<if $tanks[_inc].butt < 5*_rearQuirk && random(1,100) > 80/_rearQuirk>> The added estrogen @@.green;causes $his butt to grow.@@ <<set $tanks[_inc].butt++>> <</if>> diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw index e68fab575c493f91c336d95f9a9fb6edef090750..169e36f0cf82206a5f7a62e5873685f1fcf678ce 100644 --- a/src/uncategorized/prestigiousSlave.tw +++ b/src/uncategorized/prestigiousSlave.tw @@ -670,12 +670,14 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres <<set $activeSlave.prestigeDesc = "$He is a natural albino, and was quickly enslaved due to the great demand for physically unusual specimens.">> <<set $activeSlave.geneticQuirks.albinism = 2>> <<set $activeSlave.albinismOverride = {skin: $activeSlave.skin, eyeColor: $activeSlave.eyeColor, hColor: $activeSlave.hColor}>> + <<set $activeSlave.career = "a slave">> <<set $activeSlave.devotion = random(-90,-80)>> <<set $activeSlave.trust = random(-45,-25)>> <<set $activeSlave.health = random(40,60)>> <<set $activeSlave.hColor = "white">> <<set $activeSlave.pubicHColor = "white">> <<set $activeSlave.underArmHColor = "white">> + <<set $activeSlave.eyebrowHColor = "white">> <<set $activeSlave.eyes = -1>> <<set $activeSlave.eyeColor = "pale grey">> <<set $activeSlave.skin = "pure white">> diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw index cba358bfad0b0215e208be4865ee624161c35bb6..e7571546a92e6b32a535852ab7653a9d4d17f076 100644 --- a/src/uncategorized/reRelativeRecruiter.tw +++ b/src/uncategorized/reRelativeRecruiter.tw @@ -381,7 +381,6 @@ <<set $activeSlave.devotion = random(25,45)>> <<set $activeSlave.trust = random(-15,15)>> <<set $activeSlave.ageImplant = 0>> -<<run removeLimbs($activeSlave, "all")>> <<if $activeSlave.career != "a Futanari Sister">><<set $activeSlave.career = "a slave">><</if>> <<set $activeSlave.relationship = 0>> <<set $activeSlave.relationshipTarget = 0>> diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw index 4921b3e33563ba54e0a342db7ca185fa4eeb4838..11692061634254ab88f0fbb41955d351a3f99f59 100644 --- a/src/uncategorized/saLiveWithHG.tw +++ b/src/uncategorized/saLiveWithHG.tw @@ -685,7 +685,12 @@ <<set $slaves[$i].clothes = "a scalemail bikini">> <</if>> <<elseif ($HeadGirl.fetish == "dom")>> - $HeadGirl.slaveName keeps $slaves[$i].slaveName dressed up as a school<<= $girl>> to infantilize _his2 sub. + $HeadGirl.slaveName keeps $slaves[$i].slaveName dressed up as a school<<= $girl>> + <<if $slaves[$i].physicalAge > 16>> + to infantilize _his2 sub. + <<else>> + to highlight _his2 authority over _his2 young sub. + <</if>> <<set $slaves[$i].clothes = "a schoolgirl outfit">> <<elseif ($HeadGirl.fetish == "boobs")>> $HeadGirl.slaveName keeps $slaves[$i].slaveName wearing a string bikini, since _he2 likes seeing those tits. diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw index a5729ac0a006802998c99bacc31418d5381e6791..da6fc519c61f79b468187d2a85d8bff6fe0821d1 100644 --- a/src/uncategorized/seRaiding.tw +++ b/src/uncategorized/seRaiding.tw @@ -196,7 +196,7 @@ target <<set $activeSlave.skill.whoring = 0>> <<set $activeSlave.skill.combat = 1>> <<set $activeSlave.intelligence = random(20,60)>> - <<set activeSlave.intelligenceImplant = 15>> + <<set $activeSlave.intelligenceImplant = 15>> <<set $activeSlave.hStyle = either("short", "very short")>> <<set $activeSlave.boobs = 150>> <<set $activeSlave.vagina = -1>>