From aa55e533608841d55e6cb27009b14dc181eb63b0 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Wed, 1 Jan 2020 23:42:28 -0800
Subject: [PATCH] Remove what appears to be a misguided (and wrong) attempt to
 clamp energy reduction from accessories...SlaveStatClamp will handle it.

---
 src/uncategorized/saLongTermEffects.tw | 36 +++++---------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 87fca1d123e..2f5ad8fa984 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1625,34 +1625,18 @@
 					<<set $slaves[$i].devotion -= 4>>
 				<</if>>
 				<<if _vAcc == "bullet vibrator">>
-					<<if $slaves[$i].energy > 5>>
-						<<set $slaves[$i].energy -= 13>>
-					<<elseif $slaves[$i].energy > 0>>
-						<<set $slaves[$i].energy = 0>>
-					<</if>>
+					<<set $slaves[$i].energy -= 13>>
 				<<elseif _vAcc == "smart bullet vibrator">>
-					<<if $slaves[$i].energy > 5>>
-						<<set $slaves[$i].energy -= 16>>
-					<<elseif $slaves[$i].energy > 0>>
-						<<set $slaves[$i].energy = 0>>
-					<</if>>
+					<<set $slaves[$i].energy -= 16>>
 				<</if>>
 			<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 				and the vibrating dildo in $his pussy disrupt arousal, @@.red;reducing $his sex drive@@ and @@.mediumorchid;infuriating $him.@@
 				<<set $slaves[$i].devotion -= 3>>
-				<<if $slaves[$i].energy > 5>>
-					<<set $slaves[$i].energy -= 13>>
-				<<elseif $slaves[$i].energy > 0>>
-					<<set $slaves[$i].energy = 0>>
-				<</if>>
+				<<set $slaves[$i].energy -= 13>>
 			<<else>>
 				disrupts arousal, @@.red;reducing $his sex drive@@ and @@.mediumorchid;infuriating $him.@@
 				<<set $slaves[$i].devotion -= 2>>
-				<<if $slaves[$i].energy > 5>>
-					<<set $slaves[$i].energy -= 10>>
-				<<elseif $slaves[$i].energy > 0>>
-					<<set $slaves[$i].energy = 0>>
-				<</if>>
+				<<set $slaves[$i].energy -= 10>>
 			<</if>>
 		<<case "all">>
 			<<if $slaves[$i].energy <= 95>>
@@ -2297,17 +2281,9 @@
 			The bullet vibrator $he is wearing disrupt arousal, @@.red;reducing $his sex drive@@ and @@.mediumorchid;infuriating $him.@@
 				<<set $slaves[$i].devotion -= 3>>
 				<<if _vAcc == "bullet vibrator" || _dAcc == "bullet vibrator">>
-					<<if $slaves[$i].energy > 5>>
-						<<set $slaves[$i].energy -= 13>>
-					<<elseif $slaves[$i].energy > 0>>
-						<<set $slaves[$i].energy = 0>>
-					<</if>>
+					<<set $slaves[$i].energy -= 13>>
 				<<elseif _vAcc == "smart bullet vibrator" || _dAcc == "smart bullet vibrator">>
-					<<if $slaves[$i].energy > 5>>
-						<<set $slaves[$i].energy -= 16>>
-					<<elseif $slaves[$i].energy > 0>>
-						<<set $slaves[$i].energy = 0>>
-					<</if>>
+					<<set $slaves[$i].energy -= 16>>
 				<</if>>
 		<<case "all">>
 			<<if $slaves[$i].energy <= 95>>
-- 
GitLab