Merge remote-tracking branch 'Anya/master'

glife.qproj

@@ -629,6 +629,9 @@
 	</Folder>
 	<Folder name="Christina Zvereva">
 		<Location name="Zvereva_events"/>
+		<Location name="Zvereva_house"/>
+		<Location name="Zvereva_house_events"/>
+		<Location name="Zvereva_schedule"/>
 		<Location name="Zvereva_sub_1"/>
 	</Folder>
 	<Folder name="Julia Milov">

locations/Zvereva_events.qsrc

@@ -1,5 +1,5 @@
 # Zvereva_events
-!!22/05/07 - Alaratt
+!!22/05/14 - Alaratt
 
 !!christinaQW['bully'] - earned if you stand up for yourself or not - less then 50 is you standing up, more then 50 is you being meek - at a certain point these unlock the below options
 !!christinaQW['pre_fight'] - 1 means you are preparing to fight her
@@ -9,7 +9,6 @@
 !!christinaQW['submit'] - 1 means you willingly submitted, stays at 0 if you lose the fight, for reference on how you became her pet
 !!christinaQW['subpath'] - 1 means you are looking to become her pet, 2 means you are her new pet, 3 means you have seen shower events, more will come to increase this
 
-
 if $ARGS[0] = 'cikl':
 	!!failsafe, should be used whenever adding or subtracting with bully events 
 	if npc_rel['A18'] > 20:

locations/Zvereva_house.qsrc

