[changed] Encountering misha while returning home naked should only trigger when coming from school

locations/gschool_break.qsrc

@@ -1379,7 +1379,9 @@ if $ARGS[0] = 'naked_bathroom':
 				end
 			end
 			gs 'willpower', 'misc', 'self', 'medium'
-			if will_cost < pcs_willpwr:
+			if pcs_willpwr < will_cost:
+				act 'Tell her a lie (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			else
 				act 'Tell her a lie (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'self'
 					*clr & cla
@@ -1419,8 +1421,6 @@ if $ARGS[0] = 'naked_bathroom':
 						end
 					end
 				end
-			else
-				act 'Tell her a lie (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 	end
@@ -1439,7 +1439,7 @@ if $ARGS[0] = 'naked_bathroom':
 			end
 			'You decide to just get this over with and make a run for it. You use your hands to cover yourself as best you can, looking away from people, but sometimes have to use your hands to cover your face in the hopes no one recognizes you. Several people gasp and more than a few people, mostly older women, chastise you. Some of the men whistle and more than a few people take your picture, but all you can do is hope that none of them show your face. After what seems like an eternity, you finally make it to the apartment complex.'
 			gs 'stat'
-			act 'Continue': gt 'pav_aptcourtev', 'naked_aptcomplex'
+			act 'Continue': gt 'pav_aptcourtev', 'naked_aptcomplex', 'school'
 		end
 
 		act 'Sneak home':
@@ -1448,7 +1448,7 @@ if $ARGS[0] = 'naked_bathroom':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/sneakhomenaked.jpg"></center>'
 			'You decide that it would be better to take your time and sneak home, doing your best to not be seen. You use your hands to cover yourself as best you can and use cover as often as you can. You hide behind trees and parked cars, duck down alleyways and when that doesn''t work, you are forced to wait until you don''t see anyone and dart across open stretches of ground. Once or twice you think someone might have seen you, but all you can do is hope that you weren''t recognized. After what seems like an eternity, you finally make it to the apartment complex.'
 			gs 'stat'
-			act 'Continue': gt 'pav_aptcourtev', 'naked_aptcomplex'
+			act 'Continue': gt 'pav_aptcourtev', 'naked_aptcomplex', 'school'
 		end
 	end
 end

locations/pav_aptcourtev.qsrc

@@ -1805,10 +1805,10 @@ if $ARGS[0] = 'naked_aptcomplex':
 	'There are several older women sitting out front of your building, so you make your way round to the back of the complex near the garages, you stop a moment to peek around one of the buildings. Not seeing anyone, you dart from one building to the next, leaving just the small courtyard behind your building to cross. You peek around a building and see a few people there, you keep yourself hidden as you wait, finally they move off and you rush across the courtyard and into the back door of the apartment building.'
 	act 'Sneak upstairs':
 		*clr & cla
-		nakedrand = rand(1,5)
-		if nakedrand = 1:
+		nakedrand = rand(0, 4)
+		if nakedrand = 0:
 			gt 'pav_aptcourtev', 'two_boys'
-		elseif nakedrand = 2:
+		elseif nakedrand <= 2 and $ARGS[1] = 'school':
 			gt 'pav_aptcourtev', 'misha'
 		else
 			gs 'arousal', 'flash', -5
@@ -2033,7 +2033,7 @@ if $ARGS[0] = 'misha':
 			'You change into your other school uniform quickly and then quickly rush back to school.'
 			!! this should take Sveta back to school missing one period
 			act 'Continue': missing_class += 1 & school_period += 1 & gt 'gschool_lessons', 'short_break'
-			end
+		end
 		act 'Stay home': gt 'bedrPar'
 	end
 end