[fixes] moved the exit options to the top of action windows and fixed some checks to be more efficient

locations/rolanapt.qsrc

@@ -205,6 +205,7 @@ if $ARGS[0] = 'kitchen':
 	else
 		'This room appears the most modern in the house. However, like the rest it is not clean. You wonder, "how long have the plates been sitting in the sink?"'
 	end
+	act 'Leave the room': gt 'rolanapt','hallway'
 !!	'This room appears the most modern in the house. However, like the rest it is not clean. You wonder, "how long have the plates been sitting in the sink?"'
 !!  RolanLoc[hour] = 3  rolanpantyQW = 8
 	if RolanLoc[hour] = 4:
@@ -214,72 +215,74 @@ if $ARGS[0] = 'kitchen':
 		else
 			'When you enter the kitchen, <a href="exec:gt ''rolanapt'',''bend''">Rolan</a> is sitting at the table holding an apple. He smiles when he notices you.'
 		end
-	end
 
-	if RolanLoc[hour] = 4 and rolanpantyconfession = 1 and rolancooklesson < 1 and sup_count = 0 and $wornpantytype ! 'none':
-		act 'Approach Rolan':
-			*clr & cla
-			minut += 5
-			rolancooklesson = 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/bread0.jpg"></center>'
-			'"We need to talk."'
-			'"Miss <<$pcs_lastname>>, I swear I''ve done nothing wrong!"'
-			act 'Continue':
-			cla
-			*clr
-			'<center><b><font color = maroon>Intro</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro0.jpg"></center>'
-			'"Ah, silly boy! I''m not angry, I just want to help you learn how to cook. You need a gentle hand to guide you through it!"'
-			*nl
-			'"Miss <<$pcs_lastname>>, do not worry, it''s not necessary, I can take care of myself."'
+		if rolanpantyconfession = 1 and rolancooklesson < 1 and sup_count = 0 and $wornpantytype ! 'none':
+			act 'Approach Rolan':
+				*clr & cla
+				minut += 5
+				rolancooklesson = 1
+				rolan_cooklesson_day = daystart
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/bread0.jpg"></center>'
+				'"We need to talk."'
+				'"Miss <<$pcs_lastname>>, I swear I''ve done nothing wrong!"'
 				act 'Continue':
 				cla
-					*clr
-					'<center><b><font color = maroon>Intro</font></b></center>'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro1.jpg"></center>'
-					'"So it seems, but you need some lessons if you want to stay healthy."'
-					*nl
-					'"Miss <<$pcs_lastname>>, really this is not necessary. I usually cook for the week, I''m not a pro but I''m satisfied with my skill..."'
+				*clr
+				'<center><b><font color = maroon>Intro</font></b></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro0.jpg"></center>'
+				'"Ah, silly boy! I''m not angry, I just want to help you learn how to cook. You need a gentle hand to guide you through it!"'
+				*nl
+				'"Miss <<$pcs_lastname>>, do not worry, it''s not necessary, I can take care of myself."'
 					act 'Continue':
-						cla
+					cla
 						*clr
 						'<center><b><font color = maroon>Intro</font></b></center>'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro2.jpg"></center>'
-						'"I SAID WE ARE GOING TO START IMPROVING YOUR COOKING ABILITIES."'
-						act 'Continue': gt 'rolanapt', 'chef'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro1.jpg"></center>'
+						'"So it seems, but you need some lessons if you want to stay healthy."'
+						*nl
+						'"Miss <<$pcs_lastname>>, really this is not necessary. I usually cook for the week, I''m not a pro but I''m satisfied with my skill..."'
+						act 'Continue':
+							cla
+							*clr
+							'<center><b><font color = maroon>Intro</font></b></center>'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro2.jpg"></center>'
+							'"I SAID WE ARE GOING TO START IMPROVING YOUR COOKING ABILITIES."'
+							act 'Continue': gt 'rolanapt', 'chef'
+						end
 					end
 				end
 			end