@@ -0,0 +1,240 @@
+# Zvereva_house
+!!22/05/14 - Alaratt
+
+!!christinaQW['bully'] - earned if you stand up for yourself or not - less then 50 is you standing up, more then 50 is you being meek - at a certain point these unlock the below options
+!!christinaQW['pre_fight'] - 1 means you are preparing to fight her
+!!christinaQW['fight'] - 1 means you fought and won, -1 means you lost and are now her plaything
+!!christinaQW['pre_bm'] - 1 means you are searching for the blackmail material to use against her
+!!christinaQW['blackmail'] - 1 means you have the blackmail and need to talk to her to initiate, 2 means you have her blackmailed and are mostly safe from her bullying
+!!christinaQW['submit'] - 1 means you willingly submitted, stays at 0 if you lose the fight, for reference on how you became her pet
+!!christinaQW['subpath'] - 1 means you are looking to become her pet, 2 means you are her new pet, 3 means you have seen shower events, more will come to increase this
+
+if $ARGS[0] = 'front_door':
+	$loc = 'Zvereva_house'
+	$loc_arg = 'front_door'
+	$menu_loc = 'Zvereva_house'
+	$menu_arg = 'front_door'
+
+	menu_off = 1
+	minut += 1
+	gs 'Zvereva_schedule'
+	gs 'stat'
+
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/christina_home/front_door.jpg"></center>'
+	'The Zvereva family house is quite impressive.'
+
+	if chrisloc['athome'] = 1:
+		'Christina answers the door smiling, but as soon as she sees you, she frowns. "I don''t remember inviting you over today."'
+		'You bow your head, but say nothing.'
+		'"Fine. Come inside."'
+
+		act 'Go inside': gt 'Zvereva_house', 'hallw'
+	else
+		'Nobody answers the door.'
+		act 'Go back to town': minut += 1 & gt 'pav_residential'
+	end
+
+end
+
+if $ARGS[0] = 'hallw':
+	CLOSE ALL
+	$loc = 'Zvereva_house'
+	$loc_arg = 'hallw'
+	$menu_loc = 'Zvereva_house'
+	$menu_arg = 'hallw'
+	$locM = 'Zvereva_house'
+	$locM_arg = 'hallw'
+	$location_type = 'private'
+	killvar '$locclass'
+
+	menu_off = 0
+	minut += 1
+	gs 'Zvereva_schedule'
+	gs 'stat'
+	gs 'themes', 'indoors'
+	if frost > 0: frost = 0
+
+	*clr & cla
+	'<center><b><font color="maroon">Foyer</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/christina_home/foyer.jpg"></center>'
+
+	act 'Leave':
+		if $clothingworntype ! 'nude':
+			minut += 1
+			gt 'pav_residential'
+		else
+			msg'<b><font color = red>You need to get dressed.</font></b>'
+			gt 'Zvereva_house', 'hallw'
+		end
+	end
+
+	'The main hallway of Christina''s house. You can visit the different rooms from here.'
+	'There''s a <a href="exec:gt ''mirror'', ''start''">mirror</a> hanging on the wall.'
+
+	if chrisloc = 1 or chrisloc = 2 or chrisloc = 8 or chrisloc = 22:
+		'Christina is in her bedroom right now.'
+	elseif chrisloc = 3 or chrisloc = 11 or chrisloc = 12:
+		'Christina is in the kitchen right now.'
+	elseif chrisloc = 14 or chrisloc = 17:
+		'Christina is in the living room right now.'
+	elseif chrisloc = 13:
+		'Christina is in the bathroom right now.'
+	else
+		'Christina isn''t home right now.'
+	end
+
+	act 'Living Room':gt 'Zvereva_house', 'livroom'
+	act 'Kitchen':gt 'Zvereva_house', 'kitch'
+	act 'Bathroom':gt 'Zvereva_house', 'bathr'
+	act 'Christina''s Bedroom':gt 'Zvereva_house', 'chris_bedro'
+	if slyQW['met'] = 1: act 'Silvestr''s bedroom': gt 'Zvereva_house', 'sly_bedro'
+
+end
+
+if $ARGS[0] = 'livroom':
+	$loc = 'Zvereva_house'
+	$loc_arg = 'livroom'
+	$menu_loc = 'Zvereva_house'
+	$menu_arg = 'livroom'
+	$location_type = 'private'
+	$locclass = 'livingr'
+
+	menu_off = 0
+	minut += 1
+	gs 'Zvereva_schedule'
+	gs 'stat'
+
+	*clr & cla
+	'<center><b><font color="maroon">Living Room</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/christina_home/living_room.jpg"></center>'
+
+	act 'Leave the room': gt 'Zvereva_house', 'hallw'
+
+	'A spacious room with two large couches and an expensive looking tv hanging on the wall above a fireplace.'
+
+	if chrisloc = 14: 'Christina is watching TV right now.'
+	if chrisloc = 17: 'Christina is hanging out here, looking bored.'
+
+end
+
+if $ARGS[0] = 'kitch':
+	$loc = 'Zvereva_house'
+	$loc_arg = 'kitch'
+	$menu_loc = 'Zvereva_house'
+	$menu_arg = 'kitch'
+	$locclass = 'kitr'
+
+	menu_off = 0
+	minut += 1
+	!!gs 'kit_din'
+	gs 'Zvereva_schedule'
+	gs 'stat'
+
+	*clr & cla
+	'<center><b><font color="maroon">Kitchen</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/christina_home/kitchen.jpg"></center>'
+
+	act 'Leave the room': gt 'Zvereva_house', 'hallw'
+
+	'A very modern looking kitchen with a large fridge and stove.'
+
+	if chrisloc = 3: 'Christina is here, eating breakfast.'
+	if chrisloc = 11: 'Christina is making dinner.'
+	if chrisloc = 12: 'Christina is eating dinner right now.'
+
+	!!dynamic $edasnack
+	!!dynamic $sandwich
+	dynamic $driwater
+	!!dynamic $dritea
+	dynamic $fill_bottle
+	!!dynamic $edaD
+	!!dynamic $pranik
+	!!dynamic $fatdel
+	!!dynamic $lekarstvo
+	!!dynamic $vitamin
+
+end
+
+if $ARGS[0] = 'bathr':
+	$loc = 'Zvereva_house'
+	$loc_arg = 'bathr'
+	$locM = 'Zvereva_house'
+	$locM_arg = 'bathr'
+	$menu_loc = 'Zvereva_house'
+	$menu_arg = 'bathr'
+	$location_type = 'bathroom'
+
+	menu_off = 0
+	minut += 1
+	gs 'Zvereva_schedule'
+	gs 'stat'
+
+	*clr & cla
+	'<center><b><font color="maroon">Bathroom</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/christina_home/bathroom.jpg"></center>'
+
+	act 'Leave the room': gt 'Zvereva_house', 'hallw'
+
+	'The stylish room has a large glass shower, toilet, sink, and a <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+
+	if chrisloc = 13: '<a href="exec:gt ''Zvereva_house_events'',''chris_shower''">Christina</a> is here, taking a shower.'
+end
+
+if $ARGS[0] = 'chris_bedro':
+	$loc = 'Zvereva_house'
+	$loc_arg = 'chris_bedro'
+	$menu_loc = 'Zvereva_house'
+	$menu_arg = 'chris_bedro'
+	$locM = 'Zvereva_house'
+	$locM_arg = 'chris_bedro'
+	$location_type = 'private'
+	$locclass = 'bedr'
+
+	menu_off = 0
+	minut += 1
+	gs 'Zvereva_schedule'
+	gs 'stat'
+
+	*clr & cla
+	'<center><b><font color="maroon">Christina''s Bedroom</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/christina_home/chris_bedroom.jpg"></center>'
+
+	act 'Leave the room': gt 'Zvereva_house', 'hallw'
+
+	'Surprisingly girly for someone of Christina''s tastes, there is a large bed, walk-in closet, a desk, and a large <a href="exec:gt ''mirror'', ''start''">mirror</a> leaning against the wall.'
+
+	if chrisloc = 1: 'Christina is in bed, asleep.'
+	if chrisloc = 2: 'Christina is getting dressed right now.'
+	if chrisloc = 8: 'Christina is here, doing her homework.'
+	if chrisloc = 22: 'Christina is hanging out here, looking bored.'
+
+end
+
+if $ARGS[0] = 'sly_bedro':
+	$loc = 'Zvereva_house'
+	$loc_arg = 'sly_bedro'
+	$menu_loc = 'Zvereva_house'
+	$menu_arg = 'sly_bedro'
+	$locM = 'Zvereva_house'
+	$locM_arg = 'sly_bedro'
+	$location_type = 'private'
+	$locclass = 'bedr'
+
+	menu_off = 0
+	minut += 1
+	gs 'Zvereva_schedule'
+	gs 'stat'
+
+	*clr & cla
+	'<center><b><font color="maroon">Silvestr''s Bedroom</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/christina_home/sly_bedroom.jpg"></center>'
+
+	act 'Leave the room': gt 'Zvereva_house', 'hallw'
+
+	'Sly''s rather stylish room holds a huge bed, a small couch, and a lot of different artsy looking items.'
+
+end
+
+--- Zvereva_house ---------------------------------
+

