[fixed] school/home hours for Julia and Nat.

locations/JuliaMilGo.qsrc

@@ -9,6 +9,7 @@ gs 'stat'
 act 'Go with Julia':
 	cls
 	minut += 15
+	BeInJulMilHome = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Julia Milova, your classmate</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big12.jpg"></center>'

locations/JuliaMilVhod.qsrc

@@ -2,27 +2,22 @@
 
 CLOSE ALL
 menu_off = 1
-cla
-*clr
+*clr & cla
 
 if BeInJulMilHome = 0:BeInJulMilHome = 1
 gs'stat'
 
-GoInside = 1
-$byetext=''
-if hour <18 and kanikuli = 0 and week <6: $byetext='You ring the door bell, but no one comes to answer. Julia must not be home.' & GoInside = 0
-
-if hour > 20 : $byetext='It''s too late in the day to visit Julia.' & GoInside = 0
-
-if hour < 8 : $byetext='It''s too early in the day to visit Julia.' & GoInside = 0
-
-if GoInside ! 0:
+act 'Leave':gt'pod_ezd','etaj_3'
+if kanikuli = 0 and hour > 6 and hour < 15 and week < 6:
+	'You ring the door bell, but no one comes to answer. Julia must not be home.'
+elseif hour > 20 :
+	'It''s too late in the day to visit Julia.'
+elseif hour < 8:
+	'It''s too early in the day to visit Julia.'
+else
 	'You ring the door bell. You hear footsteps in the apartment and sure enough, a few seconds later Julia opens the door. "Oh, hi <<$pcs_nickname>>! Come on in!"'
 	act 'Enter Julia''s apartment':gt'JuliaMilHome'
-else
-	'<<$byetext>>'
 end
-act 'Move away from the door':gt'pod_ezd','etaj_3'
 
 --- JuliaMilVhod ---------------------------------
 

locations/NatBelVhod.qsrc

@@ -1,24 +1,22 @@
 # NatBelVhod
-CLOSE ALL
 
+CLOSE ALL
 menu_off = 1
+*clr & cla
+
 if BeInNatBelHome = 0:BeInNatBelHome = 1
 gs'stat'
 
-GoInside = 1
-$byetext=''
-if hour <18 and kanikuli = 0 and week <6: $byetext='You knock on the door, but nobody answers.' & GoInside = 0
-
-if hour > 20 : $byetext='It is to late to go to visit.' & GoInside = 0
-
-if hour < 8 : $byetext='It is to early to go to visit.' & GoInside = 0
-
 act 'Leave':gt'pod_ezd','etaj_4'
-if GoInside ! 0:
+if kanikuli = 0 and hour > 6 and hour < 15 and week < 6:
+	'You knock on the door, but nobody answers.'
+elseif hour > 20 :
+	'It''s too late in the day to visit.'
+elseif hour < 8:
+	'It''s too early in the day to visit.'
+else
 	'You knock on the door. Natasha answers and invites you in.'
 	act 'Go into the apartment':gt'NatBelHome'
-else
-	'<<$byetext>>'
 end
 
 --- NatBelVhod ---------------------------------

locations/pavComplex.qsrc

@@ -95,14 +95,14 @@ if $ARGS[0] = 'start':
 		if storyline = 1:'<a href="exec:minut += 15 & gt ''shulgahome''">The Shulgin family</a> live in the apartment above your parents.'
 		if ArtemBeInHome > 0 and artemblok = 0:'<a href="exec:minut += 15 & gt ''artemhome''">Artem Chebotarev</a>, one of your classmates, lives in the same apartment building as your parents, on the first floor.'
 		if BeInJulMilHome = 1:
-			if hour >= 18 and hour <= 20 and week < 6 or hour >= 8 and hour <= 20 and week >= 6:
+			if (hour >= 15 and hour <= 20 and week < 6) or (hour >= 8 and hour <= 20 and week >= 6):
 				'<a href="exec:minut += 15 & gt ''JuliaMilVhod''">Julia Milova</a>, one of your classmates, lives in the same apartment building as your parents, on the third floor.'
 			else
 				'Julia Milova, one of your classmates, lives in the same apartment building as your parents, on the third floor.'
 			end
 		end
 		if BeInNatBelHome = 1:
-			if hour >= 18 and hour <= 20 and week < 6 or hour >= 8 and hour <= 20 and week >= 6:
+			if (hour >= 15 and hour <= 20 and week < 6) or (hour >= 8 and hour <= 20 and week >= 6):
 				'<a href="exec:minut += 15 & gt ''natbelapt'', ''home''">Natasha Belova</a>, one of your classmates, lives in the same apartment building as your parents, on the fourth floor.'
 			else
 				'Natasha Belova, one of your classmates, lives in the same apartment building as your parents, on the fourth floor.'
@@ -118,14 +118,14 @@ if $ARGS[0] = 'start':
 		end
 		if ArtemBeInHome > 0 and artemblok = 0:gs'show_table','Apartment of <a href="exec:minut += 15 & gt ''artemhome''">Artem Chebotarev</a>.','3'
 		if BeInJulMilHome = 1:
-			if hour >= 18 and hour <= 20 and week < 6 or hour >= 8 and hour <= 20 and week >= 6:
+			if (hour >= 15 and hour <= 20 and week < 6) or (hour >= 8 and hour <= 20 and week >= 6):
 				gs'show_table','apartment of <a href="exec:minut += 15 & gt ''JuliaMilHome''">Julia Milova</a>.','3'
 			else
 				gs'show_table','apartment of Julia Milova..','3'
 			end
 		end
 		if BeInNatBelHome = 1:
-			if hour >= 18 and hour <= 20 and week < 6 or hour >= 8 and hour <= 20 and week >= 6:
+			if (hour >= 15 and hour <= 20 and week < 6) or (hour >= 8 and hour <= 20 and week >= 6):
 				gs'show_table','apartment of <a href="exec:minut += 15 & gt ''natbelapt'', ''home''">Natasha Belova</a>.','3'
 			else
 				gs'show_table','apartment of Natasha Belova.','3'