Merge branch 'fixes' into 'pregmod-master'

Fixes

See merge request pregmodfan/fc-pregmod!6885

src/npc/interaction/fAbuse.tw

@@ -126,7 +126,7 @@
 		<<case "attractive lingerie">>
 			$He almost tears $his delicate lingerie in $his haste to avoid punishment.
 		<<case "a succubus outfit">>
-			<<if !["a corset", "an extreme corest"].includes(getSlave($AS).bellyAccessory)>>
+			<<if ["a corset", "an extreme corset"].includes(getSlave($AS).bellyAccessory)>>
 				$He struggles with $his leather corset.
 			<<else>>
 				Panic sets in as $he hastily sheds what's left of $his outfit.
@@ -302,7 +302,7 @@
 		<<case "slutty jewelry">>
 			$He hurriedly strips fine jewelry from $his neck, wrist<<if hasBothArms(getSlave($AS))>>s<</if>> and ankle<<if hasBothLegs(getSlave($AS))>>s<</if>>.
 		<<case "a courtesan dress">>
-			<<if !["a corset", "an extreme corest"].includes(getSlave($AS).bellyAccessory)>>
+			<<if ["a corset", "an extreme corset"].includes(getSlave($AS).bellyAccessory)>>
 				$His fingers fumble desperately with the straps of $his corset, knowing there is still a lot of dress left to remove after it.
 			<<else>>
 				Panic sets in as $he realizes just how much dress is left to remove. In $his haste, $he hooks a sleeve with $his foot and falls flat, exposing $his bare ass.
@@ -313,10 +313,10 @@
 	<</if>>
 <</if>>
 
-<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
-	$He seems to be a bit expectant of what is to come.
-<<elseif (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
+<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
 	The slap seems to have excited $him, seeing $his hard nipples and wet pussy, and $his eyes practically beg for more.
+<<elseif (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
+	$He seems to be a bit expectant of what is to come.
 <</if>>
 
 <<if ($PC.dick != 0)>>
@@ -324,10 +324,10 @@
 <<else>>
 	<<if hasAnyArms(getSlave($AS)) && (getSlave($AS).clothes !== "no clothing")>>While $he strips, you<<else>>You<</if>> don a cruelly large strap-on, earning
 <</if>>
-<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
-	a shy look
-<<elseif (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
+<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
 	a sultry look
+<<elseif (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
+	a shy look
 <<else>>
 	a frightened glance
 <</if>>