locations/Zvereva_house_events.qsrc

@@ -0,0 +1,108 @@
+# Zvereva_house_events
+!!22/05/14 - Alaratt
+
+!!christinaQW['bully'] - earned if you stand up for yourself or not - less then 50 is you standing up, more then 50 is you being meek - at a certain point these unlock the below options
+!!christinaQW['pre_fight'] - 1 means you are preparing to fight her
+!!christinaQW['fight'] - 1 means you fought and won, -1 means you lost and are now her plaything
+!!christinaQW['pre_bm'] - 1 means you are searching for the blackmail material to use against her
+!!christinaQW['blackmail'] - 1 means you have the blackmail and need to talk to her to initiate, 2 means you have her blackmailed and are mostly safe from her bullying
+!!christinaQW['submit'] - 1 means you willingly submitted, stays at 0 if you lose the fight, for reference on how you became her pet
+!!christinaQW['subpath'] - 1 means you are looking to become her pet, 2 means you are her new pet, 3 means you have seen shower events, more will come to increase this
+
+if $ARGS[0] = 'Chris_walk_home':
+	menu_off = 1
+	gs 'stat'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
+	if christinaQW['subpath'] = 4:
+		christinaQW['subpath'] = 5
+		'"About time, bitch. Come on, lets go." She starts walking away at a brisk pace. You follow, making sure to stay at least one step behind her.'
+
+		act 'Follow her':
+			minut += 10
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/christina_home/front_door.jpg"></center>'
+			'You follow her into the residential district of Pavlovsk, until you get to a large house about ten minutes from the school. Christina''s parents are obviously fairly wealthy, to own a house this size.'
+			*nl
+			'You enter the house behind her.'
+			gs 'stat'
+			act 'Listen to her':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
+				'"Ok, here are the rules you will follow, or I will '+iif(christinaQW['fight'] = -1, 'beat you black and blue. Again.','spank the absolute shit out of you.')+'"'
+				*nl
+				'"1. You will not speak unless spoken to, or otherwise given permission. When you do, you will either call me by name in the presence of others, or Mistress when we are alone."'
+				*nl
+				'"2. You will do anything I say. If I say clean, you will clean. If I say strip and lick my pussy, you will do it. No hesitation."'
+				*nl
+				'"3. If you meet my parents or brothers, you will be polite, demure, and discreet about anything and everything I do. Only Sly knows anything about my personal life. He is the youngest of my older brothers, and the only one who lives here with me, full time. My parents are almost always traveling for work, so you will only see them on special occasions."'
+				*nl
+				'"4. You will listen to Sly. His demands are usually pretty simple: suck his dick, spread your legs, that kind of thing. You don''t have to do everything he says, but if you annoy him, it better be for a damned good reason because he is the only member of my family I give a shit about."'
+				*nl
+				'"You may speak."'
+
+				act 'I''m a lesbian':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
+					'Christina rolls her eyes. "Ugh. Of course you are. Sly gonna love that. Fine, Lina is his favorite toy anyway, but you better work extra hard to please me."'
+					'"Yes, Mistress. Thank you. What about Lariska? Does she get him off?"'
+					'"Jealous? ...No, not anymore, she refuses to touch him. Don''t ask me why, if he wasn''t my brother..." She stares off into space for a few moments before coming back to the conversation. "Anyway. Those are the rules, for now. Follow them, or else."'
+
+					act 'Yes, Mistress':
+						christinaQW['svet_lez_yes'] = 1
+						gt 'Zvereva_house', 'chris_bedro'
+					end
+				end
+				act 'Yes, Mistress': gt 'Zvereva_house', 'chris_bedro'
+			end
+		end
+	else
+		'"About time, bitch. Come on, lets go." She starts walking away at a brisk pace. You follow, making sure to stay at least one step behind her.'
+		act 'Follow her':
+			minut += 10
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/christina_home/front_door.jpg"></center>'
+			'You follow her home and into her house, to her room.'
+			gs 'stat'
+			gt 'Zvereva_house', 'chris_bedro'
+		end
+	end
+end
+
+if $ARGS[0] = 'chris_shower':
+	menu_off = 1
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
+	'You find Christina in the shower. She hasn''t noticed you yet.'
+
+	gs 'arousal', 'erotic_nudity', 5
+	act 'Leave':
+		gs 'arousal', 'end'
+		gs 'stat'
+		gt 'Zvereva_house', 'hallw'
+	end
+	act 'Join her':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
+		'Removing your clothes, you walk over to the glass door and softly clear your throat and wait to be noticed.'
+		'When she sees you, she opens the door and says "Get in here, I need my back washed."'
+		'You step inside, lather your hands in soap, and start washing her.'
+
+		noShampoo = 1
+		dynamic $showerdin
+		pcs_horny += 10
+		pcs_hairbsh = 1
+		pcs_makeup = 1
+		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+		gs 'arousal', 'erotic_nudity', 20, 'lesbian'
+		gs 'stat'
+		act 'Finish the shower':
+			gs 'arousal', 'end'
+			gs 'stat'
+			gt 'Zvereva_house', 'bathr'
+		end
+	end
+end
+
+--- Zvereva_house_events ---------------------------------
+

