From c1a4e46004823090bce8e47414b9491b53584490 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 19 Jun 2017 21:26:11 -0400
Subject: [PATCH] Bug fixes and extended weight.
---
src/cheats/mod_editSlaveCheatNew.tw | 40 +++----
src/js/storyJS.tw | 18 +++
src/npc/fFeelings.tw | 2 +-
src/pregmod/incubatorReport.tw | 4 +-
src/pregmod/saInflation.tw | 2 +-
src/pregmod/seFCTVinstall.tw | 2 +-
src/pregmod/seFCTVshows.tw | 2 +-
src/pregmod/widgets/pregmodWidgets.tw | 6 +-
src/uncategorized/REroyalblood.tw | 2 +-
src/uncategorized/bodyModification.tw | 2 +-
src/uncategorized/cellblockReport.tw | 2 +-
src/uncategorized/club.tw | 2 +-
src/uncategorized/clubAdvertisement.tw | 2 +-
src/uncategorized/longSlaveDescription.tw | 139 +++++++++++++++++++---
src/uncategorized/masterSuite.tw | 6 +-
src/uncategorized/nextWeek.tw | 2 +-
src/uncategorized/reRelativeRecruiter.tw | 4 +-
src/uncategorized/saDiet.tw | 4 +-
src/uncategorized/saDrugs.tw | 18 +++
src/uncategorized/saGuardsYou.tw | 12 +-
src/uncategorized/saLongTermEffects.tw | 55 ++++++++-
src/uncategorized/saRivalries.tw | 1 +
src/uncategorized/seNonlethalPit.tw | 35 +++++-
src/uncategorized/slaveInteract.tw | 6 +-
src/uncategorized/spa.tw | 2 +-
src/utility/descriptionWidgets.tw | 15 ++-
26 files changed, 311 insertions(+), 74 deletions(-)
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index bda8eebecb7..c9f5affc488 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -285,12 +285,12 @@
<<radiobutton "$activeSlave.accent" 3>> Barely Understands Language
<br>
<br>
- ''Genes (XX:female, XY:male):'' @@color:yellow;$activeSlave.genes@@
+ ''Genes (XX:female, XY:male):'' @@.yellow;$activeSlave.genes@@
<<radiobutton "$activeSlave.genes" "XX">> Female
<<radiobutton "$activeSlave.genes" "XY">> Male
<br>
- ''Amputated (0:normal, 1: amputated, -1 to -5 prosthetic limbs):'' @@color:yellow;$activeSlave.amp@@
+ ''Amputated (0:normal, 1: amputated, -1 to -5 prosthetic limbs):'' @@.yellow;$activeSlave.amp@@
<<textbox "$activeSlave.amp" $activeSlave.amp>>
<br>
<<radiobutton "$activeSlave.amp" 0>> Normal
@@ -302,7 +302,7 @@
<<radiobutton "$activeSlave.amp" -5>> Cybernetic limbs
<br><br>
- ''Muscles (0 to 100): @@color:yellow;$activeSlave.muscles@@ |''
+ ''Muscles (0 to 100): @@.yellow;$activeSlave.muscles@@ |''
<<textbox "$activeSlave.muscles" $activeSlave.muscles>>
<br>
<<radiobutton "$activeSlave.muscles" 0>> None
@@ -338,7 +338,7 @@
<<radiobutton "$activeSlave.weight" 100>> Fat
<br>
- ''Waist (Masculine:100 | Ugly:55 | Unattractive:15 | Average:0 | Feminine:-15 | hourglass:-55 | Absurd:-100): @@color:yellow;$activeSlave.waist@@ |''
+ ''Waist (Masculine:100 | Ugly:55 | Unattractive:15 | Average:0 | Feminine:-15 | hourglass:-55 | Absurd:-100): @@.yellow;$activeSlave.waist@@ |''
<<textbox "$activeSlave.waist" $activeSlave.waist>>
<br>
<<radiobutton "$activeSlave.waist" 100>> Masculine
@@ -350,14 +350,14 @@
<<radiobutton "$activeSlave.waist" -100>> Absurd
<br><br>
- ''Height: @@color:yellow;$activeSlave.height@@ |''
+ ''Height: @@.yellow;$activeSlave.height@@ |''
<<textbox "$activeSlave.height" $activeSlave.height>>
<br>
(149 or lower: Petite, 150-159: Short, 160-169: Average, 170-184: Tall, 185 or higher: Very Tall)
<br>
- ''Height Implant (-1 to 1): @@color:yellow;$activeSlave.heightImplant@@|''
+ ''Height Implant (-1 to 1): @@.yellow;$activeSlave.heightImplant@@|''
<<textbox "$activeSlave.heightImplant" $activeSlave.heightImplant>>
<br>
<<radiobutton "$activeSlave.heightImplant" -1>> Artificially Shortened
@@ -365,7 +365,7 @@
<<radiobutton "$activeSlave.heightImplant" 1>> Artificially Lengthened
<br><br>
- ''Shoulders (-2 to 2): @@color:yellow;$activeSlave.shoulders@@ |''
+ ''Shoulders (-2 to 2): @@.yellow;$activeSlave.shoulders@@ |''
<<radiobutton "$activeSlave.shoulders" -2>> Very narrow
<<radiobutton "$activeSlave.shoulders" -1>> Narrow
<<radiobutton "$activeSlave.shoulders" -0>> Normal
@@ -373,7 +373,7 @@
<<radiobutton "$activeSlave.shoulders" 2>> Very broad
<br>
- ''Shoulder Surgery (-2 to 2): @@color:yellow;$activeSlave.shouldersImplant@@ |''
+ ''Shoulder Surgery (-2 to 2): @@.yellow;$activeSlave.shouldersImplant@@ |''
<<radiobutton "$activeSlave.shouldersImplant" -2>> Adv. Narrowed
<<radiobutton "$activeSlave.shouldersImplant" -1>> Narrowed
<<radiobutton "$activeSlave.shouldersImplant" -0>> None
@@ -381,7 +381,7 @@
<<radiobutton "$activeSlave.shouldersImplant" 2>> Adv. Broadened
<br>
- ''Hips (-2 to 2): @@color:yellow;$activeSlave.hips@@ |''
+ ''Hips (-2 to 2): @@.yellow;$activeSlave.hips@@ |''
<<radiobutton "$activeSlave.hips" -2>> Very narrow
<<radiobutton "$activeSlave.hips" -1>> Narrow
<<radiobutton "$activeSlave.hips" -0>> Normal
@@ -389,7 +389,7 @@
<<radiobutton "$activeSlave.hips" 2>> Very broad
<br>
- ''Hip Surgery(-2 to 2): @@color:yellow;$activeSlave.hipsImplant@@ |''
+ ''Hip Surgery(-2 to 2): @@.yellow;$activeSlave.hipsImplant@@ |''
<<radiobutton "$activeSlave.hipsImplant" -2>> Adv. Narrowed
<<radiobutton "$activeSlave.hipsImplant" -1>> Narrowed
<<radiobutton "$activeSlave.hipsImplant" -0>> None
@@ -1781,12 +1781,12 @@
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>>
<br>
- ''Genes (XX:female, XY:male):'' @@color:yellow;$activeSlave.genes@@
+ ''Genes (XX:female, XY:male):'' @@.yellow;$activeSlave.genes@@
<<radiobutton "$activeSlave.genes" "XX">> Female
<<radiobutton "$activeSlave.genes" "XY">> Male
<br>
- ''Amputated (0:normal, 1: amputated, -1 to -5 prosthetic limbs):'' @@color:yellow;$activeSlave.amp@@
+ ''Amputated (0:normal, 1: amputated, -1 to -5 prosthetic limbs):'' @@.yellow;$activeSlave.amp@@
<<textbox "$activeSlave.amp" $activeSlave.amp>>
<br>
<<radiobutton "$activeSlave.amp" 0>> Normal
@@ -1798,7 +1798,7 @@
<<radiobutton "$activeSlave.amp" -5>> Cybernetic limbs
<br><br>
- ''Muscles (0 to 100): @@color:yellow;$activeSlave.muscles@@ |''
+ ''Muscles (0 to 100): @@.yellow;$activeSlave.muscles@@ |''
<<textbox "$activeSlave.muscles" $activeSlave.muscles>>
<br>
<<radiobutton "$activeSlave.muscles" 0>> None
@@ -1834,7 +1834,7 @@
<<radiobutton "$activeSlave.weight" 100>> Fat
<br>
- ''Waist (Masculine:100 | Ugly:55 | Unattractive:15 | Average:0 | Feminine:-15 | hourglass:-55 | Absurd:-100): @@color:yellow;$activeSlave.waist@@ |''
+ ''Waist (Masculine:100 | Ugly:55 | Unattractive:15 | Average:0 | Feminine:-15 | hourglass:-55 | Absurd:-100): @@.yellow;$activeSlave.waist@@ |''
<<textbox "$activeSlave.waist" $activeSlave.waist>>
<br>
<<radiobutton "$activeSlave.waist" 100>> Masculine
@@ -1846,14 +1846,14 @@
<<radiobutton "$activeSlave.waist" -100>> Absurd
<br><br>
- ''Height: @@color:yellow;$activeSlave.height@@ |''
+ ''Height: @@.yellow;$activeSlave.height@@ |''
<<textbox "$activeSlave.height" $activeSlave.height>>
<br>
(149 or lower: Petite, 150-159: Short, 160-169: Average, 170-184: Tall, 185 or higher: Very Tall)
<br>
- ''Height Implant (-1 to 1): @@color:yellow;$activeSlave.heightImplant@@|''
+ ''Height Implant (-1 to 1): @@.yellow;$activeSlave.heightImplant@@|''
<<textbox "$activeSlave.heightImplant" $activeSlave.heightImplant>>
<br>
<<radiobutton "$activeSlave.heightImplant" -1>> Artificially Shortened
@@ -1861,7 +1861,7 @@
<<radiobutton "$activeSlave.heightImplant" 1>> Artificially Lengthened
<br><br>
- ''Shoulders (-2 to 2): @@color:yellow;$activeSlave.shoulders@@ |''
+ ''Shoulders (-2 to 2): @@.yellow;$activeSlave.shoulders@@ |''
<<radiobutton "$activeSlave.shoulders" -2>> Very narrow
<<radiobutton "$activeSlave.shoulders" -1>> Narrow
<<radiobutton "$activeSlave.shoulders" -0>> Normal
@@ -1869,7 +1869,7 @@
<<radiobutton "$activeSlave.shoulders" 2>> Very broad
<br>
- ''Shoulder Surgery (-2 to 2): @@color:yellow;$activeSlave.shouldersImplant@@ |''
+ ''Shoulder Surgery (-2 to 2): @@.yellow;$activeSlave.shouldersImplant@@ |''
<<radiobutton "$activeSlave.shouldersImplant" -2>> Adv. Narrowed
<<radiobutton "$activeSlave.shouldersImplant" -1>> Narrowed
<<radiobutton "$activeSlave.shouldersImplant" -0>> None
@@ -1877,7 +1877,7 @@
<<radiobutton "$activeSlave.shouldersImplant" 2>> Adv. Broadened
<br>
- ''Hips (-2 to 2): @@color:yellow;$activeSlave.hips@@ |''
+ ''Hips (-2 to 2): @@.yellow;$activeSlave.hips@@ |''
<<radiobutton "$activeSlave.hips" -2>> Very narrow
<<radiobutton "$activeSlave.hips" -1>> Narrow
<<radiobutton "$activeSlave.hips" -0>> Normal
@@ -1885,7 +1885,7 @@
<<radiobutton "$activeSlave.hips" 2>> Very broad
<br>
- ''Hip Surgery(-2 to 2): @@color:yellow;$activeSlave.hipsImplant@@ |''
+ ''Hip Surgery(-2 to 2): @@.yellow;$activeSlave.hipsImplant@@ |''
<<radiobutton "$activeSlave.hipsImplant" -2>> Adv. Narrowed
<<radiobutton "$activeSlave.hipsImplant" -1>> Narrowed
<<radiobutton "$activeSlave.hipsImplant" -0>> None
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index b4e83e4b15c..a1c9a19c4b3 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -465,6 +465,8 @@ window.canWalk = function(slave) {
return null;
} else if (slave.amp == 1) {
return false;
+ } else if (tooFatSlave(slave)) {
+ return false;
} else if (tooBigBreasts(slave)) {
return false;
} else if (tooBigDick(slave)) {
@@ -538,6 +540,22 @@ window.canDoVaginal = function(slave) {
return true;
};
+window.tooFatSlave = function(slave){
+ if (!slave) {
+ return null;
+ } else if (slave.weight > 190+(slave.muscles/5) && slave.physicalAge >= 18) {
+ return true;
+ } else if (slave.weight > 130+(slave.muscles/20) && slave.physicalAge <= 3) {
+ return true;
+ } else if (slave.weight > 160+(slave.muscles/15) && slave.physicalAge <= 12) {
+ return true;
+ } else if (slave.weight > 185+(slave.muscles/10) && slave.physicalAge < 18) {
+ return true;
+ } else {
+ return false;
+ }
+};
+
window.tooBigBreasts = function(slave){
if (!slave) {
return null;
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index f255ee1c7d9..faea01ec2e8 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -13,7 +13,7 @@
<<elseif ($activeSlave.trust >= -50)>>
<<if canTalk($activeSlave) == false>>gestures<<elseif (_lisping == 1)>>lisps<<else>>mutters<</if>> hesitantly that it's wrong to keep her a slave, and that you should free her.
<<else>>
- <<if canTalk($activeSlave) == false>>gestures a perfunctory plea not to hurt her.<<else>>mutters a perfunctory "Plea<<s>>e don't hurt me, <<Master>>."<</if>>
+ <<if !canTalk($activeSlave)>>gestures a perfunctory plea not to hurt her.<<else>>mutters a perfunctory "Plea<<s>>e don't hurt me, <<if $activeSlave.rudeTitle == 1>><<PoliteRudeTitle $activeSlave>><<else>><<Master>><</if>>."<</if>>
<</if>>
<<elseif ($activeSlave.devotion < -20)>>
diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw
index ce0f92a646b..9685be3d5b5 100644
--- a/src/pregmod/incubatorReport.tw
+++ b/src/pregmod/incubatorReport.tw
@@ -21,7 +21,7 @@
<<if $incubatorUpgradeWeight == 1>>
<br>
<<if $incubatorWeightSetting == 1>>
- <<if $tanks[_inc].weight < 100>>
+ <<if $tanks[_inc].weight < 200>>
<<if $incubatorUpgradeSpeed == 52>>
<<set $tanks[_inc].weight += 70>>
<<elseif $incubatorUpgradeSpeed == 18>>
@@ -587,7 +587,7 @@
<</if>>
<</if>>
- <<set $tanks[_inc].weight = Math.clamp($tanks[_inc].weight, -100, 100)>>
+ <<set $tanks[_inc].weight = Math.clamp($tanks[_inc].weight, -100, 200)>>
<<set $tanks[_inc].muscles = Math.clamp($tanks[_inc].muscles, -100, 100)>>
<<set $tanks[_inc].dick = Math.clamp($tanks[_inc].dick, 0, 10)>>
<<set $tanks[_inc].hips = Math.clamp($tanks[_inc].hips, -2, 2)>>
diff --git a/src/pregmod/saInflation.tw b/src/pregmod/saInflation.tw
index 9e799c7ac28..16d8f80995c 100644
--- a/src/pregmod/saInflation.tw
+++ b/src/pregmod/saInflation.tw
@@ -570,7 +570,7 @@
<</if>>
<<if $slaves[$i].inflationType == "milk" && $slaves[$i].inflation > 1>>
- <<if $slaves[$i].weight < 100>>
+ <<if $slaves[$i].weight < 200>>
$possessiveCap body @@.lime;grows a little more padded@@ as it absorbs the milk contained in $possessive digestive track.
<<set $slaves[$i].weight += 2>>
<</if>>
diff --git a/src/pregmod/seFCTVinstall.tw b/src/pregmod/seFCTVinstall.tw
index fd837745284..a05a41939d1 100644
--- a/src/pregmod/seFCTVinstall.tw
+++ b/src/pregmod/seFCTVinstall.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV", $receiverAvailable = 1>>
<<set $showOne = 0, $showTwo = 0, $showThree = 0, $showFour = 0, $showFive = 0, $showSix = 0, $showSeven = 0, $showEight = 0, $showNine = 0, $showTen = 0, $randShow = 0, $lastShow = -1>>
-You've been sitting in your office into the early afternoon going over bothersome lease documents that need your approval. When you take a break to look out the window, $assistantName speaks up. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, you have received an approval welcome packet from 8HGG Inc in regards to Free Cities TV. It seems that they've determined that $arcologies[0].name is now sufficiently developed enough to warrant a FCTV-Citizen connection. All the details and contracts necessary are included in the packet. From there, a receiver will need to be built onto $arcologies[0].name in order to access FCTV"
+You've been sitting in your office into the early afternoon going over bothersome lease documents that need your approval. When you take a break to look out the window, $assistantName speaks up. "<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Sir<<else>>Ma'am<</if>>, you have received an approval welcome packet from 8HGG Inc in regards to Free Cities TV. It seems that they've determined that $arcologies[0].name is now sufficiently developed enough to warrant a FCTV-Citizen connection. All the details and contracts necessary are included in the packet. From there, a receiver will need to be built onto $arcologies[0].name in order to access FCTV."
<br><br>
You browse the guide: Homeshopping networks, random dramas, how-tos and a miriad of other things. Of more interest are some of the programs showing glimpses into foreign arcologies and how they are using the service to help mold society.
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index e2caf78dbc7..ce53decf204 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -398,7 +398,7 @@ The offered price is ¤<<print $slaveCost>>.
<br><br>
Anabell walks up to the milking table, and gestures to the lower half. <i>"Ma'am, is it okay if I answer one part at a time?"</i> Bess gives a cheerful nod, so Anabell points to the cow's abdomen. <i>"I know it's hard to see cause of that metal holdin up the table, but there's actually an adjustable belly support there."</i> the dairy slave gives the cow an affectionate rub on one butt cheek. <i>"She may not look it right now, but this one here is more'n seven months pregnant with triplets. The table supports the womb, taking the weight and pressure off the cow. All the cows say it's the most comfortable place to be when they're full of calf!"</i> Smiling, Anabell points down between the cow's legs. The camera moves closer to get a good look, and the microphone starts picking up traces of audio from whatever program the cow's watching. Once the camera is positioned at the feet, you can see between her slightly-spread legs that there's a large adjustable-looking opening under her pubic region. More facinating though, is the device attached to her groin; it looks really similar to an athletic cup. It's just a bit bigger and longer with some tubes and a wire coming out of it, and hides the cow's vulva and asshole from the camera.
<br><br>
- With a questioning look, Anabell asks Bess <i>"Ma'am, I figure you already know what the hole's for, but should I explain it for the camera?"</i> Bess simply smiles and nods, indicating that the milk maid should continue. <i>"Well all of you watching probably already guessed one reason for the hole there: it lets the tubes and such through nice and neat so we don't have to worry about em getting pinched or kinked. The other reason for the hole is that plenty of cows have <<if $seeDicks == 0>></i>sensitive legs.<i><<else>>big ol balls that need milked too.<</if>> There's an attachment there for a stretch mesh just like what we use for the udders, it supports em nice and comfortable. There's even a motor in the table there, moves the mesh to roll em around a bit and keep em producing."</i> Anabell points toward the groin device. <i>"We call this miracle gadget here a 'cup'... cause it looks like one, right?"</i> Both Beth and Anabell give a chuckle at the rather flat joke. <i>"Probably the best way to explain it'd be to take it out, would you like to see?"</i>
+ With a questioning look, Anabell asks Bess <i>"Ma'am, I figure you already know what the hole's for, but should I explain it for the camera?"</i> Bess simply smiles and nods, indicating that the milk maid should continue. <i>"Well all of you watching probably already guessed one reason for the hole there: it lets the tubes and such through nice and neat so we don't have to worry about em getting pinched or kinked. The other reason for the hole is that plenty of cows have <<if $seeDicks == 0>><i>sensitive legs.</i><<else>>big ol balls that need milked too.<</if>> There's an attachment there for a stretch mesh just like what we use for the udders, it supports em nice and comfortable. There's even a motor in the table there, moves the mesh to roll em around a bit and keep em producing."</i> Anabell points toward the groin device. <i>"We call this miracle gadget here a 'cup'... cause it looks like one, right?"</i> Both Beth and Anabell give a chuckle at the rather flat joke. <i>"Probably the best way to explain it'd be to take it out, would you like to see?"</i>
<br><br>
Bess gives an excited nod, "yes, that'd be great!"
<br><br>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 3d539010424..f1c9ddf2ec0 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -529,13 +529,13 @@ $activeSlave.slaveName is up for review:
<<widget "PlayerRace">>
<<replace #ethnicity>>
- I'm $PC.race.
+ You're $PC.race.
<</replace>>
<</widget>>
<<widget "PlayerSkin">>
<<replace #skin>>
- I have $PC.skin skin.
+ You have $PC.skin skin.
<</replace>>
<</widget>>
@@ -544,6 +544,8 @@ $activeSlave.slaveName is up for review:
<<widget "SlaveFullName">><<switch $args[0].nationality>><<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">><<if $args[0].slaveSurname>>$args[0].slaveSurname <</if>>$args[0].slaveName<<default>>$args[0].slaveName<<if $args[0].slaveSurname>> $args[0].slaveSurname<</if>><</switch>><</widget>>
+<<widget "PoliteRudeTitle">><<switch $args[0].nationality>><<case "Japanese">><<if $args[0].trust > 0>>$PC.name<<if $PC.title > 0>>kun<<else>>chan<</if>><<else>><<print $PC.surname>>san<</if>><<default>><<if $args[0].intelligence < -2>><<Master>><<elseif $args[0].trust > 0>>$PC.name<<else>>$PC.surname<</if>><</switch>><</widget>>
+
<<widget "ResyncHeight">>
<<switch $activeSlave.actualAge>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 8c082671bbf..441e89808b5 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -29,7 +29,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
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>>
-<<if ($cash >= 50000) and ($rep >= 2000)>>
+<<if ($cash >= 50000) && ($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.
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index b9ac554f811..5818ef0d047 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -394,7 +394,7 @@ Your brand design is ''$brandDesign.''
<<if ($arcologies[0].FSSubjugationist != "unset") && ($activeSlave.race == $arcologies[0].FSSubjugationistRace)>>
| //FS// [[Racial Slur|Body Modification][$brandDesign = "a racial slur"]] <</if>>
<<if ($arcologies[0].FSRepopulationFocus != "unset")>>
-| //FS// [[Birth Count|Body Modification][$brandDesign = "the number of children "+$object+" has birthed"]] <</if>>
+| //FS// [[Birth Count|Body Modification][$brandDesign = "the number of children "+$pronoun+" has birthed"]] <</if>>
<<if ($arcologies[0].FSGenderRadicalist != "unset") || ($arcologies[0].FSGenderFundamentalist != "unset")>>
| //FS// [[Gender Symbol|Body Modification][$brandDesign = "a gender symbol"]] <</if>>
<<if ($arcologies[0].FSPaternalist != "unset")>>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index bc4466d4096..5b62239b158 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -186,7 +186,7 @@
<</if>>
<</if>>
<<if $cellblockDecoration == "Hedonistic">>
- <<if $slaves[$i].weight < 100>>
+ <<if $slaves[$i].weight < 200>>
<<set $slaves[$i].weight += 3>>
<</if>>
<<if $slaves[$i].muscles > -100>>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 0cc7f7b23f2..cf69f997baa 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -55,7 +55,7 @@ $clubNameCaps
<<case "Slimness Enthusiast">>
is distinctly gaudy, with lots of sugary drinks on offer. The music and decor are of a decidedly bubblegum quality.
<<case "Hedonistic">>
- has a gaudy appearance. The dance floor is extra large to accommodate its extra wide dancers, though bodies grinding against each other is an inevitability. Plenty of roomy, comfortable booths encircle the room for an exhausted citizen to relax with his plush dance partner, and a wide selection of greasy food accompanies the drinks. <<if $$arcologies[0].HedonisticDecadenceResearch == 1>>Platters of food are complementary for feeding slaves<<else>>Feeders are available in the booths to feed tired slaves<</if>> while they get fondled.
+ has a gaudy appearance. The dance floor is extra large to accommodate its extra wide dancers, though bodies grinding against each other is an inevitability. Plenty of roomy, comfortable booths encircle the room for an exhausted citizen to relax with his plush dance partner, and a wide selection of greasy food accompanies the drinks. <<if $arcologies[0].HedonisticDecadenceResearch == 1>>Platters of food are complementary for feeding slaves<<else>>Feeders are available in the booths to feed tired slaves<</if>> while they get fondled.
<<default>>
is set up in an uncomplicated way. There's a bar for drinks, a dance floor for slave girls, and private rooms for slave sex.
<</switch>>
diff --git a/src/uncategorized/clubAdvertisement.tw b/src/uncategorized/clubAdvertisement.tw
index 6242b712134..123eb667839 100644
--- a/src/uncategorized/clubAdvertisement.tw
+++ b/src/uncategorized/clubAdvertisement.tw
@@ -50,7 +50,7 @@
<<case "Youth Preferentialist">>
$clubNameCaps is deafeningly loud. There's a bright light show running, offering staccato glimpses of the scene out on the dance floor.
<<case "Hedonistic">>
- $clubNameCaps has a gaudy appearance. The dance floor is extra large to accommodate its extra wide dancers, though bodies grinding against each other is an inevitability. Plenty of roomy, comfortable booths encircle the room for an exhausted citizen to relax with his plush dance partner, and a wide selection of greasy food accompanies the drinks. <<if $$arcologies[0].HedonisticDecadenceResearch == 1>>Platters of food are complementary for feeding slaves<<else>>Feeders are available in the booths to feed tired slaves<</if>> while they get fondled.
+ $clubNameCaps has a gaudy appearance. The dance floor is extra large to accommodate its extra wide dancers, though bodies grinding against each other is an inevitability. Plenty of roomy, comfortable booths encircle the room for an exhausted citizen to relax with his plush dance partner, and a wide selection of greasy food accompanies the drinks. <<if $arcologies[0].HedonisticDecadenceResearch == 1>>Platters of food are complementary for feeding slaves<<else>>Feeders are available in the booths to feed tired slaves<</if>> while they get fondled.
<</switch>>
<<if $clubAdsSpending > 0>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 0b65a133f2a..b2d0b0d1d12 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -90,14 +90,7 @@ is
<<if $activeSlave.assignment == "be a subordinate slave">>
<<for _lsd = 0; _lsd < $slaves.length; _lsd++>>
<<if $activeSlave.subTarget == $slaves[_lsd].ID>>
- She has been ordered to serve
- <<switch $slaves[_lsd].nationality>>
- <<case "Chinese" "Japanese" "Korean" "Cambodian" "Vietnamese" "Hungarian">>
- ''@@.pink;<<if $slaves[_lsd].slaveSurname>>$slaves[_lsd].slaveSurname <</if>>$slaves[_lsd].slaveName@@''
- <<default>>
- ''@@.pink;$slaves[_lsd].slaveName<<if $slaves[_lsd].slaveSurname>> $slaves[_lsd].slaveSurname<</if>>@@''
- <</switch>>
- specifically.
+ She has been ordered to serve ''@@.pink;<<SlaveFullName $slaves[_lsd]>>@@'' specifically.
<<break>>
<</if>>
<</for>>
@@ -1805,15 +1798,37 @@ is
<<if $activeSlave.height < 150>>petite<<elseif $activeSlave.height < 160>>short<<elseif $activeSlave.height < 170>>an average height<<elseif $activeSlave.height < 185>>tall<<else>>very tall<</if>><<if $showHeightCMs == 1>> at $activeSlave.height cm,<</if>>
and
-<<if $activeSlave.weight > 95>>
+<<if $activeSlave.weight > 190 >>
+ <<if $arcologies[0].FSHedonisticDecadence != "unset">>
+ <<print either("perfectly curvy", "perfectly plush")>>.
+ <<else>>
+ @@.red;<<print either("dangerously overweight", "extremely obese", "dangerously fat")>>.@@
+ <</if>>
+<<elseif $activeSlave.weight > 160 >>
+ <<if $arcologies[0].FSHedonisticDecadence != "unset">>
+ <<print either("spectacularly curvy", "spectacularly plush")>>.
+ <<else>>
+ @@.red;<<print either("extremely overweight", "very obese", "extremely fat")>>.@@
+ <</if>>
+<<elseif $activeSlave.weight > 130 >>
+ <<if $arcologies[0].FSHedonisticDecadence != "unset">>
+ <<print either("amazingly curvy", "amzingly plush")>>.
+ <<else>>
+ @@.red;<<print either("very overweight", "obese", "very fat")>>.@@
+ <</if>>
+<<elseif $activeSlave.weight > 95>>
<<if $activeSlave.hips > 1>>
<<print either("extremely curvy", "extremely plush")>>, but $possessive huge hips make the extra weight attractive on $object.
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
+ <<print either("extremely curvy", "extremely plush")>>.
<<else>>
@@.red;<<print either("overweight", "carrying a lot of extra weight", "fat")>>.@@
<</if>>
<<elseif $activeSlave.weight > 30>>
<<if $activeSlave.hips > 1>>
<<print either("quite curvy", "very plush")>>, but $possessive motherly hips make the extra weight attractive on $object.
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
+ <<print either("quite curvy", "very plush")>>.
<<else>>
@@.red;<<print either("chubby", "carrying extra weight")>>.@@
<</if>>
@@ -1894,7 +1909,7 @@ $pronounCap has
<<elseif $activeSlave.waist >= -95>>
a hot @@.pink;wasp waist@@ that gives $possessive an hourglass figure<<if $activeSlave.weight > 30>> despite $possessive extra weight<<elseif $activeSlave.weight < -30>> further accentuated by how thin $pronoun is<</if>>.
<<if hyperBellyTwo($activeSlave)>>
- $possessiveCap titanic belly lewdly bulges out the sides of $possessive narrow waist and continues nearly a meter farther to either side.<<if $activeSlave.preg > 0>> The sides of $possessive waist are filled by $possessive overfilled womb in its desperate search for more room.<</if>>
+ $possessiveCap titanic belly lewdly bulges out the sides of $possessive narrow waist and continues nearly half a meter farther to either side.<<if $activeSlave.preg > 0>> The sides of $possessive waist are filled by $possessive overfilled womb in its desperate search for more room.<</if>>
<<elseif hyperBellyOne($activeSlave)>>
$possessiveCap gigantic belly lewdly distends massively to either side of $possessive narrow waist.
<<elseif hugeBelly($activeSlave)>>
@@ -1905,7 +1920,7 @@ $pronounCap has
<<else>>
an @@.pink;absurdly narrow waist@@ that gives $possessive a cartoonishly hourglass figure<<if $activeSlave.weight > 30>> made even more ludicrous by $possessive extra weight<<elseif $activeSlave.weight < -30>> made even more ludicrous by how thin $pronoun is<</if>>.
<<if hyperBellyTwo($activeSlave)>>
- $possessiveCap titanic belly lewdly bulges out the sides of $possessive very narrow waist and continues nearly a meter farther to either side.<<if $activeSlave.preg > 0>> The sides of $possessive waist are filled by $possessive overfilled womb in its desperate search for more room.<</if>>
+ $possessiveCap titanic belly lewdly bulges out the sides of $possessive very narrow waist and continues nearly half a meter farther to either side.<<if $activeSlave.preg > 0>> The sides of $possessive waist are filled by $possessive overfilled womb in its desperate search for more room.<</if>>
<<elseif hyperBellyOne($activeSlave)>>
$possessiveCap gigantic belly lewdly distends massively to either side of $possessive very narrow waist.
<<elseif hugeBelly($activeSlave)>>
@@ -1953,6 +1968,54 @@ $pronounCap has
<</if>>
<</if>>
+<<if canWalk($activeSlave)>>
+ <<if $activeSlave.weight > (170+($activeSlave.muscles/5)) && $activeSlave.physicalAge >= 18>>
+ $possessiveCap is so fat that it is difficult for $object to move.
+ <<if $activeSlave.muscles > 95>>
+ However, $pronoun is so powerfully built that $pronoun can manage it with effort, though $pronoun often has to stop for breaks.
+ <<elseif $activeSlave.muscles > 30>>
+ $pronounCap can barely manage to get to $possessive feet unaided, and usually walks alongside objects to help relieve the weight.
+ <<elseif $activeSlave.muscles > 5>>
+ $pronounCap requires assistance to get to $possessive feet, and tends to lean on things to help relieve the weight. Much furniture has met an early demise thanks to this habit.
+ <<else>>
+ $pronounCap cannot get to $possessive feet unaided, and tries to stay seated as much as $pronoun can.
+ <</if>>
+ <<elseif $activeSlave.weight > (110+($activeSlave.muscles/20)) && $activeSlave.physicalAge <= 3>>
+ $possessiveCap is so fat that it is difficult for $object to move.
+ <<if $activeSlave.muscles > 95>>
+ However, $pronoun is so powerfully built that $pronoun can manage it with effort, though $pronoun often has to stop for breaks.
+ <<elseif $activeSlave.muscles > 30>>
+ $pronounCap can barely manage to get to $possessive feet unaided, and usually walks alongside objects to help relieve the weight.
+ <<elseif $activeSlave.muscles > 5>>
+ $pronounCap requires assistance to get to $possessive feet, and tends to lean on things to help relieve the weight. Much furniture has met an early demise thanks to this habit.
+ <<else>>
+ $pronounCap cannot get to $possessive feet unaided, and tries to stay seated as much as $pronoun can.
+ <</if>>
+ <<elseif $activeSlave.weight > (140+($activeSlave.muscles/15)) && $activeSlave.physicalAge <= 12>>
+ $possessiveCap is so fat that it is difficult for $object to move.
+ <<if $activeSlave.muscles > 95>>
+ However, $pronoun is so powerfully built that $pronoun can manage it with effort, though $pronoun often has to stop for breaks.
+ <<elseif $activeSlave.muscles > 30>>
+ $pronounCap can barely manage to get to $possessive feet unaided, and usually walks alongside objects to help relieve the weight.
+ <<elseif $activeSlave.muscles > 5>>
+ $pronounCap requires assistance to get to $possessive feet, and tends to lean on things to help relieve the weight. Much furniture has met an early demise thanks to this habit.
+ <<else>>
+ $pronounCap cannot get to $possessive feet unaided, and tries to stay seated as much as $pronoun can.
+ <</if>>
+ <<elseif $activeSlave.weight > (165+($activeSlave.muscles/10)) && $activeSlave.physicalAge < 18>>
+ $possessiveCap is so fat that it is difficult for $object to move.
+ <<if $activeSlave.muscles > 95>>
+ However, $pronoun is so powerfully built that $pronoun can manage it with effort, though $pronoun often has to stop for breaks.
+ <<elseif $activeSlave.muscles > 30>>
+ $pronounCap can barely manage to get to $possessive feet unaided, and usually walks alongside objects to help relieve the weight.
+ <<elseif $activeSlave.muscles > 5>>
+ $pronounCap requires assistance to get to $possessive feet, and tends to lean on things to help relieve the weight. Much furniture has met an early demise thanks to this habit.
+ <<else>>
+ $pronounCap cannot get to $possessive feet unaided, and tries to stay seated as much as $pronoun can.
+ <</if>>
+ <</if>>
+<</if>>
+
<<if $activeSlave.heightImplant > 0>>
The proportions of $possessive arms and legs are odd, as though they have been artificially lengthened.
<<elseif $activeSlave.heightImplant < 0>>
@@ -1961,11 +2024,11 @@ $pronounCap has
$pronounCap is
<<if $activeSlave.muscles > 95>>
- @@.pink;extremely muscular,@@ with defined pecs, powerful glutes, and massive traps.
+ @@.pink;extremely muscular,@@ with defined pecs, powerful glutes, and massive traps<<if $activeSlave.weight > 95>> hidden beneath a layer of fat<</if>>.
<<elseif $activeSlave.muscles > 30>>
- @@.pink;quite muscular,@@ with ripped abs, strong shoulders, and defined lats.
+ @@.pink;quite muscular,@@ with ripped abs, strong shoulders, and defined lats<<if $activeSlave.weight > 95>> hidden beneath a layer of fat<</if>>.
<<elseif $activeSlave.muscles > 5>>
- @@.pink;well built,@@ yet feminine, with just-visible muscles.
+ @@.pink;well built,@@ yet feminine, with just-visible muscles<<if $activeSlave.weight > 30>> hidden beneath a layer of fat<</if>>.
<<elseif $activeSlave.muscles > -6>>
@@.pink;soft and feminine,@@ with no visible muscles.
<<elseif $activeSlave.muscles > -31>>
@@ -1982,6 +2045,29 @@ $pronounCap is
<</if>>
<</if>>
+<<if $activeSlave.amp == 0>>
+ <<if $activeSlave.weight > 190>>
+ $pronounCap has hugely thick arms with sagging fat rolls and
+ <<elseif $activeSlave.weight > 160>>
+ $pronounCap has thick arms with drooping fat folds and
+ <<elseif $activeSlave.weight > 130>>
+ $pronounCap has plump arms with
+ <<elseif $activeSlave.weight > 97>>
+ $pronounCap has chubby arms with
+ <<else>>
+ $pronounCap has normal arms with
+ <</if>>
+ <<if $activeSlave.muscles > 95>>
+ huge muscles<<if $activeSlave.weight > 95>> hidden beneath her soft flesh<</if>>.
+ <<elseif $activeSlave.muscles > 30>>
+ obvious muscles<<if $activeSlave.weight > 95>> hidden beneath her soft flesh<</if>>.
+ <<elseif $activeSlave.muscles > 5>>
+ toned muscles<<if $activeSlave.weight > 30>> hidden beneath her soft flesh<</if>>.
+ <<else>>
+ little muscle to them.
+ <</if>>
+<</if>>
+
<<if $activeSlave.fuckdoll == 0>>
<<if $activeSlave.ID == $Bodyguard.ID>>
She is your bodyguard.
@@ -2328,6 +2414,31 @@ $pronounCap is
Her stomach is @@.pink;large enough to be in the way,@@ both in daily affairs and during sex.
<</if>>
+<<if $activeSlave.amp == 0>>
+ <<if $activeSlave.weight > 190>>
+ $pronounCap has extremely fat legs with immense soft, rather uneven thighs and
+ <<elseif $activeSlave.weight > 160>>
+ $pronounCap has very fat legs with massively thick, soft, somewhat uneven thighs and
+ <<elseif $activeSlave.weight > 130>>
+ $pronounCap has fat legs with hugely thick, soft thighs and
+ <<elseif $activeSlave.weight > 97>>
+ $pronounCap has fat legs with thick, soft thighs and
+ <<elseif $activeSlave.weight > 95>>
+ $pronounCap has normal legs with thick, soft thighs and
+ <<else>>
+ $pronounCap has relatively normal legs and thighs with
+ <</if>>
+ <<if $activeSlave.muscles > 95>>
+ huge muscles<<if $activeSlave.weight > 95>> hidden beneath her soft flab<</if>>.
+ <<elseif $activeSlave.muscles > 30>>
+ obvious muscles<<if $activeSlave.weight > 95>> hidden beneath her soft flab<</if>>.
+ <<elseif $activeSlave.muscles > 5>>
+ toned muscles<<if $activeSlave.weight > 30>> hidden beneath her soft flab<</if>>.
+ <<else>>
+ barely any muscle in them.
+ <</if>>
+<</if>>
+
<<if ($activeSlave.heels == 1)>>
$possessiveCap @@.pink;legs have been altered@@ so that $pronoun must wear heels in order to walk.
<<if ($showClothing == 1) && ($saleDescription == 0)>>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index c0863dcf222..52535e7f683 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -120,7 +120,7 @@ $masterSuiteNameCaps is furnished
<<case "Body Purist" "Slimness Enthusiast">>
comfortably, with lots of easy-to-clean leather and plentiful tools, toys, and lubricants to make sex with slaves mutually enjoyable. The space is dominated by a huge bed with soft sheets.
<<case "Hedonistic">>
- comfortably, with lots of lounges for a hefty slaves to relax on. <<if $$arcologies[0].HedonisticDecadenceResearch == 1>>Platters of food and treats are readily available throughout the room and are<<else>>Slave food is readily available for your harem and platters of food for yourself are<</if>> never out of arm's reach. There's a huge, reinforced, low to the ground bed in the middle of the suite.
+ comfortably, with lots of lounges for a hefty slaves to relax on. <<if $arcologies[0].HedonisticDecadenceResearch == 1>>Platters of food and treats are readily available throughout the room and are<<else>>Slave food is readily available for your harem and platters of food for yourself are<</if>> never out of arm's reach. There's a huge, reinforced, low to the ground bed in the middle of the suite.
<<default>>
in a refined, yet practical style. It's dominated by a huge bed in which many slaves could serve their <<if $PC.title == 1>>master<<else>>mistress<</if>> and then cuddle afterward.
<</switch>>
@@ -192,7 +192,7 @@ $masterSuiteNameCaps is furnished
<<case "Body Purist" "Slimness Enthusiast">>
comfortably, with lots of easy-to-clean leather and plentiful tools, toys, and lubricants to make sex with slaves mutually enjoyable.
<<case "Hedonistic">>
- comfortably, with lots of lounges for a hefty slaves to relax on. <<if $$arcologies[0].HedonisticDecadenceResearch == 1>>Platters of food and treats are readily available throughout the room and are<<else>>Slave food is readily available for your harem and platters of food for yourself are<</if>> never out of arm's reach.
+ comfortably, with lots of lounges for a hefty slaves to relax on. <<if $arcologies[0].HedonisticDecadenceResearch == 1>>Platters of food and treats are readily available throughout the room and are<<else>>Slave food is readily available for your harem and platters of food for yourself are<</if>> never out of arm's reach.
<<default>>
in a refined, yet practical style.
<</switch>>
@@ -283,7 +283,7 @@ $masterSuiteNameCaps is furnished
<<case "Body Purist" "Slimness Enthusiast">>
comfortably, with lots of easy-to-clean leather and plentiful tools, toys, and lubricants to make sex with slaves mutually enjoyable.
<<case "Hedonistic">>
- comfortably, with lots of lounges for a hefty slaves to relax on. <<if $$arcologies[0].HedonisticDecadenceResearch == 1>>Platters of food and treats are readily available throughout the room and are<<else>>Slave food is readily available for your harem and platters of food for yourself are<</if>> never out of arm's reach. There's a huge, reinforced, low to the ground bed in the middle of the suite.
+ comfortably, with lots of lounges for a hefty slaves to relax on. <<if $arcologies[0].HedonisticDecadenceResearch == 1>>Platters of food and treats are readily available throughout the room and are<<else>>Slave food is readily available for your harem and platters of food for yourself are<</if>> never out of arm's reach. There's a huge, reinforced, low to the ground bed in the middle of the suite.
<<default>>
comfortably, as a fairly normal luxury suite. It is unusually large, to accommodate as large a stable of sex slaves as strikes your fancy.
<</switch>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index ce6588f49c7..58f985c970b 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -65,7 +65,7 @@
<<else>>
<<set $slaves[_i].fetishStrength = Math.clamp($slaves[_i].fetishStrength.toFixed(1), 0, 100)>>
<</if>>
- <<set $slaves[_i].weight = Math.clamp($slaves[_i].weight.toFixed(1), -100, 100)>>
+ <<set $slaves[_i].weight = Math.clamp($slaves[_i].weight.toFixed(1), -100, 200)>>
<<set $slaves[_i].health = Number($slaves[_i].health.toFixed(1))>>
<<set $slaves[_i].butt = Number($slaves[_i].butt.toFixed(1))>>
<<set $slaves[_i].muscles = Math.clamp($slaves[_i].muscles.toFixed(1), -100, 100)>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 880acbb7260..8427c00eaf6 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -219,7 +219,7 @@ She waits anxiously for your decision.
<<set $activeSlave.ovaries = 1>>
<<set $activeSlave.preg = random(5,29)>>
<<set $activeSlave.pregType = 1>>
- <<set $activeSlave.weight = random(30,80)>>
+ <<set $activeSlave.weight = random(30,135)>>
<<set $activeSlave.muscles = random(0,1)>>
<<set $activeSlave.oralSkill = 15>>
<<set $activeSlave.vaginalSkill = 30>>
@@ -250,7 +250,7 @@ She waits anxiously for your decision.
<<set $activeSlave.genes = "XY">>
<<set $activeSlave.anus = 2>>
<<set $activeSlave.vagina = -1>>
- <<set $activeSlave.weight = random(70,100)>>
+ <<set $activeSlave.weight = random(70,180)>>
<<set $activeSlave.oralSkill = 35>>
<<set $activeSlave.analSkill = 75>>
<<set $activeSlave.hLength = random(10,20)>>
diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index c2d93101554..142c7460ae5 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -294,7 +294,7 @@
@@.lime;Her butt gets a little bigger.@@
<<set $slaves[$i].butt + 1>>
<</if>>
- <<if $slaves[$i].weight > 95>>
+ <<if $slaves[$i].weight > 200>>
She is now quite fat, so her diet @@.yellow;has defaulted to maintenance of this weight.@@
<<set $slaves[$i].diet = "healthy">>
<</if>>
@@ -835,7 +835,7 @@
@@.lime;Its butt gets a little bigger.@@
<<set $slaves[$i].butt + 1>>
<</if>>
- <<if $slaves[$i].weight > 95>>
+ <<if $slaves[$i].weight > 200>>
It is now quite fat, so its diet @@.yellow;has defaulted to maintenance of this weight.@@
<<set $slaves[$i].diet = "healthy">>
<</if>>
diff --git a/src/uncategorized/saDrugs.tw b/src/uncategorized/saDrugs.tw
index 051f411b2cb..d5100095851 100644
--- a/src/uncategorized/saDrugs.tw
+++ b/src/uncategorized/saDrugs.tw
@@ -38,6 +38,9 @@
<<elseif ($slaves[$i].diet is "restricted")>>
$possessive restricted diet means $possessive body has few resources to grow on, and
<<set $seed -= 50>>
+ <<elseif ($slaves[$i].weight > 130)>>
+ the enormous diet $pronoun eats to maintain $possessive hugely fat body helps support growth, and
+ <<set $seed += 200>>
<<elseif ($slaves[$i].weight > 30)>>
the generous diet $pronoun eats to maintain $possessive fat body helps support growth, and
<<set $seed += 125>>
@@ -127,6 +130,9 @@
<<elseif ($slaves[$i].diet == "restricted")>>
$possessive restricted diet means $possessive body has few resources to grow on, <<if ($slaves[$i].boobs < 2000)>>but<<else>>and<</if>>
<<set $seed -= 2>>
+ <<elseif ($slaves[$i].weight > 130)>>
+ the enormous diet $pronoun eats to maintain $possessive hugely fat body helps support growth, and
+ <<set $seed += 2>>
<<elseif ($slaves[$i].weight > 30)>>
the generous diet $pronoun eats to maintain $possessive fat body helps support growth, <<if ($slaves[$i].boobs < 2000)>>and<<else>>but<</if>>
<<set $seed += 1>>
@@ -230,6 +236,9 @@
<<elseif ($slaves[$i].diet == "restricted")>>
$possessive restricted diet means $possessive body has few resources to grow on, <<if ($slaves[$i].butt < 6)>>but<<else>>and<</if>>
<<set $seed -= 0.2>>
+ <<elseif ($slaves[$i].weight > 130)>>
+ the enormous diet $pronoun eats to maintain $possessive hugely fat body helps support growth, <<if ($slaves[$i].butt < 6)>>and<<else>>but<</if>>
+ <<set $seed += 0.2>>
<<elseif ($slaves[$i].weight > 30)>>
the generous diet $pronoun eats to maintain $possessive fat body helps support growth, <<if ($slaves[$i].butt < 6)>>and<<else>>but<</if>>
<<set $seed += 0.1>>
@@ -276,6 +285,9 @@
<<elseif ($slaves[$i].diet is "restricted")>>
$possessive restricted diet means $possessive body has few resources to grow on, <<if ($slaves[$i].butt < 10)>>but<<else>>and<</if>>
<<set $seed -= 0.2>>
+ <<elseif ($slaves[$i].weight > 130)>>
+ the enormous diet $pronoun eats to maintain $possessive hugely fat body helps support growth, <<if ($slaves[$i].butt < 6)>>and<<else>>but<</if>>
+ <<set $seed += 0.2>>
<<elseif ($slaves[$i].weight > 30)>>
the generous diet $pronoun eats to maintain $possessive fat body helps support growth, <<if ($slaves[$i].butt < 6)>>and<<else>>but<</if>>
<<set $seed += 0.1>>
@@ -660,6 +672,9 @@
<<if ($slaves[$i].boobs-$slaves[$i].boobsImplant) <= 100>>
$possessiveCap natural breast tissue is now so thin that further drug use will fail to shrink it further; @@.yellow;$possessive drug regimen has been ended.@@
<<set $slaves[$i].drugs = "no drugs">>
+ <<elseif ($slaves[$i].weight >= 200)>>
+ $pronounCap is now so immensely obese $possessive health is greatly at risk; @@.yellow;$possessive drug regimen has been ended.@@
+ <<set $slaves[$i].drugs = "no drugs">>
<<elseif ($slaves[$i].boobs-$slaves[$i].boobsImplant) >= 20000>>
@@.lime;$possessiveCap breasts shrink painfully,@@ becoming massively smaller while $possessive @@.red;waistline swells tremendously.@@
<<set $slaves[$i].boobs -= 2000>>
@@ -687,6 +702,9 @@
<<if ($slaves[$i].butt-$slaves[$i].buttImplant) <= 0>>
$possessiveCap natural ass flesh is now so thin that further drug use will fail to shrink it further; @@.yellow;$possessive drug regimen has been ended.@@
<<set $slaves[$i].drugs = "no drugs">>
+ <<elseif ($slaves[$i].weight >= 200)>>
+ $pronounCap is now so immensely obese $possessive health is greatly at risk; @@.yellow;$possessive drug regimen has been ended.@@
+ <<set $slaves[$i].drugs = "no drugs">>
<<elseif ($slaves[$i].butt-$slaves[$i].buttImplant) >= 15>>
@@.lime;$possessiveCap butt shrinks painfully,@@ becoming massively smaller while $possessive @@.red;waistline swells tremendously.@@
<<set $slaves[$i].butt -= 2>>
diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw
index c9bc62e9620..e3de89d0c12 100644
--- a/src/uncategorized/saGuardsYou.tw
+++ b/src/uncategorized/saGuardsYou.tw
@@ -64,11 +64,15 @@ carries arms in your defense.
She struggles to move with her inhumanly wide hips and frequently gets caught between things trying to follow you.
<</if>>
-<<if $slaves[$i].weight > 30>>
+<<if $slaves[$i].weight > 190>>
+ Her extreme weight nearly immobilizes her. She struggles to move let alone protect you. At least her bloated body will likely stop bullets and block doorways when needed.
+<<elseif $slaves[$i].weight > 160>>
+ Her extreme weight limits her mobility and range of motion making her a poor bodyguard but decent meatshield.
+<<elseif $slaves[$i].weight > 130>>
+ Her extreme weight is an impediment as a bodyguard.
+<<elseif $slaves[$i].weight > 30>>
Her heavy weight is an impediment as a bodyguard.
-<</if>>
-
-<<if $slaves[$i].weight < -10>>
+<<elseif $slaves[$i].weight < -10>>
Her light weight is an impediment as a bodyguard.
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 23de0b9e057..a77717e04e8 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4621,9 +4621,20 @@
<</if>>
<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
- <<if ($slaves[$i].boobs < 500) && ($slaves[$i].butt < 3) && ($slaves[$i].weight <= 10) && ($slaves[$i].muscles <= 30)>>
- Society @@.green;approves@@ of $slaves[$i].slaveName's graceful, girlish form; $pronoun furthers the fashion for slaves like $object.
- <<FSChangePorn "SlimnessEnthusiast" 1>>
+ <<if ($slaves[$i].boobs < 500) && ($slaves[$i].butt < 3)>>
+ <<if $arcologies[0].FSPhysicalIdealist != "unset" && ($slaves[$i].weight <= 10)>>
+ <<set _slimAccept = 1>>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && $slaves[$i].weight <= 30 && $slaves[$i].muscles <= 30>>
+ <<set _slimAccept = 1>>
+ <<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $arcologies[0].FSHedonisticDecadence == "unset" && $slaves[$i].muscles <= 30 && ($slaves[$i].weight <= 10)>>
+ <<set _slimAccept = 1>>
+ <<else>>
+ <<set _slimAccept = 0>>
+ <</if>>
+ <<if _slimAccept == 1>>
+ Society @@.green;approves@@ of $slaves[$i].slaveName's graceful, girlish form; $pronoun furthers the fashion for slaves like $object.
+ <<FSChangePorn "SlimnessEnthusiast" 1>>
+ <</if>>
<</if>>
<<if ($slaves[$i].butt > 4) && ($slaves[$i].boobs > 800)>>
Society @@.red;disapproves@@ of $slaves[$i].slaveName's boorishly large tits and ass; $pronoun damages the fashion for slender slaves.
@@ -5241,6 +5252,9 @@
<<if tooBigBalls($slaves[$i])>>
<<set $anchors.push("balls")>>
<</if>>
+ <<if tooFatSlave($slaves[$i])>>
+ <<set $anchors.push("fat body")>>
+ <</if>>
<<if $anchors.length > 0>>
<<if $anchors.length > 2>>
<<for _j = 0; _j < $anchors.length; _j++>>
@@ -6085,6 +6099,34 @@
<</if>>
<</if>>
+<<if $slaves[$i].weight >= 100>>
+ <<if $slaves[$i].weight > 190>>
+ $possessiveCap extreme obesity @@.red;directly affects@@ $possesive health.
+ <<set $slaves[$i].health -= 2>>
+ <<if random(1,200) < 5>>
+ $pronounCap experienced @@.red;severe@@ health complications due to $possessive weight this week. After extensive surgery, $possessive health was stabilized, though $possessive survival is not assured.
+ <<set $slaves[$i].health -= 80>>
+ <</if>>
+ <<elseif $slaves[$i].weight > 160>>
+ $possessiveCap obesity @@.red;directly affects@@ $possesive health.
+ <<set $slaves[$i].health-->>
+ <<if random(1,200) < 5>>
+ $pronounCap experienced @@.red;severe@@ health complications due to $possessive weight this week. After extensive surgery, $possessive health was stabilized.
+ <<set $slaves[$i].health -= 40>>
+ <</if>>
+ <<elseif $slaves[$i].weight > 130>>
+ <<if random(1,200) < 5>>
+ $pronounCap experienced @@.red;severe@@ health complications due to $possessive weight this week. After some rest, $pronoun recovered.
+ <<set $slaves[$i].health -= 20>>
+ <</if>>
+ <<elseif $slaves[$i].weight > 95>>
+ <<if random(1,200) < 5>>
+ $pronounCap experienced @@.red;minor@@ health complications due to $possessive weight this week. After some rest, $pronoun recovered.
+ <<set $slaves[$i].health -= 5>>
+ <</if>>
+ <</if>>
+<</if>>
+
/* pregmod */
<<if ($slaves[$i].scarheal == 5)>>
$slaves[$i].slaveName's wound has @@.green;healed@@ leaving a big scar. It is still @@.red;quite ugly@@ but doesn't hurt anymore.
@@ -6111,7 +6153,7 @@
<<if ($slaves[$i].accent >= 4)>>
<<if ($week - $slaves[$i].weekAcquired) > _minweeks - 5>>
<<set $slaves[$i].accent -= 1>>
- <<set $slaves[$i].speechRules = "accent elimination">>
+ <<if $slaves[$i].speechRules == "language lessons">><<set $slaves[$i].speechRules = "accent elimination">><</if>>
<<if $slaves[$i].voice == 0 || $slaves[$i].lips > 95>>
$pronounCap has managed to pick up enough $language that @@.green;$object could now barely get $possessive point across.@@ If $pronoun were able to talk, that is.
<<else>>
@@ -6398,7 +6440,10 @@
<<if $slaves[$i].burst != 1>>
<<if $slaves[$i].health <= -90 && $slaves[$i].assignment != "get treatment in the clinic">>
<<set _deathSeed = ($slaves[$i].health-$slaves[$i].physicalAge-($slaves[$i].chem*2)-($slaves[$i].addict*2))>>
- <<if $slaves[$i].weight < -50 || $slaves[$i].weight >= 95>>
+ <<if $slaves[$i].weight < -50 || $slaves[$i].weight > 95>>
+ <<set _deathSeed -= 100>>
+ <</if>>
+ <<if $slaves[$i].weight > 190>>
<<set _deathSeed -= 100>>
<</if>>
<<if $slaves[$i].aphrodisiacs > 0>>
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index 482608254cd..86f3dc01761 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -22,6 +22,7 @@
$slaves[$i].slaveName and $slaves[_j].slaveName see too much of each other and @@.lightsalmon;start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID>>
<<set $slaves[$i].rivalry = 1, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
+ <<break>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index e79e4e0da4b..5ba0eb89efa 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -526,7 +526,13 @@ You throw the victor's strap-on down to _winner.slaveName.
<<set $oralTotal += 1>>
<</if>>
-<<if (_winner.energy > 95)>>
+<<if (_loser.sexualFlaw == "malicious")>>
+ winner.slaveName lives to torment and violate slave girls. She uses _loser.slaveName for her @@.hotpink;pleasure@@, slapping her viciously, pinching her until she draws blood, and showing off for the spectators. The audience @@.green;greatly enjoys@@ the depraved spectacle.
+ <<set _loser.devotion += 2>>
+<<elseif (_loser.sexualFlaw == "abusive")>>
+ winner.slaveName lives to abuse and violate slave girls. She uses _loser.slaveName for her @@.hotpink;pleasure@@, raping her mercilessly, striking her until she turns a deep reddish-purple, and showing off for the spectators. The audience @@.green;greatly enjoys@@ the depraved spectacle.
+ <<set _loser.devotion += 2>>
+<<elseif (_winner.energy > 95)>>
_winner.slaveName doesn't have to feign willingness to rape a slave girl. She uses _loser.slaveName for her @@.hotpink;pleasure@@, groping her, kissing her unwilling mouth, and showing off for the spectators. The audience @@.green;greatly enjoys@@ the depraved spectacle.
<<set _winner.devotion += 1>>
<<set $rep += 50>>
@@ -603,8 +609,24 @@ You throw the victor's strap-on down to _winner.slaveName.
She @@.mediumorchid;hates@@ having to abuse _loser.slaveName.
<<set _winner.devotion -= 10>>
<</if>>
-
-<<if (_loser.fetish == "masochist") && (_loser.fetishKnown == 1) && (_loser.fetishStrength > 60)>>
+<<if _winner.fetish == "sadist" && _winner.fetishStrength > 90 && _winner.behavioralFlaw != "malicious" && _winner.devotion >= 20>>
+ She noticed something while she was raping _loser.slaveName; watching the way she writhed in pain was strangely satisfying, as was making her suffer. _winner.slaveName cums powerfully at the mere thought; she has become @@.yellow;sexually addicted to inflicting pain and anguish.@@
+ <<set _winner.behavioralFlaw = "malicious">>
+<<elseif _winner.fetish == "masochist" && _winner.fetishStrength > 90 && _winner.behavioralFlaw != "self hating" && _winner.devotion < 20>>
+ She feels horrible after forcing herself on _loser.slaveName; she is the one that should suffer, not her. _winner.slaveName has @@.yellow;descended into true self hatred.@@
+ <<set _winner.behavioralFlaw = "self hating">>
+<<elseif _winner.fetish == "dom" && _winner.fetishStrength > 90 && _winner.behavioralFlaw != "abusive" && _winner.devotion >= 20>>
+ She noticed something while she was raping _loser.slaveName; watching the way she cowered before her raised palm was strangely satisfying, as were the painful moans that accompanied every forceful thrust. _winner.slaveName cums powerfully at the mere thought; she has become @@.yellow;sexually abusive, getting off on the thrill of forcing herself on other slaves.@@
+ <<set _winner.behavioralFlaw = "abusive">>
+<<elseif _winner.behavioralFlaw == "none" && random(1,100) <= 5 && _winner.devotion < 20>>
+ She begins to act @@.red;oddly@@ after the fight; having to beat down and rape another slave may have affected her mentally.
+ <<set _winner.behavioralFlaw = "odd">>
+<</if>>
+
+<<if (_loser.sexualFlaw == "self hating")>>
+ _loser.slaveName feels she @@.hotpink;deserved this.@@
+ <<set _loser.devotion += 5>>
+<<elseif (_loser.fetish == "masochist") && (_loser.fetishKnown == 1) && (_loser.fetishStrength > 60)>>
_loser.slaveName @@.hotpink;gets off@@ on being beaten and molested.
<<set _loser.devotion += 5>>
<<elseif (_loser.fetish == "humiliation") && (_loser.fetishKnown == 1) && (_loser.fetishStrength > 60)>>
@@ -689,6 +711,13 @@ You throw the victor's strap-on down to _winner.slaveName.
<<set _loser.devotion -= 10>>
<<set _loser.trust -= 10>>
<</if>>
+<<if _loser.fetish == "masochist" && _loser.fetishStrength > 90 && _loser.behavioralFlaw != "self hating">>
+ She feels strangely content after being abused and violated; she is the one that should suffer, after all. _loser.slaveName has @@.yellow;descended into true self hatred.@@
+ <<set _loser.behavioralFlaw = "self hating">>
+<<elseif _loser.behavioralFlaw == "none" && random(1,100) <= 5 && _loser.devotion < 20>>
+ She begins to act @@.red;oddly@@ after the fight; losing and getting raped may have affected her mentally.
+ <<set _loser.behavioralFlaw = "odd">>
+<</if>>
<<if (_loser.fetish != "masochist") && (_loser.fetish != "humiliation") && (_loser.sexualFlaw != "self-hating")>>
<<if (_loser.relationship != 0)>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 42c85a43d86..7b4c4c79e8b 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1117,10 +1117,10 @@ Hormones: <strong><span id="hormones">
<<else>>
| //She is already underweight//
<</if>>
-<<if $activeSlave.weight <= 95>>
+<<if $activeSlave.weight <= 200>>
| <<link "Fatten">><<set $activeSlave.diet = "fattening">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
<<else>>
-| //She is already overweight//
+| //She is already extremely overweight//
<</if>>
<<if $feeder == 1>>
| <<link "Estrogen enriched">><<set $activeSlave.diet = "XX">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
@@ -1134,7 +1134,7 @@ Hormones: <strong><span id="hormones">
<<elseif $activeSlave.muscles > 95 && $activeSlave.amp != 1>>
| //She is maintaining her enormous musculature//
<<else>>
-| //She has no limbs and thus can't build effectively build muscle//
+| //She has no limbs and thus can't effectively build muscle//
<</if>>
<<if $activeSlave.muscles > 5 && canWalk($activeSlave)>>
| <<link "Slim down">><<set $activeSlave.diet = "slimming">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index 00284c98fc3..150d9f48b0e 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -55,7 +55,7 @@ $spaNameCaps
<<case "Slimness Enthusiast">>
is comfortable, with waterproof cushions lining the pools. Everything is designed for the slaves' comfort; there are even special mud baths to perfect skin clarity.
<<case "Hedonistic">>
- is comfortable, with waterproof cushions lining the pools. It is equipped with all sorts of devices to aid hefty slaves, including lifts to help them in and out of the water, specialized moisturizers to keep their skin healthy and smooth, and all around showers to help clean difficult to reach spots and between folds. <<if $$arcologies[0].HedonisticDecadenceResearch == 1>>Platters of food and treats are readily available around the tubs so that relaxing slaves never have to strain to grab a bite to eat<<else>>Feeders connected to the slave food reserves line the pools so that so that relaxing slaves never have to strain to suck down their fill of food<</if>>.
+ is comfortable, with waterproof cushions lining the pools. It is equipped with all sorts of devices to aid hefty slaves, including lifts to help them in and out of the water, specialized moisturizers to keep their skin healthy and smooth, and all around showers to help clean difficult to reach spots and between folds. <<if $arcologies[0].HedonisticDecadenceResearch == 1>>Platters of food and treats are readily available around the tubs so that relaxing slaves never have to strain to grab a bite to eat<<else>>Feeders connected to the slave food reserves line the pools so that so that relaxing slaves never have to strain to suck down their fill of food<</if>>.
<<default>>
is well-appointed, with massage tables, hot tubs, and a cold pool.
<</switch>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 07845e20dbe..ceb77834342 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -7715,6 +7715,15 @@ $possessiveCap @@.pink;face is
the height of conventional feminine beauty.
<</if>>
<</switch>>@@
+<<if $activeSlave.weight > 190>>
+ $possessiveCap face is quite fat with ample excess chins.
+<<elseif $activeSlave.weight > 160>>
+ $possessiveCap face is round and plump with a trio of extra chins.
+<<elseif $activeSlave.weight > 130>>
+ $possessiveCap face is chubby with an obivous second chin.
+<<elseif $activeSlave.weight > 97>>
+ $possessiveCap face is soft with barely a second chin.
+<</if>>
<<if $activeSlave.fuckdoll > 0>>
However,
<<if $activeSlave.face < -1>>
@@ -10344,7 +10353,7 @@ $pronounCap has
<<if $activeSlave.physicalAge >= 13>>
<<if $activeSlave.bellyImplant >= 31000>>
<<if canWalk($activeSlave)>>
- $possessiveCap middle is so massive that it is difficult for $possessive to move.
+ $possessiveCap middle is so massive that it is difficult for $object to move.
<<if $activeSlave.muscles > 95>>
However, $pronoun is so powerfully built that $pronoun can manage it with effort, using $possessive arms to support it.
<<elseif $activeSlave.muscles > 30>>
@@ -10371,7 +10380,7 @@ $pronounCap has
<<elseif $activeSlave.physicalAge >= 4>>
<<if $activeSlave.bellyImplant >= 14000>>
<<if canWalk($activeSlave)>>
- $possessiveCap middle is so massive that it is difficult for $possessive to move.
+ $possessiveCap middle is so massive that it is difficult for $object to move.
<<if $activeSlave.muscles > 95>>
However, $pronoun is so powerfully built that $pronoun can manage it with effort, using $possessive arms to support it.
<<elseif $activeSlave.muscles > 30>>
@@ -10398,7 +10407,7 @@ $pronounCap has
<<elseif $activeSlave.physicalAge < 4>>
<<if $activeSlave.bellyImplant >= 10000>>
<<if canWalk($activeSlave)>>
- $possessiveCap middle is so massive that it is difficult for $possessive to move.
+ $possessiveCap middle is so massive that it is difficult for $object to move.
<<if $activeSlave.muscles > 95>>
However, $pronoun is so powerfully built that $pronoun can manage it with effort, using $possessive arms to support it.
<<elseif $activeSlave.muscles > 30>>
--
GitLab