[changed] Vicky now have a proper schedule.

changes from 0_8_5 to 0_8_6.txt

@@ -17,7 +17,7 @@ rex_party
 rex_party_firstTime
 rex_party_smallEvents
 rex_party_sexEvents
-
+vicky_meynold_schedule
 
 === deleted locations ===
 

glife.qproj

@@ -529,6 +529,7 @@
 		<Location name="NikoMeyHome"/>
 		<Location name="mey_vika_events"/>
 		<Location name="mey_tamara_events"/>
+		<Location name="vicky_meynold_schedule"/>
 	</Folder>
 	<Folder name="Niko Volkov">
 		<Location name="VolkovHome"/>

locations/KatjaHomeTalk.qsrc

@@ -99,6 +99,7 @@ if $ARGS[0] = '':
 	$location_type = 'indoors'
 	CLOSE ALL
 	menu_off = 1
+	gs 'vicky_meynold_schedule'
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -354,7 +355,8 @@ if $ARGS[0] = '':
 				end
 			end
 			
-			if katjaQW['QWstage'] = 5 and katjaQW['marcus_asked'] = 2 and week < 6 and hour < 16 and (katjaQW['horny']+katjaQW['slut']) > 100:
+			!!Katja will only have Marcus come over when Vicky is in the park with Vanya and Tamara is not home.
+			if katjaQW['QWstage'] = 5 and katjaQW['marcus_asked'] = 2 and week < 6 and (locat['Vicky'] = 10 or locat['Vicky'] = 11) and (katjaQW['horny']+katjaQW['slut']) > 100:
 				act 'Suggest that you call Marcus':
 					*clr & cla
 					katjaQW['Marcus_day'] = daystart
@@ -367,7 +369,8 @@ if $ARGS[0] = '':
 				end
 			end
 
-			if katjaQW['QWstage'] >= 6 and week < 6 and hour < 16 and katjaQW['horny'] > 80 and katjaQW['Marcus_day'] ! daystart:
+			!!Katja will only have Marcus come over when Vicky is in the park with Vanya and Tamara is not home.
+			if katjaQW['QWstage'] >= 6 and week < 6 and (locat['Vicky'] = 10 or locat['Vicky'] = 11) and katjaQW['horny'] > 80 and katjaQW['Marcus_day'] ! daystart:
 				act 'Suggest that you call Marcus':
 					*clr & cla
 					katjaQW['Marcus_day'] = daystart
@@ -443,7 +446,8 @@ if $ARGS[0] = '':
 			if katjaQW['slut'] >= 60 and katjaQW['horny'] >= 40 and (katjaQW['knows_BJ'] + katjaQW['knows_anal']) >= 2 and npc_sex['A14'] > 0 and katjaQW['anal_quest'] = 0: gt 'KatjaHomeTalk', 'anal_sex_with_boy_ask'
 
 			if katjaQW['horny'] > rand(40,120):
-				if katjaQW['QWstage'] >= 6 and week < 6 and hour < 16 and rand(0,6) =0 and katjaQW['Marcus_day'] ! daystart:
+				!!Katja will only have Marcus come over when Vicky is in the park with Vanya and Tamara is not home.
+				if katjaQW['QWstage'] >= 6 and week < 6 and (locat['Vicky'] = 10 or locat['Vicky'] = 11) and rand(0,6) =0 and katjaQW['Marcus_day'] ! daystart:
 					katjaQW['Marcus_day'] = daystart
 					gt 'katjaHomeTalk', 'marcus_kiss' 
 				elseif katjaQW['QWstage'] > 2:
@@ -1302,7 +1306,8 @@ if $ARGS[0] = 'Marcus_answer_talk':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'You tell Katja that you have talked with Marcus and that he has agreed. She looks at you exitedly. "So when do we do it?" she asks.'
 	'"He agreed to come over when I call him, so we can call him right now, or wait for another time" you answer.'
-	if week < 6 and hour < 16 and (katjaQW['horny']+katjaQW['slut']) > 100:
+	!!Katja will only have Marcus come over when Vicky is in the park with Vanya and Tamara is not home.
+	if week < 6 and  (locat['Vicky'] = 10 or locat['Vicky'] = 11) and (katjaQW['horny']+katjaQW['slut']) > 100:
 		'"Okay. Let''s us call him right now" she says her face looking completely red.'
 		act 'Call Marcus': gt 'katja_sex', 'marcus_wait'
 	elseif (katjaQW['horny'] + katjaQW['slut']) <= 100:

locations/gschool_grounds.qsrc

@@ -11,6 +11,7 @@ if $ARGS[0] = 'main':
 	menu_off = 0
 	killvar '$locclass'
 	*clr & cla
+	gs 'vicky_meynold_schedule'
 	gs 'stat'
 	'<center><b><font color="maroon">Outside School</font></b></center>'
 	if month >= 11 or month <= 3:

