From 61cc070aa6c6e43516e6961f8eae5ce2b0410caf Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 10 Jun 2017 20:47:09 -0400
Subject: [PATCH] Muscular atrophy.

---
 src/pregmod/widgets/pregmodWidgets.tw  |  4 ++--
 src/uncategorized/arcadeReport.tw      | 13 ++++++++-----
 src/uncategorized/dairyReport.tw       | 11 ++++++++++-
 src/uncategorized/saDiet.tw            | 10 ++++++++++
 src/uncategorized/saLongTermEffects.tw | 19 +++++++++++++++++--
 src/uncategorized/seBirth.tw           |  8 ++++----
 src/uncategorized/slaveInteract.tw     | 10 ++++++----
 src/utility/assayWidgets.tw            |  4 ++--
 8 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 7224fed3215..abd0d29ce6a 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1308,7 +1308,7 @@ $daddy's virile cock and balls.
 <br>
 	$possessiveCap's child had extra time to grow @@.red;greatly complicating childbirth@@.
 <</if>>
-<<if (($slaves[$i].vagina >= 2 || $slaves[$i].vaginaLube > 0) && $slaves[$i].mpreg == 1) || $slaves[$i].births > 0 || $slaves[$i].hips > 0 || setup.nurseCareers.includes($slaves[$i].career) || $slaves[$i].intelligenceImplant > 0>>
+<<if (($slaves[$i].vagina >= 2 || $slaves[$i].vaginaLube > 0) && $slaves[$i].mpreg == 1) || $slaves[$i].births > 0 || $slaves[$i].hips > 0 || (setup.nurseCareers.includes($slaves[$i].career) && $slaves[$i].fetish != "mindbroken" && $slaves[$i].muscles >= -95) || $slaves[$i].intelligenceImplant > 0>>
 <br>However:
 <<if $slaves[$i].mpreg == 1>>
 <<if $slaves[$i].anus >= 2>>
@@ -1333,7 +1333,7 @@ $daddy's virile cock and balls.
 <br>
 	$possessiveCap @@.green;wide hips@@ greatly aided childbirth.
 <</if>>
-<<if setup.nurseCareers.includes($slaves[$i].career)>>
+<<if setup.nurseCareers.includes($slaves[$i].career) && $slaves[$i].fetish != "mindbroken" && $slaves[$i].muscles >= -95>>
 <br>
 	Thanks to $possessive @@.green;previous career@@, childbirth went smoothly.
 <</if>>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 1dbdfddcd23..d72c9b0a8ca 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -46,22 +46,25 @@
 		<</if>>
 		<<set $slaves[$i].aphrodisiacs = 2, $slaves[$i].devotion -= 5, $slaves[$i].trust -= 10>>
 	<<elseif ($arcadeUpgradeCollectors > 0)>>
-		<<if ($slaves[$i].health > -60)>>
+		<<if ($slaves[$i].health > -20)>>
 			<<set $slaves[$i].health -= 5>>
-		<<elseif ($slaves[$i].health > -80)>>
+		<<elseif ($slaves[$i].health > -50)>>
 			<<set $slaves[$i].health -= 3>>
 		<<else>>
-			<<set $slaves[$i].health -= 2>>
+			<<set $slaves[$i].health -= 1>>
 		<</if>>
 		<<set $slaves[$i].trust -= 5>>	
 	<<else>>
-		<<if ($slaves[$i].health > -60)>>
+		<<if ($slaves[$i].health > -20)>>
 			<<set $slaves[$i].health -= 5>>
-		<<else>>
+		<<elseif ($slaves[$i].health > -90)>>
 			<<set $slaves[$i].health -= 1>>
 		<</if>>
 		<<set $slaves[$i].trust -= 5>>
 	<</if>>
+	<<if ($slaves[$i].muscles > -100)>>
+		<<set $slaves[$i].muscles-->>
+	<</if>>
 
 	<<if $showEWD != 0>>
 		<br><br>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 07789a1d38f..799645fa24f 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -100,6 +100,9 @@
 			<<if $slaves[$i].weight >= 70>>
 				<<set _MMWorkout++>>
 			<</if>>
+			<<if $slaves[$i].weight >= 160>>
+				<<set _MMWorkout++>>
+			<</if>>
 			<<if $slaves[$i].boobs >= 6000>>
 				<<set _MMWorkout++>>
 			<</if>>
@@ -113,6 +116,9 @@
 				<<if $slaves[$i].weight >= 70>>
 					<<set _MMWorkout += 2>>
 				<</if>>
