From 9cf9ff2e02eb294042fbb8dea6368954b74ba6e9 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sat, 8 Apr 2017 03:26:46 -0400 Subject: [PATCH] Vanilla content, bald hair descs, waist preg descs and some hopeful fixes. --- src/uncategorized/longSlaveDescription.tw | 85 ++++- src/uncategorized/multiImplant.tw | 397 ++++++++++++++++++++++ src/uncategorized/remoteSurgery.tw | 5 +- src/uncategorized/salon.tw | 60 ---- src/uncategorized/schoolroomReport.tw | 2 +- src/uncategorized/slaveMarkets.tw | 5 + src/utility/descriptionWidgets.tw | 50 ++- 7 files changed, 519 insertions(+), 85 deletions(-) create mode 100644 src/uncategorized/multiImplant.tw diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 790078737de..329a7a60969 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -1595,18 +1595,81 @@ and $pronounCap has <<if $activeSlave.waist > 95>> a badly @@color:red;masculine waist@@ that ruins her figure<<if $activeSlave.weight > 30>> and greatly exaggerates how fat $pronoun is<<elseif $activeSlave.weight > -30>> despite how thin $pronoun is<</if>>. + <<if hyperBellyTwo($activeSlave)>> + $possessiveCap titanic belly lewdly bulges out the sides of $possessive thick waist.<<if $activeSlave.preg > 0>> The sides of $possessive waist are filled by $possessive overfilled womb in its desperate search for more room.<</if>> + <<elseif hyperBellyOne($activeSlave)>> + $possessiveCap gigantic belly barely distends her $possessive thick waist. + <<elseif hugeBelly($activeSlave)>> + $possessiveCap huge belly is hidden by $possessive thick waist. + <<elseif bigBelly($activeSlave)>> + $possessiveCap belly is hidden by $possessive thick waist. + <</if>> <<elseif $activeSlave.waist > 40>> a broad, @@color:red;ugly waist@@ that makes her look mannish<<if $activeSlave.weight > 30>> and exaggerates how fat $pronoun is<<elseif $activeSlave.weight > -30>> despite how thin $pronoun is<</if>>. + <<if hyperBellyTwo($activeSlave)>> + $possessiveCap titanic belly lewdly bulges out the sides of $possessive chunky waist.<<if $activeSlave.preg > 0>> The sides of $possessive waist are filled by $possessive overfilled womb in its desperate search for more room.<</if>> + <<elseif hyperBellyOne($activeSlave)>> + $possessiveCap gigantic belly barely distends her $possessive chunky waist. + <<elseif hugeBelly($activeSlave)>> + $possessiveCap huge belly is barely hidden by $possessive chunky waist. + <<elseif bigBelly($activeSlave)>> + $possessiveCap belly is hidden by $possessive chunky waist. + <</if>> <<elseif $activeSlave.waist > 10>> an @@color:red;unattractive waist@@ that conceals $possessive <<if $activeSlave.visualAge > 25>>girlish<<else>>womanly<</if>> figure<<if $activeSlave.weight > 30>> and accentuates how fat $pronoun is<<elseif $activeSlave.weight > -30>> despite how thin $pronoun is<</if>>. + <<if hyperBellyTwo($activeSlave)>> + $possessiveCap titanic belly lewdly bulges out the sides of $possessive waist.<<if $activeSlave.preg > 0>> The sides of $possessive waist are filled by $possessive overfilled womb in its desperate search for more room.<</if>> + <<elseif hyperBellyOne($activeSlave)>> + $possessiveCap gigantic belly barely distends her $possessive waist. + <<elseif hugeBelly($activeSlave)>> + $possessiveCap huge belly is barely visible to either side of $possessive waist. + <<elseif bigBelly($activeSlave)>> + $possessiveCap belly is barely hidden by $possessive waist. + <</if>> <<elseif $activeSlave.waist >= -10>> an average waist for a <<if $activeSlave.visualAge > 25>>girl<<else>>woman<</if>><<if $activeSlave.weight > 30>>, though it looks broader since $pronoun's fat<<elseif $activeSlave.weight > -30>>, though it looks narrower since $pronoun's thin<</if>>. + <<if hyperBellyTwo($activeSlave)>> + $possessiveCap titanic belly lewdly bulges out the sides of $possessive waist.<<if $activeSlave.preg > 0>> The sides of $possessive waist are filled by $possessive overfilled womb in its desperate search for more room.<</if>> + <<elseif hyperBellyOne($activeSlave)>> + $possessiveCap gigantic belly barely distends her $possessive waist. + <<elseif hugeBelly($activeSlave)>> + $possessiveCap huge belly is barely visible to either side of $possessive waist. + <<elseif bigBelly($activeSlave)>> + $possessiveCap belly is barely hidden by $possessive waist. + <</if>> <<elseif $activeSlave.waist >= -40>> a nice @@color:pink;feminine waist@@ that gives $object a <<if $activeSlave.visualAge > 25>>girlish<<else>>womanly<</if>> figure<<if $activeSlave.weight > 30>> despite $possessive extra weight<<elseif $activeSlave.weight > -30>> and accentuates how thin $pronoun is<</if>>. + <<if hyperBellyTwo($activeSlave)>> + $possessiveCap titanic belly lewdly bulges out the sides of $possessive feminine waist.<<if $activeSlave.preg > 0>> The sides of $possessive waist are filled by $possessive overfilled womb in its desperate search for more room.<</if>> + <<elseif hyperBellyOne($activeSlave)>> + $possessiveCap gigantic belly lewdly distends her $possessive feminine waist. + <<elseif hugeBelly($activeSlave)>> + $possessiveCap huge belly juts out slightly to either side of $possessive feminine waist. + <<elseif bigBelly($activeSlave)>> + $possessiveCap belly is barely visible around $possessive feminine waist. + <</if>> <<elseif $activeSlave.waist >= -95>> a hot @@color:pink;wasp waist@@ that gives $possessive an hourglass figure<<if $activeSlave.weight > 30>> despite $possessive extra weight<<elseif $activeSlave.weight > -30>> further accentuated by how thin $pronoun is<</if>>. + <<if hyperBellyTwo($activeSlave)>> + $possessiveCap titanic belly lewdly bulges out the sides of $possessive narrow waist and continues nearly a meter farther to either side.<<if $activeSlave.preg > 0>> The sides of $possessive waist are filled by $possessive overfilled womb in its desperate search for more room.<</if>> + <<elseif hyperBellyOne($activeSlave)>> + $possessiveCap gigantic belly lewdly distends massively to either side of $possessive narrow waist. + <<elseif hugeBelly($activeSlave)>> + $possessiveCap huge belly bulges to either side of $possessive narrow waist. + <<elseif bigBelly($activeSlave)>> + $possessiveCap belly is visible around $possessive narrow waist. + <</if>> <<else>> an @@color:pink;absurdly narrow waist@@ that gives $possessive a cartoonishly hourglass figure<<if $activeSlave.weight > 30>> made even more ludicrous by $possessive extra weight<<elseif $activeSlave.weight > -30>> made even more ludicrous by how thin $pronoun is<</if>>. + <<if hyperBellyTwo($activeSlave)>> + $possessiveCap titanic belly lewdly bulges out the sides of $possessive very narrow waist and continues nearly a meter farther to either side.<<if $activeSlave.preg > 0>> The sides of $possessive waist are filled by $possessive overfilled womb in its desperate search for more room.<</if>> + <<elseif hyperBellyOne($activeSlave)>> + $possessiveCap gigantic belly lewdly distends massively to either side of $possessive very narrow waist. + <<elseif hugeBelly($activeSlave)>> + $possessiveCap huge belly bulges lewdly to either side of $possessive very narrow waist. + <<elseif bigBelly($activeSlave)>> + $possessiveCap belly is visible to either side of $possessive very narrow waist. + <</if>> <</if>> <<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSSlimnessEnthusiastLaw > 0>> @@ -2239,32 +2302,34 @@ Her scars make her look like she's in the right place. <<if ($activeSlave.hLength >= 10)>> <<if ($activeSlave.markings == "freckles") || ($activeSlave.markings == "heavily freckled")>> <<if ($activeSlave.skin == "pale") || ($activeSlave.skin == "fair")>> - It goes perfectly with her $activeSlave.skin skin and freckles. + It goes perfectly with $possessive $activeSlave.skin skin and freckles. <</if>> <</if>> <</if>> <</if>> <<if ($activeSlave.physicalAge < 11)>> - She is too young to have armpit hair. + $pronounCap is too young to have armpit hair. <<elseif $activeSlave.underArmHStyle == "hairless">> - Her armpits are perfectly smooth and naturally hairless. + $possessiveCap armpits are perfectly smooth and naturally hairless. +<<elseif $activeSlave.underArmHStyle == "bald">> + $possessiveCap armpits no longer grow hair. <<elseif ($activeSlave.underArmHStyle == "waxed")>> <<if ($activeSlave.assignment == "work in the dairy") && ($dairyRestraintsSetting > 1)>> - Her armpit hair has been removed to prevent chafing. + $possessiveCap armpit hair has been removed to prevent chafing. <<else>> - Her armpits are waxed and smooth. + $possessiveCap armpits are waxed and smooth. <</if>> <<elseif ($activeSlave.physicalAge < 12)>> - She has a few $activeSlave.underArmHColor wisps of armpit hair. + $pronounCap has a few $activeSlave.underArmHColor wisps of armpit hair. <<elseif ($activeSlave.physicalAge < 13)>> - Because of her young age she has barely any $activeSlave.underArmHColor armpit hair. + Because of her young age $pronoun has barely any $activeSlave.underArmHColor armpit hair. <<elseif $activeSlave.underArmHStyle == "shaved">> - Her armpits appear hairless, but closer inspection reveals light, $activeSlave.underArmHColor stubble. + $possessiveCap armpits appear hairless, but closer inspection reveals light, $activeSlave.underArmHColor stubble. <<elseif $activeSlave.underArmHStyle == "neat">> - Her armpit hair is neatly trimmed <<if $activeSlave.amp == 1>>since it is always in full view<<else>>to not be visible unless she lifts her arms<</if>>. + $possessiveCap armpit hair is neatly trimmed <<if $activeSlave.amp == 1>>since it is always in full view<<else>>to not be visible unless $pronoun lifts her arms<</if>>. <<elseif $activeSlave.underArmHStyle == "bushy">> - Her $activeSlave.underArmHColor armpit hair has been allowed to grow freely, <<if $activeSlave.amp == 1>>creating two bushy patches under where her arms used to be<<else>>it can be seen poking out from under her arms at all times<</if>>. + $possessiveCap $activeSlave.underArmHColor armpit hair has been allowed to grow freely, <<if $activeSlave.amp == 1>>creating two bushy patches under where $possessive arms used to be<<else>>it can be seen poking out from under $possessive arms at all times<</if>>. <</if>> <</if>> diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw new file mode 100644 index 00000000000..763b213252b --- /dev/null +++ b/src/uncategorized/multiImplant.tw @@ -0,0 +1,397 @@ +:: Multiple Organ Implant [nobr] + +You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized remote surgery<<else>>remote surgery<</if>> and start having the slaves with <<if ($organsCompleted > 0) && ($limbsCompleted > 0)>>organs or limbs <<elseif ($organsCompleted > 1)>>organs <<elseif ($limbsCompleted > 1)>>sets of limbs <</if>>that are ready be sent down. + +<<for _i = 0; _i < $slaves.length; _i++>> + <<if ($organs.length == 0) && ($limbs.length == 0)>><<break>><</if>> + <<for _o = 0; _o < $organs.length; _o++>> + <<if ($organs[_o].ID == $slaves[_i].ID) && ($organs[_o].weeksToCompletion == 0)>> + <<set $activeSlave = $slaves[_i]>> + + <<switch $organs[_o].type>> + <<case "penis">> + <<if $activeSlave.dick == 0>> + <<set $cash -= $surgeryCost>> + <<set $activeSlave.prostate = 1>> + <<set $activeSlave.dick to 2>> + <<set $activeSlave.clit to 0>> + <<set $activeSlave.foreskin to $activeSlave.dick>> + <<set $activeSlave.health -= 20>> + <<set $surgeryType = "addDick">> + <br><hr> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "testicles">> + <<if ($activeSlave.dick >= 0) && ($activeSlave.balls == 0)>> + <<set $cash -= $surgeryCost>> + <<set $activeSlave.prostate = 1>> + <<set $activeSlave.balls to 2>> + <<set $activeSlave.ballType = "human">> + <<set $activeSlave.scrotum to 2>> + <<set $activeSlave.health -= 20>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXY == 0>> + <<if $precociousPuberty == 1>> + <<set $activeSlave.pubertyXY = ($activeSlave.physicalAge+1)>> + <<else>> + <<if $activeSlave.physicalAge >= $potencyAge>> + <<set $activeSlave.pubertyXY = 1>> + <</if>> + <</if>> + <</if>> + <<set $surgeryType = "addBalls">> + <br><hr> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "scrotum">> + <<if ($activeSlave.scrotum == 0) && ($activeSlave.balls >= 0)>> + <<set $cash -= $surgeryCost>> + <<set $activeSlave.scrotum to $activeSlave.balls>> + <<set $activeSlave.health -= 10>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 10>> + <</if>> + <<set $surgeryType = "addScrotum">> + <br><hr> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "foreskin">> + <<if ($activeSlave.foreskin == 0) && ($activeSlave.penis >= 0)>> + <<set $cash -= $surgeryCost>> + <<set $activeSlave.foreskin to $activeSlave.penis>> + <<set $activeSlave.health -= 10>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 10>> + <</if>> + <<set $surgeryType = "addForeskin">> + <br><hr> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "ovaries">> + <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina >= 0)>> + <<set $cash -= $surgeryCost>> + <<set $activeSlave.ovaries to 1>> + <<set $activeSlave.eggType = "human">> + <<set $activeSlave.preg to 0>> + <<set $activeSlave.health -= 20>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXX == 0>> + <<if $precociousPuberty == 1>> + <<set $activeSlave.pubertyXX = ($activeSlave.physicalAge+1)>> + <<else>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyXX = 1>> + <</if>> + <</if>> + <</if>> + <<set $surgeryType = "addOvaries">> + <br><hr> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "prostate">> + <<if ($activeSlave.prostate == 0)>> + <<set $cash -= $surgeryCost>> + <<set $activeSlave.prostate = 1>> + <<set $activeSlave.health -= 20>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<set $surgeryType = "addProstate">> + <br><hr> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "eyes">> + <<if ($activeSlave.eyes == -2) && ($activeSlave.origEye != "implant")>> + <<set $cash -= $surgeryCost>> + <<set $activeSlave.eyes to 1>> + <<set $activeSlave.eyeColor to $activeSlave.origEye>> + /* no way to salvage original eye color */ + <<set $activeSlave.health -= 20>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<set $surgeryType = "unblind">> + <br><hr> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "voicebox">> + <<if ($activeSlave.voice == 0)>> + <<set $cash -= $surgeryCost>> + + <<if ($activeSlave.ovaries + $activeSlave.hormones) > 1>> + <<set $activeSlave.voice = 3>> + <<elseif ($activeSlave.balls > 0) || ($activeSlave.hormones < 0)>> + <<set $activeSlave.voice = 1>> + <<else>> + <<set $activeSlave.voice = 2>> + <</if>> + <<set $activeSlave.health -= 10>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 10>> + <</if>> + <<set $surgeryType = "restoreVoice">> + <br><hr> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "pigTesticles">> + <<if ($activeSlave.dick >= 0) && ($activeSlave.balls == 0)>> + <<set $cash -= $surgeryCost>> + + <<set $activeSlave.balls = 3>> + <<set $activeSlave.scrotum = 3>> + <<set $activeSlave.ballType = "pig">> + <<set $activeSlave.health -= 20>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXY == 0>> + <<if $precociousPuberty == 1>> + <<set $activeSlave.pubertyXY = ($activeSlave.physicalAge+1)>> + <<else>> + <<if $activeSlave.physicalAge >= $potencyAge>> + <<set $activeSlave.pubertyXY = 1>> + <</if>> + <</if>> + <</if>> + <br><hr> + <<set $surgeryType = "addPigBalls">> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "dogTesticles">> + <<if ($activeSlave.dick >= 0) && ($activeSlave.balls == 0)>> + <<set $cash -= $surgeryCost>> + + <<set $activeSlave.balls = 2>> + <<set $activeSlave.ballType = "dog">> + <<set $activeSlave.scrotum = 2>> + <<set $activeSlave.health -= 20>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXY == 0>> + <<if $precociousPuberty == 1>> + <<set $activeSlave.pubertyXY = ($activeSlave.physicalAge+1)>> + <<else>> + <<if $activeSlave.physicalAge >= $potencyAge>> + <<set $activeSlave.pubertyXY = 1>> + <</if>> + <</if>> + <</if>> + <<set $surgeryType = "addDogBalls">> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "pigOvaries">> + <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina >= 0)>> + <<set $cash -= $surgeryCost>> + + <<set $activeSlave.ovaries = 1>> + <<set $activeSlave.eggType = "pig">> + <<set $activeSlave.preg = 0>> + <<set $activeSlave.health -= 20>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXX == 0>> + <<if $precociousPuberty == 1>> + <<set $activeSlave.pubertyXX = ($activeSlave.physicalAge+1)>> + <<else>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyXX = 1>> + <</if>> + <</if>> + <</if>> + <<set $surgeryType = "addPigOvaries">> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "dogOvaries">> + <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina >= 0)>> + <<set $cash -= $surgeryCost>> + + <<set $activeSlave.ovaries = 1>> + <<set $activeSlave.eggType = "dog">> + <<set $activeSlave.preg = 0>> + <<set $activeSlave.health -= 20>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXX == 0>> + <<if $precociousPuberty == 1>> + <<set $activeSlave.pubertyXX = ($activeSlave.physicalAge+1)>> + <<else>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyXX = 1>> + <</if>> + <</if>> + <</if>> + <<set $surgeryType = "addDogOvaries">> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "mpreg">> + <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0)>> + <<set $cash -= $surgeryCost>> + + <<set $activeSlave.mpreg = 1>> + <<set $activeSlave.eggType = "human">> + <<set $activeSlave.preg = 0>> + <<set $activeSlave.health -= 40>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXX == 0>> + <<if $precociousPuberty == 1>> + <<set $activeSlave.pubertyXX = ($activeSlave.physicalAge+1)>> + <<else>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyXX = 1>> + <</if>> + <</if>> + <</if>> + <<set $surgeryType = "mpreg">> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "mpregPig">> + <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0)>> + <<set $cash -= $surgeryCost>> + + <<set $activeSlave.mpreg = 1>> + <<set $activeSlave.eggType = "pig">> + <<set $activeSlave.preg = 0>> + <<set $activeSlave.health -= 40>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXX == 0>> + <<if $precociousPuberty == 1>> + <<set $activeSlave.pubertyXX = ($activeSlave.physicalAge+1)>> + <<else>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyXX = 1>> + <</if>> + <</if>> + <</if>> + <<set $surgeryType = "mpregPig">> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<case "mpregDog">> + <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina < 0) && ($activeSlave.mpreg == 0)>> + <<set $cash -= $surgeryCost>> + + <<set $activeSlave.mpreg = 1>> + <<set $activeSlave.eggType = "dog">> + <<set $activeSlave.preg = 0>> + <<set $activeSlave.health -= 40>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXX == 0>> + <<if $precociousPuberty == 1>> + <<set $activeSlave.pubertyXX = ($activeSlave.physicalAge+1)>> + <<else>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyXX = 1>> + <</if>> + <</if>> + <</if>> + <<set $surgeryType = "mpregDog">> + <<include "Surgery Degradation">> + + <<set $dump = $organs.pluck([_o], [_o])>> + <</if>> + <<default>> + Error: OrganType: $organs[_o].type not known. + <</switch>> + + <<set $slaves[_i] = $activeSlave>> + <<break>> + <</if>> + <</for>> + <<if $slaves[_i].amp != 0>> + <<for _l = 0; _l < $limbs.length; _l++>> + <<if ($limbs[_l].ID == $slaves[_i].ID) && ($organs[_o].weeksToCompletion == 0)>> + <<set $activeSlave = $slaves[_i]>> + + <<switch $limbs[_l].type>> + <<case "simple">> + <<set $activeSlave.amp = -1>> + <<set $surgeryType = "basicPLimbs">> + <<case "sex">> + <<set $activeSlave.amp = -2>> + <<set $surgeryType = "sexPLimbs">> + <<case "beauty">> + <<set $activeSlave.amp = -3>> + <<set $surgeryType = "beautyPLimbs">> + <<case "combat">> + <<set $activeSlave.amp = -4>> + <<set $surgeryType = "combatPLimbs">> + <<case "cyber">> + <<set $activeSlave.amp = -5>> + <<set $surgeryType = "cyberPLimbs">> + <</switch>> + + <<set $cash -= $surgeryCost>> + <<set $activeSlave.health -= 10>> + <br><hr> + <<include "Surgery Degradation">> + <<set $dump = $limbs.pluck([_l], [_l])>> + + <<set $slaves[_i] = $activeSlave>> + <<break>> + <</if>> + <</for>> + <</if>> + +<</for>> + +/* This needs to be down here to over-ride any Surgery Degredation calls */ +<<set $nextButton = "Continue">> +<<set $nextLink = "Main">> + +/* Clean-up */ +<<set $organsCompleted = 0>> +<<for _i = 0; _i < $organs.length; _i++>> + <<if $organs[_i].weeksToCompletion == 0>> + <<set $organsCompleted++>> + <</if>> +<</for>> + +<<set $limbsCompleted = 0>> +<<for _i = 0; _i < $limbs.length; _i++>> + <<if $limbs[_i].weeksToCompletion == 0>> + <<set $limbsCompleted++>> + <</if>> +<</for>> + + + diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 8951ae781e1..67f9277450a 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -851,6 +851,7 @@ The fabricator has completed $possessive $activeOrgan.type. <<for $i to 0; $i < $organs.length; $i++>><<if $activeSlave.ID == $organs[$i].ID>><<set $dump to $organs.pluck([$i], [$i])>><<break>><</if>><</for>> <<set $activeSlave.prostate = 1>> <<set $activeSlave.balls to 2>> + <<set $activeSlave.ballType = "human">> <<set $activeSlave.scrotum to 2>> <<set $activeSlave.health -= 20>> <<if $organFarmUpgrade == 2>> @@ -992,7 +993,7 @@ The fabricator has completed $possessive $activeOrgan.type. <<link "Graft on">> <<set $cash -= $surgeryCost>> <<for $i to 0; $i < $organs.length; $i++>><<if $activeSlave.ID == $organs[$i].ID>><<set $dump to $organs.pluck([$i], [$i])>><<break>><</if>><</for>> - <<set $activeSlave.foreskin to $activeSlave.balls>> + <<set $activeSlave.foreskin to $activeSlave.penis>> <<set $activeSlave.health -= 10>> <<if $organFarmUpgrade == 2>> <<set $activeSlave.chem += 10>> @@ -1165,7 +1166,7 @@ The fabricator has completed $possessive $activeOrgan.type. <<set $cash -= $surgeryCost>> <<for $i to 0; $i < $organs.length; $i++>><<if $activeSlave.ID == $organs[$i].ID>><<set $dump to $organs.pluck([$i], [$i])>><<break>><</if>><</for>> <<set $activeSlave.eyes to 1>> - <<set $activeSlave.eyeColor to "pale pink">> + <<set $activeSlave.eyeColor to $activeSlave.origEye>> /* no way to salvage original eye color */ <<set $activeSlave.health -= 20>> <<if $organFarmUpgrade == 2>> diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw index e6c43dd2d5a..0da3d3d7902 100644 --- a/src/uncategorized/salon.tw +++ b/src/uncategorized/salon.tw @@ -8,22 +8,6 @@ $activeSlave.slaveName is seated in the auto salon. $pronounCap is awaiting your artistic pleasure. - -<<if $activeSlave.eyes > -1>> - -$possessiveCap vision is normal, and $pronoun -<<if $activeSlave.eyewear == "none">> - has no eyewear. -<<else>> - is wearing $activeSlave.eyewear. -<</if>> -[[Cosmetic glasses|Salon][$activeSlave.eyewear = "glasses",$cash -= $modCost]] -| [[Blurring glasses|Salon][$activeSlave.eyewear = "blurring glasses",$cash -= $modCost]] -| [[Blurring contacts|Salon][$activeSlave.eyewear = "blurring contacts",$cash -= $modCost]] -| [[None|Salon][$activeSlave.eyewear = "none"]] -<br> //Blurring options are annoying and impede performance on some assignments// - - <br><br> <<if $activeSlave.origEye == "implant">> $pronounCap has artificial eyes, and $pronoun @@ -117,50 +101,6 @@ $possessiveCap vision is normal, and $pronoun $possessiveCap eyes are artificial and can't be set here. <</if>> - -$pronounCap is nearsighted, and $pronoun -<<if $activeSlave.eyewear == "none">> - has no eyewear. -<<else>> - is wearing $activeSlave.eyewear. -<</if>> -[[Cosmetic glasses|Salon][$activeSlave.eyewear = "glasses",$cash -= $modCost]] -| [[Corrective glasses|Salon][$activeSlave.eyewear = "corrective glasses",$cash -= $modCost]] -| [[Corrective contacts|Salon][$activeSlave.eyewear = "corrective contacts",$cash -= $modCost]] -| [[None|Salon][$activeSlave.eyewear = "none"]] -<br> //Nearsightedness will impede performance on some assignments// - -<</if>> - - -$possessiveCap eyes are $activeSlave.eyeColor. - -<br> - -Give $possessive cosmetic contact lenses: - [[Blue|Salon][$activeSlave.eyeColor = "blue",$cash -= $modCost]] - | [[Black|Salon][$activeSlave.eyeColor = "black",$cash -= $modCost]] - | [[Brown|Salon][$activeSlave.eyeColor = "brown",$cash -= $modCost]] - | [[Green|Salon][$activeSlave.eyeColor = "green",$cash -= $modCost]] - | [[Turquoise|Salon][$activeSlave.eyeColor = "turquoise",$cash -= $modCost]] - | [[Sky-blue|Salon][$activeSlave.eyeColor = "sky-blue",$cash -= $modCost]] - | [[Hazel|Salon][$activeSlave.eyeColor = "hazel",$cash -= $modCost]] - | [[Pale-grey|Salon][$activeSlave.eyeColor = "pale-grey",$cash -= $modCost]] - | [[White|Salon][$activeSlave.eyeColor = "white",$cash -= $modCost]] - | [[Pink|Salon][$activeSlave.eyeColor = "pink",$cash -= $modCost]] - | [[Amber|Salon][$activeSlave.eyeColor = "amber",$cash -= $modCost]] - | [[Red|Salon][$activeSlave.eyeColor = "red",$cash -= $modCost]] - | [[Catlike|Salon][$activeSlave.eyeColor = "catlike",$cash -= $modCost]] - | [[Serpent-like|Salon][$activeSlave.eyeColor = "serpent-like",$cash -= $modCost]] - | [[Devilish|Salon][$activeSlave.eyeColor = "devilish",$cash -= $modCost]] - | [[Demonic|Salon][$activeSlave.eyeColor = "demonic",$cash -= $modCost]] - | [[Hypnotic|Salon][$activeSlave.eyeColor = "hypnotic",$cash -= $modCost]] - | [[Heart-shaped|Salon][$activeSlave.eyeColor = "heart-shaped",$cash -= $modCost]] -<br> //Colored contact settings will be applied in addition to eyewear choices.// - - - - <br><br> <<if $activeSlave.makeup == 1>> $pronounCap's wearing minimal makeup. diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw index 3e2a98fc4d2..ba4b49f6943 100644 --- a/src/uncategorized/schoolroomReport.tw +++ b/src/uncategorized/schoolroomReport.tw @@ -200,7 +200,7 @@ <<if ($slaves[_i].entertainSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[_i].entertainSkill > 10))>> <<if ($slaves[_i].analSkill > 10) || ($slaves[_i].anus < 1)>> <<if ($slaves[_i].vaginalSkill > 10) || ($slaves[_i].vagina < 1)>> - <<removeJob $slaves[_i] "learn in the schoolroom">> + <<removeJob $slaves[_i] "schoolroom">> <<set _restedSlaves++, _dI--, _DL-->> <<continue>> <</if>> diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw index e162296b7a1..3210df1b57a 100644 --- a/src/uncategorized/slaveMarkets.tw +++ b/src/uncategorized/slaveMarkets.tw @@ -816,6 +816,7 @@ You're in the area of the slave market that specializes in slaves from within th <</if>> <<elseif $arcologies[$i].FSDegradationist > 20>> They can be depended upon to be terrified into abject submission. + <<include "Degrading Name">> <<if $activeSlave.trust > -10>> <<set $activeSlave.trust -= random(0,10)>> <</if>> @@ -946,6 +947,7 @@ You're in the area of the slave market that specializes in slaves from within th <</if>> <<if $arcologies[$i].FSChattelReligionist > 20>> They're rarely anything but devoted, and sometimes present interesting peccadilloes. + <<set $activeSlave.slaveName = $chattelReligionistSlaveNames.random()>> <<if $activeSlave.devotion < 10>> <<set $activeSlave.devotion += random(0,10)>> <</if>> @@ -958,16 +960,19 @@ You're in the area of the slave market that specializes in slaves from within th <</if>> <<if $arcologies[$i].FSRomanRevivalist > 20>> They've often seen things that drive any squeamishness out of them. + <<set $activeSlave.slaveName = $romanSlaveNames.random()>> <<if random(0,1) == 0>> <<set $activeSlave.sexualQuirk = "unflinching">> <</if>> <<elseif $arcologies[$i].FSEgyptianRevivalist > 20>> They've often done things that give them a distinct appetite for perversion. + <<set $activeSlave.slaveName = $ancientEgyptianSlaveNames.random()>> <<if random(0,1) == 0>> <<set $activeSlave.sexualQuirk = "perverted">> <</if>> <<elseif $arcologies[$i].FSEdoRevivalist > 20>> They have frequently absorbed much culture there. + <<set $activeSlave.slaveName = $edoSlaveNames.random()>> <<set $activeSlave.entertainSkill = Math.clamp($activeSlave.entertainSkill, 35, 100)>> <<elseif $arcologies[$i].FSArabianRevivalist > 20>> They've often been part of large harems in which selflessness is prized. diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw index 02462a92ca5..6516965b892 100644 --- a/src/utility/descriptionWidgets.tw +++ b/src/utility/descriptionWidgets.tw @@ -43,27 +43,51 @@ You have not selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> @@color:cyan;[B]@@ <</if>> <</if>> + <<if $organsCompleted > 0>> +<<for _j = 0; _j < $organs.length; _j++>> + <<set _validHost = 0>> <<set $dumped = 0>> <<for _i = 0; _i < $slaves.length; _i++>> - <<set _Slave = $slaves[_i]>> - <<for _j = 0; _j < $organs.length; _j++>> - <<if ($organs[_j] != 0) && ($organs[_j].ID == _Slave.ID) && ($organs[_j].weeksToCompletion <= 0)>> - <br>@@color:yellow;The fabricator has completed an organ for@@ <span id="name"><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves[" + _i + "]]]">></span>, @@color:yellow; which is ready to be implanted.@@ - <</if>> - <</for>> + <<set _Slave = $slaves[_i]>> + <<if ($organs[_j] != 0) && ($organs[_j].ID == _Slave.ID)>> + <<set _validHost = 1>> + <<if ($organs[_j].weeksToCompletion <= 0)>> + <br>@@color:yellow;The fabricator has completed an organ for@@ <span id="name"><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves[" + _i + "]]]">></span>, @@color:yellow; which is ready to be implanted.@@ + <</if>> + <</if>> <</for>> + <<if _validHost == 0>> + <<set $dump = $organs.pluck([_j], [_j])>> + <<set _j-->> + <</if>> +<</for>> <</if>> <<if $limbsCompleted > 0>> +<<for _j = 0; _j < $limbs.length; _j++>> + <<set _validHost = 0>> <<set $dumped = 0>> <<for _i = 0; _i < $slaves.length; _i++>> - <<set _Slave = $slaves[_i]>> - <<for _j = 0; _j < $limbs.length; _j++>> - <<if ($limbs[_j] != 0) && ($limbs[_j].ID == _Slave.ID) && ($limbs[_j].weeksToCompletion == 0)>> - <br>@@color:yellow;The facility has completed a set of limbs for@@ <span id="name"><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves[" + _i + "]]]">></span>, @@color:yellow; which is ready to be attached.@@ - <</if>> - <</for>> + <<set _Slave = $slaves[_i]>> + <<if ($limbs[_j] != 0) && ($limbs[_j].ID == _Slave.ID)>> + <<set _validHost = 1>> + <<if ($limbs[_j].weeksToCompletion <= 0)>> + <br>@@color:yellow;The facility has completed a set of limbs for@@ <span id="name"><<print "[[_Slave.slaveName|Slave Interact][$activeSlave = $slaves[" + _i + "]]]">></span>, @@color:yellow; which is ready to be attached.@@ + <</if>> + <</if>> <</for>> + <<if _validHost == 0>> + <<set $dump = $organs.pluck([_j], [_j])>> + <<set _j-->> + <</if>> +<</for>> +<</if>> +<<if ($organsCompleted > 0) && ($limbsCompleted > 0)>> + <br>[[Implant and Attach|Multiple Organ Implant]] @@color:yellow;all organs and limbs that are ready.@@ +<<elseif ($organsCompleted > 1)>> + <br>[[Implant|Multiple Organ Implant]] @@color:yellow;all organs that are ready for implantation.@@ +<<elseif ($limbsCompleted > 1)>> + <br>[[Attach|Multiple Organ Implant]] @@color:yellow;all sets of limbs that are ready to be attached.@@ <</if>> <br> <span id="buySlaves"><strong><<link "Buy Slaves">><<goto "Buy Slaves">><</link>></strong></span> @@color:cyan;[S]@@ @@ -3789,6 +3813,8 @@ $pronounCap's got a $pronounCap is too young to have pubic hair. <<elseif ($activeSlave.pubicHStyle == "hairless")>> $pronounCap's naturally smooth and hairless. +<<elseif ($activeSlave.pubicHStyle == "bald")>> + $pronounCap is no longer able to grow pubic hair. <<elseif ($activeSlave.pubicHStyle == "waxed")>> <<if $activeSlave.fuckdoll > 0>> $possessiveCap pubic hair has been removed to prevent chafing. -- GitLab