locations/Zvereva_schedule.qsrc

@@ -0,0 +1,247 @@
+# Zvereva_schedule
+
+chrisloc = 0
+
+!! chrisloc['athome'] = 1 means Christina is not only home, but available to answer the door if you knock
+!! unused loc variables - 15, 18, 19, 20, 23+
+
+if SchoolAtestat = 0 and kanikuli = 0:
+	if week <= 5:
+		if (hour < 6) or (hour = 6 and minut < 45):
+			!!Bedroom - Asleep
+			chrisloc = 1
+			chrisloc['athome'] = 0
+		elseif hour < 7:
+			!!Bedroom - Getting Dressed
+			chrisloc = 2
+			chrisloc['athome'] = 1
+		elseif hour = 7 and minut <= 15:
+			!!Kitchen - Breakfast
+			chrisloc = 3
+			chrisloc['athome'] = 1
+		elseif hour = 7 and minut < 30:
+			!!NotHome - Walking to school
+			chrisloc = 4
+			chrisloc['athome'] = 0
+		elseif hour < 14:
+			!!NotHome - At School
+			chrisloc = 5
+			chrisloc['athome'] = 0
+		elseif hour < 16:
+			if cheerleaders_on = 1:
+				if week = 5:
+					!!NotHome - Game Night
+					chrisloc = 7
+					chrisloc['athome'] = 0
+				else
+					!!NotHome - Cheerleader Practice
+					chrisloc = 6
+					chrisloc['athome'] = 0
+				end
+			else
+				if lernHome > 0:
+					!!Bedroom - Homework
+					chrisloc = 8
+					chrisloc['athome'] = 1
+				else
+					!!Bedroom - Hanging Out
+					chrisloc = 22
+					chrisloc['athome'] = 1
+				end
+			end
+		elseif hour < 18:
+			if cheerleaders_on = 1:
+				!!Bedroom - Hanging Out
+				chrisloc = 22
+				chrisloc['athome'] = 1
+			else
+				!!NotHome - Jogging
+				chrisloc = 9
+				chrisloc['athome'] = 0
+			end
+		elseif hour = 18 and minut < 30:
+			!!Kitchen - Cooking Dinner
+			chrisloc = 11
+			chrisloc['athome'] = 1
+		elseif hour <= 19:
+			!!Kitchen - Eating Dinner
+			chrisloc = 12
+			chrisloc['athome'] = 1
+		elseif hour = 19 and minut <= 30:
+			!!Bathroom - Shower
+			chrisloc = 13
+			chrisloc['athome'] = 0
+		elseif hour < 21:
+			!!Living Room - Watching TV
+			chrisloc = 14
+			chrisloc['athome'] = 1
+		else
+			!!Bedroom - Hanging Out
+			chrisloc = 22
+			chrisloc['athome'] = 0
+		end
+	elseif week = 6:
+		if hour < 8:
+			!!Bedroom - Asleep
+			chrisloc = 1
+			chrisloc['athome'] = 0
+		elseif hour = 8 and minut <= 15:
+			!!Kitchen - Breakfast
+			chrisloc = 3
+			chrisloc['athome'] = 1
+		elseif hour = 8 and minut < 45:
+			!!Bathroom - Shower
+			chrisloc = 13
+			chrisloc['athome'] = 0
+		elseif hour < 9:
+			!!Bedroom - Getting Dressed
+			chrisloc = 2
+			chrisloc['athome'] = 1
+		elseif hour = 9:
+			!!NotHome - Track field stretch
+			chrisloc = 16
+			chrisloc['athome'] = 0
+		elseif hour = 10:
+			!!NotHome - Track field race
+			chrisloc = 21
+			chrisloc['athome'] = 0
+		elseif hour < 16:
+			if month < 11 or month > 3:
+				!!NotHome - Beach
+				chrisloc = 10
+				chrisloc['athome'] = 0
+			else
+				!!Living Room - hanging out
+				chrisloc = 17
+				chrisloc['athome'] = 1
+			end
+		elseif hour < 18:
+			!!NotHome - Jogging
+			chrisloc = 9
+			chrisloc['athome'] = 0
+		elseif hour = 18 and minut <= 30:
+			!!Kitchen - Dinner
+			chrisloc = 12
+			chrisloc['athome'] = 1
+		elseif hour = 18 and minut >= 30:
+			!!Bathroom - Shower
+			chrisloc = 13
+			chrisloc['athome'] = 0
+		elseif hour < 21:
+			!!Living Room - Watching TV
+			chrisloc = 14
+			chrisloc['athome'] = 1
+		else
+			!!Bedroom - Hanging Out
+			chrisloc = 22
+			chrisloc['athome'] = 0
+		end
+	else
+		if hour < 8:
+			!!Bedroom - Asleep
+			chrisloc = 1
+			chrisloc['athome'] = 0
+		elseif hour = 8 and minut <= 15:
+			!!Kitchen - Breakfast
+			chrisloc = 3
+			chrisloc['athome'] = 1
+		elseif hour = 8 and minut < 45:
+			!!Bathroom - Shower
+			chrisloc = 13
+			chrisloc['athome'] = 0
+		elseif hour < 9:
+			!!Bedroom - Getting Dressed
+			chrisloc = 2
+			chrisloc['athome'] = 1
+		elseif hour < 11:
+			!!unknown
+			chrisloc = 0
+			chrisloc['athome'] = 0
+		elseif hour < 16:
+			if month < 11 or month > 3:
+				!!NotHome - Beach
+				chrisloc = 10
+				chrisloc['athome'] = 0
+			else
+				!!Living Room - hanging out
+				chrisloc = 17
+				chrisloc['athome'] = 1
+			end
+		elseif hour < 18:
+			!!NotHome - Jogging
+			chrisloc = 9
+			chrisloc['athome'] = 0
+		elseif hour = 18 and minut <= 30:
+			!!Kitchen - Dinner
+			chrisloc = 12
+			chrisloc['athome'] = 1
+		elseif hour = 18 and minut >= 30:
+			!!Bathroom - Shower
+			chrisloc = 13
+			chrisloc['athome'] = 0
+		elseif hour < 21:
+			!!Living Room - Watching TV
+			chrisloc = 14
+			chrisloc['athome'] = 1
+		else
+			!!Bedroom - Hanging Out
+			chrisloc = 22
+			chrisloc['athome'] = 0
+		end
+	end
+else
+	if hour < 8:
+		!!Bedroom - Asleep
+		chrisloc = 1
+		chrisloc['athome'] = 0
+	elseif hour = 8 and minut <= 15:
+		!!Kitchen - Breakfast
+		chrisloc = 3
+		chrisloc['athome'] = 1
+	elseif hour = 8 and minut < 45:
+		!!Bathroom - Shower
+		chrisloc = 13
+		chrisloc['athome'] = 0
+	elseif hour < 9:
+		!!Bedroom - Getting Dressed
+		chrisloc = 2
+		chrisloc['athome'] = 1
+	elseif hour < 11:
+		!!unknown
+		chrisloc = 0
+		chrisloc['athome'] = 0	
+	elseif hour < 16:
+		if month < 11 or month > 3:
+			!!NotHome - Beach
+			chrisloc = 10
+			chrisloc['athome'] = 0
+		else
+			!!Living Room - hanging out
+			chrisloc = 17
+			chrisloc['athome'] = 1
+		end
+	elseif hour < 18:
+		!!NotHome - Jogging
+		chrisloc = 9
+		chrisloc['athome'] = 0
+	elseif hour = 18 and minut <= 30:
+		!!Kitchen - Dinner
+		chrisloc = 12
+		chrisloc['athome'] = 1
+	elseif hour = 18 and minut >= 30:
+		!!Bathroom - Shower
+		chrisloc = 13
+		chrisloc['athome'] = 1
+	elseif hour < 21:
+		!!Living Room - Watching TV
+		chrisloc = 14
+		chrisloc['athome'] = 1
+	else
+		!!Bedroom - Hanging Out
+		chrisloc = 22
+		chrisloc['athome'] = 0
+	end
+end
+
+--- Zvereva_schedule ---------------------------------
+

