From ad0b813395a48c111a64802d498b367256897a5c Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 10 May 2017 21:39:19 -0400
Subject: [PATCH] Vanilla updates and a def check for $titleEnunciate.
---
src/events/intro/terrainIntro.tw | 1 -
src/init/storyInit.tw | 9 -
.../personalNotes.tw | 2 +-
.../REresistantmotherdaughter.tw | 65 +++++
src/uncategorized/REroyalblood.tw | 236 ++++++++++++++++++
src/uncategorized/arcmgmt.tw | 2 +-
src/uncategorized/brothelReport.tw | 3 -
src/uncategorized/buySlaves.tw | 109 ++++----
src/uncategorized/corporateMarket.tw | 2 +-
src/uncategorized/corporationDevelopments.tw | 4 +-
src/uncategorized/costsReport.tw | 3 -
src/uncategorized/economics.tw | 2 +-
src/uncategorized/fsDevelopments.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 4 +-
src/uncategorized/neighborsDevelopment.tw | 2 +-
src/uncategorized/options.tw | 1 -
src/uncategorized/persBusiness.tw | 2 +-
src/uncategorized/randomNonindividualEvent.tw | 117 ++++++---
src/uncategorized/reputation.tw | 2 +-
src/uncategorized/storyCaption.tw | 4 +-
src/uncategorized/universalRules.tw | 2 +-
src/utility/assignWidgets.tw | 2 +-
src/utility/miscWidgets.tw | 6 +-
23 files changed, 469 insertions(+), 113 deletions(-)
rename src/{uncategorized => pregmod}/personalNotes.tw (99%)
create mode 100644 src/uncategorized/REresistantmotherdaughter.tw
create mode 100644 src/uncategorized/REroyalblood.tw
diff --git a/src/events/intro/terrainIntro.tw b/src/events/intro/terrainIntro.tw
index 2e720cc8c39..0d0f47577a6 100644
--- a/src/events/intro/terrainIntro.tw
+++ b/src/events/intro/terrainIntro.tw
@@ -1,6 +1,5 @@
:: Terrain Intro [nobr]
-<<unset $targetArcologies>>
<<if $targetArcology.type != "New">>
<<set $terrain = $targetArcology.terrain, $continent = $targetArcology.continent>>
<<switch $targetArcology.type>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 3030e932493..7b3021718aa 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -192,7 +192,6 @@
<<set $newModelUI = 1>>
<<set $seeArcology = 1>>
<<set $seeFCNN = 1>>
-<<set $seeBuy = 1>>
<<set $seeExtreme = 0>>
<<set $seeHyperPreg = 0>>
<<set $seeCircumcision = 1>>
@@ -267,7 +266,6 @@
<<set $headGirlTrainsParaphilias = 1>>
<<include "Init Rules">>
-<<set $autoSurgery = {lactation: 0, cosmetic: 1, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, hips: 0, hipsImplant: 0, butt: 0, faceShape: "normal", lips: 10, holes: 0}>>
<<else>>
<<if $freshPC == 0>>
@@ -302,7 +300,6 @@
<<set $independenceDay = 0>>
<<set $invasionVictory = 0>>
<<set $daughtersVictory = 0>>
-<<set $startingGirlCommitted = 0>>
<<set $startingGirlCopied = 0>>
<<set $archetyped = 0>>
@@ -356,9 +353,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $dairyNameCaps = "The Dairy">>
<<set $dairy = 0>>
<<set $cumSlaves = 0>>
-<<set $collectionFacilityUpgradeMilkers = 0>>
-<<set $collectionFacilityUpgradeRestraints = 0>>
-<<set $collectionFacility = 0>>
<<set $clubSlaves = 0>>
<<set $clubDecoration = "standard">>
<<set $clubUpgradePDAs = 0>>
@@ -424,7 +418,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $arcadeNameCaps = "The Arcade">>
<<set $arcade = 0>>
<<set $fuckdollsSold = 0>>
-<<set $fuckdollPrice = 3000>>
<<set $cellblockSlaves = 0>>
<<set $cellblockDecoration = "standard">>
<<set $cellblockUpgrade = 0>>
@@ -454,7 +447,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $fighterOne = 0>>
<<set $fighterTwo = 0>>
<<set $fighterIDs = []>>
-<<set $pitSlaves = 0>>
<<set $pitBG = 0>>
<<set $pitAudience = "none">>
<<set $pitLethal = 0>>
@@ -678,7 +670,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $assistant = 0>>
<<set $assistantPower = 0>>
<<set $economicUncertainty = 10>>
-<<set $assistantAnnounced = 0>>
<<set $assistantAppearance = "normal">>
<<set $assistantExtra1 = 0>>
<<set $assistantExtra2 = 0>>
diff --git a/src/uncategorized/personalNotes.tw b/src/pregmod/personalNotes.tw
similarity index 99%
rename from src/uncategorized/personalNotes.tw
rename to src/pregmod/personalNotes.tw
index ebaaf50db4d..49acfc6c97b 100644
--- a/src/uncategorized/personalNotes.tw
+++ b/src/pregmod/personalNotes.tw
@@ -1,6 +1,6 @@
:: Personal Notes [nobr]
-__Personal Notes__
+<<if $useTabs>>__Personal Notes__<</if>>
<br>
<<if ($playerAging != 0)>>Your birthday is <<if $PC.birthWeek is 51>>next week<<if $playerAging == 2>>; you'll be turning <<print $PC.actualAge+1>><</if>><<else>>in <<print 52-$PC.birthWeek>> weeks<</if>>.<</if>>
<<if $PC.career == "servant">>
diff --git a/src/uncategorized/REresistantmotherdaughter.tw b/src/uncategorized/REresistantmotherdaughter.tw
new file mode 100644
index 00000000000..50700ccd456
--- /dev/null
+++ b/src/uncategorized/REresistantmotherdaughter.tw
@@ -0,0 +1,65 @@
+:: RE resistant mother daughter [nobr]
+
+<<set $nextButton = "Continue">>
+<<set $nextLink = "RIE Eligibility Check">>
+
+$mother.slaveName and her daughter are both having trouble getting acclimated to your ownership, with their obedience suffering as a result. Though neither of them have done anything particular egregious lately, their combined list of minor transgressions is reaching a point where rendering punishment on the two would not be seen as unfair. By happenstance they come before you for inspection one after the other. Though they certainly see each other naked frequently around the penthouse, neither seems particularly comfortable around the other when nudity is involved. While you finish $mother.slaveName's inspection, her daughter fidgets uneasily even while trying to mimic the posture and appearance of an obedient slave. It occurs to you that the current situation presents an opportunity to do //something// about this resistant mother daughter pair.
+
+<br><br>
+<span id="result">
+<br><<link "Spend the evening gently acclimating them to your ownership">>
+ <<replace "#result">>
+ Though neither of the two vehemently protests your decision to have them both join you in bed, furtive uneasy glances are exchanged between the two. Since they're already naked, they clamber onto your bed before you and reluctantly kneel facing each other, leaving enough space between them for you and for them to avert their eyes to avoid the other's nakedness. They clearly assume you would start by using one of them, so they're quite taken aback when you remain standing at the edge of the bed and suggest that $mother.slaveName play with her daughter. $daughter.slaveName awkwardly flounders a little as her mother's hands roam about her body, but does not reel back from the intimate touching. In time you instruct $daughter.slaveName to pleasure her mother, but still decline to join the incestuous union unfolding on your sheets. You extend the foreplay for hours, bringing both mother and daughter to such a state of naked arousal that they begin grinding against each other uninhibitedly. They are both so desperate for release that they do not object when you finally decide to join them, instead eagerly moving to include you in their coupling. What started with $daughter.slaveName awkwardly kneeling unmoving while her mother sucked her nipples ends with $daughter.slaveName on all fours getting fucked by you while orally pleasuring $mother.slaveName. You gaze over at $mother.slaveName and she moans and licks her lips enticingly back at you as $daughter.slaveName moans into her fuckhole.
+ @@.mediumaquamarine;They have both become more trusting of you.@@
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<if $daughter.ID == $slaves[$i].ID>>
+ <<set $slaves[$i].trust += 4>>
+ <<if canDoAnal($slaves[$i])>>
+ <<set $slaves[$i].analCount += 1>>
+ <<set $analTotal += 1>>
+ <<elseif canDoVaginal($slaves[$i])>>
+ <<set $slaves[$i].vaginalCount += 1>>
+ <<set $vaginalTotal += 1>>
+ <</if>>
+ <<set $slaves[$i].oralCount += 1>>
+ <<set $oralTotal += 1>>
+ <</if>>
+ <</for>>
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<if $mother.ID == $slaves[$i].ID>>
+ <<set $slaves[$i].trust += 4>>
+ <<if canDoAnal($slaves[$i])>>
+ <<set $slaves[$i].analCount += 1>>
+ <<set $analTotal += 1>>
+ <<elseif canDoVaginal($slaves[$i])>>
+ <<set $slaves[$i].vaginalCount += 1>>
+ <<set $vaginalTotal += 1>>
+ <</if>>
+ <<set $slaves[$i].oralCount += 1>>
+ <<set $oralTotal += 1>>
+ <</if>>
+ <</for>>
+ <</replace>>
+<</link>>
+<br><<link "Make an example of the mother">>
+ <<replace "#result">>
+ You give them orders of devastating simplicity: You are going to assrape $mother.slaveName and if her daughter offers even the most token of resistance, you'll punish $mother.slaveName. They're stunned, but you shake them out of their shock by grabbing $mother.slaveName by the arm <<if $PC.dick == 0>>,donning a strap-on<</if>>and shoving her over your desk. $daughter.slaveName flinches visibly as you enter her mother's ass in one brutal stroke, for which you stain her mother's asscheeks a rosy red with a torrent of harsh spanks. $mother.slaveName takes the rough anal pounding with only quiet sobbing and the occasional whimper of pain, but her daughter can't bear to see $mother.slaveName in such duress and breaks her shortlived silence to beg for mercy. When you step away from $mother.slaveName, $daughter.slaveName lets out a sigh of relief, but her expression soon turns to horror and revulsion when you return to mount her mother with a lash in hand.
+ <br><br>
+ When you eventually finish your merciless assrape of $mother.slaveName, her body is covered in bruises, marks and handprints. A testament to $daughter.slaveName's inability to keep her silence as you brutalized her mother. You leave your office wordlessly to attend to other matters, while behind you $daughter.slaveName gazes forlornly at the gibbering mess you have reduced her mother to.
+ Your severe punishment of her mother has encouraged $daughter.slaveName to @@.gold;fear you@@. $mother.slaveName has been fucked into @@.hotpink;submission@@ but your savage treatment has caused her to @@.red;hate buttsex.@@
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<if $daughter.ID == $slaves[$i].ID>>
+ <<set $slaves[$i].trust -= 10>>
+ <</if>>
+ <</for>>
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<if $mother.ID == $slaves[$i].ID>>
+ <<set $slaves[$i].devotion += 4>>
+ <<set $slaves[$i].analCount += 1>>
+ <<set $analTotal += 1>>
+ <<set $slaves[$i].sexualFlaw = "hates anal">>
+ <</if>>
+ <</for>>
+ <</replace>>
+<</link>>
+</span>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
new file mode 100644
index 00000000000..ccbbc3dd473
--- /dev/null
+++ b/src/uncategorized/REroyalblood.tw
@@ -0,0 +1,236 @@
+:: RE royal blood [nobr]
+
+<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check">>
+
+One unfortunate consequence of existing in a global world is that business opportunities continue to crop up unabated by the onset of night in one corner of the world or another, an inconsiderate phenomenon for arcology owners who happen to be asleep when an event of importance takes place outside the walls of their arcology. This particular evening you are awoken by an alert from $assistantName, unusually intense for this late hour.
+<<if $assistant > 0>>
+ "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, there is a time sensitive enslavement opportunity available if you're interested." She pauses before continuing. "You're going to want to see this one <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>.
+<<else>>
+ It informs you that there is a time sensitive enslavement opportunity for you to peruse, and that it has calculated the potential rewards are worthy of your consideration even in the middle of the night.
+<</if>>
+<br><br>
+A convenient video feed is brought up, displaying a quick visual summary of the opportunity at hand.
+<br><br>
+It seems a bastion of the old world has fallen, a royal family of ancient blood and reputation has been overthrown by a local populist leader and his fellow revolutionaries. Furthermore, the leader of the revolution has designs to transform the outmoded monarchy into an arcology of his own, and has transmitted a request for aid to his new peers in the Free Cities.
+<br><br>
+Of course, nothing in the Free Cities is free and international aid is no exception. This new arcology owner is no fool, however, and has outlined a number of rewards to be delivered to his most generous benefactors.
+<br><br>
+Though the king himself is dead, murdered in his bed by bloodthirsty revolutionaries, the rest of his family and the majority of his court have been captured and enslaved by their former subjects. The new arcology owner, having decided that a large injection of credits or a shipment of goods is superior to deflowering a royal pussy or asshole, has directed his followers to slake their lust and vengeance on the king's wife and court rather than his children, though they too are past the age of majority.
+<br><br>
+Time is short, but you are well placed to acquire some choice slaves. With an adequate donation, of course.
+<br><br>
+
+<span id="result">
+<<link "Go back to sleep">>
+ <<replace "#result">>
+ You inform your personal assistant that you aren't planning to take any action. It's not every day that a monarchy collapses in the Old World, but it's also not particularly uncommon either.
+ <</replace>>
+<</link>>
+<br><br>
+<<if ($cash >= 50000) and ($rep >= 2000)>>
+<br><<link "Leverage your reputation and credits to aid the new arcology in exchange for a pretty princess">>
+ <<replace "#result">>
+ You seize a tablet and practically roll out of your bed, working furiously and using every feature of $assistantName to the utmost. It's not easy, but you call in a number of favors and grease a handful of palms, and soon a flight of VTOLs are landing in the new arcology laden with goods. When they take off again they have the princess aboard clad in chains, and make a direct course towards your waiting penthouse.
+<br><br>
+ Eventually she arrives in your penthouse, the perfect image of a demure yet composed princess. Her clearly practiced facade of poise and grace fades under scrutiny, however. The slightest trembling of her balled up fists, the minute tremors that mar her immaculate posture, her inability to meet your eyes with her own, all signs that she is still a scared girl despite all her royal trappings. Nonetheless, though the princess's court training is unlikely to be very beneficial to her in her new life in the penthouse, it does stand in stark contrast to her more common slave peers.
+ <<set $cash -= 50000>>
+ <<set $rep -= 2000>>
+ <<if $pedo_mode == 1>>
+ <<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
+ <<else>>
+ <<set $activeSlaveOneTimeMinAge = 16>>
+ <</if>>
+ <<set $activeSlaveOneTimeMaxAge = 19>>
+ <<include "Generate XX Slave">>
+ <<set _origin = "She was a princess of a royal kingdom, till her family was overthrown and she was sold to you in exchange for aid.">>
+ <<set $activeSlave.origin = _origin>>
+ <<set $activeSlave.career = "a princess">>
+ <<set $activeSlave.prestige = 2>>
+ <<set $activeSlave.prestigeDesc = "She was the princess of an ancient kingdom.">>
+ <<set $activeSlave.devotion = random(-80,-60)>>
+ <<set $activeSlave.trust = random(-50,-60)>>
+ <<set $activeSlave.face = random(25,100)>>
+ <<set $activeSlave.boobs = either(100, 200, 300)>>
+ <<set $activeSlave.vagina = 0>>
+ <<set $activeSlave.ovaries = 1>>
+ <<set $activeSlave.preg = -1>>
+ <<set $activeSlave.pubicHStyle = "waxed">>
+ <<set $activeSlave.underArmHStyle = "waxed">>
+ <<set $activeSlave.hips = -1>>
+ <<set $activeSlave.butt = 0>>
+ <<set $activeSlave.dick to 0>>
+ <<set $activeSlave.foreskin to 0>>
+ <<set $activeSlave.balls to 0>>
+ <<set $activeSlave.anus = 0>>
+ <<set $activeSlave.weight = 0>>
+ <<set $activeSlave.intelligence = random(1,3)>>
+ <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.entertainSkill = 45>>
+ <<set $activeSlave.analSkill = 0>>
+ <<set $activeSlave.oralSkill = 0>>
+ <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.canRecruit = 0>>
+ <<set $activeSlave.health = random(30,60)>>
+ <<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+ <<AddSlave $activeSlave>>
+ <br><br>
+<</replace>>
+<</link>> // You will need to utilize a portion of your reputation and ¤50000 to enslave her.//
+<<else>>
+ //You lack the necessary funds and reputation to enslave a princess.//
+<</if>>
+<br><br>
+<<if $cash >= 35000>>
+<br><<link "Dispatch a sizeable amount of aid in exchange for the crown prince">>
+ <<replace "#result">>
+ You seize a tablet and practically roll out of your bed, working vigorously and using every feature of $assistantName to the utmost. It's not easy, but your credits pave your way to sending a flight of VTOLs laden with goods to the new arcology. They take off again with the crown prince aboard and in chains, where he rails against the uncaring metal walls of the VTOL for the breadth of his journey to your penthouse.
+<br><br>
+ When he arrives in your penthouse, the former prince is beside himself with rage. When he is brought to be modified in the remote surgery, he breaks free and attempts to fight his way out of your penthouse. His attempt at freedom is futile, however, and he is soon overwhelmed by your guards and dragged back to the remote surgery. It doesn't take long for the valiant prince to become a new dickgirl, though his submission to life as a slave is another question entirely.
+ <<set $cash -= 35000>>
+ <<if $pedo_mode == 1>>
+ <<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
+ <<else>>
+ <<set $activeSlaveOneTimeMinAge = 16>>
+ <</if>>
+ <<set $activeSlaveOneTimeMaxAge = 21>>
+ <<include "Generate XY Slave">>
+ <<set _origin = "She was the crown prince of a royal kingdom, till her family was overthrown and she was sold to you in exchange for aid.">>
+ <<set $activeSlave.origin = _origin>>
+ <<set $activeSlave.career = "a prince">>
+ <<set $activeSlave.prestige = 2>>
+ <<set $activeSlave.prestigeDesc = "She was the crown prince of an ancient kingdom.">>
+ <<set $activeSlave.devotion = random(-80,-60)>>
+ <<set $activeSlave.trust = random(-50,-60)>>
+ <<set $activeSlave.boobs = 150>>
+ <<set $activeSlave.vagina = -1>>
+ <<set $activeSlave.clit = 0>>
+ <<set $activeSlave.ovaries = 0>>
+ <<set $activeSlave.preg = 0>>
+ <<set $activeSlave.dick = random(3,5)>>
+ <<set $activeSlave.balls = random(2,4)>>
+ <<set $activeSlave.scrotum = $activeSlave.balls>>
+ <<set $activeSlave.anus = 0>>
+ <<set $activeSlave.weight = 0>>
+ <<set $activeSlave.muscles = 50>>
+ <<set $activeSlave.intelligence = random(1,3)>>
+ <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
+ <<set $activeSlave.faceImplant to 1>>
+ <<set $activeSlave.analSkill = 0>>
+ <<set $activeSlave.oralSkill = 0>>
+ <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.canRecruit = 0>>
+ <<set $activeSlave.health = random(30,60)>>
+ <<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+ <<AddSlave $activeSlave>>
+ <br><br>
+<</replace>>
+<</link>> // Purchasing the goods and hiring the VTOLs will cost about ¤35000.//
+<<else>>
+ //You lack the necessary funds to enslave a crown prince.//
+<</if>>
+<br><br>
+<<if $cash >= 25000>>
+<br><<link "Transfer a respectable quantity of credits for a handful of court ladies">>
+ <<replace "#result">>
+ You take a tablet and peruse the various court ladies on offer by the fledgling arcology. You single out a few interesting individuals for purchase that might suit your tastes, but the slapdash descriptions provided for each slave by the revolutionaries make it likely that any similarities to your aesthetic leanings will be coincidental. Once you are satisfied with your selection, you electronically transfer the credits to the new arcology and soon receive a receipt for your donation and an estimated delivery schedule.
+<br><br>
+ When the ladies arrives at your penthouse, they seem almost relieved at the opulence of their new surroundings. Though they still retain much of their aristocratic arrogance, they each submit to biometric scanning with relative obedience. It seems likely that their obedience is borne out of a delusional rationalization that enslavement by one wealthy master is better than enslavement by the unwashed masses they once lorded over.
+ <<set $cash -= 25000>>
+ <<for $i to 0; $i < 3; $i++>>
+ <<if $pedo_mode == 1>>
+ <<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
+ <<else>>
+ <<set $activeSlaveOneTimeMinAge = 21>>
+ <</if>>
+ <<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
+ <<include "Generate XX Slave">>
+ <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was sold to you in exchange for credits.">>
+ <<set $activeSlave.origin = _origin>>
+ <<set $activeSlave.career = "a lady courtier">>
+ <<set $activeSlave.prestige = 1>>
+ <<set $activeSlave.prestigeDesc = "She was once a lady of the court of an ancient kingdom.">>
+ <<set $activeSlave.face = random(25,76)>>
+ <<set $activeSlave.devotion = random(10,20)>>
+ <<set $activeSlave.trust = random(-20,-30)>>
+ <<set $activeSlave.boobs = random(3,10)*100>>
+ <<set $activeSlave.vagina = 1>>
+ <<set $activeSlave.dick to 0>>
+ <<set $activeSlave.foreskin to 0>>
+ <<set $activeSlave.balls to 0>>
+ <<set $activeSlave.ovaries = 1>>
+ <<set $activeSlave.pubicHStyle = "waxed">>
+ <<set $activeSlave.underArmHStyle = "waxed">>
+ <<set $activeSlave.shoulders = random(-1,1)>>
+ <<set $activeSlave.hips = 1>>
+ <<set $activeSlave.butt = 1>>
+ <<set $activeSlave.anus = 0>>
+ <<set $activeSlave.weight = 0>>
+ <<set $activeSlave.intelligence = either(-1, 1, 2)>>
+ <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.entertainSkill = 25>>
+ <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.health = random(30,60)>>
+ <<set $activeSlave.canRecruit = 0>>
+ <<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+ <<AddSlave $activeSlave>>
+ <</for>>
+ <br><br>
+<</replace>>
+<</link>> // It will cost about ¤25000 to enslave them.//
+<<else>>
+ //You lack the necessary funds to enslave a handful of court ladies.//
+<</if>>
+<br><br>
+<<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?"
+<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>
+ When the Queen arrives at your penthouse, she seems almost relieved and almost basks in the opulence of her new surroundings. Yet, it seems likely that her relief has more to do with saving her from a lifetime of gang rape at the mercy of her former subjects, than it does the familiar luxury. She submits to biometric scanning obediently and without fuss, during which you discover to her surprise that she is pregnant. Since she hasn't begun to show yet, it's unclear whether the child is the former King's or the new arcology owner's. You don't have the means to discern the father of the child, but you notice she cradles her flat stomach protectively nonetheless.
+ <<set $cash -= 15000>>
+ <<set $activeSlaveOneTimeMinAge = ($fertilityAge+2)>>
+ <<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
+ <<set $one_time_age_overrides_pedo_mode = 1>>
+ <<include "Generate XX Slave">>
+ <<set _origin = "She was the Queen of a royal kingdom, till her husband was overthrown and she was sold to you in exchange for credits.">>
+ <<set $activeSlave.origin = _origin>>
+ <<set $activeSlave.career = "a Queen">>
+ <<set $activeSlave.prestige = 2>>
+ <<set $activeSlave.prestigeDesc = "She was the Queen of an ancient kingdom.">>
+ <<set $activeSlave.face = random(25,100)>>
+ <<set $activeSlave.devotion = random(10,20)>>
+ <<set $activeSlave.trust = random(-20,-30)>>
+ <<set $activeSlave.boobs = random(3,10)*100>>
+ <<set $activeSlave.vagina = 1>>
+ <<set $activeSlave.dick to 0>>
+ <<set $activeSlave.foreskin to 0>>
+ <<set $activeSlave.balls to 0>>
+ <<set $activeSlave.ovaries = 1>>
+ <<set $activeSlave.preg = 7>>
+ <<set $activeSlave.pubicHStyle = "waxed">>
+ <<set $activeSlave.shoulders = random(-1,1)>>
+ <<set $activeSlave.hips = 1>>
+ <<set $activeSlave.butt = 1>>
+ <<set $activeSlave.anus = 0>>
+ <<set $activeSlave.weight = 0>>
+ <<set $activeSlave.intelligence = random(1,2,3)>>
+ <<set $activeSlave.intelligenceImplant = 1>>
+ <<set $activeSlave.entertainSkill = 45>>
+ <<set $activeSlave.whoreSkill = 0>>
+ <<set $activeSlave.health = random(30,60)>>
+ <<set $activeSlave.birthsTotal = 2>>
+ <<set $activeSlave.pubertyXX = 1>>
+ <<set $activeSlave.canRecruit = 0>>
+ <<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
+ <<AddSlave $activeSlave>>
+ <br><br>
+<</replace>>
+<</link>> // It will cost about ¤15000 to enslave her.//
+<<else>>
+ //You lack the necessary funds to enslave a queen.//
+<</if>>
+</span>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index e7fa6b3b55f..5e3b3b64ca8 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1,6 +1,6 @@
:: Arcology Management [nobr]
-__Arcology Management__
+<<if $useTabs>>__Arcology Management__<</if>>
<br>
<<set _flux = random(20,40)>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index 2ab392b7a33..4367a2044b4 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -266,9 +266,6 @@
<<if ($brothelUpgradeDrugs == 1)>>
<<set _healthBonus += 3, _aphrod = 2>>
<</if>>
- <<if ($brothelUpgradeHealth == 1)>>
- <<set _healthBonus += 10>>
- <</if>>
<<set $oldCash = $cash>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set _i = $BrothiIDs[_dI].Index, $i = _i>>
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 495f6ac503d..9f8b8e755bf 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -36,14 +36,14 @@ __Sex Slave Purchase Options__
<br>[[Kidnappers' Market|Slave Markets][$slaveMarket = "kidnappers", $slavesSeen += 1]] | //Slaves will tend to be low quality and resistant.//
<</if>>
-<<set $seed = 0>>
+<<set _culture = 0>>
<<for $i = 0; $i < $arcologies.length; $i++>>
<<if $arcologies[$i].direction != 0>>
<br><<print "[[Slaves from|Slave Markets][$activeArcology = $arcologies[" + $i + "]]]">>
''$arcologies[$i].name''
- <<if $seed == 0>>
+ <<if _culture == 0>>
| //The arcology's prosperity and culture will affect slaves who have lived there.//
- <<set $seed = 1>>
+ <<set _culture = 1>>
<</if>>
<</if>>
<</for>>
@@ -146,8 +146,8 @@ __Menial Slaves__
<<MenialPopCap>>
The parts of your arcology you own can house a total of $PopCap menial slaves.
-<<set $seed = Math.trunc(($slaveCostFactor*1000)/100)*100>>
-<<set $seed = Math.clamp($seed, 500, 1500)>>
+<<set _menialPrice = Math.trunc(($slaveCostFactor*1000)/100)*100>>
+<<set _menialPrice = Math.clamp(_menialPrice, 500, 1500)>>
<br>
<<if $helots > 1>>
@@ -157,26 +157,31 @@ The parts of your arcology you own can house a total of $PopCap menial slaves.
<<else>>
You do not own any menial slaves.
<</if>>
-The market price of menials is ¤$seed.
-[[Buy|Buy Slaves][$helots+=1,$menialDemandFactor+=1,$cash-=$seed]]
-<<if $cash > $seed*10>>
- [[(x10)|Buy Slaves][$helots+=10,$menialDemandFactor+=10,$cash-=$seed*10]]
-<</if>>
-<<if $cash > $seed*100>>
- [[(x100)|Buy Slaves][$helots+=100,$menialDemandFactor+=100,$cash-=$seed*100]]
-<</if>>
-<<if $cash > $seed*2>>
- [[(max)|Buy Slaves][$helots+=Math.trunc($cash/($seed)),$menialDemandFactor+=Math.trunc($cash/($seed)),$cash-=Math.trunc($cash/($seed))*($seed)]]
+The market price of menials is ¤_menialPrice.
+<<set _optionsBreak = 0>>
+<<if $PopCap < $helots+$fuckdolls+$menialBioreactors>>
+ [[Buy|Buy Slaves][$helots+=1,$menialDemandFactor+=1,$cash-=_menialPrice]]
+ <<if $cash > _menialPrice*10>>
+ [[(x10)|Buy Slaves][$helots+=10,$menialDemandFactor+=10,$cash-=_menialPrice*10]]
+ <</if>>
+ <<if $cash > _menialPrice*100>>
+ [[(x100)|Buy Slaves][$helots+=100,$menialDemandFactor+=100,$cash-=_menialPrice*100]]
+ <</if>>
+ <<if $cash > _menialPrice*2>>
+ [[(max)|Buy Slaves][$helots+=Math.trunc($cash/(_menialPrice)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice)),$cash-=Math.trunc($cash/(_menialPrice))*(_menialPrice)]]
+ <</if>>
+ <<set _optionsBreak = 1>>
<</if>>
<<if $helots >= 1>>
- | [[Sell|Buy Slaves][$helots-=1,$menialDemandFactor-=1,$cash+=$seed]]
+ <<if _optionsBreak>>|<</if>>
+ [[Sell|Buy Slaves][$helots-=1,$menialDemandFactor-=1,$cash+=_menialPrice]]
<<if $helots >= 10>>
- [[(x10)|Buy Slaves][$helots-=10,$menialDemandFactor-=10,$cash+=$seed*10]]
+ [[(x10)|Buy Slaves][$helots-=10,$menialDemandFactor-=10,$cash+=_menialPrice*10]]
<<if $helots >= 100>>
- [[(x100)|Buy Slaves][$helots-=100,$menialDemandFactor-=100,$cash+=$seed*100]]
+ [[(x100)|Buy Slaves][$helots-=100,$menialDemandFactor-=100,$cash+=_menialPrice*100]]
<</if>>
<</if>>
-[[(all)|Buy Slaves][$cash+=$helots*($seed),$menialDemandFactor-=$helots*($seed),$helots = 0]]
+[[(all)|Buy Slaves][$cash+=$helots*(_menialPrice),$menialDemandFactor-=$helots*(_menialPrice),$helots = 0]]
<<if $arcologies[0].FSPaternalist == "unset">>
<<if $arcadeUpgradeFuckdolls == 1>>
<br> [[Convert to Fuckdoll|Buy Slaves][$helots-=1,$fuckdolls+=1,$cash-=1000]]
@@ -212,28 +217,33 @@ The market price of menials is ¤$seed.
<br>You do not own any standard Fuckdolls.
<</if>>
<<if ($fuckdolls > 0) || ($arcologies[0].FSPaternalist == "unset")>>
-The market price of standard fuckdolls is ¤<<print $seed*2>>.
+The market price of standard fuckdolls is ¤<<print _menialPrice*2>>.
+<<set _optionsBreak = 0>>
+<<if $PopCap < $helots+$fuckdolls+$menialBioreactors>>
<<if $arcologies[0].FSPaternalist == "unset">>
-[[Buy|Buy Slaves][$fuckdolls+=1,$menialDemandFactor+=1,$cash-=$seed*2]]
-<<if $cash > $seed*20>>
- [[(x10)|Buy Slaves][$fuckdolls+=10,$menialDemandFactor+=10,$cash-=$seed*20]]
-<</if>>
-<<if $cash > $seed*200>>
- [[(x100)|Buy Slaves][$fuckdolls+=100,$menialDemandFactor+=100,$cash-=$seed*200]]
-<</if>>
-<<if $cash > $seed*4>>
- [[(max)|Buy Slaves][$fuckdolls+=Math.trunc($cash/($seed*2)),$menialDemandFactor+=Math.trunc($cash/($seed*2)),$cash-=Math.trunc($cash/($seed*2))*($seed*2)]]
+ [[Buy|Buy Slaves][$fuckdolls+=1,$menialDemandFactor+=1,$cash-=_menialPrice*2]]
+ <<if $cash > _menialPrice*20>>
+ [[(x10)|Buy Slaves][$fuckdolls+=10,$menialDemandFactor+=10,$cash-=_menialPrice*20]]
+ <</if>>
+ <<if $cash > _menialPrice*200>>
+ [[(x100)|Buy Slaves][$fuckdolls+=100,$menialDemandFactor+=100,$cash-=_menialPrice*200]]
+ <</if>>
+ <<if $cash > _menialPrice*4>>
+ [[(max)|Buy Slaves][$fuckdolls+=Math.trunc($cash/(_menialPrice*2)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice*2)),$cash-=Math.trunc($cash/(_menialPrice*2))*(_menialPrice*2)]]
+ <</if>>
+ <<set _optionsBreak = 1>>
<</if>>
<</if>>
<<if $fuckdolls >= 1>>
- | [[Sell|Buy Slaves][$fuckdolls-=1,$menialDemandFactor-=1,$cash+=$seed*2]]
+ <<if _optionsBreak>>|<</if>>
+ [[Sell|Buy Slaves][$fuckdolls-=1,$menialDemandFactor-=1,$cash+=_menialPrice*2]]
<<if $fuckdolls >= 10>>
- [[(x10)|Buy Slaves][$fuckdolls-=10,$menialDemandFactor-=10,$cash+=$seed*20]]
+ [[(x10)|Buy Slaves][$fuckdolls-=10,$menialDemandFactor-=10,$cash+=_menialPrice*20]]
<<if $fuckdolls >= 100>>
- [[(x100)|Buy Slaves][$fuckdolls-=100,$menialDemandFactor-=100,$cash+=$seed*200]]
+ [[(x100)|Buy Slaves][$fuckdolls-=100,$menialDemandFactor-=100,$cash+=_menialPrice*200]]
<</if>>
<</if>>
-[[(all)|Buy Slaves][$cash+=$fuckdolls*($seed*2),$menialDemandFactor-=$fuckdolls*($seed*2),$fuckdolls = 0]]
+[[(all)|Buy Slaves][$cash+=$fuckdolls*(_menialPrice*2),$menialDemandFactor-=$fuckdolls*(_menialPrice*2),$fuckdolls = 0]]
<</if>>
<</if>>
@@ -245,27 +255,32 @@ The market price of standard fuckdolls is ¤<<print $seed*2>>.
<br>You do not own any standard bioreactors.
<</if>>
<<if ($menialBioreactors > 0) || ($arcologies[0].FSPaternalist == "unset")>>
-The market price of standard bioreactors is ¤<<print ($seed-100)>>.
+The market price of standard bioreactors is ¤<<print (_menialPrice-100)>>.
+<<set _optionsBreak = 0>>
+<<if $PopCap < $helots+$fuckdolls+$menialBioreactors>>
<<if $arcologies[0].FSPaternalist == "unset">>
-[[Buy|Buy Slaves][$menialBioreactors+=1,$menialDemandFactor+=1,$cash-=($seed-100)]]
-<<if $cash > ($seed-100)*10>>
- [[(x10)|Buy Slaves][$menialBioreactors+=10,$menialDemandFactor+=10,$cash-=($seed-100)*10]]
-<</if>>
-<<if $cash > ($seed-100)*100>>
- [[(x100)|Buy Slaves][$menialBioreactors+=100,$menialDemandFactor+=100,$cash-=($seed-100)*100]]
-<</if>>
-<<if $cash > ($seed-100)*2>>
- [[(max)|Buy Slaves][$menialBioreactors+=Math.trunc($cash/($seed-100)),$menialDemandFactor+=Math.trunc($cash/($seed-100)),$cash-=Math.trunc($cash/($seed-100))*($seed-100)]]
+ [[Buy|Buy Slaves][$menialBioreactors+=1,$menialDemandFactor+=1,$cash-=(_menialPrice-100)]]
+ <<if $cash > (_menialPrice-100)*10>>
+ [[(x10)|Buy Slaves][$menialBioreactors+=10,$menialDemandFactor+=10,$cash-=(_menialPrice-100)*10]]
+ <</if>>
+ <<if $cash > (_menialPrice-100)*100>>
+ [[(x100)|Buy Slaves][$menialBioreactors+=100,$menialDemandFactor+=100,$cash-=(_menialPrice-100)*100]]
+ <</if>>
+ <<if $cash > (_menialPrice-100)*2>>
+ [[(max)|Buy Slaves][$menialBioreactors+=Math.trunc($cash/(_menialPrice-100)),$menialDemandFactor+=Math.trunc($cash/(_menialPrice-100)),$cash-=Math.trunc($cash/(_menialPrice-100))*(_menialPrice-100)]]
+ <</if>>
+ <<set _optionsBreak = 1>>
<</if>>
<</if>>
<<if $menialBioreactors >= 1>>
- | [[Sell|Buy Slaves][$menialBioreactors-=1,$menialDemandFactor-=1,$cash+=($seed-100)]]
+ <<if _optionsBreak>>|<</if>>
+ [[Sell|Buy Slaves][$menialBioreactors-=1,$menialDemandFactor-=1,$cash+=(_menialPrice-100)]]
<<if $menialBioreactors >= 10>>
- [[(x10)|Buy Slaves][$menialBioreactors-=10,$menialDemandFactor-=10,$cash+=($seed-100)*10]]
+ [[(x10)|Buy Slaves][$menialBioreactors-=10,$menialDemandFactor-=10,$cash+=(_menialPrice-100)*10]]
<<if $menialBioreactors >= 100>>
- [[(x100)|Buy Slaves][$menialBioreactors-=100,$menialDemandFactor-=100,$cash+=($seed-100)*100]]
+ [[(x100)|Buy Slaves][$menialBioreactors-=100,$menialDemandFactor-=100,$cash+=(_menialPrice-100)*100]]
<</if>>
<</if>>
-[[(all)|Buy Slaves][$cash+=$menialBioreactors*($seed-100),$menialDemandFactor-=$menialBioreactors*($seed-100),$menialBioreactors = 0]]
+[[(all)|Buy Slaves][$cash+=$menialBioreactors*(_menialPrice-100),$menialDemandFactor-=$menialBioreactors*(_menialPrice-100),$menialBioreactors = 0]]
<</if>>
<</if>>
diff --git a/src/uncategorized/corporateMarket.tw b/src/uncategorized/corporateMarket.tw
index e5b53388bdb..e4a9859abff 100644
--- a/src/uncategorized/corporateMarket.tw
+++ b/src/uncategorized/corporateMarket.tw
@@ -22,7 +22,7 @@ sales<<if $captureUpgradeAge == "old">>woman<<else>>girl<</if>> in a slutty suit
She's nice and curvy, with nice breasts and a lovely ass.
<</if>>
<<if $surgicalUpgradeCosmetics == "applied">>Her face is flawless.<</if>>
-<<if ($captureUpgradeRace != "unselected") || ($captureUpgradeRace != "none")>>
+<<if ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>>
She's $captureUpgradeRace>>, of course<<if $trainingUpgradeAccent == "accents">>, and has a cute accent<</if>>.
<</if>>
<<if $drugUpgradeHormones == "XX">>
diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw
index d1526c88f16..26ded193b78 100644
--- a/src/uncategorized/corporationDevelopments.tw
+++ b/src/uncategorized/corporationDevelopments.tw
@@ -8,7 +8,7 @@
<<set _Numsurgical = "ALL">>
<<set _Numdrug = "ALL">>
<</if>>
-__The Corporation__
+<<if $useTabs>>__The Corporation__<</if>>
<br>
<<set _roll = random(1,100)>>
@@ -56,7 +56,7 @@ in total, the corporation has enslaved $corpPeopleEnslaved people.
<<else>>
The corporation has only enough training and medical assets to maintain the value of its human holdings.
<</if>>
-<<if $CorporationMarket>>
+<<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
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index bed2b44efba..7872e84b095 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -56,9 +56,6 @@
<br> Additional maintenance for milking machines upgraded with biological components: ¤<<print ($bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren)*100>>
<</if>>
<</if>>
-<<if $collectionFacility > 0>>
- <br>__Collection Facility__ maintenance: ¤<<print ($collectionFacility*$facilityCost)+(0.2*$dairyStimulatorsUpgrade*$collectionFacility*$facilityCost)+(0.2*$collectionFacilityUpgradeMilkers*$collectionFacility*$facilityCost)>>
-<</if>>
<<if ($servantsQuarters > 0) && ($servantsQuartersUpgradeMonitoring > 0)>>
<br>__Servants' Quarters__ maintenance: ¤<<print (0.2*$servantsQuartersUpgradeMonitoring*$servantsQuarters*$facilityCost)>>
<</if>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 9ae0d845778..af0d4b0c83e 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -15,7 +15,7 @@
<br><br>
-<<if $useTabs<1>>
+<<if $useTabs>>
<<include "Neighbors Development">>
<br><br>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index d898b522a2f..4c96d0b44cd 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -1,6 +1,6 @@
:: FS Developments [nobr]
-__Society__
+<<if $useTabs>>__Society__<</if>>
<br>
<<if $FSCredits > 0>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 5755c5ca135..ffe11cd52c8 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2367,10 +2367,10 @@ Her scars make her look like she's in the right place.
<</if>>
<<if $activeSlave.voice == 0>>
- $pronounCap is @@.pink;completely silent@@, which is understandable, since <<if $activeSlave.fuckdoll > 0>>it's<<else>>she's a<</if>> mute.
+ $pronounCap is @@.pink;completely silent@@, which is understandable, since $pronoun's mute.
<<else>>
<<if $activeSlave.lips > 95>>
- $pronounCap is @@.pink;effectively mute@@, since $possessive lips are so large that <<if $activeSlave.fuckdoll > 0>>its<<else>>SHE<</if>> can no longer speak intelligibly. $pronounCap can still <<if $activeSlave.devotion > 50>>moan<<elseif $activeSlave.devotion >= 20>>whimper<<else>>scream<</if>> through them, though.
+ $pronounCap is @@.pink;effectively mute@@, since $possessive lips are so large that $pronoun can no longer speak intelligibly. $pronounCap can still <<if $activeSlave.devotion > 50>>moan<<elseif $activeSlave.devotion >= 20>>whimper<<else>>scream<</if>> through them, though.
<</if>>
<</if>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index b7e98c7890b..1140f70945b 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -11,7 +11,7 @@
<<set _corpBonus = Math.trunc($corpProfit*0.05)>>
-__Arcologies in the Free City__
+<<if $useTabs>>__Arcologies in the Free City__<</if>>
<<for $i = 0; $i < $arcologies.length; $i++>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 0dbbf531aee..71df631f743 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -1,7 +1,6 @@
:: Options [nobr]
<<set $showEncyclopedia = 0>>
-<<set $slavesForImport = []>>
This save was created using FC version $ver build $releaseID.
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index e64066e2818..62702236e48 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -1,6 +1,6 @@
:: Personal Business [nobr]
-__Personal Business__
+<<if $useTabs>>__Personal Business__<</if>>
<br>
<<if $cash < 0>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 99be692ef6c..b597f7d5e45 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -69,15 +69,21 @@
/* Relationship Events */
-<<if $familyTesting == 1>>
+<<if $familyTesting == 0>>
<<set $used = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if ($used == 0)>>
-<<if ($slaves[$i].daughters > 0)>>
+<<if ($slaves[$i].relation == "mother")>>
+<<if ($slaves[$i].relationshipTarget != $slaves[$i].relationTarget)>>
<<if ($slaves[$i].devotion > 50)>>
<<set $mother = $slaves[$i]>>
- <<set $daughter = randomDaughter($slaves[$i])>>
+ <<for $j = 0; $j < $slaves.length; $j++>>
+ <<if $slaves[$j].ID == $mother.relationTarget>>
+ <<set $daughter = $slaves[$j]>>
+ <<break>>
+ <</if>>
+ <</for>>
<<if ($daughter.devotion > 50)>>
<<if canWalk($daughter)>>
<<if canWalk($mother)>>
@@ -93,15 +99,52 @@
<</if>>
<</if>>
<</if>>
+<</if>>
<</for>>
<<set $used = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if ($used == 0)>>
-<<if ($slaves[$i].sisters > 0)>>
+<<if ($slaves[$i].relation == "mother")>>
+<<if ($slaves[$i].relationshipTarget != $slaves[$i].relationTarget)>>
+<<if ($slaves[$i].devotion < 10)>>
+ <<set $mother = $slaves[$i]>>
+ <<for $j = 0; $j < $slaves.length; $j++>>
+ <<if $slaves[$j].ID == $mother.relationTarget>>
+ <<set $daughter = $slaves[$j]>>
+ <<break>>
+ <</if>>
+ <</for>>
+ <<if ($daughter.devotion < 10)>>
+ <<if canWalk($daughter)>>
+ <<if canWalk($mother)>>
+ <<if ($daughter.anus != 0)>>
+ <<if ($mother.anus != 0)>>
+ <<set $events.push("RE resistant mother daughter")>>
+ <<set $used = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+<</for>>
+
+<<set $used = 0>>
+<<for $i = 0; $i < $slaves.length; $i++>>
+<<if ($used == 0)>>
+<<if ($slaves[$i].relation == "sister")>>
<<if ($slaves[$i].dick == 1)>>
<<set $youngerSister = $slaves[$i]>>
- <<set $olderSister = randomSister($slaves[$i])>>
+ <<for $j = 0; $j < $slaves.length; $j++>>
+ <<if $slaves[$j].ID == $slaves[$i].relationTarget>>
+ <<set $olderSister = $slaves[$j]>>
+ <<break>>
+ <</if>>
+ <</for>>
<<if ($olderSister.anus == 0)>>
<<if ($youngerSister.devotion > ($olderSister.devotion+20))>>
<<set $events.push("RE sibling revenge")>>
@@ -116,9 +159,14 @@
<<set $used = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if ($used == 0)>>
-<<if ($slaves[$i].sisters > 0)>>
+<<if ($slaves[$i].relation == "twin")>>
<<set $alphaTwin = $slaves[$i]>>
- <<set $betaTwin = randomTwinSister($slaves[$i])>>
+ <<for $j = 0; $j < $slaves.length; $j++>>
+ <<if $slaves[$j].ID == $slaves[$i].relationTarget>>
+ <<set $betaTwin = $slaves[$j]>>
+ <<break>>
+ <</if>>
+ <</for>>
<<if ($alphaTwin.anus > 0)>>
<<if ($betaTwin.anus > 0)>>
<<if ($alphaTwin.devotion > 50)>>
@@ -142,16 +190,10 @@
<<set $used = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if ($used == 0)>>
-<<if ($slaves[$i].relation == "mother")>>
-<<if ($slaves[$i].relationshipTarget != $slaves[$i].relationTarget)>>
+<<if ($slaves[$i].daughters > 0)>>
<<if ($slaves[$i].devotion > 50)>>
<<set $mother = $slaves[$i]>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID == $mother.relationTarget>>
- <<set $daughter = $slaves[$j]>>
- <<break>>
- <</if>>
- <</for>>
+ <<set $daughter = randomDaughter($slaves[$i])>>
<<if ($daughter.devotion > 50)>>
<<if canWalk($daughter)>>
<<if canWalk($mother)>>
@@ -167,21 +209,39 @@
<</if>>
<</if>>
<</if>>
+<</for>>
+
+<<set $used = 0>>
+<<for $i = 0; $i < $slaves.length; $i++>>
+<<if ($used == 0)>>
+<<if ($slaves[$i].daughters > 0)>>
+<<if ($slaves[$i].devotion > 50)>>
+ <<set $mother = $slaves[$i]>>
+ <<set $daughter = randomDaughter($slaves[$i])>>
+ <<if ($daughter.devotion < 10)>>
+ <<if canWalk($daughter)>>
+ <<if canWalk($mother)>>
+ <<if ($daughter.anus != 0)>>
+ <<if ($mother.anus != 0)>>
+ <<set $events.push("RE resistant mother daughter")>>
+ <<set $used = 1>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <</if>>
+<</if>>
+<</if>>
<</if>>
<</for>>
<<set $used = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if ($used == 0)>>
-<<if ($slaves[$i].relation == "sister")>>
+<<if ($slaves[$i].sisters > 0)>>
<<if ($slaves[$i].dick == 1)>>
<<set $youngerSister = $slaves[$i]>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID == $slaves[$i].relationTarget>>
- <<set $olderSister = $slaves[$j]>>
- <<break>>
- <</if>>
- <</for>>
+ <<set $olderSister = randomSister($slaves[$i])>>
<<if ($olderSister.anus == 0)>>
<<if ($youngerSister.devotion > ($olderSister.devotion+20))>>
<<set $events.push("RE sibling revenge")>>
@@ -196,14 +256,9 @@
<<set $used = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
<<if ($used == 0)>>
-<<if ($slaves[$i].relation == "twin")>>
+<<if ($slaves[$i].sisters > 0)>>
<<set $alphaTwin = $slaves[$i]>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].ID == $slaves[$i].relationTarget>>
- <<set $betaTwin = $slaves[$j]>>
- <<break>>
- <</if>>
- <</for>>
+ <<set $betaTwin = randomTwinSister($slaves[$i])>>
<<if ($alphaTwin.anus > 0)>>
<<if ($betaTwin.anus > 0)>>
<<if ($alphaTwin.devotion > 50)>>
@@ -1145,6 +1200,10 @@
<<set $events.push("REM merger")>>
<</if>>
+<<if $rep-10000 > random(1,12500)>>
+ <<set $events.push("RE royal blood")>>
+<</if>>
+
<<if $RegularParties == 1>>
<<if ($PC.vagina == 1 && $PC.title == 0) && (random(0,99) < $seeDicks)>>
<<set $events.push("RE male citizen hookup")>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 7320149d0ca..94a0cb03f0f 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -1,6 +1,6 @@
:: Reputation [nobr]
-__Reputation__
+<<if $useTabs>>__Reputation__<</if>>
<br>
<<PCTitle>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 932be5c6974..c7b4ca5969b 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -550,9 +550,7 @@ _Pass $nextLink
<<elseif _Pass == "Manage Penthouse">>
<br>
<br><<link [[Wardrobe]]>><</link>>
- <<if $dispensary == 0>>
- <br>[[Pharmaceutical Fabricator|Dispensary]]
- <</if>>
+ <<if $dispensary>><br>[[Pharmaceutical Fabricator|Dispensary]]<</if>>
<br><br><br><br><br>
<<else>>
<br><br><br><br><br><br><br><br>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index 775f06bce64..07e756a9687 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -57,7 +57,7 @@ Future society names for new slaves are currently @@.cyan;APPLIED@@. [[Stop appl
<</if>>
<</if>>
-<<if $brothel+$club+$dairy+$servantsQuarters+$collectionFacility+$arcade+$schoolroom+$spa+$clinic+$masterSuite+$cellblock > 0>>
+<<if $brothel+$club+$dairy+$servantsQuarters+$arcade+$schoolroom+$spa+$clinic+$masterSuite+$cellblock > 0>>
<br><br>
<<if $universalRulesFacilityWork == 0>>
Slaves ''will not'' cooperate with staffed facilities to improve their performance. [[Allow cooperation|Universal Rules][$universalRulesFacilityWork = 1]]
diff --git a/src/utility/assignWidgets.tw b/src/utility/assignWidgets.tw
index 5a182ce1779..24f72e9f43b 100644
--- a/src/utility/assignWidgets.tw
+++ b/src/utility/assignWidgets.tw
@@ -1,7 +1,7 @@
:: Assign Widgets [widget nobr]
/%
- Call as <<assignJob slaveObject $returnto | _currentRule.facilityRemove | "serve in the master suite"
+ Call as <<assignJob slaveObject $returnTo | _currentRule.facilityRemove | "serve in the master suite"
$args[0] slave object. *MUST be present*
$args[1] Job to assign slave to. Will accept the $returnTo vars and the _currentRule.assignFacility vars and the actual job assignments "serve in the master suite" etc.
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index da1a042e5cd..c3704ede9cc 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1397,7 +1397,7 @@
<</if>>
<</if>>
<</if>>
- <<if $args[0].customTitleLisp != "">>
+ <<if def $args[0].customTitleLisp && $args[0].customTitleLisp != "">>
<<set $titleEnunciate = $args[0].customTitleLisp>>
<</if>>
<<set $sayEnunciate = "lisp">>
@@ -1446,7 +1446,7 @@
<</if>>
<</if>>
<</if>>
- <<if $args[0].customTitle != "">>
+ <<if def $args[0].customTitle && $args[0].customTitle != "">>
<<set $titleEnunciate = $args[0].customTitle>>
<</if>>
<<set $sayEnunciate = "say">>
@@ -1575,7 +1575,7 @@ This experience
<</widget>>
/%
- Call as <<SlaveSort [$FacilityiIDs or $slaves]>>
+Call as <<SlaveSort [$slaves]>>
$args[0]: array to sort
%/
<<widget "SlaveSort">>
--
GitLab