diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 0d47ce8bbe738c4ad3afaead220e6a58f182cf02..f7e6e51ea1c7d97225ef32c9d422c47162d09923 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
0.10.7.1-0.4.x
+7/07/2018
+
+ 19
+ -various little fixes and tweaks
+ -incubator slaves take longer to learn languages now
+
7/05/2018
18
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 158dc56a07a6bb2d2143958c13458d1b13c70798..dc1895990c75a2078b0033a03c91ff1dfe2b35d8 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -16295,6 +16295,28 @@ window.SimpleSlaveSlaveFucking = function SimpleSlaveSlaveFucking(subslave, doms
return r;
}
+window.SimpleVaginaFuck = function SimpleVaginaFuck(slave, count) {
+ if (count) {
+ State.variables.vaginalTotal += count;
+ slave.vaginalCount += count;
+ }
+ else {
+ State.variables.vaginalTotal++;
+ slave.vaginalCount++;
+ }
+}
+
+window.SimpleAssFuck = function SimpleAssFuck(slave, count) {
+ if (count) {
+ State.variables.analTotal += count;
+ slave.analCount += count;
+ }
+ else {
+ State.variables.analTotal++;
+ slave.analCount++;
+ }
+}
+
/*:: PenthouseNaming [script]*/
window.MS = function() {
diff --git a/src/js/sexActsJS.tw b/src/js/sexActsJS.tw
index d242aee1184b628062dd946a27d8f122dbe1134b..d3648912ad4231ddee61e2b57d8b25b82e33abed 100644
--- a/src/js/sexActsJS.tw
+++ b/src/js/sexActsJS.tw
@@ -537,4 +537,26 @@ window.SimpleSlaveSlaveFucking = function SimpleSlaveSlaveFucking(subslave, doms
}
}
return r;
+}
+
+window.SimpleVaginaFuck = function SimpleVaginaFuck(slave, count) {
+ if (count) {
+ State.variables.vaginalTotal += count;
+ slave.vaginalCount += count;
+ }
+ else {
+ State.variables.vaginalTotal++;
+ slave.vaginalCount++;
+ }
+}
+
+window.SimpleAssFuck = function SimpleAssFuck(slave, count) {
+ if (count) {
+ State.variables.analTotal += count;
+ slave.analCount += count;
+ }
+ else {
+ State.variables.analTotal++;
+ slave.analCount++;
+ }
}
\ No newline at end of file
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 1ec10e92c3bed8cff67937272d9f7b697a1a204a..2cf2b6f5dd90446c293fa04bb4712fa0ebc9a952 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -80,7 +80,7 @@ if(!Macro.has('sectorblock')) {
Sweatshops: { base: 'Manufacturing' },
weapManu: { base: 'weaponsManufacturing', name: 'Weapons manufacturing', cls: 'weapManu' },
transportHub: { base: 'transportHub', name: 'Transport Hub', cls: 'transportHub' },
- Barracks: { base: 'Barracks', name: 'The armory', extra: ' of $mercenariesTitle' },
+ Barracks: { base: 'Barracks', name: 'Garrison', extra: ' of $mercenariesTitle' },
/* speciality shop types */
'Subjugationist': { base: 'Shops', name: 'Subjugationist Shops', cls: 'FSShops' },
'Supremacist': { base: 'Shops', name: 'Supremacist Shops', cls: 'FSShops' },
diff --git a/src/uncategorized/recETSWorkaround.tw b/src/uncategorized/recETSWorkaround.tw
index 2c7f80d956532cd7533c8042053488c5e5f976ef..f054066680dd1fc1c6e9d30f2066621a9245e381 100644
--- a/src/uncategorized/recETSWorkaround.tw
+++ b/src/uncategorized/recETSWorkaround.tw
@@ -141,6 +141,8 @@ The son cheers happily and hugs his relieved mother. She leans in and kisses him
<<set $activeSlave.preg = 0>>
<<set $activeSlave.pregKnown = 0>>
<<set $activeSlave.pregWeek = 0>>
+<<set $activeSlave.pregType = 0>>
+<<set $activeSlave.pregSource = 0>>
<<set WombFlush($activeSlave)>>
<<run SetBellySize($activeSlave)>>
<<set $activeSlave.dick = 2>>
@@ -153,8 +155,6 @@ The son cheers happily and hugs his relieved mother. She leans in and kisses him
<<set $activeSlave.vaginalSkill = 0>>
<<set $activeSlave.faceShape = "cute">>
<<set $activeSlave.boobs = 0>>
-<<set $activeSlave.pregType = 0>>
-<<set $activeSlave.pregSource = 0>>
<<set $activeSlave.birthsTotal = 0>>
<<set $activeSlave.lactation = 0>>
<<set $activeSlave.anus = 0>>
@@ -235,6 +235,8 @@ They cheer happily and hug each other tightly. They ought to be an interesting a
<<set $activeSlave.pubertyXX = 0>>
<<set $activeSlave.pubertyXY = 1>>
<<set $activeSlave.preg = 0>>
+<<set $activeSlave.pregType = 0>>
+<<set $activeSlave.pregSource = 0>>
<<set $activeSlave.pregKnown = 0>>
<<set $activeSlave.pregWeek = 0>>
<<set WombFlush($activeSlave)>>
@@ -249,8 +251,6 @@ They cheer happily and hug each other tightly. They ought to be an interesting a
<<set $activeSlave.vaginalSkill = 0>>
<<set $activeSlave.faceShape = "masculine">>
<<set $activeSlave.boobs = 0>>
-<<set $activeSlave.pregType = 0>>
-<<set $activeSlave.pregSource = 0>>
<<set $activeSlave.lactation = 0>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.pubicHStyle = "bushy">>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index eb1937f305d9aa4587a2317154dfcf86b9608de7..c8f8365db21781ec209611770a738c095b4d62d4 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6588,27 +6588,29 @@
<</if>>
<<if $slaves[$i].physicalAge >= 18>>
<<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 < 300))>>
- <<if ($slaves[$i].boobs > 30000+($slaves[$i].muscles*100))>>
- $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 25>>
- <<else>>
- $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 50>>
- <</if>>
- <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
- This effect is massively compounded by $possessive @@.orange;NCS.@@
- <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
+ <<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 < 300))>>
+ <<if ($slaves[$i].boobs > 30000+($slaves[$i].muscles*100))>>
+ $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 25>>
+ <<else>>
+ $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 50>>
+ <</if>>
+ <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
+ This effect is massively compounded by $possessive @@.orange;NCS.@@
+ <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
+ <</if>>
+ <</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>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ She's perfectly fine with dragging them along as a testament to how much she's managed to grow.
+ <<elseif $slaves[$i].devotion <= 50>>
She finds pulling them along @@.mediumorchid;mildly annoying.@@
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6616,7 +6618,9 @@
<</if>>
<<elseif ($slaves[$i].boobs > 25000)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Her giant tits are debilitatingly big and a constant reminder of her progress. No amount of discomfort or pain could dissuade her from going bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
Her giant tits are debilitatingly big. They are @@.mediumorchid;very uncomfortable@@ and @@.red;painful@@ for her body.
<<set $slaves[$i].devotion -= 3>>
<<set $slaves[$i].health -= 5>>
@@ -6627,7 +6631,9 @@
<<elseif ($slaves[$i].boobs > 10000)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Her huge breasts are becoming troublesome for her slight form, but that only drives her desire to go even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
Dragging her huge tits around is @@.mediumorchid;uncomfortable@@ and @@.red;painful@@ for her slight form.
<<set $slaves[$i].devotion -= 2>>
<<set $slaves[$i].health -= 2>>
@@ -6639,7 +6645,9 @@
<<elseif ($slaves[$i].boobs > 4000)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ The weight of her big boobs serves as a reminder that she needs to get even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
The weight of her big boobs is @@.mediumorchid;uncomfortable@@ for her slight form.
<<set $slaves[$i].devotion -= 2>>
<<else>>
@@ -6650,29 +6658,31 @@
<</if>>
<<elseif $slaves[$i].physicalAge <= 3>>
<<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 < 300>>
- <<if ($slaves[$i].boobs > 5000+($slaves[$i].muscles*10))>>
- $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 25>>
- <<else>>
- $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 50>>
- <</if>>
- <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
- This effect is compounded by $possessive @@.orange;NCS.@@
- <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
+ <<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 < 300>>
+ <<if ($slaves[$i].boobs > 5000+($slaves[$i].muscles*10))>>
+ $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 25>>
+ <<else>>
+ $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 50>>
+ <</if>>
+ <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
+ This effect is compounded by $possessive @@.orange;NCS.@@
+ <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
+ <</if>>
+ <</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.
+ Her titanic breasts are so massive they dwarf her body. She <<if $slaves[$i].sexualFlaw == "breast growth">>happily embraces<<else>>has no choice but to accept<</if>> immobility.
<<elseif ($slaves[$i].boobs > 20000)>>
Her immense breasts are so huge they rest upon the floor even when she tries to stand, taking the weight off her tiny body.
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ She's perfectly fine with dragging them along as a testament to how much she's managed to grow.
+ <<elseif $slaves[$i].devotion <= 50>>
She finds pulling them along @@.mediumorchid;mildly annoying.@@
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6680,7 +6690,9 @@
<</if>>
<<elseif ($slaves[$i].boobs > 6000)>>
Her giant breasts are so big they pin her to the floor, taking the weight off her tiny body.
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ She's perfectly fine with dragging them along as a testament to how much she's managed to grow.
+ <<elseif $slaves[$i].devotion <= 50>>
She finds pulling them along @@.mediumorchid;mildly annoying.@@
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6688,7 +6700,9 @@
<</if>>
<<elseif ($slaves[$i].boobs > 5000)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Her giant tits are debilitatingly big and a constant reminder of her progress. No amount of discomfort or pain could dissuade her from going bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
Her giant tits are debilitatingly big. They are @@.mediumorchid;very uncomfortable@@ and @@.red;painful@@ for her childish form.
<<set $slaves[$i].devotion -= 3>>
<<set $slaves[$i].health -= 4>>
@@ -6699,7 +6713,9 @@
<<elseif ($slaves[$i].boobs > 2500)>>
<<if ($slaves[$i].muscles <= 80)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Her huge breasts are troublesome for her childish form, but that only drives her desire to go even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
Hauling her huge tits around is @@.mediumorchid;uncomfortable@@ for her childish form.
<<set $slaves[$i].devotion -= 2>>
<<else>>
@@ -6710,7 +6726,9 @@
<<elseif ($slaves[$i].boobs > 1000)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ The weight of her big boobs serves as a reminder that she needs to get even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
The weight of her big boobs is @@.mediumorchid;uncomfortable@@ for her slight form.
<<set $slaves[$i].devotion -= 2>>
<<else>>
@@ -6721,27 +6739,29 @@
<</if>>
<<elseif $slaves[$i].physicalAge <= 12>>
<<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 < 300>>
- <<if ($slaves[$i].boobs > 10000+($slaves[$i].muscles*20))>>
- $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 25>>
- <<else>>
- $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 50>>
- <</if>>
- <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
- This effect is compounded by $possessive @@.orange;NCS.@@
- <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
+ <<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 < 300>>
+ <<if ($slaves[$i].boobs > 10000+($slaves[$i].muscles*20))>>
+ $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 25>>
+ <<else>>
+ $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 50>>
+ <</if>>
+ <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
+ This effect is compounded by $possessive @@.orange;NCS.@@
+ <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
+ <</if>>
+ <</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>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ She's perfectly fine with dragging them along as a testament to how much she's managed to grow.
+ <<elseif $slaves[$i].devotion <= 50>>
She finds pulling them along @@.mediumorchid;mildly annoying.@@
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6749,7 +6769,9 @@
<</if>>
<<elseif ($slaves[$i].boobs > 12000)>>
Her giant breasts are so big they pin her to the floor, taking the weight off her young body.
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ She's perfectly fine with dragging them along as a testament to how much she's managed to grow.
+ <<elseif $slaves[$i].devotion <= 50>>
She finds pulling them along @@.mediumorchid;mildly annoying.@@
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6758,7 +6780,9 @@
<<elseif ($slaves[$i].boobs > 10000)>>
<<if canWalk($slaves[$i])>>
Her giant tits are debilitatingly big.
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ No amount of discomfort or pain could dissuade her from going bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
They are @@.mediumorchid;very uncomfortable@@ and @@.red;painful@@ for her childish form.
<<set $slaves[$i].devotion -= 3>>
<<set $slaves[$i].health -= 5>>
@@ -6769,7 +6793,9 @@
<<elseif ($slaves[$i].boobs > 5000)>>
<<if ($slaves[$i].muscles <= 80)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Her huge breasts are troublesome for her childish form, but that only drives her desire to go even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
Dragging her huge tits around is @@.mediumorchid;uncomfortable@@ and @@.red;painful@@ for her childish form.
<<set $slaves[$i].devotion -= 2>>
<<set $slaves[$i].health -= 4>>
@@ -6781,7 +6807,9 @@
<<elseif ($slaves[$i].boobs > 2000)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ The weight of her big boobs serves as a reminder that she needs to get even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
The weight of her big boobs is @@.mediumorchid;uncomfortable@@ for her slight form.
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6792,40 +6820,50 @@
<</if>>
<<else>>
<<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 < 300>>
- <<if ($slaves[$i].boobs > 20000+($slaves[$i].muscles*50))>>
- $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 25>>
- <<else>>
- $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
- <<set $slaves[$i].boobs -= 50>>
- <</if>>
- <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
- This effect is compounded by $possessive @@.orange;NCS.@@
- <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
+ <<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 < 300>>
+ <<if ($slaves[$i].boobs > 20000+($slaves[$i].muscles*50))>>
+ $possessiveCap breasts are larger than $possessive body can possibly sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 25>>
+ <<else>>
+ $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@
+ <<set $slaves[$i].boobs -= 50>>
+ <</if>>
+ <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>>
+ This effect is compounded by $possessive @@.orange;NCS.@@
+ <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>>
+ <</if>>
+ <</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>>
+ Her immense breasts are so big they pin her to the floor, taking the weight off her youthful body.
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ She's perfectly fine with dragging them along as a testament to how much she's managed to grow.
+ <<elseif $slaves[$i].devotion <= 50>>
+ She finds pulling them along @@.mediumorchid;mildly annoying.@@
+ <<set $slaves[$i].devotion -= 1>>
+ <<else>>
+ She finds pulling them along a little annoying, but your will is far more important to her.
+ <</if>>
<<elseif ($slaves[$i].boobs > 17000)>>
Her giant tits are debilitatingly big.
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ No amount of discomfort or pain could dissuade her from going bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
They are @@.mediumorchid;very uncomfortable@@ and @@.red;painful@@ for her youthful form.
- <<set $slaves[$i].devotion -= 3>>
- <<set $slaves[$i].health -= 10>>
+ <<set $slaves[$i].devotion -= 3, $slaves[$i].health -= 10>>
<<else>>
She finds them painfully uncomfortable, but finds ways to mitigate it to not distract you with her worries.
<</if>>
<<elseif ($slaves[$i].boobs > 10000)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Her huge breasts are troublesome for her slight form, but that only drives her desire to go even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
Dragging her huge tits around is @@.mediumorchid;uncomfortable@@ and @@.red;painful@@ for her slight form.
<<set $slaves[$i].devotion -= 2, $slaves[$i].health -= 3>>
<<else>>
@@ -6836,7 +6874,9 @@
<<elseif ($slaves[$i].boobs > 2000)>>
<<if ($slaves[$i].muscles <= 5)>>
<<if canWalk($slaves[$i])>>
- <<if $slaves[$i].devotion <= 50>>
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ The weight of her big boobs serves as a reminder that she needs to get even bigger.
+ <<elseif $slaves[$i].devotion <= 50>>
The weight of her big boobs is @@.mediumorchid;uncomfortable@@ for her slight form.
<<set $slaves[$i].devotion -= 1>>
<<else>>
@@ -6848,6 +6888,7 @@
<</if>>
/* I need to be redone phase-7 */
+ /* keep in mind breeder paraphilia overriding mentla effects */
<<if ($slaves[$i].preg > 30)>>
<<if ($slaves[$i].physicalAge < 4)>>
<<if ($slaves[$i].pregType >= 20)>>
@@ -6994,27 +7035,29 @@
<</if>>
<<if $slaves[$i].fuckdoll == 0>>
- <<if $slaves[$i].fetish != "mindbroken">>
- <<if ($slaves[$i].boobs > 20000)>>
- <<if $boobAccessibility == 1>>
- <<if ($slaves[$i].devotion > 20)>>
- She's @@.mediumaquamarine;thankful@@ to you for providing living spaces adapted to life with gigantic boobs.
- <<set $slaves[$i].trust += 1>>
- <</if>>
- <<else>>
- Her gigantic boobs make life a struggle: <<if $buttAccessibility == 1 || $pregAccessibility == 1 || $ballsAccessibility == 1>>she has trouble using appliances and furniture, and constantly bumps into things, but at least the doors have already been widened for your other slaves<<else>>she barely fits through doors, has trouble using appliances and furniture, and constantly bumps into things<</if>>.
- <<if ($slaves[$i].devotion > 50)>>
- Since she's devoted to you, she just does her best.
- <<elseif ($slaves[$i].trust > -20)>>
- This torment makes her @@.gold;less trusting@@ of your willingness to look after her.
- <<set $slaves[$i].trust -= 2>>
- <<else>>
- She already believes you capable of tormenting her, so this proof of your indifference @@.mediumorchid;angers her@@ daily.
- <<set $slaves[$i].devotion -= 2>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
+ <<if $slaves[$i].fetish != "mindbroken">>
+ <<if ($slaves[$i].boobs > 20000)>>
+ <<if $boobAccessibility == 1>>
+ <<if ($slaves[$i].devotion > 20)>>
+ She's @@.mediumaquamarine;thankful@@ to you for providing living spaces adapted to life with gigantic boobs.
+ <<set $slaves[$i].trust += 1>>
+ <</if>>
+ <<else>>
+ Her gigantic boobs make life a struggle: <<if $buttAccessibility == 1 || $pregAccessibility == 1 || $ballsAccessibility == 1>>she has trouble using appliances and furniture, and constantly bumps into things, but at least the doors have already been widened for your other slaves<<else>>she barely fits through doors, has trouble using appliances and furniture, and constantly bumps into things<</if>>.
+ <<if $slaves[$i].sexualFlaw == "breast growth">>
+ Every little inconvenience just feeds her breast growth obsession, so she's more bothered that they aren't an even bigger problem for her daily life.
+ <<elseif ($slaves[$i].devotion > 50)>>
+ Since she's devoted to you, she just does her best.
+ <<elseif ($slaves[$i].trust > -20)>>
+ This torment makes her @@.gold;less trusting@@ of your willingness to look after her.
+ <<set $slaves[$i].trust -= 2>>
+ <<else>>
+ She already believes you capable of tormenting her, so this proof of your indifference @@.mediumorchid;angers her@@ daily.
+ <<set $slaves[$i].devotion -= 2>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<<if (($slaves[$i].inducedNCS == 0) && ($slaves[$i].lactation > 1))>>
@@ -7576,6 +7619,9 @@
<<elseif SlaveStatsChecker.checkForLisp($slaves[$i])>> /* moderate speech impediment */
<<set _minweeks += 15>>
<</if>>
+ <<if $slaves[$i].accent == 4>>
+ <<set _minweeks += 40>>
+ <</if>>
<<if ($slaves[$i].accent >= 4)>>
<<if ($week - $slaves[$i].weekAcquired) > _minweeks - 5>>
<<set $slaves[$i].accent -= 1>>
diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw
index 6ffaaadaeb08ceeb9ad9fdb8db07f66bdef740af..fe6d768cd7826490f2043602ff3571a39ac23ca0 100644
--- a/src/uncategorized/saTakeClasses.tw
+++ b/src/uncategorized/saTakeClasses.tw
@@ -193,7 +193,7 @@
<<if $slaves[$i].voice != 0>>
<<if ($slaves[$i].intelligence > random(-4,4))>>
<<if ($schoolroomUpgradeLanguage == 0)>>
- <<if ($slaves[$i].accent > 3)>>
+ <<if ($slaves[$i].accent > 3) && ($week-$slaves[$i].weekAcquired > 24)>>
$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">>
@@ -205,8 +205,13 @@
<</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>>
+ <<if ($week-$slaves[$i].weekAcquired > 16)>>
+ $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>>
+ <</if>>
<<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>>