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/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..113d643d29f2f3714099ecc31ab9bd60a67a52fd 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -168,6 +168,7 @@
<<NationalityToRace $activeSlave>>
/* Corporate slavegen with race selection */
<<if passage() == "Corporate Market" && ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>>
+ /* Disabled for now
<<if $captureUpgradeRace == "mixed race">>
<<set $activeSlave.race = "mixed race">>
<<else>>
@@ -185,6 +186,7 @@
<<set $activeSlave.nationality = _capUpgradeCheck.random(), $activeSlave.race = $captureUpgradeRace>>
<</if>>
<</if>>
+ */
<<if $activeSlave.race != $captureUpgradeRace>>
<<set $activeSlave.race = $captureUpgradeRace>>
<</if>>
@@ -367,15 +369,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..864dbf4493da4c3aba642b273c67f2beae183b66 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -172,6 +172,7 @@
<<NationalityToRace $activeSlave>>
/* Corporate slavegen with race selection */
<<if passage() == "Corporate Market" && ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>>
+ /* Disabled for now
<<if $captureUpgradeRace == "mixed race">>
<<set $activeSlave.race = "mixed race">>
<<else>>
@@ -189,6 +190,7 @@
<<set $activeSlave.nationality = _capUpgradeCheck.random(), $activeSlave.race = $captureUpgradeRace>>
<</if>>
<</if>>
+ */
<<if $activeSlave.race != $captureUpgradeRace>>
<<set $activeSlave.race = $captureUpgradeRace>>
<</if>>
@@ -374,15 +376,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/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/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/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/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)>>