diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 081296405b02a775e3cd3ea8e43dd297e7617003..08bf406babbc1af057e971d7800bd3a673b23955 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,15 @@
0.10.7.1-0.2.x
+5/27/2018
+
+ 6
+ -bodyswapping moved out of cheatmode
+ -prettied up former Elites
+ -tweaked breeding standard for fit focused physical idealist societies
+ -various minor text fixes
+ -fixes
+
5/26/2018
5
diff --git a/src/npc/removeActiveSlave.tw b/src/npc/removeActiveSlave.tw
index d34b57232b5e5599d42c11109d65e92e491d9bfe..9d2dd987304b54c96ca950f1599eab25460f46a6 100644
--- a/src/npc/removeActiveSlave.tw
+++ b/src/npc/removeActiveSlave.tw
@@ -78,9 +78,11 @@
<<if $slaves[_y].ID == $activeSlave.rivalryTarget>>
<<set $slaves[_y].rivalry = 0, $slaves[_y].rivalryTarget = 0>>
<</if>>
+ /* moved to saDevotion as a discovery event
<<if $slaves[_y].origBodyOwnerID == _ID>>
<<set $slaves[_y].origBodyOwnerID = 0>>
<</if>>
+ */
<</for>>
/* remove from Pit fighters list, if needed */
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index ba5f22726029354932f442234a90f4c61591538e..8db704ca15394250eb604d6c5ae623060e778e3f 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -120,25 +120,23 @@
<<set $activeSlave.career = "a member of the Societal Elite">>
<<set $activeSlave.prestige = either(2,2,3)>> /* 33% chance of getting level 3 prestige */
<<set $activeSlave.prestigeDesc = "She was a member of the Societal Elite.">>
- <<set $activeSlave.face = random(25,76)>>
+ <<set $activeSlave.face = random(70,100)>>
<<set $activeSlave.devotion = random(-10,-20)>>
<<set $activeSlave.trust = random(-20,-30)>>
- <<set $activeSlave.boobs = random(3,10)*100>>
+ <<if $activeSlave.boobShape == "saggy" || $activeSlave.boobShape == "downward-facing">>
+ <<set $activeSlave.boobShape = either("perky", "torpedo-shaped", "wide-set")>>
+ <</if>>
<<set $activeSlave.fetish = "mindbroken">>
<<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 = 75>>
- <<set $activeSlave.intelligence = either(0,-1, 1, 2,3)>>
+ <<set $activeSlave.weight = random(10,75)>>
+ <<set $activeSlave.intelligence = either(2,3)>>
<<set $activeSlave.intelligenceImplant = 1>>
- <<set $activeSlave.entertainSkill = -25>>
+ <<set $activeSlave.entertainSkill = 0>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(60,75)>>
<<set $activeSlave.canRecruit = 0>>
- <<set $activeSlave.behavioralFlaw = either("bitchy", "arrogant")>>
<<AddSlave $activeSlave>> /* skip New Slave Intro */
<<set $activeSlave.recruiter = 0>> /* override New Slave Intro */
<</if>>
@@ -155,28 +153,22 @@
<<set $activeSlave.career = "a member of the Societal Elite">>
<<set $activeSlave.prestige = either(2,2,3)>>
<<set $activeSlave.prestigeDesc = "She was a member of the Societal Elite.">>
- <<set $activeSlave.face = random(25,76)>>
+ <<set $activeSlave.face = random(70,100)>>
<<set $activeSlave.devotion = random(-10,-20)>>
<<set $activeSlave.trust = random(-20,-30)>>
- <<set $activeSlave.boobs = random(3,10)*100>>
<<if $eliteFate == 2 && random(1,100) >= 75>> /* 25% chance of getting mindbroken elites if they were abused */
<<set $activeSlave.fetish = "mindbroken">>
<</if>>
- <<set $activeSlave.vagina = 1>>
- <<set $activeSlave.dick = 0>>
- <<set $activeSlave.foreskin = 0>>
- <<set $activeSlave.balls = 0>>
- <<set $activeSlave.ovaries = 1>>
+ <<if $activeSlave.boobShape == "saggy" || $activeSlave.boobShape == "downward-facing">>
+ <<set $activeSlave.boobShape = either("perky", "torpedo-shaped", "wide-set")>>
+ <</if>>
<<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 = 75>>
+ <<set $activeSlave.weight = random(-30,75)>>
<<set $activeSlave.intelligence = either(0,-1, 1, 2,3)>>
<<set $activeSlave.intelligenceImplant = 1>>
- <<set $activeSlave.entertainSkill = -25>>
+ <<set $activeSlave.entertainSkill = 0>>
<<set $activeSlave.whoreSkill = 0>>
<<set $activeSlave.health = random(60,75)>>
<<set $activeSlave.canRecruit = 0>>
diff --git a/src/pregmod/huskSlaveSwap.tw b/src/pregmod/huskSlaveSwap.tw
index e15bf8918ee747402b38de4e11e6e844ca19b140..af77094c17f96f4501936113cc05d83aa93e3de6 100644
--- a/src/pregmod/huskSlaveSwap.tw
+++ b/src/pregmod/huskSlaveSwap.tw
@@ -28,7 +28,7 @@ $slaves[_m].slaveName's body was bought by the Flesh Heap for <<print cashFormat
$slaves[_myBody].slaveName is somwhat saddened to see her body leave forever.
<<elseif $slaves[_myBody].devotion >= -50>>
$slaves[_myBody].slaveName is @@.medimorchid;disturbed@@ to find her body is gone for good, damaging her @@.gold;ability to trust you.@@
- <<set $slaves[_myBody].devotion -= 10, $slaves[_myBody].trust -= 5>>
+ <<set $slaves[_myBody].devotion -= 30, $slaves[_myBody].trust -= 30>>
<<else>>
$slaves[_myBody].slaveName is @@.medimorchid;deeply upset@@ that she'll never see her body again. With so little left, she finds it easy to take vengeance by @@.orangered;completely rejecting your ownership of her.@@
<<set $slaves[_myBody].devotion -= 50, $slaves[_myBody].trust += 200>>
diff --git a/src/pregmod/widgets/bodySwapReaction.tw b/src/pregmod/widgets/bodySwapReaction.tw
index fb7999cc8b874987cee06431a767e2bad7ed18ef..098bc3570912791d4506afdb6cdd0b3af87f3b70 100644
--- a/src/pregmod/widgets/bodySwapReaction.tw
+++ b/src/pregmod/widgets/bodySwapReaction.tw
@@ -1038,7 +1038,7 @@ Now you only have to wait for her to wake up.
/*(pregnancy/belly changes)*/
<<set _weightChange = 0>> /*used to segway to weight after pregnancy/belly implants*/
- <<if $args[0].pregKnown == 1 && $args[0].preg > 0>>
+ <<if $args[0].pregKnown == 1 && $args[1].preg > 0>>
<br><br>
Her hands drift over her stomach,
<<if $args[0].bellyPreg < 100>>
@@ -1105,13 +1105,13 @@ Now you only have to wait for her to wake up.
<<if $args[0].fetish == "pregnancy">>
<<if $args[0].devotion >= 50>>
She @@.mediumorchid;scowls with momentary wrath@@ before regaining her composure. She resents being separated from her pregnancy<<if canGetPregnant($args[0])>>, though that is easily remedied<</if>>.
- <<set $args[0].devotion -= 3>>
+ <<set $args[0].devotion -= 5>>
<<elseif $args[0].devotion >= 20>>
She @@.mediumorchid;scowls angrily@@ at this turn of events<<if canGetPregnant($args[0])>>, though that will be easily remedied by putting another child in her<</if>>.
- <<set $args[0].devotion -= 5>>
+ <<set $args[0].devotion -= 10>>
<<else>>
She is filled with @@.mediumorchid;hatred for you@@ for snatching her pregnancy away from her.
- <<set $args[0].devotion -= 7>>
+ <<set $args[0].devotion -= 15>>
<</if>>
<<elseif $args[0].fetish != "mindbroken">>
<<if $args[0].devotion >= 50>>
@@ -1131,13 +1131,13 @@ Now you only have to wait for her to wake up.
<<if $args[0].fetish == "pregnancy">>
<<if $args[0].devotion >= 50>>
She @@.mediumorchid;scowls with momentary wrath@@ before regaining her composure. She resents being separated from her pregnancy<<if canGetPregnant($args[0])>>, though that is easily remedied<</if>>.
- <<set $args[0].devotion -= 3>>
+ <<set $args[0].devotion -= 5>>
<<elseif $args[0].devotion >= 20>>
She @@.mediumorchid;scowls angrily@@ at this turn of events<<if canGetPregnant($args[0])>>, though that will be easily remedied by putting another child in her<</if>>.
- <<set $args[0].devotion -= 5>>
+ <<set $args[0].devotion -= 10>>
<<else>>
She is filled with @@.mediumorchid;hatred for you@@ for snatching her pregnancy away from her.
- <<set $args[0].devotion -= 7>>
+ <<set $args[0].devotion -= 15>>
<</if>>
<<elseif $args[0].fetish != "mindbroken">>
<<if $args[0].devotion >= 50>>
@@ -1276,6 +1276,8 @@ Now you only have to wait for her to wake up.
<<set $args[0].trust += 2>>
<</if>>
<</if>>
+ <<else>>
+ stomach, though she finds little out of the ordinary<<if _weightChange == 1>>; other than the obvious, of course<</if>>.
<</if>>
<<if $args[0].navelPiercing != 0 && $args[1].navelPiercing == 0>>
She now has a piercing in her navel; she rolls her tummy<<if $args[0].belly >= 15000>>, a feat in and of itself<</if>>, fascinated by her new hardware grazing her stomach to the motion.
@@ -1634,6 +1636,19 @@ Now you only have to wait for her to wake up.
The changes to her tattoos were not lost on her, but compared to everything else, they were truly insignificant.
<</if>>
+ <<if $args[0].fetish != "mindbroken" && $args[0].origBodyOwnerID == $args[0].ID>>
+ This is her body alright. Some things might have changed,
+ <<if $args[0].devotion > 50>>
+ but she enjoyed the time they spent apart.
+ <<elseif $args[0].devotion >= -20>>
+ but @@.mediumaquamarine;it's good to be home.@@
+ <<set $args[0].trust += 15>>
+ <<else>>
+ but @@.mediumaquamarine;she's where she belongs.@@ Now to get it back the way @@.mediumorchid;she likes it.@@
+ <<set $args[0].trust += 30, $args[0].devotion -= 15>>
+ <</if>>
+ <</if>>
+
<</if>>
<<elseif canSee($args[0])>> /* (amputee) + sight */
After a while, she begins to stir, her eyes fluttering.
@@ -2152,7 +2167,7 @@ Now you only have to wait for her to wake up.
<<else>>
voice,
<</if>>
- but then murmurs “...mirrorâ€.
+ but then murmurs “...mirror...â€
<</if>>
<</if>>
@@ -2473,7 +2488,7 @@ Now you only have to wait for her to wake up.
/*(pregnancy/belly changes)*/
<<set _weightChange = 0>> /*used to segway to weight after pregnancy/belly implants*/
- <<if $args[0].pregKnown == 1 && $args[0].preg > 0>>
+ <<if $args[0].pregKnown == 1 && $args[1].preg > 0>>
<br><br>
She wiggles into a better position to see her stomach,
<<if $args[0].bellyPreg < 100>>
@@ -2491,7 +2506,7 @@ Now you only have to wait for her to wake up.
<<elseif $args[0].bellyPreg >= 15000>>
and she can clearly see that she is @@.pink;quite pregnant,@@ as she sports a belly that could easily carry a full sized baby.
<<elseif $args[0].bellyPreg >= 5000>>
- and she sees a @@.pink;bump in her stomach.@@ A gentle kick clues her in to the reason..
+ and she sees a @@.pink;bump in her stomach.@@ A gentle kick clues her in to the reason.
<<elseif $args[0].bellyPreg >= 100>>
and she see a @@.pink;slight swell to her stomach.@@
<</if>>
@@ -2540,13 +2555,13 @@ Now you only have to wait for her to wake up.
<<if $args[0].fetish == "pregnancy">>
<<if $args[0].devotion >= 50>>
She @@.mediumorchid;scowls with momentary wrath@@ before regaining her composure. She resents being separated from her pregnancy<<if canGetPregnant($args[0])>>, though that is easily remedied<</if>>.
- <<set $args[0].devotion -= 3>>
+ <<set $args[0].devotion -= 5>>
<<elseif $args[0].devotion >= 20>>
She @@.mediumorchid;scowls angrily@@ at this turn of events<<if canGetPregnant($args[0])>>, though that will be easily remedied by putting another child in her<</if>>.
- <<set $args[0].devotion -= 5>>
+ <<set $args[0].devotion -= 10>>
<<else>>
She is filled with @@.mediumorchid;hatred for you@@ for snatching her pregnancy away from her.
- <<set $args[0].devotion -= 7>>
+ <<set $args[0].devotion -= 15>>
<</if>>
<<elseif $args[0].fetish != "mindbroken">>
<<if $args[0].devotion >= 50>>
@@ -2566,13 +2581,13 @@ Now you only have to wait for her to wake up.
<<if $args[0].fetish == "pregnancy">>
<<if $args[0].devotion >= 50>>
She @@.mediumorchid;scowls with momentary wrath@@ before regaining her composure. She resents being separated from her pregnancy<<if canGetPregnant($args[0])>>, though that is easily remedied<</if>>.
- <<set $args[0].devotion -= 3>>
+ <<set $args[0].devotion -= 5>>
<<elseif $args[0].devotion >= 20>>
She @@.mediumorchid;scowls angrily@@ at this turn of events<<if canGetPregnant($args[0])>>, though that will be easily remedied by putting another child in her<</if>>.
- <<set $args[0].devotion -= 5>>
+ <<set $args[0].devotion -= 10>>
<<else>>
She is filled with @@.mediumorchid;hatred for you@@ for snatching her pregnancy away from her.
- <<set $args[0].devotion -= 7>>
+ <<set $args[0].devotion -= 15>>
<</if>>
<<elseif $args[0].fetish != "mindbroken">>
<<if $args[0].devotion >= 50>>
@@ -2711,6 +2726,8 @@ Now you only have to wait for her to wake up.
<<set $args[0].trust += 2>>
<</if>>
<</if>>
+ <<else>>
+ stomach, though she finds little out of the ordinary<<if _weightChange == 1>>; other than the obvious, of course<</if>>.
<</if>>
<<if $args[0].navelPiercing != 0 && $args[1].navelPiercing == 0>>
She now has a piercing in her navel; she rolls her tummy<<if $args[0].belly >= 15000>>, a feat in and of itself<</if>>, fascinated by her new hardware grazing her stomach to the motion.
@@ -3112,7 +3129,20 @@ Now you only have to wait for her to wake up.
<br><br>
The changes to her tattoos were not lost on her, but compared to everything else, they were truly insignificant.
<</if>>
-
+
+ <<if $args[0].fetish != "mindbroken" && $args[0].origBodyOwnerID == $args[0].ID>>
+ This is her body alright. Some things might have changed,
+ <<if $args[0].devotion > 50>>
+ but she enjoyed the time they spent apart.
+ <<elseif $args[0].devotion >= -20>>
+ but @@.mediumaquamarine;it's good to be home.@@
+ <<set $args[0].trust += 15>>
+ <<else>>
+ but @@.mediumaquamarine;she's where she belongs.@@ Now to get it back the way @@.mediumorchid;she likes it.@@
+ <<set $args[0].trust += 30, $args[0].devotion -= 15>>
+ <</if>>
+ <</if>>
+
<</if>>
<<else>> /* blind amp that needs you to detail the changes to her body */
After a while, she begins to stir, her eyes fluttering.
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index f1372c85a77e4ff5e97d3556cdae454647e74b5d..8da9328e0568f80ece61d3de90c169212c757cd5 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -167,9 +167,11 @@
<<set $args[0].laborCount = $args[1].laborCount>>
<<set $args[0].canRecruit = 0>>
+/*
<<if def $args[2]>>
<<assignJob $args[0] "rest">>
<</if>>
+*/
<</widget>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 55b59b537bac482900470532a05aaa6256c9e1d6..790c8396c93330e2609c09a3270f09e6621dc9e2 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -372,7 +372,7 @@
<<widget "InitStandards">>
-<<set $activeStandard to {age: 24, weightMax: 0, weightMin: 0, muscles: 0, raceSup: "white", raceSub: "white", boobs: 0, boobsImplant: 0, lactation: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, face: 0, faceImplant: 0, lips: 15, lipsImplant: 0, chem: 0, addict: 0, intelligence: 0, intelligenceImplant: 0, bellyImplant: -1, beauty: 0, dick: 0, balls: 0, health: 0}>>
+<<set $activeStandard to {age: 24, weightMax: 0, weightMin: 0, musclesMin: 0, musclesMax: 0, raceSup: "white", raceSub: "white", boobs: 0, boobsImplant: 0, lactation: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, face: 0, faceImplant: 0, lips: 15, lipsImplant: 0, chem: 0, addict: 0, intelligence: 0, intelligenceImplant: 0, bellyImplant: -1, beauty: 0, dick: 0, balls: 0, health: 0}>>
<<UpdateStandards>>
<<BreedingStandards>>
@@ -442,7 +442,13 @@
<<set $activeStandard.lactation = 1>>
<</if>>
<<if $arcologies[0].FSPhysicalIdealist > 20>>
- <<set $activeStandard.muscles = 95>>
+ <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>
+ <<set $activeStandard.weightMax = 30>>
+ <<set $activeStandard.musclesMin = 20>>
+ <<set $activeStandard.musclesMax = 50>>
+ <<else>>
+ <<set $activeStandard.musclesMin = 95>>
+ <</if>>
<<elseif $arcologies[0].FSHedonisticDecadence > 20>>
<<if $arcologies[0].FSSlimnessEnthusiast > 20>>
<<set $activeStandard.weightMin = 10>>
@@ -506,10 +512,16 @@ In order to be eligible to be bred, the potential breeding bitch must first sati
<br>She must be lactating naturally.
<</if>>
<<if $arcologies[0].FSPhysicalIdealist > 20>>
- <br>She must be extremely muscular.
+ <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>
+ <br>She must not be overweight.
+ <br>She must be fit, but not too muscular.
+ <<else>>
+ <br>She must be extremely muscular.
+ <</if>>
+
<<elseif $arcologies[0].FSHedonisticDecadence > 20>>
<<if $arcologies[0].FSSlimnessEnthusiast > 20>>
- <br>She must be larger size than "trim".
+ <br>She must be more than "trim".
<<else>>
<br>She must be big, soft and fat.
<</if>>
@@ -520,45 +532,45 @@ In order to be eligible to be bred, the potential breeding bitch must first sati
<</widget>>
<<widget "BreedingEligibility">>
-<<set $passing = 0>>
+<<set _passing = 0>>
<br><br>
$activeSlave.slaveName is up for review:
<<if $activeSlave.intelligence >= $activeStandard.intelligence>>
<br>She @@.lime;PASSED@@ the intelligence test.
<<else>>
<br>She @@.red;FAILED@@ the intelligence test.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<if $beauty >= $activeStandard.beauty>>
<br>She @@.lime;PASSED@@ the beauty test.
<<else>>
<br>She @@.red;FAILED@@ the beauty test.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<if $activeSlave.face >= $activeStandard.face>>
<br>She @@.lime;PASSED@@ the facial attractiveness test.
<<else>>
<br>She @@.red;FAILED@@ the facial attractiveness test.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<if $activeSlave.chem <= $activeStandard.chem>>
<br>She @@.lime;PASSED@@ the carcinogen test.
<<else>>
<br>She @@.red;FAILED@@ the carcinogen test.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<if $activeSlave.addict >= $activeStandard.addict>>
<br>She @@.lime;PASSED@@ the drug test.
<<else>>
<br>She @@.red;FAILED@@ the drug test.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<if $arcologies[0].FSSupremacist > 20>>
<<if $activeSlave.race == $activeStandard.raceSup>>
<br>She @@.lime;PASSED@@ racial testing.
<<else>>
<br>She @@.red;FAILED@@ racial testing.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<</if>>
<<if $arcologies[0].FSSubjugationist > 20>>
@@ -566,7 +578,7 @@ $activeSlave.slaveName is up for review:
<br>She @@.lime;PASSED@@ racial testing.
<<else>>
<br>She @@.red;FAILED@@ racial testing.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<</if>>
<<if $arcologies[0].FSGenderRadicalist > 20>>
@@ -574,14 +586,14 @@ $activeSlave.slaveName is up for review:
<br>She @@.lime;PASSED@@ penis inspection.
<<else>>
<br>She @@.red;FAILED@@ penis inspection.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<elseif $arcologies[0].FSGenderFundamentalist > 20>>
<<if $activeSlave.dick == $activeStandard.dick && $activeSlave.balls == $activeStandard.balls>>
<br>She @@.lime;PASSED@@ genital inspection.
<<else>>
<br>She @@.red;FAILED@@ genital inspection.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<</if>>
<<if $arcologies[0].FSPaternalist > 20>>
@@ -589,13 +601,13 @@ $activeSlave.slaveName is up for review:
<br>She @@.lime;PASSED@@ educational trials.
<<else>>
<br>She @@.red;FAILED@@ educational trials.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<if $activeSlave.health >= $activeStandard.health>>
<br>She @@.lime;PASSED@@ health examinations.
<<else>>
<br>She @@.red;FAILED@@ health examinations.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<</if>>
<<if $arcologies[0].FSBodyPurist > 20>>
@@ -603,13 +615,13 @@ $activeSlave.slaveName is up for review:
<br>She @@.lime;PASSED@@ health examinations.
<<else>>
<br>She @@.red;FAILED@@ health examinations.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<if $activeSlave.boobsImplant == 0 && $activeSlave.buttImplant == 0 && $activeSlave.lipsImplant == 0 && $activeSlave.hipsImplant == 0 && $activeSlave.shouldersImplant == 0 && $activeSlave.faceImplant <= 5 && $activeSlave.bellyImplant == -1>>
<br>She @@.lime;PASSED@@ implant examinations.
<<else>>
<br>She @@.red;FAILED@@ implant examinations.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist > 20>>
@@ -617,14 +629,14 @@ $activeSlave.slaveName is up for review:
<br>She @@.lime;PASSED@@ age examinations.
<<else>>
<br>She @@.red;FAILED@@ age examinations.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<elseif $arcologies[0].FSYouthPreferentialist > 20>>
<<if $activeSlave.physicalAge < $activeStandard.age>>
<br>She @@.lime;PASSED@@ age examinations.
<<else>>
<br>She @@.red;FAILED@@ age examinations.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<</if>>
<<if $arcologies[0].FSSlimnessEnthusiast > 20>>
@@ -632,32 +644,32 @@ $activeSlave.slaveName is up for review:
<br>She @@.lime;MET@@ weight limits.
<<else>>
<br>She @@.red;EXCEEDED@@ weight limits.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<if $activeSlave.butt <= $activeStandard.butt>>
<br>She @@.lime;MET@@ ass measurements.
<<else>>
<br>She @@.red;EXCEEDED@@ ass measurements.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<if $activeSlave.boobs <= $activeStandard.boobs>>
<br>She @@.lime;MET@@ chest measurements.
<<else>>
<br>She @@.red;EXCEEDED@@ chest measurements.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<elseif $arcologies[0].FSAssetExpansionist > 20>>
<<if ($activeSlave.butt - $activeSlave.buttImplant) >= $activeStandard.butt>>
<br>She @@.lime;MET@@ ass measurements.
<<else>>
<br>She @@.red;FAILED@@ to meet ass measurements.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<<if ($activeSlave.boobs - $activeSlave.boobsImplant) >= $activeStandard.boobs>>
<br>She @@.lime;MET@@ chest measurements.
<<else>>
<br>She @@.red;FAILED@@ to meet chest measurements.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<</if>>
<<if $arcologies[0].FSPastoralist > 20>>
@@ -665,29 +677,53 @@ $activeSlave.slaveName is up for review:
<br>She @@.lime;MET@@ milk production standards.
<<elseif $activeSlave.lactation > $activeStandard.lactation>>
<br>She @@.red;EXCEEDED@@ milk production standards.
- <<set $passing-->>
+ <<set _passing-->>
<<else>>
<br>She @@.red;FAILED@@ to meet milk production standards.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<</if>>
<<if $arcologies[0].FSPhysicalIdealist > 20>>
- <<if $activeSlave.muscles > $activeStandard.muscles>>
- <br>She @@.lime;MET@@ the required muscle mass.
+ <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ <<if $activeSlave.weight <= $activeStandard.weightMax>>
+ <br>She @@.lime;MET@@ weight limits.
+ <<else>>
+ <br>She @@.red;EXCEEDED@@ weight limits.
+ <<set _passing-->>
+ <</if>>
+ <</if>>
+ <<if $activeSlave.muscles > $activeStandard.musclesMin && $activeSlave.muscles < $activeStandard.musclesMax>>
+ <br>She @@.lime;MET@@ the required muscle standard.
+ <<elseif ($activeSlave.muscles <= $activeStandard.musclesMin && $activeSlave.muscles > $activeStandard.musclesMin-20) || ($activeSlave.muscles >= $activeStandard.musclesMax && $activeSlave.muscles < $activeStandard.musclesMax+30)>>
+ <br>She @@.yellow;failed@@ to match the required muscle standard, but was deemed within fixable range.
+ <<if _passing == 0>>
+ <<set _passing = 2>>
+ <</if>>
+ <<else>>
+ <br>She @@.red;FAILED@@ to match the required muscle standard.
+ <<set _passing-->>
+ <</if>>
<<else>>
- <br>She @@.red;FAILED@@ to meet the required muscle mass.
- <<set $passing-->>
+ <<if $activeSlave.muscles > $activeStandard.musclesMin>>
+ <br>She @@.lime;MET@@ the required muscle mass.
+ <<else>>
+ <br>She @@.red;FAILED@@ to meet the required muscle mass.
+ <<set _passing-->>
+ <</if>>
<</if>>
<<elseif $arcologies[0].FSHedonisticDecadence > 20>>
<<if $activeSlave.weight > $activeStandard.weightMin>>
<br>She @@.lime;MET@@ the minimum weight limit.
<<else>>
<br>She @@.red;failed@@ to meet minimum weight limits.
- <<set $passing-->>
+ <<set _passing-->>
<</if>>
<</if>>
<br><br>
-<<if $passing != 0>>
+<<if _passing == 2>>
+ The slave known as "<<SlaveFullName $activeSlave>>" has been deemed @@.yellow;currently unsuitable@@ for breeding, but may be resubmitted after corrections are applied. We understand the subjective nature of "fit" and do not wish to preclude the use a viable breeder over such a trivial fix. She has been placed on a contraceptive routine to protect against "accidents" in the interim.
+<<elseif _passing != 0>>
The slave known as "<<SlaveFullName $activeSlave>>" has been deemed @@.red;unsuitable@@ for breeding and has been @@.green;sterilized@@ as per agreement.
<<set $activeSlave.preg = -3>>
<<else>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index b12d43fb8f739f0dba781aab3290c6158edcb38d..f30564ceca0c86013b13b187403702302b91717d 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -105,7 +105,7 @@
<<elseif (_effectiveWeek > 18) && ($assistant > 0) && ($assistantOptions == 0)>>
<<set $Event = "assistant SP">>
<<goto "Assistant Events">>
-<<elseif (_effectiveWeek > 45) && ($bodyswapAnnounced == 0) && ($surgeryUpgrade == 1) && ($seeExtreme == 1) && ($cheatMode == 1)>>
+<<elseif (_effectiveWeek > 45) && ($bodyswapAnnounced == 0) && ($surgeryUpgrade == 1)>>
<<goto "P Bodyswap Reveal">>
<<elseif _effectiveWeek > 48 && $invasionVictory > 0 && $peacekeepers == 0 && $peacekeepersGone != 1>>
<<goto "P peacekeepers intro">>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index 7dfc080a88c41675494ad01c7aaced7a14933b28..46d4885c1eb0f7ff8d50abedd7a54d66d59077b2 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -146,7 +146,6 @@ that several nondescript citizens she sees occasionally at work have passed a fe
<<set _myBody = $slaves.findIndex(function(s) { return s.origBodyOwnerID == $traitor.ID; })>>
<<if _myBody != -1>>
<<set $traitorStats.traitorBody = $slaves[_myBody].ID>>
- <<set $slaves[_myBody].origBodyOwnerID = 0>>
<</if>>
<</if>>
<<include "Remove activeSlave">>
diff --git a/src/uncategorized/saDevotion.tw b/src/uncategorized/saDevotion.tw
index 25f297043601bed7691b822c35903097d46d92c5..0b9abef574cfdc415593211a12d0fb430cd1b324 100644
--- a/src/uncategorized/saDevotion.tw
+++ b/src/uncategorized/saDevotion.tw
@@ -177,6 +177,25 @@
<</if>>
<</if>>
+/* Body lost effects */
+
+<<if $slaves[$i].bodySwap > 0 && $slaves[$i].origBodyOwnerID > 0>>
+ <<if ndef $slaveIndices[$slaves[$i].origBodyOwnerID]>>
+ <<set $slaves[$i].origBodyOwnerID = 0>>
+ <<if $slaves[$i].fetish != "mindbroken" && $slaves[$i].fuckdoll == 0>>
+ <<if $slaves[$i].devotion > 20>>
+ $slaves[$i].slaveName is somwhat saddened to see her body leave forever.
+ <<elseif $slaves[$i].devotion >= -50>>
+ $slaves[$i].slaveName is @@.medimorchid;disturbed@@ to find her body is gone for good, damaging her @@.gold;ability to trust you.@@
+ <<set $slaves[$i].devotion -= 30, $slaves[$i].trust -= 30>>
+ <<else>>
+ $slaves[$i].slaveName is @@.medimorchid;deeply upset@@ that she'll never see her body again. With so little left, she finds it easy to take vengeance by @@.orangered;completely rejecting your ownership of her.@@
+ <<set $slaves[$i].devotion -= 50, $slaves[$i].trust += 200>>
+ <</if>>
+ <</if>>
+ <</if>>
+<</if>>
+
/* INDENTURE MENTAL EFFECTS */
<<if ($slaves[$i].indenture > -1)>>
diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index 14a3ad2cd5e80fd6eeae7082d042c7a122c5781d..f7e74bc8b67e6e488ef8198f19209f58e7297df8 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -980,7 +980,7 @@
<<case "cum production">>
Fuckdoll suits have easily attached reservoirs to catch excess cum.
<<if ($slaves[$i].balls < 6) && (random(1,100) > 90)>>
- It's @@.lime;balls swell@@ to better accommodate its increased cum production.
+ Its @@.lime;balls swell@@ to better accommodate its increased cum production.
<<set $slaves[$i].balls += 1>>
<</if>>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index 1df4b110d881f9f40eff47d06cc442c42106103b..c12a39cdb8382593490c1ab953cb6e3db1ebf82e 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -801,7 +801,7 @@
and puts her on a normal diet.
<<set $slaves[$i].diet = "healthy">>
<<else>>
- and keeps her on her healthy diet
+ and keeps her on her healthy diet.
<</if>>
<</if>>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index aaa9dd89ae1378d982ccbc0ee6ccc7000f715858..6f89be3f674334690bbcd35ccb1e3763f798ec8a 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -70,7 +70,6 @@
<<set _myBody = $slaves.findIndex(function(s) { return s.origBodyOwnerID == $activeSlave.ID; })>>
<<if _myBody != -1>>
<<set $boomerangStats.boomerangBody = $slaves[_myBody].ID>>
- <<set $slaves[_myBody].origBodyOwnerID = 0>>
<</if>>
<</if>>
<</if>>