From b5af810c7c9dd70df8feaccf08f190b07c65b0f8 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 8 Mar 2018 21:46:30 -0500
Subject: [PATCH] possible ghost exorcised and goto precedence bug fix
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 2 +
src/uncategorized/REroyalblood.tw | 104 +++++++++----------
src/uncategorized/scheduledEvent.tw | 6 +-
3 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index f667e0eed2c..bd38b589e4b 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -9,6 +9,8 @@
-your BG nows considers servants and your harem in her count
-a race now no longer be both superior and inferior
-slaves can now die of age as young as 50 should they be in bad condition, conversely, healthy slaves live longer
+ -reordered full royal court enslavement to circumvent a possible ghost in the machine situation
+ -partial revert to scheduledEvent to handle sugarcube BS
386
-tweaked childgen to only random face and int for playerXmarked if the child is below the minimum value
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 93375421212..be1afe96db5 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -871,6 +871,42 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
You take a tablet and transmit a communication request to the new arcology owner with your intent. Once his shock wears off, he readily accepts with little need for negotiation. Soon, a flight of VTOLs land in the new arcology laden with goods. When they take off again they have the prince and princess, clad in chains and bound face to face in a forced embrace, the Queen, resigned to her fate and a gaggle of terrified court ladies.
<br><br>
Eventually they all arrive in your penthouse. The prince and princess are flushed with embarrassment in 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 maintain 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. The Queen, on the other hand, seems almost relieved and 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<<if $seePreg != 0>>, 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 ever so slightly rounded stomach protectively nonetheless<</if>>. Lastly, the ladies seem comforted by 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.
+ /* ladies */
+ <<for $i = 0; $i < 3; $i++>>
+ <<set $activeSlaveOneTimeMinAge = 21>>
+ <<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 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 = 0>>
+ <<set $activeSlave.foreskin = 0>>
+ <<set $activeSlave.balls = 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>> /* skip New Slave Intro */
+ <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
+ <</for>>
/* princess */
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 19>>
@@ -1015,12 +1051,27 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $missingParentID-->>
<<set _queen = clone($activeSlave)>>
<<AddSlave _queen>> /* skip New Slave Intro */
+ <</replace>>
+<</link>> // It will cost about <<print cashFormat(2500000)>> to enslave the entire court.//
+<<elseif $familyTesting == 1>>
+ <br>//You lack the necessary funds to enslave the entire court.//
+<</if>>
+
+<<if $securityForceActive == 1 && $familyTesting == 1>>
+<br><<link "Dispatch $securityForceName on a night time raid to take everything of value.">>
+ <<replace "#result">>
+ <<set _loot = random(10,300)*100>>
+ Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the prince and princess, clad in chains and bound face to face in a forced embrace, the Queen, resigned to her fate, a gaggle of terrified court ladies and as much loot as they could carry.
+ <br><br>
+ Eventually they all arrive in your penthouse. The prince and princess are flushed with embarrassment in 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 maintain 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. The Queen, on the other hand, seems almost relieved and 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<<if $seePreg != 0>>, 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 ever so slightly rounded stomach protectively nonetheless<</if>>. Lastly, the ladies seem comforted by 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. You also scored @@.yellowgreen;<<print cashFormat(_loot)>>@@ in valuables from the raid.
+ <<set $arcologies[0].prosperity = 2>>
+ <<set $rep = 0>>
/* ladies */
<<for $i = 0; $i < 3; $i++>>
<<set $activeSlaveOneTimeMinAge = 21>>
<<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 for credits.">>
+ <<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$securityForceName+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
<<set $activeSlave.prestige = 1>>
@@ -1051,21 +1102,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<AddSlave $activeSlave>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</for>>
- <</replace>>
-<</link>> // It will cost about <<print cashFormat(2500000)>> to enslave the entire court.//
-<<elseif $familyTesting == 1>>
- <br>//You lack the necessary funds to enslave the entire court.//
-<</if>>
-
-<<if $securityForceActive == 1 && $familyTesting == 1>>
-<br><<link "Dispatch $securityForceName on a night time raid to take everything of value.">>
- <<replace "#result">>
- <<set _loot = random(10,300)*100>>
- Seizing a tablet, you quickly send a message to The Colonel. After dark, a flight of VTOLs land in the new arcology laden with troops. When they take off again they have the prince and princess, clad in chains and bound face to face in a forced embrace, the Queen, resigned to her fate, a gaggle of terrified court ladies and as much loot as they could carry.
- <br><br>
- Eventually they all arrive in your penthouse. The prince and princess are flushed with embarrassment in 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 maintain 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. The Queen, on the other hand, seems almost relieved and 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<<if $seePreg != 0>>, 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 ever so slightly rounded stomach protectively nonetheless<</if>>. Lastly, the ladies seem comforted by 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. You also scored @@.yellowgreen;<<print cashFormat(_loot)>>@@ in valuables from the raid.
- <<set $arcologies[0].prosperity = 2>>
- <<set $rep = 0>>
/* princess */
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 19>>
@@ -1210,42 +1246,6 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $missingParentID-->>
<<set _queen = clone($activeSlave)>>
<<AddSlave _queen>> /* skip New Slave Intro */
- /* ladies */
- <<for $i = 0; $i < 3; $i++>>
- <<set $activeSlaveOneTimeMinAge = 21>>
- <<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 acquired by "+$securityForceName+".">>
- <<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 = 0>>
- <<set $activeSlave.foreskin = 0>>
- <<set $activeSlave.balls = 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>> /* skip New Slave Intro */
- <<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
- <</for>>
<</replace>>
<</link>> //You will loathed for this action and trade will be crippled.//
<</if>>
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index 1a4e0d5adb3..3b12a10d450 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -184,6 +184,7 @@
<<goto "SE nicaea preparation">>
<<else>>
<<set $nicaeaPreparation = 0>>
+ <<if $plot == 1>><<goto "Nonrandom Event">><<else>><<goto "Random Nonindividual Event">><</if>>
<</if>>
<<elseif ($nicaeaHeld != 1) && ($arcologies[0].FSChattelReligionist != "unset") && ($nicaeaInvolvement >= 0)>>
<<set $nicaeaRollA = random(-1,0), $nicaeaRollB = random(-1,0), $nicaeaRollC = random(-1,0)>>
@@ -194,10 +195,7 @@
<<elseif (Math.trunc($week/24) == ($week/24)) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance >= 1>>
<<goto "securityForceTradeShow">>
-<</if>>
-
-/* Nobody else to take us home? */
-<<if $plot == 1>>
+<<elseif $plot == 1>>
<<goto "Nonrandom Event">>
<<else>>
<<goto "Random Nonindividual Event">>
--
GitLab