+				<<if $slaves[$i].weight >= 160>>
+					<<set _MMWorkout += 2>>
+				<</if>>
 				<<if $slaves[$i].boobs >= 6000>>
 					<<set _MMWorkout += 2>>
 				<</if>>
@@ -125,7 +131,7 @@
 			<</if>>
 		<</for>>
 	<</if>>
-	<<if (_MMWorkout > random(1,10)) && $Milkmaid.muscles < 60>>
+	<<if (_MMWorkout > random(1,30)) && $Milkmaid.muscles < 60>>
 		Constantly having to wrestle unruly or aiding heavy cows into their stalls forces her to @@.lime;build muscle.@@
 		<<set $slaves[_FLs].muscles++>>
 	<</if>>
@@ -437,6 +443,9 @@
 	<</if>>
 	<<if ($dairyRestraintsSetting > 1)>>
 		<<set $slaves[$i].lactationAdaptation += 1>>
+		<<if ($slaves[$i].muscles > -100)>>
+			<<set $slaves[$i].muscles-->>
+		<</if>>
 		<<if ($slaves[$i].fetish == "mindbroken")>>
 			<<if ($slaves[$i].boobs > 24800) && (($slaves[$i].balls > 5) || ($slaves[$i].balls == 0))>>
 				<<set $bioreactorPerfectedID = $slaves[$i].ID>>
diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index 060e3fff83c..c2d93101554 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -302,6 +302,10 @@
 		She doesn't gain any weight this week.
 	<</if>>
 <<case "muscle building">> /* Muscle Gain */
+	<<if $slaves[$i].amp == 1>>
+		She is no longer capable of pumping iron. Her special diet @@.yellow;has ended.@@
+		<<set $slaves[$i].diet = "healthy">>
+	<<else>>
 	<<if $slaves[$i].muscles > 90>>
 		Her heavy workouts focus on lifting. She has plateaued at a state of @@.lime;goddess-like musculature.@@
 		<<set $slaves[$i].muscles = 100>>
@@ -349,7 +353,12 @@
 		Her workouts have also @@.orange;burned off some excess fat.@@
 		<<set $slaves[$i].weight -= 2>>
 	<</if>>
+	<</if>>
 <<case "slimming">> /* Muscle Loss */
+	<<if !canWalk($slaves[$i])>>
+		She is no longer capable of actively working out. Her special diet @@.yellow;has ended.@@
+		<<set $slaves[$i].diet = "healthy">>
+	<<else>>
 	<<if $slaves[$i].muscles <= 10>>
 		Her long workouts focus on cardio. She has finally @@.lime;lost all visible musculature.@@
 		<<set $slaves[$i].muscles = 0>>
@@ -397,6 +406,7 @@
 		Her workouts have also @@.orange;burned off some excess fat.@@
 		<<set $slaves[$i].weight -= 2>>
 	<</if>>
+	<</if>>
 <<case "cum production">>
 	<<if ($slaves[$i].attrXX < 80)>>
 		She finds herself @@.lime;fantasizing about fucking girls@@ in her free time.
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index d5ec712dd50..57d945efb6d 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5068,10 +5068,25 @@
 		<</if>>
 		<</if>>
 		<<if ($slaves[$i].amp == 1)>>
-			<<if $slaves[$i].muscles > 5>>
-				As an amputee she @@.orange;loses some muscle definition.@@
+			<<if $slaves[$i].muscles > -100>>
+				As an amputee
+				<<if $slaves[$i].muscles > 5>>
+					she @@.orange;loses some muscle definition.@@
+				<<else>>
+					her @@.orange;muscles steadily atrophy.@@
+				<</if>>
 				<<set $slaves[$i].muscles -= 3>>
 			<</if>>
+		<<elseif !canWalk($slaves[$i]) && ($slaves[$i].heels != 1) && ($slaves[$i].diet != "muscle building")>>
+			<<if $slaves[$i].muscles > -100>>
+				Since she is incapable of moving herself
+				<<if $slaves[$i].muscles > 5>>
+					she steadily @@.orange;loses muscle definition.@@
+				<<elseif $slaves[$i].muscles > -80>>>>
+					her @@.red;muscles steadily atrophy.@@
+				<</if>>
+				<<set $slaves[$i].muscles-->>
+			<</if>>
 		<</if>>
 	<</if>>
 	<<if $slaves[$i].physicalAge >= 18>>
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
index d1df2760580..2d933895b2f 100644
--- a/src/uncategorized/seBirth.tw
+++ b/src/uncategorized/seBirth.tw
@@ -43,9 +43,9 @@
 <<if $slaves[$i].muscles < -95>>
 	<<set $birthDamage += 30>>
 <<elseif $slaves[$i].muscles < -30>>
