From 0c7ea81e1406999d004df02da813b65ab1c53e4c Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 15 May 2017 19:24:09 -0400
Subject: [PATCH] Fixes, PC breast options and prince+princess option.
---
src/events/intro/initNationalities.tw | 2 +-
src/events/intro/introSummary.tw | 19 +++-
src/uncategorized/REroyalblood.tw | 105 ++++++++++++++++++++
src/uncategorized/servantsQuartersReport.tw | 2 +-
4 files changed, 124 insertions(+), 4 deletions(-)
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 2a0519f55ba..deab2ec361d 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -358,7 +358,7 @@
<<set $seed = ["north", "northeast", "east", "southeast", "south", "southwest", "west", "northwest"]>>
<<set $neighboringArcologies = Math.clamp($neighboringArcologies, 0, 8)>>
<<for $i = 0; $i <= $neighboringArcologies; $i++>>
- <<set $activeArcology = {name: "Arcology X-", direction: "north", government: "an individual", leaderID: 0, honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor: 0, FSSupremacist: "unset", FSSupremacistRace: 0, FSSubjugationist: "unset", FSSubjugationistRace: 0, FSRestart: "unset", FSRepopulationFocus: "unset", FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", FSGenderRadicalistResearch: 0, FSGenderFundamentalistResearch: 0, FSPaternalistResearch: 0, FSDegradationistResearch: 0, FSBodyPuristResearch: 0, FSTransformationFetishistResearch: 0, FSYouthPreferentialistResearch: 0, FSMaturityPreferentialistResearch: 0, FSSlimnessEnthusiastResearch: 0, FSAssetExpansionistResearch: 0, FSPastoralistResearch: 0, FSPhysicalIdealistResearch: 0, FSRepopulationFocusResearch: 0, FSRestartResearch: 0, embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0}>>
+ <<set $activeArcology = {name: "Arcology X-", direction: "north", government: "an individual", leaderID: 0, honeymoon: 0, prosperity: 50, ownership: 50, minority: 20, PCminority: 0, demandFactor: 0, FSSupremacist: "unset", FSSubjugationist: "unset", FSRestart: "unset", FSRepopulationFocus: "unset", FSGenderRadicalist: "unset", FSGenderFundamentalist: "unset", FSPaternalist: "unset", FSDegradationist: "unset", FSBodyPurist: "unset", FSTransformationFetishist: "unset", FSYouthPreferentialist: "unset", FSMaturityPreferentialist: "unset", FSSlimnessEnthusiast: "unset", FSAssetExpansionist: "unset", FSPastoralist: "unset", FSPhysicalIdealist: "unset", FSChattelReligionist: "unset", FSRomanRevivalist: "unset", FSEgyptianRevivalist: "unset", FSEdoRevivalist: "unset", FSArabianRevivalist: "unset", FSChineseRevivalist: "unset", FSNull: "unset", FSGenderRadicalistResearch: 0, FSGenderFundamentalistResearch: 0, FSPaternalistResearch: 0, FSDegradationistResearch: 0, FSBodyPuristResearch: 0, FSTransformationFetishistResearch: 0, FSYouthPreferentialistResearch: 0, FSMaturityPreferentialistResearch: 0, FSSlimnessEnthusiastResearch: 0, FSAssetExpansionistResearch: 0, FSPastoralistResearch: 0, FSPhysicalIdealistResearch: 0, FSRepopulationFocusResearch: 0, FSRestartResearch: 0, embargo: 1, embargoTarget: -1, influenceTarget: -1, influenceBonus: 0, rival: 0}>>
<<if $i == 0>>
<<set $activeArcology.direction = 0>>
<<set $activeArcology.name = "Arcology X-4">>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 2a621f2ff49..8adf580ea84 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -552,8 +552,23 @@ Genitalia:
<br>
<<if $PC.boobs > 0>>
- Chest: ''breasts''. Sex scene variations; more difficult reputation maintenance.
- [[Remove breasts|Intro Summary][$PC.boobs = 0]]
+ Chest:
+ <<if $PC.boobsBonus == 2>>
+ ''huge breasts''.
+ <<elseif $PC.boobsBonus == -1>>
+ ''average breasts''.
+ <<else>>
+ ''breasts''.
+ <</if>>
+ Sex scene variations; more difficult reputation maintenance.
+ [[Remove breasts|Intro Summary][$PC.boobs = 0, $PC.boobsBonus = 0]]
+ <<if $PC.boobsBonus == -1>>
+ | [[Bigger|Intro Summary][$PC.boobsBonus = 0]]
+ <<elseif $PC.boobsBonus == 2>>
+ | [[Smaller|Intro Summary][$PC.boobsBonus = 0]]
+ <<else>>
+ | [[Smaller|Intro Summary][$PC.boobsBonus = -1]] | [[Bigger|Intro Summary][$PC.boobsBonus = 2]]
+ <</if>>
<<else>>
Chest: ''masculine''. Standard sex scenes; easier reputation maintenance.
[[Add breasts|Intro Summary][$PC.boobs = 1]]
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index ccbbc3dd473..758276af2ba 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -131,6 +131,111 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
//You lack the necessary funds to enslave a crown prince.//
<</if>>
<br><br>
+<<if ($cash >= 100000) and ($rep >= 10000)>>
+<br><<link "Leverage your substantial reputation and a huge sum of credits to aid the new arcology in exchange for both the prince and 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 prince and princess aboard, clad in chains and bound face to face in a forced embrace, and make a direct course towards your waiting penthouse.
+<br><br>
+ Eventually they arrives in your penthouse, faces flush with embarrassment of their compromising position. The former prince is beside himself with rage, but seems to be holding himself back for his little sister's sake, while she struggles to maintin a facade of poise and grace. 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. However, the prince's submission to life as a slave is another question entirely.
+ <<set $cash -= 100000>>
+ <<set $rep -= 10000>>
+ /* princess */
+ <<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 = 0>>
+ <<set $activeSlave.foreskin = 0>>
+ <<set $activeSlave.balls = 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")>>
+ <<if $familyTesting == 1>>
+ <<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
+ <<set $activeSlave.father = $missingParentID>>
+ <<set $missingParentID-->>
+ <<else>>
+ <<set $activeSlave.relation = "sister">>
+ <<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
+ <</if>>
+ <<set _princess = $activeSlave>>
+ <<AddSlave _princess>>
+ /* prince */
+ <<set $activeSlave.ID = $activeSlave.ID + 1000>>
+ <<set $activeSlave.actualAge = $activeSlave.actualAge+1>>
+ <<set $activeSlave.visualAge = $activeSlave.actualAge>>
+ <<set $activeSlave.physicalAge = $activeSlave.actualAge>>
+ <<set $activeSlave.slaveName = $activeSlave.birthName>>
+ <<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.prostate = 1>>
+ <<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 = 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")>>
+ <<if $familyTesting == 0>>
+ <<set $activeSlave.relation = "sister">>
+ <<set $activeSlave.relationTarget = $activeSlave.ID - 1000>>
+ <</if>>
+ <<AddSlave $activeSlave>>
+ <br><br>
+<</replace>>
+<</link>> // You will need to utilize a sizable portion of your reputation and ¤100000 to enslave them.//
+<<else>>
+ //You lack the necessary funds and reputation to enslave both the crown prince and princess.//
+<</if>>
+<br><br>
<<if $cash >= 25000>>
<br><<link "Transfer a respectable quantity of credits for a handful of court ladies">>
<<replace "#result">>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index ee262e48a37..a3bdedb6a91 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -196,7 +196,7 @@
<</if>>
<</if>>
-<<if _stewardessImpregnated == 1>>
+<<if $arcologies[0].FSRestart != "unset" && _stewardessImpregnated == 1>>
The Societal Elite know you've ordered $Stewardess.slaveName to impregnate your maids. @@.red;They are not amused by your disenterest in eugenics.@@
<<set $failedElite += 10>>
<</if>>
--
GitLab