-		end
-	end
-!! rolan_cooklesson_day = daystart
-	if RolanLoc[hour] = 4 and rolancooklesson = 2 and rolan_cooklesson_day ! daystart and $wornpantytype ! 'none':
-		act 'Approach Rolan':
-			*clr & cla
-			minut += 5
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro3.jpg"></center>'
-			'As soon as you walk toward Rolan he stands up and tries to escape, but you manage to stop him...'
-			*nl
-			'"Hey now, what''s the rush? I hope you are not trying to avoid me."'
-			*nl
-			'Rolan sighs. He doesn''t want to do this, but you''re not giving him a choice.'
-			act 'Start lesson': gt 'rolanapt', 'chef'
-		end
-	elseif RolanLoc[hour] = 4 and rolancooklesson > 2 and rolancooklesson =< 6 and rolan_cooklesson_day ! daystart and $wornpantytype ! 'none':
-		act 'Approach Rolan':
-			*clr & cla
-			minut += 5
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro3.jpg"></center>'
-			'This time, Rolan doesn''t attempt to flee. "<i>Good</i>," you think, this lesson should go smoother than usual.'
-			act 'Start lesson': gt 'rolanapt', 'chef'
+		elseif rolancooklesson = 2 and rolan_cooklesson_day ! daystart and $wornpantytype ! 'none':
+			act 'Approach Rolan':
+				*clr & cla
+				minut += 5
+				rolancooklesson += 1
+				rolan_cooklesson_day = daystart
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro3.jpg"></center>'
+				'As soon as you walk toward Rolan he stands up and tries to escape, but you manage to stop him...'
+				*nl
+				'"Hey now, what''s the rush? I hope you are not trying to avoid me."'
+				*nl
+				'Rolan sighs. He doesn''t want to do this, but you''re not giving him a choice.'
+				act 'Start lesson': gt 'rolanapt', 'chef'
+			end
+		elseif rolancooklesson > 2 and rolancooklesson =< 6 and rolan_cooklesson_day ! daystart and $wornpantytype ! 'none':
+			act 'Approach Rolan':
+				*clr & cla
+				minut += 5
+				rolancooklesson += 1
+				rolan_cooklesson_day = daystart
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro3.jpg"></center>'
+				'This time, Rolan doesn''t attempt to flee. "<i>Good</i>," you think, this lesson should go smoother than usual.'
+				act 'Start lesson': gt 'rolanapt', 'chef'
+			end
 		end
 	end
 !!	elseif rolancooklesson = 6:
 	act 'Look in the fridge': gt 'rolanapt', 'holodil'
-	act 'Leave the room': gt 'rolanapt','hallway'
 	act 'Drink water (0:05)':
 		cla
 		minut += 5
@@ -301,7 +304,7 @@ if $ARGS[0] = 'kitchen':
 	!!count-of glasses in a bottle of vodka
 	if kvass_day ! daystart: kvass_count = 5
 	!!count-in soup plates in kostryule
-	if sup_day ! daystart: sup_count = 2
+	if sup_day ! daystart: sup_count = 1
 end
 
 if $ARGS[0] = 'holodil':
@@ -492,69 +495,72 @@ if $ARGS[0] = 'grandmaroom':
 		'This is the only room in good condition. It seems no one lives here... but this room is regularly cleaned.'
 	end
 
+	act 'Leave the room': gt 'rolanapt','hallway'
+
 	if RolanLoc[hour] = 6: 'Rolan is here.'
 
-	if rolanworker = 4 and rolanknow = 1:
-		act 'Talk to Rolan':
-			*clr & cla
-			minut += 5
-			rolanworker += 1
-			'<center><b><font color = maroon>Grandma''s room</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanheadbath2.jpg"></center>'
-			'"Rolan, is everything all right? You ran away like... why are you crying?"'
-			*nl
-			'"Out."'
-			act 'Ask':
+		if rolanworker = 4 and rolanknow = 1:
+			act 'Talk to Rolan':
 				*clr & cla
 				minut += 5
+				rolanworker += 1
 				'<center><b><font color = maroon>Grandma''s room</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanheadbath3.jpg"></center>'
-				'"Rolan, you can tell me. What''s happened?"'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanheadbath2.jpg"></center>'
+				'"Rolan, is everything all right? You ran away like... why are you crying?"'
 				*nl
