diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw index fc2f6b751c4383b2a52b05fef32d42c4ce69633b..e9cecbcf9af702aa8230b7a3e43fcf69f923fe47 100644 --- a/src/facilities/nursery/childInteract.tw +++ b/src/facilities/nursery/childInteract.tw @@ -1288,14 +1288,14 @@ Hormones: <b><span id="hormones">$activeChild.hormones</span>.</b> <</link>> <</if>> <</if>> -<<if ($activeChild.muscles <= 95) && !isAmputee($activeChild)>> +<<if ($activeChild.muscles < 100) && !isAmputee($activeChild)>> | <<link "Build muscle">><<set $activeChild.diet = "muscle building">><<replace "#diet">>$activeChild.diet<</replace>><</link>> -<<elseif $activeChild.muscles > 95 && !isAmputee($activeChild)>> +<<elseif $activeChild.muscles >= 100 && !isAmputee($activeChild)>> | //$He is maintaining $his enormous musculature// <<else>> | //$He has no limbs and thus can't effectively build muscle// <</if>> -<<if $activeChild.muscles > 5 && canWalk($activeChild)>> +<<if $activeChild.muscles > 0 && canWalk($activeChild)>> | <<link "Slim down">> <<set $activeChild.diet = "slimming">> <<replace "#diet">>$activeChild.diet<</replace>> diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js index 8d7ed15a39a17e516150009abfaace5c0aa81970..36654d15032c2bef163c04c03ec4ba46980bb97c 100644 --- a/src/interaction/slaveInteract.js +++ b/src/interaction/slaveInteract.js @@ -773,7 +773,7 @@ App.UI.SlaveInteract.diet = function(slave) { } const muscle = []; - if (slave.muscles <= 95 && !isAmputee(slave)) { + if (slave.muscles < 100 && !isAmputee(slave)) { muscle.push({text: `Build muscle`, updateSlave: {diet: "muscle building"}}); } else if (!isAmputee(slave)) { muscle.push({text: `Build muscle`, disabled: `${He} is maintaining ${his} enormous musculature`}); @@ -781,7 +781,7 @@ App.UI.SlaveInteract.diet = function(slave) { muscle.push({text: `Build muscle`, disabled: `${He} has no limbs and thus can't effectively build muscle`}); } - if ((slave.muscles > 5 || slave.fuckdoll === 0) && canWalk(slave)) { + if ((slave.muscles > 0 || slave.fuckdoll === 0) && canWalk(slave)) { muscle.push({text: `Slim down`, updateSlave: {diet: "slimming"}}); } else if (!canWalk(slave)) { muscle.push({text: `Slim down`, disabled: `${He} can't walk and thus can't trim down`}); diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw index cb3412be07d4a3be4387af25431f46716d977615..d970d99900e42e86a0daa6d952ae296344623946 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>> + $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>> + $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">>