[fixed] vicky not appearing in the school

locations/gschool_grounds.qsrc

@@ -35,6 +35,16 @@ if $ARGS[0] = 'main':
 		act 'Follow Dimka to his home at the New Year party':  minut += 30 & gt 'sny', '3'
 	end
 	
+	if week < 6 and hour = 14 and kanikuli = 0 and afterschool_day ! daystart:		
+		afterschool_day = daystart
+		if rand(0,3) = 0:
+			$eventtype = 'after_school'
+			gt 'gschool_events', 'break_events'
+		else
+			gt 'gschool_events', 'afterschool_events'
+		end
+	end
+	
 	if hour <= 8 and kanikuli = 6:
 		'Today is graduation day! The school prom is tonight as well.'
 
@@ -272,7 +282,7 @@ if $ARGS[0] = 'main':
 		if albinaCarday ! daystart and AlbFrend >= 1 and albrideday ! daystart:'<a href="exec:minut += 15 & gt ''albinaRide''">Albina Barlovskaya</a> is waiting behind the wheel of a large black SUV, parked near the school.'
 		
 		! meynold`s events
-		if minut >= 0 and minut <= 30 and vicky_afterschool ! daystart: gs 'mey_vika_events', 'near_school'
+		if hour = 14 and vicky_afterschool ! daystart: gs 'mey_vika_events', 'near_school'
 		if mey_vika['mey_vika_qw'] = 35 or mey_vika['mey_vika_qw'] = 36 and minut < 45:
 			act 'Study with Tamara Mikhailovna':
 				if mey_vika['mey_vika_qw'] = 36: gt 'mey_tamara_events', 'rebuke'
@@ -289,16 +299,6 @@ if $ARGS[0] = 'main':
 		act 'Go and see what Fedor needs':gt 'strela'
 		exit
 	end
-	
-	if week < 6 and hour = 14 and kanikuli = 0 and afterschool_day ! daystart:		
-		afterschool_day = daystart
-		if rand(0,3) = 0:
-			$eventtype = 'after_school'
-			gt 'gschool_events', 'break_events'
-		else
-			gt 'gschool_events', 'afterschool_events'
-		end
-	end
 end
 
 !Outside school sports field
@@ -615,10 +615,10 @@ if $ARGS[0] = 'SchoolRun2':
 			npc_rel['A18'] = 0
 			zverevaQW = 1
             if razradbeg < 2:
-                'You have won the competition three more times and mr. Pavlovich awards you the second tier sports trophy in running.'
+                'You have won the competition three more times and Mr. Pavlovich awards you the second tier sports trophy in running.'
                 razradbeg = 2
             else
-                'You have won the competition three more times and mr. Pavlovich awards you another trophy.'
+                'You have won the competition three more times and Mr. Pavlovich awards you another trophy.'
             end
             'Christina Zvereva stands nearby glaring at you the whole time, her hands balled into fists. She''s seething with rage, realizing she cannot beat you.'
 		elseif swinbeggor = 2 and begresult >= 130:

locations/mey_vika_events.qsrc

@@ -21,12 +21,10 @@ mey_tamara['qw_end']	mey_tamara['qw_end']
 mey_tamara['reputation_qw']	mey_tamara['reputation_qw']
 }
 
-$location_type = 'event'
-menu_off = 1
-
 if $ARGS[0] = 'first_visit':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	! for the first time - familiarity with TM
 	if mey_vika['mey_vika_qw'] = 20: gt 'mey_tamara_events', 'first_meet'
 	minut += 10
@@ -65,6 +63,8 @@ if $ARGS[0] = 'first_visit':
 end
 
 if $ARGS[0] = 'end_game':
+	menu_off = 1
+	$location_type = 'event'
 	'Noticing you, Tamara leans over, rubbing against your breasts...'
 	'<font color="maroon"><i>"You can come over and visit us any time you want, <<$pcs_nickname>>. We can sit down and have a chat over a cup of tea."</i></font>'
 	'<font color="navy"><i>"Of course, aunt Tamara! I''ll be sure to come by."</i></font>'
@@ -79,6 +79,7 @@ end
 if $ARGS[0] = 'play_game':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	minut += 5
 	gs 'mey_vika_events', 'play_game_sub', 1
 	! info about the winner/loser
@@ -145,6 +146,7 @@ if $ARGS[0] = 'play_game_wish0':
 	! Ivan lost
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	if mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart: mey_vika['mey_vika_qw'] += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/vika_game0.jpg"></center>'
 	'<font color="maroon"><i>"Vanya, you’’re the athlete here, come on show off your toned body! As if you were imitating a famous ancient discus thrower!"</i></font>'
@@ -219,6 +221,8 @@ end
 ! wish Vicky Svetka, Striptease
 if $ARGS[0] = 'play_game_wish1':
 	*clr & cla
+	menu_off = 1
+	$location_type = 'event'
 	if mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart: mey_vika['mey_vika_qw'] += 1
 	pcs_horny += 10
 	minut += 1
@@ -309,6 +313,7 @@ end
 if $ARGS[0] = 'play_game_wish2':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	if mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart: mey_vika['mey_vika_qw'] += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_game_kiss2.jpg"></center>'
 	'Vanya thoughtfully rubs his chin.'
@@ -336,6 +341,7 @@ end
 if $ARGS[0] = 'play_game_wish3':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	if mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart: mey_vika['mey_vika_qw'] += 1
 	'<center><video autoplay loop src="'+'images/characters/pavlovsk/school/girl/vicky/event/vika_game_kiss.mp4'+'"></video></center>'
 	'<font color="maroon"><i>"You Lost! You Lost!"</i></font> sings Vicky. <font color="maroon"><i>"Now let''s see, what do I want? I want... I want... I want you to make out with Vanya! A real kiss, not a little pecker! And don''t forget using your tongue!"</i></font>'
@@ -366,10 +372,11 @@ end
 
 if $ARGS[0] = 'near_school':
 	menu_off = 1
+	$location_type = 'event'
 	vicky_afterschool = daystart
 
 	if week mod 2 = 0:
-		'You see Vicky Meynold leaving the school area holding hands with Vanya.'
+		'<br>You see Vicky Meynold leaving the school area holding hands with Vanya.'
 
 		if mey_vika['mey_vika_qw'] = 0:
 			cla
@@ -420,6 +427,7 @@ end
 
 if $ARGS[0] = 'park_meet':
 	menu_off = 1
+	$location_type = 'event'
 	minut += rand(10,20)
 	gs 'stat'
 	if sunWeather = 0 or temper < 5:		
@@ -518,6 +526,7 @@ end
 if $ARGS[0] = 'cafe_qw':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	money -= 150
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/cafe_qw0.jpg"></center>'
 	'You sit in the café, eating pizza and chat with Vicky. You notice Vicky is acting somewhat strange, giggling, pressing herself against Vanya. One of his hands is almost constantly under the table and you can hear Vicky purr quietly, arching her back, and lustfully looking at you, occasionally licking her lips.'
@@ -564,6 +573,7 @@ end
 if $ARGS[0] = 'cafe_repeat_qw':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	money -= 150
 	pcs_horny += 10
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/cafe_qw0.jpg"></center>'
@@ -583,6 +593,7 @@ end
 if $ARGS[0] = 'park_qw':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool.jpg"></center>'
 	'After school ends you meet Vicky and Vanya  outside. They once again invite you to the café, but remembering what happened the previous time you tell them that you don''t have any money. You politely decline, even in spite being sure they would put on a new show for you.<br><font color="maroon"><i>"Then let''s go for a walk together!"</i></font> Vicky offers. <br><font color="maroon"><i>"What do you say, <<$pcs_nickname>>?"</i></font>'
 	act 'Decline':
@@ -623,6 +634,7 @@ end
 if $ARGS[0] = 'beach_event0':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	if args[1] < 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach1.jpg"></center>'
 		'You arrive at the beach seeing more people than usual and lots of children running around. Vicky frowns...'
@@ -798,6 +810,7 @@ end
 
 if $ARGS[0] = 'beach_event1':
 	menu_off = 1
+	$location_type = 'event'
 	!if temper >= 20 and sunWeather = 1 and month >= 5 and month <= 9 and hour < 20 and mey_vika['mey_vika_qw'] >= 18 and mey_vika['mey_vika_qw'] < 20 and mey_vika['qw_day'] ! daystart:
 		!if (hour >= 10 and week >= 6) or (hour >= 14 and week < 6):
 			*clr & cla
@@ -841,6 +854,7 @@ end
 ! case with a gift
 if $ARGS[0] = 'case_gift':
 	menu_off = 1
+	$location_type = 'event'
 	!if mey_vika['mey_vika_qw'] = 30 and mey_vika['qw_day'] ! daystart and hour = 23:
 		zz_stage = args[1]
 		if zz_stage < 2:
@@ -973,6 +987,7 @@ end
 
 if $ARGS[0] = 'learning0':
 	menu_off = 1
+	$location_type = 'event'
 	!if mey_vika['mey_vika_qw'] >= 32 and mey_vika['mey_vika_qw'] < 35 and mey_vika['qw_day'] ! daystart and hour >= 23:
 		*clr & cla
 		minut += 5
@@ -1092,6 +1107,7 @@ end
 
 if $ARGS[0] = 'gym0':
 	menu_off = 1
+	$location_type = 'event'
 !!	if week mod 2 ! 0 and mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and hour = 14 and minut >= 30:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/gym0.jpg"></center>'
@@ -1205,6 +1221,7 @@ end
 
 if $ARGS[0] = 'gym1':
 	menu_off = 1
+	$location_type = 'event'
 	!if week mod 2 ! 0 and mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and hour = 17 and minut >= 30:
 		zz_stage = args[1]
 		if zz_stage < 1:
@@ -1266,6 +1283,7 @@ end
 if $ARGS[0] = 'bath_qw0':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vaccleaner.jpg"></center>'
 	'Sighing, you begin looking where the cleaning supplies are stored in the Meynold residence.'
 	'Everything that is need is found in a small closet next to the kitchen, a broom, a bucket, detergent and a floor scrubbing machine. All brand new, as if no one ever used it. All the supplies stand in a far corner, covered with dust.'
@@ -1295,6 +1313,7 @@ end
 if $ARGS[0] = 'bath_qw1':
 	cla
 	menu_off = 1
+	$location_type = 'event'
 	mey_vika['bath_qw_day'] = daystart
 	'Standing in the hallway in her shorts and a short top Vicky confronts you, pointing at the stairs.'
 	'<font color="maroon"><i>"<<$pcs_nickname>>! No excuses you''re taking a bath now! Come with me!"</i></font>'
@@ -1315,6 +1334,7 @@ end
 if $ARGS[0] = 'bath_common':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/bath_qw1.jpg"></center>'
 	'The bathroom looks absolutely amazing. Half of the space is occupied by a corner bath and an enormous mirror hangs there.'
 	'You and Vicky quickly take off all the clothes you''re wearing and climb into the tub.'
@@ -1390,6 +1410,7 @@ end
 
 if $ARGS[0] = 'bang_katya':
 	menu_off = 1
+	$location_type = 'event'
 	zz_stage = args[1]
 	if zz_stage = 0:
 		cla
@@ -1423,6 +1444,7 @@ end
 if $ARGS[0] = 'bang_katya2':
 	*clr & cla
 	menu_off = 1
+	$location_type = 'event'
 !!Image needed	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/bang_katya3.jpg"></center>'
 	'You quietly sneak into Katja''s room. Katja is deep asleep, wearing a short tank top and panties, you lightly move her over and remove the blanket.'
 	'Vicky lays still next to her sister and winks at you. You gently lay down on the other side. Vicky starts gently kissing Katja''s tummy and softly touches her legs. You seem to understand what the plan is and you gently bite Katja''s nipple through the thin fabric.'