diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index fe713ae13ddb8cc6f57f455026135325e1e73903..d97d68ce86058753478d97cc3d9fc5d55d1e8dfa 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,18 @@
0.10.7.1-0.4.x
+7/03/2018
+
+ 15
+ -fixes and typo corrections
+ -Deepmurk's Battlearmor, Biyelgee Costume, Dirndl, Lederhosen, Long Qipao/Qipao (Nice), and Mounty Outfit
+
+7/02/2018
+
+ 14
+ -fixes and typos
+ -applied lisping to new slave intro, among other technical things
+
7/01/2018
13
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 3a6d774672f505f1c91d20a3dfd57d91ae11dab4..68283bae5bf43b1303d0de8083fac60394bb331e 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -13059,7 +13059,7 @@ window.rulesAssistantOptions = (function() {
["Skimpy battledress", "battledress"],
["Slave gown", "a slave gown"],
["Slutty outfit", "a slutty outfit"],
- ["String bikini", "a stirng bikini"],
+ ["String bikini", "a string bikini"],
["Scalemail bikini", "a scalemail bikini"],
["Succubus costume", "a succubus outfit"],
["Suit (nice)", "nice business sattire"],
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index 048d6d3d9896174428da29b3a46d47eb1d35cf87..064394a02d9d003b464d3777abe20f9d0ad1db1c 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -1070,7 +1070,7 @@ window.rulesAssistantOptions = (function() {
["Skimpy battledress", "battledress"],
["Slave gown", "a slave gown"],
["Slutty outfit", "a slutty outfit"],
- ["String bikini", "a stirng bikini"],
+ ["String bikini", "a string bikini"],
["Scalemail bikini", "a scalemail bikini"],
["Succubus costume", "a succubus outfit"],
["Suit (nice)", "nice business sattire"],
diff --git a/src/player/actions/fEmbrace.tw b/src/player/actions/fEmbrace.tw
index 7c9b41c6589ef22608998258702a914025e0b14b..7f12b33a1863e7a2f64aa96e8f7b521838139a72 100644
--- a/src/player/actions/fEmbrace.tw
+++ b/src/player/actions/fEmbrace.tw
@@ -1,6 +1,5 @@
-:: FEmbrace
+:: FEmbrace [nobr]
-<<nobr>>
You tell $activeSlave.slaveName to
<<if ($activeSlave.amp != 1)>>
stand in front of you.
@@ -76,7 +75,7 @@ You walk around $him and put your hands around $his abdomen,<<if ($activeSlave.a
<</if>>
$He eagerly looks at you, $his eyes almost seem to say that $he wants you to give $his <<Master>> more than a mere hug.
<<elseif ($activeSlave.devotion > 50)>>
- $He sighs devotedly in your arms and slowly relaxes. $He turns towards you, $his doting $activeSlave.eyeColor eyes staring intently at your face. You feel $his heart beating faster against your chest as you softly squeeze your arms tighter. $His hands reach to your arms and $he strokes them longingly as you squeeze. $He gradually closes $his eyes as $he leans $his body against yours, melting in your warm embrace, and you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. When you finally stop, <<if ($activeSlave.amp != 1)>>$he reaches to your face with $his hand and gently strokes your cheek<</if>>, a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his $activeSlave.eyeColor eyes, since $he's not confident in $his ability to express it in $language.<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He does $his best to communicate devotion with $his $activeSlave.eyeColor eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>"I love you, <<Master>>," $he lisps elatedly.<<else>>"I love you, <<Master>>," $he says elatedly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than a mere embrace.
+ $He sighs devotedly in your arms and slowly relaxes. $He turns towards you, $his doting $activeSlave.eyeColor eyes staring intently at your face. You feel $his heart beating faster against your chest as you softly squeeze your arms tighter. $His hands reach to your arms and $he strokes them longingly as you squeeze. $He gradually closes $his eyes as $he leans $his body against yours, melting in your warm embrace, and you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. When you finally stop, <<if ($activeSlave.amp != 1)>>$he reaches to your face with $his hand and gently strokes your cheek<<else>>$he turns to you<</if>>, a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his $activeSlave.eyeColor eyes, since $he's not confident in $his ability to express it in $language.<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$He does $his best to communicate devotion with $his $activeSlave.eyeColor eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>"I love you, <<Master>>," $he lisps elatedly.<<else>>"I love you, <<Master>>," $he says elatedly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than a mere embrace.
<<elseif ($activeSlave.devotion > 20)>>
$He willingly gives $himself up to your embracing arms. As you are so close to $him, you sense considerable uneasiness in the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your soft embrace against $his body. $He gradually closes $his eyes in the feeling of your gentle arms. When you finally stop and relax your embrace, $his $activeSlave.eyeColor eyes open to gaze puzzlingly at you. Even though $he has accepted life as a sex slave, $he looks as though $he is unsure of what to make of this non-sexual physical contact. <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>$He asks hesitantly, "I-ith that it, <<Master>>?"<<else>>$He asks hesitantly, "I-is that it, <<Master>>?"<</if>>
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>>
@@ -86,4 +85,3 @@ You walk around $him and put your hands around $his abdomen,<<if ($activeSlave.a
<<else>>
$He reflexively tries to break free from your arms, but you keep $him wrapped in them. Shuddering, $he desperately leans away from you, but you tip forward with $him and pin $him against your desk, continuing your hold on $him. $He tries to wriggle out of your grasp desperately, but $his struggles slowly subside as $he realizes that you're not taking this any farther. When you bore of it and release $him, $he stares at you in utter incomprehension. <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>$His eyes demand an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs irritably, asking whether that's it.<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>$He splutters, "Ith that it, <<Master>>!?"<<else>>$He splutters, "Is that it, <<Master>>!?"<</if>> $He shakes uncontrollably, apprehensive at what you are going to do next.
<</if>>
-<</nobr>>
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 310c7eef2b3e159fddd8499f262a95450874b320..2ed039ff149c3d47805deaf2818ead6d54ae8b3d 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -298,7 +298,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
<<if $assistant == 0>>
instructions.
<<else>>
- instructions, $his
+ instructions, _his2
<<if $assistantAppearance == "monstergirl">>
monstergirl avatar appearing in a surprisingly conventional surplice that covers _him2 up decently. All except for _his2 horns, which protrude from under the headpiece.
<<elseif $assistantAppearance == "shemale">>
@@ -316,9 +316,9 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
<<elseif $assistantAppearance == "hypergoddess">>
goddess avatar completely unchanged, since _he2 considers _his2 usual form perfectly appropriate for a marriage.
<<elseif $assistantAppearance == "loli">>
- loli avatar looking surprisingly mature in a minister's collar. Though, _he2 would rather be the flower $girl in this wedding.
+ loli avatar looking surprisingly mature in a minister's collar. Though, _he2 would rather be the flower _girl2 in this wedding.
<<elseif $assistantAppearance == "preggololi">>
- loli avatar looking surprisingly mature in a minister's collar. Though, _he2 would rather be the flower $girl in this wedding.
+ loli avatar looking surprisingly mature in a minister's collar. Though, _he2 would rather be the flower _girl2 in this wedding.
<<elseif $assistantAppearance == "schoolgirl">>
schoolgirl avatar looking willfully absurd in a minister's collar and _his2 usual short plaid skirt.
<<elseif $assistantAppearance == "angel">>
@@ -342,14 +342,14 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
<br>
<span id="result">
-<br><<link "Just redesignate $his as your slave wife">>
+<br><<link "Just redesignate $him as your slave wife">>
<<replace "#result">>
You order $assistantName to simply redesignate $activeSlave.slaveName as your slave wife.
<<if $assistant == 0>>
"Slave redesignated," it responds immediately. The thing is done.
<<else>>
<<if $assistantAppearance == "monstergirl">>
- _His2 avatar snaps its fingers and shrugs off its surplice, revealing $his tentacle hair, pale skin, and cocks once more.
+ _His2 avatar snaps its fingers and shrugs off its surplice, revealing _his2 tentacle hair, pale skin, and cocks once more.
<<elseif $assistantAppearance == "shemale">>
_His2 avatar snaps its fingers and starts to masturbate more energetically.
<<elseif $assistantAppearance == "amazon">>
@@ -373,7 +373,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
<<elseif $assistantAppearance == "cherub">>
_His2 avatar claps its hands together, emitting a burst of light.
<<elseif $assistantAppearance == "incubus">>
- _His2 avatar flick the tip of its penis and blows $his load towards the both of you.
+ _His2 avatar flicks the tip of its penis and blows _his2 load towards the both of you.
<<elseif $assistantAppearance == "succubus">>
_His2 avatar starts to masturbate furiously and orgasms lewdly.
<<elseif $assistantAppearance == "imp">>
@@ -552,7 +552,13 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
$His lacy g-string is starting to look a bit moist in front.
<</if>>
<</if>>
- <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> marries $him to you in a brief ceremony adapted for slaves and their owners. You place a simple steel ring on $his finger; $he does not reciprocate, since this marriage does not bind you.
+ <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> marries $him to you in a brief ceremony adapted for slaves and their owners. You place a
+ <<if $activeSlave.amp != 1>>
+ simple steel ring on $his finger;
+ <<else>>
+ chain with a simple steel ring around $his neck;
+ <</if>>
+ $he does not reciprocate, since this marriage does not bind you.
<<if $assistant == 0>>
"The marriage protocol now requires you to <<if $PC.dick == 1>>fellate<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>," $assistantName orders $him, and $he <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>.
<<else>>
@@ -565,7 +571,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
<<elseif $assistantAppearance == "businesswoman">>
"To consecrate the marriage," $assistantName concludes, "$activeSlave.slaveName, you will now <<if $PC.dick == 1>>fellate<<else>>perform cunnilingus on<</if>> the <<if $PC.title == 1>>groom<<else>>the bride<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar sneaks a hand down _his2 suit skirt, blushing furiously.
<<elseif $assistantAppearance == "fairy">>
- "To seal the deal," $assistantName concludes, "$activeSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick == 1>>semen<<if $PC.vagina == 1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar spreads _his2 legs while still hovering in the air and masturbates eagerly through $his half-worn robes.
+ "To seal the deal," $assistantName concludes, "$activeSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick == 1>>semen<<if $PC.vagina == 1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar spreads _his2 legs while still hovering in the air and masturbates eagerly through _his2 half-worn robes.
<<elseif $assistantAppearance == "pregnant fairy">>
"To seal the deal," $assistantName concludes, "$activeSlave.slaveName, you gotta drink the <<if $PC.title == 1>>groom's <<else>>bride's <</if>><<if $PC.dick == 1>>semen<<if $PC.vagina == 1>> and pussy juices<</if>><<else>>pussy juices<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's pregnant avatar curls while still hovering in the air and masturbates eagerly around _his2 large belly.
<<elseif $assistantAppearance == "goddess">>
@@ -575,7 +581,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
<<elseif $assistantAppearance == "loli">>
"To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina == 1>>and lick their cunny.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunny<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar sneaks a hand down _his2 dress, blushing furiously.
<<elseif $assistantAppearance == "preggololi">>
- "To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s lovely cock<<if $PC.vagina == 1>>and eat out their cunt.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunt<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar attempts to sneak a hand down $his dress, but is thwarted by $his belly. $He instead openly rubs _his2 crotch through the front of _his2 dress, blushing furiously.
+ "To consummate the marriage," $assistantName concludes, "$activeSlave.slaveName, you should now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s lovely cock<<if $PC.vagina == 1>>and eat out their cunt.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunt<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. $assistantName's avatar attempts to sneak a hand down _his2 dress, but is thwarted by _his2 belly. _He2 instead openly rubs _his2 crotch through the front of _his2 dress, blushing furiously.
<<elseif $assistantAppearance == "schoolgirl">>
"To get this marriage started," $assistantName concludes, "$activeSlave.slaveName, the rules say you should now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina == 1>> and eat <<if $PC.title == 1>>his<<else>>$his<</if>> pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave <<if _reactionType == 0>>only starts when you push $his head to your crotch<<elseif _reactionType == 1>>eagerly complies<<elseif _reactionType == 2>>reluctantly obeys<<else>>hurries to obey<</if>>. Pleased by the sight, $assistantName's avatar starts to jill off.
<<elseif $assistantAppearance == "angel">>
@@ -628,7 +634,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
<</if>>
<<if $activeSlave.devotion+$activeSlave.trust >= 175>>
<<if $activeSlave.relationship > 0>>
- $His ex is @@.mediumorchid;disappointed@@ that their relationship had to end and @@.gold;worries@@ for $his love's future.
+ $His ex is @@.mediumorchid;disappointed@@ that their relationship had to end and @@.gold;worries@@ for her love's future.
<<if $activeSlave.relationship == 4>>
<<set $slaves[_m].devotion -= 5, $slaves[_m].trust -= 5>>
<<elseif $activeSlave.relationship == 3>>
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index dbf9a1019b7c46baf425f18706ebca1a5a8ed6f6..de2b27a88e3e6a04e116f29c953e8b987d466edc 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -137,7 +137,7 @@ You walk around $him, drawing closer and slowly resting your hand on $his head.
$He reflexively turns away from you, but you tenderly hold $his chin and maneuver $him in position with one hand and slowly but gently move your other hand to the top of $his head. Spluttering, $he leans backwards, but you catch $him by the shoulder and pin $him against you, where you feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>, before resuming your gentle stroking. $He desperately tries to wriggle out of your grasp, but $his struggles slowly subside as $he realizes that you're not taking this any farther. Tenderly and lovingly you stroke your fingers over $his head, appreciating the feeling of your slave's rebelliousness.
<</if>>
-You pat $him softly move your palm down the side of $his head with a soothing touch as you pet $him. Gently you start to run your down the back of his head, softly stroking and caressing $him. You delicately lift $his head and touch your fingertips to $his chin, tenderly brushing along the line of $his mouth with the your <<if $PC.title == 1>>manly<<else>>feminine<</if>> thumb.
+You pat $him softly move your palm down the side of $his head with a soothing touch as you pet $him. Gently you start to run your hand down the back of $his head, softly stroking and caressing $him. You delicately lift $his head and touch your fingertips to $his chin, tenderly brushing along the line of $his mouth with the your <<if $PC.title == 1>>manly<<else>>feminine<</if>> thumb.
<<if $activeSlave.hStyle == "shaved bald">>
Then, you gently touch $his
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index f36e7da0f824fc37476f76f0ad9e0eb80ab0b827..f89121e68312e898085030bacd7bc144b1bc563f 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -217,10 +217,10 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if
<<if $PC.boobsBonus == 3>>
<<if $activeSlave.fetish == "boobs">>
<<if $activeSlave.fetishKnown == 0>>
- She keeps stealing glances at your huge rack.<<if canAchieveErection($activeSlave)>> Her dick rapidly hardening.<</if>> You stretch, giving her a fantastic view of your breasts, before circling around behind her and cupping her chest. Between your tits against her back, and how teasingly big you are pretending her breasts will be, she can't contain herself; she cums from overstimulation, completely pinning her @@.green;as a breast fetishist!@@
+ She keeps stealing glances at your huge rack<<if canAchieveErection($activeSlave)>>, her dick rapidly hardening<</if>>. You stretch, giving her a fantastic view of your breasts, before circling around behind her and cupping her chest. Between your tits against her back, and how teasingly big you are pretending her breasts will be, she can't contain herself; she cums from overstimulation, completely pinning her @@.green;as a breast fetishist!@@
<<set $activeSlave.fetishKnown = 1>>
<<else>>
- She keeps stealing glances at your huge rack<<if canAchieveErection($activeSlave)>>, her dick rapidly hardening<</if>>, As you inspect her, you take care to keep "accidentally" bumping her with your tits, before "tripping" and landing with her face buried in your chest. She is practically bursting with lust by the end and @color:hotpink;eager to please you@@ so she can be close to those boobs.
+ She keeps stealing glances at your huge rack<<if canAchieveErection($activeSlave)>>, her dick rapidly hardening<</if>>. As you inspect her, you take care to keep "accidentally" bumping her with your tits, before "tripping" and landing with her face buried in your chest. She is practically bursting with lust by the end and @color:hotpink;eager to please you@@ so she can be close to those boobs.
<<set $activeSlave.devotion += 5>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 8c7b9b67c2083a3c123fc604ea5ea77dda7053b4..0ce9d5f1a22657a0da110ff7c642dc5292f95db5 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -7677,7 +7677,7 @@
the sight of her holes stretched to their limits,
<<set $desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her stuffed to her limit">>
<<elseif $slaves[$i].bellyPreg >= 1500>>
- <<set $slaves[$i].prestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with growth of her belly and her pregnant pussy.">>
+ <<set $slaves[$i].prestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the growth of her belly and her pregnant pussy.">>
the sight of her rounded belly and pregnant pussy,
<<set $desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her pregnant pussy getting pounded">>
<<else>>
diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index c53eb120422f58f2a1c66e9d9760d51cf56e63b3..e036edce7fd17bc818b4762981e5dd0b8f7af865 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -1,6 +1,4 @@
-:: SE expiration
-
-<<nobr>>
+:: SE expiration [nobr]
<<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
@@ -13,14 +11,14 @@
$activeSlave.slaveName's indentured servitude is ending this week, meaning that your arcology is gaining a citizen.
<<set $ACitizens += 1>>
-<<set $seed = 0>>
-<<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].devotion <= 20>>
- <<set $seed = 1>>
- <<set $slaves[$i].devotion -= 1>>
+<<set _seed = 0>>
+<<for _seexp = 0; _seexp < $slaves.length; _seexp++>>
+ <<if $slaves[_seexp].devotion <= 20>>
+ <<set _seed = 1>>
+ <<set $slaves[_seexp].devotion -= 1>>
<</if>>
<</for>>
-<<if $seed == 1>>
+<<if _seed == 1>>
Those of your slaves who are unhappy with their lives under you are @@.mediumorchid;envious or angry@@ to see her become free, according to their individual natures.
<</if>>
@@ -29,110 +27,103 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
<<if $activeSlave.fetish == "mindbroken">>
-Since she is mindbroken, there is precisely no chance that she will be able to look after herself. She stands before you dumbly, betraying no reaction to the prospect of becoming free from sexual slavery. In situations like this, it is perfectly acceptable to subject her to another indenture for her own good.
-<br><br>
-
-<span id="result">
-<<if $cash > 1000>>
-<<link "Plead necessity and reactivate her indenture">>
- <<replace "#result">>
- <<nobr>>
- You plead necessity and place her under another indenture, paying the trivial fees left over once she has been charged for her own forecasted upkeep. Naturally, she offers no response at all to any of this.
- <</nobr>>
- <<set $cash -= 1000>>
- <<set $ACitizens -= 1>>
- <<set $expired = 0>><<set $expiree = 0>>
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].indenture == 0>>
- <<set $expiree = $slaves[$i].ID>>
- <<break>>
+ Since she is mindbroken, there is precisely no chance that she will be able to look after herself. She <<if $activeSlave.amp != 1>>stands<<else>>sits<</if>> before you dumbly, betraying no reaction to the prospect of becoming free from sexual slavery. In situations like this, it is perfectly acceptable to subject her to another indenture for her own good.
+ <br><br>
+
+ <span id="result">
+ <<if $cash > 1000>>
+ <<link "Plead necessity and reactivate her indenture">>
+ <<replace "#result">>
+ You plead necessity and place her under another indenture, paying the trivial fees left over once she has been charged for her own forecasted upkeep. Naturally, she offers no response at all to any of this.
+ <<set $cash -= 1000>>
+ <<set $ACitizens -= 1>>
+ <<set $expired = 0 $expiree = 0>>
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].indenture == 0>>
+ <<set $expiree = $slaves[$i].ID>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</replace>>
+ <</link>> //This cost <<print cashFormat(1000)>>//
+ <<else>>//You cannot afford to do this//
<</if>>
- <</for>>
- <</replace>>
-<</link>> //This cost <<print cashFormat(1000)>>//
-<<else>>//You cannot afford to do this//
-<</if>>
-</span>
+ </span>
<<elseif ($activeSlave.relationship < -1) && ($activeSlave.devotion > 95) && ($activeSlave.trust > 95)>>
-She has been trying desperately hard not to think about this trying situation, but when she comes before you on the day of her indenture's expiration, she can ignore it no longer. She
-<<if $activeSlave.amp == 1>>
- wriggles disconsolately, probably wishing she could throw herself at your feet or cling to your knees.
-<<else>>
- throws herself at your feet and clings to your knees, bursting into tears.
-<</if>>
-<<if !canTalk($activeSlave)>>
- She does her best to communicate an earnest desire to stay, and repeats over and over that she loves you. She begins to indicate a willingness to accept true, unlimited slavery, if that's what it takes to stay.
-<<else>>
- "Plea<<s>>e <<Master>>, don't <<s>>end me away," she sobs. "I love you! I'll d-do anything - I'll be your <<s>>lave! Plea<<s>>e, en<<s>>lave me. I l-love you...," she moans, trailing off into convulsive blubbering.
-<</if>>
-<br><br>
-
-<span id="result">
-<<if $cash > 1000>>
-<<link "Enslave her">>
- <<replace "#result">>
- <<nobr>>
- She's beside herself with joy when you accept her plea and enslave her. She's given you the finest proof of loyalty a slave possibly can, having tasted a moment of freedom under the law, and thrown it away with utter contempt. Her $activeSlave.eyeColor eyes watch you with eager anticipation, radiating gladness that the prospect of separation from you has gone.
- <</nobr>>
- <<set $activeSlave.indenture = -1>>
- <<set $activeSlave.indentureRestrictions = 0>>
- <<set $cash -= 1000>>
- <<set $ACitizens -= 1>>
- <<set $expired = 0>><<set $expiree = 0>>
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].indenture == 0>>
- <<set $expiree = $slaves[$i].ID>>
- <<break>>
+ She has been trying desperately hard not to think about this trying situation, but when she comes before you on the day of her indenture's expiration, she can ignore it no longer. She
+ <<if $activeSlave.amp == 1>>
+ wriggles disconsolately, probably wishing she could throw herself at your feet or cling to your knees.
+ <<else>>
+ throws herself at your feet and clings to your knees, bursting into tears.
<</if>>
- <</for>>
- <</replace>>
-<</link>> //This will cost <<print cashFormat(1000)>>//
-<<else>>//You cannot afford to do this//
-<</if>>
-</span>
+ <<if !canTalk($activeSlave)>>
+ She does her best to communicate an earnest desire to stay, and repeats over and over that she loves you. She begins to indicate a willingness to accept true, unlimited slavery, if that's what it takes to stay.
+ <<else>>
+ "Plea<<s>>e <<Master>>, don't <<s>>end me away," she sobs. "I love you! I'll d-do anything - I'll be your <<s>>lave! Plea<<s>>e, en<<s>>lave me. I l-love you...," she moans, trailing off into convulsive blubbering.
+ <</if>>
+ <br><br>
+
+ <span id="result">
+ <<if $cash > 1000>>
+ <<link "Enslave her">>
+ <<replace "#result">>
+ She's beside herself with joy when you accept her plea and enslave her. She's given you the finest proof of loyalty a slave possibly can, having tasted a moment of freedom under the law, and thrown it away with utter contempt. Her $activeSlave.eyeColor eyes <<if canSee($activeSlave)>>watch you<<else>>are wide<</if>> with eager anticipation, radiating gladness that the prospect of separation from you has gone.
+ <<set $activeSlave.indenture = -1, $activeSlave.indentureRestrictions = 0>>
+ <<set $cash -= 1000>>
+ <<set $ACitizens -= 1>>
+ <<set $expired = 0, $expiree = 0>>
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].indenture == 0>>
+ <<set $expiree = $slaves[$i].ID>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</replace>>
+ <</link>> //This will cost <<print cashFormat(1000)>>//
+ <<else>>//You cannot afford to do this//
+ <</if>>
+ </span>
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.trust > 50)>>
-<<set $slaveCost = Math.trunc(($slaveCost*0.5)/500)*500>>
-<<set $slaveCost = Math.clamp($slaveCost, $minimumSlaveCost, 100000)>>
-
-Her feelings on this are quite mixed, since she has come to feel that she has a place under you.
-<<if $activeSlave.amp == 1>>
- Propped up
-<<else>>
- Standing before you
-<</if>>
-at the moment of her scheduled emancipation, she seems to be struggling to express herself.
-<<if !canTalk($activeSlave)>>
- She does her best to communicate a willingness to remain your slave, indicating that she wouldn't press too hard about the price if you offered her another indenture.
-<<else>>
- "<<Master>>, um," she <<say>>s hesitantly. "I don't mind being your <<s>>lave. Could I - would you plea<<s>>e give me another indenture? I'm, um, not too worried about the pri<<c>>e."
-<</if>>
-<br><br>
+ <<set $slaveCost = Math.trunc(($slaveCost*0.5)/500)*500>>
+ <<set $slaveCost = Math.clamp($slaveCost, $minimumSlaveCost, 100000)>>
-<span id="result">
-<<if $cash > $slaveCost>>
-<<link "Offer her a one year supplementary indenture">>
- <<replace "#result">>
- <<nobr>>
- She smiles almost shyly when you offer her a one year supplementary indenture. The price is reasonable, but definitely favorable to you. She accepts it anyway, and you transfer the money into an escrow account to be held for her until her new indenture is done. Your sex slave once again, she awaits your pleasure without a hint of fear.
- <</nobr>>
- <<set $cash -= $slaveCost>>
- <<set $ACitizens -= 1>>
- <<set $expired = 0>><<set $expiree = 0>>
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].indenture == 0>>
- <<set $expiree = $slaves[$i].ID>>
- <<break>>
+ Her feelings on this are quite mixed, since she has come to feel that she has a place under you.
+ <<if $activeSlave.amp == 1>>
+ Propped up
+ <<else>>
+ Standing before you
<</if>>
- <</for>>
- <</replace>>
-<</link>> //This will cost <<print cashFormat($slaveCost)>>//
-<<else>>//You cannot afford to do this//
-<</if>>
-</span>
+ at the moment of her scheduled emancipation, she seems to be struggling to express herself.
+ <<if !canTalk($activeSlave)>>
+ She does her best to communicate a willingness to remain your slave, indicating that she wouldn't press too hard about the price if you offered her another indenture.
+ <<else>>
+ "<<Master>>, um," she <<say>>s hesitantly. "I don't mind being your <<s>>lave. Could I - would you plea<<s>>e give me another indenture? I'm, um, not too worried about the pri<<c>>e."
+ <</if>>
+ <br><br>
+
+ <span id="result">
+ <<if $cash > $slaveCost>>
+ <<link "Offer her a one year supplementary indenture">>
+ <<replace "#result">>
+ She smiles almost shyly when you offer her a one year supplementary indenture. The price is reasonable, but definitely favorable to you. She accepts it anyway, and you transfer the money into an escrow account to be held for her until her new indenture is done. Your sex slave once again, she awaits your pleasure without a hint of fear.
+ <<set $cash -= $slaveCost>>
+ <<set $ACitizens -= 1>>
+ <<set $expired = 0>><<set $expiree = 0>>
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].indenture == 0>>
+ <<set $expiree = $slaves[$i].ID>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</replace>>
+ <</link>> //This will cost <<print cashFormat($slaveCost)>>//
+ <<else>>//You cannot afford to do this//
+ <</if>>
+ </span>
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust > 20)>>
@@ -147,22 +138,20 @@ at the moment of her scheduled emancipation, she seems willing to consider a sho
<span id="result">
<<if $cash > $slaveCost>>
-<<link "Offer her a one year supplementary indenture">>
- <<replace "#result">>
- <<nobr>>
- She looks pensive when you offer her a one year supplementary indenture. The price reflects the market, and is a reasonable compensation for a year of sexual slavery. She accepts it after some consideration, and you transfer the money into an escrow account to be held for her until her new indenture is done. Your sex slave once again, she awaits orders with complacency.
- <</nobr>>
- <<set $cash -= $slaveCost>>
- <<set $ACitizens -= 1>>
- <<set $expired = 0>><<set $expiree = 0>>
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].indenture == 0>>
- <<set $expiree = $slaves[$i].ID>>
- <<break>>
- <</if>>
- <</for>>
- <</replace>>
-<</link>> //This will cost <<print cashFormat($slaveCost)>>//
+ <<link "Offer her a one year supplementary indenture">>
+ <<replace "#result">>
+ She looks pensive when you offer her a one year supplementary indenture. The price reflects the market, and is a reasonable compensation for a year of sexual slavery. She accepts it after some consideration, and you transfer the money into an escrow account to be held for her until her new indenture is done. Your sex slave once again, she awaits orders with complacency.
+ <<set $cash -= $slaveCost>>
+ <<set $ACitizens -= 1>>
+ <<set $expired = 0>><<set $expiree = 0>>
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].indenture == 0>>
+ <<set $expiree = $slaves[$i].ID>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</replace>>
+ <</link>> //This will cost <<print cashFormat($slaveCost)>>//
<<else>>//You cannot afford to do this//
<</if>>
</span>
@@ -172,5 +161,3 @@ at the moment of her scheduled emancipation, she seems willing to consider a sho
She makes no effort at all to conceal her joy at being a free woman again. It seems very unlikely that she'll stay in the arcology; she'll probably take what remains of her indenture payment, held in escrow for this day, and be off to wherever it is that she came from in the first place.
<</if>>
-
-<</nobr>>