From d1c3c32c077fc9dd951584b9f08b7c87991a6763 Mon Sep 17 00:00:00 2001
From: Anu <barrychahal@gmail.com>
Date: Sun, 2 Aug 2020 00:02:38 -0700
Subject: [PATCH] Update saDiet.tw

---
 src/uncategorized/saDiet.tw | 54 +++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index cb3412be07d..ce688322a3a 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -495,11 +495,7 @@
 		$He is no longer capable of working out in any plausible way. $His special diet @@.yellow;has ended.@@
 		<<set $slaves[$i].diet = "healthy">>
 	<<else>>
-		<<if $slaves[$i].muscles > 90>>
-			$His heavy workouts focus on lifting. $He has plateaued at a state of @@.lime;goddess-like musculature.@@
-			<<set $slaves[$i].muscles = 100>>
-			<<set $slaves[$i].diet = "healthy">>
-		<<elseif ($slaves[$i].geneticQuirks.mGain == 2)>>
+		<<if ($slaves[$i].geneticQuirks.mGain == 2)>>
 			$His heavy workouts focus on lifting,
 			<<if $geneticMappingUpgrade >= 1>>
 				and with $his myotonic hypertrophy,
@@ -507,7 +503,7 @@
 				and despite run-of-the-mill routines,
 			<</if>>
 			$he @@.lime;gains muscle rapidly.@@
-			<<set $slaves[$i].muscles = Math.clamp($slaves[$i].muscles+10, -100, 100)>>
+			<<set $slaves[$i].muscles += 10>>
 		<<elseif ($slaves[$i].drugs == "steroids")>>
 			$His heavy workouts focus on lifting, and since $he's on so much gear, $he @@.lime;gains muscle rapidly.@@
 			<<set $slaves[$i].muscles += 8+$slaves[$i].geneticQuirks.mGain>>
@@ -576,17 +572,19 @@
 				<<set $slaves[$i].weight -= 2>>
 			<</if>>
 		<</if>>
+		<<set $slaves[$i].muscles = Math.clamp($slaves[$i].muscles, -100, 100)>>
+		<<if $slaves[$i].muscles >= 100>>
+			$His heavy workouts focus on lifting. $He has plateaued at a state of @@.lime;goddess-like musculature.@@
+			<<set $slaves[$i].muscles = 100>>
+			<<set $slaves[$i].diet = "healthy">>
+		<</if>>
 	<</if>>
 <<case "slimming">> /* Muscle Loss */
 	<<if !canWalk($slaves[$i])>>
 		$He is no longer capable of actively working out. $His special diet @@.yellow;has ended.@@
 		<<set $slaves[$i].diet = "healthy">>
-	<<elseif $slaves[$i].muscles > 5>>
-		<<if $slaves[$i].muscles <= 10>>
-			$His long workouts focus on cardio. $He has finally @@.orange;lost all visible musculature.@@
-			<<set $slaves[$i].muscles = 0>>
-			<<set $slaves[$i].diet = "healthy">>
-		<<elseif ($slaves[$i].geneticQuirks.mLoss == 2)>>
+	<<elseif $slaves[$i].muscles > 0>>
+		<<if ($slaves[$i].geneticQuirks.mLoss == 2)>>
 			$His long workouts focus on cardio,
 			<<if $geneticMappingUpgrade >= 1>>
 				and with $his myotonic dystrophy,
@@ -663,6 +661,12 @@
 				<<set $slaves[$i].weight -= 2>>
 			<</if>>
 		<</if>>
+		<<set $slaves[$i].muscles = Math.clamp($slaves[$i].muscles, 0, 100)>>
+		<<if $slaves[$i].muscles <= 0>>
+			$His long workouts focus on cardio. $He has finally @@.orange;lost all visible musculature.@@
+			<<set $slaves[$i].muscles = 0>>
+			<<set $slaves[$i].diet = "healthy">>
+		<</if>>
 	<<else>>
 		$His long workouts focus on cardio to keep $his body lithe.
 		<<if ($slaves[$i].behavioralQuirk == "fitness")>>
@@ -1304,13 +1308,9 @@
 	<</if>>
 <<case "muscle building">> /* Muscle Gain */
 	Fuckdoll suits can force their inhabitants to <<if hasAnyArms($slaves[$i])>>lift weights<<else>>exercise<</if>> until they drop.
-	<<if $slaves[$i].muscles > 90>>
-		$He has plateaued at a state of @@.lime;perfect musculature.@@
-		<<set $slaves[$i].muscles = 100>>
-		<<set $slaves[$i].diet = "healthy">>
-	<<elseif ($slaves[$i].geneticQuirks.mGain == 2)>>
+	<<if ($slaves[$i].geneticQuirks.mGain == 2)>>
 		$He @@.lime;explosively builds muscle<<if $geneticMappingUpgrade >= 1>>@@ aided by $his myotonic hypertrophy.<<else>>.@@<</if>>
-		<<set $slaves[$i].muscles = Math.clamp($slaves[$i].muscles+15, 0, 100)>>
+		<<set $slaves[$i].muscles += 15>>
 	<<elseif ($slaves[$i].geneticQuirks.mLoss == 2)>>
 		$He @@.lime;slowly gains muscle<<if $geneticMappingUpgrade >= 1>>@@ due to $his myotonic dystrophy.<<else>>.@@<</if>>
 		<<set $slaves[$i].muscles += 4>>
@@ -1334,14 +1334,16 @@
 			<<set $slaves[$i].weight -= 2>>
 		<</if>>
 	<</if>>
+	<<set $slaves[$i].muscles = Math.clamp($slaves[$i].muscles, -100, 100)>>
+	<<if $slaves[$i].muscles >= 100>>
+		$He has plateaued at a state of @@.lime;perfect musculature.@@
+		<<set $slaves[$i].muscles = 100>>
+		<<set $slaves[$i].diet = "healthy">>
+	<</if>>
 	The stress of forced exercise is trivial compared to everything else $he experiences, and $he's unaffected mentally.
 <<case "slimming">> /* Muscle Loss */
 	Fuckdoll suits can force their inhabitants to <<if hasAnyArms($slaves[$i])>>lift weights<<else>>exercise<</if>> until they drop.
-	<<if $slaves[$i].muscles <= 10>>
-		$He has finally @@.lime;lost all visible musculature.@@
-		<<set $slaves[$i].muscles = 0>>
-		<<set $slaves[$i].diet = "healthy">>
-	<<elseif ($slaves[$i].geneticQuirks.mLoss == 2)>>
+	<<if ($slaves[$i].geneticQuirks.mLoss == 2)>>
 		$He @@.lime;rapidly sheds muscle<<if $geneticMappingUpgrade >= 1>>@@ aided by $his myotonic dystrophy.<<else>>.@@<</if>>
 		<<set $slaves[$i].muscles = Math.clamp($slaves[$i].muscles-15, -100, 100)>>
 	<<elseif ($slaves[$i].geneticQuirks.mGain == 2)>>
@@ -1367,6 +1369,12 @@
 			<<set $slaves[$i].weight -= 2>>
 		<</if>>
 	<</if>>
+	<<set $slaves[$i].muscles = Math.clamp($slaves[$i].muscles, 0, 100)>>
+	<<if $slaves[$i].muscles <= 0>>
+		$He has finally @@.lime;lost all visible musculature.@@
+		<<set $slaves[$i].muscles = 0>>
+		<<set $slaves[$i].diet = "healthy">>
+	<</if>>
 	The stress of forced exercise is trivial compared to everything else $he experiences, and $he's unaffected mentally.
 
 <<case "cum production">>
-- 
GitLab