locations/mey_home.qsrc

@@ -63,6 +63,7 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	killvar '$locclass'
 	cls
+	gs 'vicky_meynold_schedule'
 	gs'stat'
 	'<center><h4><font color="maroon">Hall</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/corridor.jpg"></center>'
@@ -72,10 +73,10 @@ if $ARGS[0] = 'start':
 
 	act 'Leave the house':minut += 5 & gt 'pav_residential'
 
-	if mey_vika['mey_vika_qw'] = 30 and mey_vika['qw_day'] ! daystart and hour = 23: gs 'mey_vika_events', 'case_gift'
-	if week mod 2 ! 0 and mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and hour = 16 and minut >= 30: gs 'mey_vika_events', 'gym0'
-	if week mod 2 ! 0 and mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and hour = 17 and minut >= 30: gs 'mey_vika_events', 'gym1'
-	if mey_vika['mey_vika_qw'] >= 32 and mey_vika['mey_vika_qw'] < 35 and mey_vika['qw_day'] ! daystart and hour >= 23: gs 'mey_vika_events', 'learning0'
+	if mey_vika['mey_vika_qw'] = 30 and mey_vika['qw_day'] ! daystart and locat['Vicky'] = 15: gs 'mey_vika_events', 'case_gift'
+	if mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and locat['Vicky'] = 12: gs 'mey_vika_events', 'gym0'
+	if mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and locat['Vicky'] = 13: gs 'mey_vika_events', 'gym1'
+	if mey_vika['mey_vika_qw'] >= 32 and mey_vika['mey_vika_qw'] < 35 and mey_vika['qw_day'] ! daystart and locat['Vicky'] = 15: gs 'mey_vika_events', 'learning0'
 
 	if mey_vika['mey_vika_qw'] >= 32:
 		! welcome to the corporate
@@ -90,7 +91,7 @@ if $ARGS[0] = 'start':
 		end
 
 		! Vic calls in the shower
-		if mesec = 0 and pcs_vag > 0 and mey_vika['bath_qw'] = 1 and mey_vika['bath_qw_day'] ! daystart and rand(0,10) > 5 and ((week < 6 and hour >= 14) or (week = 6 and hour >= 8)):
+		if mesec = 0 and pcs_vag > 0 and mey_vika['bath_qw'] = 1 and mey_vika['bath_qw_day'] ! daystart and rand(0,1) = 0 and locat['Vicky'] = 9:
 			gs 'mey_vika_events', 'bath_qw1'
 			exit
 		end

locations/mey_vika_events.qsrc

@@ -368,7 +368,7 @@ if $ARGS[0] = 'near_school':
 	$location_type = 'event'
 	vicky_afterschool = daystart
 
-	if (cheerleadingQW['quest_stage'] > 1 and (week = 1 or week = 3)) or (cheerleadingQW['quest_stage'] < 2 and (week = 2 or week = 4)):
+	if locat['Vicky'] = 10 or locat['Vicky'] = 11:
 		'<br>You see Vicky Meynold leaving the school area holding hands with Vanya.'
 
 		if mey_vika['mey_vika_qw'] = 0:
@@ -950,7 +950,7 @@ end
 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:
+	!if mey_vika['mey_vika_qw'] = 30 and mey_vika['qw_day'] ! daystart and locat['Vicky'] = 15:
 		zz_stage = args[1]
 		if zz_stage < 2:
 			*clr & cla
@@ -1083,7 +1083,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:
+	!if mey_vika['mey_vika_qw'] >= 32 and mey_vika['mey_vika_qw'] < 35 and mey_vika['qw_day'] ! daystart and locat['Vicky'] = 15:
 		*clr & cla
 		minut += 5
 		mey_vika['qw_day'] = daystart
@@ -1203,7 +1203,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:
+!!	if mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and locat['Vicky'] = 12:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/gym0.jpg"></center>'
 		'You are walking past Vicky''s room. The door to the room is opened. You see Vicky warming up inside her room. Seeing you, she smiles...'
@@ -1319,7 +1319,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:
+	!if mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and locat['Vicky'] = 12:
 		zz_stage = args[1]
 		if zz_stage < 1:
 			*clr & cla

locations/pav_park.qsrc

@@ -13,6 +13,7 @@ if $ARGS[0] = 'start':
 	$locclass = 'city_park'
 	menu_off = 0
 	gs 'stat'
+	gs 'vicky_meynold_schedule'
 
 	if sound = 0:
 		if month >=11 and month <= 12 or month >=1 and month <=3:
@@ -142,7 +143,7 @@ if $ARGS[0] = 'start':
 		menu_off = 1
 		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
 