locations/Zvereva_sub_1.qsrc

@@ -1,5 +1,13 @@
 # Zvereva_sub_1
+!!22/05/14 - Alaratt
 
+!!christinaQW['bully'] - earned if you stand up for yourself or not - less then 50 is you standing up, more then 50 is you being meek - at a certain point these unlock the below options
+!!christinaQW['pre_fight'] - 1 means you are preparing to fight her
+!!christinaQW['fight'] - 1 means you fought and won, -1 means you lost and are now her plaything
+!!christinaQW['pre_bm'] - 1 means you are searching for the blackmail material to use against her
+!!christinaQW['blackmail'] - 1 means you have the blackmail and need to talk to her to initiate, 2 means you have her blackmailed and are mostly safe from her bullying
+!!christinaQW['submit'] - 1 means you willingly submitted, stays at 0 if you lose the fight, for reference on how you became her pet
+!!christinaQW['subpath'] - 1 means you are looking to become her pet, 2 means you are her new pet, 3 means you have seen shower events, more will come to increase this
 
 if $ARGS[0] = 'chris_sub':
 	cla & *clr
@@ -295,7 +303,7 @@ if $ARGS[0] = '0':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj.jpg"></center>'
 		'You nod obediently, not wanting to anger her. You squat down in front of the dildo, and take it in your hands before carefully licking it and closing your lips around it. You expected an awful rubber taste, but it''s actually not that bad. You give the dildo a blowjob as all the girls in your class watch you, while Christina laughs. After a few minutes, she has seen enough and allows you to change.'
 