-	<<set $birthDamage += 7>>
+	<<set $birthDamage += 4>>
 <<elseif $slaves[$i].muscles < -5>>
-	<<set $birthDamage += 3>>
+	<<set $birthDamage += 2>>
 <</if>>
 <<if $slaves[$i].health < -20>>
 	<<set $birthDamage += (4-($slaves[$i].health/10))>>
@@ -604,7 +604,7 @@ $daddy's virile cock and balls.
 <br>
 	$possessiveCap's child had extra time to grow @@.red;greatly complicating childbirth@@.
 <</if>>
-<<if (($slaves[$i].vagina >= 2 || $slaves[$i].vaginaLube > 0) && $slaves[$i].mpreg == 1) || $slaves[$i].births > 0 || $slaves[$i].hips > 0 || setup.nurseCareers.includes($slaves[$i].career) || $slaves[$i].intelligenceImplant > 0>>
+<<if (($slaves[$i].vagina >= 2 || $slaves[$i].vaginaLube > 0) && $slaves[$i].mpreg == 1) || $slaves[$i].births > 0 || $slaves[$i].hips > 0 || (setup.nurseCareers.includes($slaves[$i].career) && $slaves[$i].fetish != "mindbroken" && $slaves[$i].muscles >= -95) || $slaves[$i].intelligenceImplant > 0>>
 <br>However:
 <<if $slaves[$i].mpreg == 1>>
 <<if $slaves[$i].anus >= 2>>
@@ -629,7 +629,7 @@ $daddy's virile cock and balls.
 <br>
 	$possessiveCap @@.green;wide hips@@ greatly aided childbirth.
 <</if>>
-<<if setup.nurseCareers.includes($slaves[$i].career)>>
+<<if setup.nurseCareers.includes($slaves[$i].career) && $slaves[$i].fetish != "mindbroken" && $slaves[$i].muscles >= -95>>>>
 <br>
 	Thanks to $possessive @@.green;previous career@@, childbirth went smoothly.
 <</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index b6c91ed01d1..82925e13797 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1128,15 +1128,17 @@ Hormones: <strong><span id="hormones">
 | <<link "Herm hormone blend">><<set $activeSlave.diet = "XXY">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
 <</if>>
 <</if>>
-<<if ($activeSlave.muscles <= 95) && canWalk($activeSlave)>>
+<<if ($activeSlave.muscles <= 95) && $activeSlave.amp != 1>>
 | <<link "Build muscle">><<set $activeSlave.diet = "muscle building">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
-<<elseif $activeSlave.muscles > 95>>
+<<elseif $activeSlave.muscles > 95 && $activeSlave.amp != 1>>
 | //She is maintaining her enormous musculature//
 <<else>>
-| //She can't move and thus can't exercise//
+| //She has no limbs and thus can't build effectively build muscle//
 <</if>>
-<<if $activeSlave.muscles > 5>>
+<<if $activeSlave.muscles > 5 && canWalk($activeSlave)>>
 | <<link "Slim down">><<set $activeSlave.diet = "slimming">><<replace "#diet">>$activeSlave.diet<</replace>><</link>>
+<<else>>
+| //She can't move and thus can't trim down//
 <</if>>
 
 <br>Diet Base: <strong><span id="dietBase"><<if $activeSlave.dietCum == 2>>Cum Based<<elseif ($activeSlave.dietCum == 1) && ($activeSlave.dietMilk == 0)>>Cum Added<<elseif ($activeSlave.dietCum == 1) && ($activeSlave.dietMilk == 1)>>Cum and Milk Added<<elseif ($activeSlave.dietMilk == 1) && ($activeSlave.dietCum == 0)>>Milk Added<<elseif ($activeSlave.dietMilk == 2)>>Milk Based<<elseif ($activeSlave.dietCum == 0) && ($activeSlave.dietMilk == 0)>>Normal<<else>>THERE HAS BEEN AN ERROR<</if>></span></strong>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 15570043c89..728337d9677 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -711,9 +711,9 @@
 	<</if>>
 <</if>>
 
-<<if ($args[0].preg > 10) || ($args[0].bellyImplant >= 4000)>>
+<<if visibleBellyPreg($args[0]) || ($args[0].bellyImplant >= 4000)>>
 	<<set $pregYes += 1>>
-<<elseif ($args[0].pregType < 10) && ($args[0].preg < 1) && ($args[0].weight <= 95) && ($args[0].bellyImplant < 2000) && ($args[0].inflation < 2)>>
+<<elseif !visibleBelly($args[0]) && ($args[0].weight <= 10)>>
 	<<set $pregNo -= 1>>
 <</if>>
 
-- 
GitLab