-		if StoryLine = 1 and SchoolAtestat = 0 and mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart and ((week > 5 and hour >= 8 and hour < 20) or (week < 6 and week mod 2 = 1 and hour > 14)):
+		if StoryLine = 1 and SchoolAtestat = 0 and mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart and locat['Vicky'] = 11:
 			gs 'mey_vika_events', 'park_meet'
 			gs 'stat'
 		else
@@ -233,7 +234,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:
-		if hour >= 20 or (week > 5 and hour < 8) or (week < 6 and week mod 2 = 0 and hour < 14) or (week mod 2 = 1 and hour < 18):
+		if locat['Vicky'] ! 11:
 			'<br>Vicky and Vanya never are in the park at this time.'
 		else
 			act 'Look for Vicky and Vanya (0:05)':

locations/vicky_meynold_schedule.qsrc

@@ -0,0 +1,277 @@
+# vicky_meynold_schedule
+!!2022/01/22
+locat['Vicky'] = 0
+
+if SchoolAtestat = 0 and kanikuli = 0:
+	if week <= 5:
+		if (hour < 6) or (hour = 6 and minut < 45):
+			!!Bedroom - Asleep
+			locat['Vicky']  = 1
+		elseif hour < 7:
+			!!Bedroom - Getting Dressed
+			locat['Vicky']  = 2
+		elseif hour = 7 and minut <= 15:
+			!!Kitchen - Breakfast
+			locat['Vicky']  = 3
+		elseif hour = 7 and minut < 30:
+			!!NotHome - Walking to school
+			locat['Vicky']  = 4
+		elseif hour < 14:
+			!!NotHome - At School
+			locat['Vicky']  = 5
+		elseif hour < 16:
+			if (week = 2 or week = 4) and (month >= 10 or month <= 5):
+				!!NotHome - Cheerleader Practice
+				locat['Vicky']  = 6
+			elseif week = 5 and odd_week = 1 and (month >= 10 or month <= 5):
+				!!NotHome - Game Night
+				locat['Vicky']  = 7
+			else
+				if week = 5:
+					if hour = 14 and minut < 30:
+						!!Walking home
+						locat['Vicky'] = 8
+					else
+						!!At home in her room
+						locat['Vicky'] = 9
+					end
+				else
+					if hour = 14 and minut < 15:
+						!!Walking to the park with Vanya
+						locat['Vicky'] = 10
+					else
+						!!In the park with Vanya
+						locat['Vicky'] = 11
+					end
+				end
+			end
+		elseif hour < 18:
+			if week = 5:
+				!!At home in her room
+				locat['Vicky'] = 9
+			else
+				!!In the park with Vanya
+				locat['Vicky'] = 11
+			end
+		elseif hour = 18 and minut < 30:
+			if week = 5:
+				!!At home in her room
+				locat['Vicky'] = 9
+			else
+				!!Walking home from the park
+				locat['Vicky'] = 8
+			end
+		elseif hour = 18 and minut < 45:
+			if week = 1 or week = 3:
+				!!At home in her room preparing to do exercises
+				locat['Vicky'] = 12
+			else
+				!!At home in her room
+				locat['Vicky'] = 9
+			end
+		elseif hour < 19 or (hour = 19 and minut <15):
+			if week = 1 or week = 3:
+				!!In the living room doing exercises
+				locat['Vicky'] = 13
+			else
+				!!At home in her room
+				locat['Vicky'] = 9
+			end		
+		elseif hour < 20:
+				!!At home in her room
+				locat['Vicky'] = 9
+		elseif hour < 23:
+			if week = 5:
+				!!At the comunity cneter disco
+				locat['Vicky'] = 14
+			else
+				!!At home in her room
+				locat['Vicky'] = 9
+			end
+		else
+			if week = 5:
+				!!At the comunity center disco
+				locat['Vicky'] = 14
+			else
+				!!In her room with Vanya
+				locat['Vicky'] = 15
+			end
+		end
+	elseif week = 6:
+		if hour < 9:
+			!!Bedroom - Asleep
+			locat['Vicky']  = 1
+		elseif hour = 10 and minut < 15:
+			!!Bedroom - Getting Dressed
+			locat['Vicky']  = 2
+		elseif hour = 10 and minut <= 45:
+			!!Kitchen - Breakfast
+			locat['Vicky']  = 3
+		elseif hour < 11:
+			!!Walking to the park with Vanya
+			locat['Vicky'] = 10
+		elseif hour < 16:
+			!!In the park with Vanya
+			locat['Vicky'] = 11
+		elseif hour = 16 and minut < 30:
+			!!Walking home from the park
+			locat['Vicky'] = 8
+		elseif hour = 16 and minut < 45:
+			!!At home in her room preparing to do exercises
+			locat['Vicky'] = 12
+		elseif hour < 17 or (hour = 17 and minut <15):
+			!!In the living room doing exercises
+			locat['Vicky'] = 13
+		elseif hour < 20:
+			!!At home in her room
+			locat['Vicky'] = 9
+		else
+			!!At the comunity center disco
+			locat['Vicky'] = 14
+		end
+	else
+		if hour < 9:
+			!!Bedroom - Asleep
+			locat['Vicky']  = 1
+		elseif hour = 10 and minut < 15:
+			!!Bedroom - Getting Dressed
+			locat['Vicky']  = 2
+		elseif hour = 10 and minut <= 45:
+			!!Kitchen - Breakfast
+			locat['Vicky']  = 3
+		elseif hour < 23:
+			!!At home in her room
+			locat['Vicky'] = 9
+		else
+			!!In her room with Vanya
+			locat['Vicky'] = 15
+		end
+	end
+else
+	if week <= 5:
+		if (hour < 7) or (hour = 7 and minut < 45):
+			!!Bedroom - Asleep
+			locat['Vicky']  = 1
+		elseif hour < 7:
+			!!Bedroom - Getting Dressed
+			locat['Vicky']  = 2
+		elseif hour = 8 and minut <= 30:
+			!!Kitchen - Breakfast
+			locat['Vicky']  = 3
+		elseif hour = 8 and minut < 45:
+			!!At home in her room
+			locat['Vicky']  = 9
+		elseif hour < 9:
+			if week = 5:
+				!!At home in her room
+				locat['Vicky'] = 9
+			else
+				!!Walking to the park with Vanya
+				locat['Vicky'] = 10
+			end
+		elseif hour < 18:
+			if week = 5:
+				!!At home in her room
+				locat['Vicky'] = 9
+			else
+				!!In the park with Vanya
+				locat['Vicky'] = 11
+			end
+		elseif hour = 18 and minut < 30:
+			if week = 5:
+				!!At home in her room
+				locat['Vicky'] = 9
+			else
+				!!Walking home from the park
+				locat['Vicky'] = 8
+			end
+		elseif hour = 18 and minut < 45:
+			if week = 1 or week = 3:
+				!!At home in her room preparing to do exercises
+				locat['Vicky'] = 12
+			else
+				!!At home in her room
+				locat['Vicky'] = 9
+			end
+		elseif hour < 19  or (hour = 19 and minut <15):
+			if week = 1 or week = 3:
+				!!In the living room doing exercises
+				locat['Vicky'] = 13
+			else
+				!!At home in her room
+				locat['Vicky'] = 9
+			end		
+		elseif hour < 20:
+				!!At home in her room
+				locat['Vicky'] = 9
+		elseif hour < 23:
+			if week = 5:
+				!!At the comunity cneter disco
+				locat['Vicky'] = 14
+			else
+				!!At home in her room
+				locat['Vicky'] = 9
+			end
+		else
+			if week = 5:
+				!!At the comunity center disco
+				locat['Vicky'] = 14
+			else
+				!!In her room with Vanya
+				locat['Vicky'] = 15
+			end
+		end
+	elseif week = 6:
+		if hour < 9:
+			!!Bedroom - Asleep
+			locat['Vicky']  = 1
+		elseif hour = 10 and minut < 15:
+			!!Bedroom - Getting Dressed
+			locat['Vicky']  = 2
+		elseif hour = 10 and minut <= 45:
+			!!Kitchen - Breakfast
+			locat['Vicky']  = 3
+		elseif hour < 11:
+			!!Walking to the park with Vanya
+			locat['Vicky'] = 10
+		elseif hour < 16:
+			!!In the park with Vanya
+			locat['Vicky'] = 11
+		elseif hour = 16 and minut < 30:
+			!!Walking home from the park
+			locat['Vicky'] = 8
+		elseif hour = 16 and minut < 45:
+			!!At home in her room preparing to do exercises
+			locat['Vicky'] = 12
+		elseif hour < 17  or (hour = 17 and minut <15):
+			!!In the living room doing exercises
+			locat['Vicky'] = 13
+		elseif hour < 20:
+			!!At home in her room
+			locat['Vicky'] = 9
+		else
+			!!At the comunity center disco
+			locat['Vicky'] = 14
+		end
+	else
+		if hour < 9:
+			!!Bedroom - Asleep
+			locat['Vicky']  = 1
+		elseif hour = 10 and minut < 15:
+			!!Bedroom - Getting Dressed
+			locat['Vicky']  = 2
+		elseif hour = 10 and minut <= 45:
+			!!Kitchen - Breakfast
+			locat['Vicky']  = 3
+		elseif hour < 23:
+			!!At home in her room
+			locat['Vicky'] = 9
+		else
+			!!In her room with Vanya
+			locat['Vicky'] = 15
+		end
+	end
+end
+
+--- vicky_meynold_schedule ---------------------------------
+