-		gs 'arousal', 'bj', 10, 'sub', 'humiliation'
+		gs 'arousal', 'dildo_suck', 10, 'sub', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
 		
@@ -317,7 +325,7 @@ if $ARGS[0] = '1':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj2.jpg"></center>'
 		'You nod obediently, not wanting to anger her. You kneel down in front of the dildo, and take it in your hands before carefully licking it and closing your lips around it. Then you stretch your body and rest your hands next to the stone before pushing yourself up. The dildo makes you have to push up higher than you normally would, and after only a few your arms get tired. As you struggle to keep your weight up, the dildo is driven further and further down your throat. All of the girls in your class watch you do your best to not choke on the dildo while Christina laughs evilly, and after a few more push-ups Christina has seen enough and allows you to stop and change.'
 
-		gs 'arousal', 'bj', 10, 'sub', 'humiliation', 'deepthroat'
+		gs 'arousal', 'dildo_suck', 10, 'sub', 'humiliation', 'deepthroat'
 		gs 'arousal', 'end'
 		gs 'stat'
 		
@@ -340,7 +348,7 @@ if $ARGS[0] = '2':
 		'No moving your feet... this is going to be tricky. You spread your legs and awkwardly bend over, while one of the girls in your class holds the dildo up straight to help you out a little. Once you close your lips around it she pulls away, while you do your best to give the dildo a blowjob in this awkward position.'
 		'After a while, Christina nods approvingly: "Not bad, bitch. You''re getting good at this. Go get changed, I''ll have to think of something more challenging for you for next time."'
 
-		gs 'arousal', 'bj', 10, 'sub', 'humiliation'
+		gs 'arousal', 'dildo_suck', 10, 'sub', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
 		
@@ -359,7 +367,7 @@ if $ARGS[0] = '3':
 		'You get down on your knees in front of the middle dildo, and take it in your mouth. You close your lips around it and begin to suck it off, while rhythmically stroking the other two with your hands. You hear the girls of your class quietly whisper things amongst each other while you do what you''re told, and while Christina applauds you. "Very nice, bitch! Very nice! You''re a natural! Or is this just something you do on a regular basis?"'
 		'After a few minutes, she allows you to get changed.'
 
-		gs 'arousal', 'bj', 10, 'sub', 'humiliation'
+		gs 'arousal', 'dildo_suck', 10, 'sub', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
 		
@@ -379,7 +387,7 @@ if $ARGS[0] = '4':
 		'You get down on your haunches, and obediently lick the dildo before taking it in your mouth. You look yourself in the eye the whole time as instructed, and are intrigued by the look... this must be what you look like when you suck a guy off. Rather fascinated by the concept, you try to do some different things with your lips, and test out a few facial expressions.'
 		'Hearing the whispers of your classmates suddenly remind you that you''re not alone here, there are a dozen girls watching you! Your face turns crimson red, and when Christina tells you can stop, you do so imediately, feeling deeply embarrassed.'
 
-		gs 'arousal', 'bj', 10, 'sub', 'humiliation'
+		gs 'arousal', 'dildo_suck', 10, 'sub', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Continue': gt 'gschool_lessons4', 'postphys2'
@@ -396,7 +404,7 @@ if $ARGS[0] = '5':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/christina/dildobj6.jpg"></center>'
 		'You move the dildo to your mouth, and slowly lick the head a few times. Urgh, this one tastes awful. Nevertheless, you don''t want to face the consequences for refusing so you open your mouth as wide as you can, and barely manage to get the dildo past your lips. It''s too big to go down your throat, so you spend the next few minutes licking it and sucking on the tip, while the girls encourage you. After a few minutes, Christina says you can stop.'
 
