diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 1ea7fa9c2a021c0963aa0c3c164f66bd34e9155a..fdb92acd25d585fdc95d28048bd9fd2d42037cb4 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -13,8 +13,8 @@ You should have received a copy of the GNU General Public License along with thi
*/
<<unset $releaseID>>
-<<set $ver = "0.10.5", $releaseID = 1016>>
-<<if ndef $releaseID>><<set $releaseID = 1016>><</if>>
+<<set $ver = "0.10.4", $releaseID = 1017>>
+<<if ndef $releaseID>><<set $releaseID = 1017>><</if>>
/* This needs to be broken down into individual files that can be added to StoryInit instead. */
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 210f53832960ab2628359720896e6314db07c584..b45e11e3f95978f772448b9608f9b252da110427 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -31,7 +31,9 @@ window.getSlaveCost = function(s) {
case 'restricted': case 'slimming':
cost -= foodCost;
}
- if(s.weight > 50) {
+ if(s.weight > 130) {
+ cost += foodCost * 2;
+ } else if(s.weight > 50) {
cost += foodCost;
} else if(s.weight < -50) {
cost -= foodCost;
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 948240a75ee6168fed815e97f6dd697ab69f6f9b..77de47a163db38637cf835424bc1ca59e7f4bd27 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -514,7 +514,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.face = random(15,40)>>
<<set $activeSlave.boobs += 100*random(3,6)>>
<<set $activeSlave.butt += random(2,5)>>
- <<set $activeSlave.weight = 100>>
+ <<set $activeSlave.weight = random(100,200)>>
<<set $activeSlave.oralSkill = random(15,35), $activeSlave.analSkill = random(15,35), $activeSlave.anus = 2>>
<<if $activeSlave.vagina > -1>><<set $activeSlave.vaginalSkill = random(15,35), $activeSlave.vagina = 3>><</if>>
<<set $activeSlave.entertainSkill = 0>>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 77a793f23c8d3d15ce79f555ce4691aadbe7fb59..f255ee1c7d943e89cde8f0ad0df9073e0fa7623a 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -196,8 +196,10 @@ My favorite part of my body i<<s>>
my pregnant belly, of cour<<s>>e.
<<elseif ($activeSlave.dick > 0) && ($activeSlave.balls > 0)>>
my cock, I imagine knocking another <<s>>lave up all the time.
+ <<elseif ($activeSlave.weight > 95)>>
+ my big tummy, I can imagine my<<s>>elf pregnant.
<<elseif ($activeSlave.weight > 10)>>
- my plush tummy, I can imagine my<<s>>elf pregnant.
+ my plu<<s>>h tummy, I can imagine my<<s>>elf pregnant.
<<else>>
my tight tummy, I like to imagine how it would <<s>>well if I got pregnant.
<</if>>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 7d0778481039e805881ed86d91385987f396911b..30093a9a72998ad35cdbb44b13731d2a0e33c6e6 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -529,7 +529,10 @@ __You are customizing this slave:__
<<elseif $activeSlave.weight <= 10>>Average.
<<elseif $activeSlave.weight <= 30>>Plush.
<<elseif $activeSlave.weight <= 95>>@@.red;Chubby.@@
-<<else>>@@.red;Fat.@@
+<<elseif $activeSlave.weight <= 130>>@@.red;Fat.@@
+<<elseif $activeSlave.weight <= 160>>@@.red;Obese.@@
+<<elseif $activeSlave.weight <= 190>>@@.red;Super obese.@@
+<<else>>@@.red;Dangerously obese.@@
<</if>>
</span>
<<link "Emaciated">><<set $activeSlave.weight = -100>><<replace "#weight">>@@.red;Emaciated.@@<</replace>><<StartingGirlsCost>><</link>> |
@@ -538,7 +541,10 @@ __You are customizing this slave:__
<<link "Average">><<set $activeSlave.weight = 0>><<replace "#weight">>Average.<</replace>><<StartingGirlsCost>><</link>> |
<<link "Plush">><<set $activeSlave.weight = 20>><<replace "#weight">>Plush.<</replace>><<StartingGirlsCost>><</link>> |
<<link "Chubby">><<set $activeSlave.weight = 50>><<replace "#weight">>@@.red;Chubby.@@<</replace>><<StartingGirlsCost>><</link>> |
-<<link "Fat">><<set $activeSlave.weight = 100>><<replace "#weight">>@@.red;Fat.@@<</replace>><<StartingGirlsCost>><</link>>
+<<link "Fat">><<set $activeSlave.weight = 100>><<replace "#weight">>@@.red;Fat.@@<</replace>><<StartingGirlsCost>><</link>> |
+<<link "Obese">><<set $activeSlave.weight = 140>><<replace "#weight">>@@.red;Obese.@@<</replace>><<StartingGirlsCost>><</link>> |
+<<link "Super obese">><<set $activeSlave.weight = 180>><<replace "#weight">>@@.red;Super obese.@@<</replace>><<StartingGirlsCost>><</link>> |
+<<link "Dangerously obese">><<set $activeSlave.weight = 200>><<replace "#weight">>@@.red;Dangerously obese.@@<</replace>><<StartingGirlsCost>><</link>>
<br><br>
<span id = "nationality">
diff --git a/src/pregmod/seFCTVinstall.tw b/src/pregmod/seFCTVinstall.tw
index f9d85214daab1a0b768c82555b813de8f3d9d915..89f1264e4d7fb670a79c445814c93a408485a6cd 100644
--- a/src/pregmod/seFCTVinstall.tw
+++ b/src/pregmod/seFCTVinstall.tw
@@ -1,10 +1,9 @@
:: SE FCTV Install [nobr]
-<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV">>
+<<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." You nod in acknowledgement.
<br><br>
-[[You'll look into it.|Scheduled Event][$receiverAvailable = 1]]
-<br>[[You've never heard of FCTV.|Scheduled Event][$receiverAvailable = 0]] This option will disable FCTV content
-<br><br><i>While FCTV excludes any dick-based, hyperpregnancy, and extreme content based on your settings, it may still hint at that content. If you wish to be absolutely sure, disable FCTV.</i>
+[[You'll look into it.|Scheduled Event]]
+<br><br><i>While FCTV excludes any dick-based, hyperpregnancy, and extreme content based on your settings, it may still hint at that content. If you wish to be absolutely sure, don't watch FCTV or do not install the receiver.</i>
diff --git a/src/uncategorized/PESS.tw b/src/uncategorized/PESS.tw
index 9af391c28c59a8b5a670c79ed0e113fddfdfc073..0ba1db0f81c0e4b786849eb99f50ff7b528ecdc9 100644
--- a/src/uncategorized/PESS.tw
+++ b/src/uncategorized/PESS.tw
@@ -21,7 +21,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($PESSevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index a761bb010ba7cc33c5d9aae8ef7ac2f0a9572e52..6cf8d3ac5e2af70b210bff44b32e078d7ad42660 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -21,7 +21,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($PETSevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 22001caf190002337b889717c4a72355e0266bbc..05d6510ab05724100b2590b66040b58d26e7dfcf 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -21,7 +21,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($RECIevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index c5e9981e8da9e2623e34c2c463eb5ea9029e9fa6..33f0cecbd7d7132d535a7d7b32714b4bd32a0a89 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -38,7 +38,7 @@
<<set $activeSlave = $slaves.find(function(s) { return s.ID == $humiliationInterestTargetID; })>>
<</switch>>
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($REFIevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index ffd7fd324b4b42de19e1c8df140ad53a33162030..ec98cf81fdb42227e230403cbba25907866e6c4d 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -22,7 +22,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($REFSevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 85b3ad134ab13e82784c84be24699d70a53002aa..e3ce3320c91df0672ef627b3fd115b190c057a29 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -21,7 +21,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($RESSevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/RESSTR.tw b/src/uncategorized/RESSTR.tw
index 7e72f756dbb2b6aa92cb6ba59a08425a4e12ccb6..d43dc4ffadc8df410b4adde7acd09c558179e967 100644
--- a/src/uncategorized/RESSTR.tw
+++ b/src/uncategorized/RESSTR.tw
@@ -21,7 +21,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($RESSTRevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index d6f2b360759f4576f2a468a686b21d0b98a5228f..4d8ab0151c9d9339a6d57c25c9d11e90cffb8fd9 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -21,7 +21,7 @@
/* */
/* Some scenes are also stored in useGuard.tw, walkPast.tw, and toychest.tw */
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($RETSevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 7e743a5d4574c5390d00a4b96f302f8cc55624d6..e74c141edce973a0cf72064560ee4741e6fa46a2 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -57,7 +57,7 @@ $arcadeNameCaps
<<case "Hedonistic">>
is built in such a way so that most of a slave's ass, thighs, breasts and belly are exposed for patrons to grope and fondle. Plenty of cup holders and surfaces are available to hold one's food and drink as they enjoy their hole of choice.
<<default>>
- is a standard Free Cities sex arcade: a pair of hallways extend away from the entrance, lined with doorless stalls like those in a public restroom. One hallway offers mouths, the other <<if $seeDicks != 2>>vaginas and <</if>>anuses.
+ is a standard Free Cities sex arcade: a pair of hallways extend away from the entrance, lined with doorless stalls like those in a public restroom. One hallway offers mouths, the other <<if $seeDicks != 100>>vaginas and <</if>>anuses.
<</switch>>
<<if $arcadeSlaves > 2>>
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 50413aa5af1d7b30db69dd96adedbc8522780fbf..59e969e14d744bd77c3b23110337130a9176dd94 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -97,7 +97,7 @@ __Sex Slave Purchase Options__
<<if ($rep > 5500)>>
<br>''Slave Schools:'' //High prices; will be young and healthy.//
- <<if ($seeDicks != 2)>>
+ <<if ($seeDicks != 100)>>
<br> [[The Slavegirl School][$slavesSeen += 1]] |
<<if $cash > _minimumFive>>
[[(x5)|Bulk Slave Generate][$slaveMarket = "TSS", $introType = "bulk", $numSlaves = 5]] |
diff --git a/src/uncategorized/degradingName.tw b/src/uncategorized/degradingName.tw
index 9f302aa6af57ad9625be16ba9c7cfff3c4f32687..3ba0c5ff268b623aa0154e725efda689610d072b 100644
--- a/src/uncategorized/degradingName.tw
+++ b/src/uncategorized/degradingName.tw
@@ -53,7 +53,9 @@
<<if ($activeSlave.anus > 2) || ($activeSlave.vagina > 2)>>
<<set _names.push("Gaping", "Slit", "Wideopen", "Hallway")>>
<</if>>
-<<if ($activeSlave.weight > 30)>>
+<<if ($activeSlave.weight > 160)>>
+ <<set _names.push("Fat", "Whale", "Cow",)>>
+<<elseif ($activeSlave.weight > 30)>>
<<set _names.push("Fat", "Chubby", "Whale")>>
<<elseif ($activeSlave.weight <= -30)>>
<<set _names.push("Skinny", "Bony", "Rail")>>
@@ -216,6 +218,9 @@
<<if ($activeSlave.energy > 95)>>
<<set _suffixes.push("Fuck", "Nympho", "Fuckaddict", "Sexaddict")>>
<</if>>
+<<if ($activeSlave.weight > 160)>>
+ <<set _names.push("Blimp", "Fatass")>>
+<</if>>
<<if ($activeSlave.fetish == "humiliation") && ($activeSlave.fetishKnown == 1)>>
<<set _suffixes.push("Rapebait", "Showgirl")>>
<</if>>
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index da838053191bac13cab14aee95d793628d3dcf12..5e53eca05bf3ed48c7c8c296769d08d14cad6c5e 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -171,7 +171,7 @@
<<if $captureUpgradeRace == "mixed race">>
<<set $activeSlave.race = "mixed race">>
<<else>>
- <<set _capUpgradeCheck = State.variables[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>>
+ <<set _capUpgradeCheck = setup[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>>
<<set _capUpgradeNationalities = []>>
<<for _u = 0; _u < _capUpgradeCheck.length; _u++>>
<<set _capNation = _capUpgradeCheck[_u]>>
@@ -367,15 +367,17 @@
<<set $activeSlave.height = Math.round($activeSlave.height * $seed / 162.5)>>
/% End height replacement section. %/
-<<set $activeSlave.weight = random(-100, 100)>>
+<<set $activeSlave.weight = random(-100,180)>>
<<if ($activeSlave.weight < -30)>>
<<set $activeSlave.waist = random(-55,0)>>
<<elseif ($activeSlave.weight <= 30)>>
<<set $activeSlave.waist = random(-45,45)>>
<<elseif $activeSlave.physicalAge < 13>>
<<set $activeSlave.waist = random(-25,25)>>
-<<else>>
+<<elseif ($activeSlave.weight <= 160)>>
<<set $activeSlave.waist = random(0,55)>>
+<<else>>
+ <<set $activeSlave.waist = random(50,100)>>
<</if>>
<<if ($activeSlave.physicalAge > random(0,100))>>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index 152f2c78d1f5c9c4fe217bcbfe7197b25386dd0a..2ef07c6b03e459a56aca3ff723bad7b82956e429 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -175,7 +175,7 @@
<<if $captureUpgradeRace == "mixed race">>
<<set $activeSlave.race = "mixed race">>
<<else>>
- <<set _capUpgradeCheck = State.variables[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>>
+ <<set _capUpgradeCheck = setup[$captureUpgradeRace.toLowerCase().replace(/[ -]/g, '')+'Nationalities']>>
<<set _capUpgradeNationalities = []>>
<<for _u = 0; _u < _capUpgradeCheck.length; _u++>>
<<set _capNation = _capUpgradeCheck[_u]>>
@@ -374,15 +374,17 @@
<<set $activeSlave.height = Math.round($activeSlave.height * $seed / 172.5)>>
/% End height replacement section. %/
-<<set $activeSlave.weight = random(-100, 100)>>
+<<set $activeSlave.weight = random(-100, 180)>>
<<if ($activeSlave.weight < -30)>>
<<set $activeSlave.waist = random(-45,45)>>
<<elseif ($activeSlave.weight <= 30)>>
<<set $activeSlave.waist = random(-15,65)>>
<<elseif $activeSlave.physicalAge < 13>>
<<set $activeSlave.waist = random(-15,25)>>
-<<else>>
+<<elseif ($activeSlave.weight <= 160)>>
<<set $activeSlave.waist = random(5,100)>>
+<<else>>
+ <<set $activeSlave.waist = random(50,100)>>
<</if>>
<<if ($activeSlave.intelligenceImplant == 1) && ($activeSlave.accent >= 3) && (3+$activeSlave.intelligence) > random(0,6)>>
diff --git a/src/uncategorized/lawCompliance.tw b/src/uncategorized/lawCompliance.tw
index b5b84bec1ce4904d31a54dcb7bf44c587d951f3c..a4bd0567a8c6598c76946298b94e244a0ce55052 100644
--- a/src/uncategorized/lawCompliance.tw
+++ b/src/uncategorized/lawCompliance.tw
@@ -45,7 +45,7 @@
Much of her time before sale was spent lifting weights, and her health has been raised to an almost unnatural level.
<<elseif $arcologies[0].FSHedonisticDecadenceSMR == 1>>
<<set $activeSlave.muscles = random(-80,0)>>
- <<set $activeSlave.weight = random(500,1000)>>
+ <<set $activeSlave.weight = random(50,200)>>
<<set $activeSlave.health = random(-30,10)>>
Much of her time before sale was spent being fattened up and lying around.
<<if $activeSlave.devotion <= 20>>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 6c1580f8dba4a9e187792aed48215a38b25e0bb5..7c71b275f60e214d9cf8e7b4e04374a29228bbde 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -175,7 +175,7 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.trust -= 5>>
<<set $hostage.devotion -= 5>>
<<set $hostage.behavioralFlaw = "bitchy">>
- <<set $hostage.sexualQuirk = "shamefast">>
+ <<set $hostage.sexualFlaw = "shamefast">>
being weighed and measured to document her trim body.
<<case "Pastoralism">>
<<set $hostage.trust -= 5>>
@@ -441,8 +441,8 @@ Your inter-arcology war with the arcology owner behind the Daughters of Liberty
<<set $hostage.analCount += 50>>
<<set $hostage.mammaryCount += 50>>
<<set $hostage.fetishStrength = 65>>
- <<set $hostage.behavioralFlaw = "none">>
- <<set $hostage.behavioralQuirk = "odd">>
+ <<set $hostage.behavioralQuirk = "none">>
+ <<set $hostage.behavioralFlaw = "odd">>
<<set $hostage.sexualFlaw = "apathetic">>
collapsing into her rancid cot, hands on her rounded middle, sobbing in terror.
<<case "Repopulation Focus">>
diff --git a/src/uncategorized/pSchoolSuggestion.tw b/src/uncategorized/pSchoolSuggestion.tw
index e6854fc45d49503cb084dacec75b32406e01b05c..72db9d6ebea9e6de38b0793be15059184efb997d 100644
--- a/src/uncategorized/pSchoolSuggestion.tw
+++ b/src/uncategorized/pSchoolSuggestion.tw
@@ -11,7 +11,7 @@ You entertain your most prominent citizens on a regular basis; it's expected, it
When you do appear, you get an even greater acclamation than usual. It seems your best citizens have discovered that they're unanimous in the belief that the arcology would benefit if a reputable slave school opened a branch campus here. Now they're deep in debate over which of the prominent schools is the best, and it's turned into a friendly but spirited dispute over the schools' merits.
-<<if $seeDicks != 2>>
+<<if $seeDicks != 100>>
<br><br>
"The Slave School for me," says a portly man with a thriving slave breaking business down in the markets. "Their girls are pretty, skilled, and innocent, without any of that weird crap the other schools go in for. Besides, all that special stuff drives up the prices. TSS girls are cheap for what you get. When you're tired of one, just buy another." He turns to his friend and business partner, a much thinner man. "Though I'm sure you disagree with me."
<br><br>
@@ -33,7 +33,7 @@ The older gentleman who seems to have been acting as unofficial moderator before
<br><br>
<span id="result">
-<<if $seeDicks != 2>>
+<<if $seeDicks != 100>>
<<link "The Slave School">>
<<replace "#result">>
You thank your leading citizens and announce your decision: you'll be contacting The Slave School about opening a branch campus here, immediately.
@@ -54,7 +54,7 @@ The older gentleman who seems to have been acting as unofficial moderator before
<</link>>
<</if>>
<<if $seeDicks != 0>>
-<<if $seeDicks != 2>><br><</if>>
+<<if $seeDicks != 100>><br><</if>>
<<link "L'Ecole des Enculees">>
<<replace "#result">>
You thank your leading citizens and announce your decision: you'll be contacting L'Ecole des Enculees about opening a branch campus here, immediately.
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index f5e30075167bc5a43e3734b51e813940e69eeba5..235df2469cc206d173c1168240568a86b8db4bce 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -153,8 +153,8 @@ Your training will seek to <span id="training"><strong>$trainingRegimen</strong>
<</if>>
<br>
-<<if $activeSlave.fetishKnown == 0>>
- <<link "Explore her sexuality">><<set $trainingRegimen = "explore her sexuality">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>>
+<<if $activeSlave.fetishKnown == 0 || $activeSlave.attrKnown == 0>>
+ <<link "Explore her sexuality and fetishes">><<set $trainingRegimen = "explore her sexuality">><<replace "#training">><strong>$trainingRegimen</strong><</replace>><</link>>
<<else>>
//You already understand her sexuality//
<</if>>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index 34aae2a5192416d9e8e103e84444c6cfee7fe989..4b1e080d710280fc2543de8d1c806b0805cfd9ee 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -1098,7 +1098,7 @@
<<if $arcologies[0].FSRestartResearch == 0>>
<br>''@@.lime;Elite Breeder Eligibility:@@'' slaves that pass very strict tests may be permited for use by the Societal Elite to bear their children.
[[Propose|Breeder Proposal][$arcologies[0].FSRestartResearch = 1, $rep -= 5000]]
- <br> //Will damage your greatly damage your reputation for even proposing.//
+ <br> //Will greatly damage your reputation for even proposing.//
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index e028d13f722aa7c5495442bfa080291923ca6d90..b9abc8bbeed68a389b84486cf14336a24247146a 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -535,7 +535,7 @@
<<if ($HeadGirl.devotion > 50) && ($HeadGirl.dick > 0)>>
<<set $recruit.push("male recruit")>>
<</if>>
-<<if $seeDicks != 2>>
+<<if $seeDicks != 100>>
<<if ($HeadGirl.devotion > 50)>>
<<set $RecETSevent.push("mismatched pair")>>
<</if>>
@@ -946,7 +946,7 @@
<<set $RESSale = []>>
<<if $cash > 10000>>
<<if $rep > 6000>>
- <<if $seeDicks != 2>>
+ <<if $seeDicks != 100>>
<<if $TSS.studentsBought == 0>>
<<set $events.push("RES Sale")>>
<<set $RESSale.push("TSS")>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 2e0d0a8937eebda6fb4118edfb553ded039510ae..2dc4002ea0c484f1512ee22d8267b40cbd64ee1c 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1394,7 +1394,7 @@ Knowing what's coming, the teachers in the facility do train their pupils accord
<<set $activeSlave.intelligence = -1>>
<<set $activeSlave.career = "from an upper class family">>
<<set $activeSlave.fetish = "humiliation">>
-<<set $activeSlave.behavioralQuirk = "arrogant">>
+<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.nationality = "American">>
<<set $activeSlave.birthName = setup.whiteAmericanSlaveNames.random(), $activeSlave.birthSurname = setup.whiteAmericanSlaveSurnames.random()>>
<<set $activeSlave.slaveName = $activeSlave.birthName, $activeSlave.slaveSurname = $activeSlave.birthSurname>>
@@ -1473,7 +1473,7 @@ She begins to weep quietly, but continues after her daughters lay their hands su
<<set $activeSlave.shoulders = random(-2,0)>>
<<set $activeSlave.intelligence = -1>>
<<set $activeSlave.career = "from an upper class family">>
-<<set $activeSlave.behavioralQuirk = "arrogant">>
+<<set $activeSlave.behavioralFlaw = "arrogant">>
<<set $activeSlave.voice = 3>>
<<set $activeSlave.teeth = "normal">>
<<set $activeSlave.prestige = 1>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 4c309497faefc73b04c3dbb6241e45a2c9d83f31..2aef340fba5eb7f30480a71a6597a4e86092c2d5 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1,6 +1,6 @@
:: RecETS [nobr]
-<<if (ndef $activeSlave) || ($activeSlave == 0)>>
+<<if Array.isArray($RecETSevent)>>
<<set $activeSlave = $eventSlave>>
<<if $cheatMode == 1>>
<<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */
diff --git a/src/uncategorized/recruiterSelect.tw b/src/uncategorized/recruiterSelect.tw
index d717adcecbf908d0c0b8b168fdf315b46a7fa994..6fcf021b0d34434fc3df6ccde1091d45e1ec8a00 100644
--- a/src/uncategorized/recruiterSelect.tw
+++ b/src/uncategorized/recruiterSelect.tw
@@ -11,7 +11,7 @@
<br><br>Your recruiter will target ''$recruiterTarget.'' ''Assign a different focus:''
<br> [[Desperate whores|Recruiter Select][$recruiterTarget = "desperate whores"]] //Likely to be skilled but unhealthy//
<br> [[Young migrants|Recruiter Select][$recruiterTarget = "young migrants"]] //Young and inexperienced but unhealthy//
-<<if ($seeDicks != 2)>>
+<<if ($seeDicks != 100)>>
<br> [[Expectant mothers|Recruiter Select][$recruiterTarget = "expectant mothers"]] //Will be pregnant, and likely unhealthy//
<</if>>
<<if ($seeDicks != 0)>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index b666d571383190cd45e231a4a539373aaf810d25..87c8f9550e9b61b5f3ca8e8e041ed7ecc15b04a2 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -484,6 +484,17 @@ $possessiveCap
| [[Remove lactation implant|Surgery Degradation][$activeSlave.lactation = 0,$cash -= $surgeryCost, $surgeryType = "endlac"]]
<</if>>
+<<if $activeSlave.indentureRestrictions >= 2 && $activeSlave.weight > 30>>
+ <br>//$possessiveCap indenture forbids elective surgery//
+<<else>>
+ <<if $activeSlave.weight > 190>>
+ <br>$pronounCap is extremely fat. [[Major liposuction|Surgery Degradation][$activeSlave.weight = 0, $activeSlave.health -= 40, $cash -= $surgeryCost, $surgeryType = "liposuction"]]
+ <<elseif $activeSlave.weight > 130>>
+ <br>$pronounCap is fat. [[Heavy liposuction|Surgery Degradation][$activeSlave.weight = 0, $activeSlave.health -= 20, $cash -= $surgeryCost, $surgeryType = "liposuction"]]
+ <<elseif $activeSlave.weight > 30>>
+ <br>$pronounCap is overweight. [[Liposuction|Surgery Degradation][$activeSlave.weight = 0, $activeSlave.health -= 10, $cash -= $surgeryCost, $surgeryType = "liposuction"]]
+ <</if>>
+<</if>>
<br>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index abbdd93c71e1a71a0c8a0b1f77e7e9e875aeeaf6..7ef651027749e64e3fc3959e325f0a221431e6ae 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -54,6 +54,7 @@ uses your online resources and some @@.yellowgreen;modest funds@@ to convince $r
<<set $recruiterProgress += 2>>
<<elseif $slaves[$i].entertainSkill > 60>>
She has the entertainment expertise to lure in most targets.
+ <<set $recruiterProgress += 1.5>>
<<elseif $slaves[$i].entertainSkill > 30>>
She has the necessary entertainment skills to banter successfully with her targets.
<<set $recruiterProgress += 1>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 54f4c4a1b4861c8adaabce7eea34e2b36fd671e2..0aed23df281a2d59898d77a999b55ef12f512338 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -728,6 +728,22 @@ As the remote surgery's long recovery cycle completes,
<</if>>
<</if>>
+<<case "liposuction">>
+ <<if ($activeSlave.behavioralFlaw == "anorexic")>>
+ <<if canSee($activeSlave)>>She looks over her new thin figure experimentally<<else>>She shifts her weight experimentally<</if>> and turns to you with a smile to show it off. As an anorexic @@.hotpink;she thinks you have brought her closer to the true ideal.@@ As with all surgeries, @@.red;her health has been affected.@@
+ <<set $activeSlave.devotion += 4>>
+ <<elseif ($activeSlave.devotion > 50)>>
+ <<if canSee($activeSlave)>>She looks over her new thin figure experimentally<<else>>She shifts her weight experimentally<</if>> and turns to you with a smile to show it off. She's still sore, so she doesn't bend or flirt, but she turns around to let you see it from all angles. @@.hotpink;She's happy with your changes to her body.@@ As with all surgery @@.red;her health has been affected.@@
+ <<set $activeSlave.devotion += 4>>
+ <<elseif ($activeSlave.devotion >= -20)>>
+ She <<if canSee($activeSlave)>>eyes her new thin figure<<else>>shifts her weight<</if>> skeptically. She's still sore, so she doesn't bend or touch herself. She's come to terms with the fact that she's a slave, so she expected something like this when she was sent to the surgery. She isn't much affected mentally. As with all surgery @@.red;her health has been affected.@@ She is @@.gold;sensibly fearful@@ of your total power over her body.
+ <<set $activeSlave.trust -= 5>>
+ <<else>>
+ <<if canSee($activeSlave)>>She eyes her new thin figure<<else>>How light she feels fills her<</if>> with resentment. She's still sore, so she doesn't bend or touch herself, but <<if canSee($activeSlave)>>she glares daggers<<else>>her face contorts with distaste<</if>>. She still thinks of herself as a person, so she isn't used to the idea of being surgically altered to suit your every whim. For now, @@.mediumorchid;she seems to view this model figure as a cruel imposition@@. As with all surgery @@.red;her health has been affected.@@ She is @@.gold;terribly afraid@@ of your total power over her body.
+ <<set $activeSlave.trust -= 10>>
+ <<set $activeSlave.devotion -= 5>>
+ <</if>>
+
<<case "lipo">>
<<if ($activeSlave.behavioralFlaw == "anorexic")>>
<<if canSee($activeSlave)>>She looks over her new waist experimentally<<else>>She shifts her weight experimentally<</if>> and turns to you with a smile to show it off. As an anorexic @@.hotpink;she thinks you have brought her closer to the true ideal.@@ Since the surgery was invasive, @@.red;her health has been greatly affected.@@
@@ -1551,7 +1567,7 @@ As the remote surgery's long recovery cycle completes,
<<set $activeSlave.devotion += 2>>
<<case "tummyTuck">>
- She leaves the surgery with a soreness on her lower abdomen, and is @@.hotpink;pleased@@ to find it's no longer saggy. She's happy that she'll be able to show off her <<if $activeSlave.weight > 95>>big soft belly<<elseif $activeSlave.weight > 30>>soft belly<<elseif $activeSlave.muscles > 30>>muscular belly<<elseif $activeSlave.muscles > 5>>once again firm, ripped belly <<else>>once again firm, flat belly<</if>> without being self conscious about it. As with all surgery @@.red;her health has been affected.@@
+ She leaves the surgery with a soreness on her lower abdomen, and is @@.hotpink;pleased@@ to find it's no longer saggy. She's happy that she'll be able to show off her <<if $activeSlave.weight > 95>>big soft belly<<if $activeSlave.weight > 130>>, for awhile at least,<</if>><<elseif $activeSlave.weight > 30>>soft belly<<elseif $activeSlave.muscles > 30>>muscular belly<<elseif $activeSlave.muscles > 5>>once again firm, ripped belly <<else>>once again firm, flat belly<</if>> without being self conscious about it. As with all surgery @@.red;her health has been affected.@@
<<set $activeSlave.devotion += 2>>
<<case "bellyIn">>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 7d235ed2e2980629b548f3651f4068faad925c90..07845e20dbea9c812864608b0a5ec7d7bdc43de9 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -14,13 +14,13 @@
<<elseif ($personalAttention == "medicine")>>This week you will learn medicine.
<<else>>
<<if _PA > -1>>
- You plan to train ''__@@.pink;$slaves[_PA].slaveName@@__'' to $trainingRegimen this week.
+ You plan to train ''__@@.pink;<<SlaveFullName $slaves[_PA]>>@@__'' to $trainingRegimen this week.
<</if>>
<</if>>
<span id="managePA"><strong><<link "Change plans">><<goto "Personal Attention Select">><</link>></strong></span> @@.cyan;[A]@@
<br>
<<if _HG > -1>>
- ''__@@.pink;$HeadGirl.slaveName@@__'' is <<if ndef $headGirlFocus>>serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.<<else>>your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort,<</if>> and is focusing on your slaves' $headGirlFocus.<</if>>
+ ''__@@.pink;<<SlaveFullName $HeadGirl>>@@__'' is <<if ndef $headGirlFocus>>serving as your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>.<<else>>your head girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort,<</if>> and is focusing on your slaves' $headGirlFocus.<</if>>
<span id="manageHG"><strong><<link "Manage Head Girl">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
<<elseif (_HG == -1) && ($slaves.length > 1)>>
You have not selected a Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort<</if>>. <span id="manageHG"><strong><<link "Select one">><<goto "HG Select">><</link>></strong></span> @@.cyan;[H]@@
@@ -29,7 +29,7 @@
<</if>>
<br>
<<if _RC > -1>>
- ''__@@.pink;$Recruiter.slaveName@@__'' is working to recruit girls.
+ ''__@@.pink;<<SlaveFullName $Recruiter>>@@__'' is working to recruit girls.
<span id="manageRecruiter"><strong><<link "Manage Recruiter">><<goto "Recruiter Select">><</link>></strong></span> @@.cyan;[U]@@
<<else>>
You have not selected a Recruiter.
@@ -38,7 +38,7 @@
<<if ($dojo != 0)>>
<br>
<<if _BG > -1>>
- ''__@@.pink;$Bodyguard.slaveName@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
+ ''__@@.pink;<<SlaveFullName $Bodyguard>>@@__'' is serving as your bodyguard. <span id="manageBG"><strong><<link "Manage Bodyguard">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<<else>>
You have not selected a Bodyguard. <span id="manageBG"><strong><<link "Select one">><<goto "BG Select">><</link>></strong></span> @@.cyan;[B]@@
<</if>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 92f4229b9eba970d23ec0b564d3a08c44191eaeb..dac578314200ccdc8d1f80ce6343bdc9108301a1 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -229,7 +229,10 @@
<<elseif $activeSlave.weight <= 10>>Average.
<<elseif $activeSlave.weight <= 30>>Plush.
<<elseif $activeSlave.weight <= 95>>@@.red;Chubby.@@
- <<else>>@@.red;Fat.@@
+ <<elseif $activeSlave.weight <= 130>>@@.red;Fat.@@
+ <<elseif $activeSlave.weight <= 160>>@@.red;Obese.@@
+ <<elseif $activeSlave.weight <= 190>>@@.red;Super obese.@@
+ <<else>>@@.red;Dangerously obese.@@
<</if>>
<</replace>>
@@ -2388,7 +2391,7 @@
<<set $activeSlave.weight = random(10,25)>>
<<else>>
They're usually very soft and rather laid back.
- <<set $activeSlave.weight = random(30,100)>>
+ <<set $activeSlave.weight = random(30,180)>>
<</if>>
<<set $activeSlave.muscles = random(-50,0)>>
<<set $activeSlave.trust += random(5,15)>>