diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 05e88bf9513e12b6e268cea9820788e99b515ce3..a2843da195c4894b71b49a69c641b1d31f2a4c6f 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1232,7 +1232,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $ArcologyNamesPhysicalIdealist = ["Themyscira", "Midgard", "Muscle Beach", "Skid Row"]>>
<<set $ArcologyNamesChattelReligionist = ["Heaven", "The Light", "Heaven on Earth"]>>
<<set $ArcologyNamesRomanRevivalist = ["Elysian Fields", "Carthago Nova", "Nova Roma", "Neapolis", "Capua", "Ostia", "Salernum", "The City of the Seven Hills"]>>
-<<set $ArcologyNamesAztechRevivalist = ["The Halls of Montezuma", "Aztlan"]>>
+<<set $ArcologyNamesAztecRevivalist = ["The Halls of Montezuma", "Aztlan"]>>
<<set $ArcologyNamesEgyptianRevivalist = ["Thebes", "Memphis", "Alexandria"]>>
<<set $ArcologyNamesEdoRevivalist = ["Onogoro", "Kokyo", "Tengoku", "Takama-ga-hara", "New Kyoto", "The Imperial Palace", "New Tokyo"]>>
<<set $ArcologyNamesArabianRevivalist = ["Jannah", "Madinat al-Salam", "Madinat al-Hareer", "Madinat al-Zahra", "Madinat al-Yasmin", "Bayt al-Hikma", "Baghdad", "Alhambra", "Samarra"]>>
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index dda8808cf51e2383391f3205a20398aa1532be36..32fa61d871defb0eb9fb60a78da12f7f29f48bde 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -316,7 +316,7 @@
/*Added piercings, corrected customdesc syntax, added bitchy to fit with her smart-ass masochist personality. -BoneyM*/
<<set _HS = {}>>
-<<set _HS.slaveName = "Mikayla", _HS.birthName = "Mikayla", _HS.origin = "She was previously owned by an creative sadist, who has left a variety of mental scars on her.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.health = 20, _HS.devotion = -25, _HS.weight = 20, _HS.height = 155, _HS.skin = "white", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = -1, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customDesc = "She is extremely claustrophobic.">>
+<<set _HS.slaveName = "Mikayla", _HS.birthName = "Mikayla", _HS.origin = "She was previously owned by a creative sadist, who has left a variety of mental scars on her.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 21, _HS.physicalAge = 21, _HS.visualAge = 21, _HS.health = 20, _HS.devotion = -25, _HS.weight = 20, _HS.height = 155, _HS.skin = "white", _HS.hStyle = "long", _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.nipplesPiercing = 1, _HS.butt = 3, _HS.lips = 35, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.clitPiercing = 1, _HS.anus = 1, _HS.ovaries = 1, _HS.earPiercing = 1, _HS.vaginalSkill = 15, _HS.oralSkill = 15, _HS.analSkill = 15, _HS.intelligence = -1, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.behavioralFlaw = "arrogant", _HS.customDesc = "She is extremely claustrophobic.">>
<<set $heroSlaves.push(_HS)>>
/*claustrophobia, pride*/
/*Fixed customdesc syntax, added pierced ears, corrected hair color, added origin and arrogant -BoneyM*/
diff --git a/src/npc/removeActiveSlave.tw b/src/npc/removeActiveSlave.tw
index 6387214483c00f970e30aa4641f91bb922fdffe2..e5f4a868939a2625803656f25572df94f4c76dd8 100644
--- a/src/npc/removeActiveSlave.tw
+++ b/src/npc/removeActiveSlave.tw
@@ -2,8 +2,8 @@
<<set _ID = $activeSlave.ID, _SL = $slaves.length>>
-<<if (def _i) && (_i < _SL) && ($slaves[_i].ID == _ID)>>
- <<set _x = _i>>
+<<if (def $i) && ($i < _SL) && ($slaves[$i].ID == _ID)>>
+ <<set _x = $i>>
<<else>>
<<for _x = 0; _x < _SL; _x++>>
<<if _ID == $slaves[_x].ID>>
diff --git a/src/npc/takeoverTarget.tw b/src/npc/takeoverTarget.tw
index 2973890acbc0921ef565e942a111ac947e2febaf..5b4dfce4eaab89433b1cd7a93a4dc4e1b44600dc 100644
--- a/src/npc/takeoverTarget.tw
+++ b/src/npc/takeoverTarget.tw
@@ -4,7 +4,7 @@
<<set $showBodyMods = 1>>
Before you deploy the <<if $PC.rumor == "wealth">>financial reserves that<<elseif $PC.rumor == "diligence">>carefully constructed plan that<<elseif $PC.rumor == "force">>mercenaries and <<if $continent == "Europe">>//maskirovka//<<else>>cover plan<</if>> that<<elseif $PC.rumor == "social engineering">>clever social manipulation that<<else>>optimistic plan you hope<</if>> will allow you to take over an arcology, you need to select a target. There are a number of vulnerable arcologies that you could <<if $PC.rumor == "wealth">>attempt a hostile takeover of<<elseif $PC.rumor == "diligence">>work to take over<<elseif $PC.rumor == "force">>attack<<elseif $PC.rumor == "social engineering">>infiltrate<<else>>aspire to take over<</if>> with a reasonable chance of success. Free Cities are volatile places, even compared to the troubled state of the rest of the world. There are always arcologies whose owners are on the brink of failure, and you could target one of them.
-<<if $PC.career == "arcology owner">>(Since you've @@.springgreen;owned an arcology before,@@ you identify more potential target arcologies than an novice might.)<</if>>
+<<if $PC.career == "arcology owner">>(Since you've @@.springgreen;owned an arcology before,@@ you identify more potential target arcologies than a novice might.)<</if>>
Alternatively, arcologies are being built every day, and their owners' control is often uncertain. @@.orange;Which arcology will you target?@@
<br><br>
diff --git a/src/pregmod/testGenetics.tw b/src/pregmod/testGenetics.tw
index 6b5a55ca2daa8186634f4e7e652dd6a17fdea05e..8e7ffc1f5424cdfcaaec0c5c11ae9d823ad50703 100644
--- a/src/pregmod/testGenetics.tw
+++ b/src/pregmod/testGenetics.tw
@@ -10,9 +10,11 @@ All slave array slaves MUST be present in genePool or else there is a malfunctio
genePool:
<<for _i = 0; _i < $genePool.length; _i++>>
<br>
- $genePool[_i].slaveName $genePool[_i].ID $genePool[_i].origin
+ _i $genePool[_i].slaveName $genePool[_i].ID $genePool[_i].origin
<</for>>
+<br><br>
+<br>Name ID Origin Assignment
<br><br>
slaves:
@@ -25,8 +27,8 @@ slaves:
<</if>>
<</for>>
<<if _seed == 1>>
- @@.green;$slaves[_i].slaveName $slaves[_i].ID $slaves[_i].origin@@
+ @@.green;_i $slaves[_i].slaveName $slaves[_i].ID $slaves[_i].origin $slaves[_i].assignment @@
<<else>>
- @@.red;$slaves[_i].slaveName $slaves[_i].ID $slaves[_i].origin@@
+ @@.red;_i $slaves[_i].slaveName $slaves[_i].ID $slaves[_i].origin $slaves[_i].assignment @@
<</if>>
<</for>>
\ No newline at end of file
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index a00321d04f51232f08ba194b0c800e2256144085..469c6f6090ab9ac46c599b8c72d7414dcd4906a9 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -39,6 +39,17 @@
<<set $fixedRace = 0>>
<</if>>
+<<if ndef $arcologies[0].FSAztechRevivalist>>
+ <<for _i = 0; _i < $arcologies.length; _i++>>
+ <<set $arcologies[_i].FSAztecRevivalist = "unset", $arcologies[_i].FSAztecRevivalistDecoration = 0>>
+ <</for>>
+ <<set $arcologies[0].FSAztecRevivalistLaw = 0, $arcologies[0].FSAztecRevivalistSMR = 0>>
+<</if>>
+
+<<if ndef $FSPromenade>>
+ <<set $FSPromenade = {Subjugationist: 0, Supremacist: 0, GenderRadicalist: 0, GenderFundamentalist: 0, Paternalist: 0, Degradationist: 0, BodyPurist: 0, TransformationFetishist: 0, YouthPreferentialist: 0, MaturityPreferentialist: 0, SlimnessEnthusiast: 0, AssetExpansionist: 0, Pastoralist: 0, PhysicalIdealist: 0, ChattelReligionist: 0, RomanRevivalist: 0, AztecRevivalist: 0, EgyptianRevivalist: 0, EdoRevivalist: 0, ArabianRevivalist: 0, ChineseRevivalist: 0, RepopulationFocus: 0, Restart: 0}>>
+<</if>>
+
<<if ndef $arcologyUpgrade>>
<<set $arcologyUpgrade = {drones: 0, hydro: 0, apron: 0, grid: 0, spire: 0}>>
<<set $arcologyUpgrade.drones = ($AProsperityCap > 60) ? 1 : 0>>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 8138ae5bd957de8e4b03f17f023ad671737a4673..81e4621c20b99f6dadcc2276aa4dbb8a190b7b79 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -56,7 +56,7 @@ Your madam <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Descript
<<case "DJ publicity">>
-Your DJ <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span> is a terribly pretty girl. Very few of your tenants, male or female, would turn down an night in $clubName with her. Demand is such that she must carefully confine herself to the most important, leaving the lesser of your citizens with the sight of her body and the sound of her beats. A few of them are so smitten as to consider earning her favors the primary benefit of advancement, looking forward to the day when $activeSlave.slaveName will deign to mark their success in life by giving them attention on the floor. In many ways, $activeSlave.slaveName's face is the face of $arcologies[0].name.
+Your DJ <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span> is a terribly pretty girl. Very few of your tenants, male or female, would turn down a night in $clubName with her. Demand is such that she must carefully confine herself to the most important, leaving the lesser of your citizens with the sight of her body and the sound of her beats. A few of them are so smitten as to consider earning her favors the primary benefit of advancement, looking forward to the day when $activeSlave.slaveName will deign to mark their success in life by giving them attention on the floor. In many ways, $activeSlave.slaveName's face is the face of $arcologies[0].name.
<<case "tired collectrix">>
@@ -230,7 +230,7 @@ She sees you examining at her, and looks back at you submissively, too tired to
<br><<link "Put public emphasis on her with the objective of making her famous">>
<<replace "#name">>$activeSlave.slaveName<</replace>>
<<replace "#result">>
- For the coming week, she does the publicity rounds. It's a little different than an free celebrity might do, but the mere act of letting her be interviewed is enough of a display of your confidence in her loyalty that people @@.green;take notice.@@ She will be @@.green;forever remembered@@ as one of the first slaves to go before the press and articulately explain why she loves being your property. She looks good doing it, too.
+ For the coming week, she does the publicity rounds. It's a little different than a free celebrity might do, but the mere act of letting her be interviewed is enough of a display of your confidence in her loyalty that people @@.green;take notice.@@ She will be @@.green;forever remembered@@ as one of the first slaves to go before the press and articulately explain why she loves being your property. She looks good doing it, too.
<<set $cash -= 10000>>
<<set $rep += 500>>
<<set $activeSlave.prestige = 1>>
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 447e5bde9345659ee8d514a425711ec2f970bb1c..371ff16768510b3a6d87eb01b6bc19f22a6d45d7 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -19,6 +19,66 @@
<<switch $RESSTRevent>>
+<<case "servant maid">>
+
+<span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span> is scheduled to clean your office today, just one of her many duties as a servant in your penthouse. She pauses in the doorway of your office for a moment, only entering once it becomes clear that you're not going to be using her immediately.
+<br><br>
+She begins her cleaning dutifully, fluttering about your office in a flurry of scrubbing and dusting. Her almost frenzied sanitization of your office allows you ample opportunity to inspect her, your eyes lingering on her body as she moves back and forth in front of you.
+<<if ($activeSlave.clothes == "a slutty maid outfit")>>
+ Her maid uniform does little to conceal her form from prying eyes, with a thin white blouse all that separates the surfaces of her breasts from the air. The associated skirt is similarly superficial, made more for easy access to a slave's holes than for provision of any sort of modesty.
+ <<if $activeSlave.amp < 0>>
+ Although her movements rarely stray from a slight flick of her wrist as she dusts some surface or a gyration of her body as she scrubs the floor clean, her P-Limbs nonetheless produce a steady stream of minute machine noises. They give her the coordination she needs to purge even the smallest of stains, but the multitude of gyros, servos, and other mechanical pieces constantly working to maintain it ensure that the process is far from silent.
+ <<elseif $activeSlave.boobs > 4000>>
+ Her breasts are so massive that a whole ream of cloth is needed to provide even the semblance of covering her massive chest. They do little to aid in her cleaning duties, often causing her to attack any blemish on the wall sideways lest her gigantic boobs prevent her from reaching the offending smudge at all.
+ <<elseif $activeSlave.boobs > 800>>
+ Her breasts are pleasingly large and appealingly visible despite the minor concealment provided by her blouse. They often cause her difficulty by mashing against the top surface of your desk as she tries to duck beneath to clean the underside. The struggle is surprisingly erotic - if not without humor.
+ <<elseif $activeSlave.preg > 30>>
+ Despite her pregnancy, she manages to clean with surprising efficacy. She often cradles her gravid belly through her sheer skirt as she dusts or scrubs with one hand, conscious of the fragile life within her even as she works hard to cleanse your office of any unsightly blemishes.
+ <<elseif $activeSlave.muscles > 30>>
+ With her incredible musculature, she's able to conduct a deep cleaning that few other slaves can match. Life as an arcology owner exposes you to a wealth of unique situations, but you doubt many of your peers have seen a slave in a slutty maid ensemble lift up a couch with one outstretched arm as they sweep the now exposed ground beneath it clean with the other.
+ <<elseif $activeSlave.energy > 95>>
+ Despite mundanity of her current duties, it's clear she's holding back her immense sex drive for the duration of her cleaning.
+ <<if $activeSlave.dick > 0>>
+ <<if canAchieveErection($activeSlave)>>
+ Her cock is painfully erect, visible under her flimsy skirt.
+ <<else>>
+ Her soft dick is dribbling precum, visibly dripping down her legs.
+ <</if>>
+ <<elseif $activeSlave.vagina == -1>>
+ She's unconsciously presents her bare bottom as she scrubs the ground clean.
+ <<else>>
+ Her pussy is visibly soaked, ironically staining the flimsy skirt of her uniform as she cleans your office.
+ <</if>>
+ <</if>>
+<<elseif ($activeSlave.clothes == "a nice maid outfit")>>
+ Her maid uniform is fairly demure for a sex slave and makes some effort to conceal her form from prying eyes, even whilst presenting an image of servitude and obedience that a classic maids' ensemble embodies so well. Her dress is fairly conservative, enveloping her breasts in intricate lace and cloth. Likewise, her apron is more than ornamental, $activeSlave.slaveName having stuffed it with cleaning materials and tools.
+ <<if $activeSlave.amp < 0>>
+ Although her movements rarely stray from a slight flick of her wrist as she dusts some surface or a gyration of her body as she scrubs the floor clean, her P-Limbs nonetheless produce a steady stream of minute machine noises. They give her the coordination she needs to purge even the smallest of stains, but the multitude of gyros, servos, and other mechanical pieces constantly working to maintain it ensure that the process is far from silent.
+ <<elseif $activeSlave.boobs > 4000>>
+ Her breasts are so massive that several reams of cloth are needed to provide her massive chest with any semblance of modesty. They do little to aid in her cleaning duties, often causing her to attack any blemish on the wall sideways lest her gigantic boobs prevent her from reaching the offending smudge at all.
+ <<elseif $activeSlave.boobs > 800>>
+ Her breasts are pleasingly large and appealingly visible, even beneath the folds and ruffles of her dress. They often cause her difficulty by mashing against the top surface of your desk as she tries to duck beneath to clean the underside. The struggle is surprisingly erotic - if not without humor.
+ <<elseif $activeSlave.preg > 30>>
+ Despite her pregnancy, she manages to clean with surprising efficacy. She often cradles her gravid belly through her thick apron as she dusts or scrubs with one hand, conscious of the fragile life within her even as she works hard to cleanse your office of any unsightly blemishes.
+ <<elseif $activeSlave.muscles > 30>>
+ With her incredible musculature, she's able to conduct a deep cleaning that few other slaves can match. Life as an arcology owner exposes you to a wealth of unique situations, but you doubt many of your peers have seen a slave in a modest maid ensemble lift up a couch with one outstretched arm as they sweep the now exposed ground beneath it clean with the other.
+ <<elseif $activeSlave.energy > 95>>
+ Despite mundanity of her current duties, it's clear she's holding back her immense sex drive for the duration of her cleaning.
+ <<if $activeSlave.dick > 0>>
+ <<if canAchieveErection($activeSlave)>>
+ Her cock is painfully erect, poking through her apron.
+ <<else>>
+ Her soft dick is dribbling precum, visibly dripping down her legs.
+ <</if>>
+ <<elseif $activeSlave.vagina == -1>>
+ She's unconsciously presents her bottom, though it remains covered by the length of her apron, as she scrubs the ground clean.
+ <<else>>
+ Her pussy is visibly soaked, ironically staining the once immaculate apron of her uniform as she cleans your office.
+ <</if>>
+ <</if>>
+<</if>>
+Eventually, her duties satisfactorily completed, she comes before your desk to beg your permission to continue her servitude elsewhere in the penthouse.
+
<<case "young PC age difference">>
As another long weeks draws to a close, <span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink = passage(), $eventDescription = 1]]">></span> happens to walk past your office toward bed. There's nothing inherently abnormal about her actions, but you do notice as she steps past the doorway that an expression of worry and concern adorns her $activeSlave.skin face. When you call her into your office, her face visibly brightens up in an attempt to conceal her obvious distress as she comes before you. Notably, although she stands still and patiently awaits further orders, you notice she <<if canSee($activeSlave)>>never manages to meet your eyes<<else>>keeps her sightless eyes downcast<</if>>. When you ask her what's troubling her, her face plainly falls.
@@ -116,7 +176,7 @@ She saunters over and kneels obediently in front of you, awaiting further direct
<<case "devoted shortstack">>
-<span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> comes before you for a routine inspection. The <<if ($activeSlave.height > 130) and ($activeSlave.boobs > 800)>>shortstack <<(elseif $activeSlave.height > 130) and ($activeSlave.boobs < 600)>>petite <<else>>short <</if>> <<if $activeSlave.preg > 30>>and heavily pregnant <<elseif $activeSlave.preg > 20>>pregnant <</if>>$desc is looking good despite her diminutive height. When she raises her arms above her head to submit to an inspection under your gaze, the top of her $activeSlave.hColor-haired head doesn't even reach your chest. Despite the discrepancy between your height and hers, you notice an unmistakable flush of embaressment tinging her cheeks. <<if canSee($activeSlave)>>Her $activeSlave.eyeColor eyes flick up to gaze at you, but she must crane her head upwards as well to meet your gaze<<else>>Her ears perk up to hear at the sound of some minute noise you made, before she cranes her head upwards so that her sightless eyes may meet your gaze<</if>>.
+<span id="name"><<print "[[$activeSlave.slaveName|Long Slave Description][$nextLink to passage(), $eventDescription to 1]]">></span> comes before you for a routine inspection. The <<if ($activeSlave.height > 130) and ($activeSlave.boobs > 800)>>shortstack <<(elseif $activeSlave.height > 130) and ($activeSlave.boobs < 600)>>petite <<else>>short <</if>> <<if $activeSlave.preg > 30>>and heavily pregnant <<elseif $activeSlave.preg > 20>>pregnant <</if>>$desc is looking good despite her diminutive height. When she raises her arms above her head to submit to an inspection under your gaze, the top of her $activeSlave.hColor-haired head doesn't even reach your chest. Despite the discrepancy between your height and hers, you notice an unmistakable flush of embarrassment tinging her cheeks. <<if canSee($activeSlave)>>Her $activeSlave.eyeColor eyes flick up to gaze at you, but she must crane her head upwards as well to meet your gaze<<else>>Her ears perk up to hear at the sound of some minute noise you made, before she cranes her head upwards so that her sightless eyes may meet your gaze<</if>>.
<<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)>>
@@ -170,7 +230,7 @@ You pass through your slaves' living area as some of them are starting your days
<<else>>
climbed out of her comfortable bed.
<</if>>
-It's time for $activeSlave.slaveName to start another strenuous day of carrying the weight of her <<if $activeSlave.boobs > 10000>>disporportionate<<elseif $activeSlave.boobs > 5000>>massive<<else>>heavy<</if>> <<if $activeSlave.boobsImplant>>implants<<elseif $activeSlave.lactation>>milk-bearing udders<<else>>natural breasts<</if>>. She can manage it <<if $activeSlave.muscles <= 10>>only with difficulty, since she's not in good shape<<elseif $activeSlave.boobs <= 5000+($activeSlave.muscles*100)>>with ease, since she's in good shape<<else>>with some difficulty, since they're so big<</if>>. Slaves with endowments like hers are trained to stretch, and since she's a good $desc, she does it as soon as she gets up. She's doing it now.
+It's time for $activeSlave.slaveName to start another strenuous day of carrying the weight of her <<if $activeSlave.boobs > 10000>>disproportionate<<elseif $activeSlave.boobs > 5000>>massive<<else>>heavy<</if>> <<if $activeSlave.boobsImplant>>implants<<elseif $activeSlave.lactation>>milk-bearing udders<<else>>natural breasts<</if>>. She can manage it <<if $activeSlave.muscles <= 10>>only with difficulty, since she's not in good shape<<elseif $activeSlave.boobs <= 5000+($activeSlave.muscles*100)>>with ease, since she's in good shape<<else>>with some difficulty, since they're so big<</if>>. Slaves with endowments like hers are trained to stretch, and since she's a good $desc, she does it as soon as she gets up. She's doing it now.
<br><br>
She kneels with her legs together, and then sits back, her <<if $activeSlave.buttImplant>>fake ass not changing shape at all as it rests on her heels<<elseif $activeSlave.butt > 6>>mass of assflesh extinguishing her feet completely<<elseif $activeSlave.butt > 2>>big butt resting heavily on her heels<<else>>cute butt resting lightly on her heels<</if>>. Then she reaches her arms back, and leans back, as far as she can go. She arches her spine, closing her eyes voluptuously as she enjoys the stretch in her lower back. The pose thrusts her chest up and out,
<<if $activeSlave.boobsImplant*0.5 > $activeSlave.boobs>>
@@ -205,6 +265,61 @@ She sits back up and rubs her hands down her lower back on either side, sighing
<span id="result">
<<switch $RESSTRevent>>
+<<case "servant maid">>
+
+<<link "Stop her">>
+ <<replace "#name">>$activeSlave.slaveName<</replace>>
+ <<replace "#result">>
+ You look $activeSlave.slaveName up and down slowly before informing her that she has one more duty left to perform.
+ <br><br><span id="result2">
+ <<link "Clean out her ass with an enema and fuck it">>
+ <<replace "#name">>
+ $activeSlave.slaveName
+ <</replace>>
+ <<replace "#result2">>
+ You tell $activeSlave.slaveName that she forgot to clean one thing in her office - herself. As she looks at you in confusion, you rise from your chair and lightly press her chest down on your desk. She lays there obediently, only letting out a gasp as the cold tip of an enema bulb penetrates her ass. As a result of her slave diet and daily anal preparation, the insertion of the enema is little more a bit of roleplaying spectacle. When you retrieve the enema from her rectum you remark, <<if $PC.dick == 0>>as you don a strap-on, <</if>>that you'll need to inspect her asshole personally with a vigorous assfucking. Soon $activeSlave.slaveName finds herself being pounded so forcefully that a small pool of drool begins to form beneath her open mouth, staining the surface of your desk that she so meticulously cleaned. She @@.mediumaquamarine;resolves to trust you more in the future,@@ since you took a personal interest in her cleanliness.
+ <<set $activeSlave.analCount += 1>>
+ <<set $analTotal += 1>>
+ <<AnalVCheck>>
+ <<set $activeSlave.trust += 4>>
+ <</replace>>
+ <</link>><<if $activeSlave.anus == 0>> //This option will take her anal virginity//<</if>>
+ <br><<link "Have her lick you clean">>
+ <<replace "#name">>
+ $activeSlave.slaveName
+ <</replace>>
+ <<replace "#result2">>
+ You recline in your chair and inform $activeSlave.slaveName that she has one last thing to clean in your office. She understands your meaning quickly and sinks to her knees and crawls beneath your desk to kneel between your legs. Soon enough you feel the sensation of her lips wrapping obediently about one of your toes, fellating the appendage with some enthusiasm. She works her way through your various digits, taking some solace in the simplicity of her task, before a sudden understanding dawns on her. She runs her tongue up your leg, cleansing your skin with her tongue as best she can, before heading for your
+ <<if $PC.dick == 1>>cock<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>cunt<</if>>
+ but you lay a hand on her forehead and halt her - she'll do that last.
+ <<if $PC.boobs == 1>>
+ Soon enough she manages to lick all the way up from your feet to your breasts, cleansing your body with her wet tongue all the way. She hesitates before teasingly laying a single lap on your nipples, so you take her head and hold it against your breasts to enjoy her skillful tongue on your nipples.
+ <<else>>
+ Soon enough she manages to lick all the way up from your feet to your abs, pecs, and collarbone, cleansing your body with her wet tongue all the way. She lavishes particular attention on every nook and groove of your chiseled body, clearly eager to please her muscular <<Master>>.
+ <</if>>
+ When she's satisfied that every other inch of your body has been bathed by her tongue, she moves for your
+ <<if $PC.dick == 0>>
+ cunt, and laps at you enthusiastically
+ <<else>>
+ cock, and runs her tongue all over its surface<<if $PC.vagina == 1>> before turning her attentions to lavish the same wet service to your pussy<</if>>
+ <</if>>
+ This extravagant display of her subservience leaves her more sure of her @@.hotpink;submission@@ to you than before.
+ <<set $activeSlave.oralCount += 1>>
+ <<set $oralTotal += 1>>
+ <<set $activeSlave.devotion += 4>>
+ <</replace>>
+ <</link>>
+ </span>
+ <</replace>>
+<</link>>
+<br><<link "Let her go">>
+ <<replace "#name">>$activeSlave.slaveName<</replace>>
+ <<replace "#result">>
+ You grant her your assent to leave, and she hurries off to go on with her day. Her @@.mediumaquamarine;trust@@ for you grows as a result of allowing her to go about her duties unmolested.
+ <<set $activeSlave.trust += 2>>
+ <</replace>>
+<</link>>
+
<<case "young PC age difference">>
<<link "Gently acclimate her to the age difference with some lovemaking">>
@@ -222,7 +337,7 @@ She sits back up and rubs her hands down her lower back on either side, sighing
<<replace "#result">>
As you close in on $activeSlave.slaveName predatorily, her face blanches with visible regret at her prior candidness. By the time you have her bent over your desk and begun spanking her <<if $activeSlave.butt > 6>>massive behind<<elseif $activeSlave.butt > 3>>bountiful bottom<<else>>cute ass<</if>>, she seems almost resigned to accept any of the standard punishments you've been known to dole out. When your lips lightly brush one of her ears, she flinches harder at the gentle touch than any of your harsh, disciplinary spanks. When you start whispering wicked reminders about her sexual submission and subservience to so young a <<Master>>, she begins to sob quietly against the hard surface of your desk.
<br><br>
- By the time you deign to <<if $PC.dick == 0>>don a strap-on and <</if>>mount her ass, she seems catatonic at the revelation that her body is owned by a cruel <<Master>>, nearly half her age. Even when you accompany each brutal thrust with a harsh spank and a harsher jab at the dearth in years between the two of you, she merely winces at the anal pain of your coupling. Judging by the empty look in her eyes that persists past her dismissal from your office, she might @@color:gold;not feel any better@@ about the age difference but you've definitely @@color:hotpink;fucked her into compliance@@.
+ By the time you deign to <<if $PC.dick == 0>>don a strap-on and <</if>>mount her ass, she seems catatonic at the revelation that her body is owned by a cruel <<Master>>, nearly half her age. Even when you accompany each brutal thrust with a harsh spank and a harsher jab at the dearth in years between the two of you, she merely winces at the anal pain of your coupling. Judging by the empty look in her eyes that persists past her dismissal from your office, she might @@.gold;not feel any better@@ about the age difference but you've definitely @@.hotpink;fucked her into compliance@@.
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust -= 4>>
<<set $activeSlave.analCount += 1>>
@@ -264,7 +379,7 @@ She sits back up and rubs her hands down her lower back on either side, sighing
<<replace "#result">>
As you close in on $activeSlave.slaveName predatorily, her face blanches with visible regret at her prior candidness. By the time you have her bent over your desk and begun spanking her <<if $activeSlave.butt > 6>>massive behind<<elseif $activeSlave.butt > 3>>bountiful bottom<<else>>cute ass<</if>>, she seems almost resigned to accept any of the standard punishments you've been known to dole out. When your lips lightly brush one of her ears, she flinches harder at the gentle touch than any of your harsh, disciplinary spanks. When you start whispering wicked reminders about her sexual submission and subservience to so old a <<Master>>, she begins to sob quietly against the hard surface of your desk.
<br><br>
- By the time you deign to <<if $PC.dick == 0>>don a strap-on and <</if>>mount her ass, she seems catatonic at the revelation that her body is owned by so cruel an old <<Master>>. Even when you accompany each brutal thrust with a harsh spank and a harsh jab at the dearth in years between the two of you, she merely winces at the anal pain of your coupling. Judging by the empty look in her eyes that persists past her dismissal from your office, she might @@color:gold;not feel any better@@ about the age difference but you've definitely @@color:hotpink;fucked her into compliance@@.
+ By the time you deign to <<if $PC.dick == 0>>don a strap-on and <</if>>mount her ass, she seems catatonic at the revelation that her body is owned by so cruel an old <<Master>>. Even when you accompany each brutal thrust with a harsh spank and a harsh jab at the dearth in years between the two of you, she merely winces at the anal pain of your coupling. Judging by the empty look in her eyes that persists past her dismissal from your office, she might @@.gold;not feel any better@@ about the age difference but you've definitely @@.hotpink;fucked her into compliance@@.
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust -= 4>>
<<set $activeSlave.analCount += 1>>
@@ -548,9 +663,9 @@ She sits back up and rubs her hands down her lower back on either side, sighing
Deciding to do something a little more intimate than fucking her cleavage with a strap-on, you walk forward and into her face, pressing her inexorably backwards as she nuzzles your pussy until she's forced to collapse onto the ground. Then you scoot backwards a little, until you're straddling her ribcage just below her breasts. Her huge breasts rest atop your inner thighs, <<if $activeSlave.boobsImplant>>her skin taut against yours, from the implants<<else>>heavy and soft and female<</if>>. You ride her gently like this for a little while, enjoying the feminine weight of her and the effects of this intimacy on her face. Once you're ready for some more stimulation, you pull one of her hands down between her breasts; she gets her thumb down into her cleavage, all the way down until it can stimulate your button and bring you to a soft orgasm. Pleased, you slide down until you're face to face with her, and give her a kiss.
<</if>>
She
- <<if $activeSlave.energy > 80>>was looking after herself with a hand the whole time, and she @@color:mediumaquamarine;smiles gratefully at you@@ with satisfaction.
- <<elseif $activeSlave.trust > 20>>giggles a little, @@color:mediumaquamarine;pleased with herself.@@
- <<else>>smiles hesitantly, clearly thinking that @@color:mediumaquamarine;she did well.@@
+ <<if $activeSlave.energy > 80>>was looking after herself with a hand the whole time, and she @@.mediumaquamarine;smiles gratefully at you@@ with satisfaction.
+ <<elseif $activeSlave.trust > 20>>giggles a little, @@.mediumaquamarine;pleased with herself.@@
+ <<else>>smiles hesitantly, clearly thinking that @@.mediumaquamarine;she did well.@@
<</if>>
<<set $activeSlave.trust += 5>>
<<EventFetish "boobs">>
@@ -576,7 +691,7 @@ She sits back up and rubs her hands down her lower back on either side, sighing
<<default>>
You grab each of her nipples in a merciless grip and pinch them with abandon, adding a cruel twist as soon as you've got them held tightly enough.
<</switch>>
- Her $activeSlave.eyeColor eyes fly open and she <<if $activeSlave.voice == 1>>bellows with pain, her deep voice very loud<<elseif $activeSlave.voice == 2>>screams at the tops of her lungs<<elseif $activeSlave.voice == 3>>shrieks, her high, girlish voice very shrill<</if>>. The sudden agony discombobulates her so badly that for a few moments, she has no idea what's going on, and her hands fly forward reflexively. She manages to stop herself at the last minute, realizing that trying to knock your hands away from her poor nipples would be a very bad idea indeed. She looks up at you with huge eyes, mewling helplessly, @@color:gold;tears beginning to collect at the corners of her eyes.@@ Pleased, you turn and go.
+ Her $activeSlave.eyeColor eyes fly open and she <<if $activeSlave.voice == 1>>bellows with pain, her deep voice very loud<<elseif $activeSlave.voice == 2>>screams at the tops of her lungs<<elseif $activeSlave.voice == 3>>shrieks, her high, girlish voice very shrill<</if>>. The sudden agony discombobulates her so badly that for a few moments, she has no idea what's going on, and her hands fly forward reflexively. She manages to stop herself at the last minute, realizing that trying to knock your hands away from her poor nipples would be a very bad idea indeed. She looks up at you with huge eyes, mewling helplessly, @@.gold;tears beginning to collect at the corners of her eyes.@@ Pleased, you turn and go.
<<set $activeSlave.trust -= 5>>
<<EventFetish "masochist">>
<</replace>>
@@ -594,7 +709,7 @@ She sits back up and rubs her hands down her lower back on either side, sighing
<<case "huge">>her huge nipple filling your mouth comfortably.
<<default>>pulling her soft nipple and some of the areolae around it into your mouth.
<</switch>>
- Her rich milk begins to flow across your tongue, creamy and with a hint of vanilla. She breathes faster and faster as she becomes aroused, but then the stimulation peaks. You keep drinking from her, making no move to stop nursing and start fucking her. She sighs with sudden contentment, realizing that you're going to drink every drop she has, and her sudden relaxation sends a little extra gush of milk into your mouth. She @@color:hotpink;definitely enjoys the experience,@@ leaning back compliantly as you drain that breast and then her left one, too.
+ Her rich milk begins to flow across your tongue, creamy and with a hint of vanilla. She breathes faster and faster as she becomes aroused, but then the stimulation peaks. You keep drinking from her, making no move to stop nursing and start fucking her. She sighs with sudden contentment, realizing that you're going to drink every drop she has, and her sudden relaxation sends a little extra gush of milk into your mouth. She @@.hotpink;definitely enjoys the experience,@@ leaning back compliantly as you drain that breast and then her left one, too.
<<set $activeSlave.devotion += 5>>
<<EventFetish "boobs">>
<</replace>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 2497fa1a878952a8e619c70d14ef24df4c326953..4510a1e6922a02860aab55facca075b8eb5c733f 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -291,7 +291,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<if $cash >= 15000>>
<br><<link "Transfer a modest quantity of credits for the Queen herself">>
<<replace "#result">>
- You take a tablet and transmit a communication request to the new arcology owner. It doesn't take long for him to accept but when his video feed connects on your screen, you find yourself staring at the pained expression of the Queen herself. It becomes abundantly clear that someone is mounting her from behind as her body shakes and spasms from the intensity of their thrusts. You note that the Queen appears to be getting fucked on a extravagant, yet bloodstained, four-poster bed, likely the site of her former husband's demise. The mysterious individual unsurprisingly turns out to be the new arcology owner, revealing himself by shoving the Queen's face down against the stained bedsheets as he lowers his own face into frame. "How can I help you?"
+ You take a tablet and transmit a communication request to the new arcology owner. It doesn't take long for him to accept but when his video feed connects on your screen, you find yourself staring at the pained expression of the Queen herself. It becomes abundantly clear that someone is mounting her from behind as her body shakes and spasms from the intensity of their thrusts. You note that the Queen appears to be getting fucked on an extravagant, yet bloodstained, four-poster bed, likely the site of her former husband's demise. The mysterious individual unsurprisingly turns out to be the new arcology owner, revealing himself by shoving the Queen's face down against the stained bedsheets as he lowers his own face into frame. "How can I help you?"
<br><br>
The man seems somewhat surprised that you want to purchase the Queen, given the breadth and quality of his other merchandise available, but not unduly so. Soon enough negotiations begin and a short time later an equitable price is agreed upon. Your new peer even throws in a slight discount, in exchange for allowing him to use the Queen himself for the remainder of the night.
<br><br>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 3daed443c0412beb54b2df5603e80ace5afa9b1b..3885f713d9f5729eb1f9025b09f5b2aaf8a9681f 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -11,7 +11,7 @@ $arcadeNameCaps
<<case "Roman Revivalist">>
is built out as a Roman street restaurant, with the bar containing the inmates. Citizens can amuse themselves at either side of the bar while enjoying some wine and olives and talking over the day's events.
<<case "Aztec Revivalist">>
- is built out as a an Aztec stone temple, with a short stone staircase to lead the people straight to the slaves waiting in front of the establishment. A small canal leads the shed blood to the back and out of the building.
+ is built out as an Aztec stone temple, with a short stone staircase to lead the people straight to the slaves waiting in front of the establishment. A small canal leads the shed blood to the back and out of the building.
<<case "Egyptian Revivalist">>
is built to look like an ancient Egyptian temple, with a long altar of sacrifice serving as the wall in which the inmates are held. Incongruously, it's piled with fresh flowers.
<<case "Edo Revivalist">>
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 45826aa8be34a28022c70d8fcff71667868ca4bf..31335a2f83c7b548dbb5c3a5ee4ef8fc428578d2 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -136,7 +136,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her appearance to resemble an Egyptian deity to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her appearance to resemble a demon to conform with your vision of building new a Edo Japan.
+ adjusts her appearance to resemble a demon to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her appearance to resemble a djinn to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -180,7 +180,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble Egyptian garb to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to a brief Japanese bathhouse robe to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to a brief Japanese bathhouse robe to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an oil millionaire to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -224,7 +224,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her appearance to resemble an Egyptian to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese warrior to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese warrior to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arabian warrior to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -268,7 +268,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian lady to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese lady to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese lady to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arabian oil heiress to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -310,7 +310,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian girl to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese girl to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese girl to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arabian girl to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -354,7 +354,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian girl to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese girl to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese girl to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arabian girl to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -398,7 +398,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian lady to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese lady to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese lady to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arabian lady to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -442,7 +442,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian lady to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese lady to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese lady to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arabian lady to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -486,7 +486,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian girl to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese girl to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese girl to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arabian girl to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -530,7 +530,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian girl to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese girl to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese girl to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arabian girl to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -574,7 +574,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian woman to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese woman to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese woman to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arabian woman to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -618,7 +618,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian woman to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese woman to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese woman to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arabian woman to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -662,7 +662,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian woman, despite her cock, to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese woman, despite her cock, to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese woman, despite her cock, to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arabian woman, despite her cock, to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -706,7 +706,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble a topless Egyptian lady to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a traditional Japanese lady to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a traditional Japanese lady to conform with your vision of building a newEdo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arab girl attending a western school to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -750,7 +750,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble an Egyptian woman to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a Japanese woman to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a Japanese woman to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arabian woman to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -847,7 +847,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her form to an Egyptian woman to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her form to a Japanese woman to conform with your vision of building new a Edo Japan.
+ adjusts her form to a Japanese woman to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her form to an Arabian woman to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -891,7 +891,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
adjusts her outfit to resemble a topless Egyptian lady to conform with your vision of building a new land of the Pharaohs.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- adjusts her outfit to resemble a traditional Japanese lady to conform with your vision of building new a Edo Japan.
+ adjusts her outfit to resemble a traditional Japanese lady to conform with your vision of building a new Edo Japan.
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
adjusts her outfit to resemble an Arab girl attending a western school to conform with your vision of building a new Sultanate.
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
diff --git a/src/uncategorized/brothelAdvertisement.tw b/src/uncategorized/brothelAdvertisement.tw
index 2e69c64c28013b768689eb5323bce396db79e253..9e968e9cde993e9a74ad48c662bc4386c9582c50 100644
--- a/src/uncategorized/brothelAdvertisement.tw
+++ b/src/uncategorized/brothelAdvertisement.tw
@@ -4,7 +4,7 @@
<<if $arcologies[0].FSRomanRevivalistDecoration >= 60>>
The brothel is decorated as a Roman whorehouse. Refreshments are served at a bar, and someone is playing pipes in the back.
-<<if $arcologies[0].FSAztecRevivalistDecoration >= 60>>
+<<elseif $arcologies[0].FSAztecRevivalistDecoration >= 60>>
The brothel is decorated as an Aztec ode to fertility and nature. Clients may sacrifice a bit of blood to honor the goddess of Filth or to partake in a fertility ritual before joining the girl of their choosing.
<<elseif $arcologies[0].FSEgyptianRevivalistDecoration >= 60>>
The brothel is decorated as an ancient Egyptian fertility temple. Customers are bade relax on couches next to running water so that slaves may dance to entice them.
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 459ef2c2a5de025fd08d22a0b79288ee10aafe07..48a2c302e57f70975838d8f106d16fe1b0b3cfa8 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -471,16 +471,8 @@
$brothelNameCaps's customers enjoy @@.green;fucking whores in $brothelDecoration surroundings.@@
<</if>>
- <<if $brothel <= $brothelSlaves>>
- <<set $brothelSpots = 0>>
- <<else>>
- <<set $brothelSpots = $brothel - $brothelSlaves>>
- <</if>>
-
<!-- Statistics output -->
<<BrothelStatistics 0>>
-<<else>>
- <<set $brothelSpots = $brothel>>
<</if>>
<<if $brothelSlaves || $Madam>>
<br><br>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 8fb7937fc68d47568ec48a45ac10dc74a6b2eb2d..66a72ec871bfc21f9d84eb09f290e56254524ee1 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -17,7 +17,7 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to
border-spacing: 5px;
border-style: hidden;
empty-cells: hide;
- width: 75%;
+ width: 70%;
}
th, td {
border: 0px;
diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw
index 3cd5c0151c9ab54a5b230c7d6b7bef1806c81668..d8a42875d72b464f7cee552672da50df1e70fcaa 100644
--- a/src/uncategorized/bulkSlaveIntro.tw
+++ b/src/uncategorized/bulkSlaveIntro.tw
@@ -81,17 +81,17 @@
/* Use existing Long Slave Description */
<span id="description">
- <<click "Show slave description">>
+ <<link "Show slave description">>
<<replace "#description">>
<<set $saleDescription = 1>>
- <<display "Long Slave Description">>
+ <<include "Long Slave Description">>
<<set $saleDescription = 0>>
<</replace>>
- <</click>>
+ <</link>>
</span><br>
/* Use existing New Slave Intro */
- <<display "New Slave Intro">>
+ <<include "New Slave Intro">>
/* Override nextButton setting from New Slave Intro */
<<set $nextButton = "Continue">>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 04c10a24c635c947b8e69d4eea57a9651b79b479..e386bc3ce130ad397c3cf450c7d93b415b5c9ca0 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -251,7 +251,7 @@
<<if ($Nurse != 0) && ($clinicSpeedGestation == 1) && ($slaves[_i].preg > 0)>>
<<set $slaves[_i].pregControl = "speed up">>
<</if>>
- <<if ($Nurse != 0) && ($slaves[_i].chem > 0) && ($clinicUpgradeFilters == 1)>>
+ <<if ($Nurse != 0) && ($slaves[_i].chem > 10) && ($clinicUpgradeFilters == 1)>>
<<set $slaves[_i].chem -= 5 + (50 * $clinicUpgradePurge)>>
<<if $clinicUpgradePurge == 1 && $slaves[_i].health > -50>>
<<set $slaves[_i].health = -50>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 8c6761b764aea250aa395991cc1defdf993418bd..b4a4cfabaa22730cabaeb34d15e6ff37f2e0c3e4 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -3,41 +3,59 @@
<<set $clubBonuses = 0, $DJRepBonus = 0, $implanted = 0, $legendaryEntertainerID = 0, $modded = 0, $old = 0, $pure = 0, $slim = 0, $stacked = 0, $unmodded = 0, $XX = 0, $XY = 0, $young = 0, _FLsFetish = 0, _DL = $ClubiIDs.length, $clubSlaves = _DL, _SL = $slaves.length, _FLs = -1>>
<<set $legendaryWombID = 0, $pregYes = 0, $pregNo = 0>>
+<<for _dI = 0; _dI < _DL; _dI++>>
+ <<set _i = $ClubiIDs[_dI].Index, _ID = $ClubiIDs[_dI].ID>>
+ <<if _i >= _SL || _ID != $slaves[_i].ID>>
+ /% Slaves.ID and $ClubiIDs.ID's don't match-up so let's find her %/
+ <<for _i = 0; _i < _SL; _i++>>
+ <<if _ID == $slaves[_i].ID>>
+ /% Correct the Index %/
+ <<set $ClubiIDs[_dI].Index = _i>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<if _i >= _SL || $slaves[_i].assignment != "serve in the club">>
+ <<set $ClubiIDs.deleteAt(_dI), _dI--, _DL-->>
+ <<continue>>
+ <</if>>
+<</for>>
+<<SlaveSort $ClubiIDs>>
<<if $DJ != 0>>
<<for _FLs = 0; _FLs < _SL; _FLs++>>
- <<if $slaves[_FLs].ID == $DJ.ID>>
- <<break>>
- <</if>>
+ <<if $slaves[_FLs].ID == $DJ.ID>>
+ <<break>>
+ <</if>>
<</for>>
<<if ($slaves[_FLs].health < -80)>>
- <<set $slaves[_FLs].health += 20>>
+ <<set $slaves[_FLs].health += 20>>
<<elseif $slaves[_FLs].health < -40>>
- <<set $slaves[_FLs].health += 15>>
+ <<set $slaves[_FLs].health += 15>>
<<elseif $slaves[_FLs].health < 0>>
- <<set $slaves[_FLs].health += 10>>
+ <<set $slaves[_FLs].health += 10>>
<<elseif $slaves[_FLs].health < 90>>
- <<set $slaves[_FLs].health += 7>>
+ <<set $slaves[_FLs].health += 7>>
<</if>>
<<if $slaves[_FLs].devotion <= 60>>
- <<set $slaves[_FLs].devotion += 5>>
+ <<set $slaves[_FLs].devotion += 5>>
<</if>>
<<if $slaves[_FLs].trust < 60>>
- <<set $slaves[_FLs].trust += 3>>
+ <<set $slaves[_FLs].trust += 3>>
<</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
- <<if $slaves[_FLs].fetish != "humiliation">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "humiliation">>
+ <<if $slaves[_FLs].fetish != "humiliation">>
+ <<fetishChangeChance $slaves[_FLs]>>
+ <<if $fetishChangeChance > random(0,100)>>
+ <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "humiliation">>
+ <</if>>
+ <<elseif $slaves[_FLs].fetishKnown == 0>>
+ <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
+ <<else>>
+ <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
<</if>>
- <<elseif $slaves[_FLs].fetishKnown == 0>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
- <<else>>
- <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
<</if>>
- <</if>>
- <<set $DJ = $slaves[_FLs]>>
+ <<set $DJ = $slaves[_FLs], $i = _FLs>>
$DJ.slaveName is performing as the DJ.
<<if $DJ.relationship == -3>>
She tries her best to be your energetic, cheerful wife.
@@ -87,11 +105,11 @@
<<if ($clubSlaves < 10)>>
<<set $slavesGettingHelp = 0>>
<<if $universalRulesFacilityWork == 1>>
- <<for _i = 0; _i < _SL; _i++>>
- <<if ($slaves[_i].assignment == "serve the public")>>
- <<set $slavesGettingHelp++>>
- <</if>>
- <</for>>
+ <<for _i = 0; _i < _SL; _i++>>
+ <<if ($slaves[_i].assignment == "serve the public")>>
+ <<set $slavesGettingHelp++>>
+ <</if>>
+ <</for>>
<</if>>
<<if ($clubSlaves+$slavesGettingHelp < 10)>>
<<if ($legendaryEntertainerID == 0) && ($slaves[_FLs].prestige == 0) && ($slaves[_FLs].entertainSkill >= 100) && ($slaves[_FLs].devotion > 50)>>
@@ -115,6 +133,7 @@
<</if>>
<<if ($DJ != 0)>>
+ <<set $i = _FLs>> /* apply following SA passages to facility leader */
<<if $showEWD != 0>>
<br><br>
/* 000-250-006 */
@@ -126,14 +145,7 @@
/* 000-250-006 */
''__@@.pink;$slaves[_FLs].slaveName@@__'' is performing as the DJ in the club.
<br>
- <<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[_FLs].devotion <= 20)>>
- <<set $slaves[_FLs].devotion -= 5>>
- <<else>>
- <<set $slaves[_FLs].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -142,14 +154,7 @@
<br><<include "SA devotion">>
<<else>>
<<silently>>
- <<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[$i].devotion <= 20)>>
- <<set $slaves[_FLs].devotion -= 5>>
- <<else>>
- <<set $slaves[_FLs].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -161,101 +166,70 @@
<<set $DJ = $slaves[_FLs]>>
<</if>>
-<<if $clubSlaves > 0>>
- <<SlaveSort $ClubiIDs>>
+<<if ($clubSlaves > 0)>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set _i = $ClubiIDs[_dI].Index, _ID = $ClubiIDs[_dI].ID>>
- <<if _i >= _SL || _ID != $slaves[_i].ID>>
- /% Slaves.ID and $ClubiIDs.ID's don't match-up so let's find her %/
- <<for _i = 0; _i < _SL; _i++>>
- <<if _ID == $slaves[_i].ID>>
- /% Correct the Index %/
- <<set $ClubiIDs[_dI].Index = _i>>
- <<break>>
+ <<set _i = $ClubiIDs[_dI].Index, $i = _i>>
+ <<if ($legendaryEntertainerID == 0) && ($slaves[_i].prestige == 0) && ($slaves[_i].entertainSkill >= 100) && ($slaves[_i].devotion > 50) && ($slaves[_i].prestige == 0)>>
+ <<set $legendaryEntertainerID = $slaves[_i].ID>>
<</if>>
- <</for>>
- <</if>>
- <<if _i >= _SL || $slaves[_i].assignment != "serve in the club">>
- <<set $ClubiIDs.deleteAt(_dI), _dI--, _DL-->>
- <<continue>>
- <</if>>
-
- <<if ($legendaryEntertainerID == 0) && ($slaves[_i].prestige == 0) && ($slaves[_i].entertainSkill >= 100) && ($slaves[_i].devotion > 50) && ($slaves[_i].prestige == 0)>>
- <<set $legendaryEntertainerID = $slaves[_i].ID>>
- <</if>>
- <<if ($legendaryWombID == 0) && ($slaves[_i].amp != 1) && ($slaves[_i].preg > 30) && ($slaves[_i].pregType < 50) && ($slaves[_i].eggType == "human") && ($slaves[_i].births > 10) && ($slaves[_i].devotion > 50) && ($slaves[_i].prestige == 0)>>
- <<set $legendaryWombID = $slaves[_i].ID>>
- <</if>>
- <<if ($slaves[_i].devotion <= 20) && ($slaves[_i].trust > -20)>>
- <<set $slaves[_i].devotion -= 5, $slaves[_i].trust -= 5>>
- <<elseif ($slaves[_i].devotion < 45)>>
- <<set $slaves[_i].devotion += 4>>
- <<elseif ($slaves[_i].devotion >= 50)>>
- <<set $slaves[_i].devotion -= 4>>
- <</if>>
-
- <<if ($slaves[_i].trust < 30)>>
- <<set $slaves[_i].trust += 5>>
- <</if>>
-
- <<if ($slaves[_i].health < -80)>>
- <<set $slaves[_i].health += 20>>
- <<elseif ($slaves[_i].health < -40)>>
- <<set $slaves[_i].health += 15>>
- <<elseif ($slaves[_i].health < 0)>>
- <<set $slaves[_i].health += 10>>
- <<elseif ($slaves[_i].health < 90)>>
- <<set $slaves[_i].health += 7>>
- <</if>>
-
- <<set $i = _i>>
-
- <<if $showEWD != 0>>
- <br><br>
- /* 000-250-006 */
- <<if $seeImages == 1 && $imageChoice == 0>>
- <div class="imageRef tinyImg">
- <<SlaveArt $slaves[$i] 0 0>>
- </div>
+ <<if ($legendaryWombID == 0) && ($slaves[_i].amp != 1) && ($slaves[_i].preg > 30) && ($slaves[_i].pregType < 50) && ($slaves[_i].eggType == "human") && ($slaves[_i].births > 10) && ($slaves[_i].devotion > 50) && ($slaves[_i].prestige == 0)>>
+ <<set $legendaryWombID = $slaves[_i].ID>>
<</if>>
- /* 000-250-006 */
- ''__@@.pink;$slaves[$i].slaveName@@__'' is serving in the club.
- <br> She <<include "SA serve the public">>
- <br>
- <<if $slaves[$i].choosesOwnClothes == 1>>
- <<include "SA chooses own clothes">>
- <<if ($slaves[$i].devotion <= 20)>>
- <<set $slaves[$i].devotion -= 5>>
- <<else>>
- <<set $slaves[$i].devotion++>>
+ <<if ($slaves[_i].devotion <= 20) && ($slaves[_i].trust > -20)>>
+ <<set $slaves[_i].devotion -= 5, $slaves[_i].trust -= 5>>
+ <<elseif ($slaves[_i].devotion < 45)>>
+ <<set $slaves[_i].devotion += 4>>
+ <<elseif ($slaves[_i].devotion >= 50)>>
+ <<set $slaves[_i].devotion -= 4>>
<</if>>
+
+ <<if ($slaves[_i].trust < 30)>>
+ <<set $slaves[_i].trust += 5>>
<</if>>
- <<include "SA diet">>
- <<include "SA long term effects">>
- <<include "SA drugs">>
- <<include "SA relationships">>
- <<include "SA rivalries">>
- <br><<include "SA devotion">>
- <<else>>
- <<silently>>
- <<include "SA serve the public">>
- <<if $slaves[$i].choosesOwnClothes == 1>>
- <<include "SA chooses own clothes">>
- <<if ($slaves[$i].devotion <= 20)>>
- <<set $slaves[$i].devotion -= 5>>
- <<else>>
- <<set $slaves[$i].devotion++>>
+
+ <<if ($slaves[_i].health < -80)>>
+ <<set $slaves[_i].health += 20>>
+ <<elseif ($slaves[_i].health < -40)>>
+ <<set $slaves[_i].health += 15>>
+ <<elseif ($slaves[_i].health < 0)>>
+ <<set $slaves[_i].health += 10>>
+ <<elseif ($slaves[_i].health < 90)>>
+ <<set $slaves[_i].health += 7>>
<</if>>
+
+ <<if $showEWD != 0>>
+ <br><br>
+ /* 000-250-006 */
+ <<if $seeImages == 1 && $imageChoice == 0>>
+ <div class="imageRef tinyImg">
+ <<SlaveArt $slaves[$i] 0 0>>
+ </div>
+ <</if>>
+ /* 000-250-006 */
+ ''__@@.pink;$slaves[$i].slaveName@@__'' is serving in the club.
+ <br> She <<include "SA serve the public">>
+ <br>
+ <<include "SA chooses own clothes">>
+ <<include "SA diet">>
+ <<include "SA long term effects">>
+ <<include "SA drugs">>
+ <<include "SA relationships">>
+ <<include "SA rivalries">>
+ <br><<include "SA devotion">>
+ <<else>>
+ <<silently>>
+ <<include "SA serve the public">>
+ <<include "SA chooses own clothes">>
+ <<include "SA diet">>
+ <<include "SA long term effects">>
+ <<include "SA drugs">>
+ <<include "SA relationships">>
+ <<include "SA rivalries">>
+ <<include "SA devotion">>
+ <</silently>>
<</if>>
- <<include "SA diet">>
- <<include "SA long term effects">>
- <<include "SA drugs">>
- <<include "SA relationships">>
- <<include "SA rivalries">>
- <<include "SA devotion">>
- <</silently>>
- <</if>>
-<</for>>
+ <</for>>
+
<br><br>
<<if $clubAdsSpending != 0>>
An ad campaign is getting citizens into the club every night, and sluts that match it gratify patrons.
@@ -324,13 +298,6 @@
$clubNameCaps's customers enjoy @@.green;having sex in $clubDecoration surroundings.@@
<</if>>
- <<if ($club <= $clubSlaves)>>
- <<set $clubSpots = 0>>
- <<else>>
- <<set $clubSpots = $club - $clubSlaves>>
- <</if>>
-<<else>>
- <<set $clubSpots = $club>>
<</if>>
<<if $clubSlaves || $DJ>>
<br><br>
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index 26ded193b786741c134d40935f0b129eef3aa353..130f60ed599b26db12f9f68d9889b0b878552e6c 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -59,7 +59,7 @@ in total, the corporation has enslaved $corpPeopleEnslaved people.
<<if $corpMarket>>
<<if $rep > 5000>>
<<set $slaveAssets = $slaveAssets+Math.trunc(0.1*$slaveAssets*(($rep-5000)/15000))>>
- Since the corpration has its flagship slave market in $arcologies[0].name, your
+ Since the corporation has its flagship slave market in $arcologies[0].name, your
<<if $rep > 19000>>
worldwide renown greatly
<<elseif $rep > 15000>>
@@ -73,7 +73,7 @@ in total, the corporation has enslaved $corpPeopleEnslaved people.
<</if>>
<</if>>
<<if $corpProfit*0.6 > ($personalShares+$publicShares)*3>>
- Since it is incredibly profitable, an massive dividend of ¤<<print Math.trunc(($corpProfit*0.6)/($personalShares+$publicShares))>> was paid out to stockholders; you received @@.yellowgreen;¤<<print Math.trunc(($corpProfit*0.6)/($personalShares+$publicShares))*$personalShares>>.@@
+ Since it is incredibly profitable, a massive dividend of ¤<<print Math.trunc(($corpProfit*0.6)/($personalShares+$publicShares))>> was paid out to stockholders; you received @@.yellowgreen;¤<<print Math.trunc(($corpProfit*0.6)/($personalShares+$publicShares))*$personalShares>>.@@
<<set $cash += Math.trunc(($corpProfit*0.6)/($personalShares+$publicShares))*$personalShares>>
<<set $corpCash -= Math.trunc(($corpProfit*0.6)/($personalShares+$publicShares))*$personalShares>>
<<elseif $corpProfit > ($personalShares+$publicShares)*2.4>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 32eb2e204b315e15fa6fe239e26e7050de064ce0..ddc0bdc39d31bb8e2b5946373cb1a3e19f941832 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -3,29 +3,29 @@
<<set $bioreactorPerfectedID = 0, $legendaryBallsID = 0, $legendaryCowID = 0, $milkmaidDevotionBonus = 1, $milkmaidHealthBonus = 0, $milkmaidTrustBonus = 1, $milkmaidDevotionThreshold = 45, $milkmaidTrustThreshold = 35, _anusesStretched = 0, _birthers = 0, _births = 0, _cumWeek = 0, _femCumWeek = 0, _FLsFetish = 0, _milkWeek = 0, _balltacular = 0, _boobtacular = 0, _careerForgotten = 0, _chemMinor = 0, _chemSevere = 0, _desterilized = 0, _hatefilled = 0, _horrified = 0, _intelligenceLost = 0, _mindbroken = 0, _profits = 0, _skillsLost = 0, _stupidified = 0, _vaginasStretched = 0, _DL = $DairyiIDs.length, $dairySlaves = _DL, _SL = $slaves.length, _FLs = -1>>
<<for _dI = 0; _dI < _DL; _dI++>>
-<<set _i = $DairyiIDs[_dI].Index, _ID = $DairyiIDs[_dI].ID>>
-<<if _i >= _SL || _ID != $slaves[_i].ID>>
- /% Slaves.ID and $DairyiIDs.ID's don't match-up so let's find her %/
- <<for _i = 0; _i < _SL; _i++>>
- <<if _ID == $slaves[_i].ID>>
- /% Correct the Index %/
- <<set $DairyiIDs[_dI].Index = _i>>
- <<break>>
+ <<set _i = $DairyiIDs[_dI].Index, _ID = $DairyiIDs[_dI].ID>>
+ <<if _i >= _SL || _ID != $slaves[_i].ID>>
+ /% Slaves.ID and $DairyiIDs.ID's don't match-up so let's find her %/
+ <<for _i = 0; _i < _SL; _i++>>
+ <<if _ID == $slaves[_i].ID>>
+ /% Correct the Index %/
+ <<set $DairyiIDs[_dI].Index = _i>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<if _i >= _SL || $slaves[_i].assignment != "work in the dairy">>
+ <<set $DairyiIDs.deleteAt(_dI), _dI--, _DL-->>
+ <<continue>>
<</if>>
- <</for>>
-<</if>>
-<<if _i >= _SL || $slaves[_i].assignment != "work in the dairy">>
- <<set $DairyiIDs.deleteAt(_dI), _dI--, _DL-->>
- <<continue>>
-<</if>>
<</for>>
<<SlaveSort $DairyiIDs>>
<<if ($Milkmaid != 0)>>
<<for _FLs = 0; _FLs < _SL; _FLs++>>
- <<if $slaves[_FLs].ID == $Milkmaid.ID>>
- <<break>>
- <</if>>
+ <<if $slaves[_FLs].ID == $Milkmaid.ID>>
+ <<break>>
+ <</if>>
<</for>>
<<if $slaves[_FLs].health < 90>>
<<set $slaves[_FLs].curatives = 2>>
@@ -48,19 +48,19 @@
<<set $milkmaidHealthBonus++>>
<</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
- <<if $slaves[_FLs].fetish != "boobs">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "boobs">>
+ <<if $slaves[_FLs].fetish != "boobs">>
+ <<fetishChangeChance $slaves[_FLs]>>
+ <<if $fetishChangeChance > random(0,100)>>
+ <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "boobs">>
+ <</if>>
+ <<elseif $slaves[_FLs].fetishKnown == 0>>
+ <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
+ <<else>>
+ <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
<</if>>
- <<elseif $slaves[_FLs].fetishKnown == 0>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
- <<else>>
- <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
<</if>>
- <</if>>
- <<set $Milkmaid = $slaves[_FLs]>>
- $Milkmaid.slaveName is serving as your milkmaid
+ <<set $Milkmaid = $slaves[_FLs], $i = _FLs>>
+ $Milkmaid.slaveName is serving as your Milkmaid.
<<if $Milkmaid.relationship == -3>>
<<set $milkmaidDevotionBonus += 2, $milkmaidTrustBonus += 2>>
She tries her best to be your perfect farmwife.
@@ -68,10 +68,10 @@
<<if ($dairySlaves > 0) && ($milkmaidImpregnates == 1) && (canPenetrate($Milkmaid)) && $Milkmaid.pubertyXY == 1>>
<<set _milkmaidImpregnated = 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set _i = $DairyiIDs[_dI].Index>>
- <<if (canGetPregnant($slaves[_i])) && (canBreed($slaves[_i], $Milkmaid))>>
- <<set $slaves[_i].preg = 1, $slaves[_i].pregSource = $Milkmaid.ID, _milkmaidImpregnated++, $slaves[_i].vaginalCount += 10, $vaginalTotal += 10>>
- <</if>>
+ <<set _i = $DairyiIDs[_dI].Index>>
+ <<if (canImpreg($slaves[_i], $Milkmaid))>>
+ <<set $slaves[_i].preg = 1, $slaves[_i].pregSource = $Milkmaid.ID, _milkmaidImpregnated++, $slaves[_i].vaginalCount += 10, $vaginalTotal += 10>>
+ <</if>>
<</for>>
<<if _milkmaidImpregnated > 0>>
It's her responsibility to keep her charges pregnant, and she constantly
@@ -92,46 +92,46 @@
<<set $milkmaidHealthBonus++>>
Her muscles help her handle the fattest or most reluctant cow.
<</if>>
- <<for _dI = 0; _dI < _DL; _dI++>>
- <<set _i = $DairyiIDs[_dI].Index>>
<<if $dairyRestraintsSetting != 2>> /* how much effort the MM must take to force a slave into a stall */
- <<if $slaves[_i].devotion < 20>>
- <<set _MMWorkout++>>
- <</if>>
- <<if $slaves[_i].trust < 20>>
- <<set _MMWorkout++>>
- <</if>>
- <<if $slaves[_i].muscles >= 30>>
- <<set _MMWorkout++>>
- <</if>>
- <<if $slaves[_i].weight >= 70>>
- <<set _MMWorkout++>>
- <</if>>
- <<if $slaves[_i].boobs >= 6000>>
- <<set _MMWorkout++>>
- <</if>>
- <<if $slaves[_i].balls >= 30>>
- <<set _MMWorkout++>>
- <</if>>
- <<if bigBellyPreg($slaves[_i])>>
- <<set _MMWorkout++>>
- <</if>>
- <<if !canWalk($slaves[_i])>> /* big bonus if they can't move themselves and are fat as cows */
+ <<for _dI = 0; _dI < _DL; _dI++>>
+ <<set _i = $DairyiIDs[_dI].Index>>
+ <<if $slaves[_i].devotion < 20>>
+ <<set _MMWorkout++>>
+ <</if>>
+ <<if $slaves[_i].trust < 20>>
+ <<set _MMWorkout++>>
+ <</if>>
+ <<if $slaves[_i].muscles >= 30>>
+ <<set _MMWorkout++>>
+ <</if>>
<<if $slaves[_i].weight >= 70>>
- <<set _MMWorkout += 2>>
+ <<set _MMWorkout++>>
<</if>>
<<if $slaves[_i].boobs >= 6000>>
- <<set _MMWorkout += 2>>
+ <<set _MMWorkout++>>
<</if>>
<<if $slaves[_i].balls >= 30>>
- <<set _MMWorkout += 2>>
+ <<set _MMWorkout++>>
<</if>>
<<if bigBellyPreg($slaves[_i])>>
- <<set _MMWorkout += 2>>
+ <<set _MMWorkout++>>
<</if>>
- <</if>>
+ <<if !canWalk($slaves[_i])>> /* big bonus if they can't move themselves and are fat as cows */
+ <<if $slaves[_i].weight >= 70>>
+ <<set _MMWorkout += 2>>
+ <</if>>
+ <<if $slaves[_i].boobs >= 6000>>
+ <<set _MMWorkout += 2>>
+ <</if>>
+ <<if $slaves[_i].balls >= 30>>
+ <<set _MMWorkout += 2>>
+ <</if>>
+ <<if bigBellyPreg($slaves[_i])>>
+ <<set _MMWorkout += 2>>
+ <</if>>
+ <</if>>
+ <</for>>
<</if>>
- <</for>>
<<if _MMWorkout > (random(1,100)+$Milkmaid.muscles) && $Milkmaid.muscles < 60>>>
Constantly having to wrestle unruly or aiding heavy cows into their stalls forces her to @@.lime;build muscle.@@
<<set $slaves[_FL].muscles++>>
@@ -155,93 +155,80 @@
<<set $milkmaidHealthBonus++>>
She has career experience dealing with milk animals.
<</if>>
- <<set $milkmaidDevotionThreshold += (5*$milkmaidDevotionBonus), $milkmaidTrustThreshold += (5*$milkmaidTrustBonus)>>
- <<if $dairySlaves > 0>>
- <<if ($dairyStimulatorsSetting < 2) && ($Milkmaid.dick > 4) && (canPenetrate($Milkmaid))>>
+ <<if ($dairyStimulatorsSetting < 2) && ($Milkmaid.dick > 4) && (canPenetrate($Milkmaid))>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set _i = $DairyiIDs[_dI].Index>>
- <<if ($slaves[_i].balls > 0)>>
- She uses her turgid cock to give prostate stimulation to slaves that need help ejaculating.
- <<break>>
- <</if>>
+ <<set _i = $DairyiIDs[_dI].Index>>
+ <<if ($slaves[_i].balls > 0)>>
+ She uses her turgid cock to give prostate stimulation to slaves that need help ejaculating.
+ <<break>>
+ <</if>>
<</for>>
- <</if>>
+ <</if>>
+ <<set $milkmaidDevotionThreshold += (5*$milkmaidDevotionBonus), $milkmaidTrustThreshold += (5*$milkmaidTrustBonus)>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set _i = $DairyiIDs[_dI].Index>>
- <<if $familyTesting == 1>>
- <<if $slaves[_i].mother == $Milkmaid.ID>>
- She pays special attention to her daughter, $slaves[_i].slaveName, making sure she is well kept and happy.
+ <<set _i = $DairyiIDs[_dI].Index>>
+ <<if $Milkmaid.rivalryTarget == $slaves[_i].ID>>
+ She either neglects or harasses her <<if $Milkmaid.rivalry == 1>>growing rival<<elseif $Milkmaid.rivalry == 2>>rival<<elseif $Milkmaid.rivalry == 3>>bitter rival<</if>>, $slaves[_i].slaveName, making sure she is unhappy and uncomfortable.
+ <<set $slaves[_i].devotion -= 3, $slaves[_i].trust -= 3>>
+ <<if random(1,100) > 65>>
+ <<set $Milkmaid.rivalry++, $slaves[_FLs].rivalry++, $slaves[_i].rivalry++>>
+ <</if>>
+ <<elseif $Milkmaid.relationshipTarget == $slaves[_i].ID>>
+ She dotes over her <<if $Milkmaid.relationship == 1>>friend<<elseif $Milkmaid.relationship == 2>>best friend<<elseif $Milkmaid.relationship == 3>>friend with benefits<<elseif $Milkmaid.relationship == 4>>lover<<elseif $Milkmaid.relationship == 5>>slave wife<</if>>, $slaves[_i].slaveName, making sure she is happy and comfortable.
+ <<set $slaves[_i].devotion++, $slaves[_i].trust++>>
+ <<elseif $familyTesting == 1 && totalRelatives($slaves[_i]) > 0>>
+ <<if $slaves[_i].mother == $Milkmaid.ID || $slaves[_i].father == $Milkmaid.ID>>
+ She pays special attention to her daughter, $slaves[_i].slaveName, making sure she is well kept and happy.
+ <<set $slaves[_i].trust++>>
+ <<elseif $slaves[_i].ID == $Milkmaid.mother>>
+ She pays special attention to her mother, $slaves[_i].slaveName, making sure she is well kept and happy.
+ <<set $slaves[_i].trust++>>
+ <<elseif $slaves[_i].ID == $Milkmaid.father>>
+ She pays special attention to her father, $slaves[_i].slaveName, making sure she is well kept and happy.
+ <<set $slaves[_i].trust++>>
+ <<elseif areSisters($slaves[_i], $Milkmaid) == 1>>
+ She pays special attention to her twin sister, $slaves[_i].slaveName, making sure she is well kept and happy.
+ <<set $slaves[_i].trust++>>
+ <<elseif areSisters($slaves[_i], $Milkmaid) == 2>>
+ She pays special attention to her sister, $slaves[_i].slaveName, making sure she is well kept and happy.
+ <<set $slaves[_i].trust++>>
+ <<elseif areSisters($slaves[_i], $Milkmaid) == 3>>
+ She pays special attention to her half-sister, $slaves[_i].slaveName, making sure she is well kept and happy.
+ <<set $slaves[_i].trust++>>
+ <</if>>
+ <<elseif $Milkmaid.relationTarget == $slaves[_i].ID && $familyTesting == 0>>
+ She pays special attention to her $slaves[_i].relation, $slaves[_i].slaveName, making sure she is well kept and happy.
<<set $slaves[_i].trust++>>
<</if>>
- <<if $slaves[_i].father == $Milkmaid.ID>>
- She pays special attention to her daughter, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust++>>
+ <<if $slaves[_i].prestigeDesc == "She is remembered for winning best in show as a dairy cow.">>
+ She spends extra time with $slaves[_i].slaveName, the well-known cow. $Milkmaid.slaveName is fascinated by her massive $slaves[_i].boobs cc breasts and spends extra time massaging and kneading them to maximize production.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
<</if>>
- <<if $slaves[_i].ID == $Milkmaid.father>>
- She pays special attention to her father, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust++>>
+ <<if $slaves[_i].prestigeDesc == "She is remembered for winning best in show as a cockmilker.">>
+ She spends extra time with $slaves[_i].slaveName, the massive ejaculating cow. She can't help but massage the cow's dick and testes to stimulate them further and coax more from them.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
<</if>>
- <<if $slaves[_i].ID == $Milkmaid.mother>>
- She pays special attention to her mother, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust++>>
+ <<if $slaves[_i].prestigeDesc == "She is remembered for winning best in show as a breeder." && $slaves[_i].preg > 10>>
+ She spends extra time with $slaves[_i].slaveName, the well-known breeder. $Milkmaid.slaveName is fascinated by her growing pregnancy and popular womb. She makes sure her belly and it's occupants are nice and comfortable.
+ <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
<</if>>
- <<if areSisters($slaves[_i], $Milkmaid) == 1>>
- She pays special attention to her twin sister, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust++>>
- <<elseif areSisters($slaves[_i], $Milkmaid) == 2>>
- She pays special attention to her sister, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust++>>
- <<elseif areSisters($slaves[_i], $Milkmaid) == 3>>
- She pays special attention to her half-sister, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust++>>
- <</if>>
- <<else>>
- <<if $Milkmaid.relationTarget == $slaves[_i].ID>>
- She pays special attention to her $slaves[_i].relation, $slaves[_i].slaveName, making sure she is well kept and happy.
- <<set $slaves[_i].trust++>>
- <</if>>
- <</if>> /*closes family mode */
- <<if $Milkmaid.relationshipTarget == $slaves[_i].ID>>
- She dotes over her <<if $Milkmaid.relationship == 1>>friend<<elseif $Milkmaid.relationship == 2>>best friend<<elseif $Milkmaid.relationship == 3>>friend with benefits<<elseif $Milkmaid.relationship == 4>>lover<<elseif $Milkmaid.relationship == 5>>slave wife<</if>>, $slaves[_i].slaveName, making sure she is happy and comfortable.
- <<set $slaves[_i].devotion++>>
- <</if>>
- <<if $Milkmaid.rivalryTarget == $slaves[_i].ID>>
- She either neglects or harasses her <<if $Milkmaid.rivalry == 1>>growing rival<<elseif $Milkmaid.rivalry == 2>>rival<<elseif $Milkmaid.rivalry == 3>>bitter rival<</if>>, $slaves[_i].slaveName, making sure she is unhappy and uncomfortable.
- <<set $slaves[_i].devotion -= 3, $slaves[_i].trust -= 3>>
- <<if random(1,100) > 65>>
- <<set $Milkmaid.rivalry++, $slaves[_FLs].rivalry++, $slaves[_i].rivalry++>>
- <</if>>
- <</if>>
- <<if $slaves[_i].prestigeDesc == "She is remembered for winning best in show as a dairy cow.">>
- She spends extra time with $slaves[_i].slaveName, the well-known cow. $Milkmaid.slaveName is fascinated by her massive $slaves[_i].boobs cc breasts and spends extra time massaging and kneading them to maximize production.
- <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
- <</if>>
- <<if $slaves[_i].prestigeDesc == "She is remembered for winning best in show as a cockmilker.">>
- She spends extra time with $slaves[_i].slaveName, the massive ejaculating cow. She can't help but massage the cow's dick and testes to stimulate them further and coax more from them.
- <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
- <</if>>
- <<if $slaves[_i].prestigeDesc == "She is remembered for winning best in show as a breeder." && $slaves[_i].preg > 10>>
- She spends extra time with $slaves[_i].slaveName, the well-known breeder. $Milkmaid.slaveName is fascinated by her growing pregnancy and popular womb. She makes sure her belly and it's occupants are nice and comfortable.
- <<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
- <</if>>
<</for>>
- <br><br>
- <</if>>
<</if>>
<<set _Tadd = ($bioreactorsXY + $bioreactorsXX + $bioreactorsHerm + $bioreactorsBarren)>>
<<if ($dairySlaves + _Tadd > 0)>>
+ <<if ($Milkmaid != 0)>><br><br><</if>>
<<if ($dairySlaves != 1)>>''There are $dairySlaves cows in $dairyName.''<<else>>''There is one cow in $dairyName.''<</if>>
<<if ($dairyRestraintsSetting > 1)>>
- It functions as an industrial slave products factory.
+ The facility functions as an industrial slave products factory.
<</if>>
<<if (_Tadd > 0)>>
- _Tadd milking machines have permanent biological components, making a total of <<print _Tadd + $dairySlaves>> milk-producing bodies.
+ _Tadd milking machines have permanent biological components, making a total of <<print _Tadd + $dairySlaves>> milk-producing bodies.
<</if>>
<</if>>
<<if ($Milkmaid != 0)>>
- <<set $i = _FLs>>
+ <<set $i = _FLs>> /* apply following SA passages to facility leader */
<<if $showEWD != 0>>
<br><br>
/* 000-250-006 */
@@ -251,16 +238,9 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;$slaves[_FLs].slaveName@@__'' is serving as your milkmaid.
+ ''__@@.pink;$slaves[_FLs].slaveName@@__'' is serving as your Milkmaid.
<br>
- <<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[_FLs].devotion <= 20)>>
- <<set $slaves[_FLs].devotion -= 5>>
- <<else>>
- <<set $slaves[_FLs].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -269,14 +249,7 @@
<br><<include "SA devotion">>
<<else>>
<<silently>>
- <<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[_FLs].devotion <= 20)>>
- <<set $slaves[_FLs].devotion -= 5>>
- <<else>>
- <<set $slaves[_FLs].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -289,7 +262,6 @@
<</if>>
<<set $oldCash = $cash>>
-<<if $dairySlaves > 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $DairyiIDs[_dI].Index, $i = _i>>
/* Special attention section */
@@ -307,7 +279,7 @@
<<set $slaves[_i].diet = "healthy">>
<</if>>
<<if $dairyRestraintsSetting > 1>>
- <<set $slaves[_i].collar = "none", $slaves[_i].clothes = "no clothing", $slaves[_i].buttplug = "none", $slaves[_i].vaginalAccessory = "none">>
+ <<set $slaves[_i].collar = "none", $slaves[_i].choosesOwnClothes = 0, $slaves[_i].clothes = "no clothing", $slaves[_i].buttplug = "none", $slaves[_i].vaginalAccessory = "none", $slaves[_i].dickAccessory = "none">>
<</if>>
<<if $dairyPregSetting > 0>>
<<set $reservedChildren -= $slaves[_i].reservedChildren>>
@@ -351,13 +323,13 @@
<<set $slaves[_i].devotion -= 5, $slaves[_i].trust -= 5>>
<</if>>
<<if ($slaves[_i].health < -80)>>
- <<set $slaves[_i].health += 20>>
+ <<set $slaves[_i].health += 20>>
<<elseif ($slaves[_i].health < -40)>>
- <<set $slaves[_i].health += 10>>
+ <<set $slaves[_i].health += 10>>
<<elseif ($slaves[_i].health < 0)>>
- <<set $slaves[_i].health += 7>>
+ <<set $slaves[_i].health += 7>>
<<elseif ($slaves[_i].health < 90)>>
- <<set $slaves[_i].health += 3>>
+ <<set $slaves[_i].health += 3>>
<</if>>
<<if ($slaves[_i].inflation > 0)>>
<<set $slaves[_i].inflation = 0, $slaves[_i].inflationType = "none", $slaves[_i].inflationMethod = 0, $slaves[_i].milkSource = 0>>
@@ -413,27 +385,27 @@
<</if>>
<<elseif ($slaves[_i].balls < 6)>>
<<if (random(1,100) > (40+(10*$slaves[_i].dick)-(10*$dairyRestraintsSetting)-($injectionUpgrade*10)))>>
- <<set $slaves[_i].balls++>>
+ <<set $slaves[_i].balls++>>
<</if>>
<<if ($slaves[_i].balls == 6)>>
- <<set _balltacular++>>
+ <<set _balltacular++>>
<</if>>
<</if>>
<<if $slaves[_i].dick > 0>>
- <<if $slaves[_i].dick < 10>>
- <<if (random(1,100) > (40+(10*$slaves[_i].dick)-(10*$dairyRestraintsSetting)-($injectionUpgrade*10)))>>
- <<set $slaves[_i].dick++>>
+ <<if $slaves[_i].dick < 10>>
+ <<if (random(1,100) > (40+(10*$slaves[_i].dick)-(10*$dairyRestraintsSetting)-($injectionUpgrade*10)))>>
+ <<set $slaves[_i].dick++>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
<</if>>
<</if>>
- <</if>>
+ <</if>> /* closes ($dairyFeedersUpgrade == 1) && ($dairyFeedersSetting > 0) */
<<if ($dairyStimulatorsUpgrade == 1)>>
<<if ($dairyStimulatorsSetting > 1) && ($slaves[_i].anus < 4)>>
<<set $slaves[_i].anus++>>
<<if ($slaves[_i].anus == 4)>>
- <<set _anusesStretched++>>
+ <<set _anusesStretched++>>
<</if>>
<<elseif ($slaves[_i].anus < 3)>>
<<set $slaves[_i].anus++>>
@@ -442,19 +414,19 @@
<<set $slaves[_i].health += 20>>
<<elseif $dairySlimMaintain == 0>>
<<if ($slaves[_i].boobs < 25000)>>
- <<if $arcologies[0].FSAssetExpansionistResearch == 1>>
- <<if ($slaves[_i].boobs < 2000)>>
- <<set $slaves[_i].boobs += 500>>
- <<elseif ($slaves[_i].boobs < 5000)>>
- <<set $slaves[_i].boobs += 250>>
+ <<if $arcologies[0].FSAssetExpansionistResearch == 1>>
+ <<if ($slaves[_i].boobs < 2000)>>
+ <<set $slaves[_i].boobs += 500>>
+ <<elseif ($slaves[_i].boobs < 5000)>>
+ <<set $slaves[_i].boobs += 250>>
+ <<else>>
+ <<set $slaves[_i].boobs += 100>>
+ <</if>>
<<else>>
- <<set $slaves[_i].boobs += 100>>
+ <<set $slaves[_i].boobs += 25*Math.trunc(($injectionUpgrade*2)+$dairyStimulatorsSetting+$dairyRestraintsSetting+((50-$slaves[_i].physicalAge)/4))>>
<</if>>
- <<else>>
- <<set $slaves[_i].boobs += 25*Math.trunc(($injectionUpgrade*2)+$dairyStimulatorsSetting+$dairyRestraintsSetting+((50-$slaves[_i].physicalAge)/4))>>
- <</if>>
<<if ($slaves[_i].boobs > 14900) && ($slaves[_i].boobs < 15100)>>
- <<set _boobtacular++>>
+ <<set _boobtacular++>>
<</if>>
<<else>>
<<set $slaves[_i].boobs = 25000>>
@@ -465,7 +437,7 @@
<<set $slaves[_i].lactationAdaptation += 1>>
<<if ($slaves[_i].fetish == "mindbroken")>>
<<if ($slaves[_i].boobs > 24800) && (($slaves[_i].balls > 5) || ($slaves[_i].balls == 0))>>
- <<set $bioreactorPerfectedID = $slaves[_i].ID>>
+ <<set $bioreactorPerfectedID = $slaves[_i].ID>>
<</if>>
<<else>>
<<if ($slaves[_i].sexualFlaw != "self hating")>>
@@ -474,17 +446,17 @@
<<if ($slaves[_i].sexualFlaw != "breeder") || ($slaves[_i].preg < 0) || ($dairyPregSetting == 0)>>
<<if $dairyStimulatorsSetting > 1>>
<<if ($slaves[_i].sexualFlaw != "hates anal") && ($slaves[_i].sexualQuirk != "painal queen")>>
- <<set $slaves[_i].sexualFlaw = "hates anal">>
+ <<set $slaves[_i].sexualFlaw = "hates anal">>
<</if>>
<</if>>
<<if $dairyPregSetting > 1>>
<<if ($slaves[_i].sexualFlaw != "hates penetration") && ($slaves[_i].sexualQuirk != "strugglefuck queen")>>
- <<set $slaves[_i].sexualFlaw = "hates penetration">>
+ <<set $slaves[_i].sexualFlaw = "hates penetration">>
<</if>>
<</if>>
<<if $dairyFeedersSetting > 1>>
<<if ($slaves[_i].sexualFlaw != "hates oral") && ($slaves[_i].sexualQuirk != "gagfuck queen")>>
- <<set $slaves[_i].sexualFlaw = "hates oral">>
+ <<set $slaves[_i].sexualFlaw = "hates oral">>
<</if>>
<</if>>
<</if>>
@@ -500,132 +472,131 @@
<</if>>
<<if ($dairyStimulatorsSetting + $dairyFeedersSetting + $dairyPregSetting) > 5>>
<<if $slaves[_i].devotion <= 95 && $slaves[_i].sexualFlaw != "self hating">>
- <<if ($slaves[_i].sexualFlaw != "breeder") || ($slaves[_i].preg < 0)>>
+ <<if ($slaves[_i].sexualFlaw != "breeder") || ($slaves[_i].preg < 0)>>
+ <<if ($slaves[_i].devotion > -75)>>
+ <<set $slaves[_i].devotion -= 10>>
+ <<if ($slaves[_i].devotion < -65)>>
+ <<set _hatefilled++>>
+ <</if>>
+ <<elseif ($slaves[_i].trust > -75)>>
+ <<set $slaves[_i].trust -= 10>>
+ <<if ($slaves[_i].trust < -65)>>
+ <<set _horrified++>>
+ <</if>>
+ <<elseif ($slaves[_i].vaginalSkill > 0)>>
+ <<set $slaves[_i].vaginalSkill -= 10, _skillsLost++>>
+ <<elseif ($slaves[_i].oralSkill > 0)>>
+ <<set $slaves[_i].oralSkill -= 10, _skillsLost++>>
+ <<elseif ($slaves[_i].analSkill > 0)>>
+ <<set $slaves[_i].analSkill -= 10, _skillsLost++>>
+ <<elseif ($slaves[_i].career != "a bioreactor")>>
+ <<set $slaves[_i].career = "a bioreactor", _careerForgotten++>>
+ <<elseif ($slaves[_i].intelligence > -1)>>
+ <<set $slaves[_i].intelligence--, _intelligenceLost++>>
+ <<elseif ($slaves[_i].devotion >= -20)>>
+ <<set $slaves[_i].devotion -= 10>>
+ <<elseif ($slaves[_i].trust > -20)>>
+ <<set $slaves[_i].trust -= 10>>
+ <<elseif ($slaves[_i].whoreSkill > 0)>>
+ <<set $slaves[_i].whoreSkill -= 10, _skillsLost++>>
+ <<elseif ($slaves[_i].entertainSkill > 0)>>
+ <<set $slaves[_i].entertainSkill -= 10, _skillsLost++>>
+ <<elseif ($slaves[_i].intelligence > -2)>>
+ <<set $slaves[_i].intelligence--, _stupidified++>>
+ <<elseif ($slaves[_i].fetish != "mindbroken")>>
+ <<set $slaves[_i].fetish = "mindbroken", _mindbroken++>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<if ($slaves[_i].milk > 1000) && ($slaves[_i].boobs > 12000) && ($slaves[_i].career != "a bioreactor")>>
+ <<set $slaves[_i].career = "a bioreactor", _careerForgotten++>>
+ <</if>>
+ <<if ($arcologies[0].FSBodyPuristLaw == 0) && ($healthyDrugsUpgrade == 0)>>
+ <<set $slaves[_i].chem += 5>>
+ <<else>>
+ <<set $slaves[_i].chem += 2>>
+ <</if>>
+ <<elseif ($dairyStimulatorsSetting + $dairyFeedersSetting + $dairyPregSetting) > 3>>
+ <<if ($slaves[_i].devotion < 75)>>
<<if ($slaves[_i].devotion > -75)>>
- <<set $slaves[_i].devotion -= 10>>
- <<if ($slaves[_i].devotion < -65)>>
+ <<set $slaves[_i].devotion -= 5>>
+ <<if ($slaves[_i].devotion < -70)>>
<<set _hatefilled++>>
<</if>>
<<elseif ($slaves[_i].trust > -75)>>
- <<set $slaves[_i].trust -= 10>>
- <<if ($slaves[_i].trust < -65)>>
+ <<set $slaves[_i].trust -= 5>>
+ <<if ($slaves[_i].trust < -70)>>
<<set _horrified++>>
<</if>>
- <<elseif ($slaves[_i].vaginalSkill > 0)>>
+ <<elseif ($slaves[_i].vaginalSkill >= 20)>>
<<set $slaves[_i].vaginalSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[_i].oralSkill > 0)>>
+ <<elseif ($slaves[_i].oralSkill >= 20)>>
<<set $slaves[_i].oralSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[_i].analSkill > 0)>>
+ <<elseif ($slaves[_i].analSkill >= 20)>>
<<set $slaves[_i].analSkill -= 10, _skillsLost++>>
<<elseif ($slaves[_i].career != "a bioreactor")>>
<<set $slaves[_i].career = "a bioreactor", _careerForgotten++>>
<<elseif ($slaves[_i].intelligence > -1)>>
<<set $slaves[_i].intelligence--, _intelligenceLost++>>
<<elseif ($slaves[_i].devotion >= -20)>>
- <<set $slaves[_i].devotion -= 10>>
+ <<set $slaves[_i].devotion -= 8>>
<<elseif ($slaves[_i].trust > -20)>>
- <<set $slaves[_i].trust -= 10>>
- <<elseif ($slaves[_i].whoreSkill > 0)>>
+ <<set $slaves[_i].trust -= 8>>
+ <<elseif ($slaves[_i].whoreSkill >= 20)>>
<<set $slaves[_i].whoreSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[_i].entertainSkill > 0)>>
+ <<elseif ($slaves[_i].entertainSkill >= 20)>>
<<set $slaves[_i].entertainSkill -= 10, _skillsLost++>>
<<elseif ($slaves[_i].intelligence > -2)>>
<<set $slaves[_i].intelligence--, _stupidified++>>
<<elseif ($slaves[_i].fetish != "mindbroken")>>
<<set $slaves[_i].fetish = "mindbroken", _mindbroken++>>
<</if>>
- <</if>>
- <</if>>
- <<if ($slaves[_i].milk > 1000) && ($slaves[_i].boobs > 12000) && ($slaves[_i].career != "a bioreactor")>>
+ <<elseif ($slaves[_i].milk > 1000) && ($slaves[_i].boobs > 12000) && ($slaves[_i].career != "a bioreactor")>>
<<set $slaves[_i].career = "a bioreactor", _careerForgotten++>>
<</if>>
<<if ($arcologies[0].FSBodyPuristLaw == 0) && ($healthyDrugsUpgrade == 0)>>
- <<set $slaves[_i].chem += 5>>
- <<else>>
<<set $slaves[_i].chem += 2>>
+ <<else>>
+ <<set $slaves[_i].chem++>>
<</if>>
- <<elseif ($dairyStimulatorsSetting + $dairyFeedersSetting + $dairyPregSetting) > 3>>
- <<if ($slaves[_i].devotion < 75)>>
- <<if ($slaves[_i].devotion > -75)>>
- <<set $slaves[_i].devotion -= 5>>
- <<if ($slaves[_i].devotion < -70)>>
- <<set _hatefilled++>>
- <</if>>
- <<elseif ($slaves[_i].trust > -75)>>
- <<set $slaves[_i].trust -= 5>>
- <<if ($slaves[_i].trust < -70)>>
- <<set _horrified++>>
- <</if>>
- <<elseif ($slaves[_i].vaginalSkill >= 20)>>
- <<set $slaves[_i].vaginalSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[_i].oralSkill >= 20)>>
- <<set $slaves[_i].oralSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[_i].analSkill >= 20)>>
- <<set $slaves[_i].analSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[_i].career != "a bioreactor")>>
- <<set $slaves[_i].career = "a bioreactor", _careerForgotten++>>
- <<elseif ($slaves[_i].intelligence > -1)>>
- <<set $slaves[_i].intelligence--, _intelligenceLost++>>
- <<elseif ($slaves[_i].devotion >= -20)>>
- <<set $slaves[_i].devotion -= 8>>
- <<elseif ($slaves[_i].trust > -20)>>
- <<set $slaves[_i].trust -= 8>>
- <<elseif ($slaves[_i].whoreSkill >= 20)>>
- <<set $slaves[_i].whoreSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[_i].entertainSkill >= 20)>>
- <<set $slaves[_i].entertainSkill -= 10, _skillsLost++>>
- <<elseif ($slaves[_i].intelligence > -2)>>
- <<set $slaves[_i].intelligence--, _stupidified++>>
- <<elseif ($slaves[_i].fetish != "mindbroken")>>
- <<set $slaves[_i].fetish = "mindbroken", _mindbroken++>>
- <</if>>
- <<elseif ($slaves[_i].milk > 1000) && ($slaves[_i].boobs > 12000) && ($slaves[_i].career != "a bioreactor")>>
- <<set $slaves[_i].career = "a bioreactor", _careerForgotten++>>
- <</if>>
- <<if ($arcologies[0].FSBodyPuristLaw == 0) && ($healthyDrugsUpgrade == 0)>>
- <<set $slaves[_i].chem += 2>>
- <<else>>
- <<set $slaves[_i].chem++>>
- <</if>>
- <</if>>
+ <</if>> /* closes ($dairyStimulatorsSetting + $dairyFeedersSetting + $dairyPregSetting) > 5 */
<<if ($dairyPregUpgrade == 1) && ($dairyPregSetting > 0)>>
<<if ($slaves[_i].ovaries == 1) && ($slaves[_i].vagina > -1)>>
<<set _femCumWeek += Math.trunc((70-$slaves[_i].physicalAge)/(30-($slaves[_i].vaginaLube*10)))>>
<<if ($slaves[_i].preg == -2)>>
- <<set $slaves[_i].preg = 0, _desterilized++>>
+ <<set $slaves[_i].preg = 0, _desterilized++>>
<</if>>
<<if isFertile($slaves[_i])>>
<<if $slaves[_i].eggType == "human">>
- <<set $slaves[_i].preg = 1>>
+ <<set $slaves[_i].preg = 1>>
+ <<if ($dairyPregSetting > 2)>>
+ <<set $slaves[_i].pregType = random(10,29)>>
+ <<elseif ($dairyPregSetting > 1)>>
+ <<set $slaves[_i].pregType = random(3,5)>>
+ <<else>>
+ <<set $slaves[_i].pregType = either(1, 1, 1, 1, 2, 2, 2, 3, 3, 4)>>
+ <</if>>
+ <<set $slaves[_i].pregSource = -2>>
+ <</if>> /*closes eggType */
+ <<if ($slaves[_i].vagina == 0)>>
+ <<set $slaves[_i].vagina++>>
+ <</if>>
+ <<elseif ($slaves[_i].preg > 0)>>
<<if ($dairyPregSetting > 2)>>
- <<set $slaves[_i].pregType = random(10,29)>>
+ <<set $cash += 100>>
<<elseif ($dairyPregSetting > 1)>>
- <<set $slaves[_i].pregType = random(3,5)>>
+ <<set $cash += 50>>
<<else>>
- <<set $slaves[_i].pregType = either(1, 1, 1, 1, 2, 2, 2, 3, 3, 4)>>
+ <<set $cash += 25>>
<</if>>
- <<set $slaves[_i].pregSource = -2>>
- <</if>> /*closes eggType */
- <<if ($slaves[_i].vagina == 0)>>
- <<set $slaves[_i].vagina++>>
- <</if>>
- <</if>>
- <<if ($slaves[_i].preg > 0)>>
- <<if ($dairyPregSetting > 2)>>
- <<set $cash += 100>>
- <<elseif ($dairyPregSetting > 1)>>
- <<set $cash += 50>>
- <<else>>
- <<set $cash += 25>>
- <</if>>
- <<if ($dairyPregSetting > 1) && ($slaves[_i].vagina < 4)>>
- <<set $slaves[_i].vagina++>>
- <<if ($slaves[_i].vagina == 4)>>
- <<set _vaginasStretched++>>
+ <<if ($dairyPregSetting > 1) && ($slaves[_i].vagina < 4)>>
+ <<set $slaves[_i].vagina++>>
+ <<if ($slaves[_i].vagina == 4)>>
+ <<set _vaginasStretched++>>
+ <</if>>
+ <<elseif ($slaves[_i].vagina < 3)>>
+ <<set $slaves[_i].vagina++>>
<</if>>
- <<elseif ($slaves[_i].vagina < 3)>>
- <<set $slaves[_i].vagina++>>
- <</if>>
<</if>>
<</if>>
<</if>>
@@ -675,7 +646,7 @@
<<set $cash -= Math.trunc(((300*($inflatedSlavesCum+8))+random(25,100)))>>
<</if>>
- <<set _profits = $cash-$oldCash>>
+<<set _profits = $cash-$oldCash>>
<br><br>
<<if _chemSevere > 1>>
_chemSevere cows' productivity is being reduced by the long term effects of industrial use.
@@ -800,46 +771,37 @@ These products sell for @@.yellowgreen;¤_profits@@.
<<set $dairySlimMaintain = 0, $dairySlimMaintainUpgrade = 0>>
<</if>>
<</if>>
-<<if ($dairy < ($dairySlaves + _Tadd))>>
- <<set $dairySpots = 0>>
-<<else>>
-
-<<set $dairySpots = $dairy - $dairySpots>>
<<if ($createBioreactors == 1) && ($bioreactorPerfectedID != 0)>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set _i = $DairyiIDs[_dI].Index>>
- <<if ($slaves[_i].ID == $bioreactorPerfectedID)>>
- <br><br> $slaves[_i].slaveName's breasts<<if $slaves[_i].balls > 0>>, balls<</if>><<if $slaves[_i].ovaries == 1>>, belly<</if>>, body, and mind have been completely adapted to synthesize useful products. She has been reclassified as part of the machine she's now permanently attached to. This combination is projected to produce approximately
- <<if $slaves[_i].balls > 0>><<print 1000*Math.trunc((3*52*(45-$slaves[_i].physicalAge))/1000)>> liters of cum,<</if>>
- <<if $slaves[_i].ovaries == 1>><<print 100*Math.trunc((52*(45-$slaves[_i].physicalAge))/100)>> liters of vaginal secretions, <<if $dairyPregSetting == 3>><<print 13*(45-$slaves[_i].physicalAge)>><<else>><<print 5*(45-$slaves[_i].physicalAge)>><</if>> slaves,<</if>>
- and <<print 1000*Math.trunc((300*52*(45-$slaves[_i].physicalAge))/1000)>> liters of milk over a <<print 45-$slaves[_i].physicalAge>> year period before its biological components must be replaced.
- <<if ($slaves[_i].ovaries == 1)>>
- <<if ($slaves[_i].balls == 0)>>
- <<set $bioreactorsXX++>>
- <<else>>
- <<set $bioreactorsHerm++>>
- <</if>>
- <<else>>
- <<if ($slaves[_i].balls == 0)>>
- <<set $bioreactorsBarren++>>
- <<else>>
- <<set $bioreactorsXY++>>
- <</if>>
+ <<set _i = $DairyiIDs[_dI].Index>>
+ <<if ($slaves[_i].ID == $bioreactorPerfectedID)>>
+ <br><br> $slaves[_i].slaveName's breasts<<if $slaves[_i].balls > 0>>, balls<</if>><<if $slaves[_i].ovaries == 1>>, belly<</if>>, body, and mind have been completely adapted to synthesize useful products. She has been reclassified as part of the machine she's now permanently attached to. This combination is projected to produce approximately
+ <<if $slaves[_i].balls > 0>><<print 1000*Math.trunc((3*52*(45-$slaves[_i].physicalAge))/1000)>> liters of cum,<</if>>
+ <<if $slaves[_i].ovaries == 1>><<print 100*Math.trunc((52*(45-$slaves[_i].physicalAge))/100)>> liters of vaginal secretions, <<if $dairyPregSetting == 3>><<print 13*(45-$slaves[_i].physicalAge)>><<else>><<print 5*(45-$slaves[_i].physicalAge)>><</if>> slaves,<</if>>
+ and <<print 1000*Math.trunc((300*52*(45-$slaves[_i].physicalAge))/1000)>> liters of milk over a <<print 45-$slaves[_i].physicalAge>> year period before its biological components must be replaced.
+ <<if ($slaves[_i].ovaries == 1)>>
+ <<if ($slaves[_i].balls == 0)>>
+ <<set $bioreactorsXX++>>
+ <<else>>
+ <<set $bioreactorsHerm++>>
+ <</if>>
+ <<else>>
+ <<if ($slaves[_i].balls == 0)>>
+ <<set $bioreactorsBarren++>>
+ <<else>>
+ <<set $bioreactorsXY++>>
+ <</if>>
+ <</if>>
+ <<set $activeSlave = $slaves[_i]>>
+ <<include "Remove activeSlave">>
+ <<break>>
<</if>>
- <<set $activeSlave = $slaves[_i]>>
- <<include "Remove activeSlave">>
- <<break>>
- <</if>>
<</for>>
<</if>>
-<</if>>
- <<if $dairyDecoration != "standard">>
- $dairyNameCaps's @@.green;$dairyDecoration style is well known.@@
- <</if>>
-<<else>>
- <<set $dairySpots = $dairy>>
+<<if $dairyDecoration != "standard">>
+ $dairyNameCaps's @@.green;$dairyDecoration style is well known.@@
<</if>>
<<if ($dairySlaves + _Tadd) || $Milkmaid>>
<br><br>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index d7b186c380b7b99ab5bf769656761f113079cca5..9edc0e927c626cd5c14de12652d72d55331f2a64 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -300,9 +300,9 @@
<</if>>
<<for _i = 5; _i <= 7; _i++>>
-<<if $sectors[_i].type =! "Shops">>
-<<if $sectors[_i].type =! "Brothel">>
-<<if $sectors[_i].type =! "Club">>
+<<if $sectors[_i].type != "Shops">>
+<<if $sectors[_i].type != "Brothel">>
+<<if $sectors[_i].type != "Club">>
The $sectors[_i].type establishments on the Promenade help develop society.
<<FSChange $sectors[_i].type.replace(" ","") 4>>
<<break>>
@@ -461,6 +461,7 @@
<</if>>
<</if>>
+<br><br>
<<if $PAPublic == 1 && $assistantAppearance != "normal">>
<<set _seed1 = 0, _seed2 = 0>>
<<if $arcologies[0].FSSupremacist != "unset">>
@@ -1077,7 +1078,7 @@ With her $assistantAppearance appearance, $assistantName's public visibility mes
<<if $arcologies[0].FSAssetExpansionist != "unset">>
<<if $arcologies[0].FSAssetExpansionist < 0>>
<<set $arcologies[0].FSAssetExpansionist = "unset">><<set $FSCredits += 1>>
- <<set $arcologies[0].FSAssetExpansionistSMR = 0, $arcologies[0].FSAssetExpansionistSMR = 0>>
+ <<set $arcologies[0].FSAssetExpansionistSMR = 0, $arcologies[0].FSAssetExpansionistLaw = 0>>
<<if $assistantFSAppearance == "asset expansionist">><<set $assistantFSAppearance = "default">><</if>>
<<ClearFacilityDecorations>>
@@.red;One of your future society projects has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
@@ -1137,7 +1138,7 @@ With her $assistantAppearance appearance, $assistantName's public visibility mes
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
<<if $arcologies[0].FSPhysicalIdealist < 0>>
<<set $arcologies[0].FSPhysicalIdealist = "unset">><<set $FSCredits += 1>>
- <<set $arcologies[0].FSPhysicalIdealistSMR = 0, $arcologies[0].FSPhysicalIdealistSMR = 0>>
+ <<set $arcologies[0].FSPhysicalIdealistSMR = 0, $arcologies[0].FSPhysicalIdealistLaw = 0>>
<<if $assistantFSAppearance == "physical idealist">><<set $assistantFSAppearance = "default">><</if>>
<<ClearFacilityDecorations>>
@@.red;One of your future society projects has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
@@ -1297,7 +1298,7 @@ With her $assistantAppearance appearance, $assistantName's public visibility mes
$arcologies[0].name believes implicitly that it is the land of the Shogun, reborn.
<<set $independenceDay = 1>>
<<elseif $arcologies[0].FSEdoRevivalist >= $FSLockinLevel*0.6>>
- $arcologies[0].name agrees strongly with your project to build a Edo Japan.
+ $arcologies[0].name agrees strongly with your project to build an Edo Japan.
<<set $independenceDay = 1>>
<<elseif $arcologies[0].FSEdoRevivalist >= $FSLockinLevel*0.3>>
$arcologies[0].name is sympathetic to your project to build a new Edo Japan.
diff --git a/src/uncategorized/futureSocities.tw b/src/uncategorized/futureSocities.tw
index 9dd92ec2cff8f385eed71d94d547a323c6a99cc2..cf4cbbef04bd24f19c80d32fb84b1748d01ed1d6 100644
--- a/src/uncategorized/futureSocities.tw
+++ b/src/uncategorized/futureSocities.tw
@@ -382,7 +382,7 @@
<<if $arcologies[0].FSEdoRevivalist >= $FSLockinLevel>>
$arcologies[0].name believes implicitly that it is the land of the Shogun, reborn.
<<elseif $arcologies[0].FSEdoRevivalist >= $FSLockinLevel*0.6>>
- $arcologies[0].name agrees strongly with your project to build a Edo Japan.
+ $arcologies[0].name agrees strongly with your project to build a new Edo Japan.
<<elseif $arcologies[0].FSEdoRevivalist >= $FSLockinLevel*0.3>>
$arcologies[0].name is sympathetic to your project to build a new Edo Japan.
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 9c4da50ed04bbf4125c94b7d6e4b25ebe636b177..68b4781111a0bfe6b92d1b6b8eb489935396377a 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -254,7 +254,7 @@ The level of sexual energy in the suite is
@@.lightcoral;sinks farther into pregnancy obsession,@@ since she never wants for a pregnant girl to make love to.
<<set $slaves[_i].fetishStrength += 4>>
<<else>>
- @@.lightcoral;acquires an pregnancy fetish,@@ since many of her sexual partners in the fuckpit are heavily pregnant.
+ @@.lightcoral;acquires a pregnancy fetish,@@ since many of her sexual partners in the fuckpit are heavily pregnant.
<<set $slaves[_i].fetish = "pregnancy", $slaves[_i].fetishStrength = 65>>
<</if>>
<<elseif (_masterSuiteAverageDom < 50) && ($fetishChangeChance > random(0,50))>>
@@ -350,14 +350,7 @@ The level of sexual energy in the suite is
<<if $verboseDescriptions == 1>>
<br> She <<include "SA please you">>
<br>
- <<if $slaves[_i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[_i].devotion <= 20)>>
- <<set $slaves[_i].devotion -= 5>>
- <<else>>
- <<set $slaves[_i].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -367,14 +360,7 @@ The level of sexual energy in the suite is
<<else>>
<<silently>>
<<include "SA please you">>
- <<if $slaves[_i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[_i].devotion <= 20)>>
- <<set $slaves[_i].devotion -= 5>>
- <<else>>
- <<set $slaves[_i].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw
index 7c4c8b6521c25d2f4e1f1ee327432b43b4504336..abc9d704a4346f489e5533502b53552a24578628 100644
--- a/src/uncategorized/neighborDescription.tw
+++ b/src/uncategorized/neighborDescription.tw
@@ -390,11 +390,11 @@ its neighbors.
<</if>>
<<set $desc = $desc + "Aztec Revivalism, and is ">>
<<if $arcologies[$i].FSAztecRevivalist > 95>>
- <<set $desc = $desc + "world famous for it's incredible architecture and highly qualified leading caste and military.">>
+ <<set $desc = $desc + "world famous for its incredible architecture and highly qualified leading caste and military.">>
<<elseif $arcologies[$i].FSAztecRevivalist > 40>>
- <<set $desc = $desc + "constructing great pyramids and statues, so still hampered by construction.">>
+ <<set $desc = $desc + "constructing great pyramids and statues with equally weighty costs.">>
<<else>>
- <<set $desc = $desc + "still strugling to embrace the ammount of blood and praying needed.">>
+ <<set $desc = $desc + "struggling to embrace the amount of blood sacrifice and prayer involved.">>
<</if>>
<<set $seed.push($desc)>>
<</if>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 8856cb6af05b00d0dfcdb5fbbf29cf06a95a6b7c..1c3b34a7d5c574a2550168c8616b77d27ec6037c 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -746,7 +746,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Gender Radicalism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSGenderRadicalist += 1>>
<<elseif $arcologies[$j].FSGenderFundamentalist > $arcologies[$i].FSGenderRadicalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Gender Radicalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Gender Fundamentalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Gender Radicalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Gender Fundamentalist society.<</if>>
<<set $arcologies[$i].FSGenderRadicalist -= 1>>
<</if>>
<</if>>
@@ -801,7 +801,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Gender Fundamentalism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSGenderFundamentalist += 1>>
<<elseif $arcologies[$j].FSGenderRadicalist > $arcologies[$i].FSGenderFundamentalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Gender Fundamentalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Gender Radicalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Gender Fundamentalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Gender Radicalist society.<</if>>
<<set $arcologies[$i].FSGenderFundamentalist -= 1>>
<</if>>
<</if>>
@@ -841,7 +841,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Paternalism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSPaternalist += 1>>
<<elseif $arcologies[$j].FSDegradationist > $arcologies[$i].FSPaternalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Paternalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Degradationist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Paternalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Degradationist society.<</if>>
<<set $arcologies[$i].FSPaternalist -= 1>>
<</if>>
<</if>>
@@ -884,7 +884,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Degradationism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSDegradationist += 1>>
<<elseif $arcologies[$j].FSPaternalist > $arcologies[$i].FSDegradationist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Degradationism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Paternalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Degradationism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Paternalist society.<</if>>
<<set $arcologies[$i].FSDegradationist -= 1>>
<</if>>
<</if>>
@@ -933,7 +933,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Body Purism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSBodyPurist += 1>>
<<elseif $arcologies[$j].FSTransformationFetishist > $arcologies[$i].FSBodyPurist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Body Purism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Transformation Fetishist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Body Purism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Transformation Fetishist society.<</if>>
<<set $arcologies[$i].FSBodyPurist -= 1>>
<</if>>
<</if>>
@@ -973,7 +973,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Transformation Fetishism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSTransformationFetishist += 1>>
<<elseif $arcologies[$j].FSBodyPurist > $arcologies[$i].FSTransformationFetishist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Transformation Fetishism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Body Purist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Transformation Fetishism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Body Purist society.<</if>>
<<set $arcologies[$i].FSTransformationFetishist -= 1>>
<</if>>
<</if>>
@@ -1018,7 +1018,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Youth Preferentialism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSYouthPreferentialist += 1>>
<<elseif $arcologies[$j].FSMaturityPreferentialist > $arcologies[$i].FSYouthPreferentialist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Youth Preferentialism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Maturity Preferentialist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Youth Preferentialism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Maturity Preferentialist society.<</if>>
<<set $arcologies[$i].FSYouthPreferentialist -= 1>>
<</if>>
<</if>>
@@ -1057,7 +1057,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Maturity Preferentialism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSMaturityPreferentialist += 1>>
<<elseif $arcologies[$j].FSYouthPreferentialist > $arcologies[$i].FSMaturityPreferentialist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Maturity Preferentialism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Youth Preferentialist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Maturity Preferentialism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Youth Preferentialist society.<</if>>
<<set $arcologies[$i].FSMaturityPreferentialist -= 1>>
<</if>>
<</if>>
@@ -1097,7 +1097,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Slimness Enthusiasm in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSSlimnessEnthusiast += 1>>
<<elseif $arcologies[$j].FSAssetExpansionist > $arcologies[$i].FSSlimnessEnthusiast + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Slimness Enthusiasm in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Asset Expansionist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Slimness Enthusiasm in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Asset Expansionist society.<</if>>
<<set $arcologies[$i].FSSlimnessEnthusiast -= 1>>
<</if>>
<</if>>
@@ -1144,7 +1144,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Asset Expansionism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSAssetExpansionist += 1>>
<<elseif $arcologies[$j].FSSlimnessEnthusiast > $arcologies[$i].FSAssetExpansionist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Asset Expansionism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Slimness Enthusiast society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Asset Expansionism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Slimness Enthusiast society.<</if>>
<<set $arcologies[$i].FSAssetExpansionist -= 1>>
<</if>>
<</if>>
@@ -1193,7 +1193,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Pastoralism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSPastoralist += 1>>
<<elseif $arcologies[$j].FSPhysicalIdealist > $arcologies[$i].FSPastoralist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Asset Expansionism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Physical Idealist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Asset Expansionism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Physical Idealist society.<</if>>
<<set $arcologies[$i].FSPastoralist -= 1>>
<</if>>
<</if>>
@@ -1231,7 +1231,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Physical Idealism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSPhysicalIdealist += 1>>
<<elseif $arcologies[$j].FSPastoralist > $arcologies[$i].FSPhysicalIdealist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Asset Expansionism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Pastoralist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Asset Expansionism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Pastoralist society.<</if>>
<<set $arcologies[$i].FSPhysicalIdealist -= 1>>
<</if>>
<</if>>
@@ -1316,19 +1316,19 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Roman Revivalism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSRomanRevivalist += 1>>
<<elseif $arcologies[$j].FSAztecRevivalist > $arcologies[$i].FSRomanRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Roman Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Roman Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
<<set $arcologies[$i].FSRomanRevivalist -= 1>>
<<elseif $arcologies[$j].FSChineseRevivalist > $arcologies[$i].FSRomanRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Roman Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Roman Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
<<set $arcologies[$i].FSRomanRevivalist -= 1>>
<<elseif $arcologies[$j].FSEgyptianRevivalist > $arcologies[$i].FSRomanRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Roman Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Roman Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
<<set $arcologies[$i].FSRomanRevivalist -= 1>>
<<elseif $arcologies[$j].FSEdoRevivalist > $arcologies[$i].FSRomanRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Roman Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Edo Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Roman Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Edo Revivalist society.<</if>>
<<set $arcologies[$i].FSRomanRevivalist -= 1>>
<<elseif $arcologies[$j].FSArabianRevivalist > $arcologies[$i].FSRomanRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Roman Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Arabian Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Roman Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Arabian Revivalist society.<</if>>
<<set $arcologies[$i].FSRomanRevivalist -= 1>>
<</if>>
<</if>>
@@ -1366,19 +1366,19 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Aztec Revivalism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSAztecRevivalist += 1>>
<<elseif $arcologies[$j].FSEgyptianRevivalist > $arcologies[$i].FSAztecRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
<<set $arcologies[$i].FSAztecRevivalist -= 1>>
<<elseif $arcologies[$j].FSRomanRevivalist > $arcologies[$i].FSAztecRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
<<set $arcologies[$i].FSAztecRevivalist -= 1>>
<<elseif $arcologies[$j].FSChineseRevivalist > $arcologies[$i].FSAztecRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
<<set $arcologies[$i].FSAztecRevivalist -= 1>>
<<elseif $arcologies[$j].FSEdoRevivalist > $arcologies[$i].FSAztecRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Edo Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Edo Revivalist society.<</if>>
<<set $arcologies[$i].FSAztecRevivalist -= 1>>
<<elseif $arcologies[$j].FSArabianRevivalist > $arcologies[$i].FSAztecRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Arabian Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Aztec Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Arabian Revivalist society.<</if>>
<<set $arcologies[$i].FSAztecRevivalist -= 1>>
<</if>>
<</if>>
@@ -1416,19 +1416,19 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Egyptian Revivalism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSEgyptianRevivalist += 1>>
<<elseif $arcologies[$j].FSRomanRevivalist > $arcologies[$i].FSEgyptianRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
<<set $arcologies[$i].FSEgyptianRevivalist -= 1>>
<<elseif $arcologies[$j].FSAztecRevivalist > $arcologies[$i].FSEgyptianRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
<<set $arcologies[$i].FSEgyptianRevivalist -= 1>>
<<elseif $arcologies[$j].FSEgyptianRevivalist > $arcologies[$i].FSEgyptianRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
<<set $arcologies[$i].FSEgyptianRevivalist -= 1>>
<<elseif $arcologies[$j].FSEdoRevivalist > $arcologies[$i].FSEgyptianRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Edo Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Edo Revivalist society.<</if>>
<<set $arcologies[$i].FSEgyptianRevivalist -= 1>>
<<elseif $arcologies[$j].FSArabianRevivalist > $arcologies[$i].FSEgyptianRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Arabian Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Egyptian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Arabian Revivalist society.<</if>>
<<set $arcologies[$i].FSEgyptianRevivalist -= 1>>
<</if>>
<</if>>
@@ -1466,19 +1466,19 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Edo Revivalism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSEdoRevivalist += 1>>
<<elseif $arcologies[$j].FSRomanRevivalist > $arcologies[$i].FSEdoRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
<<set $arcologies[$i].FSEdoRevivalist -= 1>>
<<elseif $arcologies[$j].FSAztecRevivalist > $arcologies[$i].FSEdoRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
<<set $arcologies[$i].FSEdoRevivalist -= 1>>
<<elseif $arcologies[$j].FSEgyptianRevivalist > $arcologies[$i].FSEdoRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
<<set $arcologies[$i].FSEdoRevivalist -= 1>>
<<elseif $arcologies[$j].FSChineseRevivalist > $arcologies[$i].FSEdoRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
<<set $arcologies[$i].FSEdoRevivalist -= 1>>
<<elseif $arcologies[$j].FSArabianRevivalist > $arcologies[$i].FSEdoRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Arabian Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Edo Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Arabian Revivalist society.<</if>>
<<set $arcologies[$i].FSEdoRevivalist -= 1>>
<</if>>
<</if>>
@@ -1516,19 +1516,19 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Arabian Revivalism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSArabianRevivalist += 1>>
<<elseif $arcologies[$j].FSRomanRevivalist > $arcologies[$i].FSArabianRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
<<set $arcologies[$i].FSArabianRevivalist -= 1>>
<<elseif $arcologies[$j].FSAztecRevivalist > $arcologies[$i].FSArabianRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
<<set $arcologies[$i].FSArabianRevivalist -= 1>>
<<elseif $arcologies[$j].FSEgyptianRevivalist > $arcologies[$i].FSArabianRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
<<set $arcologies[$i].FSArabianRevivalist -= 1>>
<<elseif $arcologies[$j].FSEdoRevivalist > $arcologies[$i].FSArabianRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Edo Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Edo Revivalist society.<</if>>
<<set $arcologies[$i].FSArabianRevivalist -= 1>>
<<elseif $arcologies[$j].FSChineseRevivalist > $arcologies[$i].FSArabianRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Arabian Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Chinese Revivalist society.<</if>>
<<set $arcologies[$i].FSArabianRevivalist -= 1>>
<</if>>
<</if>>
@@ -1570,19 +1570,19 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if $showNeighborDetails != 0>>Chinese Revivalism in $arcologies[$i].name is influenced by $arcologies[$j].name's more advanced society.<</if>>
<<set $arcologies[$i].FSChineseRevivalist += 1>>
<<elseif $arcologies[$j].FSRomanRevivalist > $arcologies[$i].FSChineseRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Roman Revivalist society.<</if>>
<<set $arcologies[$i].FSChineseRevivalist -= 1>>
<<elseif $arcologies[$j].FSAztecRevivalist > $arcologies[$i].FSChineseRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Aztec Revivalist society.<</if>>
<<set $arcologies[$i].FSChineseRevivalist -= 1>>
<<elseif $arcologies[$j].FSEgyptianRevivalist > $arcologies[$i].FSChineseRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Egyptian Revivalist society.<</if>>
<<set $arcologies[$i].FSChineseRevivalist -= 1>>
<<elseif $arcologies[$j].FSEdoRevivalist > $arcologies[$i].FSChineseRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Edo Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Edo Revivalist society.<</if>>
<<set $arcologies[$i].FSChineseRevivalist -= 1>>
<<elseif $arcologies[$j].FSArabianRevivalist > $arcologies[$i].FSChineseRevivalist + _FSCrossThresh>>
- <<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Arabian Revivalist society.<</if>>
+ <<if $showNeighborDetails != 0>>Development of Chinese Revivalism in $arcologies[$i].name is slowed by contact with $arcologies[$j].name's more advanced Arabian Revivalist society.<</if>>
<<set $arcologies[$i].FSChineseRevivalist -= 1>>
<</if>>
<</if>>
diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw
index 8dd30bdc5419fc9398847d7931b3717ff4a1d728..3be2ca8eda743ee06b6d1b59afe04fff8131c938 100644
--- a/src/uncategorized/neighborsFSAdoption.tw
+++ b/src/uncategorized/neighborsFSAdoption.tw
@@ -431,6 +431,7 @@ societal development.
<</if>>
<</if>>
<</if>>
+<</if>>
<<else>>
<<if $adopted == 0>>
<<if ($arcologies[$i].FSRomanRevivalist == "unset")>>
@@ -464,6 +465,7 @@ societal development.
<</if>>
<</if>>
<</if>>
+<</if>>
<</if>> /* closes extended family mode */
<<break>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index e6f970ed1b73a384ed4e6039f64e81c95338b598..20eb159928e35e5f525ff11616f9e59f1bdf9e87 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -101,7 +101,7 @@
<<goto "P Bodyswap Reveal">>
<<elseif ($arcologies[0].prosperity > 80) && ($TSS.schoolPresent+$GRI.schoolPresent+$SCP.schoolPresent+$LDE.schoolPresent+$TGA.schoolPresent+$TFS.schoolPresent == 0) && ($schoolSuggestion == 0)>>
<<goto "P school suggestion">>
-<<elseif ($assistantFSOptions == 0) && ($assistant > 0) && ($assistantAppearance != "normal") && ($arcologies[0].FSGenderRadicalistDecoration > 20 or $arcologies[0].FSGenderFundamentalistDecoration > 20 or $arcologies[0].FSPaternalistDecoration > 20 or $arcologies[0].FSDegradationistDecoration > 20 or $arcologies[0].FSBodyPuristDecoration > 20 or $arcologies[0].FSTransformationFetishistDecoration > 20 or $arcologies[0].FSYouthPreferentialistDecoration > 20 or $arcologies[0].FSMaturityPreferentialistDecoration > 20 or $arcologies[0].FSSlimnessEnthusiastDecoration > 20 or $arcologies[0].FSAssetExpansionistDecoration > 20 or $arcologies[0].FSPastoralistDecoration > 20 or $arcologies[0].FSPhysicalIdealistDecoration > 20 or $arcologies[0].FSChattelReligionistDecoration > 20 or $arcologies[0].FSRomanRevivalistDecoration > 20 or $arcologies[0].FSAztecRevivalistDecoration > 20 or $arcologies[0].FSEgyptianRevivalistDecoration > 20 or $arcologies[0].FSEdoRevivalistDecoration > 20 or $arcologies[0].FSArabianRevivalistDecoration > 20 or $arcologies[0].FSChineseRevivalistDecoration > 20)>>
+<<elseif ($assistantFSOptions == 0) && ($assistant > 0) && ($assistantAppearance != "normal") && ($arcologies[0].FSGenderRadicalistDecoration > 20 || $arcologies[0].FSGenderFundamentalistDecoration > 20 || $arcologies[0].FSPaternalistDecoration > 20 || $arcologies[0].FSDegradationistDecoration > 20 || $arcologies[0].FSBodyPuristDecoration > 20 || $arcologies[0].FSTransformationFetishistDecoration > 20 || $arcologies[0].FSYouthPreferentialistDecoration > 20 || $arcologies[0].FSMaturityPreferentialistDecoration > 20 || $arcologies[0].FSSlimnessEnthusiastDecoration > 20 || $arcologies[0].FSAssetExpansionistDecoration > 20 || $arcologies[0].FSPastoralistDecoration > 20 || $arcologies[0].FSPhysicalIdealistDecoration > 20 || $arcologies[0].FSChattelReligionistDecoration > 20 || $arcologies[0].FSRomanRevivalistDecoration > 20 || $arcologies[0].FSAztecRevivalistDecoration > 20 || $arcologies[0].FSEgyptianRevivalistDecoration > 20 || $arcologies[0].FSEdoRevivalistDecoration > 20 || $arcologies[0].FSArabianRevivalistDecoration > 20 || $arcologies[0].FSChineseRevivalistDecoration > 20)>>
<<set $Event = "assistant FS">>
<<goto "Assistant Events">>
<<elseif ($assistant > 0) && ($assistantNameAnnounced == 0) && ($assistantPower > 0)>>
diff --git a/src/uncategorized/nurseSelect.tw b/src/uncategorized/nurseSelect.tw
index fc488a21182c498080ea4e11a0ffdadbd5daa1c9..5571542100ec3f3e2bcf33f45c175b1ff127c774 100644
--- a/src/uncategorized/nurseSelect.tw
+++ b/src/uncategorized/nurseSelect.tw
@@ -5,7 +5,7 @@
<<if ($Nurse != 0)>>
''__@@.pink;$Nurse.slaveName@@__'' is serving as your Nurse.<br><br>She will help heal your slaves.
<<else>>
- You have not selected an Nurse.
+ You have not selected a Nurse.
<</if>>
<br><br>''Appoint a Nurse from your devoted slaves:''
diff --git a/src/uncategorized/pInvasion.tw b/src/uncategorized/pInvasion.tw
index 85bd91b9b8d1e4af1e1dd3ac2175aa3204f40675..da966a8d46e29dd578ad6161c34650e1d0ab369d 100644
--- a/src/uncategorized/pInvasion.tw
+++ b/src/uncategorized/pInvasion.tw
@@ -90,7 +90,7 @@ The loose militia lately organized by the arcology owners has been called out to
<<set $rep += 1000>>
<<else>>
-@@.green;The counterattack is a crushing success.@@ Your mercenary squad and your drones form a irresistible phalanx around you that smashes everything it touches. The enemy is put to flight, and you send your drones racing ahead to take captives. By law these are shared among the militia. There is talk that your contributions deserve more than a few wretched slaves in reward. A public subscription pays for the damage $arcologies[0].name took from stray fire, and @@.green;you are acclaimed a hero.@@
+@@.green;The counterattack is a crushing success.@@ Your mercenary squad and your drones form an irresistible phalanx around you that smashes everything it touches. The enemy is put to flight, and you send your drones racing ahead to take captives. By law these are shared among the militia. There is talk that your contributions deserve more than a few wretched slaves in reward. A public subscription pays for the damage $arcologies[0].name took from stray fire, and @@.green;you are acclaimed a hero.@@
<<set $invasionVictory = 3>>
<<set $rep += 2000>>
diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw
index ab1d1d33cd2db226333f6def8f441dcb4596666d..70500c0ca0e325d0661caf5c154b15d3ac7d73ed 100644
--- a/src/uncategorized/pePitFight.tw
+++ b/src/uncategorized/pePitFight.tw
@@ -119,7 +119,7 @@ Finally, her opponent enters as well.
She is a tall, thin woman covered in ropy muscle, trying to hide her terror.
<<set $opponent = 3>>
<<elseif $seed > 20>>
- She is an decent-looking slave, physically fit but obviously scared.
+ She is a decent-looking slave, physically fit but obviously scared.
<<set $opponent = 2>>
<<else>>
She is an average looking slave, so frightened there's urine running down her leg. She must have annoyed her master to earn this.
diff --git a/src/uncategorized/penthouseReport.tw b/src/uncategorized/penthouseReport.tw
index c35d34b8784af7cb9b3d90cafa4035931b555082..697ff8cd8ee42badc434373b1c1c9c560bae9a99 100644
--- a/src/uncategorized/penthouseReport.tw
+++ b/src/uncategorized/penthouseReport.tw
@@ -42,3 +42,6 @@
<</if>> /* closes assignmentVisible == 1 */
<</for>>
+/* count open spots in facilities after all assignments have been decided for the week */
+<<set $brothelSpots = $brothel - $brothelSlaves, $clubSpots = $club - $clubSlaves, $dairySpots = $dairy - $dairySlaves, $servantsQuartersSpots = $servantsQuarters - $servantsQuartersSlaves>>
+
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index d9389b5e8aee70665c96150d7c7088cbba4fe0b0..d562d5fb455f3f197f12f8d0d8b8763d8f3abe80 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -1100,7 +1100,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<case "roman revivalist">>
She'd fit in perfectly tormenting the condemned in Tartarus.
<<case "aztec revivalist">>
- She's taken to carrying a pair of ceremonial daggers perfect for bloodletting and even an impromtu sacrifice. Two things she really enjoys performing.
+ She's taken to carrying a pair of ceremonial daggers perfect for bloodletting and even an impromptu sacrifice. Two things she really enjoys performing.
<<case "egyptian revivalist">>
She has recently adjusted her appearance to resemble an Egyptian slave; that combined with a manufactured rebellious streak are sure to earn her a whipping.
<<case "edo revivalist">>
@@ -1179,7 +1179,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<case "roman revivalist">>
While she acts like a typical Roman woman, she is pretty obviously Greek. She can't even name the Pantheon correctly.
<<case "aztec revivalist">>
- She is still very obviously not a native and has become rathe caught up in the fear that she'll soon be sacrificed.
+ She is still very obviously not a native and has become rather caught up in the fear that she'll soon be sacrificed.
<<case "egyptian revivalist">>
She's managed to untangle herself from the wrappings, though she has chosen to leave several still wrapped around her body.
<<case "edo revivalist">>
@@ -1260,7 +1260,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<</if>>
<<case "ERROR_1606_APPEARANCE_FILE_CORRUPT">>
- She's a odd little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>> girl, with slightly off mannerisms,
+ She's an odd little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0].FSSupremacistRace <</if>> girl, with slightly off mannerisms,
<<if $assistantFSOptions>>
<<switch $assistantFSAppearance>>
<<case "paternalist">>
@@ -1431,7 +1431,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<elseif ($seed == 5) && ($invasionVictory > 0)>>
She's intently staring down a representation of one of your security drones. When she sees you looking at her, she coyly says, "I like this one. She did very well during the invasion and I wanted to reward her, but I can't find a hole..."
<<elseif ($seed == 6) && ($studio == 1)>>
- She has a camera strapped to her cock and is recording a of the recognizable little representation of one of your slaves sucking it. The slave must be playing with one of the penthouse's many dildoes, and $assistantName is likely turning the feed of it into a PoV porno.
+ She has a camera strapped to her cock and is recording a recognizable little representation of one of your slaves sucking it. The slave must be playing with one of the penthouse's many dildoes, and $assistantName is likely turning the feed of it into a PoV porno.
<<elseif ($seed == 7) && ($marketAssistantAnnounced == 1)>>
She's accompanied by your market assistant's still inexperienced avatar.
<<if $marketAssistantRelationship == "cute">>
@@ -1553,9 +1553,9 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<elseif $minimumSlaveAge <= 7>>
She's a cute loli wearing tight, crotch hugging, spats and a tight tub top across her flat chest.
<<elseif $minimumSlaveAge <= 13>>
- She's a attractive teenager wearing short shorts and a sheer top that shows off her newly grown breats.
+ She's an attractive teenager wearing short shorts and a sheer top that shows off her newly grown breats.
<<else>>
- She's a attractive young adult wearing a sheer dress that shows off her youthful curves.
+ She's an attractive young adult wearing a sheer dress that shows off her youthful curves.
<</if>>
<<case "slimness enthusiast">>
<<if $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 34e6557033eb53609b38e10d33f4805cd2d417f0..3132d58ec5eafe83e1167ada4f66ef140babe46b 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -1464,6 +1464,14 @@
<</if>>
<</if>>
+<<if ($eventSlave.devotion <= 20)>>
+<<if ($eventSlave.assignment == "work as a servant") || ($eventSlave.assignment == "be a servant")>>
+<<if ($eventSlave.clothes == "a slutty maid outfit") || ($eventSlave.clothes == "a nice maid outfit")>>
+ <<set $RESSTRevent.push("servant maid")>>
+<</if>>
+<</if>>
+<</if>>
+
<<if ($eventSlave.speechRules != "restrictive")>>
<<if ($eventSlave.vaginalAccessory != "chastity belt")>>
<<if ($eventSlave.fetish != "buttslut")>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 3ab643f50f6464e368c4025d0493274078927430..26e0d186aae5b6a68ddac84afd85ac1fa8702a29 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -326,7 +326,7 @@ On formal occasions, you are announced as $PCTitle.
<</if>>
<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
<<if $PC.visualAge >= 35>>
- Society @@.green;approves@@ of your advancing age, which advances the ancient Aztec ideal an experienced leader to the people.
+ Society @@.green;approves@@ of your advancing age, which advances the ancient Aztec ideal of an experienced leader of the people.
<<FSChange "AztecRevivalist" 1>>
<</if>>
<<if $HeadGirl == 0>>
@@ -336,11 +336,14 @@ On formal occasions, you are announced as $PCTitle.
Society @@.green;approves@@ of your reliance on a Head Girl as an advisor and assistant.
<<FSChange "AztecRevivalist" 2>>
<</if>>
- <<if $PC.warfare < 50>>
- Society @@.red;disapproves@@ of you not being properly trained in the art of combat.
+ <<if $PC.warfare < 0>>
+ Society @@.red;greatly disapproves@@ of your feebleness in the arts of war.
+ <<FSChange "AztecRevivalist" -4>>
+ <<elseif $PC.warfare < 50>>
+ Society @@.red;disapproves@@ of you not being properly trained in the arts of war.
<<FSChange "AztecRevivalist" -2>>
<<else>>
- Society @@.green;approves@@ of having a leader, than can defend themselves properly in a life threatening situation.
+ Society @@.green;approves@@ of having a leader that is trained in the arts of war.
<<FSChange "AztecRevivalist" 2>>
<</if>>
<<if $language != "Nahuatl">>
diff --git a/src/uncategorized/saChoosesOwnClothes.tw b/src/uncategorized/saChoosesOwnClothes.tw
index bf9292420db67e44aaa9e2f2f24b93b4e30f39c9..f332d51f2038dcd46f62e60910648ac7378ab257 100644
--- a/src/uncategorized/saChoosesOwnClothes.tw
+++ b/src/uncategorized/saChoosesOwnClothes.tw
@@ -1,68 +1,72 @@
:: SA chooses own clothes [nobr]
+<<if $slaves[$i].choosesOwnClothes == 1>>
+
+<<SlavePronouns $slaves[$i]>>
+
<<set $bellyAccessory = $slaves[$i].bellyAccessory>>
<<if $slaves[$i].fetish == "mindbroken">>
- She is fundamentally broken, but still follows some faint memories of standing within the wardrobe.
+ $pronounCap is fundamentally broken, but still follows some faint memories of standing within the wardrobe.
<<if $slaves[$i].amp != 1 && $slaves[$i].heels == 1>>
- She finds she can inexplicably walk if she wears heels; a daily lesson for her, as she forgets shortly after leaving.
+ $pronounCap finds $pronoun can inexplicably walk if $pronoun wears heels; a daily lesson for $object, as $pronoun forgets shortly after leaving.
<<set $slaves[$i].shoes = either("heels", "extreme heels", "boots")>>
<</if>>
<<if ($arcologies[0].FSRepopulationFocus > 0) && ($slaves[$i].preg <= 10) && ($slaves[$i].bellyImplant < 2000) && ($slaves[$i].inflation == 0)>>
- She sees the fake bellies; since every girl she has ever met has a rounded middle, it's only natuaral she is compelled to wear one.
+ $pronounCap sees the fake bellies; since every girl $pronoun has ever met has a rounded middle, it's only natuaral $pronoun is compelled to wear one.
<<set $slaves[$i].bellyAccessory = "a large empathy belly">>
<</if>>
Faced with so many choices and no thought on the matter;
<<if ($arcologies[0].FSChattelReligionist > 0)>>
- she commonly sees others wearing chattel habits and is drawn to doing so herself.
+ $pronoun commonly sees others wearing chattel habits and is drawn to doing so <<print $object>>self.
<<set $slaves[$i].clothes = "a chattel habit">>
<<elseif ($arcologies[0].FSEgyptianRevivalist > 0) && (random(1,3) == 1)>>
- she commonly sees others wearing nothing but jewelry and is drawn to doing so herself.
+ $pronoun commonly sees others wearing nothing but jewelry and is drawn to doing so <<print $object>>self.
<<set $slaves[$i].clothes = "slutty jewelry">>
<<elseif ($arcologies[0].FSRomanRevivalist > 0) && (random(1,3) == 1)>>
- she commonly sees others wearing togas and is drawn to doing so herself.
+ $pronoun commonly sees others wearing togas and is drawn to doing so <<print $object>>self.
<<set $slaves[$i].clothes = "a toga">>
<<elseif ($arcologies[0].FSAztecRevivalist > 0) && (random(1,3) == 1)>>
- and wears a very revealing huipil, that accentuates her body.
+ $pronoun wears a very revealing huipil, that accentuates $possessive body.
<<set $slaves[$i].clothes = "a huipil">>
<<elseif ($arcologies[0].FSEdoRevivalist > 0) && (random(1,3) == 1)>>
- she commonly sees others wearing kimonos and is drawn to doing so herself.
+ $pronoun commonly sees others wearing kimonos and is drawn to doing so <<print $object>>self.
<<set $slaves[$i].clothes = "a kimono">>
<<elseif ($arcologies[0].FSArabianRevivalist > 0) && (random(1,3) == 1)>>
- she commonly sees others wearing silk and is drawn to doing so herself.
+ $pronoun commonly sees others wearing silk and is drawn to doing so <<print $object>>self.
<<set $slaves[$i].clothes = "harem gauze">>
<<elseif ($arcologies[0].FSChineseRevivalist > 0) && (random(1,3) == 1)>>
- she commonly sees others wearing qipaos and is drawn to doing so herself.
+ $pronoun commonly sees others wearing qipaos and is drawn to doing so <<print $object>>self.
<<set $slaves[$i].clothes = "a slutty qipao">>
<<elseif ($arcologies[0].FSGenderFundamentalist > 0) && (random(1,3) == 1)>>
- she commonly sees cheerleaders around and instinctually follows along.
+ $pronoun commonly sees cheerleaders around and instinctually follows along.
<<set $slaves[$i].clothes = either("a cheerleader outfit", "a schoolgirl outfit")>>
<<elseif ($arcologies[0].FSGenderFundamentalist > 0) && (random(1,3) == 1)>>
- she commonly sees bunnies around and instinctually follows along.
+ $pronoun commonly sees bunnies around and instinctually follows along.
<<set $slaves[$i].clothes = "a bunny outfit">>
<<elseif ($arcologies[0].FSPaternalist > 0) && (random(1,3) == 1)>>
- she commonly sees others wearing clothing and is drawn to doing so herself.
+ $pronoun commonly sees others wearing clothing and is drawn to doing so <<print $object>>self.
<<set $slaves[$i].clothes = "conservative clothing">>
<<elseif ($arcologies[0].FSMaturityPreferentialist > 0) && (random(1,3) == 1)>>
- she commonly sees others wearing suits and is drawn to doing so herself.
+ $pronoun commonly sees others wearing suits and is drawn to doing so <<print $object>>self.
<<set $slaves[$i].clothes = either("slutty business attire", "a nice maid outfit", "a military uniform", "nice business attire")>>
<<elseif ($arcologies[0].FSYouthPreferentialist > 0) && (random(1,3) == 1)>>
- she commonly sees schoolgirls around and instinctually follows along.
+ $pronoun commonly sees schoolgirls around and instinctually follows along.
<<set $slaves[$i].clothes = either("a schoolgirl outfit", "a cheerleader outfit")>>
<<elseif ($arcologies[0].FSDegradationist > 0) && (random(1,3) == 1)>>
- she commonly sees others wearing chains and is drawn to doing so herself.
+ $pronoun commonly sees others wearing chains and is drawn to doing so <<print $object>>self.
<<set $slaves[$i].clothes = either("chains", "uncomfortable straps", "shibari ropes")>>
<<elseif ($arcologies[0].FSPhysicalIdealist > 0) && (random(1,3) == 1)>>
- she commonly sees naked girls around and seldom realizes they are coated in oil.
+ $pronoun commonly sees naked girls around and seldom realizes they are coated in oil.
<<set $slaves[$i].clothes = either("body oil", "no clothing", "no clothing")>>
<<elseif ($arcologies[0].FSPastoralist > 0) && (random(1,3) == 1)>>
- she commonly sees cowgirls around and instinctually follows along.
+ $pronoun commonly sees cowgirls around and instinctually follows along.
<<set $slaves[$i].clothes = "Western clothing">>
<<elseif ($arcologies[0].FSBodyPurist > 0) && (random(1,3) == 1)>>
- she commonly sees others wearing tight, form fitting clothes and is drawn to doing so herself.
+ $pronoun commonly sees others wearing tight, form-fitting clothes and is drawn to doing so <<print $object>>self.
<<set $slaves[$i].clothes = either("a leotard", "a string bikini", "a slave gown", "a comfortable bodysuit", "restrictive latex", "clubslut netting", "a leotard", "a halter top dress")>>
<<else>>
- she chooses to put on underwear, the reasons lost to her, and moves on.
+ $pronoun chooses to put on underwear, the reasons lost to $possessive, and moves on.
<<set $slaves[$i].clothes = "attractive lingerie">>
<</if>>
<<else>>
@@ -75,14 +79,16 @@
and wears comfortable flats,
<<set $slaves[$i].shoes = "flats">>
<<else>>
- and angrily wears the heels she needs to walk,
+ and angrily wears the heels $pronoun needs to walk,
<<set $slaves[$i].shoes = "heels">>
<</if>>
<</if>>
- @@.mediumorchid;increasing her independence.@@
+ @@.mediumorchid;increasing $possessive independence.@@
+ <<set $slaves[$i].devotion -= 5>>
<<else>>
- She @@.hotpink;loves@@ being able to dress herself,
+ $pronounCap @@.hotpink;loves@@ being able to dress <<print $object>>self,
+ <<set $slaves[$i].devotion += 1>>
<<if ($arcologies[0].FSEgyptianRevivalist > 0)>>
dons a wesekh to support your ancient Egyptian pretensions,
@@ -96,27 +102,27 @@
<<if ($slaves[$i].fetishStrength <= 30)>>
<<set $bellySeed = random(1,3)>>
<<if $bellySeed == 1>>
- straps on a 1st trimester belly to satisfy her curiosity,
+ straps on a 1st trimester belly to satisfy $possessive curiosity,
<<set $slaves[$i].bellyAccessory = "a small empathy belly">>
<<elseif $bellySeed == 2>>
- straps on a 2nd trimester belly to satisfy her curiosity,
+ straps on a 2nd trimester belly to satisfy $possessive curiosity,
<<set $slaves[$i].bellyAccessory = "a medium empathy belly">>
<<else>>
- straps on a 3rd trimester belly to satisfy her curiosity,
+ straps on a 3rd trimester belly to satisfy $possessive curiosity,
<<set $slaves[$i].bellyAccessory = "a large empathy belly">>
<</if>>
<<elseif ($slaves[$i].fetishStrength <= 95)>>
- straps on a 3rd trimester belly to satisfy her pregnancy fetish,
+ straps on a 3rd trimester belly to satisfy $possessive pregnancy fetish,
<<set $slaves[$i].bellyAccessory = "a large empathy belly">>
<<elseif ($slaves[$i].fetishStrength > 95)>>
- straps on the largest belly she can find to satisfy her pregnancy fetish,
+ straps on the largest belly $pronoun can find to satisfy $possessive pregnancy fetish,
<<set $slaves[$i].bellyAccessory = "a huge empathy belly">>
<</if>>
<<elseif ($fakeBellies.includes($bellyAccessory)) && ($slaves[$i].fetish != "pregnancy")>>
- removes her fake belly, since she dislikes it,
+ removes $possessive fake belly, since $pronoun dislikes it,
<<set $slaves[$i].bellyAccessory to "none">>
<<elseif ($fakeBellies.includes($bellyAccessory)) && ($slaves[$i].sexualFlaw == "breeder")>>
- pulls her fake belly off, disgusted by it,
+ pulls $possessive fake belly off, disgusted by it,
<<set $slaves[$i].bellyAccessory = "none">>
<</if>>
@@ -154,30 +160,30 @@
and wears a schoolgirl outfit to look younger.
<<set $slaves[$i].clothes = "a schoolgirl outfit">>
<<elseif ($arcologies[0].FSDegradationist > 0) && (random(1,3) == 1)>>
- and wears chains, to degrade herself as required by your societal goals.
+ and wears chains, to degrade <<print $object>>self as required by your societal goals.
<<set $slaves[$i].clothes = "chains">>
<<elseif ($arcologies[0].FSPhysicalIdealist > 0) && (random(1,3) == 1)>>
- and coats herself in body oil to show off how she's part of your physical idealism.
+ and coats <<print $object>>self in body oil to show off how $pronoun's part of your physical idealism.
<<set $slaves[$i].clothes = "body oil">>
<<elseif ($arcologies[0].FSPastoralist > 0) && (random(1,3) == 1)>>
- and wears Western clothing, since she thinks it fits with pastoralism.
+ and wears Western clothing, since $pronoun thinks it fits with pastoralism.
<<set $slaves[$i].clothes = "Western clothing">>
<<elseif ($arcologies[0].FSBodyPurist > 0) && (random(1,3) == 1)>>
- and wears a leotard to show off the purity of her body.
+ and wears a leotard to show off the purity of $possessive body.
<<set $slaves[$i].clothes = "a leotard">>
<<elseif ($slaves[$i].behavioralQuirk == "sinful") && (random(1,3) == 1)>>
- and dresses up like a succubus because it makes her feel naughty.
+ and dresses up like a succubus because it makes $object feel naughty.
<<set $slaves[$i].clothes = "a succubus outfit">>
<<elseif ($slaves[$i].assignment == "guard you")>>
<<if random(1,2) == 1>>
- and wears a bodysuit to show off her curves without hindering her deadliness.
+ and wears a bodysuit to show off $possessive curves without hindering $possessive deadliness.
<<set $slaves[$i].clothes = "a comfortable bodysuit">>
<<else>>
and wears a military uniform to look the part of the honor guard.
<<set $slaves[$i].clothes = "a military uniform">>
<</if>>
<<elseif ($slaves[$i].assignment == "be the Nurse")>>
- and wears a nice nurse outfit to look professional before her patients.
+ and wears a nice nurse outfit to look professional before $possessive patients.
<<set $slaves[$i].clothes = "a nice nurse outfit">>
<<elseif ($slaves[$i].assignment == "be your Recruiter")>>
and wears a flattering mini dress to appear sexy and carefree before those desperately seeking a better life.
@@ -189,47 +195,47 @@
and wears clubslut netting to look like the perfect easy club girl.
<<set $slaves[$i].clothes = "clubslut netting">>
<<elseif ($slaves[$i].assignment == "be the Milkmaid")>>
- and wears a sturdy maid outfit, since anything else might be damaged by her hard work with the cows.
+ and wears a sturdy maid outfit, since anything else might be damaged by $possessive hard work with the cows.
<<set $slaves[$i].clothes = "a nice maid outfit">>
<<elseif ($slaves[$i].assignment == "be the Collectrix")>>
- and wears a slutty nurse outfit to help keep her charges hard.
+ and wears a slutty nurse outfit to help keep $possessive charges hard.
<<set $slaves[$i].clothes = "a slutty nurse outfit">>
<<elseif ($slaves[$i].assignment == "be your Head Girl")>>
- and wears a handsome suit to give her that extra touch of authority.
+ and wears a handsome suit to give $object that extra touch of authority.
<<set $slaves[$i].clothes = "nice business attire">>
<<elseif ($slaves[$i].assignment == "be the Schoolteacher")>>
- and wears a schoolgirl outfit to help keep her charges on task.
+ and wears a schoolgirl outfit to help keep $possessive charges on task.
<<set $slaves[$i].clothes = "a schoolgirl outfit">>
<<elseif ($slaves[$i].assignment == "be the Attendant")>>
- and wears a string bikini, since it's all she can wear that won't be ruined by all the moisture in the spa.
+ and wears a string bikini, since it's all $pronoun can wear that won't be ruined by all the moisture in the spa.
<<set $slaves[$i].clothes = "a string bikini">>
<<elseif ($slaves[$i].assignment == "be the Wardeness")>>
and dons battledress, the better to intimidate the prisoners.
<<set $slaves[$i].clothes = "battledress">>
<<elseif ($slaves[$i].assignment == "be your concubine")>>
- and goes naked, since it's her honored role to be the chief object of your desire.
+ and goes naked, since it's $possessive honored role to be the chief object of your desire.
<<set $slaves[$i].clothes = "no clothing">>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "submissive")>>
<<if random(1,2) == 1>>
- and wears restrictive latex to encourage others to dominate her.
+ and wears restrictive latex to encourage others to dominate $object.
<<set $slaves[$i].clothes = "restrictive latex">>
<<else>>
- and wears shibari ropes to encourage others to dominate her.
+ and wears shibari ropes to encourage others to dominate $object.
<<set $slaves[$i].clothes = "shibari ropes">>
<</if>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "dom")>>
<<if random(1,2) == 1>>
- and wears a handsome suit, since she likes other slaves to look up to her.
+ and wears a handsome suit, since $pronoun likes other slaves to look up to $object.
<<set $slaves[$i].clothes = "nice business attire">>
<<else>>
and wears a full body latex catsuit to look the part of the whip cracking domme.
<<set $slaves[$i].clothes = "a latex catsuit">>
<</if>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "masochist")>>
- and wears painfully restrictive bondage gear, since she likes the torment.
+ and wears painfully restrictive bondage gear, since $pronoun likes the torment.
<<set $slaves[$i].clothes = "uncomfortable straps">>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "sadist")>>
- and wears an elegant gown, since she thinks it makes her look the part of the femme fatale.
+ and wears an elegant gown, since $pronoun thinks it makes $object look the part of the femme fatale.
<<set $slaves[$i].clothes = "a slave gown">>
<<elseif ($slaves[$i].attrKnown == 1) && ($slaves[$i].attrXY > 85)>>
and wears a schoolgirl outfit to show off a some T&A to attract boys.
@@ -238,86 +244,86 @@
and wears a fashionable gown, since girls appreciate nice clothes.
<<set $slaves[$i].clothes = "a slave gown">>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "cumslut")>>
- and wears cut-offs and a t-shirt, because the fun yet relatively conservative outfit seems to encourage others to ask her for blowjobs.
+ and wears cut-offs and a t-shirt, because the fun yet relatively conservative outfit seems to encourage others to ask $object for blowjobs.
<<set $slaves[$i].clothes = "cutoffs and a t-shirt">>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "humiliation")>>
- and wears leather straps with rings over her private parts because she enjoys the embarrassment such a humiliating outfit causes her.
+ and wears leather straps with rings over $possessive private parts because $pronoun enjoys the embarrassment such a humiliating outfit causes $object.
<<set $slaves[$i].clothes = "uncomfortable straps">>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "buttslut")>>
- and wears nothing other than slutty bangles, because she likes to catch the eye without putting anything between cocks and her rear end.
+ and wears nothing other than slutty bangles, because $pronoun likes to catch the eye without putting anything between cocks and $possessive rear end.
<<set $slaves[$i].clothes = "slutty jewelry">>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "mindbroken")>>
- or would, if she were competent or sane.
+ or would, if $pronoun were competent or sane.
<<set $slaves[$i].clothes = "no clothing">>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "pregnancy")>>
- and wears a short maid dress, because she wants to look motherly and fuckable at the same time.
+ and wears a short maid dress, because $pronoun wants to look motherly and fuckable at the same time.
<<set $slaves[$i].clothes = "a slutty maid outfit">>
<<elseif ($slaves[$i].energy > 95)>>
- but goes nude, since as a nympho she gets plenty of attention anyway, and considers clothes an unnecessary hindrance.
+ but goes nude, since as a nympho $pronoun gets plenty of attention anyway, and considers clothes an unnecessary hindrance.
<<set $slaves[$i].clothes = "no clothing">>
<<elseif ($slaves[$i].assignment == "rest")>>
and wears a comfortable t-shirt and cutoffs to relax.
<<set $slaves[$i].clothes = "no clothing">>
<<elseif ($slaves[$i].assignment == "be a subordinate slave")>>
- but gives up and goes naked after the other slaves constantly tear whatever she's wearing off her.
+ but gives up and goes naked after the other slaves constantly tear whatever $pronoun's wearing off $object.
<<set $slaves[$i].clothes = "no clothing">>
<<elseif ($slaves[$i].assignment == "work a glory hole")>>
- but doesn't bother wearing anything, since no one can see her clothing when she's immured inside a glory hole.
+ but doesn't bother wearing anything, since no one can see $possessive clothing when $pronoun's immured inside a glory hole.
<<set $slaves[$i].clothes = "no clothing">>
<<elseif ($slaves[$i].assignment == "take classes") || ($slaves[$i].assignment == "learn in the schoolroom")>>
and wears a schoolgirl outfit, since it seems most appropriate.
<<set $slaves[$i].clothes = "a schoolgirl outfit">>
<<elseif (($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel")) && bigBelly($slaves[$i]) && ($clothesBoughtMaternityDress == 1 || $arcologies[0].FSRepopulationFocus != "unset")>>
- and wears pretty lingerie to show off her merchandise and accentuate her pregnancy while still looking a little classy.
+ and wears pretty lingerie to show off $possessive merchandise and accentuate $possessive pregnancy while still looking a little classy.
<<set $slaves[$i].clothes = "attractive lingerie for a pregnant woman">>
<<elseif ($slaves[$i].assignment == "whore") || ($slaves[$i].assignment == "work in the brothel")>>
- and wears pretty lingerie to show off her merchandise and still look a little classy.
+ and wears pretty lingerie to show off $possessive merchandise and still look a little classy.
<<set $slaves[$i].clothes = "attractive lingerie">>
<<elseif ($slaves[$i].assignment == "serve the public") || ($slaves[$i].assignment == "serve in the club")>>
and wears string lingerie to look fun and fuckable.
<<set $slaves[$i].clothes = "a string bikini">>
<<elseif ($slaves[$i].assignment == "get milked") || ($slaves[$i].assignment == "work in the dairy")>>
- and wears sturdy lingerie to offer the best support to her sore, milk-filled udders.
+ and wears sturdy lingerie to offer the best support to $possessive sore, milk-filled udders.
<<set $slaves[$i].clothes = "attractive lingerie">>
<<elseif ($slaves[$i].assignment == "be a servant") || ($slaves[$i].assignment == "work as a servant")>>
- and wears a sturdy maid outfit, since anything else might be damaged by her hard work around the penthouse.
+ and wears a sturdy maid outfit, since anything else might be damaged by $possessive hard work around the penthouse.
<<set $slaves[$i].clothes = "a nice maid outfit">>
<<elseif bigBelly($slaves[$i])>>
<<if random(1,2) == 1>>
- and wears pretty lingerie to show off her merchandise while giving her big belly plenty of room to hang free.
+ and wears pretty lingerie to show off $possessive merchandise while giving $possessive big belly plenty of room to hang free.
<<set $slaves[$i].clothes = "attractive lingerie">>
<<elseif ($clothesBoughtMaternityLingerie == 1 || $arcologies[0].FSRepopulationFocus != "unset") && $slaves[$i].energy > 90>>
- and wears pretty lingerie to show off her merchandise and accentuate her pregnancy while giving it plenty of room to hang free.
+ and wears pretty lingerie to show off $possessive merchandise and accentuate $possessive pregnancy while giving it plenty of room to hang free.
<<set $slaves[$i].clothes = "attractive lingerie for a pregnant woman">>
<<elseif ($clothesBoughtMaternityDress == 1 || $arcologies[0].FSRepopulationFocus != "unset")>>
- and wears a conservative dress with plenty of give for her belly to stretch it.
+ and wears a conservative dress with plenty of give for $possessive belly to stretch it.
<<set $slaves[$i].clothes = "a maternity dress">>
<<else>>
- and wears string lingerie to look fun and fuckable while giving her big belly plenty of room to hang free.
+ and wears string lingerie to look fun and fuckable while giving $possessive big belly plenty of room to hang free.
<<set $slaves[$i].clothes = "a string bikini">>
<</if>>
<<else>>
- and wears string lingerie to show off her body.
+ and wears string lingerie to show off $possessive body.
<<set $slaves[$i].clothes = "a string bikini">>
<</if>>
<<if $arcologies[0].FSRestart != "unset">>
<<if $slaves[$i].choosesOwnChastity == 1>>
<<if $slaves[$i].vagina > -1 && $slaves[$i].breedingMark == 1 && ($slaves[$i].vaginalAccessory == "chastity belt" || $slaves[$i].vaginalAccessory == "combined chastity")>>
- She unfastens her chastity belt knowing full well her role in life is to carry her <<if def $PC.customTitle>><<print $PC.customTitle>>'s<<elseif $PC.title != 0>>Master's<<else>>Mistress'<</if>> children.
+ $pronounCap unfastens $possessive chastity belt knowing full well $possessive role in life is to carry $possessive <<if def $PC.customTitle>><<print $PC.customTitle>>'s<<elseif $PC.title != 0>>Master's<<else>>Mistress'<</if>> children.
<<set $slaves[$i].vaginalAccessory = "none">>
<<elseif $slaves[$i].vagina > -1 && $slaves[$i].ovaries == 1 && $slaves[$i].preg == 0 && $slaves[$i].vaginalAccessory != "chastity belt">>
- She also affixes a chastity belt over her vagina to discourage use of her reproductive organ.
+ $pronounCap also affixes a chastity belt over $possessive vagina to discourage use of $possessive reproductive organ.
<<set $slaves[$i].vaginalAccessory = "chastity belt">>
<<elseif $slaves[$i].vagina > -1 && ($slaves[$i].ovaries == 0 || $slaves[$i].preg < -1) && $slaves[$i].vaginalAccessory == "chastity belt">>
- She removes her chastity belt since no matter how hard someone tries, she can never become pregnant.
+ $pronounCap removes $possessive chastity belt since no matter how hard someone tries, $pronoun can never become pregnant.
<<set $slaves[$i].vaginalAccessory = "none">>
<</if>>
<<if $slaves[$i].dick > 0 && $slaves[$i].balls > 0 && $slaves[$i].dickAccessory != "chastity">>
- She also affixes a chastity cage onto her dick to discourage use of her reproductive organ.
+ $pronounCap also affixes a chastity cage onto $possessive dick to discourage use of $possessive reproductive organ.
<<set $slaves[$i].dickAccessory = "chastity">>
<<elseif $slaves[$i].dick > 0 && $slaves[$i].balls == 0 && $slaves[$i].dickAccessory == "chastity">>
- She removes her chastity cage since even if she could get erect, she only shoots blanks.
+ $pronounCap removes $possessive chastity cage since even if $pronoun could get erect, $pronoun only shoots blanks.
<<set $slaves[$i].dickAccessory = "none">>
<</if>>
<</if>>
@@ -325,23 +331,26 @@
<<if ($slaves[$i].amp != 1)>>
<<if ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "dom")>>
- She wears boots to look like a proper dominant.
+ $pronounCap wears boots to look like a proper dominant.
<<set $slaves[$i].shoes = "boots">>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "sadist")>>
- She wears boots, since she thinks they make her look dangerous.
+ $pronounCap wears boots, since $pronoun thinks they make $possessive look dangerous.
<<set $slaves[$i].shoes = "boots">>
<<elseif ($slaves[$i].heels == 1)>>
- She wears the heels she needs to walk.
+ $pronounCap wears the heels $pronoun needs to walk.
<<set $slaves[$i].shoes = "heels">>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "none")>>
- She wears comfortable flats, since she doesn't have a fetish to show off.
+ $pronounCap wears comfortable flats, since $pronoun doesn't have a fetish to show off.
<<set $slaves[$i].shoes = "flats">>
<<else>>
- She wears heels to strut her stuff.
+ $pronounCap wears heels to strut $possessive stuff.
<<set $slaves[$i].shoes = "heels">>
<</if>>
<</if>>
-<</if>>
+<</if>> /* closes devotion > 20 */
<</if>> /* closes MB check */
+
+<</if>> /* closes choosesOwnClothes check */
+
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index b9dc70de95e4e6f8a4f6eaea6564889b40dcbdde..13dd45c83449692cebde0c54ccfdc74bab5350a8 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -9,6 +9,7 @@
is allowed to select $possessive own job this week. $pronounCap watches your other slaves to decide what to do, @@.hotpink;happy@@ to be permitted a choice and a little more @@.mediumaquamarine;confident@@ than if you had just given $object orders. The $desc
<<set $slaves[$i].devotion++, $slaves[$i].trust++>>
+
<<if ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -20)>>
decides to rest, taking advantage of your permission to @@.mediumorchid;remain indolent.@@
<<removeJob $slaves[$i] $slaves[$i].assignment>>
@@ -23,9 +24,6 @@
<<removeJob $slaves[$i] $slaves[$i].assignment>>
<</if>>
-<<elseif (($slaves[$i].devotion < 45) || ($slaves[$i].trust < 45)) && (($slaves[$i].sexualFlaw != "none") || ($slaves[$i].behavioralFlaw != "none")) && ($Attendant != 0) && $universalRulesAssignsSelfFacility == 1>>
- could use some counseling, so $pronoun decides to visit $spaName.
- <<assignJob $slaves[$i] "rest in the spa">>
<<elseif ($slaves[$i].intelligenceImplant != 1)>>
<<if $schoolroom > $schoolroomSlaves && $universalRulesAssignsSelfFacility == 1>>
@@ -36,6 +34,10 @@
<<assignJob $slaves[$i] "take classes">>
<</if>>
+<<elseif (($Attendant != 0) && $universalRulesAssignsSelfFacility == 1 && (($slaves[$i].devotion < 45) || ($slaves[$i].trust < 45) || ($slaves[$i].sexualFlaw != "none") || ($slaves[$i].behavioralFlaw != "none"))>>
+ could use some counseling, so $pronoun decides to visit $spaName.
+ <<assignJob $slaves[$i] "rest in the spa">>
+
<<elseif ($slaves[$i].devotion <= 50) && canWalk($slaves[$i]) && canSee($slaves[$i])>>
<<if $servantsQuarters > $servantsQuartersSlaves && $universalRulesAssignsSelfFacility == 1>>
is obedient but not devoted, so $pronoun decides to work from $servantsQuartersName since it's the least sexually demanding job available.
@@ -337,11 +339,11 @@
<</if>>
<<elseif ($arcologies[0].FSAztecRevivalist > 0)>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
- is a devoted slave, so she decides she can best serve the empire by serving at the fertility temple.
+ is a devoted slave, so $pronoun decides $pronoun can best serve the empire by serving at the fertility temple.
<<assignJob $slaves[$i] "work in the brothel">>
<<else>>
- is a devoted slave, so she decides she can best serve the empire by offering herself to the public.
- <<set $slaves[$i].assignment = "serve the public", $slaves[$i].assignmentVisible = 1>>
+ is a devoted slave, so $pronoun decides $pronoun can best serve the empire by offering herself to the public.
+ <<assignJob $slaves[$i] "serve the public">>
<</if>>
<<elseif ($arcologies[0].FSPaternalist > 0)>>
<<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
diff --git a/src/uncategorized/saGetMilked.tw b/src/uncategorized/saGetMilked.tw
index 7dcb36575578b8917e73fb5c20c8f34ab9849d92..1b54409038656db7045b9dc3c9819f0e37477701 100644
--- a/src/uncategorized/saGetMilked.tw
+++ b/src/uncategorized/saGetMilked.tw
@@ -11,10 +11,12 @@ gets milked this week.
<<if $dairy > 0>>
<<if $dairyRestraintsSetting < 2>>
<<if (($universalRulesFacilityWork == 1) && ($slaves[$i].assignment == "get milked") && ($dairySpots > 0)) || ($slaves[$i].assignment == "work in the dairy")>>
- Since there's extra space in $dairyName, she spends most of her milkings there.
- <<set $dairySpots -= 1>>
+ <<if ($slaves[$i].assignment == "get milked")>>
+ Since there's extra space in $dairyName, she spends most of her milkings there.
+ <<set $dairySpots -= 1>>
+ <</if>>
<<if ($Milkmaid != 0)>>
- While there, she gets the benefit of $Milkmaid.slaveName's <<if ($Milkmaid.physicalAge < 21)>>youthful energy<<else>>care<</if>><<if ($Milkmaid.oralSkill >= 100)>>and talented tongue<<else>>.<</if>>
+ While there, she gets the benefit of $Milkmaid.slaveName's <<if ($Milkmaid.physicalAge < 21)>>youthful energy<<else>>care<</if>><<if ($Milkmaid.oralSkill >= 100)>> and talented tongue<</if>>.
<<if ($slaves[$i].devotion < $milkmaidDevotionThreshold)>>
<<set $slaves[$i].devotion += $milkmaidDevotionBonus>>
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index b2fabe4d29918c2b8eefcd549dab2fddfeb326ec..7de55b2a05e5d1fad7abb7bbbbacb6e76d98aec8 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -123,6 +123,7 @@
<</if>>
<</if>>
+
<<if $slaves[$i].fuckdoll == 0>>
<<if $slaves[$i].fetish != "mindbroken">>
diff --git a/src/uncategorized/saServant.tw b/src/uncategorized/saServant.tw
index b7be63882d88a9a066c5f89b002265a611a85d67..d9cf3fb55ad3c9dd22e21aea4dac8a48098e4bd3 100644
--- a/src/uncategorized/saServant.tw
+++ b/src/uncategorized/saServant.tw
@@ -1,67 +1,69 @@
:: SA servant [nobr]
-works as a servant. She performs the lowest jobs in your penthouse, cleaning up after your other slaves, bathing them, helping them dress, and giving them sexual relief.
+<<SlavePronouns $slaves[$i]>>
+
+works as a servant. $pronounCap performs the lowest jobs in your penthouse, cleaning up after your other slaves, bathing them, helping them dress, and giving them sexual relief.
<<if $servantsQuarters > 0>>
<<if (($universalRulesFacilityWork == 1) && ($slaves[$i].assignment == "be a servant") && ($servantsQuartersSpots > 0)) || ($slaves[$i].assignment == "work as a servant")>>
<<if ($slaves[$i].assignment == "be a servant")>>
- Since there's extra space in the servants' quarters, $assistantName attaches her to the cadre of maids there.
+ Since there's extra space in the servants' quarters, $assistantName attaches $object to the cadre of maids there.
<<set $servantsQuartersSpots -= 1>>
<</if>>
<<if ($Stewardess != 0)>>
- This brings her under $Stewardess.slaveName's supervision. The Stewardess <<if $slaves[$i].devotion < -20>>subjects her to corrective rape when her service is imperfect, or when she feels like raping her, forcing the poor slave to @@.yellowgreen;find refuge in work.@@<<elseif $slaves[$i].devotion <= 20>>molests her, encouraging the poor slave to keep her head down and @@.yellowgreen;work harder.@@<<else>>uses sex as a reward, getting her off when she @@.yellowgreen;works harder.@@<</if>>
+ This brings $object under $Stewardess.slaveName's supervision. The Stewardess <<if $slaves[$i].devotion < -20>>subjects $object to corrective rape when $possessive service is imperfect, or when the Stewardess feels like raping $object, forcing the poor slave to @@.yellowgreen;find refuge in work.@@<<elseif $slaves[$i].devotion <= 20>>molests $object, encouraging the poor slave to keep $possessive head down and @@.yellowgreen;work harder.@@<<else>>uses sex as a reward, getting $object off when $pronoun @@.yellowgreen;works harder.@@<</if>>
<<set $cash += $stewardessBonus>>
<</if>>
<</if>>
<</if>>
<<if ($slaves[$i].trust < -20)>>
- She is frightened of punishment and works very hard, @@.yellowgreen;reducing the upkeep@@ of your slaves.
+ $pronounCap is frightened of punishment and works very hard, @@.yellowgreen;reducing the upkeep@@ of your slaves.
<<elseif ($slaves[$i].devotion < -20)>>
- She is reluctant, requiring your other slaves to force her services, and does not @@.yellowgreen;reduce upkeep@@ of your slaves much.
+ $pronounCap is reluctant, requiring your other slaves to force $possessive services, and does not @@.yellowgreen;reduce upkeep@@ of your slaves much.
<<elseif ($slaves[$i].devotion <= 20)>>
- She is hesitant, requiring your other slaves to demand her services, and only slightly @@.yellowgreen;reduces upkeep@@ of your slaves.
+ $pronounCap is hesitant, requiring your other slaves to demand $possessive services, and only slightly @@.yellowgreen;reduces upkeep@@ of your slaves.
<<elseif ($slaves[$i].devotion <= 50)>>
- She is obedient, offering your other slaves to her services, and moderately @@.yellowgreen;reduces the upkeep@@ of your slaves.
+ $pronounCap is obedient, offering your other slaves to $possessive services, and moderately @@.yellowgreen;reduces the upkeep@@ of your slaves.
<<elseif ($slaves[$i].devotion <= 95)>>
- She is devoted, happily giving your other slaves her services, and @@.yellowgreen;reduces the upkeep@@ of your slaves.
+ $pronounCap is devoted, happily giving your other slaves $possessive services, and @@.yellowgreen;reduces the upkeep@@ of your slaves.
<<else>>
- She is so happy to serve your other slaves that she often sees to their needs before they know they have them, and greatly @@.yellowgreen;reduces the upkeep@@ of your slaves.
+ $pronounCap is so happy to serve your other slaves that $pronoun often sees to their needs before they know they have them, and greatly @@.yellowgreen;reduces the upkeep@@ of your slaves.
<</if>>
<<set $slaves[$i].oralCount += random(5,10)>>
<<set $oralTotal += random(5,10)>>
<<if ($slaves[$i].relationship == -2)>>
- She does her best to perfect your domesticity due to her emotional bond to you.
+ $pronounCap does $possessive best to perfect your domesticity due to $possessive emotional bond to you.
<<elseif ($slaves[$i].relationship == -3)>>
- She does her very best to be the perfect housewife, making her an outstanding servant.
+ $pronounCap does $possessive very best to be the perfect housewife, making $possessive an outstanding servant.
<</if>>
<<if ($slaves[$i].fetishStrength > 60)>>
<<if ($slaves[$i].fetish == "submissive") && ($slaves[$i].fetishKnown == 1)>>
- Her natural affinity for submission increases her effectiveness.
+ $possessiveCap natural affinity for submission increases $possessive effectiveness.
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "dom")>>
- Her sexual appetite for domination reduces her effectiveness.
+ $possessiveCap sexual appetite for domination reduces $possessive effectiveness.
<</if>>
<</if>>
<<if ($slaves[$i].energy < 20)>>
- Her frigidity allows her to ignore the intercourse all around her, making her very efficient.
+ $possessiveCap frigidity allows $object to ignore the intercourse all around $object, making $object very efficient.
<<elseif ($slaves[$i].energy < 40)>>
- Her low sex drive keeps her from becoming too distracted by the intercourse all around her, making her more efficient.
+ $possessiveCap low sex drive keeps $object from becoming too distracted by the intercourse all around $object, making $object more efficient.
<</if>>
<<if (($slaves[$i].eyes <= -1) && ($slaves[$i].eyewear != "corrective glasses") && ($slaves[$i].eyewear != "corrective contacts")) || ($slaves[$i].eyewear == "blurring glasses") || ($slaves[$i].eyewear == "blurring contacts")>>
- Her bad vision makes her a worse servant.
+ $possessiveCap bad vision makes $object a worse servant.
<</if>>
<<if ($slaves[$i].lactation > 0)>>
- Since she is
+ Since $pronoun is
<<if ($slaves[$i].devotion > 20) || ($slaves[$i].trust < -20)>>
- lactating, she serves
+ lactating, $pronoun serves
<<else>>
- lactating, and disobedient, she is restrained to serve
+ lactating, and disobedient, $pronoun is restrained to serve
<</if>>
- as a drink dispenser at mealtimes, and makes a meaningful contribution to her fellow slaves' nutrition in concert with the feeding systems.
+ as a drink dispenser at mealtimes, and makes a meaningful contribution to $possessive fellow slaves' nutrition in concert with the feeding systems.
<</if>>
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index 65a9ff439652a463508a26789de1911b7df1b464..3bfed885f2163df8920409140d0b974077cd3648 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -37,7 +37,7 @@
<</if>>
<<if $slaves[$i].assignment == "be the DJ">>
<<if $clubSlaves+$slavesGettingHelp > 0>>
- <<set $beauty = Math.trunc($beauty*((10-$clubSlaves-$slavesGettingHelp)/10))>>
+ <<set $beauty = Math.trunc($beauty*((10-$clubSlaves-$slavesGettingHelp)/10))>>
<</if>>
<</if>>
@@ -63,6 +63,7 @@ the public.
<<if (($universalRulesFacilityWork == 1) && ($slaves[$i].assignment == "serve the public") && ($clubSpots > 0)) || ($slaves[$i].assignment == "serve in the club")>>
<<if ($slaves[$i].assignment == "serve the public")>>
Since there's extra space in $clubName, she's promiscuous there.
+ <<set $clubSpots -= 1>>
<</if>>
<<if $clubAdsSpending != 0>>
<<if $clubAdsStacked == 1>>
@@ -178,9 +179,6 @@ the public.
<</if>>
<</if>>
<</if>>
- <<if ($slaves[$i].assignment == "serve the public")>>
- <<set $clubSpots -= 1>>
- <</if>>
<<if $DJ != 0>>
<<if $DJRepBonus > 0>>
<<set $beautyMultiplier += $DJRepBonus>>
@@ -253,8 +251,8 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
<<set $injury = 0>>
<<if $slaves[$i].assignment == "serve in the club">>
-<<elseif $slaves[$i].curatives > 0>>
- The drugs she's on protect her from the wear of being a slut.
+<<elseif ($slaves[$i].curatives > 0) || ($slaves[$i].inflationType == "curative")>>
+ The drugs <<if $slaves[$i].inflationType == "curative">>she holds within her gut<<else>>she's on<</if>> protect her from the wear of being a slut.
<<elseif ($slaves[$i].health < -50)>>
The stress of being a slut while ill is @@.red;very hard on her.@@
<<set $slaves[$i].health -= 10>>
@@ -468,17 +466,17 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
<</for>>
are public sluts too, she earns extra attention.
<<if $arcologies[0].FSEgyptianRevivalist > 20>>
- Citizens are very excited about being able to participate in properly ancient Egyptian incestuous sex.
+ Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.
<</if>>
<<elseif $children.length > 1>>
Since her relatives, $children[0].slaveName and $children[1].slaveName, are public sluts too, she earns extra attention.
<<if $arcologies[0].FSEgyptianRevivalist > 20>>
- Citizens are very excited about being able to participate in properly ancient Egyptian incestuous sex.
+ Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.
<</if>>
<<elseif $children.length > 0>>
Since her relative, $children[0].slaveName, is a public slut too, she earns extra attention.
<<if $arcologies[0].FSEgyptianRevivalist > 20>>
- Citizens are very excited about being able to participate in properly ancient Egyptian incestuous sex.
+ Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.
<</if>>
<</if>>
<<set $children = []>>
@@ -490,7 +488,7 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
<<if $slaves[$j].assignment == $slaves[$i].assignment>>
Since her $slaves[$j].relation $slaves[$j].slaveName is a public slut too, she earns extra attention.
<<if $arcologies[0].FSEgyptianRevivalist > 20>>
- Citizens are very excited about being able to participate in properly ancient Egyptian incestuous sex.
+ Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.
<</if>>
<</if>>
<<break>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index c96c5fd21cb63dc37b9032c408e175e8587a9378..7b35bb60dd25ce13e8bc892c0956d58ddb92e5c6 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -54,9 +54,10 @@ her body.
<<set $beautyMultiplier = 1>>
<<if $brothel > 0>>
- <<if (($universalRulesFacilityWork == 1) && ($slaves[$i].assignment == "whore") && ($brothel > $brothelSlaves)) || ($slaves[$i].assignment == "work in the brothel")>>
+ <<if (($universalRulesFacilityWork == 1) && ($slaves[$i].assignment == "whore") && ($brothelSpots > 0)) || ($slaves[$i].assignment == "work in the brothel")>>
<<if ($slaves[$i].assignment == "whore")>>
Since there's extra space in $brothelName, she sells herself there.
+ <<set $brothelSpots -= 1>>
<</if>>
<<if $brothelAdsSpending != 0>>
<<if $brothelAdsStacked == 1>>
@@ -172,9 +173,6 @@ her body.
<</if>>
<</if>>
<</if>>
- <<if ($slaves[$i].assignment == "whore")>>
- <<set $brothelSpots -= 1>>
- <</if>>
<<if $Madam != 0>>
<<if $madamCashBonus > 0>>
<<set $beautyMultiplier += $madamCashBonus>>
@@ -373,7 +371,7 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da
<<elseif ($slaves[$i].whoreSkill <= 30)>>
As a skilled prostitute, she gets a little more money out of customers.
<<elseif ($slaves[$i].whoreSkill <= 60)>>
- As a expert prostitute, she gets more money out of customers.
+ As an expert prostitute, she gets more money out of customers.
<<elseif ($slaves[$i].whoreSkill >= 100)>>
As a masterful prostitute, she makes more money.
<</if>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 719de6025a6675e62ebe905f92d2e2d3ff9e95aa..0b4cc72bbf4eccf929b1690457066b6e58439886 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -3,21 +3,21 @@
<<set _idleBonus = 0, _FLsFetish = 0, _DL = $SchlRiIDs.length, $schoolroomSlaves = _DL, _SL = $slaves.length, _FLs = -1>>
<<for _dI = 0; _dI < _DL; _dI++>>
-<<set _i = $SchlRiIDs[_dI].Index, _ID = $SchlRiIDs[_dI].ID>>
-<<if _i >= _SL || _ID != $slaves[_i].ID>>
- /% Slaves.ID and $SchlRiIDs.ID's don't match-up so let's find her %/
- <<for _i = 0; _i < _SL; _i++>>
- <<if _ID == $slaves[_i].ID>>
- /% Correct the Index %/
- <<set $SchlRiIDs[_dI].Index = _i>>
- <<break>>
+ <<set _i = $SchlRiIDs[_dI].Index, _ID = $SchlRiIDs[_dI].ID>>
+ <<if _i >= _SL || _ID != $slaves[_i].ID>>
+ /% Slaves.ID and $SchlRiIDs.ID's don't match-up so let's find her %/
+ <<for _i = 0; _i < _SL; _i++>>
+ <<if _ID == $slaves[_i].ID>>
+ /% Correct the Index %/
+ <<set $SchlRiIDs[_dI].Index = _i>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<if _i >= _SL || $slaves[_i].assignment != "learn in the schoolroom">>
+ <<set $SchlRiIDs.deleteAt(_dI), _dI--, _DL-->>
+ <<continue>>
<</if>>
- <</for>>
-<</if>>
-<<if _i >= _SL || $slaves[_i].assignment != "learn in the schoolroom">>
- <<set $SchlRiIDs.deleteAt(_dI), _dI--, _DL-->>
- <<continue>>
-<</if>>
<</for>>
<<SlaveSort $SchlRiIDs>>
@@ -29,40 +29,40 @@
<<if $Schoolteacher != 0>>
<<for _FLs = 0; _FLs < _SL; _FLs++>>
- <<if $slaves[_FLs].ID == $Schoolteacher.ID>>
- <<break>>
- <</if>>
+ <<if $slaves[_FLs].ID == $Schoolteacher.ID>>
+ <<break>>
+ <</if>>
<</for>>
<<if ($slaves[_FLs].health < -80)>>
- <<set $slaves[_FLs].health += 20>>
+ <<set $slaves[_FLs].health += 20>>
<<elseif ($slaves[_FLs].health < -40)>>
- <<set $slaves[_FLs].health += 15>>
+ <<set $slaves[_FLs].health += 15>>
<<elseif ($slaves[_FLs].health < 0)>>
- <<set $slaves[_FLs].health += 10>>
+ <<set $slaves[_FLs].health += 10>>
<<elseif ($slaves[_FLs].health < 90)>>
- <<set $slaves[_FLs].health += 7>>
+ <<set $slaves[_FLs].health += 7>>
<</if>>
<<if ($slaves[_FLs].devotion <= 60)>>
- <<set $slaves[_FLs].devotion++>>
+ <<set $slaves[_FLs].devotion++>>
<</if>>
<<if ($slaves[_FLs].trust < -30)>>
- <<set $slaves[_FLs].trust++>>
+ <<set $slaves[_FLs].trust++>>
<</if>>
<<set $slaves[_FLs].devotion += _devBonus>>
<<if $slaves[_FLs].fetishStrength <= 95>>
- <<if $slaves[_FLs].fetish != "dom">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "dom">>
+ <<if $slaves[_FLs].fetish != "dom">>
+ <<fetishChangeChance $slaves[_FLs]>>
+ <<if $fetishChangeChance > random(0,100)>>
+ <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "dom">>
+ <</if>>
+ <<elseif $slaves[_FLs].fetishKnown == 0>>
+ <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
+ <<else>>
+ <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
<</if>>
- <<elseif $slaves[_FLs].fetishKnown == 0>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
- <<else>>
- <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
- <</if>>
<</if>>
<<set $Schoolteacher = $slaves[_FLs], $i = _FLs>>
- $Schoolteacher.slaveName is serving as your schoolteacher.<<if $Schoolteacher.relationship == -3>> As your wife, she tries her best to teach her pupils how to please you.<</if>>
+ $Schoolteacher.slaveName is serving as your Schoolteacher.<<if $Schoolteacher.relationship == -3>> As your wife, she tries her best to teach her pupils how to please you.<</if>>
<<if (_FLsFetish == 1)>>
She's allowed and even expected to use her students for her own sexual gratification, and in their own way her students are complicit, offering sexual favors for an easier time in the classroom. Before long, she's running a hungry eye over the tits and asses of new trainees; she is now @@.lightcoral;more dominant.@@
<<elseif (_FLsFetish == 2)>>
@@ -87,61 +87,48 @@
Her students want to be just like their beautiful teacher.
<<set _idleBonus++>>
<</if>>
- <<if ($schoolroomSlaves > 0)>>
<<for _dI = 0; _dI < _DL; _dI++>>
- <<set _i = $SchlRiIDs[_dI].Index>>
- <<if $familyTesting == 1>>
- <<if $slaves[_i].mother == $Schoolteacher.ID>>
- She makes sure to spend extra time teaching her daughter, $slaves[_i].slaveName.
- <<set $slaves[_i].trust++>>
- <</if>>
- <<if $slaves[_i].father == $Schoolteacher.ID>>
- She makes sure to spend extra time teaching her daughter, $slaves[_i].slaveName.
+ <<set _i = $SchlRiIDs[_dI].Index>>
+ <<if $Schoolteacher.rivalryTarget == $slaves[_i].ID>>
+ Ever since her <<if $Schoolteacher.rivalry == 1>>growing rival<<elseif $Schoolteacher.rivalry == 2>>rival<<elseif $Schoolteacher.rivalry == 3>>bitter rival<</if>>, was enrolled, she began stalking the classroom carrying a large paddle, much to $slaves[_i].slaveName's terror.
+ <<set $slaves[_i].devotion -= 4, $slaves[_i].trust -= 4>>
+ <<if random(1,100) > 35>>
+ <<set $Schoolteacher.rivalry++, $slaves[_FLs].rivalry++, $slaves[_i].rivalry++>>
+ <</if>>
+ <<elseif $Schoolteacher.relationshipTarget == $slaves[_i].ID>>
+ She dedicates most of her attention to her <<if $Schoolteacher.relationship == 1>>friend<<elseif $Schoolteacher.relationship == 2>>best friend<<elseif $Schoolteacher.relationship == 3>>friend with benefits<<elseif $Schoolteacher.relationship == 4>>lover<<elseif $Schoolteacher.relationship == 5>>slave wife<</if>>, $slaves[_i].slaveName, making sure she understands that day's lesson.
+ <<set $slaves[_i].devotion += 2, $slaves[_i].trust += 2>>
+ <<elseif $familyTesting == 1 && totalRelatives($slaves[_i]) > 0>>
+ <<if $slaves[_i].mother == $Schoolteacher.ID || $slaves[_i].father == $Schoolteacher.ID>>
+ She makes sure to spend extra time teaching her daughter, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust++>>
+ <<elseif $slaves[_i].ID == $Schoolteacher.mother>>
+ She makes sure to spend extra time teaching her mother, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust++>>
+ <<elseif $slaves[_i].ID == $Schoolteacher.father>>
+ She makes sure to spend extra time teaching her father, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust++>>
+ <<elseif areSisters($slaves[_i], $Schoolteacher) == 1>>
+ She makes sure to spend extra time teaching her twin sister, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust++>>
+ <<elseif areSisters($slaves[_i], $Schoolteacher) == 2>>
+ She makes sure to spend extra time teaching her sister, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust++>>
+ <<elseif areSisters($slaves[_i], $Schoolteacher) == 3>>
+ She makes sure to spend extra time teaching her half-sister, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust++>>
+ <</if>>
+ <<elseif $Schoolteacher.relationTarget == $slaves[_i].ID && $familyTesting == 0>>
+ She makes sure to spend extra time teaching her $slaves[_i].relation, $slaves[_i].slaveName.
<<set $slaves[_i].trust++>>
<</if>>
- <<if $slaves[_i].ID == $Schoolteacher.father>>
- She makes sure to spend extra time teaching her father, $slaves[_i].slaveName.
- <<set $slaves[_i].trust++>>
- <</if>>
- <<if $slaves[_i].ID == $Schoolteacher.mother>>
- She makes sure to spend extra time teaching her mother, $slaves[_i].slaveName.
- <<set $slaves[_i].trust++>>
- <</if>>
- <<if areSisters($slaves[_i], $Schoolteacher) == 1>>
- She makes sure to spend extra time teaching her twin, $slaves[_i].slaveName.
- <<set $slaves[_i].trust++>>
- <<elseif areSisters($slaves[_i], $Schoolteacher) == 2>>
- She makes sure to spend extra time teaching her sister, $slaves[_i].slaveName.
- <<set $slaves[_i].trust++>>
- <<elseif areSisters($slaves[_i], $Schoolteacher) == 3>>
- She makes sure to spend extra time teaching her half-sister, $slaves[_i].slaveName.
- <<set $slaves[_i].trust++>>
- <</if>>
- <<else>>
- <<if $Schoolteacher.relationTarget == $slaves[_i].ID>>
- She makes sure to spend extra time teaching her $slaves[_i].relation, $slaves[_i].slaveName.
- <<set $slaves[_i].trust++>>
- <</if>>
- <</if>> /*closes extended family mode */
- <<if $Schoolteacher.relationshipTarget == $slaves[_i].ID>>
- She dedicates most of her attention to her <<if $Schoolteacher.relationship == 1>>friend<<elseif $Schoolteacher.relationship == 2>>best friend<<elseif $Schoolteacher.relationship == 3>>friend with benefits<<elseif $Schoolteacher.relationship == 4>>lover<<elseif $Schoolteacher.relationship == 5>>slave wife<</if>>, $slaves[_i].slaveName making sure she understands that day's lesson.
- <<set $slaves[_i].devotion += 2, $slaves[_i].trust += 2>>
- <</if>>
- <<if $Schoolteacher.rivalryTarget == $slaves[_i].ID>>
- Ever since her <<if $Schoolteacher.rivalry == 1>>growing rival<<elseif $Schoolteacher.rivalry == 2>>rival<<elseif $Schoolteacher.rivalry == 3>>bitter rival<</if>>, was enrolled, she began stalking the classroom carrying a large paddle, much to $slaves[_i].slaveName's terror.
- <<set $slaves[_i].devotion -= 4, $slaves[_i].trust -= 4>>
- <<if random(1,100) > 35>>
- <<set $Schoolteacher.rivalry++, $slaves[_FLs].rivalry++, $slaves[_i].rivalry++>>
- <</if>>
- <</if>>
<</for>>
- <</if>>
<<if ($schoolroomSlaves < $schoolroom)>>
<<set _seed = random(1,10)+(($schoolroom-$schoolroomSlaves)*(random(150,170)+(_idleBonus*10)))>>
<<set $cash += _seed>>
- <br> Since she doesn't have enough students to occupy all her time, $schoolroomName takes in citizens' slaves on a contract basis and she teaches them too, earning @@.yellowgreen;¤_seed.@@<br>
+ <br> Since she doesn't have enough students to occupy all her time, $schoolroomName takes in citizens' slaves on a contract basis and she teaches them too, earning @@.yellowgreen;¤_seed.@@
<</if>>
- <<if ($schoolroomSlaves > 0)>><br><</if>>
+ <<if ($schoolroomSlaves > 0)>><br><br><</if>>
<</if>>
<<if ($schoolroomSlaves > 0)>>
@@ -149,6 +136,7 @@
<</if>>
<<if ($Schoolteacher != 0)>>
+ <<set $i = _FLs>> /* apply following SA passages to facility leader */
<<if $showEWD != 0>>
<br><br>
/* 000-250-006 */
@@ -158,16 +146,9 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;$slaves[_FLs].slaveName@@__'' is serving as your schoolteacher.
+ ''__@@.pink;$slaves[_FLs].slaveName@@__'' is serving as your Schoolteacher.
<br>
- <<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[$i].devotion <= 20)>>
- <<set $slaves[$i].devotion -= 5>>
- <<else>>
- <<set $slaves[$i].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -176,14 +157,7 @@
<br><<include "SA devotion">>
<<else>>
<<silently>>
- <<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[$i].devotion <= 20)>>
- <<set $slaves[$i].devotion -= 5>>
- <<else>>
- <<set $slaves[$i].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -195,19 +169,18 @@
<<set $Schoolteacher = $slaves[_FLs]>>
<</if>>
-<<if ($schoolroomSlaves > 0)>>
- <<set _restedSlaves = 0>>
+<<set _restedSlaves = 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $SchlRiIDs[_dI].Index, $i = _i>>
<<set $slaves[_i].devotion += _devBonus>>
<<if ($slaves[_i].health < -80)>>
- <<set $slaves[_i].health += 20>>
+ <<set $slaves[_i].health += 20>>
<<elseif ($slaves[_i].health < -40)>>
- <<set $slaves[_i].health += 10>>
+ <<set $slaves[_i].health += 10>>
<<elseif ($slaves[_i].health < 0)>>
- <<set $slaves[_i].health += 7>>
+ <<set $slaves[_i].health += 7>>
<<elseif ($slaves[_i].health < 90)>>
- <<set $slaves[_i].health += 3>>
+ <<set $slaves[_i].health += 3>>
<</if>>
/% Education done? Has to be here before we run the SA's or there will be double entries for slave %/
<<if ($slaves[_i].intelligenceImplant == 1)>>
@@ -217,7 +190,8 @@
<<if ($slaves[_i].entertainSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[_i].entertainSkill > 10))>>
<<if ($slaves[_i].analSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[_i].analSkill > 10))>>
<<if ($slaves[_i].vaginalSkill > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[_i].vaginalSkill > 10)) || ($slaves[_i].vagina < 0)>>
- <<removeJob $slaves[_i] "schoolroom">>
+ ''__@@.pink;$slaves[_i].slaveName@@__'' can learn little from further classes, so @@.yellow;her assignment has defaulted to rest.@@
+ <<removeJob $slaves[_i] "learn in the schoolroom">>
<<set _restedSlaves++, _dI--, _DL-->>
<<continue>>
<</if>>
@@ -239,14 +213,7 @@
''__@@.pink;$slaves[$i].slaveName@@__'' is studying in $schoolroomName.
<br> She <<include "SA take classes">>
<br>
- <<if $slaves[_i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[$i].devotion <= 20)>>
- <<set $slaves[_i].devotion -= 5>>
- <<else>>
- <<set $slaves[_i].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -256,14 +223,7 @@
<<else>>
<<silently>>
<<include "SA take classes">>
- <<if $slaves[_i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[_i].devotion <= 20)>>
- <<set $slaves[_i].devotion -= 5>>
- <<else>>
- <<set $slaves[_i].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -273,18 +233,17 @@
<</silently>>
<</if>>
<</for>>
- <<if (_restedSlaves > 0)>>
- <br><br>
- <<if (_restedSlaves == 1)>>
- One slave has
- <<else>>
- _restedSlaves slaves have
- <</if>>
- @@.green;learned@@ all they can, and will be released from the schoolroom before the end of the week.
- <</if>>
- <<if $schoolroomDecoration != "standard">>
- $schoolroomNameCaps's $schoolroomDecoration atmosphere @@.hotpink;has a minor impact on the students.@@
+<<if (_restedSlaves > 0)>>
+ <br><br>
+ <<if (_restedSlaves == 1)>>
+ One slave has
+ <<else>>
+ _restedSlaves slaves have
<</if>>
+ @@.green;learned@@ all they can, and will be released from the schoolroom before the end of the week.
+<</if>>
+<<if $schoolroomDecoration != "standard">>
+ $schoolroomNameCaps's $schoolroomDecoration atmosphere @@.hotpink;has a minor impact on the students.@@
<</if>>
<<if $schoolroomSlaves || $Schoolteacher>>
<br><br>
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index 7293ac30f24baa7902c152b6cf56054113ced8fb..e5cfc0a2aa0312422364b15692e7b8a51a317a22 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -52,12 +52,11 @@ This week's pit fight is between $fighterOne.slaveName and $fighterTwo.slaveName
They @@.green;passionately approve@@ of your hosting lethal combat between slaves; this advances ideas from antiquity about what public events should be.
<<set $rep += 20*$FSSingleSlaveRep*($arcologies[0].FSRomanRevivalist/$FSLockinLevel)>>
<<set $arcologies[0].FSRomanRevivalist += 0.4*$FSSingleSlaveRep>>
-<<else $arcologies[0].FSAztecRevivalist != "unset">>
+<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
They @@.green;approve@@ of your hosting lethal combat; this advances ideas that blood must flow as it did in ancient times.
<<set $rep += 10*$FSSingleSlaveRep*($arcologies[0].FSAztecRevivalist/$FSLockinLevel)>>
<<set $arcologies[0].FSAztecRevivalist += 0.2*$FSSingleSlaveRep>>
<</if>>
-
You review the rules - the combatants will use their choice of swords, and the fight will be to the death, with both combatants executed if no decision is reached. The winner will earn two complete days of rest, not to mention continued life. You take a moment to look over your girls before giving the word. After all, it's the last time you'll be seeing one of them alive.
<</nobr>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 4bff37130225a57469507b1e123cedbc79a35c23..d3fdc84ad6af0e05f0b03f501b2ca9abcd6a3519 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -32,7 +32,7 @@ You prepare her for sale. Her response to being put up for purchase is
<<set $seed = []>>
<<if $arcologies[0].FSRomanRevivalist > 20>>
<<set $seed.push("roman")>>
-<<if $arcologies[0].FSAztecRevivalist > 20>>
+<<elseif $arcologies[0].FSAztecRevivalist > 20>>
<<set $seed.push("aztec")>>
<<elseif $arcologies[0].FSEgyptianRevivalist > 20>>
<<set $seed.push("egyptian")>>
@@ -87,8 +87,7 @@ A reputable slave appraiser arrives promptly to inspect her and certify her qual
<<elseif $arcologies[0].FSAztecRevivalist >= $FSLockinLevel*0.6>>
"Sanctity,
<<else>>
- <<if $PC.title == 1>>
- "Your Greantess,
+ "Your Greatness,
<</if>>
<</if>>
I have appraised your slave. My appraisal is based on her potential income in a brothel, with modification for her special qualities. I have found the following.
@@ -544,7 +543,7 @@ A reputable slave appraiser arrives promptly to inspect her and certify her qual
<</if>>
<</if>> /* CLOSES APPRAISAL */
-<</if>>
+<</if>> /* closes breeding mark */
<</nobr>>
@@ -1050,7 +1049,7 @@ __Bids Received__\
<<if $activeSlave.devotion > 20>>
<<if $activeSlave.height > 180>>
<<if random(1,100) > 60>>
- <br>''¤<<print 500*Math.trunc(($slaveCost*1.35)/500)>>'' from an prominent citizen who keeps a large harem of lithe, muscular girls to bear him children.
+ <br>''¤<<print 500*Math.trunc(($slaveCost*1.35)/500)>>'' from a prominent citizen who keeps a large harem of lithe, muscular girls to bear him children.
<<link "Accept bid">>
<<set $cash += 500*Math.trunc(($slaveCost*1.35)/500)>>
<<set $buyer = "D shorty breeder">>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index a3bdedb6a91d6c443fbf944f48b563ae59fb0306..df9e1fabae2716738951275d11275a34fe1f4c5f 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -3,21 +3,21 @@
<<set $stewardessBonus = 0, _FLsFetish = 0, _DL = $ServQiIDs.length, $servantsQuartersSlaves = _DL, _SL = $slaves.length, _FLs = -1>>
<<for _dI = 0; _dI < _DL; _dI++>>
-<<set _i = $ServQiIDs[_dI].Index, _ID = $ServQiIDs[_dI].ID>>
-<<if _i >= _SL || _ID != $slaves[_i].ID>>
- /% Slaves.ID and $ServQiIDs.ID's don't match-up so let's find her %/
- <<for _i = 0; _i < _SL; _i++>>
- <<if _ID == $slaves[_i].ID>>
- /% Correct the Index %/
- <<set $ServQiIDs[_dI].Index = _i>>
- <<break>>
+ <<set _i = $ServQiIDs[_dI].Index, _ID = $ServQiIDs[_dI].ID>>
+ <<if _i >= _SL || _ID != $slaves[_i].ID>>
+ /% Slaves.ID and $ServQiIDs.ID's don't match-up so let's find her %/
+ <<for _i = 0; _i < _SL; _i++>>
+ <<if _ID == $slaves[_i].ID>>
+ /% Correct the Index %/
+ <<set $ServQiIDs[_dI].Index = _i>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<if _i >= _SL || $slaves[_i].assignment != "work as a servant">>
+ <<set $ServQiIDs.deleteAt(_dI), _dI--, _DL-->>
+ <<continue>>
<</if>>
- <</for>>
-<</if>>
-<<if _i >= _SL || $slaves[_i].assignment != "work as a servant">>
- <<set $ServQiIDs.deleteAt(_dI), _dI--, _DL-->>
- <<continue>>
-<</if>>
<</for>>
<<SlaveSort $ServQiIDs>>
@@ -29,52 +29,52 @@
<<if ($Stewardess != 0)>>
<<for _FLs = 0; _FLs < _SL; _FLs++>>
- <<if $slaves[_FLs].ID == $Stewardess.ID>>
- <<break>>
- <</if>>
+ <<if $slaves[_FLs].ID == $Stewardess.ID>>
+ <<break>>
+ <</if>>
<</for>>
<<set $slaves[_FLs].devotion += _devBonus, $i = _FLs>>
<<if ($slaves[_FLs].health < -80)>>
- <<set $slaves[_FLs].health += 20>>
+ <<set $slaves[_FLs].health += 20>>
<<elseif ($slaves[_FLs].health < -40)>>
- <<set $slaves[_FLs].health += 15>>
+ <<set $slaves[_FLs].health += 15>>
<<elseif ($slaves[_FLs].health < 0)>>
- <<set $slaves[_FLs].health += 10>>
+ <<set $slaves[_FLs].health += 10>>
<<elseif ($slaves[_FLs].health < 90)>>
- <<set $slaves[_FLs].health += 7>>
+ <<set $slaves[_FLs].health += 7>>
<</if>>
<<if $slaves[_FLs].devotion <= 60>>
- <<set $slaves[_FLs].devotion++>>
+ <<set $slaves[_FLs].devotion++>>
<</if>>
<<if $slaves[_FLs].trust < 60>>
- <<set $slaves[_FLs].trust++>>
+ <<set $slaves[_FLs].trust++>>
<</if>>
<<if $slaves[_FLs].fetishStrength <= 95>>
- <<if $slaves[_FLs].fetish != "dom">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "dom">>
+ <<if $slaves[_FLs].fetish != "dom">>
+ <<fetishChangeChance $slaves[_FLs]>>
+ <<if $fetishChangeChance > random(0,100)>>
+ <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "dom">>
+ <</if>>
+ <<elseif $slaves[_FLs].fetishKnown == 0>>
+ <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
+ <<else>>
+ <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
<</if>>
- <<elseif $slaves[_FLs].fetishKnown == 0>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
- <<else>>
- <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
<</if>>
- <</if>>
- <<set $Stewardess = $slaves[_FLs]>>
- $Stewardess.slaveName is serving as your stewardess.<<if $Stewardess.relationship == -3>> She does her best to be your perfect housewife.<</if>>
+ <<set $Stewardess = $slaves[_FLs], $i = _FLs>>
+ $Stewardess.slaveName is serving as your Stewardess.<<if $Stewardess.relationship == -3>> She does her best to be your perfect housewife.<</if>>
<<if ($stewardessImpregnates == 1) && ($servantsQuartersSlaves > 0) && (canPenetrate($Stewardess)) && $Stewardess.pubertyXY == 1>>
<<set _stewardessImpregnated = 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $ServQiIDs[_dI].Index>>
- <<if (canGetPregnant($slaves[_i])) && canBreed($slaves[_i], $Stewardess)>>
+ <<if (canImpreg($slaves[_i], $Stewardess))>>
<<set $slaves[_i].preg = 1, $slaves[_i].pregSource = $Stewardess.ID, $slaves[_i].vagina = Math.clamp($slaves[_i].vagina,1,10), _stewardessImpregnated++, $slaves[_i].vaginalCount += 10, $vaginalTotal += 10>>
<</if>>
<</for>>
<<if _stewardessImpregnated > 0>>
- It's her responsibility to keep her charges pregnant, and
+ It's her responsibility to keep her charges pregnant, so
<<if _stewardessImpregnated == 1>>
- she cums in the fertile one's pussy all week.
+ she cums in the only fertile slave's pussy all week.
<<else>>
she ensures the _stewardessImpregnated fertile servants are full of her cum at all times.
<</if>>
@@ -87,7 +87,7 @@
Having a legion of girls jumping to obey her daily commands @@.lightsalmon;makes her more dominant.@@
<</if>>
<<if ($Stewardess.health < 10)>>
- Though $Stewardess.slaveName tries to watch the servants, her lack of good health inhibits her.
+ Though she tries to watch the servants, her lack of good health inhibits her.
<<elseif ($Stewardess.health < 80)>>
<<set $stewardessBonus += 50>>
Her good health allows her to work long hours and @@.yellowgreen;drive@@ the servants hard.
@@ -107,33 +107,34 @@
<<set $stewardessBonus += 25*$Stewardess.intelligence>>
She's smart enough that she misses very little.
<</if>>
- <<if $servantsQuartersSlaves > 0>>
- <<if ($Stewardess.energy > 95) || (($Stewardess.fetishKnown == 1) && ($Stewardess.fetish == "dom"))>>
- <<set _BonusToggle = 1>>
- <<else>>
- <<set _BonusToggle = 0>>
- <</if>>
+ <<if ($Stewardess.energy > 95) || (($Stewardess.fetishKnown == 1) && ($Stewardess.fetish == "dom"))>>
+ <<set _BonusToggle = 1>>
+ <<else>>
+ <<set _BonusToggle = 0>>
+ <</if>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $ServQiIDs[_dI].Index>>
- <<if $familyTesting == 1>>
- <<if $slaves[_i].mother == $Stewardess.ID>>
- She pays special attention to her daughter, $slaves[_i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[_i].trust++>>
+ <<if $Stewardess.rivalryTarget == $slaves[_i].ID>>
+ She bears down on her <<if $Stewardess.rivalry == 1>>growing rival<<elseif $Stewardess.rivalry == 2>>rival<<elseif $Stewardess.rivalry == 3>>bitter rival<</if>>, $slaves[_i].slaveName, forcing her to work extra hard or suffer punishment.
+ <<set $slaves[_i].devotion--, $slaves[_i].trust-->>
+ <<if random(1,100) > 65>>
+ <<set $Stewardess.rivalry++, $slaves[_FLs].rivalry++, $slaves[_i].rivalry++>>
<</if>>
- <<if $slaves[_i].father == $Stewardess.ID>>
+ <<elseif $Stewardess.relationshipTarget == $slaves[_i].ID>>
+ She dotes over her <<if $Stewardess.relationship == 1>>friend<<elseif $Stewardess.relationship == 2>>best friend<<elseif $Stewardess.relationship == 3>>friend with benefits<<elseif $Stewardess.relationship == 4>>lover<<elseif $Stewardess.relationship == 5>>slave wife<</if>>, $slaves[_i].slaveName, making sure she knows how to do a good job and keeping her well stocked with everything she needs.
+ <<set $slaves[_i].devotion++>>
+ <<elseif $familyTesting == 1 && totalRelatives($slaves[_i]) > 0>>
+ <<if $slaves[_i].mother == $Stewardess.ID || $slaves[_i].father == $Stewardess.ID>>
She pays special attention to her daughter, $slaves[_i].slaveName, making sure she doesn't slack off just because they are related.
<<set $slaves[_i].trust++>>
- <</if>>
- <<if $slaves[_i].ID == $Stewardess.father>>
- She pays special attention to her father, $slaves[_i].slaveName, making sure she doesn't slack off just because they are related.
- <<set $slaves[_i].trust++>>
- <</if>>
- <<if $slaves[_i].ID == $Stewardess.mother>>
+ <<elseif $slaves[_i].ID == $Stewardess.mother>>
She pays special attention to her mother, $slaves[_i].slaveName, making sure she doesn't slack off just because they are related.
<<set $slaves[_i].trust++>>
- <</if>>
- <<if areSisters($slaves[_i], $Stewardess) == 1>>
- She pays special attention to her twin, $slaves[_i].slaveName, making sure she doesn't slack off just because they are related.
+ <<elseif $slaves[_i].ID == $Stewardess.father>>
+ She pays special attention to her father, $slaves[_i].slaveName, making sure she doesn't slack off just because they are related.
+ <<set $slaves[_i].trust++>>
+ <<elseif areSisters($slaves[_i], $Stewardess) == 1>>
+ She pays special attention to her twin sister, $slaves[_i].slaveName, making sure she doesn't slack off just because they are related.
<<set $slaves[_i].trust++>>
<<elseif areSisters($slaves[_i], $Stewardess) == 2>>
She pays special attention to her sister, $slaves[_i].slaveName, making sure she doesn't slack off just because they are related.
@@ -142,23 +143,10 @@
She pays special attention to her half-sister, $slaves[_i].slaveName, making sure she doesn't slack off just because they are related.
<<set $slaves[_i].trust++>>
<</if>>
- <<else>>
- <<if $Stewardess.relationTarget == $slaves[_i].ID>>
+ <<elseif $Stewardess.relationTarget == $slaves[_i].ID && $familyTesting == 0>>
She pays special attention to her $slaves[_i].relation, $slaves[_i].slaveName, making sure she doesn't slack off just because they are related.
<<set $slaves[_i].trust++>>
<</if>>
- <</if>> /* closes family mode */
- <<if $Stewardess.relationshipTarget == $slaves[_i].ID>>
- She dotes over her <<if $Stewardess.relationship == 1>>friend<<elseif $Stewardess.relationship == 2>>best friend<<elseif $Stewardess.relationship == 3>>friend with benefits<<elseif $Stewardess.relationship == 4>>lover<<elseif $Stewardess.relationship == 5>>slave wife<</if>>, $slaves[_i].slaveName, making sure she is knows how to do a good job and keeps her well stocked with everything she needs.
- <<set $slaves[_i].devotion++>>
- <</if>>
- <<if $Stewardess.rivalryTarget == $slaves[_i].ID>>
- She bears down on her <<if $Stewardess.rivalry == 1>>growing rival<<elseif $Stewardess.rivalry == 2>>rival<<elseif $Stewardess.rivalry == 3>>bitter rival<</if>>, $slaves[_i].slaveName, forcing her to work extra hard or suffer punishment.
- <<set $slaves[_i].devotion--, $slaves[_i].trust-->>
- <<if random(1,100) > 65>>
- <<set $Stewardess.rivalry++, $slaves[_FLs].rivalry++, $slaves[_i].rivalry++>>
- <</if>>
- <</if>>
<<switch $slaves[_i].prestigeDesc>>
<<case "She is a famed Free Cities whore, and commands top prices.">>
She does her best to motivate the famous whore, $slaves[_i].slaveName, though she is uncertain why she is here.
@@ -167,14 +155,14 @@
<<case "She is remembered for winning best in show as a cockmilker.">>
$slaves[_i].slaveName leaves a trail of cum wherever she goes and frequently stops to masturbate greatly annoying $Stewardess.slaveName.
<<if random(1,100) > 90 && $Stewardess.rivalry == 0 && $slaves[_i].rivalry == 0>>
- <<set $Stewardess.rivalryTarget = $slaves[_i].ID, $Stewardess.rivalry++, $slaves[_FLs].rivalryTarget = $slaves[_i].ID, $slaves[_FLs].rivalry++>>
- <<set $slaves[_i].rivalryTarget = $Stewardess.ID, $slaves[_i].rivalry++>>
+ <<set $Stewardess.rivalryTarget = $slaves[_i].ID, $Stewardess.rivalry++, $slaves[_FLs].rivalryTarget = $slaves[_i].ID, $slaves[_FLs].rivalry++>>
+ <<set $slaves[_i].rivalryTarget = $Stewardess.ID, $slaves[_i].rivalry++>>
<</if>>
<<case "She is remembered for winning best in show as a dairy cow.">>
$slaves[_i].slaveName's huge breasts frequently get in the way of her work and she leaks milk everywhere, greatly annoying $Stewardess.slaveName.
<<if random(1,100) > 90 && $Stewardess.rivalry == 0 && $slaves[_i].rivalry == 0>>
- <<set $Stewardess.rivalryTarget = $slaves[_i].ID, $Stewardess.rivalry++, $slaves[_FLs].rivalryTarget = $slaves[_i].ID, $slaves[_FLs].rivalry++>>
- <<set $slaves[_i].rivalryTarget = $Stewardess.ID, $slaves[_i].rivalry++>>
+ <<set $Stewardess.rivalryTarget = $slaves[_i].ID, $Stewardess.rivalry++, $slaves[_FLs].rivalryTarget = $slaves[_i].ID, $slaves[_FLs].rivalry++>>
+ <<set $slaves[_i].rivalryTarget = $Stewardess.ID, $slaves[_i].rivalry++>>
<</if>>
<<case "She is remembered for winning best in show as a breeder.">>
<<if $slaves[_i].preg > 20>>
@@ -185,6 +173,7 @@
<<set $slaves[_i].devotion += 5>>
<</if>>
<</for>>
+ <<if ($servantsQuartersSlaves > 0)>>
<<if ($Stewardess.fetishKnown == 1) && ($Stewardess.fetish == "dom")>>
She walks among the cowering servants as a queen among peasants, playing the role of dominant to perfection and increasing her charges' @@.hotpink;obedience.@@
<<elseif ($Stewardess.energy > 95)>>
@@ -205,6 +194,7 @@
<</if>>
<<if ($Stewardess != 0)>>
+ <<set $i = _FLs>> /* apply following SA passages to facility leader */
<<if $showEWD != 0>>
<br><br>
/* 000-250-006 */
@@ -214,16 +204,9 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;$slaves[_FLs].slaveName@@__'' is serving as your stewardess.
+ ''__@@.pink;$slaves[_FLs].slaveName@@__'' is serving as your Stewardess.
<br>
- <<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[_FLs].devotion <= 20)>>
- <<set $slaves[_FLs].devotion -= 5>>
- <<else>>
- <<set $slaves[_FLs].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -232,14 +215,7 @@
<br><<include "SA devotion">>
<<else>>
<<silently>>
- <<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[_FLs].devotion <= 20)>>
- <<set $slaves[_FLs].devotion -= 5>>
- <<else>>
- <<set $slaves[_FLs].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -251,30 +227,30 @@
<<set $Stewardess = $slaves[_FLs]>>
<</if>>
-<<if $servantsQuartersSlaves > 0>>
- <<set $servantMilkersMultiplier = 0.5, _SQMilk = 0, _SQMilkSale = 0>>
+<<set $servantMilkersMultiplier = 0.5, _SQMilk = 0, _SQMilkSale = 0>>
+
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $ServQiIDs[_dI].Index, $i = _i, $slaves[_i].devotion += _devBonus>>
<<if ($slaves[_i].devotion <= 20) && ($slaves[_i].trust > -20)>>
- <<set $slaves[_i].devotion -= 5, $slaves[_i].trust -= 5>>
+ <<set $slaves[_i].devotion -= 5, $slaves[_i].trust -= 5>>
<<elseif ($slaves[_i].devotion < 2)>>
- <<set $slaves[_i].devotion += 2>>
+ <<set $slaves[_i].devotion += 2>>
<<elseif ($slaves[_i].devotion > 3)>>
- <<set $slaves[_i].devotion -= 2>>
+ <<set $slaves[_i].devotion -= 2>>
<</if>>
<<if ($slaves[_i].trust < -50)>>
- <<set $slaves[_i].trust += 2>>
+ <<set $slaves[_i].trust += 2>>
<<elseif ($slaves[_i].trust < -6)>>
- <<set $slaves[_i].trust += 1>>
+ <<set $slaves[_i].trust += 1>>
<</if>>
<<if ($slaves[_i].health < -80)>>
- <<set $slaves[_i].health += 20>>
+ <<set $slaves[_i].health += 20>>
<<elseif ($slaves[_i].health < -40)>>
- <<set $slaves[_i].health += 10>>
+ <<set $slaves[_i].health += 10>>
<<elseif ($slaves[_i].health < 0)>>
- <<set $slaves[_i].health += 7>>
+ <<set $slaves[_i].health += 7>>
<<elseif ($slaves[_i].health < 90)>>
- <<set $slaves[_i].health += 3>>
+ <<set $slaves[_i].health += 3>>
<</if>>
<<if $showEWD != 0>>
<br><br>
@@ -292,14 +268,7 @@
<<set _SQMilk += $milk, _SQMilkSale += $milkSale>>
<</if>>
<br>
- <<if $slaves[_i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[_i].devotion <= 20)>>
- <<set $slaves[_i].devotion -= 5>>
- <<else>>
- <<set $slaves[_i].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -313,14 +282,7 @@
<<include "SA get milked">>
<<set _SQMilk += $milk, _SQMilkSale += $milkSale>>
<</if>>
- <<if $slaves[_i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[_i].devotion <= 20)>>
- <<set $slaves[_i].devotion -= 5>>
- <<else>>
- <<set $slaves[_i].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -330,26 +292,20 @@
<</silently>>
<</if>>
<</for>>
- <<if _SQMilk || $servantsQuartersDecoration != "standard">>
- <br><br>
- <</if>>
+
+<<if _SQMilk || $servantsQuartersDecoration != "standard">>
+ <br><br>
<<if _SQMilk > 0>>
Since your lactating servants spend most of their time working in the penthouse, they use the milkers there, giving _SQMilk liters of milk over the week, which is sold for @@.yellowgreen;¤_SQMilkSale.@@
<</if>>
- <<if $servantsQuartersDecoration != "standard">>
- $servantsQuartersNameCaps's $servantsQuartersDecoration atmosphere @@.hotpink;has a minor impact on your servants.@@
- <</if>>
-
- <<set $servantMilkersMultiplier = 1, $repGain += $servantsQuartersSlaves*20>>
+<</if>>
- <<if $servantsQuarters < $servantsQuartersSlaves>>
- <<set $servantsQuartersSpots = 0>>
- <<else>>
- <<set $servantsQuartersSpots = $servantsQuarters - $servantsQuartersSlaves>>
- <</if>>
-<<else>>
- <<set $servantsQuartersSpots = $servantsQuarters>>
+<<if $servantsQuartersDecoration != "standard">>
+ $servantsQuartersNameCaps's $servantsQuartersDecoration atmosphere @@.hotpink;has a minor impact on your servants.@@
<</if>>
+
+<<set $servantMilkersMultiplier = 1, $repGain += $servantsQuartersSlaves*20>>
+
<<if $servantsQuartersSlaves || $Stewardess>>
<br><br>
<</if>>
diff --git a/src/uncategorized/shops.tw b/src/uncategorized/shops.tw
index 5733e576888ab623ebd586b05189807dede28de0..9c9f7c28ce3ae980219366b15d48d6b31f8b2911 100644
--- a/src/uncategorized/shops.tw
+++ b/src/uncategorized/shops.tw
@@ -26,7 +26,7 @@ This is a section of the promenade
<span id="result"><<link "Try a round">><<replace "#result">>You decide to put in an appearance at a tenant business and show off your skills, and the torture parlors are very eager to have you accept a complimentary round. You select a pretty girl sent to a torture parlor for some unknown failing by her owner, and use a switch to flog her calves, inner thighs, and breasts until she loses control of her bladder. <<if $PC.slaving >= 100>>You're skilled at this. The trick is to stop just short of blows that will break the skin, applying all possible pain without any inconvenient blood.<<else>>There's a bit of blood, but her owner will expect that.<</if>><</replace>><</link>></span>
<<case "Body Purist">>
dedicated to Body Purism. There are high end clinics for citizens, with medical specialists skilled in the latest longevity treatments. Shops offer beauty treatments, anti-aging products, and personal massage services. The slave masseuses are naturally beautiful, and their bodies are obviously part of the services offered.
- <span id="result"><<link "Get a massage">><<replace "#result">>You decide to put in an appearance at a tenant business, and the massage parlors are of course very eager to offer you complimentary services. The masseuse is very well-trained, and not at all a sex toy with poor massage skills as an veneer for handjob services. She releases the muscle soreness from your latest workout, and uses her delicate touch to bring you to an enjoyable orgasm; she <<if $PC.dick == 1>>catches your cum in her mouth and swallows it<<else>>swallows your femcum<</if>> with every appearance of appetite.<</replace>><</link>></span>
+ <span id="result"><<link "Get a massage">><<replace "#result">>You decide to put in an appearance at a tenant business, and the massage parlors are of course very eager to offer you complimentary services. The masseuse is very well-trained, and not at all a sex toy with poor massage skills as a veneer for handjob services. She releases the muscle soreness from your latest workout, and uses her delicate touch to bring you to an enjoyable orgasm; she <<if $PC.dick == 1>>catches your cum in her mouth and swallows it<<else>>swallows your femcum<</if>> with every appearance of appetite.<</replace>><</link>></span>
<<case "Transformation Fetishist">>
dedicated to Transformation Fetishism. Autosurgeries are expensive, and require a lot of infrastructure, so almost all of your citizens have to send their slaves to clinics for surgical transformation. These establishments attempt to differentiate themselves by specializing in different surgeries, and advertising what they're best at.
<span id="result"><<link "Shop around">><<replace "#result">>You decide to shop around the best surgery clinics, to put in an appearance and check out the latest developments available to citizens less exalted than yourself. The slave salesgirls are all heavily modified silicone bimbos, with an emphasis on whatever their owner's surgical specialty is. The lip specialists' salesgirls have facepussies so huge they can't talk at all, so they wear touchscreens around their necks that do the talking for them.<</replace>><</link>></span>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 248864cc83c53c8221c753254addaec0b44c0fc8..952cef11019bc7459c1cc13b910d3f8000a5cefd 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -548,7 +548,7 @@
<</if>>
<</for>>
<<if ($seed == 1)>>
- Her willingness to obey will be tested. Her life will be forfeit, a fate many others@@.gold;fear might befall them@@, if she does not perform.
+ Her willingness to obey will be tested. Her life will be forfeit, a fate many others @@.gold;fear might befall them@@, if she does not perform.
<</if>>
<<case "egyptian revivalist arcology">>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index d60aa1a076fb4efa52089e2280ccd90fe7a71f02..f82e649ed462bc3039a70f1af1396b9d782d781f 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -10,9 +10,9 @@
<<case "Main">>
<<if _Slave.assignmentVisible != 1>><<continue>><</if>>
<<if (_Slave.choosesOwnClothes == 1) && (_Slave.clothes == "choosing her own clothes")>>
- <<set $i = _i>>
+ <<set $i = _i, _oldDevotion = _Slave.devotion>>
<<silently>><<include "SA chooses own clothes">><</silently>>
- <<set _Slave = $slaves[_i]>>
+ <<set $slaves[_i].devotion = _oldDevotion, _Slave = $slaves[_i]>> /* restore devotion value so repeatedly changing clothes isn't an exploit */
<</if>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
<<if "be your Head Girl" == _Slave.assignment>>''HG''
@@ -1364,7 +1364,7 @@ Release rules: _Slave.releaseRules.
<<case "Roman Revivalist">>
Rom Rev
<<case "Aztec Revivalist">>
- Atz Rev
+ Azt Rev
<<case "Arabian Revivalist">>
Ara Rev
<<case "slave" "none" "">>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index 17d66d7d4d75fcf3eed0923dbf7ed8613410d661..c42c1846338849edb2140c7df4a084e95666d51b 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -11,7 +11,7 @@ $spaNameCaps
<<case "Roman Revivalist">>
is built as a Roman bath. The flooring is pleasantly warm due to a modernized version of hypocaust heating, and is covered in mosaic depicting slaves enjoying sex.
<<case "Aztec Revivalist">>
- is built as a Aztec bathhouse. Water steams from the middle of the room and the idols by the door glisten with moisture from the thick with herbs and essences steamed air. There are no divisions for men or women, so everyone's allowed to look.
+ is built as an Aztec bathhouse. Steam rises from the pool in the middle of the room and the idols by the door glisten with moisture from the moist air thick with the scent of herbs and essences. There are no gender divisions, so everyone's allowed to look.
<<case "Egyptian Revivalist">>
is decorated like an Egyptian water garden. All but the hottest pools include aquatic plants around their edges, and the atmosphere is heavy with perfume.
<<case "Edo Revivalist">>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index d2e5210f08aaad71d77eb0aa072a45b3b8a615e2..734b1696f7400f9fe1cd52c6ab421cf2c003cd55 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -3,21 +3,21 @@
<<set _bonusToggle = 0, _healthBonus = 0, _idleBonus = 0, _restedSlaves = 0, _trustBonus = 0, _DL = $SpaiIDs.length, $spaSlaves = _DL, _SL = $slaves.length, _FLs = -1>>
<<for _dI = 0; _dI < _DL; _dI++>>
-<<set _i = $SpaiIDs[_dI].Index, _ID = $SpaiIDs[_dI].ID>>
-<<if _i >= _SL || _ID != $slaves[_i].ID>>
- /% Slaves.ID and $SpaiIDs.ID's don't match-up so let's find her %/
- <<for _i = 0; _i < _SL; _i++>>
- <<if _ID == $slaves[_i].ID>>
- /% Correct the Index %/
- <<set $SpaiIDs[_dI].Index = _i>>
- <<break>>
+ <<set _i = $SpaiIDs[_dI].Index, _ID = $SpaiIDs[_dI].ID>>
+ <<if _i >= _SL || _ID != $slaves[_i].ID>>
+ /% Slaves.ID and $SpaiIDs.ID's don't match-up so let's find her %/
+ <<for _i = 0; _i < _SL; _i++>>
+ <<if _ID == $slaves[_i].ID>>
+ /% Correct the Index %/
+ <<set $SpaiIDs[_dI].Index = _i>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<if _i >= _SL || $slaves[_i].assignment != "rest in the spa">>
+ <<set $SpaiIDs.deleteAt(_dI), _dI--, _DL-->>
+ <<continue>>
<</if>>
- <</for>>
-<</if>>
-<<if _i >= _SL || $slaves[_i].assignment != "rest in the spa">>
- <<set $SpaiIDs.deleteAt(_dI), _dI--, _DL-->>
- <<continue>>
-<</if>>
<</for>>
<<SlaveSort $SpaiIDs>>
@@ -29,37 +29,36 @@
<<if $Attendant != 0>>
<<for _FLs = 0; _FLs < _SL; _FLs++>>
- <<if $slaves[_FLs].ID == $Attendant.ID>>
- <<break>>
- <</if>>
+ <<if $slaves[_FLs].ID == $Attendant.ID>>
+ <<break>>
+ <</if>>
<</for>>
<<if ($slaves[_FLs].health < 100)>>
- <<set $slaves[_FLs].health += 20>>
+ <<set $slaves[_FLs].health += 20>>
<</if>>
<<if ($slaves[_FLs].devotion <= 60)>>
- <<set $slaves[_FLs].devotion++>>
+ <<set $slaves[_FLs].devotion++>>
<</if>>
<<if $slaves[_FLs].trust < 60>>
- <<set $slaves[_FLs].trust++>>
+ <<set $slaves[_FLs].trust++>>
<</if>>
<<set _FLsFetish = 0>>
<<if $slaves[_FLs].fetishStrength <= 95>>
- <<if $slaves[_FLs].fetish != "submissive">>
- <<fetishChangeChance $slaves[_FLs]>>
- <<if $fetishChangeChance > random(0,100)>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "submissive">>
+ <<if $slaves[_FLs].fetish != "submissive">>
+ <<fetishChangeChance $slaves[_FLs]>>
+ <<if $fetishChangeChance > random(0,100)>>
+ <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "submissive">>
+ <</if>>
+ <<elseif $slaves[_FLs].fetishKnown == 0>>
+ <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
+ <<else>>
+ <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
<</if>>
- <<elseif $slaves[_FLs].fetishKnown == 0>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
- <<else>>
- <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
- <</if>>
<</if>>
- <<set $slaves[_FLs].devotion += _devBonus>>
- <<set $Attendant = $slaves[_FLs], $i = _FLs>>
<<if ($Attendant.fetish == "none") || ($Attendant.fetish == "submissive")>>
<<set _devBonus++>>
<</if>>
+ <<set $slaves[_FLs].devotion += _devBonus, $Attendant = $slaves[_FLs], $i = _FLs>>
$Attendant.slaveName is serving as the spa attendant.<<if $Attendant.relationship == -3>> She tries her best to be your perfect attentive and caring wife.<</if>>
<<if (_FLsFetish == 1)>>
When she is paid a visit by a slave with sexual issues to work out, she provides her with an understanding, willing, giving partner. She finds real satisfaction in helping your slaves find sexual gratification, and @@.lightsalmon;becomes a submissive.@@
@@ -101,12 +100,12 @@
<<if ($slaves[_i].fetish == "mindbroken") && ($slaves[_i].health > 20) && (_attendantUsedCure == 0) && ($spaFix != 2)>>
<<set _attendantUsedCure = 1>>
<<if (random(1,100) > 90-$Attendant.devotion)>>
- <br> @@.green;Something almost miraculous has happened.@@ $Attendant.slaveName has always refused to believe that $slaves[_i].slaveName could not be reached, and has lavished patient tenderness on her in $spaName. $slaves[_i].slaveName has begun to respond, and is stirring from her mental torpor.
- <<set $slaves[_i].devotion = -3, $slaves[_i].sexualFlaw = "apathetic", $slaves[_i].behavioralFlaw = either("hates men", "odd"), $slaves[_i].fetish = "none", $slaves[_i].fetishKnown = 1>>
- <<if ($arcologies[0].FSPaternalist > 0)>>
- Society @@.green;strongly approves@@ of $slaves[_i].slaveName being restored to sanity, which advances ideals about enlightened slave ownership.
- <<set $repGain += 2*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel), $arcologies[0].FSPaternalist += 0.01*$FSSingleSlaveRep>>
- <</if>>
+ @@.green;Something almost miraculous has happened.@@ $Attendant.slaveName has always refused to believe that $slaves[_i].slaveName could not be reached, and has lavished patient tenderness on her in $spaName. $slaves[_i].slaveName has begun to respond, and is stirring from her mental torpor.
+ <<set $slaves[_i].devotion = -3, $slaves[_i].sexualFlaw = "apathetic", $slaves[_i].behavioralFlaw = either("hates men", "odd"), $slaves[_i].fetish = "none", $slaves[_i].fetishKnown = 1>>
+ <<if ($arcologies[0].FSPaternalist > 0)>>
+ Society @@.green;strongly approves@@ of $slaves[_i].slaveName being restored to sanity, which advances ideals about enlightened slave ownership.
+ <<set $repGain += 2*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel), $arcologies[0].FSPaternalist += 0.01*$FSSingleSlaveRep>>
+ <</if>>
<</if>>
<</if>>
<<set _seed = _bonusToggle * 10>>
@@ -123,31 +122,24 @@
She dedicates most of her attention to her <<if $Attendant.relationship == 1>>friend<<elseif $Attendant.relationship == 2>>best friend<<elseif $Attendant.relationship == 3>>friend with benefits<<elseif $Attendant.relationship == 4>>lover<<elseif $Attendant.relationship == 5>>slave wife<</if>>, $slaves[_i].slaveName, making her stress, both physical and mental, wash away.
<<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
<<elseif $familyTesting == 1 && totalRelatives($slaves[_i]) > 0>>
- <<if $slaves[_i].mother == $Attendant.ID>>
+ <<if $slaves[_i].mother == $Attendant.ID || $slaves[_i].father == $Attendant.ID>>
She makes sure to spend extra time caring for her daughter, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<if $slaves[_i].father == $Attendant.ID>>
- She makes sure to spend extra time caring for her daughter, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<if $slaves[_i].ID == $Attendant.father>>
- She makes sure to spend extra time caring for her father, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<if $slaves[_i].ID == $Attendant.mother>>
+ <<set $slaves[_i].trust++, $slaves[_i].health++>>
+ <<elseif $slaves[_i].ID == $Attendant.mother>>
She makes sure to spend extra time caring for her mother, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
- <</if>>
- <<if areSisters($slaves[_i], $Attendant) == 1>>
+ <<set $slaves[_i].trust++, $slaves[_i].health++>>
+ <<elseif $slaves[_i].ID == $Attendant.father>>
+ She makes sure to spend extra time caring for her father, $slaves[_i].slaveName.
+ <<set $slaves[_i].trust++, $slaves[_i].health++>>
+ <<elseif areSisters($slaves[_i], $Attendant) == 1>>
She makes sure to spend extra time caring for her twin sister, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
+ <<set $slaves[_i].trust++, $slaves[_i].health++>>
<<elseif areSisters($slaves[_i], $Attendant) == 2>>
She makes sure to spend extra time caring for her sister, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
+ <<set $slaves[_i].trust++, $slaves[_i].health++>>
<<elseif areSisters($slaves[_i], $Attendant) == 3>>
She makes sure to spend extra time caring for her half-sister, $slaves[_i].slaveName.
- <<set $slaves[_i].trust += 1>>
+ <<set $slaves[_i].trust++, $slaves[_i].health++>>
<</if>>
<<elseif $Attendant.relationTarget == $slaves[_i].ID && $familyTesting == 0>>
She makes sure to spend extra time caring for her $slaves[_i].relation, $slaves[_i].slaveName.
@@ -167,8 +159,8 @@
<<else>>
She does her best to accommodate $slaves[_i].slaveName's massive genitals and tends to her when ever she feels a need for release.
<<if random(1,100) > 65 && $Attendant.fetish == "none">>
- After taking several massive loads to the face, $Attendant.slaveName begins to find satisfaction in being coated in cum.
- <<set $Attendant.fetish = "cumslut", $slaves[_FLs].fetish = "cumslut">>
+ After taking several massive loads to the face, $Attendant.slaveName begins to find satisfaction in being coated in cum.
+ <<set $Attendant.fetish = "cumslut", $slaves[_FLs].fetish = "cumslut">>
<</if>>
<</if>>
<<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
@@ -178,9 +170,9 @@
<<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
<<else>>
She does her best to accommodate $slaves[_i].slaveName's massive breasts and tends to her when ever she feels a need for release.
- <<if $Attendant.fetish == "none" && random(1,100) > 65>>
- After multiple milking sessions, $Attendant.slaveName begins to find herself fantasizing about having giant milky breasts too.
- <<set $Attendant.fetish = "boobs", $slaves[_FLs].fetish = "boobs">>
+ <<if random(1,100) > 65 && $Attendant.fetish == "none">>
+ After multiple milking sessions, $Attendant.slaveName begins to find herself fantasizing about having giant milky breasts too.
+ <<set $Attendant.fetish = "boobs", $slaves[_FLs].fetish = "boobs">>
<</if>>
<</if>>
<<set $slaves[_i].devotion += 3, $slaves[_i].trust += 3>>
@@ -191,7 +183,7 @@
<<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
<<else>>
She does her best to accommodate $slaves[_i].slaveName's pregnancy and to make sure the mother-to-be is happy and comfortable.
- <<if random(1,100) > 65 && $Attendant.fetish is "none">>
+ <<if random(1,100) > 65 && $Attendant.fetish == "none">>
After massaging $slaves[_i].slaveName's growing belly multiple times, $Attendant.slaveName begins to find herself fantasizing about being swollen with life too.
<<set $Attendant.fetish to "pregnancy", $slaves[_FLs].fetish to "pregnancy">>
<</if>>
@@ -231,7 +223,7 @@
<<set $slaves[_i].behavioralQuirk = "advocate">>
<</switch>>
<<set $slaves[_i].behavioralFlaw = "none", _attendantUsedCure += 1>>
- <br> $Attendant.slaveName works carefully with $slaves[_i].slaveName, and successfully @@.green;softens her behavioral flaw@@ into an appealing quirk.
+ $Attendant.slaveName works carefully with $slaves[_i].slaveName, and successfully @@.green;softens her behavioral flaw@@ into an appealing quirk.
<</if>>
<<elseif $slaves[_i].sexualFlaw != "none">>
<<if random(1,100) > (100-($Attendant.intelligence*10)-_seed)>>
@@ -256,7 +248,7 @@
<<set $slaves[_i].sexualQuirk = "size queen">>
<</switch>>
<<set $slaves[_i].sexualFlaw = "none", _attendantUsedCure += 1>>
- <br> $Attendant.slaveName works carefully with $slaves[_i].slaveName, and successfully @@.green;softens her sexual flaw@@ into an appealing quirk.
+ $Attendant.slaveName works carefully with $slaves[_i].slaveName, and successfully @@.green;softens her sexual flaw@@ into an appealing quirk.
<</if>>
<</if>>
<</if>>
@@ -274,6 +266,7 @@
<</if>>
<<if $Attendant != 0>>
+ <<set $i = _FLs>> /* apply following SA passages to facility leader */
<<if $showEWD != 0>>
<br><br>
/* 000-250-006 */
@@ -283,16 +276,9 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;$slaves[$i].slaveName@@__'' is serving as the Attendant in the spa.
+ ''__@@.pink;$slaves[$i].slaveName@@__'' is serving as the Attendant in $spaName.
<br>
- <<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[_FLs].devotion <= 20)>>
- <<set $slaves[_FLs].devotion -= 5>>
- <<else>>
- <<set $slaves[_FLs].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -301,14 +287,7 @@
<br><<include "SA devotion">>
<<else>>
<<silently>>
- <<if $slaves[_FLs].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[_FLs].devotion <= 20)>>
- <<set $slaves[_FLs].devotion -= 5>>
- <<else>>
- <<set $slaves[_FLs].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -320,21 +299,21 @@
<<set $Attendant = $slaves[_FLs]>>
<</if>>
-<<if $spaSlaves > 0>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $SpaiIDs[_dI].Index, $i = _i>>
<<set $slaves[_i].devotion += _devBonus, $slaves[_i].trust += _trustBonus, $slaves[_i].health += _healthBonus>>
- <<if ($slaves[_i].devotion <= 60) && ($slaves[_i].trust < 60)>>
- <<set $slaves[_i].devotion++, $slaves[_i].trust++>>
- <<elseif ($slaves[_i].devotion < 40)>>
- <<set $slaves[_i].devotion += 10>>
+ <<if ($slaves[_i].devotion < 60) && ($slaves[_i].trust < 60)>>
+ <<set $slaves[_i].devotion++, $slaves[_i].trust++>>
<<elseif ($slaves[_i].trust < 40)>>
- <<set $slaves[_i].trust += 10>>
+ <<set $slaves[_i].trust += 10>>
+ <<elseif ($slaves[_i].devotion < 40)>>
+ <<set $slaves[_i].devotion += 10>>
<</if>>
- <<if ($slaves[_i].health < 100) && ($spaUpgrade == 1)>>
+ <<if ($spaUpgrade == 1) && ($slaves[_i].health < 20)>>
<<set $slaves[_i].health += 3>>
<</if>>
<<if ($slaves[_i].health >= 20) && ($slaves[_i].trust > 60) && ($slaves[_i].devotion > 60) && ($slaves[_i].fetish != "mindbroken") && ($slaves[_i].sexualFlaw == "none") && ($slaves[_i].behavioralFlaw == "none")>>
+ ''__@@.pink;$slaves[_i].slaveName@@__'' is feeling well enough to leave $spaName, so @@.yellow;her assignment has defaulted to rest@@.
<<removeJob $slaves[_i] "rest in the spa">>
<<set _restedSlaves++, _DL--, _dI-->>
<<continue>>
@@ -348,17 +327,10 @@
</div>
<</if>>
/* 000-250-006 */
- ''__@@.pink;$slaves[$i].slaveName@@__'' is resting in the spa.
+ ''__@@.pink;$slaves[$i].slaveName@@__'' is resting in $spaName.
<br> She <<include "SA rest">>
<br>
- <<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[$i].devotion <= 20)>>
- <<set $slaves[$i].devotion -= 5>>
- <<else>>
- <<set $slaves[$i].devotion++>>
- <</if>>
- <</if>>
<<include "SA diet">>
<<include "SA long term effects">>
<<include "SA drugs">>
@@ -367,14 +339,7 @@
<br><<include "SA devotion">>
<<else>>
<<silently>>
- <<if $slaves[$i].choosesOwnClothes == 1>>
<<include "SA chooses own clothes">>
- <<if ($slaves[$i].devotion <= 20)>>
- <<set $slaves[$i].devotion -= 5>>
- <<else>>
- <<set $slaves[$i].devotion++>>
- <</if>>
- <</if>>
<<include "SA rest">>
<<include "SA diet">>
<<include "SA long term effects">>
@@ -385,7 +350,7 @@
<</silently>>
<</if>>
<</for>>
- <<if (_restedSlaves > 0)>>
+<<if (_restedSlaves > 0)>>
<br><br>
<<if (_restedSlaves == 1)>>
One slave has rested until she reached a state of @@.hotpink;devotion@@ and @@.mediumaquamarine;trust@@ and will leave the spa before the end of the week.
@@ -395,7 +360,6 @@
<<if $spaDecoration != "standard">>
$spaNameCaps's $spaDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>her while she<<else>>them while they<</if>>@@ were resting.
<</if>>
- <</if>>
<</if>>
<<if $spaSlaves || $Attendant>>
<br><br>
diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw
index 30f3c1132ed8476a371a4420951077423c6dfc28..de517ca57a44b08e161caa71ba3feff9f4c8dcbc 100644
--- a/src/utility/assignWidgets.tw
+++ b/src/utility/assignWidgets.tw
@@ -68,8 +68,9 @@
<</for>>
<</if>>
- <<set $slaves[_wi] = $args[0]>> /* save changes to slave array */
-
+ <<if _wi < _SL>>
+ <<set $slaves[_wi] = $args[0]>> /* save changes to slave array */
+ <</if>>
<</if>> /* not Pit or Coursing Association */
<</widget>>
@@ -117,73 +118,84 @@
<</if>>
<</for>>
<</if>>
-
+
/% use .toLowerCase() to get rid of a few dupe conditions. %/
<<switch $args[1].toLowerCase()>>
<<case "be confined in the arcade" "arcade">>
+ <<set $args[0].assignment = "work a glory hole">>
<<for _i = 0; _i < $ArcadeiIDs.length; _i++>>
<<if $ArcadeiIDs[_i].ID == _wID>>
- <<set $ArcadeiIDs.deleteAt(_i), _i--, $arcadeSlaves--, $args[0].assignment = "work a glory hole">>
+ <<set $ArcadeiIDs.deleteAt(_i), _i--, $arcadeSlaves-->>
<</if>>
<</for>>
<<case "work in the brothel" "brothel">>
+ <<set $args[0].assignment = "whore">>
<<for _i = 0; _i < $BrothiIDs.length; _i++>>
<<if $BrothiIDs[_i].ID == _wID>>
- <<set $BrothiIDs.deleteAt(_i), _i--, $brothelSlaves--, $args[0].assignment = "whore">>
+ <<set $BrothiIDs.deleteAt(_i), _i--, $brothelSlaves-->>
<</if>>
<</for>>
<<case "be confined in the cellblock" "cellblock">>
+ <<set $args[0].assignment = "rest">>
<<for _i = 0; _i < $CellBiIDs.length; _i++>>
<<if $CellBiIDs[_i].ID == _wID>>
- <<set $CellBiIDs.deleteAt(_i), _i--, $cellblockSlaves--, $args[0].assignment = "rest">>
+ <<set $CellBiIDs.deleteAt(_i), _i--, $cellblockSlaves-->>
<</if>>
<</for>>
<<case "get treatment in the clinic" "clinic">>
+ <<set $args[0].assignment = "rest">>
<<for _i = 0; _i < $CliniciIDs.length; _i++>>
<<if $CliniciIDs[_i].ID == _wID>>
- <<set $CliniciIDs.deleteAt(_i), _i--, $clinicSlaves--, $args[0].assignment = "rest">>
+ <<set $CliniciIDs.deleteAt(_i), _i--, $clinicSlaves-->>
<</if>>
<</for>>
<<case "serve in the club" "club">>
+ <<set $args[0].assignment = "serve the public">>
<<for _i = 0; _i < $ClubiIDs.length; _i++>>
<<if $ClubiIDs[_i].ID == _wID>>
- <<set $ClubiIDs.deleteAt(_i), _i--, $clubSlaves--, $args[0].assignment = "serve the public">>
+ <<set $ClubiIDs.deleteAt(_i), _i--, $clubSlaves-->>
<</if>>
<</for>>
<<case "work in the dairy" "dairy">>
+ <<set $args[0].assignment = "get milked">>
<<for _i = 0; _i < $DairyiIDs.length; _i++>>
<<if $DairyiIDs[_i].ID == _wID>>
- <<set $DairyiIDs.deleteAt(_i), _i--, $dairySlaves--, $args[0].assignment = "get milked">>
- <</if>>
- <</for>>
- <<case "live with your head girl" "head girl suite" "hgsuite">>
- <<for _i = 0; _i < $HGSuiteiIDs.length; _i++>>
- <<if $HGSuiteiIDs[_i].ID == _wID>>
- <<set $HGSuiteiIDs.deleteAt(_i), _i--, $HGSuiteSlaves--, $args[0].assignment = "rest">>
- <</if>>
- <</for>>
- <<case "serve in the master suite" "master suite" "mastersuite">>
- <<for _i = 0; _i < $MastSiIDs.length; _i++>>
- <<if $MastSiIDs[_i].ID == _wID>>
- <<set $MastSiIDs.deleteAt(_i), _i--, $masterSuiteSlaves--, $args[0].assignment = "please you">>
+ <<set $DairyiIDs.deleteAt(_i), _i--, $dairySlaves-->>
<</if>>
<</for>>
<<case "learn in the schoolroom" "schoolroom">>
+ <<set $args[0].assignment = "rest">>
<<for _i = 0; _i < $SchlRiIDs.length; _i++>>
<<if $SchlRiIDs[_i].ID == _wID>>
- <<set $SchlRiIDs.deleteAt(_i), _i--, $schoolroomSlaves--, $args[0].assignment = "rest">>
+ <<set $SchlRiIDs.deleteAt(_i), _i--, $schoolroomSlaves-->>
+ <</if>>
+ <</for>>
+ <<case "rest in the spa" "spa">>
+ <<set $args[0].assignment = "rest">>
+ <<for _i = 0; _i < $SpaiIDs.length; _i++>>
+ <<if $SpaiIDs[_i].ID == _wID>>
+ <<set $SpaiIDs.deleteAt(_i), _i--, $spaSlaves-->>
<</if>>
<</for>>
<<case "work as a servant" "servants' quarters" "servantsquarters">>
+ <<set $args[0].assignment = "be a servant">>
<<for _i = 0; _i < $ServQiIDs.length; _i++>>
<<if $ServQiIDs[_i].ID == _wID>>
- <<set $ServQiIDs.deleteAt(_i), _i--, $servantsQuartersSlaves--, $args[0].assignment = "be a servant">>
+ <<set $ServQiIDs.deleteAt(_i), _i--, $servantsQuartersSlaves-->>
<</if>>
<</for>>
- <<case "rest in the spa" "spa">>
- <<for _i = 0; _i < $SpaiIDs.length; _i++>>
- <<if $SpaiIDs[_i].ID == _wID>>
- <<set $SpaiIDs.deleteAt(_i), _i--, $spaSlaves--, $args[0].assignment = "rest">>
+ <<case "serve in the master suite" "master suite" "mastersuite">>
+ <<set $args[0].assignment = "please you">>
+ <<for _i = 0; _i < $MastSiIDs.length; _i++>>
+ <<if $MastSiIDs[_i].ID == _wID>>
+ <<set $MastSiIDs.deleteAt(_i), _i--, $masterSuiteSlaves-->>
+ <</if>>
+ <</for>>
+ <<case "live with your head girl" "head girl suite" "hgsuite">>
+ <<set $args[0].assignment = "rest">>
+ <<for _i = 0; _i < $HGSuiteiIDs.length; _i++>>
+ <<if $HGSuiteiIDs[_i].ID == _wID>>
+ <<set $HGSuiteiIDs.deleteAt(_i), _i--, $HGSuiteSlaves-->>
<</if>>
<</for>>
<<case "be your head girl">>
@@ -204,7 +216,9 @@
<<set $args[0].assignmentVisible = 1, $args[0].choosesOwnAssignment = 0, $args[0].sentence = 0>>
- <<set $slaves[_wi] = $args[0]>>
+ <<if _wi < _SL>>
+ <<set $slaves[_wi] = $args[0]>> /* save changes to slave array */
+ <</if>>
<</if>>
<</widget>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 3fe37340e28c032a8f8f768acb14873ed0775959..93ca5cc10b8c517a9dd84f0a225f377314b3403d 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -6125,7 +6125,7 @@ $possessiveCap
<<case "a slutty qipao">>
is brushed back and ornamented with a little jade talisman.
<<case "a huipil">>
- is short and neat, giving $possesive an innocent look.
+ is short and neat, giving $possessive an innocent look.
<<case "restrictive latex" "a latex catsuit">>
is crammed under $possessive latex hood.
<<case "harem gauze">>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index c462560cf63c68bd44368c86cb370c0ab8f88635..f4596544da94a894788ec606091ef772120d4fd6 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1221,7 +1221,7 @@
<</if>>
<<elseif $args[0].entertainSkill <= 30>>
<<if $args[0].entertainSkill+$skillIncrease > 30>>
- @@.green;$pronounCap now has some skill as a entertainer,@@ and can flirt, dance, and strip acceptably.
+ @@.green;$pronounCap now has some skill as an entertainer,@@ and can flirt, dance, and strip acceptably.
<</if>>
<<elseif $args[0].entertainSkill <= 60>>
<<if $args[0].entertainSkill+$skillIncrease > 60>>
@@ -1339,6 +1339,14 @@
<<set $REReductionCheckinIDs.push($args[0].ID)>>
<</if>>
+<<set $slaves.push($args[0]), $slavesOriginal.push($args[0]), $genePool.push($args[0]), $i = $slaves.length>>
+
+/* add to facilities array if needed */
+<<if $args[0].assignment != "rest">>
+ <<assignJob $args[0] $args[0].assignment>>
+<</if>>
+
+/** do not run the Rules Assistant before adding the new slave to the slaves list! **/
<<if $ui != "start">>
<<if $universalRulesNewSlavesRA == 1>>
<<if $rulesAssistantAuto != 0>>
@@ -1350,13 +1358,6 @@
<</if>>
<</if>>
-<<set $slaves.push($args[0]), $slavesOriginal.push($args[0]), $genePool.push($args[0])>>
-
-<<switch $args[0].assignment>>
-<<case "work in the dairy" "be confined in the arcade">>
- <<assignJob $args[0] $args[0].assignment>>
-<</switch>>
-
<</widget>>
/%
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 8084390c0f4c2f8363ebe217b60df9c06a97a4a6..e172450806e05badd437c9a11862a8d9e381b5f2 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -2304,7 +2304,7 @@
<<if random(0,1) == 0>>
<<set $activeSlave.sexualQuirk = "unflinching">>
<</if>>
- <<elseif $arcologies[$i].FSAztecRevivalist > 20>>
+ <<elseif $arcologies[_market].FSAztecRevivalist > 20>>
They've seen sights that will traumatize almost anyone.
<<if random(0,1) == 0>>
<<set $activeSlave.trust = -30>>