[fixed] Problems found by skybarbie

locations/bed2.qsrc

@@ -242,21 +242,31 @@ if $ARGS[0] = 'sleep':
 		bed['shoenumber'] = shoewornnumber
 !!		gs 'shoes', 'strip'
 	end
-	if bedPanty = 1 and $pantyworntype = 'none' and $braworntype = 'none':
-		*nl
-		'You put on your bra and panties.'
-	elseif bedPanty = 1 and $pantyworntype ! 'none' and $braworntype = 'none':
-		*nl
-		'You put on your bra.'
-	elseif bedPanty = 1 and $pantyworntype ! 'none' and $braworntype ! 'none':
-		*nl
-		'You put on your panties.'
-	elseif bedPanty = 1:
-		*nl
-		'You change your bra and panties.'
-	elseif bedPanty = 2:
-		*nl
-		'You remove your bra and panties.'
+	if bedPanty = 1
+		if $pantyworntype = 'none' and $braworntype = 'none':
+			*nl
+			'You put on your bra and panties.'
+		elseif $pantyworntype ! 'none' and $braworntype = 'none':
+			*nl
+			'You put on your bra.'
+		elseif $pantyworntype ! 'none' and $braworntype ! 'none':
+			*nl
+			'You put on your panties.'
+		else
+			*nl
+			'You change your bra and panties.'
+		end
+	elseif bedPanty = 2
+		if $pantyworntype ! 'none' or $braworntype ! 'none':
+			*nl
+			'You remove your bra and panties.'
+		elseif $pantyworntype ! 'none' and $braworntype = 'none':
+			*nl
+			'You remove your panties.'
+		elseif $braworntype ! 'none':
+			*nl
+			'You remove your bra.'
+		end
 	else
 		*nl
 		'You were too tired to worry about your underwear, so for tonight you left it as is.'

locations/kafeM.qsrc

@@ -51,7 +51,8 @@ if $ARGS[0] = 'b':
 	'Music begins to play in the cafe and <<$loverdesc[lover_number]>> asks if you would like to dance.'
 
 	act 'Dance':
-		cla
+		
+		*clr & cla
 		loverrelation[lover_number] += 1
 		xgt 'kafeM', 'dance'
 	end

locations/treeCircle.qsrc

@@ -85,10 +85,11 @@ killvar 'i'
 
 if pcs_inhib >= 30 and pcs_horny > 60:
 	act 'Masturbate to clear your head':
-		*nl
+		*clr & cla
 		'<center><video autoplay loop src="images/locations/shared/park/tree_masturb.mp4"></center>'
 		*nl
-		'That''s better!'
+		'It takes some time to masturbate out in the cold of the tree circle but the magical wards here keep you safe even when you would otherwise being putting on such a lewd show.'
+		'As you finally approach your climax you feel a connection to the nature and history here.'
 		$orgasm_or = 'yes'
 		gs 'arousal', 'clit_finger', 15, 'masturbate'
 		gs 'arousal', 'end'