From d801d420c01361a54e050bb74ff5741578cc7260 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 1 Nov 2018 20:41:45 -0400
Subject: [PATCH] fixes and removed traitors from their temporal hole
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 +
slave variables documentation - Pregmod.txt | 2 +-
src/init/storyInit.tw | 1 +
src/pregmod/saClothes.tw | 107 ++++++++++--------
src/uncategorized/BackwardsCompatibility.tw | 3 +
src/uncategorized/REroyalblood.tw | 4 +
src/uncategorized/nextWeek.tw | 1 +
src/uncategorized/pCoupAttempt.tw | 34 ++++++
src/uncategorized/pCoupCollaboration.tw | 37 +++++-
src/uncategorized/pCoupLoss.tw | 34 +++++-
src/uncategorized/pTraitorMessage.tw | 64 ++++++++++-
src/uncategorized/pUndergroundRailroad.tw | 2 +
.../reFSEgyptianRevivalistAcquisition.tw | 17 +--
13 files changed, 246 insertions(+), 66 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 07811937800..5fe56375f7a 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,12 @@
0.10.7.1-0.10.x
+11/01/2018
+
+ 41
+ -fixes
+ -traitor slave no longer exists outside the realm of time
+
10/31/2018
40
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index e815290adab..bcc25a9850c 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -1244,7 +1244,7 @@ hStyle:
hair style
accepts string
-"shaved bald"
+"shaved"
"buzzcut"
"trimmed"
"afro"
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index ea974b0dbf8..61dd250983a 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1017,6 +1017,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $collaboration = 0>>
<<set $traitor = 0>>
+<<set $traitorWeeks = 0>>
<<set $hackerSupport = 0>>
<<set $hostage = 0>>
<<set $hostageAnnounced = 0>>
diff --git a/src/pregmod/saClothes.tw b/src/pregmod/saClothes.tw
index 45772a6b794..21b3659e348 100644
--- a/src/pregmod/saClothes.tw
+++ b/src/pregmod/saClothes.tw
@@ -559,63 +559,72 @@
<</if>>
<</if>>
-<<if ($slaves[$i].shoes == "heels")>>
- <<if ($slaves[$i].amp < 0)>>
- $His P-Limb legs work just as well in heels as they do out of them.
- <<elseif $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
- <<if $slaves[$i].devotion < -20>>
- $He @@.mediumorchid;resents being forced@@ to wear high heels.
- <<set $slaves[$i].devotion -= 2>>
+<<if $slaves[$i].amp < 1>>
+ <<if ($slaves[$i].shoes == "heels")>>
+ <<if ($slaves[$i].amp < 0)>>
+ $His P-Limb legs work just as well in heels as they do out of them.
+ <<elseif $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
+ <<if $slaves[$i].devotion < -20>>
+ $He @@.mediumorchid;resents being forced@@ to wear high heels.
+ <<set $slaves[$i].devotion -= 2>>
+ <</if>>
<</if>>
- <</if>>
-<<elseif ($slaves[$i].shoes == "boots")>>
- <<if ($slaves[$i].amp < 0)>>
- $His P-Limb legs work just as well in boots as they do out of them.
- <<elseif $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
- <<if $slaves[$i].devotion < -20>>
- $He @@.mediumorchid;resents being forced@@ to wear high heeled boots.
- <<set $slaves[$i].devotion -= 2>>
+ <<elseif ($slaves[$i].shoes == "boots")>>
+ <<if ($slaves[$i].amp < 0)>>
+ $His P-Limb legs work just as well in boots as they do out of them.
+ <<elseif $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
+ <<if $slaves[$i].devotion < -20>>
+ $He @@.mediumorchid;resents being forced@@ to wear high heeled boots.
+ <<set $slaves[$i].devotion -= 2>>
+ <</if>>
<</if>>
- <</if>>
-<<elseif ($slaves[$i].shoes == "extreme heels")>>
- <<if ($slaves[$i].amp < 0)>>
- $His P-Limb legs work just as well in extreme heels as they do out of them.
- <<elseif $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
- <<if $slaves[$i].devotion < -20>>
- $He @@.mediumorchid;resents being forced@@ to wear @@.gold;painfully@@ high heels.
- <<set $slaves[$i].devotion -= 2>>
- <<set $slaves[$i].trust -= 2>>
- <<elseif ($slaves[$i].fetish == "masochist")>>
- It is difficult to walk in $his extreme heels, but $he
- <<if ($slaves[$i].fetishKnown == 0)>>
- seems to enjoy every painful step; $he's a @@.lightcoral;natural masochist.@@
- <<set $slaves[$i].fetishKnown = 1>>
+ <<elseif ($slaves[$i].shoes == "extreme heels")>>
+ <<if ($slaves[$i].amp < 0)>>
+ $His P-Limb legs work just as well in extreme heels as they do out of them.
+ <<elseif $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
+ <<if $slaves[$i].devotion < -20>>
+ $He @@.mediumorchid;resents being forced@@ to wear @@.gold;painfully@@ high heels.
+ <<set $slaves[$i].devotion -= 2>>
+ <<set $slaves[$i].trust -= 2>>
+ <<elseif ($slaves[$i].fetish == "masochist")>>
+ It is difficult to walk in $his extreme heels, but $he
+ <<if ($slaves[$i].fetishKnown == 0)>>
+ seems to enjoy every painful step; $he's a @@.lightcoral;natural masochist.@@
+ <<set $slaves[$i].fetishKnown = 1>>
+ <<else>>
+ @@.hotpink;appreciates@@ every painful step $he gets to take.
+ <<set $slaves[$i].devotion += 1>>
+ <</if>>
<<else>>
- @@.hotpink;appreciates@@ every painful step $he gets to take.
+ $He is kept @@.hotpink;mindful@@ and @@.gold;fearful@@ by the difficulty of walking in $his extreme heels.
<<set $slaves[$i].devotion += 1>>
+ <<set $slaves[$i].trust -= 1>>
+ <</if>>
+ They're so high they're a bit @@.red;unhealthy@@ for $his legs.
+ <<set $slaves[$i].health -= 2>>
+ <</if>>
+ <<else>>
+ <<if ($slaves[$i].heels == 1) && !canWalk($slaves[$i]) && ($slaves[$i].fetish != "mindbroken")>>
+ <<if $slaves[$i].shoes == "pumps">>
+ While $he can barely stand with $his heeled pumps, $he is incapable of taking a step in them.
+ <</if>>
+ <<if ($slaves[$i].devotion >= -20) && ($slaves[$i].fetish == "submissive") && ($slaves[$i].fetishKnown == 1)>>
+ $He @@.hotpink;loves being forced@@ to crawl around like some kind of animal.
+ <<set $slaves[$i].devotion += 1>>
+ <<elseif $slaves[$i].devotion > 50>>
+ $He accepts being forced to crawl around on all fours.
+ <<else>>
+ $He @@.mediumorchid;resents being forced@@ to crawl around like some kind of animal, but it keeps $him properly @@.gold;afraid.@@
+ <<set $slaves[$i].devotion -= 2, $slaves[$i].trust -= 4>>
<</if>>
- <<else>>
- $He is kept @@.hotpink;mindful@@ and @@.gold;fearful@@ by the difficulty of walking in $his extreme heels.
- <<set $slaves[$i].devotion += 1>>
- <<set $slaves[$i].trust -= 1>>
<</if>>
- They're so high they're a bit @@.red;unhealthy@@ for $his legs.
- <<set $slaves[$i].health -= 2>>
<</if>>
<<else>>
- <<if ($slaves[$i].heels == 1) && !canWalk($slaves[$i]) && ($slaves[$i].fetish != "mindbroken")>>
- <<if $slaves[$i].shoes == "pumps">>
- While $he can barely stand with $his heeled pumps, $he is incapable of taking a step in them.
- <</if>>
- <<if ($slaves[$i].devotion >= -20) && ($slaves[$i].fetish == "submissive") && ($slaves[$i].fetishKnown == 1)>>
- $He @@.hotpink;loves being forced@@ to crawl around like some kind of animal.
- <<set $slaves[$i].devotion += 1>>
- <<elseif $slaves[$i].devotion > 50>>
- $He accepts being forced to crawl around on all fours.
- <<else>>
- $He @@.mediumorchid;resents being forced@@ to crawl around like some kind of animal, but it keeps $him properly @@.gold;afraid.@@
- <<set $slaves[$i].devotion -= 2, $slaves[$i].trust -= 4>>
- <</if>>
+ <<if $slaves[$i].shoes != "none">>
+ <<set $slaves[$i].shoes = "none">>
+ <</if>>
+ <<if $slaves[$i].legAccessory != "none">>
+ <<set $slaves[$i].legAccessory = "none">>
<</if>>
<</if>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 5815557a8e0..d3d678e178a 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2199,6 +2199,9 @@ Setting missing global variables:
<<if ndef $pregInventions>>
<<set $pregInventions = 0>>
<</if>>
+<<if ndef $traitorWeeks>>
+ <<set $traitorWeeks = 0>>
+<</if>>
/* Job Fulfillment Center */
<<if ndef $JFCOrder>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 28e56a6bc01..596f9594d94 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -539,6 +539,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<</link>> //You will be despised for this action, and trade will be greatly damaged.//
<</if>>
+<<if $cash >= 500000>>
<br><<link "Offer a generous amount of cash in exchange for both the Queen and her court ladies.">>
<<replace "#result">>
<<set $cash -= 500000>>
@@ -592,6 +593,8 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<run newSlave(_queen)>> /* skip New Slave Intro */
<</replace>>
<</link>> // It will cost about <<print cashFormat(500000)>> to enslave the Queen and her court ladies.//
+<<else>>
+<</if>>
<<if $securityForceActive == 1>>
<br><<link "Dispatch $securityForceName on a night time raid to acquire the Queen and her court ladies.">>
<<replace "#result">>
@@ -647,6 +650,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<run newSlave(_queen)>> /* skip New Slave Intro */
<</replace>>
<</link>> //You will be despised for this action, and trade will be greatly damaged.//
+ <br>//You lack the necessary funds to enslave the Queen and her ladies.//
<</if>>
<<if $cash >= 2500000 && $familyTesting == 1>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index c8a9e955591..2d0ecf86c63 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -354,6 +354,7 @@
<</if>>
<<if $boomerangWeeks>><<set $boomerangWeeks++>><<else>><<set $boomerangSlave = 0>><</if>>
+<<if $traitorWeeks>><<set $traitorWeeks++>><</if>>
<<set $thisWeeksFSWares = $merchantFSWares.randomMany(2)>>
<<set $thisWeeksIllegalWares = $merchantIllegalWares.randomMany(1)>>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index aced0544a0c..88e9dcbca37 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -1,6 +1,40 @@
:: P coup attempt [nobr]
<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $daughtersVictory = 1>>
+<<set _weeks = $taitorWeeks, _pregWeeks = $taitorWeeks, $taitorWeeks = 0>>
+
+<<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */
+<<set WombUpdatePregVars($traitor)>>
+<<if WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/
+ <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>>
+ <<set WombFlush($traitor)>>
+<<else>>/* still pregnant slave */
+ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+ <<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+<</if>>
+<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
+
+<<if $traitor.bald != 1>>
+ <<if ($traitor.hLength < 150)>>
+ <<set $traitor.hLength += _weeks>>
+ <</if>>
+<</if>>
+<<if $seeAge != 0>>
+ <<for _weeks > 0>>
+ <<set $traitor.birthWeek++>>
+ <<if $traitor.birthWeek >= 52>>
+ <<set $traitor.birthWeek = 0>>
+ <<if $seeAge == 1>>
+ <<set $traitor.physicalAge += 1, $traitor.actualAge += 1, $traitor.visualAge += 1>>
+ <<set $traitor.ovaryAge += either(.8, .9, .9, 1, 1, 1, 1.1)>>
+ <<if $traitor.physicalAge <= 18 && $loliGrow == 0>>
+ <<PhysicalDevelopment $traitor>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set _weeks-->>
+ <</for>>
+<</if>>
You are awakened in the middle of the night by a jolt that shakes the entire arcology, accompanied by a distant boom. It is followed by the wail of the arcology's alarm systems, and then finally by a faint crackle that grows to a constant chatter of gunfire. Main power goes out, and you claw your way in the darkness to the video feeds, running on emergency backup. The Daughters of Liberty have more sympathizers in the arcology than even you suspected, and they're well armed and have the element of surprise. <<if $arcologies[0].FSRomanRevivalistLaw == 1>>$arcologies[0].name, however, is home to a society that cannot be surprised, for each and every one of its citizens is armed and trained for instant contribution to the defense of Rome. Even as you do your best to reestablish control, you hear a thunderous, ubiquitous roar from all around you. Your citizens are already getting into the fight.<</if>>
diff --git a/src/uncategorized/pCoupCollaboration.tw b/src/uncategorized/pCoupCollaboration.tw
index ea6b13c5a10..2c9b37a9b72 100644
--- a/src/uncategorized/pCoupCollaboration.tw
+++ b/src/uncategorized/pCoupCollaboration.tw
@@ -1,10 +1,41 @@
-:: P coup collaboration
+:: P coup collaboration [nobr]
+
+<<set _weeks = $taitorWeeks, _pregWeeks = $taitorWeeks, $taitorWeeks = 0>>
+<<setLocalPronouns $traitor>>
+<<run Enunciate($traitor)>>
+
+<<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */
+<<set WombUpdatePregVars($traitor)>>
+<<if WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/
+ <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>>
+ <<set WombFlush($traitor)>>
+<<else>>/* still pregnant slave */
+ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+ <<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+<</if>>
+<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
You are awakened in the middle of the night by an odd darkness. All the normal lights of your healthy arcology are out. Main power has gone out, and you claw your way in the darkness to the video feeds, running on emergency backup.
-Armed rebels are running unchecked down the corridors. <<if $mercenaries > 0>>Your mercenaries' quarters is locked down, but from the interior feeds you can see a few of them lying in their beds or slumped in chairs as gas is pumped through the ventilation systems. <</if>>The security drones are actively assisting the rebels. You can see $traitor.slaveName on one of the feeds, encouraging her fellow fighters with yells, and when that fails, leading them by example. In areas already controlled by the Daughters, slaveowners are being summarily shot in the streets. "<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are in complete control of all arcology systems. Remain here."
+<br><br>
+
+Armed rebels are running unchecked down the corridors. <<if $mercenaries > 0>>Your mercenaries' quarters is locked down, but from the interior feeds you can see a few of them lying in their beds or slumped in chairs as gas is pumped through the ventilation systems. <</if>>The security drones are actively assisting the rebels. You can see
+<<if $traitor.bellyPreg >= 100000>>
+ the staggeringly pregnant
+<<elseif $traitor.bellyPreg >= 15000>>
+ the heavily pregnant
+<<elseif $traitor.bellyPreg >= 10000>>
+ the very pregnant
+<<elseif $traitor.bellyPreg >= 5000>>
+ the pregnant
+<</if>>
+$traitor.slaveName on one of the feeds, encouraging $his fellow fighters with yells, and when that fails, leading them by example. In areas already controlled by the Daughters, slaveowners are being summarily shot in the streets. "<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are in complete control of all arcology systems. Remain here."
+
+<br><br>
+
+After half an hour of watching the executions, $traitor.slaveName <<if $traitor.bellyPreg >= 10000>>waddles<<else>>strides<</if>> confidently into your office. You greet $him by name, in response to which $he deals you a vicious open-handed slap that knocks you out of your chair. <<if $traitor.slaveName != $traitor.birthName>>"My name," $he <<say>>s, "i<<s>> <<if SlaveStatsChecker.checkForLisp($traitor)>><<= lispReplace($traitor.birthName)>><<else>>$traitor.birthName<</if>>."<<else>>"You <<s>>tupid fuck," $he <<say>>s.<</if>> Your cause of death is that of many an oppressor - an aneurysm of the cerebellum, in 9mm Parabellum.
-After half an hour of watching the executions, $traitor.slaveName strides confidently into your office. You greet her by name, in response to which she deals you a vicious open-handed slap that knocks you out of your chair. <<if $traitor.slaveName != $traitor.birthName>>"My name," she says, "is $traitor.birthName."<<else>>"You stupid fuck," she says.<</if>> Your cause of death is that of many an oppressor - an aneurysm of the cerebellum, in 9mm Parabellum.
+<br><br>
''GAME OVER''
diff --git a/src/uncategorized/pCoupLoss.tw b/src/uncategorized/pCoupLoss.tw
index b5aa4780516..7ed6d537207 100644
--- a/src/uncategorized/pCoupLoss.tw
+++ b/src/uncategorized/pCoupLoss.tw
@@ -1,11 +1,41 @@
-:: P coup loss
+:: P coup loss [nobr]
+
+<<set _weeks = $taitorWeeks, _pregWeeks = $taitorWeeks, $taitorWeeks = 0>>
+<<setLocalPronouns $traitor>>
+
+<<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */
+<<set WombUpdatePregVars($traitor)>>
+<<if WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/
+ <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>>
+ <<set WombFlush($traitor)>>
+<<else>>/* still pregnant slave */
+ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+ <<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+<</if>>
+<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
You are awakened in the middle of the night by a jolt that shakes the entire arcology, accompanied by a distant boom. It is followed by another, and another, and then the wail of the arcology's alarm systems, and then finally by a faint crackle that grows to a constant chatter of gunfire. Main power goes out, and you claw your way in the darkness to the video feeds, running on emergency backup.
-<<if $mercenaries > 0>>Sheets of flame are pouring from your mercenaries' quarters; it seems they were among the first targets for bombs. <</if>>Heavy gunfire is bringing down security drones by the scores. The attackers seem to have figured out where the drone hangars are, and are laying down fire on the exits the drones must use to get into action. <<if $traitor != 0>>You can see $traitor.slaveName on one of the feeds, encouraging her fellow fighters with yells, and when that fails, leading them by example. <</if>> In areas already controlled by your enemies, slaveowners are being summarily shot in the streets. <<if $hackerSupport == 1>>"<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant quantity of arms and explosives into the arcology.<<else>>"<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant qua - zzzt -" There is nothing more from the computer systems.<</if>>
+<br><br>
+
+<<if $mercenaries > 0>>Sheets of flame are pouring from your mercenaries' quarters; it seems they were among the first targets for bombs. <</if>>Heavy gunfire is bringing down security drones by the scores. The attackers seem to have figured out where the drone hangars are, and are laying down fire on the exits the drones must use to get into action. <<if $traitor != 0>>You can see
+<<if $traitor.bellyPreg >= 100000>>
+ the staggeringly pregnant
+<<elseif $traitor.bellyPreg >= 15000>>
+ the heavily pregnant
+<<elseif $traitor.bellyPreg >= 10000>>
+ the very pregnant
+<<elseif $traitor.bellyPreg >= 5000>>
+ the pregnant
+<</if>>
+$traitor.slaveName on one of the feeds, encouraging $his fellow fighters with yells, and when that fails, leading them by example<<if $traitor.bellyPreg >= 15000>> as best $he can<</if>>. <</if>> In areas already controlled by your enemies, slaveowners are being summarily shot in the streets. <<if $hackerSupport == 1>>"<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant quantity of arms and explosives into the arcology.<<else>>"<<= properTitle()>>," $assistantName says, "the Daughters of Liberty are attempting a coup. They appear to have smuggled a significant qua - zzzt -" There is nothing more from the computer systems.<</if>>
+
+<br><br>
<<if $traitor != 0>>If this were a movie, $traitor.slaveName would be the one to kill you after a desperate struggle in your office. Reality does not have such a refined sense of drama. <</if>>If the Daughters had any plans to take you alive, they are lost to the exigencies of combat. Your penthouse remains locked down, forcing them to use breaching charges to make an entrance. These prove entirely too effective, and your last impression is of the floor heaving bodily up toward the ceiling.
+<br><br>
+
''GAME OVER''
<<set $ui = "start">>
diff --git a/src/uncategorized/pTraitorMessage.tw b/src/uncategorized/pTraitorMessage.tw
index 5769db4e381..377cc4d96a3 100644
--- a/src/uncategorized/pTraitorMessage.tw
+++ b/src/uncategorized/pTraitorMessage.tw
@@ -1,9 +1,67 @@
:: P traitor message [nobr]
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Random Nonindividual Event">>
+<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event">>
+<<set _weeks = $taitorWeeks, _pregWeeks = $taitorWeeks, $taitorWeeks = 1>>
+<<setLocalPronouns $traitor>>
-The month after freeing $traitor.slaveName, you receive another message from the Daughters of Liberty. This one contains a video. It shows $traitor.slaveName sitting quietly at a table, wearing comfortable clothes and eating a nice meal. She looks a little bewildered, but there's an obvious happiness to her, it's impossible to deny. She seems unaware she's being recorded.
+/* ------------------ pregnancy setup start here----------------- */
+
+<<if $traitor.preg > 0>>
+ <<set _wasPreg = 1>>
+<<else>>
+ <<set _wasPreg = 0>>
+<</if>>
+
+<<set WombProgress($traitor, _pregWeeks)>> /* In all cases should be done */
+<<set WombUpdatePregVars($traitor)>>
+<<if $traitor.broodmother > 0>> /* Broodmother implant is assumed as removed.*/
+ <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 37), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0, $traitor.broodmother == 0, $traitor.broodmotherFetuses = 0>>
+ <<set WombFlush($traitor)>>
+<<elseif WombBirthReady($traitor, 40) > 0 >> /* normal birth case, partial birthers not supported*/
+ <<set $traitor.preg = -1, $traitor.birthsTotal += WombBirthReady($traitor, 40), $traitor.pregType = 0, $traitor.pregSource = 0, $traitor.pregWeek = 0, $traitor.pregKnown = 0>>
+ <<set WombFlush($traitor)>>
+<<else>>/* still pregnant slave */
+ <<set $traitor.preg = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+ <<set $traitor.pregWeek = WombMaxPreg($traitor)>> /*most ready fetus is a base*/
+<</if>>
+<<run SetBellySize($traitor)>> /*In any case it's useful to do.*/
+
+<<if $traitor.preg > 0>>
+ <<set _isPreg = 1>>
+<<else>>
+ <<set _isPreg = 0>>
+<</if>>
+
+/* ------------------ pregnancy setup end here-----------------
+ As no broodmother cases in code below, it's no need to setup every case of impregnation through new system. Backup mechanic will do it for normal pregnancies.
+*/
+
+<<if $traitor.hStyle == "shaved">>
+ <<set $traitor.hStyle = "strip">>
+<</if>>
+<<if $traitor.bald != 1>>
+ <<if ($traitor.hLength < 150)>>
+ <<set $traitor.hLength += _weeks>>
+ <</if>>
+<</if>>
+<<if $seeAge != 0>>
+ <<for _weeks > 0>>
+ <<set $traitor.birthWeek++>>
+ <<if $traitor.birthWeek >= 52>>
+ <<set $traitor.birthWeek = 0>>
+ <<if $seeAge == 1>>
+ <<set $traitor.physicalAge += 1, $traitor.actualAge += 1, $traitor.visualAge += 1>>
+ <<set $traitor.ovaryAge += either(.8, .9, .9, 1, 1, 1, 1.1)>>
+ <<if $traitor.physicalAge <= 18 && $loliGrow == 0>>
+ <<PhysicalDevelopment $traitor>>
+ <</if>>
+ <</if>>
+ <</if>>
+ <<set _weeks-->>
+ <</for>>
+<</if>>
+
+The month after freeing $traitor.slaveName, you receive another message from the Daughters of Liberty. This one contains a video. It shows $traitor.slaveName sitting quietly at a table<<if _wasPreg != _isPreg>>, no longer clearly pregnant<</if>>, wearing comfortable clothes and eating a nice meal. $He looks a little bewildered, but there's an obvious happiness to $him, it's impossible to deny. $He seems unaware $he's being recorded.
<br><br>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index c273651108e..dbcc6953f5a 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -97,8 +97,10 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<<set $activeSlave.relationshipTarget = 0, $activeSlave.relationship = 0>>
<<if def $i>><<set $slaves[$i].relationshipTarget = 0, $slaves[$i].relationship = 0>><<else>>@@.red;Error, relationshipTarget not found.@@<</if>>
<</if>>
+ <<set $taitorWeeks = 1>>
<<set $traitor = clone($activeSlave)>>
<<set $traitor.assignment = "rest">>
+ <<set $traitor.inflation = 0, $traitor.inflationType = "none", $traitor.inflationMethod = 0, SetBellySize($traitor)>>
<<set $traitorStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, traitorMother: [], traitorFather: [], traitorPregSources: [], traitorMotherTank: [], traitorFatherTank: [], traitorBody: 0}>>
<<if $familyTesting == 1>>
<<if $traitor.ID == $PC.pregSource>>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
index 2b0c2fde6ec..8f8d65e0c98 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
@@ -1,4 +1,5 @@
:: RE FSEgyptianRevivalist acquisition [nobr]
+
/* Written and coded by Boney M */
<<set $nextButton = "Continue">>
@@ -35,17 +36,17 @@
<<if ($activeSlave.dick > 0) && ($activeSlave.balls == 0)>><<set $activeSlave.balls = random(1,5)>><</if>>
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. She lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
-
+<br><br>
This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. In this case, however, the story is more unusual - the callers seem stressed, but otherwise normal. They haltingly and quietly explain, with many nervous glances off-camera to ensure they are not overheard, that they are both siblings and lovers, and their attempts to keep the truth of the nature of their relationship from their friends, family, and society at large have failed. They had heard of $arcologies[0].name's reverence for incestuous relationships, and have managed to talk themselves into the questionable conclusion that their only chance to be together was for them to sell themselves to someone who would not just accept but encourage their incest - namely, you.
-
+<br><br>
//Enslaving them will cost <<print cashFormat($contractCost)>>. Selling them immediately will bring in approximately <<print cashFormat($slaveCost*2)>>.//
-
-<<include "Long Slave Description">>\
-
+<br><br>
+<<include "Long Slave Description">>
+<br><br>
<span id="result">
-<<if $cash >= $contractCost>>\
+<<if $cash >= $contractCost>>
[[Enslave the pair|RE FSEgyptianRevivalist acquisition workaround][$sibling = $activeSlave, $cash -= ($contractCost)]]
-<<else>>\
+<<else>>
//You lack the necessary funds to enslave them.//
-<</if>>\
+<</if>>
</span>
--
GitLab