Merge remote-tracking branch 'Lusticon/TheRapist-fixes'

# Conflicts:
#	locations/stat.qsrc

locations/clothing.qsrc

@@ -1425,6 +1425,10 @@ if $ARGS[0] = 'view_clothing_item':
 	elseif $swimwear_description = '':
 		gs 'clothing_descriptions'
 		'<<$description>>'
+		if hypnoClothes > 0 and ((CloStyle2 = 4 and CloThinness >= 3) _
+		or (($ARGS[1] = 'eroto_outfits' or $ARGS[1] = 'eroto_dress' or $ARGS[1] = 'eroto_strip') and CloThinness >= 4) _
+		or CloThinness >= 6 or $ARGS[1] = 'salacious_outfits' or $ARGS[1] = 'salacious_dress'): _
+			nl & '<I>You have a strange feeling about this outfit. You <b>really</b> want to wear it.</i>'
 	else
 		$swimwear_description
 	end

locations/clothing_QV.qsrc

@@ -1341,7 +1341,8 @@ if $ARGS[0] = 'change':
 					end
 				end
 			else
-				if CloThinness > 6 or $clothingworntype = 'salacious_outfits' or $clothingworntype = 'salacious_dress':
+				if CloThinness >= 6 or $ARGS[1] = 'salacious_outfits' or $ARGS[1] = 'salacious_dress' _
+				or (($ARGS[1] = 'eroto_outfits' or $ARGS[1] = 'eroto_dress' or $ARGS[1] = 'eroto_strip') and CloThinness >= 4):
 					act 'Wear this outfit':
 						gs 'clothing', 'wear', $ARGS[1], ARGS[2]
 

locations/stat.qsrc

@@ -1079,9 +1079,12 @@ else
 	pornstar['icon'] = 0
 end
 
-if therapistday ! daystart and remindedtherapyday ! daystart and week = 4 and hypnoSchedule = 1 and (hour >= 18 and (minut > 45 or hour >= 19)) and (hour < 20 and (minut < 15 or hour < 19)) and menu_off = 0 and workDolg = 0:
-	remindedtherapyday = daystart
-	gt 'therapist_reminder'
+if therapistday ! daystart:
+	if therapistFuckedPussyScene > 0: therapistFuckedPussyScene = 0
+	if remindedtherapyday ! daystart and week ! 4 and hypnoSchedule = 1 and (hour >= 18 and (minut > 45 or hour >= 19)) and (hour < 20 and (minut < 15 or hour < 19)) and menu_off = 0 and workDolg = 0:
+		remindedtherapyday = daystart
+		gt 'therapist_reminder'
+	end
 end
 
 !!--------------------------Booty Call SMSs--------------------------------

locations/therapist.qsrc

@@ -2171,9 +2171,9 @@ if $ARGS[0] = 'hypnoRandom':
 			'"You show him that you are not wearing a bra.'
 			'Good girl. Keep it that way."'
 			'"Yes, <i>Master</i>."'
-		end
 
-		act 'Continue':	gt 'therapist', 'hypnoEnd'
+			act 'Continue':	gt 'therapist', 'hypnoEnd'
+		end
 
 		hypnoBra = 1
 

locations/therapist_reminder.qsrc

@@ -57,6 +57,12 @@ if $ARGS[0] = '':
 			else
 				minut += 5
 			end
+			if $clothingworntype = 'nude':
+				gs 'clothing', 'wear_last_worn'
+				gs 'underwear', 'wear'
+				gs 'shoes', 'wear', 'last_worn'
+			end
+			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/schoolWalk.mp4"></video></center>'
 			'You walk to your therapist''s office.'
 	

locations/wardrobe.qsrc

@@ -527,12 +527,6 @@ if $ARGS[0] = 'default_entry_wear':
 	end
 
 	if defunderwear[default_entry] = 0:
-		if (hypnoPanty = 1 and $pantyworntype ! 'none') or (hypnoBra = 1 and $braworntype ! 'none'):
-			!! removal of underwear from set if therapist has prohibited it
-			if hypnoPanty = 1 and $pantyworntype ! 'none': $defpantytype[default_entry] = 'none' & defpantynumber[default_entry] = 0
-			if hypnoBra = 1 and $braworntype ! 'none': $defbratype[default_entry] = 'none' & defbranumber[default_entry] = 0
-			msg '<center>You feel like something about this set has changed but you cannot workout what it is.</center>'
-		end
 		if dyneval('RESULT = <<$defpantytype[default_entry]>>_panties[<<defpantynumber[default_entry]>>]') = 0:
 			$defpantytype[default_entry] = 'none' & defpantynumber[default_entry] = 0
 		end
@@ -549,6 +543,12 @@ if $ARGS[0] = 'default_entry_wear':
 		else
 			gs 'bras', 'wear', $defbratype[default_entry], defbranumber[default_entry]
 		end
+		if (hypnoPanty = 1 and $pantyworntype ! 'none') or (hypnoBra = 1 and $braworntype ! 'none'):
+			!! removal of underwear from set if therapist has prohibited it
+			if hypnoPanty = 1 and $pantyworntype ! 'none': $defpantytype[default_entry] = 'none' & defpantynumber[default_entry] = 0
+			if hypnoBra = 1 and $braworntype ! 'none': $defbratype[default_entry] = 'none' & defbranumber[default_entry] = 0
+			msg '<center>You feel like something about this set has changed but you cannot workout what it is.</center>'
+		end
 	end
 
 	if dyneval('RESULT = <<$defshoetype[default_entry]>>_shoe[<<defshoenumber[default_entry]>>]') = 0:
@@ -600,6 +600,18 @@ if $ARGS[0] = 'default_entry_wear':
 			gs 'stat'
 			act 'Return': gt 'wardrobe', $wloc
 		end
+	!!Therapist force exhibitionist clothing check
+	elseif hypnoClothes = 1 and CloThinness < 6 and $temp1 <> 'salacious_outfits' and $temp1 <> 'salacious_dress' _
+	and NO (($temp1 = 'eroto_outfits' or $temp1 = 'eroto_dress' or $temp1 = 'eroto_strip') and CloThinness >= 4) _
+	and NO (CloStyle2 = 4 and CloThinness >= 3):
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/bimbo.strip6.mp4"/></center>'
+		'You pick up the outfit and think about trying them on... but you don''t really like wearing these type of outfits'
+		act 'Strip out of restrictive clothing':
+			gs 'clothing', 'strip'
+			gs 'stat'
+			gt 'wardrobe', $wloc
+		end
 	!! clothing exhibition is greater than player exhibition
 	elseif CloInhibit > pcs_inhib:
 		cls