-				'"Out. I said get out of here. You are not welcome in this house anymore!"'
-				*nl
-				'You''re at a loss for words.'
-				act 'But...':
+				'"Out."'
+				act 'Ask':
 					*clr & cla
 					minut += 5
-					rolanblockhome = 1
 					'<center><b><font color = maroon>Grandma''s room</font></b></center>'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanheadbath4.jpg"></center>'
-					'"What have I done?"'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanheadbath3.jpg"></center>'
+					'"Rolan, you can tell me. What''s happened?"'
 					*nl
-					'"That''s it," Rolan grabs his phone and dials a number. "Mr. Chervov? It''s Rolan Matveev here... yes, the janitor. There is a thief in my home..."'
+					'"Out. I said get out of here. You are not welcome in this house anymore!"'
 					*nl
-					'"A thief? But I... okay. Okay, I''ll leave."'
-					act 'Leave':gt 'pavComplex', 'start'
+					'You''re at a loss for words.'
+					act 'But...':
+						*clr & cla
+						minut += 5
+						rolanblockhome = 1
+						'<center><b><font color = maroon>Grandma''s room</font></b></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanheadbath4.jpg"></center>'
+						'"What have I done?"'
+						*nl
+						'"That''s it," Rolan grabs his phone and dials a number. "Mr. Chervov? It''s Rolan Matveev here... yes, the janitor. There is a thief in my home..."'
+						*nl
+						'"A thief? But I... okay. Okay, I''ll leave."'
+						act 'Leave':gt 'pavComplex', 'start'
+					end
 				end
 			end
 		end
-	end
-	act 'Leave the room': gt 'rolanapt','hallway'
-	if RolanLoc[hour] ! 6 and workertool ! 1:
-		act 'Look around':
-			*clr & cla
-			minut += 5
-			'<center><b><font color = maroon>dreamroom</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/grandma.jpg"></center>'
-			'You snoop around, opening drawers, and looking in the closet. Even if you were hoping to find something of interest, you didn''t. The only thing of note is a dark marble container full of grey powder.'
-			act 'Leave':gt 'rolanapt','hallway'
-		end
-	elseif RolanLoc[hour] ! 6 and workertool = 1:
-		act 'Look around':
-			*clr & cla
-			minut += 2
-			'<center><b><font color = maroon>a bad mistake</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/grandma.jpg"></center>'
-			'You snoop around, opening drawers, and looking in the closet. The only thing of note is a dark marble container full of grey powder.'
-			act 'Take the powder':
+	else
+		if workertool ! 1:
+			act 'Look around':
+				*clr & cla
+				minut += 5
+				'<center><b><font color = maroon>dreamroom</font></b></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/grandma.jpg"></center>'
+				'You snoop around, opening drawers, and looking in the closet. Even if you were hoping to find something of interest, you didn''t. The only thing of note is a dark marble container full of grey powder.'
+				act 'Leave':gt 'rolanapt','hallway'
+			end
+		else
+			act 'Look around':
 				*clr & cla
 				minut += 2
-				workertool += 1
 				'<center><b><font color = maroon>a bad mistake</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/grandma.jpg"></center>'
-				'"That powder should do the trick."'
-				act 'Leave':gt 'rolanapt','hallway'
+				'You snoop around, opening drawers, and looking in the closet. The only thing of note is a dark marble container full of grey powder.'
+				act 'Take the powder':
+					*clr & cla
+					minut += 2
+					workertool += 1
+					'<center><b><font color = maroon>a bad mistake</font></b></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/grandma.jpg"></center>'
+					'"That powder should do the trick."'
+					act 'Leave':gt 'rolanapt','hallway'
+				end
 			end
 		end
 	end
@@ -850,8 +856,6 @@ if $ARGS[0] = 'mypanty':
 !! 'If you''re going to confront Rolan with his thievery, <b>you''ll need to be more daring</b>. Perhaps if you tempted him while wearing panties?'
 		act 'Move away from Rolan': gt 'rolanapt','hallway'
 	end
-
-	act 'Leave the room': gt 'rolanapt','hallway'
 end
 !RolanLoc = 0 (Rolan not home school)
 !RolanLoc = 1 (Rolan not home church)