-		gs 'arousal', 'bj', 10, 'sub', 'humiliation'
+		gs 'arousal', 'dildo_suck', 10, 'sub', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Continue': gt 'gschool_lessons4', 'postphys2'
@@ -737,9 +745,14 @@ if $ARGS[0] = '15':
 end
 
 if $ARGS[0] = 'default':
-	'Christina grins as you walk up to her meekly, expecting your punishment: "Sorry bitch, I''m busy today. You''ll have to do without punishment this time."'
-	'She quickly gets dressed and leaves the locker room, and for a second you feel unsure as to what to do. The other girls of your class smirk at your behaviour; you''d gotten so used to Christina''s abuse, that you have no idea how to posture yourself when she''s not here. You''re deeply embarrassed when you try to imagine what they must think of you, and you do your best to ignore them.'
-
+	if christinaQW['subpath'] = 3:
+		christinaQW['subpath'] = 4
+		'Christina grins as you walk up to her meekly, expecting your punishment: "Sorry bitch, I''m busy right now. Meet me after school, we will continue this at my house."'
+		'She quickly gets dressed and leaves the locker room, and for a second you feel unsure as to what to do. The other girls of your class smirk at your behaviour; you''d gotten so used to Christina''s abuse, that you have no idea how to posture yourself when she''s not here. You''re deeply embarrassed when you try to imagine what they must think of you, and you do your best to ignore them.'
+	else
+		'Christina grins as you walk up to her meekly, expecting your punishment: "Sorry bitch, I''m busy today. You''ll have to do without punishment this time."'
+		'She quickly gets dressed and leaves the locker room, and for a second you feel unsure as to what to do. The other girls of your class smirk at your behaviour; you''d gotten so used to Christina''s abuse, that you have no idea how to posture yourself when she''s not here. You''re deeply embarrassed when you try to imagine what they must think of you, and you do your best to ignore them.'
+	end
 	act 'Continue': gt 'gschool_lessons4', 'postphys2'
 end
 

locations/gschool_grounds.qsrc

@@ -245,7 +245,8 @@ if $ARGS[0] = 'main':
 
 		if Enable_tablemap = 0:
 			if anushkaFirstvisit = 0 and meet_after_school = 1: '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka</a> is leaning against a tree just in front of the school.'
-			if LariskaQW['story'] >= 5 and cheerleaders_on = 0: '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
+			if LariskaQW['story'] >= 5 and cheerleaders_on = 0: 'You see <a href="exec:minut += 1 & gt ''LariskaGo''">Lariska</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
+			if christinaQW['subpath'] >= 4 and cheerleaders_on = 0: '<a href="exec:minut += 1 & gt ''Zvereva_house_events'', ''Chris_walk_home''">Christina Zvereva</a> is walking across the school courtyard, looking irritated.'
 			if JuliaMilLernQW >= 1: '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia</a> is sitting out on the courtyard, reading a book.'
 			if NatbelQW['QWstage'] > 0: '<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha</a> is standing in a corner.'
 			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1: '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem</a> is waiting for you near the school entrance.'
@@ -274,6 +275,7 @@ if $ARGS[0] = 'main':
 			st_count=0 & $show_table=''
 			if anushkaFirstvisit = 0 and meet_after_school = 1: gs 'show_table', '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a>', '5'
 			if LariskaQW['story'] >= 5 and cheerleaders_on = 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>', '5'
+			if christinaQW['subpath'] >= 4 and cheerleaders_on = 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''Zvereva_house_events'', ''Chris_walk_home''">Christina Zvereva</a>', '5'
 			if JuliaMilLernQW >= 1: gs 'show_table', '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a>', '5'
 			if NatbelQW['QWstage'] > 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a>', '5'
 			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem Chebotarev</a>', '5'
@@ -335,6 +337,8 @@ if $ARGS[0] = 'sports':
 	menu_off = 0
 	killvar '$locclass'
 	*clr & cla
+	gs 'family'
+	gs 'Zvereva_schedule'
 	gs 'stat'
 	if month > 3 and month < 11:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/field.jpg"></center>'
@@ -393,8 +397,6 @@ if $ARGS[0] = 'sports':
 		end
 	end
 
-	gs 'family'
-	
 	! Giving football preference, since there''s no indoor option for it.
 	if temper => 15 and sunWeather = 1 and hour > 8 and hour < 12 and week = 6 and fbpickupDay + 14 <= daystart and bbpickupDay ! daystart:
 		*nl
@@ -403,6 +405,8 @@ if $ARGS[0] = 'sports':
 		*nl
 		'As you pass by the sports field, you notice that most of the jocks have gathered around the <a href="exec: gt ''bbgameout'', ''start''">basketball court</a>.'
 	end
+
+	if chrisloc = 16: 'Christina and Lina are here, stretching for the race coming up.'
 end
 
 !!School building

locations/journal_quests.qsrc

@@ -53,7 +53,11 @@ if $ARGS[0] = 'start':
 					'I should wait and see what opportunities come up to get some dirt on Christina.'
 				end
 			else
