diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index b4cbe140e711f65cbab8b8abe3870770e2692e22..4944b5f1d8fee064a86c0a13efadc01d85f6a027 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -235,7 +235,7 @@ Pharmaceutical fabricators are the cutting edge of modern medicine. They are in
There are remote surgical and tattoo implements if you wish to hire an artist to do the work for you, but there are also sophisticated piercing and tattoo implements that can help you plan and apply the work yourself. Select a body part and a desired modification, and they'll do the rest.
-Your equipment will cost ¤$modCost per use. These procedures are not especially invasive, and you can perform as many of them as you wish during a single week without fear for your slave's health.//
+Your equipment will cost ¤<<print $modCost>> per use. These procedures are not especially invasive, and you can perform as many of them as you wish during a single week without fear for your slave's health.//
<<case "The Auto Salon">>\
//Your auto salon is similar to the studio and the remote surgery, but is far less intimidating. It is set up like a single seat from an old world beauty salon, except that a series of manipulators descend from the ceiling towards the chair. It can perform any of the usual cosmetic services. The only special capability it has is to automatically color coordinate nails and makeup with a slave's hair. It is fashionable to apply color schemes to slaves, and this function will make following the trend easy. Your salon will cost ¤$modCost per use. These procedures are not especially invasive, and you can perform as many of them as you wish during a single week without fear for your slave's health.//
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 6c5d02d7c1cbd26593a45d2cddaf05d09fec4263..397bebcd0355fd4177c7eee30821cef1e230a417 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -25,16 +25,16 @@
<<if canTalk($activeSlave) == false>>
She uses gestures to beg your pardon and explains that while she enjoys life as your slave, she doesn't feel like her new role in your arcology allows her to stimulate her mind as often as it does her body.
<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>
- "<<Master>>," she says. "I really enjoy my role ath your thlave, but I jutht don't feel like my new life thtimulateth me" She blushes prettily at her choice of words before continuing, "Thtimulate my mind, I mean."
+ "<<Master>>," she says. "I really enjoy my role ath your thlave, but I jutht don't feel like my new life thtimulateth me." She blushes prettily at her choice of words before continuing, "Thtimulate my mind, I mean."
<<else>>
- "<<Master>>," she says. "I really enjoy my role as your slave, but I just don't feel like my new life stimulates me" She blushes prettily at her choice of words before continuing, "Stimulate my mind, I mean."
+ "<<Master>>," she says. "I really enjoy my role as your slave, but I just don't feel like my new life stimulates me." She blushes prettily at her choice of words before continuing, "Stimulate my mind, I mean."
<</if>>
<<case "nice guys">>
One afternoon, $assistantName informs you she that she has a non-urgent matter that you might be interested in overseeing personally.
<<if $assistant > 0>>
- Her $assistantAppearance avatar looks unusually curious. "<<Master>>," she says, "a group of tourists have just entered the arcology. They seem strangely enthralled by <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span>." Before you can ask why she deemed this important enough news to draw your attention to, she continues, "They're not using her or anything. Just look." She
+ Her $assistantAppearance avatar looks unusually curious. "<<if $PC.title == 1>>Sir<<else>>Ma'am<</if>>," she says, "a group of tourists have just entered the arcology. They seem strangely enthralled by <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span>." Before you can ask why she deemed this important enough news to draw your attention to, she continues, "They're not using her or anything. Just look." She
<<else>>
She announces that a group of tourists have just entered the arcology, and seem unusually enthralled by <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span>. Before you can ask why it's bothering you with this, it continues, "A business opportunity may exist," and
<</if>>
@@ -108,7 +108,7 @@ She saunters over and kneels obediently in front of you, awaiting further direct
<<if canTalk($activeSlave) == false>>
She uses gestures to beg your pardon, even as she continues to blush rosily, and explains that she doesn't understand why you keep her in your penthouse, when there are such tall, beautiful slaves in abundance in your arcology. She pauses, shuffling about a little shamefacedly before signing that she thinks their bodies could be more fit to pleasure you.
<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>
- "<<Master>>," she lisps. "Why do you keep a thhort, plain thlave like me in your penthouthe, when there are thuth beautiful, tall thlaveth out there in the arcology?." She shuffles about under your gaze a little shamefacedly before lisping in a quiet voice "Thurely, their bodieth are more fit for pleathuring you."
+ "<<Master>>," she lisps. "Why do you keep a thhort, plain thlave like me in your penthouthe, when there are thuth beautiful, tall thlaveth out there in the arcology?." She shuffles about under your gaze a little shamefacedly before lisping in a quiet voice, "Thurely, their bodieth are more fit for pleathuring you."
<<else>>
"<<Master>>," she says. "Why do you keep a short, plain slave like me in your penthouse, when there are such beautiful, tall slaves out there in the arcology?" She shuffles about under your gaze a little shamefacedly before saying in a quiet voice, "Surely, their bodies are more fit for pleasuring you."
<</if>>
diff --git a/src/uncategorized/barracks.tw b/src/uncategorized/barracks.tw
index 457dcf7413d96dbdb48ce760b74242d7af47bd95..e5b093fc9c2f87d0d16571276f20f49f6a2a0295 100644
--- a/src/uncategorized/barracks.tw
+++ b/src/uncategorized/barracks.tw
@@ -18,7 +18,7 @@ As you enter the main bay of the barracks, lined with modern arms and armor and
<</if>>
<</if>>
-<<if $mercenariesTitle>>
+<<if $mercenariesTitle != "mercenaries">>
They've taken to their role as $mercenariesTitle.
<<switch $mercenariesTitle>>
<<case "Knights">>
@@ -45,76 +45,78 @@ As you enter the main bay of the barracks, lined with modern arms and armor and
Their gear is designed to take their foes alive and relatively unharmed, though lethal force can be applied if need be.
<</switch>>
<</if>>
+There are doors to magazines, armories, and training areas to all sides, and muffled gunfire can be heard from the latter.
-There are doors to magazines, armories, and training areas to all sides, and muffled gunfire can be heard from the last. You head up a deck, to the staff area, and up one more, to look into the living area. It's comfortable and very well-kept, since they have a large number of slaves here to look after them. Relaxing mercenaries are scattered around the common areas, and most are enjoying a slave or two.
+<br><br>
+You head up a deck, to the staff area, and up one more, to look into the living area. It's comfortable and very well-kept, since they have a large number of slaves here to look after them. Relaxing mercenaries are scattered around the common areas, and most are enjoying a slave or two.
<<if $FSAnnounced>>
They're obviously adopting the customs of $arcologies[0].name.
<<set _vignette = 0>>
- <<if $activeArcology.FSSubjugationist != "unset">>
- A mercenary is fingering a $activeArcology.FSSubjugationistRace girl's <<if $seeDicks != 100>>pussy<<else>>anus<</if>>. She's wincing a little; she must be new here.
+ <<if $arcologies[0].FSSubjugationist != "unset">>
+ A mercenary is fingering a $arcologies[0].FSSubjugationistRace girl's <<if $seeDicks != 100>>pussy<<else>>anus<</if>>. She's wincing a little; she must be new here.
<<set _vignette++>>
<</if>>
- <<if $activeArcology.FSSupremacist != "unset">>
+ <<if $arcologies[0].FSSupremacist != "unset">>
<<if _vignette>>Another<<else>>A<</if>> mercenary, a woman, is being seen to by a multicultural bunch of subhumans of different races. She has one eating her out while two more are rubbing her feet.
<<set _vignette++>>
<</if>>
- <<if $activeArcology.FSGenderRadicalist != "unset">>
+ <<if $arcologies[0].FSGenderRadicalist != "unset">>
<<if _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary, who's rather obviously earned enough money to pay for the surgeries and drugs to turn herself into an imposing futanari, is pounding a dickgirl slave.
<<set _vignette++>>
- <<elseif $activeArcology.FSGenderFundamentalist != "unset">>
+ <<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
<<if _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is fucking a slave
- <<if $activeArcology.FSRestart != "unset">>
+ <<if $arcologies[0].FSRestart != "unset">>
lotus style. His hands are greedily following her womanly curves as they bang.
<<else>>
doggy style. He's massaging her rounded belly as she enjoys her first foray into motherhood.
<</if>>
<<set _vignette++>>
<</if>>
- <<if $activeArcology.FSPaternalist != "unset">>
+ <<if $arcologies[0].FSPaternalist != "unset">>
<<if _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is making out with a pretty slave. An old romantic movie is playing on a wallscreen in front of them, forgotten.
<<set _vignette++>>
- <<elseif $activeArcology.FSDegradationist != "unset">>
+ <<elseif $arcologies[0].FSDegradationist != "unset">>
<<if _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is using a slave as a footrest as he relaxes. She has a huge dildo up her ass, and whenever she moves, he uses a foot to shove it farther inside her.
<<set _vignette++>>
<</if>>
- <<if $activeArcology.FSBodyPurist != "unset">>
+ <<if $arcologies[0].FSBodyPurist != "unset">>
<<if _vignette >= 4>>Finally, a<<elseif _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is idly playing with a slave's natural breasts as he watches a wallscreen. He's being gentle and she doesn't seem to mind.
<<set _vignette++>>
- <<elseif $activeArcology.FSTransformationFetishist != "unset">>
+ <<elseif $arcologies[0].FSTransformationFetishist != "unset">>
<<if _vignette >= 4>>Finally, a<<elseif _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is fucking a bimbo slave doggy style. Her fake tits are so huge that the motion is making them slap together under her.
<<set _vignette++>>
<</if>>
- <<if $activeArcology.FSYouthPreferentialist != "unset">>
+ <<if $arcologies[0].FSYouthPreferentialist != "unset">>
<<if _vignette >= 4>>Finally, a<<elseif _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is getting a blowjob from a young slave. He's playing with her <<if $seeDicks != 100>>fresh pussy<<else>>tight little anus<</if>> as she sucks his dick.
<<set _vignette++>>
- <<elseif $activeArcology.FSMaturityPreferentialist != "unset">>
+ <<elseif $arcologies[0].FSMaturityPreferentialist != "unset">>
<<if _vignette >= 4>>Finally, a<<elseif _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is getting a massage from a mature slave. She's wearing a towel, but he sneaks a hand back and steals it, freeing her heavy breasts.
<<set _vignette++>>
<</if>>
- <<if $activeArcology.FSSlimnessEnthusiast != "unset">>
+ <<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
<<if _vignette >= 4>>Finally, a<<elseif _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is getting a lapdance from a lithe slave. She's moving her cute butt lower and lower, getting ready to impale herself on his raging erection.
<<set _vignette++>>
- <<elseif $activeArcology.FSAssetExpansionist != "unset">>
+ <<elseif $arcologies[0].FSAssetExpansionist != "unset">>
<<if _vignette >= 4>>Finally, a<<elseif _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is almost hidden by a slave he's got in his lap. He has his head buried between her monstrous breasts, and it's not clear how he's breathing.
<</if>>
- <<if $activeArcology.FSPastoralist != "unset">>
+ <<if $arcologies[0].FSPastoralist != "unset">>
<<if _vignette >= 4>>Finally, a<<elseif _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is drinking a slave's milk, straight from the nipple, while idly massaging her other breast, bringing out a thin stream of milk.
- <<elseif $activeArcology.FSPhysicalIdealist != "unset">>
+ <<elseif $arcologies[0].FSPhysicalIdealist != "unset">>
<<if _vignette >= 4>>Finally, a<<elseif _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is doing pushups with a well-endowed slave sitting on his back to add weight. She's counting his reps for him.
<</if>>
- <<if $activeArcology.FSChattelReligionist != "unset">>
+ <<if $arcologies[0].FSChattelReligionist != "unset">>
<<if _vignette >= 4>>Finally, a<<elseif _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is mounting a praying slave from behind. It doesn't distract her; her quiet devotions become more fervent as he fucks her.
<</if>>
- <<if $activeArcology.FSRepopulationFocus != "unset">>
+ <<if $arcologies[0].FSRepopulationFocus != "unset">>
<<if _vignette >= 4>>Finally, a<<elseif _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is being ridden by an enormously pregnant slave. He's massaging her taut belly as she uses her hands to support her sore boobs.
- <<elseif $activeArcology.FSRestart != "unset">>
+ <<elseif $arcologies[0].FSRestart != "unset">>
<<if _vignette >= 4>>Finally, a<<elseif _vignette >= 3>>Yet another<<elseif _vignette >= 2>>A third<<elseif _vignette>>Another<<else>>A<</if>> mercenary is being serviced by a slave with a visibly smooth crotch. He has a dildo rammed in her ass and moves it along with her sucking.
<</if>>
- <<if $activeArcology.FSRomanRevivalist != "unset">>
- <<elseif $activeArcology.FSEgyptianRevivalist != "unset">>
- <<elseif $activeArcology.FSEdoRevivalist != "unset">>
- <<elseif $activeArcology.FSArabianRevivalist != "unset">>
- <<elseif $activeArcology.FSChineseRevivalist != "unset">>
+ <<if $arcologies[0].FSRomanRevivalist != "unset">>
+ <<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
+ <<elseif $arcologies[0].FSEdoRevivalist != "unset">>
+ <<elseif $arcologies[0].FSArabianRevivalist != "unset">>
+ <<elseif $arcologies[0].FSChineseRevivalist != "unset">>
<</if>>
<</if>>
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index 65d8243372236abbde957466d191e8e2174c50d7..d748e812d144204fbd71a5c12041e03a0c8377d5 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -34,8 +34,8 @@
<<if $mercenaries > 0>>
<<set _mercCosts = $mercenaries*2000>>
- <<if $barracks>><<set _mercCosts /= 0.5>><</if>>
- <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>><<set _mercCosts /= 0.5>><</if>>
+ <<if $barracks>><<set _mercCosts *= 0.5>><</if>>
+ <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>><<set _mercCosts *= 0.5>><</if>>
<<set $costs += _mercCosts>>
<</if>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 7872e84b0953c4c2f4674d7bae130022629442eb..bc473bec4cb23bbd35a8b8e81149cea92d1dcfde 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -26,8 +26,8 @@
<<if $mercenaries > 0>>
<<set _mercCosts = $mercenaries*2000>>
- <<if $barracks>><<set _mercCosts /= 0.5>><</if>>
- <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>><<set _mercCosts /= 0.5>><</if>>
+ <<if $barracks>><<set _mercCosts *= 0.5>><</if>>
+ <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>><<set _mercCosts *= 0.5>><</if>>
<<set $costs += _mercCosts>>
<br>__Mercenary__ expenses: ¤_mercCosts
<<if $barracks>><<else>>//@@.red;Increased by the lack of a barracks.@@//<</if>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 7ae851d6fcf11b4d088295d3df2f72e17c3c2f4b..ca6510210edd2e80a53a00dfb94b039a4dcf0a01 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -381,13 +381,16 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if ($arcologies[$i].government == "your agent") || ($arcologies[$i].government == "your trustees")>>
<<set $arcologies[$i].ownership = 0>>
<</if>>
+<<set _owned = $arcologies[$i].minority+$arcologies[$i].ownership+$arcologies[$i].PCminority>>
<<if $arcologies[$i].minority < 10>>
<<set $arcologies[$i].minority = 0>>
<<elseif $arcologies[$i].minority < $arcologies[$i].PCminority>>
<<set $arcologies[$i].minority = 0>>
-<<elseif $arcologies[$i].minority > (100 - $arcologies[$i].minority - $arcologies[$i].ownership - $arcologies[$i].PCminority)*5>>
+<<elseif _owned >= 95>>
<<set $arcologies[$i].minority -= random(3,5)>>
-<<elseif $arcologies[$i].minority < (100 - $arcologies[$i].minority - $arcologies[$i].ownership - $arcologies[$i].PCminority)*4>>
+<<elseif $arcologies[$i].minority > (100 - _owned)*5>>
+ <<set $arcologies[$i].minority -= random(3,5)>>
+<<elseif $arcologies[$i].minority < (100 - _owned)*4>>
<<if $arcologies[$i].minority < 10>>
<<if $arcologies[$i].ownership + $arcologies[$i].PCminority <= 90>>
<<set $arcologies[$i].minority = 10>>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 7e55c06bb3c86efc7c2e0f9cb35ad1885bcd67d4..33843e80b28651e5cdb4c84852cbe7b835ed9c6e 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -1347,11 +1347,11 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
She's become even more irresistible lately; <<if $PC.vagina == 1>>you can help but think of that perfect cock cumming deep in your pussy and your belly rounding with a gorgeous child<<else>>the children sired by a stud are unimaginable<</if>>.
<<case "gender radicalist">>
<<if $arcologies[0].FSGenderRadicalistLawFuta == 1>>
- futa, obv
+ She is wearing nothing at all and has recently rendered herself slightly more feminine. She makes sure to make exaggerated motions to show off the pussy hidden beneath her swinging nuts.
<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 2>>
- dick+balls worship
+ She has recently increased the size of her genitals and has given up trying to wear pants; they just get in the way of her prominent erection.
<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 3>>
- butt
+ She is wearing nothing at all; not that anything could fit her. Her cock and balls are utterly dwarfed by her door-jamming hips, massive ass and extra thick thighs.
<<else>>
She is wearing nothing at all and has recently rendered herself even more handsome, since she was already a perfect fit for society.
<</if>>
@@ -1438,11 +1438,11 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
She's become even more irresistible lately; <<if $PC.vagina == 1>>you can help but think of that perfect cock cumming deep in your pussy and your belly rounding with a gorgeous child<<else>>the children sired by a stud are unimaginable<</if>>.
<<case "gender radicalist">>
<<if $arcologies[0].FSGenderRadicalistLawFuta == 1>>
- futa, obv
+ She is wearing nothing at all and has recently rendered herself slightly more feminine. She makes sure to make exaggerated motions to show off the pussy hidden beneath her swinging nuts.
<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 2>>
- dick+balls worship
+ She has recently increased the size of her genitals and has given up trying to wear pants; they just get in the way of her prominent erection.
<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 3>>
- butt
+ She is wearing nothing at all; not that anything could fit her. Her cock and balls are utterly dwarfed by her door-jamming hips, massive ass and extra thick thighs.
<<else>>
She is wearing nothing at all and has recently rendered herself even more handsome, since she was already a perfect fit for society.
<</if>>
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index dd1b4a1602139654b1b4c048e8ac0d26da8bb3e5..d92772cd01cd5b883b1c84f84c0d810173bc73cb 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -1301,7 +1301,7 @@ Buttplugs for other slaves: ''$currentRule.buttplug.''
<br><br>
-__Rule $r Drug Regimen:__
+__Rule $r Physical Regimen:__
<br>
@@ -2237,21 +2237,21 @@ Smart piercing fetish target: <span id = "spf">''$currentRule.clitSetting.''</sp
<<RAChangeApply>>
<</link>>
|
-<<link "Pregnancy">>
+<<link "Preg">>
<<set $currentRule.clitSetting = "pregnancy">>
<<RAChangeSPF>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Masochist">>
+<<link "Pain">>
<<set $currentRule.clitSetting = "masochist">>
<<RAChangeSPF>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
|
-<<link "Sadist">>
+<<link "Sadism">>
<<set $currentRule.clitSetting = "sadist">>
<<RAChangeSPF>>
<<RAChangeSave>>
@@ -2597,7 +2597,7 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<set $currentRule.releaseRules = "restrictive">>
<<set $currentRule.standardPunishment = "confinement">>
<<set $currentRule.standardReward = "relaxation">>
- <<set $currentRule.clitSetting = "all">>
+ <<set $currentRule.clitSetting = "anal", $currentRule.clitSettingXY = 100, $currentRule.clitSettingXX = 100, $currentRule.clitSettingEnergy = 100>>
<<set $currentRule.speechRules = "permissive">>
<<set $currentRule.relationshipRules = "permissive">>
<<set $currentRule.livingRules = "luxurious">>
@@ -2675,7 +2675,7 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<set $currentRule.releaseRules = "restrictive">>
<<set $currentRule.standardPunishment = "whipping">>
<<set $currentRule.standardReward = "orgasm">>
- <<set $currentRule.clitSetting = "all">>
+ <<set $currentRule.clitSetting = "anal", $currentRule.clitSettingXY = 100, $currentRule.clitSettingXX = 100, $currentRule.clitSettingEnergy = 100>>
<<set $currentRule.speechRules = "restrictive">>
<<set $currentRule.relationshipRules = "restrictive">>
<<set $currentRule.livingRules = "spare">>
@@ -2752,7 +2752,7 @@ Relationship rules: ''$currentRule.relationshipRules.''
<<set $currentRule.releaseRules = "no default setting">>
<<set $currentRule.standardPunishment = "no default setting">>
<<set $currentRule.standardReward = "no default setting">>
- <<set $currentRule.clitSetting = "no default setting">>
+ <<set $currentRule.clitSetting = "no default setting", $currentRule.clitSettingXY = "no default setting", $currentRule.clitSettingXX = "no default setting", $currentRule.clitSettingEnergy = "no default setting">>
<<set $currentRule.speechRules = "no default setting">>
<<set $currentRule.relationshipRules = "no default setting">>
<<set $currentRule.livingRules = "no default setting">>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index c25ef5eb6571152985a20d962926ea010b810f05..3e955ec8f102266437592917ad1f9b6baa0ca6c6 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -2924,8 +2924,7 @@
<</if>>
<</if>>
-<<if $slaves[$i].addict > 2>>
-<<if $slaves[$i].addict > random(0,100)>>
+<<if $slaves[$i].aphrodisiacs > random(0,2)>>
<<set _Effects = []>>
<<if ($slaves[$i].dick > 1)>>
<<set _Effects.push("DickShrink")>>
@@ -3018,7 +3017,6 @@
<</switch>>
<</if>>
<</if>>
-<</if>>
<<if ($slaves[$i].hormones != 0)>>
<<include "SA hormone effects">>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index d5f996e9bb9e9a20dd1ffce4c0d7445cd77059e2..6bf654c63851eb17408906f6bb7fc357bce2da6c 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -727,6 +727,8 @@ __Health__: <span id="curatives"><strong><<if $activeSlave.curatives > 1>>curati
<<link "None">><<set $activeSlave.curatives = 0>><<replace "#curatives">><strong>none</strong><</replace>><</link>>
| <<link "Preventatives">><<set $activeSlave.curatives = 1>><<replace "#curatives">><strong>preventatives</strong><</replace>><</link>>
| <<link "Curatives">><<set $activeSlave.curatives = 2>><<replace "#curatives">><strong>curatives</strong><</replace>><</link>>
+
+
__Aphrodisiacs__: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1>>extreme<<elseif $activeSlave.aphrodisiacs > 0>>applied<<else>>none<</if>></strong></span>.
<<link "None">><<set $activeSlave.aphrodisiacs = 0>><<replace "#aphrodisiacs">><strong>none</strong><</replace>><</link>>
@@ -1003,7 +1005,7 @@ __Hormones__: <strong><span id="hormones">
<<else>>Her smart frenulum piercing is set to
<</if>>
<strong><span id="setting">$activeSlave.clitSetting</span></strong>.
- <<link "Vanilla">><<set $activeSlave.clitSetting = "vanilla">><<replace "#setting">>$activeSlave.clitSetting<</replace>><</link>>
+<<link "Vanilla">><<set $activeSlave.clitSetting = "vanilla">><<replace "#setting">>$activeSlave.clitSetting<</replace>><</link>>
| <<link "Oral">><<set $activeSlave.clitSetting = "oral">><<replace "#setting">>$activeSlave.clitSetting<</replace>><</link>>
| <<link "Anal">><<set $activeSlave.clitSetting = "anal">><<replace "#setting">>$activeSlave.clitSetting<</replace>><</link>>
| <<link "Boobs">><<set $activeSlave.clitSetting = "boobs">><<replace "#setting">>$activeSlave.clitSetting<</replace>><</link>>
@@ -1025,35 +1027,35 @@ __Hormones__: <strong><span id="hormones">
<<if $activeSlave.fuckdoll == 0>>
<br>__Clothes__: ''<span id="clothes">$activeSlave.clothes</span>.''
<<link "Go naked">><<set $activeSlave.clothes = "no clothing", $activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| //Harsh clothes:// <<link "Uncomfortable straps">><<set $activeSlave.clothes = "uncomfortable straps",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| //Harsh:// <<link "Uncomfortable straps">><<set $activeSlave.clothes = "uncomfortable straps",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Shibari ropes">><<set $activeSlave.clothes = "shibari ropes",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Restrictive latex">><<set $activeSlave.clothes = "restrictive latex",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Penitent nun">><<set $activeSlave.clothes = "a penitent nuns habit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| //Nice clothes:// <<link "Nice lingerie">><<set $activeSlave.clothes = "attractive lingerie",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| //Nice:// <<link "Nice lingerie">><<set $activeSlave.clothes = "attractive lingerie",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Slutty maid">><<set $activeSlave.clothes = "a slutty maid outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Nice maid">><<set $activeSlave.clothes = "a nice maid outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Haltertop Dress">><<set $activeSlave.clothes = "a halter top dress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Mini Dress">><<set $activeSlave.clothes = "a mini dress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Silken Ballgown">><<set $activeSlave.clothes = "a ball gown",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Haltertop dress">><<set $activeSlave.clothes = "a halter top dress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Mini dress">><<set $activeSlave.clothes = "a mini dress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Silken ballgown">><<set $activeSlave.clothes = "a ball gown",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "String bikini">><<set $activeSlave.clothes = "a string bikini",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Clubslut netting">><<set $activeSlave.clothes = "clubslut netting",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Cheerleader outfit">><<set $activeSlave.clothes = "a cheerleader outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">><<print $activeSlave.clothes>><</replace>><</link>>
| <<link "Cutoffs and a t-shirt">><<set $activeSlave.clothes = "cutoffs and a t-shirt",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Slave Gown">><<set $activeSlave.clothes = "a slave gown",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Slutty Suit">><<set $activeSlave.clothes = "slutty business attire",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Nice Suit">><<set $activeSlave.clothes = "nice business attire",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Slutty Nurse">><<set $activeSlave.clothes = "a slutty nurse outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Nice Nurse">><<set $activeSlave.clothes = "a nice nurse outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Slave gown">><<set $activeSlave.clothes = "a slave gown",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Slutty suit">><<set $activeSlave.clothes = "slutty business attire",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Nice suit">><<set $activeSlave.clothes = "nice business attire",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Slutty nurse">><<set $activeSlave.clothes = "a slutty nurse outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Nice nurse">><<set $activeSlave.clothes = "a nice nurse outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Schoolgirl">><<set $activeSlave.clothes = "a schoolgirl outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Bodysuit">><<set $activeSlave.clothes = "a comfortable bodysuit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Latex catsuit">><<set $activeSlave.clothes = "a latex catsuit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Leotard">><<set $activeSlave.clothes = "a leotard",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Skimpy Battledress">><<set $activeSlave.clothes = "battledress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Military Uniform">><<set $activeSlave.clothes = "a military uniform",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Skimpy battledress">><<set $activeSlave.clothes = "battledress",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Military uniform">><<set $activeSlave.clothes = "a military uniform",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Fallen nun">><<set $activeSlave.clothes = "a fallen nuns habit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Hijab and abaya">><<set $activeSlave.clothes = "a hijab and abaya",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
| <<link "Bangles">><<set $activeSlave.clothes = "slutty jewelry",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
-| <<link "Succubus Costume">><<set $activeSlave.clothes = "a succubus outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+| <<link "Succubus costume">><<set $activeSlave.clothes = "a succubus outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>>
| //FS// <<link "Bunny outfit">><<set $activeSlave.clothes = "a bunny outfit",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
<</if>>
@@ -1088,13 +1090,13 @@ __Hormones__: <strong><span id="hormones">
| //FS// <<link "Harem gauze">><<set $activeSlave.clothes = "harem gauze",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
<</if>>
<<if ($arcologies[0].FSChineseRevivalist != "unset") || ($cheatMode == 1) || ($clothesBoughtQipao == 1)>>
- | //FS// <<link "Slutty Qipao">><<set $activeSlave.clothes = "a slutty qipao",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
+ | //FS// <<link "Slutty qipao">><<set $activeSlave.clothes = "a slutty qipao",$activeSlave.choosesOwnClothes = 0>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
<</if>>
| <<link "Select her own clothes">><<set $activeSlave.clothes = "choosing her own clothes",$activeSlave.choosesOwnClothes = 1>><<replace "#clothes">>$activeSlave.clothes<</replace>><</link>>
<br>__Collar__: ''<span id="collar">$activeSlave.collar</span>.''
<<link "None">><<set $activeSlave.collar = "none">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-| <<link "Tight steel">><<set $activeSlave.collar = "tight steel">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+| //Harsh:// <<link "Tight steel">><<set $activeSlave.collar = "tight steel">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
<<if ($seeAge != 0)>>
| <<link "Cruel retirement counter">><<set $activeSlave.collar = "cruel retirement counter">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
<</if>>
@@ -1108,7 +1110,7 @@ __Hormones__: <strong><span id="hormones">
| <<link "Massive dildo gag">><<set $activeSlave.collar = "massive dildo gag">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
<</if>>
| <<link "Neck corset">><<set $activeSlave.collar = "neck corset">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
-| <<link "Stylish leather">><<set $activeSlave.collar = "stylish leather">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+| //Nice:// <<link "Stylish leather">><<set $activeSlave.collar = "stylish leather">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
| <<link "Satin choker">><<set $activeSlave.collar = "satin choker">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
| <<link "Silken ribbon">><<set $activeSlave.collar = "silk ribbon">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
| <<link "Heavy gold">><<set $activeSlave.collar = "heavy gold">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
@@ -1116,7 +1118,7 @@ __Hormones__: <strong><span id="hormones">
<<if ($seeAge != 0)>>
| <<link "Nice retirement counter">><<set $activeSlave.collar = "nice retirement counter">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
<</if>>
-| <<link "Leather with cowbell">><<set $activeSlave.collar = "leather with cowbell">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
+| <<link "Cowbell">><<set $activeSlave.collar = "leather with cowbell">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
<<if ($arcologies[0].FSGenderFundamentalist != "unset") || ($cheatMode == 1) || ($clothesBoughtBunny == 1)>>
| //FS// <<link "Bowtie collar">><<set $activeSlave.collar = "bowtie">><<replace "#collar">>$activeSlave.collar<</replace>><</link>>
<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index c7b4ca5969bc38ad1db1fca2f5388b59cc0eed86..83931d53b585bd81e774cbc6cf509f08eddf871d 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -188,9 +188,6 @@
<<elseif $ui != "start">>\
<<nobr>>
-/*
-_Pass $nextLink
-*/
<<set _SL = $slaves.length>>
<<if $cheatMode>>_Pass<br><</if>>
<span id="week">''Week $week''</span>
@@ -550,7 +547,7 @@ _Pass $nextLink
<<elseif _Pass == "Manage Penthouse">>
<br>
<br><<link [[Wardrobe]]>><</link>>
- <<if $dispensary>><br>[[Pharmaceutical Fabricator|Dispensary]]<</if>>
+ <br><<if $dispensary>>[[Pharmaceutical Fabricator|Dispensary]]<</if>>
<br><br><br><br><br>
<<else>>
<br><br><br><br><br><br><br><br>
@@ -563,4 +560,4 @@ _Pass $nextLink
<<else>>
//FCE:// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]]
<</if>>
-<</nobr>>
+<</nobr>>
\ No newline at end of file
diff --git a/src/uncategorized/theFutanariSisters.tw b/src/uncategorized/theFutanariSisters.tw
index 3a61802683da39987120b973d9e823f2cd8c292f..7dd71d80d3b836a5d3d9139ca52129f71fc43fa0 100644
--- a/src/uncategorized/theFutanariSisters.tw
+++ b/src/uncategorized/theFutanariSisters.tw
@@ -1,11 +1,6 @@
-:: The Futanari Sisters
+:: The Futanari Sisters [nobr]
-<<set $nextButton = "Back">>\
-<<set $nextLink = "Buy Slaves">>\
-<<set $returnTo = "Buy Slaves">>\
-<<set $showEncyclopedia = 1>><<set $encyclopedia = "Slave Schools">>\
-\
-<<nobr>>
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
<<if $TFS.schoolPresent == 1>>
@@ -79,9 +74,8 @@ The Sisters offer a member selected for sale into slavery for inspection via vid
<</if>>
-<</nobr>>
+<br><br>
-<<nobr>>
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = 29>>
<<set $one_time_age_overrides_pedo_mode = 1>>
@@ -89,16 +83,11 @@ The Sisters offer a member selected for sale into slavery for inspection via vid
<<set $activeSlave.origin = "You bought her from the enigmatic Futanari Sisters after they sold her into slavery.">>
<<set $activeSlave.career = "a Futanari Sister">>
<<set $activeSlave.faceShape = either("sensual", "exotic")>>
-<<set $seed = random(1,4)>>
-<<if $seed == 1>>
- <<set $activeSlave.intelligence to -1>>
- <<set $activeSlave.chem to 150>>
- <<set $activeSlave.butt to either(5,6)>>
- <<set $activeSlave.hips to 1>>
- <<set $activeSlave.face to either(35,35,35,75,100)>>
- <<set $activeSlave.boobs = 100*random(12,20)>>
- <<set $activeSlave.dick = random(2,3)>>
- <<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
+<<set _sisterAge = random(1,5)>>
+<<if _sisterAge == 1>>
+ <<set $activeSlave.intelligence = -2>>
+ <<set $activeSlave.hips = 0>>
+ <<set $activeSlave.face = either(35,35,35,75,100)>>
<<if $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
@@ -109,20 +98,37 @@ The Sisters offer a member selected for sale into slavery for inspection via vid
<<set $activeSlave.balls = random(2,3)>>
<<set $activeSlave.scrotum = $activeSlave.balls>>
<</if>>
- <<set $activeSlave.lips to 0>>
- <<set $activeSlave.weight to 0>>
- <<set $activeSlave.vagina to 2>>
- <<set $activeSlave.anus to 2>>
- <<set $activeSlave.fetish to "submissive">>
-<<elseif $seed is 2>>
- <<set $activeSlave.intelligence to 0>>
- <<set $activeSlave.chem to 200>>
- <<set $activeSlave.butt to either(6,7)>>
- <<set $activeSlave.hips to 2>>
- <<set $activeSlave.face to either(35,35,75,75,100)>>
- <<set $activeSlave.boobs = 100*random(20,32)>>
- <<set $activeSlave.dick = random(3,4)>>
- <<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
+ <<set $activeSlave.lips = 0>>
+ <<set $activeSlave.weight = 0>>
+ <<set $activeSlave.actualAge = random(19,24)>>
+ <<set $activeSlave.physicalAge = $activeSlave.actualAge>>
+ <<set $activeSlave.visualAge = $activeSlave.actualAge>>
+ <<set $activeSlave.vagina = 2>>
+ <<set $activeSlave.anus = 2>>
+ <<set $activeSlave.fetish = "submissive">>
+<<elseif _sisterAge == 2>>
+ <<set $activeSlave.intelligence = -1>>
+ <<set $activeSlave.hips = 1>>
+ <<set $activeSlave.face = either(35,35,35,75,100)>>
+ <<if $TFS.schoolUpgrade == 1>>
+ <<set $activeSlave.balls = 1>>
+ <<set $activeSlave.scrotum = 0>>
+ <<elseif $TFS.schoolUpgrade == 2>>
+ <<set $activeSlave.balls = 6>>
+ <<set $activeSlave.scrotum = $activeSlave.balls>>
+ <<else>>
+ <<set $activeSlave.balls = random(2,3)>>
+ <<set $activeSlave.scrotum = $activeSlave.balls>>
+ <</if>>
+ <<set $activeSlave.lips = 0>>
+ <<set $activeSlave.weight = 0>>
+ <<set $activeSlave.vagina = 2>>
+ <<set $activeSlave.anus = 2>>
+ <<set $activeSlave.fetish = either("submissive", "buttslut", "cumslut")>>
+<<elseif _sisterAge == 3>>
+ <<set $activeSlave.intelligence = 0>>
+ <<set $activeSlave.hips = 2>>
+ <<set $activeSlave.face = either(35,35,75,75,100)>>
<<if $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
@@ -133,23 +139,18 @@ The Sisters offer a member selected for sale into slavery for inspection via vid
<<set $activeSlave.balls = random(3,4)>>
<<set $activeSlave.scrotum = $activeSlave.balls>>
<</if>>
- <<set $activeSlave.lips to random(15,25)>>
- <<set $activeSlave.weight to 20>>
+ <<set $activeSlave.lips = random(15,25)>>
+ <<set $activeSlave.weight = 20>>
<<set $activeSlave.actualAge = random(30,34)>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge>>
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
- <<set $activeSlave.vagina to 2>>
- <<set $activeSlave.anus to 2>>
- <<set $activeSlave.fetish to either("buttslut", "cumslut")>>
-<<elseif $seed is 3>>
- <<set $activeSlave.intelligence to 1>>
- <<set $activeSlave.chem to 250>>
- <<set $activeSlave.butt to either(7,8)>>
- <<set $activeSlave.hips to 2>>
- <<set $activeSlave.face to either(35,75,75,100,100)>>
- <<set $activeSlave.boobs = 100*random(32,42)>>
- <<set $activeSlave.dick = random(4,5)>>
- <<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
+ <<set $activeSlave.vagina = 2>>
+ <<set $activeSlave.anus = 2>>
+ <<set $activeSlave.fetish = either("buttslut", "cumslut")>>
+<<elseif _sisterAge == 4>>
+ <<set $activeSlave.intelligence = 1>>
+ <<set $activeSlave.hips = 2>>
+ <<set $activeSlave.face = either(35,75,75,100,100)>>
<<if $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
@@ -167,16 +168,11 @@ The Sisters offer a member selected for sale into slavery for inspection via vid
<<set $activeSlave.visualAge = $activeSlave.actualAge>>
<<set $activeSlave.vagina = 3>>
<<set $activeSlave.anus = 3>>
- <<set $activeSlave.fetish = either("buttslut", "cumslut")>>
+ <<set $activeSlave.fetish = either("buttslut", "cumslut", "dom")>>
<<else>>
- <<set $activeSlave.intelligence to 2>>
- <<set $activeSlave.chem to 300>>
- <<set $activeSlave.butt to either(8,9)>>
- <<set $activeSlave.hips to 2>>
- <<set $activeSlave.face to either(35,75,100,100,100)>>
- <<set $activeSlave.boobs = 100*random(44,60)>>
- <<set $activeSlave.dick = random(5,6)>>
- <<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
+ <<set $activeSlave.intelligence = 2>>
+ <<set $activeSlave.hips = 2>>
+ <<set $activeSlave.face = either(35,75,100,100,100)>>
<<if $TFS.schoolUpgrade == 1>>
<<set $activeSlave.balls = 1>>
<<set $activeSlave.scrotum = 0>>
@@ -196,6 +192,12 @@ The Sisters offer a member selected for sale into slavery for inspection via vid
<<set $activeSlave.anus = 3>>
<<set $activeSlave.fetish = "dom">>
<</if>>
+<<set $activeSlave.chem = 100+(_sisterAge*50)>>
+<<set $activeSlave.butt = _sisterAge+random(2,4)>>
+<<set $activeSlave.boobs = 50*((10*_sisterAge)+random(10,20))>>
+<<set $activeSlave.dick = _sisterAge+random(1,2)>>
+<<if $activeSlave.foreskin > 0>><<set $activeSlave.foreskin = $activeSlave.dick>><</if>>
+<<set $activeSlave.preg = -2>>
<<if $TFS.farmUpgrade > 0>>
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.preg = -1>>
@@ -219,7 +221,7 @@ The Sisters offer a member selected for sale into slavery for inspection via vid
<<set $activeSlave.health = random(60,80)>>
<<set $activeSlave.muscles = 20>>
<<set $activeSlave.waist = -15>>
-<<set $activeSlave.shoulders to 1>>
+<<set $activeSlave.shoulders = 1>>
<<set $activeSlave.vaginalSkill = 100>>
<<set $activeSlave.oralSkill = 100>>
<<set $activeSlave.analSkill = 100>>
@@ -247,17 +249,16 @@ The Sisters offer a member selected for sale into slavery for inspection via vid
<<set $slaveCost = Math.trunc($slaveCost*0.8)>>
<</if>>
<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += Math.trunc($slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
-<</nobr>>\
-\
+
The price is ¤<<print $slaveCost>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
-\
-<<nobr>>
+
+<br>
<<if $cash >= $slaveCost>>
[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost,$TFS.schoolSale = 0,$TFS.studentsBought += 1,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
-<</nobr>>
-[[Request to see a different graduate of the same school|The Futanari Sisters][$slavesSeen += 1]]
+<br>[[Request to see a different graduate of the same school|The Futanari Sisters][$slavesSeen += 1]]
+<br><br>
<<set $saleDescription = 1>><<include "Long Slave Description">><<set $saleDescription = 0>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 92070f2f3bc539d6b7a1532e6737c77c51d53a65..2a1625fa3a172509e7ff77564de1514a41a54361 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -928,57 +928,6 @@ $possessiveCap
<</if>>
<</if>>
-<<if $activeSlave.fuckdoll == 0>>
-<<if $activeSlave.shoulders < -1>>
- $possessiveCap shoulders and chest are very narrow and
- <<if $activeSlave.boobs > 2000>>
- feminine, forcing $possessive pressed-together tits to spread far beyond $possessive sides.
- <<else>>
- feminine.
- <</if>>
-<<elseif $activeSlave.shoulders < 0>>
- $possessiveCap shoulders and chest are quite
- <<if $activeSlave.boobs > 1200>>
- feminine, causing a lot of cleavage and pressing $possessive boobs outward beyond $possessive sides.
- <<else>>
- feminine.
- <</if>>
-<<elseif $activeSlave.shoulders > 1>>
- $possessiveCap shoulders and chest are very
- <<if $activeSlave.boobs > 600>>
- broad, making $possessive boobs look a lot smaller than they actually are.
- <<else>>
- broad.
- <</if>>
-<<elseif $activeSlave.shoulders > 0>>
- $possessiveCap shoulders and chest are fairly
- <<if $activeSlave.boobs > 600>>
- broad, making $possessive tits look smaller than they actually are.
- <<else>>
- broad.
- <</if>>
-<<else>>
- $possessiveCap shoulders and chest are
- <<if $activeSlave.boobs > 800>>
- feminine, flattering $possessive breasts.
- <<else>>
- feminine.
- <</if>>
-<</if>>
-<<if $activeSlave.shoulders > $activeSlave.hips>>
- They're wider than $possessive hips,
- <<if $activeSlave.boobs > 2000*($activeSlave.shoulders- $activeSlave.hips)>>
- but $possessive massive breasts make it hard to discern.
- <<elseif $arcologies[0].FSGenderRadicalist != "unset">>
- giving $object a somewhat mannish appearance.
- <<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
- giving $object an @@.red;ugly, mannish appearance.@@
- <<else>>
- giving $object an @@.red;unattractive, somewhat mannish, appearance.@@
- <</if>>
-<</if>>
-<</if>>
-
<<if $activeSlave.physicalAge >= 18>>
<<if $activeSlave.boobs > 7500>>
<<if $activeSlave.fuckdoll > 0>>
@@ -1113,6 +1062,57 @@ $possessiveCap
<</if>>
<</if>>
+<<if $activeSlave.fuckdoll == 0>>
+<<if $activeSlave.shoulders < -1>>
+ $possessiveCap shoulders and chest are very narrow and
+ <<if $activeSlave.boobs > 2000>>
+ feminine, forcing $possessive pressed-together tits to spread far beyond $possessive sides.
+ <<else>>
+ feminine.
+ <</if>>
+<<elseif $activeSlave.shoulders < 0>>
+ $possessiveCap shoulders and chest are quite
+ <<if $activeSlave.boobs > 1200>>
+ feminine, causing a lot of cleavage and pressing $possessive boobs outward beyond $possessive sides.
+ <<else>>
+ feminine.
+ <</if>>
+<<elseif $activeSlave.shoulders > 1>>
+ $possessiveCap shoulders and chest are very
+ <<if $activeSlave.boobs > 600>>
+ broad, making $possessive boobs look a lot smaller than they actually are.
+ <<else>>
+ broad.
+ <</if>>
+<<elseif $activeSlave.shoulders > 0>>
+ $possessiveCap shoulders and chest are fairly
+ <<if $activeSlave.boobs > 600>>
+ broad, making $possessive tits look smaller than they actually are.
+ <<else>>
+ broad.
+ <</if>>
+<<else>>
+ $possessiveCap shoulders and chest are
+ <<if $activeSlave.boobs > 800>>
+ feminine, flattering $possessive breasts.
+ <<else>>
+ feminine.
+ <</if>>
+<</if>>
+<<if $activeSlave.shoulders > $activeSlave.hips>>
+ They're wider than $possessive hips,
+ <<if $activeSlave.boobs > 2000*($activeSlave.shoulders- $activeSlave.hips)>>
+ but $possessive massive breasts make it hard to discern.
+ <<elseif $arcologies[0].FSGenderRadicalist != "unset">>
+ giving $object a somewhat mannish appearance.
+ <<elseif $arcologies[0].FSGenderFundamentalist != "unset">>
+ giving $object an @@.red;ugly, mannish appearance.@@
+ <<else>>
+ giving $object an @@.red;unattractive, somewhat mannish, appearance.@@
+ <</if>>
+<</if>>
+<</if>>
+
<<if $activeSlave.fuckdoll == 0>>
<<if $activeSlave.markings == "heavily freckled">>
<<if $activeSlave.boobs > 2000>>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index b82f94035551242b8b6d62c5a43efef14371d573..2264f6bda1eba4ed8f9cc010b7f71f22822dd38b 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -112,8 +112,7 @@
<<switch _activation>>
<<case "devotion">>
- <br>@@.darkviolet;Very hateful@@: under -95, @@.darkviolet;Hateful@@: -95 to under -50, @@.mediumorchid;Resistant@@: -50 to under -20,
- <br>@@.yellow;Ambivalent@@: -20 to 20, @@.hotpink;Accepting@@: over 20 to 50, @@.deeppink;Devoted@@: over 50 to 95, @@.magenta;Worshipful@@: over 95
+ <br>@@.darkviolet;Very hateful@@: under -95, @@.darkviolet;Hateful@@: -95 to under -50, @@.mediumorchid;Resistant@@: -50 to under -20, @@.yellow;Ambivalent@@: -20 to 20, @@.hotpink;Accepting@@: over 20 to 50, @@.deeppink;Devoted@@: over 50 to 95, @@.magenta;Worshipful@@: over 95
<<case "trust">>
<br>@@.goldenrod;Extremely terrified@@: under -95, @@.goldenrod;Terrified@@: -95 to under -50, @@.gold;Frightened@@: -50 to under -20,
<br>@@.yellow;Fearful@@: -20 to 20, @@.mediumaquamarine;Careful@@: over 40 to 50, @@.mediumseagreen;Trusting@@: 50 to 95, @@.seagreen;Total trust@@: over 95