diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index af21589e4743d35a015245be47c0d45a95ce9f90..ceba4417954b35fb8c4ac731fc6dbfd05f901ceb 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,14 @@ 3/08/2018 + 386 + -tweaked childgen to only random face and int for playerXmarked if the child is below the minimum value + -migrated mindbroken kicker cases from slaveAssignmentsReport to saTakeClasses and saStayConfined + -hyperpreg and overwhelmingly female hormone balances now prevent oversized breasts from shrinking + -slaves below 10 are now more resistant to developing fetishes + -fixed bad initialization + -various little text corrections + 385 -fixed itt noted errors -lowercasedonkey's tabed slave overview (find it in options) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index a370dcebf0f3a29554d25251dc0cbec7d207ede3..9ee3b2735ef8aedbbad196b544e923d5cb2c275f 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -342,8 +342,8 @@ You should have received a copy of the GNU General Public License along with thi <<set $headGirlSoftensFlaws = 1>> <<set $headGirlTrainsParaphilias = 1>> <<set $retainCareer = 1>> - <<set useSlaveSummaryTabs = 0>> - <<set useSlaveSummaryOverviewTab = 0>> + <<set $useSlaveSummaryTabs = 0>> + <<set $useSlaveSummaryOverviewTab = 0>> <<include "Init Rules">> diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw index 31757956f088bd031049a91d430d5d6a59a56360..07cc52e3ad9e4c2f632ac8ce92b574e04dbc41c8 100644 --- a/src/pregmod/generateChild.tw +++ b/src/pregmod/generateChild.tw @@ -441,7 +441,7 @@ /* Int and facial attractiveness changes to bolster eugenics and add negatives for excessive inbreeding */ <<if $activeSlave.mother == -1 && $PC.pregSource == -1>> - <<set $activeSlave.face = random(50,100)>> + <<set $activeSlave.face = random(90,100)>> <<set $activeSlave.intelligence = either(2, 2, 2, 2, 3, 3)>> <<elseif $activeSlave.mother == -1>> <<if $PC.pregSource > 0>> @@ -466,29 +466,31 @@ <<set $activeSlave.intelligence = either(1, 2, 2, 2, 2, 3, 3)>> <</if>> <<elseif $activeSlave.father == -1>> - <<if $mom.breedingMark == 1>> - <<set $activeSlave.face = random(60,100)>> - <<set $activeSlave.intelligence = either(2, 2, 2, 2, 3, 3)>> + <<if $PC.face > $mergeMom.face>> + <<set $activeSlave.face = random($mergeMom.face, $PC.face)>> <<else>> - <<if $PC.face > $mergeMom.face>> - <<set $activeSlave.face = random($mergeMom.face, $PC.face)>> - <<else>> - <<set $activeSlave.face = either($mergeMom.face-10, $mergeMom.face+10)>> + <<set $activeSlave.face = either($mergeMom.face-10, $mergeMom.face+10)>> + <</if>> + <<if $PC.intelligence > $mergeMom.intelligence>> + <<set $activeSlave.intelligence = random($mergeMom.intelligence, $PC.intelligence)>> + <<else>> + <<set $activeSlave.intelligence = $mergeMom.intelligence>> + <</if>> + <<if $mom.breedingMark == 1>> + <<if $activeSlave.face < 60>> + <<set $activeSlave.face = random(60,100)>> <</if>> - <<if $PC.intelligence > $mergeMom.intelligence>> - <<set $activeSlave.intelligence = random($mergeMom.intelligence, $PC.intelligence)>> - <<else>> - <<set $activeSlave.intelligence = $mergeMom.intelligence>> + <<if $activeSlave.intelligence < 2>> + <<set $activeSlave.intelligence = either(2, 2, 2, 2, 3, 3)>> <</if>> - <<if $inbreeding == 1>> - <<if $activeSlave.face > -100 && random(1,100) > 60>> - <<set $activeSlave.face -= random(2,20)>> - <</if>> - <<if $activeSlave.intelligence > -3 && random(1,100) < 40>> + <<elseif $inbreeding == 1>> + <<if $activeSlave.face > -100 && random(1,100) > 60>> + <<set $activeSlave.face -= random(2,20)>> + <</if>> + <<if $activeSlave.intelligence > -3 && random(1,100) < 40>> + <<set $activeSlave.intelligence -= 1>> + <<if $activeSlave.intelligence > -3 && random(1,100) < 20>> <<set $activeSlave.intelligence -= 1>> - <<if $activeSlave.intelligence > -3 && random(1,100) < 20>> - <<set $activeSlave.intelligence -= 1>> - <</if>> <</if>> <</if>> <</if>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index ebc116cad0e0be953ff852397810b076f1fe6254..60cc112a0bdc60c473060d103e1437d7180afe09 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -795,11 +795,11 @@ <</if>> -<<if ndef useSlaveSummaryTabs>> - <<set useSlaveSummaryTabs = 0>> +<<if ndef $useSlaveSummaryTabs>> + <<set $useSlaveSummaryTabs = 0>> <</if>> -<<if ndef useSlaveSummaryOverviewTab>> - <<set useSlaveSummaryOverviewTab = 0>> +<<if ndef $useSlaveSummaryOverviewTab>> + <<set $useSlaveSummaryOverviewTab = 0>> <</if>> <<if ndef $arcologies[0].FSAztecRevivalist>> diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw index 09737e15a6081c4791a370f86755553a624f168c..3ac718c1a12b3ac91f44a9822101f9962d298825 100644 --- a/src/uncategorized/arcade.tw +++ b/src/uncategorized/arcade.tw @@ -100,7 +100,7 @@ $arcadeNameCaps <br> <<if $arcadeUpgradeMenials == 1>> <<if $fuckdolls > 0>> - Rows of menial Fuckdolls are shackled to the floor in positions that force them to present all their holes. Their latex-clad bodies struggle in their restraints when fucked, offering a different $arcadeName experience. + Rows of menial Fuckdolls are shackled to the floor in positions that force them to present all their holes. Their latex-clad bodies struggle in their restraints when fucked, offering a different arcade experience. <<else>> In addition to the low walls that house inmates, there are also rows of simple shackles that allow menial Fuckdolls to be restrained here to add still more rapeable holes to $arcadeName's capacity. They're empty at present. <</if>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index e505f2dd8a08709cf5ecce510dd695f65582a30b..a4b2e5348223c9385e3f95c84f25d903814ea5c7 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -6110,6 +6110,7 @@ <<if ($slaves[$i].boobs > 30000+($slaves[$i].muscles*100))>> <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>> <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>> + <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 400>> <<if ($slaves[$i].boobs > 30000+($slaves[$i].muscles*100))>> Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 30000+($slaves[$i].muscles*100), 50000)>> @@ -6120,6 +6121,7 @@ <</if>> <</if>> <</if>> + <</if>> <<if ($slaves[$i].boobs > 40000)>> Her immense breasts are so big they pin her to the floor, taking the weight off her body. <<if $slaves[$i].devotion <= 50>> @@ -6166,6 +6168,7 @@ <<if ($slaves[$i].boobs > 5000+($slaves[$i].muscles*10))>> <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>> <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>> + <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 400>> <<if ($slaves[$i].boobs > 5000+($slaves[$i].muscles*10))>> Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 5000+($slaves[$i].muscles*10), 50000)>> @@ -6176,6 +6179,7 @@ <</if>> <</if>> <</if>> + <</if>> <<if ($slaves[$i].boobs > 40000)>> Her titanic breasts are so massive they dwarf her body. She has no choice but to accept immobility. <<elseif ($slaves[$i].boobs > 20000)>> @@ -6231,6 +6235,7 @@ <<if ($slaves[$i].boobs > 10000+($slaves[$i].muscles*20))>> <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>> <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>> + <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 400>> <<if ($slaves[$i].boobs > 10000+($slaves[$i].muscles*20))>> Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 10000+($slaves[$i].muscles*20), 50000)>> @@ -6241,6 +6246,7 @@ <</if>> <</if>> <</if>> + <</if>> <<if ($slaves[$i].boobs > 40000)>> Her immense breasts are so huge they rest upon the floor even when she tries to stand, taking the weight off her small body. <<if $slaves[$i].devotion <= 50>> @@ -6296,6 +6302,7 @@ <<if ($slaves[$i].boobs > 20000+($slaves[$i].muscles*50))>> <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyRestraintsSetting < 2) || $arcologies[0].FSAssetExpansionistResearch == 0>> <<if ($slaves[$i].drugs != "breast injections" && $slaves[$i].drugs != "intensive breast injections" && $arcologies[0].FSAssetExpansionistResearch == 0)>> + <<if $slaves[$i].bellyPreg < 300000 && $slaves[$i].hormoneBalance < 400>> <<if ($slaves[$i].boobs > 20000+($slaves[$i].muscles*50))>> Her breasts are larger than her body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ <<set $slaves[$i].boobs = Math.clamp($slaves[$i].boobs-25, 20000+($slaves[$i].muscles*50), 50000)>> @@ -6306,6 +6313,7 @@ <</if>> <</if>> <</if>> + <</if>> <<if ($slaves[$i].boobs > 25000)>> Her immense breasts are so big they pin her to the floor, taking the weight off her youthful body. She finds pulling them along @@.mediumorchid;mildly annoying.@@ <<set $slaves[$i].devotion -= 1>> diff --git a/src/uncategorized/saStayConfined.tw b/src/uncategorized/saStayConfined.tw index 087fc68a9b5c57b29623877e5b8ea77c05841451..d1ff670255494fe687b5f1c129acbd5adfa4ac34 100644 --- a/src/uncategorized/saStayConfined.tw +++ b/src/uncategorized/saStayConfined.tw @@ -2,6 +2,7 @@ <<SlavePronouns $slaves[$i]>> +<<if $slaves[$i].fetish != "mindbroken">> <<if ($slaves[$i].devotion < -50)>> is kept in solitary confinement whenever $pronoun is not being forced to do something else. $pronounCap still hates $possessive place in the world, but being forced to rely on slave life as $possessive only human contact @@.hotpink;grinds down $possessive resistance.@@ <<set $slaves[$i].devotion += 2>> @@ -31,8 +32,18 @@ The stress of confinement @@.red;damages $possessive health@@. <<set $slaves[$i].health -= 10>> -<<if ($slaves[$i].sentence == 0) && (($slaves[$i].devotion > 20) || (($slaves[$i].devotion >= -20) && ($slaves[$i].trust < -20)) || (($slaves[$i].devotion >= -50) && ($slaves[$i].trust < -50)))>> - $pronounCap is now willing to @@.hotpink;do as $pronoun's told@@, so @@.yellow;$possessive assignment has defaulted to rest.@@ +<<else>> + is oblivious to $possessive confinement. +<</if>> + +<<if ($slaves[$i].sentence == 0) && (($slaves[$i].devotion > 20) || (($slaves[$i].devotion >= -20) && ($slaves[$i].trust < -20)) || (($slaves[$i].devotion >= -50) && ($slaves[$i].trust < -50)) || ($slaves[$i].fetish == "mindbroken"))>> + $pronounCap + <<if $slaves[$i].fetish == "mindbroken">> + broken mind hinges entirely on other's guidance, + <<else>> + is now willing to @@.hotpink;do as $pronoun's told@@, + <</if>> + so @@.yellow;$possessive assignment has defaulted to rest.@@ <<if $slaves[$i].assignment == "be confined in the cellblock">> <<set _brokenSlaves++, _DL--, _dI-->> <</if>> diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw index 10c5ab07135e547307e0e914774dc69d6867cec0..dae37313d594e94f438aa7b9ddda33a385902b13 100644 --- a/src/uncategorized/saTakeClasses.tw +++ b/src/uncategorized/saTakeClasses.tw @@ -4,7 +4,12 @@ <<set _learning = 1>> -<<if ($slaves[$i].assignment == "learn in the schoolroom")>> +<<if $slaves[$i].fetish == "mindbroken">> + is no longer mentally capable and @@.yellow;has been dropped from class.@@ + <<if $slaves[$i].assignment == "take classes">> + <<removeJob $slaves[$i] "take classes">> + <</if>> +<<elseif ($slaves[$i].assignment == "learn in the schoolroom")>> <<if ($Schoolteacher != 0)>> <<set _seed = $Schoolteacher.intelligence+$Schoolteacher.intelligenceImplant>> <<if ($Schoolteacher.visualAge > 35)>> @@ -60,169 +65,172 @@ <</if>> <</if>> -<<if ($slaves[$i].intelligence >= 3)>> - $pronounCap is a genius, - <<set _learning += 1>> -<<elseif ($slaves[$i].intelligence >= 2)>> - $pronounCap is highly intelligent - <<set _learning += 1>> -<<elseif ($slaves[$i].intelligence >= 1)>> - $pronounCap is of above average intelligence - <<if (random(1,100) < 70)>> +<<if $slaves[$i].fetish != "mindbroken">> + <<if ($slaves[$i].intelligence >= 3)>> + $pronounCap is a genius, <<set _learning += 1>> - <</if>> -<<elseif ($slaves[$i].intelligence >= 0)>> - $pronounCap is of average intelligence - <<if (random(1,100) < 50)>> + <<elseif ($slaves[$i].intelligence >= 2)>> + $pronounCap is highly intelligent <<set _learning += 1>> - <</if>> -<<else>> - <<set _seed = 50 + $slaves[$i].intelligence*20>> - <<if ($schoolroomUpgradeRemedial == 1) && random(1,100) < 50>> - <<set _seed = 50>> - <</if>> - <<if (random(1,100) < _seed)>> - <<set _learning += 1>> - <</if>> - <<if ($slaves[$i].intelligence >= -1)>> - $pronounCap is of below average intelligence - <<elseif ($slaves[$i].intelligence >= -2)>> - $pronounCap is quite stupid + <<elseif ($slaves[$i].intelligence >= 1)>> + $pronounCap is of above average intelligence + <<if (random(1,100) < 70)>> + <<set _learning += 1>> + <</if>> + <<elseif ($slaves[$i].intelligence >= 0)>> + $pronounCap is of average intelligence + <<if (random(1,100) < 50)>> + <<set _learning += 1>> + <</if>> <<else>> - $pronounCap is an imbecile, + <<set _seed = 50 + $slaves[$i].intelligence*20>> + <<if ($schoolroomUpgradeRemedial == 1) && random(1,100) < 50>> + <<set _seed = 50>> + <</if>> + <<if (random(1,100) < _seed)>> + <<set _learning += 1>> + <</if>> + <<if ($slaves[$i].intelligence >= -1)>> + $pronounCap is of below average intelligence + <<elseif ($slaves[$i].intelligence >= -2)>> + $pronounCap is quite stupid + <<else>> + $pronounCap is an imbecile, + <</if>> <</if>> -<</if>> -<<if ($slaves[$i].devotion > 95)>> - and worshipful of you, - <<set _learning += 1>> -<<elseif ($slaves[$i].devotion > 50)>> - and devoted to you, - <<if (random(1,100) < 70)>> - <<set _learning += 1>> - <</if>> -<<elseif ($slaves[$i].devotion > 20)>> - and obedient to you, - <<if (random(1,100) < 50)>> - <<set _learning += 1>> - <</if>> -<<elseif ($slaves[$i].trust < -20)>> - and frightened of you, - <<if (random(1,100) < 50)>> + <<if ($slaves[$i].devotion > 95)>> + and worshipful of you, <<set _learning += 1>> + <<elseif ($slaves[$i].devotion > 50)>> + and devoted to you, + <<if (random(1,100) < 70)>> + <<set _learning += 1>> + <</if>> + <<elseif ($slaves[$i].devotion > 20)>> + and obedient to you, + <<if (random(1,100) < 50)>> + <<set _learning += 1>> + <</if>> + <<elseif ($slaves[$i].trust < -20)>> + and frightened of you, + <<if (random(1,100) < 50)>> + <<set _learning += 1>> + <</if>> + <<else>> + and neither likes you nor is afraid of you, <</if>> -<<else>> - and neither likes you nor is afraid of you, -<</if>> -<<if (_learning <= 1)>> - and $pronoun learns slowly this week. -<<elseif (_learning == 2)>> - and $pronoun does well with $possessive studies this week. -<<else>> - and $pronoun is perfectly studious this week. -<</if>> + <<if (_learning <= 1)>> + and $pronoun learns slowly this week. + <<elseif (_learning == 2)>> + and $pronoun does well with $possessive studies this week. + <<else>> + and $pronoun is perfectly studious this week. + <</if>> -<<set _seed = 0>> -<<set $skillIncrease = 10+$slaves[$i].intelligence>> -<<for _j = 0; _j < _learning; _j++>> - <<if ($slaves[$i].devotion <= 20) && (_seed == 0)>> - Since $pronoun is wanting in basic obedience, $pronoun suffers through courses on @@.hotpink;$possessive place@@ in the Free Cities world. - <<set $slaves[$i].devotion += 10>> - <<set _seed = 1>> - <<elseif ($slaves[$i].oralSkill <= 10)>> - Since $pronoun is orally incompetent, $pronoun is taught basic gag reflex suppression exercises and other simple oral things. - <<OralSkillIncrease $slaves[$i]>> - <<elseif ($slaves[$i].vaginalSkill <= 10) && ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>> - Since $pronoun is unskilled at using $possessive pussy, $pronoun is taught kegel exercises and other simple vaginal skills. - <<VaginalSkillIncrease $slaves[$i]>> - <<elseif ($slaves[$i].vaginalSkill <= 10) && ($slaves[$i].vagina >= 0)>> - Since $pronoun is unskilled at using $possessive pussy and not permitted to learn through practice, $pronoun is taught kegel exercises, vaginal basics and several new positions. - <<VaginalSkillIncrease $slaves[$i]>> - <<elseif ($slaves[$i].analSkill <= 10) && ($slaves[$i].anus > 0) && canDoAnal($slaves[$i])>> - Since $pronoun is a novice at taking it up $possessive butt, $pronoun is taught relaxation exercises and other simple anal basics. - <<AnalSkillIncrease $slaves[$i]>> - <<elseif ($slaves[$i].analSkill <= 10) && ($slaves[$i].anus >= 0)>> - Since $pronoun is a novice at taking it up $possessive butt and not permitted to learn through practice, $pronoun is taught relaxation exercises and other simple anal basics. - <<AnalSkillIncrease $slaves[$i]>> - <<elseif ($slaves[$i].whoreSkill <= 10)>> - Since $pronoun has little idea what's involved in selling $possessive body, $pronoun is taught basic safety practices and other simple prostitution skills. - <<WhoreSkillIncrease $slaves[$i]>> - <<elseif ($slaves[$i].entertainSkill <= 10)>> - Since $possessive entertainment value is limited to $possessive holes, $pronoun is taught simple conversational skills and other courtesan's essentials. - <<EntertainSkillIncrease $slaves[$i]>> - <<elseif ($schoolroomUpgradeSkills == 1)>> - <<if ($slaves[$i].oralSkill <= 30)>> - Having completed the basic sex slave curriculum, $pronoun studies more advanced ways to use $possessive lips and tongue to please cocks, cunts, and asses. + <<set _seed = 0>> + <<set $skillIncrease = 10+$slaves[$i].intelligence>> + <<for _j = 0; _j < _learning; _j++>> + <<if ($slaves[$i].devotion <= 20) && (_seed == 0)>> + Since $pronoun is wanting in basic obedience, $pronoun suffers through courses on @@.hotpink;$possessive place@@ in the Free Cities world. + <<set $slaves[$i].devotion += 10>> + <<set _seed = 1>> + <<elseif ($slaves[$i].oralSkill <= 10)>> + Since $pronoun is orally incompetent, $pronoun is taught basic gag reflex suppression exercises and other simple oral things. <<OralSkillIncrease $slaves[$i]>> - <<elseif ($slaves[$i].whoreSkill <= 30)>> - Having completed the basic sex slave curriculum, $pronoun studies intermediate prostitution, including how to stay as safe as possible and maximize $possessive efficiency. - <<WhoreSkillIncrease $slaves[$i]>> - <<elseif ($slaves[$i].entertainSkill <= 30)>> - Having completed the basic sex slave curriculum, $pronoun studies courtesanship, including social dynamics and flirtation more subtle than straightforward begging for sex. - <<EntertainSkillIncrease $slaves[$i]>> - <<elseif ($slaves[$i].vaginalSkill <= 30) && ($slaves[$i].vagina >= 0)>> - Having completed the basic sex slave curriculum, $pronoun studies more advanced techniques and exotic positions to make use of $possessive <<if $slaves[$i].vagina == 0>>virgin pussy for use in $possessive first time<<else>>pussy<</if>>. + <<elseif ($slaves[$i].vaginalSkill <= 10) && ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>> + Since $pronoun is unskilled at using $possessive pussy, $pronoun is taught kegel exercises and other simple vaginal skills. <<VaginalSkillIncrease $slaves[$i]>> - <<elseif ($slaves[$i].analSkill <= 30)>> - Having completed the basic sex slave curriculum, $pronoun studies more advanced techniques and exotic positions to make use of $possessive <<if $slaves[$i].vagina == 0>>virgin ass for use in $possessive first time<<else>>ass<</if>>. + <<elseif ($slaves[$i].vaginalSkill <= 10) && ($slaves[$i].vagina >= 0)>> + Since $pronoun is unskilled at using $possessive pussy and not permitted to learn through practice, $pronoun is taught kegel exercises, vaginal basics and several new positions. + <<VaginalSkillIncrease $slaves[$i]>> + <<elseif ($slaves[$i].analSkill <= 10) && ($slaves[$i].anus > 0) && canDoAnal($slaves[$i])>> + Since $pronoun is a novice at taking it up $possessive butt, $pronoun is taught relaxation exercises and other simple anal basics. + <<AnalSkillIncrease $slaves[$i]>> + <<elseif ($slaves[$i].analSkill <= 10) && ($slaves[$i].anus >= 0)>> + Since $pronoun is a novice at taking it up $possessive butt and not permitted to learn through practice, $pronoun is taught relaxation exercises and other simple anal basics. <<AnalSkillIncrease $slaves[$i]>> + <<elseif ($slaves[$i].whoreSkill <= 10)>> + Since $pronoun has little idea what's involved in selling $possessive body, $pronoun is taught basic safety practices and other simple prostitution skills. + <<WhoreSkillIncrease $slaves[$i]>> + <<elseif ($slaves[$i].entertainSkill <= 10)>> + Since $possessive entertainment value is limited to $possessive holes, $pronoun is taught simple conversational skills and other courtesan's essentials. + <<EntertainSkillIncrease $slaves[$i]>> + <<elseif ($schoolroomUpgradeSkills == 1)>> + <<if ($slaves[$i].oralSkill <= 30)>> + Having completed the basic sex slave curriculum, $pronoun studies more advanced ways to use $possessive lips and tongue to please cocks, cunts, and asses. + <<OralSkillIncrease $slaves[$i]>> + <<elseif ($slaves[$i].whoreSkill <= 30)>> + Having completed the basic sex slave curriculum, $pronoun studies intermediate prostitution, including how to stay as safe as possible and maximize $possessive efficiency. + <<WhoreSkillIncrease $slaves[$i]>> + <<elseif ($slaves[$i].entertainSkill <= 30)>> + Having completed the basic sex slave curriculum, $pronoun studies courtesanship, including social dynamics and flirtation more subtle than straightforward begging for sex. + <<EntertainSkillIncrease $slaves[$i]>> + <<elseif ($slaves[$i].vaginalSkill <= 30) && ($slaves[$i].vagina >= 0)>> + Having completed the basic sex slave curriculum, $pronoun studies more advanced techniques and exotic positions to make use of $possessive <<if $slaves[$i].vagina == 0>>virgin pussy for use in $possessive first time<<else>>pussy<</if>>. + <<VaginalSkillIncrease $slaves[$i]>> + <<elseif ($slaves[$i].analSkill <= 30)>> + Having completed the basic sex slave curriculum, $pronoun studies more advanced techniques and exotic positions to make use of $possessive <<if $slaves[$i].vagina == 0>>virgin ass for use in $possessive first time<<else>>ass<</if>>. + <<AnalSkillIncrease $slaves[$i]>> + <</if>> <</if>> - <</if>> -<</for>> + <</for>> -<<if ($slaves[$i].intelligenceImplant < 1) || ($slaves[$i].intelligenceImplant > 1)>> - $pronounCap makes some progress towards a basic education. - <<set $slaves[$i].intelligenceImplant += 0.1*_learning>> - <<if ($slaves[$i].intelligenceImplant >= 1)>> - <<set $slaves[$i].intelligenceImplant = 1>> - $pronounCap has completed a course of slave education, and for most purposes $pronoun is now @@.deepskyblue;more intelligent.@@ - <<if ($slaves[$i].intelligence < 3)>> - <<set $slaves[$i].intelligence += 1>> + <<if ($slaves[$i].intelligenceImplant < 1) || ($slaves[$i].intelligenceImplant > 1)>> + $pronounCap makes some progress towards a basic education. + <<set $slaves[$i].intelligenceImplant += 0.1*_learning>> + <<if ($slaves[$i].intelligenceImplant >= 1)>> + <<set $slaves[$i].intelligenceImplant = 1>> + $pronounCap has completed a course of slave education, and for most purposes $pronoun is now @@.deepskyblue;more intelligent.@@ + <<if ($slaves[$i].intelligence < 3)>> + <<set $slaves[$i].intelligence += 1>> + <</if>> <</if>> <</if>> -<</if>> -<<if ($slaves[$i].intelligenceImplant == 1)>> -<<if $slaves[$i].voice != 0>> - <<if ($slaves[$i].intelligence > random(-4,4))>> - <<if ($schoolroomUpgradeLanguage == 0)>> - <<if ($slaves[$i].accent > 3)>> - $pronounCap has @@.green;learned some $language,@@ and can make $possessive point with some gesturing, though $pronoun speaks $language horribly. + <<if ($slaves[$i].intelligenceImplant == 1)>> + <<if $slaves[$i].voice != 0>> + <<if ($slaves[$i].intelligence > random(-4,4))>> + <<if ($schoolroomUpgradeLanguage == 0)>> + <<if ($slaves[$i].accent > 3)>> + $pronounCap has @@.green;learned some $language,@@ and can make $possessive point with some gesturing, though $pronoun speaks $language horribly. + <<set $slaves[$i].accent -= 1>> + <<if $slaves[$i].speechRules == "language lessons">> + <<set $slaves[$i].speechRules = "accent elimination">> + <</if>> + <<elseif ($slaves[$i].accent == 3)>> + $pronounCap has @@.green;learned functional $language,@@ and can make <<print $object>>self understood, though $possessive $slaves[$i].nationality accent is still quite heavy. <<set $slaves[$i].accent -= 1>> - <<if $slaves[$i].speechRules == "language lessons">> - <<set $slaves[$i].speechRules = "accent elimination">> <</if>> - <<elseif ($slaves[$i].accent == 3)>> - $pronounCap has @@.green;learned functional $language,@@ and can make <<print $object>>self understood, though $possessive $slaves[$i].nationality accent is still quite heavy. - <<set $slaves[$i].accent -= 1>> + <<else>> + <<if ($slaves[$i].accent > 3)>> + $pronounCap has @@.green;learned some $language,@@ and can make $possessive point with some gesturing, though $pronoun speaks $language horribly. + <<set $slaves[$i].accent -= 1>> + <<elseif ($slaves[$i].accent >= 2)>> + $pronounCap has @@.green;learned decent $language,@@ though $pronoun retains enough of $possessive $slaves[$i].nationality accent to make $possessive voice distinctly sexy. + <<set $slaves[$i].accent = 1>> + <</if>> <</if>> - <<else>> - <<if ($slaves[$i].accent > 3)>> - $pronounCap has @@.green;learned some $language,@@ and can make $possessive point with some gesturing, though $pronoun speaks $language horribly. - <<set $slaves[$i].accent -= 1>> - <<elseif ($slaves[$i].accent >= 2)>> - $pronounCap has @@.green;learned decent $language,@@ though $pronoun retains enough of $possessive $slaves[$i].nationality accent to make $possessive voice distinctly sexy. - <<set $slaves[$i].accent = 1>> <</if>> <</if>> <</if>> -<</if>> -<</if>> -<<if ($slaves[$i].intelligenceImplant == 1) && ($slaves[$i].assignment == "take classes")>> -<<if ($slaves[$i].voice == 0) || ($slaves[$i].accent <= 1) || (($schoolroomUpgradeLanguage == 0) && ($slaves[$i].accent <= 2))>> -<<if ($slaves[$i].oralSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].oralSkill > 10))>> -<<if ($slaves[$i].whoreSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].whoreSkill > 10))>> -<<if ($slaves[$i].entertainSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].entertainSkill > 10))>> -<<if ($slaves[$i].analSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].analSkill > 10))>> -<<if ($slaves[$i].vaginalSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].vaginalSkill > 10)) || ($slaves[$i].vagina < 0)>> - $pronounCap can learn little from further classes, so @@.yellow;$possessive assignment has defaulted to rest.@@ - <<removeJob $slaves[$i] "take classes">> -<</if>> -<</if>> -<</if>> -<</if>> -<</if>> -<</if>> + + <<if ($slaves[$i].intelligenceImplant == 1) && ($slaves[$i].assignment == "take classes")>> + <<if ($slaves[$i].voice == 0) || ($slaves[$i].accent <= 1) || (($schoolroomUpgradeLanguage == 0) && ($slaves[$i].accent <= 2))>> + <<if ($slaves[$i].oralSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].oralSkill > 10))>> + <<if ($slaves[$i].whoreSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].whoreSkill > 10))>> + <<if ($slaves[$i].entertainSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].entertainSkill > 10))>> + <<if ($slaves[$i].analSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].analSkill > 10))>> + <<if ($slaves[$i].vaginalSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].vaginalSkill > 10)) || ($slaves[$i].vagina < 0)>> + $pronounCap can learn little from further classes, so @@.yellow;$possessive assignment has defaulted to rest.@@ + <<removeJob $slaves[$i] "take classes">> + <</if>> + <</if>> + <</if>> + <</if>> + <</if>> + <</if>> + <</if>> <</if>> diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw index 515eb1a17919766ea3c3ddbd4048a1bdef2c91a8..4e4842320cbe4a9391d10019895ba029bad0c068 100644 --- a/src/uncategorized/schoolroomReport.tw +++ b/src/uncategorized/schoolroomReport.tw @@ -176,23 +176,29 @@ <<set $slaves[$i].livingRules = "normal">> <</if>> /% Education done? Has to be here before we run the SA's or there will be double entries for slave %/ - <<if ($slaves[$i].intelligenceImplant == 1)>> - <<if ($slaves[$i].voice == 0) || ($slaves[$i].accent <= 1) || (($schoolroomUpgradeLanguage == 0) && ($slaves[$i].accent <= 2))>> - <<if ($slaves[$i].oralSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].oralSkill > 10))>> - <<if ($slaves[$i].whoreSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].whoreSkill > 10))>> - <<if ($slaves[$i].entertainSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].entertainSkill > 10))>> - <<if ($slaves[$i].analSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].analSkill > 10))>> - <<if ($slaves[$i].vaginalSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].vaginalSkill > 10)) || ($slaves[$i].vagina < 0)>> - <br><br>''__@@.pink;$slaves[$i].slaveName@@__'' can learn little from further classes, so @@.yellow;her assignment has defaulted to rest.@@ + <<if $slaves[$i].fetish == "mindbroken">> <<removeJob $slaves[$i] "learn in the schoolroom">> <<set _restedSlaves++, _dI--, _DL-->> <<continue>> - <</if>> - <</if>> - <</if>> - <</if>> - <</if>> - <</if>> + <<else>> + <<if ($slaves[$i].intelligenceImplant == 1)>> + <<if ($slaves[$i].voice == 0) || ($slaves[$i].accent <= 1) || (($schoolroomUpgradeLanguage == 0) && ($slaves[$i].accent <= 2))>> + <<if ($slaves[$i].oralSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].oralSkill > 10))>> + <<if ($slaves[$i].whoreSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].whoreSkill > 10))>> + <<if ($slaves[$i].entertainSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].entertainSkill > 10))>> + <<if ($slaves[$i].analSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].analSkill > 10))>> + <<if ($slaves[$i].vaginalSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].vaginalSkill > 10)) || ($slaves[$i].vagina < 0)>> + <br><br>''__@@.pink;$slaves[$i].slaveName@@__'' can learn little from further classes, so @@.yellow;her assignment has defaulted to rest.@@ + <<removeJob $slaves[$i] "learn in the schoolroom">> + <<set _restedSlaves++, _dI--, _DL-->> + <<continue>> + <</if>> + <</if>> + <</if>> + <</if>> + <</if>> + <</if>> + <</if>> <</if>> <<if $showEWD != 0>> <br><br> diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw index 782476422d38050e308b18eb8cb7a567cda5a6f1..2931ae24004f23ea0311a258606615d2f0712e67 100644 --- a/src/uncategorized/slaveAssignmentsReport.tw +++ b/src/uncategorized/slaveAssignmentsReport.tw @@ -260,21 +260,6 @@ <<set $Concubine = $slaves[$i], $fuckSlaves++>> <<case "serve in the master suite" "please you">> <<set $fuckSlaves++>> -<<case "take classes">> - <<if $slaves[$i].fetish == "mindbroken">> - <<removeJob $slaves[$i] "take classes">> - ''__@@.pink;$slaves[$i].slaveName@@__'' is no longer mentally capable and @@.yellow;has been dropped from class.@@ - <</if>> -<<case "learn in the schoolroom">> - <<if $slaves[$i].fetish == "mindbroken">> - <<removeJob $slaves[$i] "learn in the schoolroom">> - ''__@@.pink;$slaves[$i].slaveName@@__'' is no longer mentally capable and @@.yellow;has been dropped from class.@@ - <</if>> -<<case "be confined in the cellblock">> - <<if $slaves[$i].fetish == "mindbroken">> - <<removeJob $slaves[$i] "be confined in the cellblock">> - ''__@@.pink;$slaves[$i].slaveName@@__'' has mentally broken and thus can not be broken further. @@.yellow;She has been released from the cellblock.@@ - <</if>> <</switch>> <<if $Lurcher>> diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index 2f9efc0e72b9ac1276afb1ec62acd80c99815f0a..398a7baae0b956532a22501c325a6551c1b4fcf9 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -1955,7 +1955,14 @@ <<widget "fetishChangeChance">> <<if $args[0].clitSetting != $args[0].fetish>> - <<set $fetishChangeChance = Math.trunc(Math.clamp(($args[0].devotion/4)-($args[0].fetishStrength/4), 0, 100))>> + <<if $args[0].balls>> + <<set _sex = $potencyAge-$args[0].actualAge>> + <<elseif $args[0].ovaries || $args[0].mpreg>> + <<set _sex = $fertilityAge-$args[0].actualAge>> + <<else>> + <<set _sex = 0>> + <</if>> + <<set $fetishChangeChance = Math.trunc(Math.clamp(($args[0].devotion/4)-($args[0].fetishStrength/4)-(Math.max(_sex,0)*10), 0, 100))>> <<else>> <<set $fetishChangeChance = 0>> <</if>>