-				if christinaQW['subpath'] >= 3:
+				if christinaQW['subpath'] >= 5:
+					'I followed Christina home. I can visit whenever I want for now, as long as I follow her rules. More will come, I''m sure. Once Alaratt stops slacking!'
+				elseif christinaQW['subpath'] = 4:
+					'Christina told me to follow her home after school, I should talk to her once school gets out.'
+				elseif christinaQW['subpath'] = 3:
 					'Christina owns me now. After gym class, she makes me do things in the showers. I am sure it''s only the beginning, too...'
 				elseif christinaQW['subpath'] = 2:
 					if christinaQW['fight'] = -1:

locations/pav_park.qsrc

@@ -14,6 +14,7 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	gs 'stat'
 	gs 'vicky_meynold_schedule'
+	gs 'Zvereva_schedule'
 
 	if sound = 0:
 		if month >=11 and month <= 12 or month >=1 and month <=3:
@@ -135,9 +136,7 @@ if $ARGS[0] = 'start':
 
 	if week >= 6 and hour >= 8 and hour <= 9 and mid($start_type,1,2) = 'sg' and socialchg['tVanya_day'] ! daystart: '<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'
 
-	if month > 8 and month < 6 and week < 6 and hour >= 16 and hour <= 20 and mid($start_type,1,2) = 'sg' and christinaQW['subpath'] = 0 and socialchg['tChris_Lina_jog'] ! daystart:
-		if rand(1,4) = 1:'You spot <a href="exec:gt ''Zvereva_events'',''Chris_Lina_park''">Christina</a> and Lina jogging around the park.'
-	end
+	if mid($start_type,1,2) = 'sg' and chrisloc = 9 and socialchg['tChris_Lina_jog'] ! daystart: 'You spot <a href="exec:gt ''Zvereva_events'',''Chris_Lina_park''">Christina</a> and Lina jogging around the park.'
 
 	act 'Go for a walk (0:15)':
 		menu_off = 1

locations/pav_residential.qsrc

@@ -124,14 +124,16 @@ if Enable_tablemap = 0:
 	if (igor_history = 1 or IgorLoverQW > 0 or IgorQW['house_open'] = 1) and IdorBlock = 0:'<a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>, one of your classmates, lives in one of the fancier houses in town.'
 	if katjaQW['QWstage'] >= 2 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: 'Nearby is a large house where the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a> live.'
 	if LariskaQW['story'] >= 6: '<a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''">Lariska Gruzdev</a>, one of your classmates, lives about 10 minutes away from your parents.'
+	if christinaQW['subpath'] >= 5: '<br><a href="exec: gt ''Zvereva_house'', ''front_door''">Christina</a> lives in an expensive house near here.'
 	if AlbinaQW['KnowsHouse'] = 1:'<a href="exec:minut += 10 & gt ''albinahome'',''gate''">Albina Barlovskaya</a>, one of your classmates, lives in one of the few luxurious mansions Pavlovsk has to offer.'
 else
 	st_count=0 & $show_table=''
-	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''dimaHome'', ''home''">Dimka Nosov</a>','3'
-	if (igor_history = 1 or IgorLoverQW > 0 or IgorQW['house_open'] = 1) and IdorBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>', '3'
+	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0: gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''dimaHome'', ''home''">Dimka Nosov</a>','3'
+	if (igor_history = 1 or IgorLoverQW > 0 or IgorQW['house_open'] = 1) and IdorBlock = 0: gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>', '3'
 	if katjaQW['QWstage'] >= 2 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: gs'show_table','The house of the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a>','3'
-	if LariskaQW['story'] >= 6:gs'show_table','House of <a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''" >Lariska Gruzdev</a> in the richer part of town','3'
-	if AlbinaQW['KnowsHouse'] = 1:gs'show_table','A luxurious mansion that''s home to <a href="exec:minut += 10 & gt ''albinahome'',''gate''">Albina Barlovskaya</a>','3'
+	if LariskaQW['story'] >= 6: gs'show_table','House of <a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''" >Lariska Gruzdev</a> in the richer part of town','3'
+	if christinaQW['subpath'] >= 5: gs'show_table','<br><a href="exec: gt ''Zvereva_house'', ''front_door''">Christina</a> lives in an expensive house near here.','3'
+	if AlbinaQW['KnowsHouse'] = 1: gs'show_table','A luxurious mansion that''s home to <a href="exec:minut += 10 & gt ''albinahome'',''gate''">Albina Barlovskaya</a>','3'
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 !!end of code changes.

locations/vann.qsrc

@@ -220,7 +220,7 @@ if $ARGS[0] = 'v3':
 			act 'Sit on the floor':
 				cla
 				*clr
-				gs 'arousal', 'facial', 1, 'sub', 'humiliation'
+				gs 'arousal', 'foreplay', 1, 'sub', 'humiliation'
 				gs 'arousal', 'end'
 				sexvolume = 10
 				spafinloc = 12