From d4141acbdc47eaae0a87453a33b18b07b50883f1 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 7 Mar 2017 17:42:44 -0500
Subject: [PATCH] Touch ups.
---
src/pregmod/incubatorReport.tw | 74 ++++++++++++++--------------
src/uncategorized/slaveSummary.tw | 10 ++--
src/utility/descriptionWidgets.tw | 80 +++++++++++++++++++++++++++++--
3 files changed, 116 insertions(+), 48 deletions(-)
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
index 3cee724a784..7fb998c8dfb 100644
--- a/src/pregmod/incubatorReport.tw
+++ b/src/pregmod/incubatorReport.tw
@@ -144,7 +144,7 @@
<<if $incubatorReproductionSetting == 2>>
Her developing body is being flooded with hormones.
<<if $incubatorWeightSetting == 1>>
- Combined with the abundant food provided to her, her body grows radibly.
+ Combined with the abundant food provided to her, her body grows rapidly.
<<if $tanks[$i].ovaries == 1>>
<<set $tanks[$i].pubertyXX = 1>>
<<if $seeHyperPreg == 1>>
@@ -153,9 +153,9 @@
<<set $tanks[$i].pregType = random(3,5)>>
<</if>>
<<if $incubatorUpgradeSpeed == 52>>
- <<if $tanks[$i].breasts < 8000>>
+ <<if $tanks[$i].boobs < 8000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 2000>>
+ <<set $tanks[$i].boobs += 2000>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 50>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -166,9 +166,9 @@
<<set $tanks[$i].butt += 4>>
<</if>>
<<elseif $incubatorUpgradeSpeed == 18>>
- <<if $tanks[$i].breasts < 8000>>
+ <<if $tanks[$i].boobs < 8000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 500>>
+ <<set $tanks[$i].boobs += 500>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 50>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -179,9 +179,9 @@
<<set $tanks[$i].butt += 3>>
<</if>>
<<elseif $incubatorUpgradeSpeed == 9>>
- <<if $tanks[$i].breasts < 8000>>
+ <<if $tanks[$i].boobs < 8000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 200>>
+ <<set $tanks[$i].boobs += 200>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 60>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -192,9 +192,9 @@
<<set $tanks[$i].butt += 2>>
<</if>>
<<elseif $incubatorUpgradeSpeed == 6>>
- <<if $tanks[$i].breasts < 8000>>
+ <<if $tanks[$i].boobs < 8000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 100>>
+ <<set $tanks[$i].boobs += 100>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 70>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -205,9 +205,9 @@
<<set $tanks[$i].butt += 1>>
<</if>>
<<elseif $incubatorUpgradeSpeed == 5>>
- <<if $tanks[$i].breasts < 8000>>
+ <<if $tanks[$i].boobs < 8000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 100>>
+ <<set $tanks[$i].boobs += 100>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 80>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -277,9 +277,9 @@
<<set $tanks[$i].pregType = random(2,4)>>
<</if>>
<<if $incubatorUpgradeSpeed == 52>>
- <<if $tanks[$i].breasts < 4000>>
+ <<if $tanks[$i].boobs < 4000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 1000>>
+ <<set $tanks[$i].boobs += 1000>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 70>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -290,9 +290,9 @@
<<set $tanks[$i].butt += 3>>
<</if>>
<<elseif $incubatorUpgradeSpeed == 18>>
- <<if $tanks[$i].breasts < 4000>>
+ <<if $tanks[$i].boobs < 4000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 500>>
+ <<set $tanks[$i].boobs += 500>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 80>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -303,9 +303,9 @@
<<set $tanks[$i].butt += 1>>
<</if>>
<<elseif $incubatorUpgradeSpeed == 9>>
- <<if $tanks[$i].breasts < 4000>>
+ <<if $tanks[$i].boobs < 4000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 200>>
+ <<set $tanks[$i].boobs += 200>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 90>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -316,9 +316,9 @@
<<set $tanks[$i].butt += 1>>
<</if>>
<<elseif $incubatorUpgradeSpeed == 6>>
- <<if $tanks[$i].breasts < 4000>>
+ <<if $tanks[$i].boobs < 4000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 100>>
+ <<set $tanks[$i].boobs += 100>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 95>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -329,9 +329,9 @@
<<set $tanks[$i].butt += 1>>
<</if>>
<<elseif $incubatorUpgradeSpeed == 5>>
- <<if $tanks[$i].breasts < 4000>>
+ <<if $tanks[$i].boobs < 4000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 100>>
+ <<set $tanks[$i].boobs += 100>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 95>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -401,9 +401,9 @@
<<set $tanks[$i].pregType = random(2,3)>>
<</if>>
<<if $incubatorUpgradeSpeed == 52>>
- <<if $tanks[$i].breasts < 2000>>
+ <<if $tanks[$i].boobs < 2000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 700>>
+ <<set $tanks[$i].boobs += 700>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 90>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -414,9 +414,9 @@
<<set $tanks[$i].butt += 2>>
<</if>>
<<elseif $incubatorUpgradeSpeed == 18>>
- <<if $tanks[$i].breasts < 2000>>
+ <<if $tanks[$i].boobs < 2000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 200>>
+ <<set $tanks[$i].boobs += 200>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 80>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -427,9 +427,9 @@
<<set $tanks[$i].butt += 1>>
<</if>>
<<elseif $incubatorUpgradeSpeed == 9>>
- <<if $tanks[$i].breasts < 2000>>
+ <<if $tanks[$i].boobs < 2000>>
The excess estrogen @@color:green;rapidly balloons her breasts.@@
- <<set $tanks[$i].breasts += 50>>
+ <<set $tanks[$i].boobs += 50>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 80>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -440,9 +440,9 @@
<<set $tanks[$i].butt += 1>>
<</if>>
<<elseif $incubatorUpgradeSpeed == 6>>
- <<if $tanks[$i].breasts < 2000>>
+ <<if $tanks[$i].boobs < 2000>>
The excess estrogen @@color:green;rapidly grows her breasts.@@
- <<set $tanks[$i].breasts += 20>>
+ <<set $tanks[$i].boobs += 20>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 90>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -453,9 +453,9 @@
<<set $tanks[$i].butt += 1>>
<</if>>
<<elseif $incubatorUpgradeSpeed == 5>>
- <<if $tanks[$i].breasts < 2000>>
+ <<if $tanks[$i].boobs < 2000>>
The excess estrogen @@color:green;rapidly grows her breasts.@@
- <<set $tanks[$i].breasts += 10>>
+ <<set $tanks[$i].boobs += 10>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 95>>
The excess estrogen @@color:green;causes her hips to widen for childbirth.@@
@@ -520,9 +520,9 @@
Her hormone levels are being carefully managed, @@color:green;encouraging early puberty.@@
<<if $tanks[$i].ovaries == 1>>
<<set $tanks[$i].pubertyXX = 1>>
- <<if $tanks[$i].breasts < 400 && random(1,100) > 60>>
+ <<if $tanks[$i].boobs < 400 && random(1,100) > 60>>
The added estrogen @@color:green;causes her breasts to swell.@@
- <<set $tanks[$i].breasts += 50>>
+ <<set $tanks[$i].boobs += 50>>
<</if>>
<<if $tanks[$i].hips < 2 && random(1,100) > 90>>
The added estrogen @@color:green;causes her hips to widen.@@
@@ -552,8 +552,8 @@
<<set $tanks[$i].dick -= 5>>
<</if>>
<</if>>
- <<if $tanks[$i].breasts > 0>>
- <<set $tanks[$i].breasts -= 500>>
+ <<if $tanks[$i].boobs > 0>>
+ <<set $tanks[$i].boobs -= 500>>
<</if>>
<<if $tanks[$i].butt > 0>>
<<set $tanks[$i].butt -= 4>>
@@ -568,8 +568,8 @@
<<set $tanks[$i].dick -= 5>>
<</if>>
<</if>>
- <<if $tanks[$i].breasts > 0>>
- <<set $tanks[$i].breasts -= 500>>
+ <<if $tanks[$i].boobs > 0>>
+ <<set $tanks[$i].boobs -= 500>>
<</if>>
<<if $tanks[$i].butt > 0>>
<<set $tanks[$i].butt -= 4>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 0b149e8f16a..a60d995762d 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -575,7 +575,7 @@ will
<</if>>
<<if $displayAssignments == 1>>
-<<if passage() is "Main">>
+<<if _Pass is "Main">>
<<if (_Slave.ID != $HeadGirl.ID) && (_Slave.ID != $Recruiter.ID) && (_Slave.ID != $Bodyguard.ID)>>
<<if _Slave.assignment != "rest">>
<<print "[[Rest|Rest Workaround][$activeSlave to $slaves[" + _i + "]]]">> |
@@ -1267,16 +1267,12 @@ Release rules: _Slave.releaseRules.
<<elseif $abbreviateNationality is 2>>
''@@color:tan;
<<switch _Slave.nationality>>
-<<case "American" "Canadian" "Puerto Rican" "Cuban" "Haitian" "Jamaican" "Mexican" "Dominican", "Peruvian" "Venezuelan" "Bolivian" "Guatemalan" "Brazilian" "Argentinian" "Chilean" "Colombian" "Egyptian" "Turkish" "Iranian" "Armenian" "Israeli" "Saudi" "Moroccan" "Nigerian" "Kenyan" "Ugandan" "Tanzanian" "Ghanan" "Congolese" "Ethiopian" "South African" "Chinese" "Korean" "Japanese" "Thai" "Vietnamese" "Indonesian" "Filipina" "Burmese" "Nepalese" "Uzbek" "Afghan" "Algerian" "Libyan" "Tunisian" "Lebanese" "Jordanian" "Emirati" "Omani" "Malian" "Sudanese" "Yemeni" "Iraqi" "Indian" "Malaysian" "Kazakh" "Pakistani" "Bangladeshi" "Belarusian" "Russian" "Ukrainian" "Irish" "Icelandic" "Finnish" "Swiss" "Danish" "Norwegian" "Austrian" "Slovak" "Dutch" "Belgian" "Czech" "Serbian" "Portuguese" "Hungarian" "Estonian" "Polish" "Lithuanian" "Romanian" "German" "Swedish" "French" "Scottish" "Italian" "Greek" "Spanish" "British" "Australian" "a New Zealander">>
- _Slave.nationality.
<<case "Zimbabwean">>
<<if _Slave.race == "white">>
Rhodesian.
<<else>>
_Slave.nationality.
<</if>>
-<<case "Ancient Egyptian Revivalist" "Ancient Chinese Revivalist" "Edo Revivalist" "Roman Revivalist" "Arabian Revivalist">>
- _Slave.nationality.
<<case "slave" "none" "" "Stateless">>
Stateless.
<<default>>
@@ -3416,5 +3412,5 @@ _Slave.faceShape face.
<<print "[[Match them|Matchmaking][$subSlave to $slaves[" + _i + "]]]">>
<</switch>>
<</for>>
-<<set $activeSlave to {}>>
-<<set _Slave to {}>>
+<<set $activeSlave to 0>>
+<<set _Slave to 0>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index ac3a6b23171..7455eca818d 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -794,7 +794,7 @@ $possessiveCap
<<else>>
Together they are nearly the same size as $possessive torso, making $object about half boob.
<</if>>
- <<if ($activeSlave.assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>>
+ <<if $activeSlave.boobs > 7500 && ($activeSlave.assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>>
<<if $boobAccessibility == 1>>
Fortunately for $object, the penthouse is adapted for daily life with a bosom
<<else>>
@@ -825,7 +825,7 @@ $possessiveCap
<<else>>
Together they are nearly the same size as her torso, making her about half boob.
<</if>>
- <<if $activeSlave.boobs > 10000 && ($activeSlave.assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>>
+ <<if $activeSlave.boobs > 7500 && ($activeSlave.assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>>
<<if $boobAccessibility == 1>>
Fortunately for $object, the penthouse is adapted for daily life with a bosom
<<else>>
@@ -856,7 +856,7 @@ $possessiveCap
<<else>>
Together they are nearly the same size as her torso, making her about half boob.
<</if>>
- <<if $activeSlave.boobs > 10000 && ($activeSlave.assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>>
+ <<if $activeSlave.boobs > 7500 && ($activeSlave.assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>>
<<if $boobAccessibility == 1>>
Fortunately for $object, the penthouse is adapted for daily life with a bosom
<<else>>
@@ -887,7 +887,7 @@ $possessiveCap
<<else>>
Together they are nearly the same size as her torso, making her about half boob.
<</if>>
- <<if $activeSlave.boobs > 10000 && ($activeSlave.assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>>
+ <<if $activeSlave.boobs > 7500 && ($activeSlave.assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)>>
<<if $boobAccessibility == 1>>
Fortunately for $object, the penthouse is adapted for daily life with a bosom
<<else>>
@@ -1779,6 +1779,14 @@ $pronounCap's got a
<<else>>
Together it is nearly the same size as $possessive torso, making $object about half butt.
<</if>>
+ <<if $activeSlave.butt > 15>>
+ <<if $buttAccessibility == 1>>
+ Fortunately for $object, the penthouse is adapted for daily life with a rear
+ <<else>>
+ $pronounCap has trouble living in your penthouse, which is not designed for girls with buttcheeks
+ <</if>>
+ wider than a standard doorway.
+ <</if>>
<</if>>
<</if>>
<<elseif $activeSlave.physicalAge <= 12>>
@@ -1800,6 +1808,14 @@ $pronounCap's got a
<<else>>
Together it is nearly the same size as $possessive torso, making $object about half butt.
<</if>>
+ <<if $activeSlave.butt > 15>>
+ <<if $buttAccessibility == 1>>
+ Fortunately for $object, the penthouse is adapted for daily life with a rear
+ <<else>>
+ $pronounCap has trouble living in your penthouse, which is not designed for girls with buttcheeks
+ <</if>>
+ wider than a standard doorway.
+ <</if>>
<</if>>
<</if>>
<<elseif $activeSlave.physicalAge > 12>>
@@ -1821,6 +1837,14 @@ $pronounCap's got a
<<else>>
Together it is nearly the same size as $possessive torso, making $object about half butt.
<</if>>
+ <<if $activeSlave.butt > 15>>
+ <<if $buttAccessibility == 1>>
+ Fortunately for $object, the penthouse is adapted for daily life with a rear
+ <<else>>
+ $pronounCap has trouble living in your penthouse, which is not designed for girls with buttcheeks
+ <</if>>
+ wider than a standard doorway.
+ <</if>>
<</if>>
<</if>>
<</if>>
@@ -3053,6 +3077,14 @@ $pronounCap's got a
<<else>>
It is nearly the same size as $possessive torso, making $object about half cock.
<</if>>
+ <<if $activeSlave.dick > 45>>
+ <<if $dickAccessibility == 1>>
+ Fortunately for $object, the penthouse is adapted for daily life with a cock
+ <<else>>
+ $pronounCap has trouble living in your penthouse, which is not designed for girls with dicks
+ <</if>>
+ bigger than they are.
+ <</if>>
<</if>>
<</if>>
<<elseif $activeSlave.physicalAge <= 12>>
@@ -3074,6 +3106,14 @@ $pronounCap's got a
<<else>>
It is nearly the same size as $possessive torso, making $object about half cock.
<</if>>
+ <<if $activeSlave.dick > 45>>
+ <<if $dickAccessibility == 1>>
+ Fortunately for $object, the penthouse is adapted for daily life with a cock
+ <<else>>
+ $pronounCap has trouble living in your penthouse, which is not designed for girls with dicks
+ <</if>>
+ bigger than they are.
+ <</if>>
<</if>>
<</if>>
<<elseif $activeSlave.physicalAge > 12>>
@@ -3095,6 +3135,14 @@ $pronounCap's got a
<<else>>
It is nearly the same size as $possessive torso, making $object about half cock.
<</if>>
+ <<if $activeSlave.dick > 45>>
+ <<if $dickAccessibility == 1>>
+ Fortunately for $object, the penthouse is adapted for daily life with a cock
+ <<else>>
+ $pronounCap has trouble living in your penthouse, which is not designed for girls with dicks
+ <</if>>
+ bigger than they are.
+ <</if>>
<</if>>
<</if>>
<</if>>
@@ -3118,6 +3166,14 @@ $pronounCap's got a
<<else>>
Together they are nearly the same size as $possessive torso, making $object about half testicle.
<</if>>
+ <<if $activeSlave.balls > 90>>
+ <<if $ballsAccessibility == 1>>
+ Fortunately for $object, the penthouse is adapted for daily life with balls
+ <<else>>
+ $pronounCap has trouble living in your penthouse, which is not designed for girls with testicles
+ <</if>>
+ wider than a standard doorway.
+ <</if>>
<</if>>
<</if>>
<<elseif $activeSlave.physicalAge <= 12>>
@@ -3139,6 +3195,14 @@ $pronounCap's got a
<<else>>
Together they are nearly the same size as $possessive torso, making $object about half testicle.
<</if>>
+ <<if $activeSlave.balls > 90>>
+ <<if $ballsAccessibility == 1>>
+ Fortunately for $object, the penthouse is adapted for daily life with balls
+ <<else>>
+ $pronounCap has trouble living in your penthouse, which is not designed for girls with testicles
+ <</if>>
+ wider than a standard doorway.
+ <</if>>
<</if>>
<</if>>
<<elseif $activeSlave.physicalAge > 12>>
@@ -3160,6 +3224,14 @@ $pronounCap's got a
<<else>>
Together they are nearly the same size as $possessive torso, making $object about half testicle.
<</if>>
+ <<if $activeSlave.balls > 90>>
+ <<if $ballsAccessibility == 1>>
+ Fortunately for $object, the penthouse is adapted for daily life with balls
+ <<else>>
+ $pronounCap has trouble living in your penthouse, which is not designed for girls with testicles
+ <</if>>
+ wider than a standard doorway.
+ <</if>>
<</if>>
<</if>>
<</if>>
--
GitLab