Merge branch 'pregmod-dev' into 'pregmod-master'

Better checks + brands don't disappear

See merge request !4543

src/uncategorized/nextWeek.tw

@@ -187,19 +187,12 @@
 	<<if $slaves[_i].amp == 1>>
 		<<set $slaves[_i].missingArms = 3, $slaves[_i].missingLegs = 3>>
 	<</if>>
-	<<if $slaves[_i].missingArms == 3>>
+	/* I don't trust these */
+	<<if $slaves[_i].missingArms == 3 && $slaves[_i].amp == 1>>
 		<<set $slaves[_i].armsTat = 0, $slaves[_i].nails = 0>>
-		<<if (["hands", "left hand", "left lower arm", "left upper arm", "left wrist", "lower arms", "right hand", "right lower arm", "right upper arm", "right wrist", "upper arms", "wrists"].includes($slaves[_i].brandLocation))>>
-			<<set $slaves[_i].brand = 0>>
-			<<set $slaves[_i].brandLocation = 0>>
-		<</if>>
 	<</if>>
-	<<if $slaves[_i].missingLegs == 3>>
+	<<if $slaves[_i].missingLegs == 3 && $slaves[_i].amp == 1>>
 		<<set $slaves[_i].heels = 0, $slaves[_i].shoes = "none", $slaves[_i].legAccessory = "none", $slaves[_i].legsTat = 0,  $slaves[_i].heightImplant = 0>>
-		<<if (["ankles", "calves", "feet", "left ankle", "left calf", "left foot", "left thigh", "right ankle", "right calf", "right foot", "right thigh", "thighs"].includes($slaves[_i].brandLocation))>>
-			<<set $slaves[_i].brand = 0>>
-			<<set $slaves[_i].brandLocation = 0>>
-		<</if>>
 	<</if>>
 	/% Fix some possible floating point rounding errors, and bring precision to one decimal place. %/
 	<<run SlaveStatClamp($slaves[_i])>>