[changed] migrated all the family variables that control their locations to the locat array

glife.qproj

@@ -429,7 +429,6 @@
 		<Location name="sister_chat"/>
 		<Location name="sistersleep"/>
 		<Location name="sisterQW"/>
-		<Location name="family"/>
 		<Location name="ludahome"/>
 		<Location name="olu"/>
 		<Location name="brother"/>

locations/Komp.qsrc

@@ -657,7 +657,7 @@ if $ARGS[0] = 'startpagemfc':
 end
 
 if $ARGS[0] = 'waitclients':
-	gs'family'
+	gs 'family_schedule'
 	*clr & cla
 	minut += rand(1,4)
 	if mfccum > 0: mfcdaycum = daystart

locations/bed2.qsrc

@@ -507,7 +507,7 @@ if $ARGS[0] = 'wake_horny':
 end
 
 if $ARGS[0] = 'wake':
-	if mid($start_type,1,2) = 'sg' and indorf = 0 and motherQW['bathroom_dildos'] > 0 and MarishaQW["marisha_sleepover"] = 0:gt'mother_sextalk','dildo_wakeup1'
+	if mid($start_type,1,2) = 'sg' and locat['Fam_inGad'] = 0 and motherQW['bathroom_dildos'] > 0 and MarishaQW["marisha_sleepover"] = 0:gt'mother_sextalk','dildo_wakeup1'
 	menu_off = 1
 	InSleep = 1
 	gs 'stat'

locations/bedrPar.qsrc

@@ -140,7 +140,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		if npc_QW['A33'] > 10:npc_QW['A33'] = 10
 
-		if sister_indorf = 0:
+		if locat['Anya_Gad'] = 0:
 			if sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
 				*clr & cla
 				menu_off = 1

locations/bedrPar2.qsrc

@@ -13,16 +13,24 @@ if $ARGS[0] = '':
 	minut += 1
 	gs 'stat'
 	gs 'themes', 'indoors'
+	gs 'family_schedule'
 	'<center><h1><font color="maroon">Master bedroom</font></h1></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar2.jpg"></center>'
 	*nl
 	'The room in which your parents sleep. Their large bed, <a href="exec: gt ''bedrPar2'',''parents_wardrobe''">wardrobe</a> and other closets take up most of the space.'
-	gs 'family'
-	gs 'family_schedule'
+	if locat['Fam_inGad'] = 0:
+		if locat['Mother'] = 1 and locat['Stepdad'] = 1:
+			'Your <<$npc_nickname[''A29'']>> and stepfather are sleeping on the bed.'
+		elseif locat['Mother'] = 1:
+			'Your <<$npc_nickname[''A29'']>> is sleeping on the bed.'
+		elseif locat['Stepdad'] = 1:
+			'Your stepfather is sleeping on the bed.'
+		end
+	end
 
 	act 'Return to the hallway':gt 'korrPar'
 
-	if indorf = 1 or (indorf = 0 and hour > 6 and hour < 21):
+	if locat['Fam_inGad'] = 1 or (locat['Fam_inGad'] = 0 and hour > 6 and hour < 21):
 		if kamasutra_day ! daystart:
 			'You notice a <a href="exec: gt ''bedrPar2'',''kamasutra''">book laying on the bed</a>.'
 		end
@@ -81,7 +89,7 @@ end
 
 if $ARGS[0] = 'wardrobe_search':
 	*clr & cla
-	if indorf = 0 and (locat['Mother'] = 1 or locat['Mother'] = 3 or locat['Stepdad'] = 1 or locat['Stepdad'] = 2):
+	if locat['Fam_inGad'] = 0 and (locat['Mother'] = 1 or locat['Mother'] = 3 or locat['Stepdad'] = 1 or locat['Stepdad'] = 2):
 		'What are you thinking? You can''t go through the wardrobe while your parents are in the room!'
 		act 'Leave ': gt $loc, $loc_arg
 		exit

locations/brother.qsrc

@@ -204,7 +204,7 @@ if $ARGS[0] = 'start':
 		if npc_pregtalk['A34'] = 0: gs 'brother', 'pregreact'
 		gs 'brother', 'brotherSexCount'
 
-		if indorf = 0 and $clothingworntype ! 'nude' and brothersawpirsF=0 and locat['Stepdad'] ! 10 and npc_rel['A34'] > 85 and hour >= 18 and hour < 23 and pirsF > 0:
+		if locat['Fam_inGad'] = 0 and $clothingworntype ! 'nude' and brothersawpirsF=0 and locat['Stepdad'] ! 10 and npc_rel['A34'] > 85 and hour >= 18 and hour < 23 and pirsF > 0:
 			act 'Show off your nipple piercings':
 				*clr & cla
 				gs 'stat'
@@ -232,7 +232,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if indorf = 0 and $clothingworntype = 'nude' and pirsF > 0 and brothersawpirsF = 0:
+		if locat['Fam_inGad'] = 0 and $clothingworntype = 'nude' and pirsF > 0 and brothersawpirsF = 0:
 			if brotherSex < 4:
 				if npc_rel['A34'] >= 70:
 					'"Looks good on you," your brother winks, and points toward your pierced nipples.'
@@ -267,7 +267,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if indorf = 0 and brotherSexCount > 0 and brotherDay = daystart:
+		if locat['Fam_inGad'] = 0 and brotherSexCount > 0 and brotherDay = daystart:
 			brotherrand = rand(0,10)
 			if hour < 6:
 				'You look at your brother sleeping peacefully on the couch.'
@@ -357,6 +357,16 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'bro_school_field':
+	if $loc = 'gschool_grounds':
+		if week = 5 and locat['Kolka'] = 6:
+			'You wonder if your <a href="exec:gt ''brother'', ''start''">brother</a> is one of the kids yelling.'
+		elseif (week < 6 and locat['Kolka'] = 6) or ((week >= 6 or kanikuli > 0) and locat['Kolka'] = 9):
+			'You see your <a href="exec:gt ''brother'', ''start''">brother</a> play football by the field near the school.'
+		end
+	end
+end
+
 if $ARGS[0] = 'playfootball':
 	if playfootball = 0:
 		*clr & cla

locations/cafe_parco.qsrc

@@ -41,11 +41,7 @@ if $args[0]= 'inner':
 		act 'Perform at the cafe': gt 'music_delparco', 'eveningshow'
 	end
 	
-	if LariskaQW['story'] = 12 and week = 6:
-		act 'Join Lariska and Lev': gt 'lariska_storyline','Boyfriend_3'
-	end
-
-	gs 'family'
+	if LariskaQW['story'] = 12 and week = 6: act 'Join Lariska and Lev': gt 'lariska_storyline','Boyfriend_3'
 
 	if (sunWeather = 0 or temper < 5) and week mod 2 = 0 and (hour >= 14 and hour < 20) and mey_vika_qw_day ! daystart:
 		mey_vika_qw_day = daystart

locations/din_van.qsrc

@@ -195,7 +195,7 @@ $shower = {
 			*nl
 			'In your absentmindedness, you have forgotton to close the door.'
 			'The idea that the door is open occupies your mind while you are showering. It would be very embarrassing if your brother or stepfather looked in at the wrong time.'
-			if indorf = 0: gs 'vanrPar', 'peek'
+			if locat['Fam_inGad'] = 0: gs 'vanrPar', 'peek'
 		end
 	end
 	killvar 'noShampoo_tmp'

locations/family.qsrc

@@ -1,169 +0,0 @@
-# family
-
-sisterAge = year - ((npc_dob['A33'] - (npc_dob['A33'] mod 10000)) / 10000)
-gs 'family_schedule'
-
-if daystart ! m_day:
-	m_day = daystart
-	father_go = 0
-	mother_go = rand(0,1)
-end
-
-indorf = 0
-!brother or father are in the livign room
-ocpd_room = 0
-
-if indorf_month ! month and week ! 7 and week ! 1:
-	!!monthly
-	indorf_month = month
-	dostupindorf = 1
-end
-
-if week = 1 and dostupindorf = 1:dostupindorf = 0
-
-if dostupindorf = 1 and ((week = 6 and hour >= 12) or (week = 7 and hour < 20)):
-	!!go to the village
-	indorf = 1
-	father_go = 0
-	mother_go = 0
-end
-
-if indorf = 1 and sister_opr_indorf = 0:
-	sister_opr_indorf = 1
-	sister_indorf = rand(0, 1)
-end
-
-if indorf = 0:
-	sister_opr_indorf = 0
-	sister_indorf = 0
-end
-if sisboyparty_day + 1 = daystart:sister_indorf = 0
-*nl
-
-if mid($start_type,1,2) = 'sg':
-	if sisboyparty_day + 1 = daystart and hour > 18 and sisboypartyQW = 1:
-		if sisboyparty = 1: sisboyparty = -1
-		if sisboyparty = 2:
-			*clr & cla
-			menu_off = 1
-			minut += 5
-			sisboyparty = -1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_7.jpg"></center>'
-			'You forgot to go to Rexs'' birthday party.'
-			'You brush it off thinking, '+$OpenInnerThought+'Oh well, hopefully he won''t be offended.'+$CloseInnerThought
-			act 'Move away':gt $loc, $loc_arg
-			exit
-		end
-	end
-
-	if sister_indorf = 0 and $loc = 'pav_commcenter' and locat['Anya'] = 10:
-		'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
-	end
-
-	if indorf = 0:
-		if $loc = 'bedrPar2':
-			if locat['Mother'] = 1 and locat['Stepdad'] = 1:
-				'Your <<$npc_nickname[''A29'']>> and stepfather are sleeping on the bed.'
-			elseif locat['Mother'] = 1:
-				'Your <<$npc_nickname[''A29'']>> is sleeping on the bed.'
-			elseif locat['Stepdad'] = 1:
-				'Your stepfather is sleeping on the bed.'
-			end
-		end
-
-		if $loc = 'sitrPar' or ($loc = 'family' and $loc_arg = 'sofa'):
-			if locat['Kolka'] = 2 and brothermorningsex = daystart:
-				ocpd_room = 1
-				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is getting ready for school.'
-			elseif locat['Kolka'] = 1:
-				ocpd_room = 1
-				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the sofa.'
-			elseif locat['Kolka'] = 7:
-				ocpd_room = 1
-				'Your little brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
-			elseif locat['Kolka'] = 11:
-				ocpd_room = 1
-				if locat['Mother'] = 19 and locat['Stepdad'] = 10:
-					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
-				elseif locat['Mother'] = 19:
-					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
-				elseif locat['Stepdad'] = 10:
-					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
-				else
-					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, playing video games.'
-				end
-			end
-
-			if locat['Stepdad'] = 10:
-				ocpd_room = 1
-				if locat['Mother'] = 19:
-					''
-				else
-					'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
-				end
-			end
-		end
-
-		if $loc = 'gschool_grounds':
-			if week = 5 and locat['Kolka'] = 6:
-				'You wonder if your <a href="exec:gt ''brother'', ''start''">brother</a> is one of the kids yelling.'
-			elseif (week < 6 and locat['Kolka'] = 6) or ((week >= 6 or kanikuli > 0) and locat['Kolka'] = 9):
-				'You see your <a href="exec:gt ''brother'', ''start''">brother</a> play football by the field near the school.'
-			end
-		end
-	end
-end
-
-if $loc = 'sitrPar': act 'Sit on the sofa':gt 'family', 'sofa'
-
-if $loc = 'sitrPar' and ocpd_room = 0 and locat['Mother'] ! 24 and locat['Mother'] ! 19:
-	'No one else is here right now, so you''re free to use the room how you like.'
-	gs 'exercise','start'
-end
-
-if $ARGS[0]='sofa':
-	$menu_loc = 'family'
-	$menu_arg = 'sofa'
-	menu_off = 0
-	$loc_arg = 'sofa'
-	$loc = 'family'
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sofa.jpg"></center>'
-	''
-	'<center>A small sofa bed, when not folded out into a bed, is just big enough for you to curl up on and take a nap.</center>'
-	''
-	act 'Watch TV':gt 'TV','pav'
-
-	if ocpd_room = 0 and pornMagazine > 0:
-		'<br>There is a porn magazine under the sofa cushions'
-		gs 'events', 'read_porn'
-		if pcs_horny >= 50:
-			act 'Masturbate':gt 'selfplay', 'start'
-		end
-	end
-
-	gs 'events', 'read'
-	gs 'family'
-
-	if ocpd_room = 0:
-		act 'Take a nap (1:00)':
-			if pcs_sleep < 90:
-				pcs_sleep += 10
-				pcs_health += 5
-				minut += 60
-				gs 'stat'
-				'You sleep about an hour.'
-			else
-				minut += 5
-				gs 'stat'
-				'You are not tired enough to sleep, even for a short nap.'
-			end
-		end
-	end
-	act 'Get up':gt 'sitrPar'
-end
-
---- family ---------------------------------
-

locations/family_schedule.qsrc

@@ -1,6 +1,7 @@
 # family_schedule
 !! 2022/06/04 - Alaratt
 
+
 locat['Anya'] = 0
 locat['Anya_athome'] = 0
 locat['Anya_inroom'] = 0
@@ -11,13 +12,41 @@ locat['sdad_athome'] = 0
 locat['Kolka'] = 0
 locat['Kolka_athome'] = 0
 
+!!---Gad_decide---------------------------------
+
+if locat['Fam_month_inGad'] ! month and week ! 7 and week ! 1:
+	!!monthly
+	locat['Fam_month_inGad'] = month
+	locat['Fam_set_month_inGad'] = 1
+end
+
+if week = 1 and locat['Fam_set_month_inGad'] = 1: locat['Fam_set_month_inGad'] = 0
+
+if locat['Fam_set_month_inGad'] = 1 and ((week = 6 and hour >= 12) or (week = 7 and hour < 21)):
+	!!go to the village
+	locat['Fam_inGad'] = 1
+else
+	locat['Fam_inGad'] = 0
+end
+
+if locat['Fam_inGad'] = 1 and locat['Anya_check_Gad'] = 0:
+	locat['Anya_check_Gad'] = 1
+	locat['Anya_Gad'] = rand(0, 1)
+end
+
+if locat['Fam_inGad'] = 0:
+	locat['Anya_check_Gad'] = 0
+	locat['Anya_Gad'] = 0
+end
+if sisboyparty_day + 1 = daystart: locat['Anya_Gad'] = 0
 
 !!---ANYA---------------------------------------
-!! sister_indorf = 1 means Anya is in the village
+
+!! locat['Anya_Gad'] = 1 means Anya is in the village
 !! locat['Anya_athome'] = 1 means Anya is at home, awake, and not in an event (like having sex with Roma)
 !! locat['Anya_inroom'] = 1 means Anya is actually in the room, so masturbating while she is in the shower is possible
 !! unused - 6, 18, 19, 20, 22, 25, 27+
-if sister_indorf = 0:
+if locat['Anya_Gad'] = 0:
 	if week <= 5:
 		if (hour < 6) or (hour = 6 and minut < 45):
 			!!Asleep
@@ -40,7 +69,7 @@ if sister_indorf = 0:
 			locat['Anya_athome'] = 1
 			locat['Anya_inroom'] = 1
 		elseif hour = 8 and minut < 20:
-			!!Shower*
+			!!Shower
 			locat['Anya'] = 5
 			locat['Anya_athome'] = 1
 			locat['Anya_inroom'] = 0
@@ -233,11 +262,16 @@ end
 
 !!---MOM--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
+if locat['Mom_cafesex_daystart'] ! daystart:
+	locat['Mom_cafesex_daystart'] = daystart
+	locat['Mom_cafe_sex'] = rand(0, 1)
+end
+
 !!locat['Mom_Salon_daystart'] = daystart check in salon
-!!indorf = 1 means mom is in the village
+!!locat['Fam_inGad'] = 1 means mom is in the village
 !!locat['Mom_athome'] = 1 means mom is at home and awake
 !!unused number - 22, 27+
-if indorf = 0:
+if locat['Fam_inGad'] = 0:
 	if week <= 5:
 		if hour < 5 or (hour = 5 and minut < 30):
 			!!Asleep
@@ -467,8 +501,8 @@ if indorf = 0:
 end
 
 !!----STEPFATHER------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-!!indorf = 1 means stepdad is in the village
-if indorf = 0:
+!!locat['Fam_inGad'] = 1 means stepdad is in the village
+if locat['Fam_inGad'] = 0:
 	if week <= 5:
 		if hour < 6 or (hour = 6 and minut < 10):
 			!! Asleep
@@ -600,8 +634,8 @@ if indorf = 0:
 end
 
 !!---KOLKA------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-!!indorf = 1 means kolka is in the village
-if indorf = 0:
+!!locat['Fam_inGad'] = 1 means kolka is in the village
+if locat['Fam_inGad'] = 0:
 	if week <= 5:
 		if hour < 6 or (hour = 6 and minut < 45):
 			if brothermorningsex ! daystart:
@@ -723,4 +757,5 @@ if indorf = 0:
 	end
 end
 
+
 --- family_schedule ---------------------------------

locations/gadbana.qsrc

@@ -118,12 +118,12 @@ if mira_guest = 0:
 	end
 	*nl
 
-	if shampoo > 0 or (indorf = 1 and home_owned[2] = 1):
+	if shampoo > 0 or (locat['Fam_inGad'] = 1 and home_owned[2] = 1):
 		act 'Wash your body (0:25)':
 			*clr & cla
 			menu_off = 1
 			minut += 25
-			if indorf = 1 and home_owned[2] = 1: noShampoo = 1
+			if locat['Fam_inGad'] = 1 and home_owned[2] = 1: noShampoo = 1
 			dynamic $showerdin
 			if frost > 0:frost = 0
 			!!gs 'clothing', 'strip', 'gadbana'

locations/gadhouse.qsrc

@@ -299,6 +299,7 @@ if $ARGS[0] = 'main':
 	$menu_arg = 'main'
 	menu_off = 0
 	*clr & cla
+	gs 'family_schedule'
 	gs 'stat'
 	'<center><H4>Your Grandparents'' Cottage</H4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
@@ -1430,9 +1431,9 @@ end
 
 if $ARGS[0] = 'family_trip':
 	! family comes to visit first weekend of each month from Saturday at 1200 to Sunday at 2100
-	if week = 6 and hour > 12 and family_trip_month ! month: indorf = 1
+	if week = 6 and hour > 12 and locat['Fam_month_inGad'] ! month: locat['Fam_inGad'] = 1
 
-	if indorf = 1:
+	if locat['Fam_inGad'] = 1:
 		'Your parents are relaxing inside.'
 
 		gs 'mother', 'check_workout'
@@ -1440,7 +1441,7 @@ if $ARGS[0] = 'family_trip':
 		if gadstay_day ! daystart and home_owned[2] = 1:
 			if week = 7:
 				if hour = 20:
-					family_trip_month = month
+					locat['Fam_month_inGad'] = month
 					if (kanikuli = 4 or kanikuli = 5) and ((month = 6 or month = 7) or (month = 8 and day <= 25)):
 						*clr & cla
 						menu_off = 1
@@ -1449,13 +1450,13 @@ if $ARGS[0] = 'family_trip':
 						*nl
 						'<<$npc_nickname[''A29'']>> asks you "Well, <<$pcs_nickname>>, are you coming home with us or are you going to stay in the village with your grandparents?"'
 
-						act 'Stay with your grandaparents':gadstay_day = daystart & gadstay = 1 & indorf = 0 & gt 'gadhouse', 'main'
+						act 'Stay with your grandaparents':gadstay_day = daystart & gadstay = 1 & locat['Fam_inGad'] = 0 & gt 'gadhouse', 'main'
 						act 'Go home to Pavlovsk': gt 'gadhouse', 'to_pavlovsk'
 					else
 						act 'Go home to Pavlovsk': gt 'gadhouse', 'to_pavlovsk'
 					end
 				elseif hour > 20:
-					family_trip_month = month
+					locat['Fam_month_inGad'] = month
 				end
 			end
 		end
@@ -1466,7 +1467,7 @@ if $ARGS[0] = 'to_pavlovsk':
 	menu_off = 1
 	*clr & cla
 	gadstay = 0
-	indorf = 0
+	locat['Fam_inGad'] = 0
 	minut += rand(15,25)
 	gs 'stat'
 
@@ -1491,7 +1492,7 @@ end
 if $ARGS[0] = 'to_gadukino':
 	menu_off = 1
 	*clr & cla
-	indorf = 1
+	locat['Fam_inGad'] = 1
 	minut += rand(15,25)
 	gs 'stat'
 

locations/gkafe.qsrc

@@ -9,7 +9,6 @@ if $ARGS[0] = '':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	gs 'stat'
-	gs 'family'
 	gs 'family_schedule'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
@@ -19,7 +18,7 @@ if $ARGS[0] = '':
 
 	act 'Leave':gt 'pav_market'
 
-	if (locat['Mother'] = 7 or locat['Mother'] = 9) and hour = 16 and indorf = 0 and mother_go = 1:
+	if (locat['Mother'] = 7 or locat['Mother'] = 9) and hour = 16 and locat['Fam_inGad'] = 0 and locat['Mom_cafe_sex'] = 1:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
 		*nl
@@ -50,7 +49,7 @@ if $ARGS[0] = '':
 				act 'Keep looking':
 					*clr & cla
 					minut += 5
-					mother_go = 0
+					locat['Mom_cafe_sex'] = 0
 					if slavatalk = 1 and pcafejob > 0: slavatalk = 2
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/event/momslut2.jpg"></center>'

locations/gschool_grounds.qsrc

@@ -403,7 +403,7 @@ if $ARGS[0] = 'sports':
 		'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
 
-	gs 'family'
+	gs 'brother', 'bro_school_field'
 	if locat['Christina'] = 16: 'Christina and Lina are here, stretching for the race coming up.'
 end
 

locations/intro_sg_select.qsrc

@@ -164,7 +164,7 @@ if $ARGS[0] = 'SGStart2':
 			week = 3
 			kanicont = 92
 			Gspassed = 1
-			dostupindorf = 1
+			locat['Fam_set_month_inGad'] = 1
 			gt 'intro_sg_select', 'SGStart3'
 		end
 	end

locations/intro_sg_tg.qsrc

@@ -603,7 +603,7 @@ if $ARGS[0] = 'intro_9':
 																	week = 3
 																	kanicont = 92
 																	Gspassed = 1
-																	dostupindorf = 1
+																	locat['Fam_set_month_inGad'] = 1
 																	gt 'intro_sg_tg', 'intro_end'
 																end
 															end

locations/korrPar.qsrc

@@ -27,7 +27,6 @@ bonusZ = 0
 display_bb = 0
 gs 'stat'
 gs 'themes', 'indoors'
-gs 'family'
 gs 'family_schedule'
 
 '<center><h1><font color="maroon">Corridor</font></h1></center>'
@@ -38,15 +37,12 @@ gs 'family_schedule'
 'A <a href="exec:gt ''mirror'', ''start''">mirror</a> hangs on the wall near the front door.'
 *nl
 
-if indorf = 1:'With your parents away visiting your grandparents, the apartment seems quiet and empty.'
+if locat['Fam_inGad'] = 1:'With your parents away visiting your grandparents, the apartment seems quiet and empty.'
 
 if courtletter_date <= daystart and courtletter_date ! 0: gt 'sentence', 'letter'
 
 if (hour ! 16 or hour ! 17) and blockBedrPar = 1:blockBedrPar = 0
 
-
-!!Her room isn''t on the cleaning list yet
-!!if (locat['Mother'] = <number for cleaning her room> ) and motherQW['con_steal_hear'] + 4 < daystart and prezikday + 4 < daystart and rand(1,4) = 1: gt 'mother', 'condom_steal', 'hear'
 if locat['Mother'] = 1 and hour = 22 and minut < 30 and motherQW['con_steal_talk'] + 4 < daystart and prezikday + 4 < daystart and rand(1,5) = 1: gt 'mother', 'condom_steal', 'talk'
 
 act '<b>Leave and go to the stairwell</b>':
@@ -168,7 +164,7 @@ end
 
 $korrParMomHeader = '<center><h1><font color="maroon"><<$npc_nickname[''A29'']>></font></h1></center><center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center><br />'
 
-if hour >= 16 and hour <= 20 and indorf = 0:
+if hour >= 16 and hour <= 20 and locat['Fam_inGad'] = 0:
 	if artemvbrosvid = 1 and artemhakday ! daystart and npc_QW['A29'] < 2 and mothervideotalk = 0 or BrotherNo = 1 and BrotherNoDay ! daystart:
 		*clr & cla
 		menu_off = 1
@@ -440,9 +436,9 @@ else
 	if Gcall > 0:Gcall = 0
 end
 
-if motherWorry = 1 and indorf = 0:
+if motherWorry = 1 and locat['Fam_inGad'] = 0:
 	gt'mother'
-elseif motherWorry = 1 and indorf > 0:
+elseif motherWorry = 1 and locat['Fam_inGad'] > 0:
 	motherWorry = 0
 end
 

locations/kuhrPar.qsrc

@@ -50,13 +50,13 @@ if locat['Mother'] = 4:
 	end
 end
 
-if (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15) and week < 6 and indorf = 0:
+if (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15) and week < 6 and locat['Fam_inGad'] = 0:
 	'<a href="exec:gt''father''">Your stepfather</a><<$mombreak>>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. You could sit down and join them for breakfast or just grab something and go.'
-elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15) and week > 5 and indorf = 0:
+elseif (hour = 6 and minut >= 45) or (hour = 7 and minut <= 15) and week > 5 and locat['Fam_inGad'] = 0:
 	'<a href="exec:gt''father''">Your stepfather</a><<$mombreak>>, and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. It seems your sister is sleeping in again. You could sit down and join them for breakfast or just grab something and go.'
-elseif hour = 18 and minut <= 30 and indorf = 0 and locat['Anya'] = 12:
+elseif hour = 18 and minut <= 30 and locat['Fam_inGad'] = 0 and locat['Anya'] = 12:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
-elseif hour = 18 and minut <= 30 and indorf = 0:
+elseif hour = 18 and minut <= 30 and locat['Fam_inGad'] = 0:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
 else
 	'The kitchen is not very impressive, but it has everything your family needs. Since everyone can''t always join for family meals, your <<$npc_nickname[''A29'']>> usually pre-cooks some meals and stores them in the fridge. Of course, you could also just have a snack if you''re not that hungry.'
@@ -72,9 +72,9 @@ if locat['Mother'] = 23: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29
 if locat['Stepdad'] = 4: '<a href="exec:gt''father''">Your stepfather</a> is here reading the paper.'
 if locat['Stepdad'] = 7: '<a href="exec:gt''father''">Your stepfather</a> is here setting the table for dinner.'
 
-if week = 6 and dostupindorf = 1 and grandmaQW['block'] = 0 and hour > 9 and hour < 12:'Your parents are getting ready to go to <a href="exec:gt ''gadhouse'', ''to_gadukino''">Gadukino</a> to visit your great grandparents. You can go with them if you want, or stay home like Anya usually does.'
+if week = 6 and locat['Fam_set_month_inGad'] = 1 and grandmaQW['block'] = 0 and hour > 9 and hour < 12:'Your parents are getting ready to go to <a href="exec:gt ''gadhouse'', ''to_gadukino''">Gadukino</a> to visit your great grandparents. You can go with them if you want, or stay home like Anya usually does.'
 
-if (hour = 6 and minut >= 45) or (hour = 7 and minut < 15) and breakfast_day ! daystart and indorf = 0: 
+if (hour = 6 and minut >= 45) or (hour = 7 and minut < 15) and breakfast_day ! daystart and locat['Fam_inGad'] = 0: 
 	if PCloswimwear ! 1 and $clothingworntype ! 'nude':
 		act 'Eat breakfast with your family (0:20)': 
 			*clr & cla
@@ -117,7 +117,7 @@ if (hour = 6 and minut >= 45) or (hour = 7 and minut < 15) and breakfast_day ! d
 			end
 		end		
 	end
-elseif hour = 18 and minut <= 30 and dinner_day ! daystart and indorf = 0: 
+elseif hour = 18 and minut <= 30 and dinner_day ! daystart and locat['Fam_inGad'] = 0: 
 	if PCloswimwear ! 1 and $clothingworntype ! 'nude':
 		act 'Eat dinner with your family (0:20)': 
 			*clr & cla
@@ -170,7 +170,7 @@ elseif hour = 18 and minut <= 30 and dinner_day ! daystart and indorf = 0:
 		end		
 	end
 else
-	if (hour = 8 or (hour = 7 and indorf = 1)) and breakfast_day ! daystart:
+	if (hour = 8 or (hour = 7 and locat['Fam_inGad'] = 1)) and breakfast_day ! daystart:
 		act 'Eat breakfast alone (0:20)':
 			*clr & cla
 			menu_off = 1

locations/mother.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = '':
 
 	act 'Move away from her': gt $loc, $loc_arg
 
-	if motherWorry = 1 and indorf = 0:
+	if motherWorry = 1 and locat['Fam_inGad'] = 0:
 		motherWorry = 0
 		gs 'npc_relationship', 'modify', 'A29', 'dislike'
 		delin_beh += 1 &!counter for getting sent to Gadukino for the summer
@@ -41,7 +41,7 @@ if $ARGS[0] = '':
 		else
 			'Your <<$npc_nickname[''A29'']>> is still awake, waiting for you to come home. Hearing the front door, she comes to the hallway and scolds you: "Where the hell have you been <<$pcs_nickname>>? You shouldn''t be out this late!"'
 		end
-	elseif motherWorry = 1 and indorf > 0:
+	elseif motherWorry = 1 and locat['Fam_inGad'] > 0:
 		motherWorry = 0
 	end
 
@@ -689,9 +689,9 @@ if $ARGS[0] = '':
 
 	if ($clothingworntype = 'moncheri_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'fashionista') and hour > 9:'Your <<$npc_nickname[''A29'']>> looks a bit puzzled at your fancy clothes: "Well well, look at you... why are you so dressed up? Big plans today?"'
 
-	if week = 5 and dostupindorf = 1 and grandmaQW['block'] = 0:
+	if week = 5 and locat['Fam_set_month_inGad'] = 1 and grandmaQW['block'] = 0:
 		if hour > 9:'While your <<$npc_nickname[''A29'']>> is working on some meals in the kitchen, she remembers something and looks at you: "Oh <<$pcs_nickname>>, while you''re here... we''re going to visit your grandparents in Gadukino tomorrow. We leave at noon (12:00) tomorrow, so if you want to come along you should meet me in the kitchen before then."'
-	elseif week = 6 and dostupindorf = 1 and grandmaQW['block'] = 0:
+	elseif week = 6 and locat['Fam_set_month_inGad'] = 1 and grandmaQW['block'] = 0:
 		if hour > 9 and hour < 12:
 			'Your <<$npc_nickname[''A29'']>> is finishing up on some meals before leaving for Gadukino and puts down her work for a second. "<<$pcs_nickname>>, well? Do you want to come with us to Gadukino or would you rather stay home with Anya?"'
 

locations/pav_commcenter.qsrc

@@ -7,6 +7,7 @@ menu_off = 0
 $loc_arg = ''
 $loc = 'pav_commcenter'
 $location_type = 'public_outdoors'
+gs 'family_schedule'
 gs 'stat'
 
 if $ARGS[0] ! 'XXX':
@@ -64,7 +65,7 @@ if $ARGS[0] ! 'XXX':
 
 	act 'Wait': gs 'obj_din', 'wait'
 
-	gs 'family'
+	if locat['Anya'] = 10: 'Your sister <a href="exec:gt ''sister'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
 	gs 'stat'	
 end
 

locations/pav_market.qsrc

@@ -282,8 +282,6 @@ if kidalob = 0:
 	end
 end
 
-gs 'family'
-
 act 'Go to the train station (0:03)': minut += 3 & gt 'pav_train_hall'
 if Trainpass_day > daystart:
 	'You have <<Trainpass_day - daystart>> days left on your train pass.'

locations/rex_party_smallEvents.qsrc

@@ -145,7 +145,7 @@ if $ARGS[0] = 'sleep':
 			'After everything that happened tonight, you feel exhausted and fall asleep. You have a dream about being impaled on a stake for all your sins but surprisingly, instead of hurting, it actually feels wonderful.'               
 		end
 	end
-	if (indorf = 0):
+	if locat['Fam_inGad'] = 0:
 		''
 		'After sleeping for some time, you are suddenly awakened by someone yelling at you to wake up while they slap you.'
 		act 'Wake up':

locations/saveupdater.qsrc

@@ -1169,22 +1169,40 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	!!Schedule migrated to the array, no need to change first
 	killvar 'chrisloc'
 	killvar 'lariloc'
-	killvar 'momloc'
-	killvar 'sdadloc'
 	killvar 'anyaloc'
 	killvar 'kolloc'
-	if momclean1 > 0:
-		locat['Mother_clean1'] = momclean1
-	end
-	if momclean2 > 0:
-		locat['Mother_clean2'] = momclean2
-	end
+	killvar 'sdadloc'
+	killvar 'father_go'
+	killvar 'momloc'
 	killvar 'momclean1'
 	killvar 'momclean2'
-	!!if indorf > 0:
-	!!	locat['Fam_inGad'] = indorf
-	!!end
-	!!killvar 'indorf'
+	if mother_go > 0:
+		locat['Mom_cafe_sex'] = mother_go
+	end
+	killvar 'm_day'
+	killvar 'mother_go'
+	killvar 'ocpd_room'
+	
+	if indorf > 0:
+		locat['Fam_inGad'] = indorf
+	end
+	if indorf_month = month:
+		locat['Fam_month_inGad'] = indorf_month
+	end
+	if dostupindorf > 0:
+		locat['Fam_set_month_inGad'] = dostupindorf
+	end
+	killvar 'indorf'
+	killvar 'indorf_month'
+	killvar 'dostupindorf'
+	if sister_indorf > 0:
+		locat['Anya_Gad'] = sister_indorf
+	end
+	if sister_opr_indorf > 0:
+		locat['Anya_check_Gad'] = sister_opr_indorf
+	end
+	killvar 'sister_indorf'
+	killvar 'sister_opr_indorf'
 
 	if workKafe = 1:
 		workKafe = 0

locations/selfplay.qsrc

@@ -384,7 +384,7 @@ if $ARGS[0] = 'shower_bathtub_suction_dildo_ride':
 		if $loc = 'vanrPar':
 			'<i>Haahhh~! Hhhh~! Mmmm~! Unnnh~!</i>'
 			*nl
-			if indorf = 1:
+			if locat['Fam_inGad'] = 1:
 				'Your cries of pleasure echo off the walls of the bathroom as you ride your dildo, thoroughly enjoying yourself and the fact that your family is gone for the weekend.'
 				$orgasm_txt = 'Pleasure and heat build between your legs until finally you slam yourself all the way down onto your dildo and climax hard all over it. Your walls squeeze tight and you can feel the entire shape of the rubber cock inside you. Gasping, quivering, and clenching, you cry out loudly and ride out your orgasm while your voice echos back at you off the walls.'
 			else
@@ -453,7 +453,7 @@ if $ARGS[0] = 'bath_bathtub_suction_dildo_ride':
 		if $loc = 'vanrPar':
 			'<i>Haahhh~! Hhhh~! Unnnh~! Unnnh~! Ahhh~!</i>'
 			*nl
-			if indorf = 1:
+			if locat['Fam_inGad'] = 1:
 				'You bounce up and down on your dildo, creating sloshes in the bathwater with your motion and moaning loudly, taking advantage of the fact your family is gone for the weekend.'
 				$orgasm_txt = 'Pleasure and heat build between your legs until finally you slam yourself all the way down onto your dildo and climax hard all over it. Your walls squeeze tight and you can feel the entire shape of the rubber cock inside you. Legs shaking and splashing bathwater everywhere, you ride out your orgasm while impaled on your dildo, crying out in a loud voice that echos off the bathroom walls.'
 			else
@@ -470,7 +470,7 @@ if $ARGS[0] = 'bath_bathtub_suction_dildo_ride':
 		end
 	else
 		if $loc = 'vanrPar':
-			if indorf = 1:
+			if locat['Fam_inGad'] = 1:
 				'<i>Ahh~! Aaahhhh~! Ahhhh~! Aaaaahhhh~!</i>'
 				*nl
 				'You continue bouncing up and down on your dildo, unwilling to finish your shower while you''re still enjoying yourself. Maybe it''s just the steam in the room but your body feels like it''s on fire right now and you can''t help but cry out loudly, so happy your family is gone for the weekend.'
@@ -533,7 +533,7 @@ if $ARGS[0] = 'shower_bathtub_wall_dildo_fuck':
 		if $loc = 'vanrPar':
 			'Using the wall of the tub as leverage, you breathe hard as you push your ass back and forth on the dildo mounted on the wall. Hot water from the shower rains down and steam fills the air and you to play tag with the bathtub wall, repeatedly tapping it with the back of your ass while your pussy gets stuffed with rubber.'
 			*nl
-			if indorf = 1:
+			if locat['Fam_inGad'] = 1:
 				'<b>thump</b><b>thump</b><b>thump</b><b>thump'
 				*nl
 				'<i>Ahh~! Aaahhhh~! Ahhhh~! Aaaaahhhh~!</i>'
@@ -559,7 +559,7 @@ if $ARGS[0] = 'shower_bathtub_wall_dildo_fuck':
 		end
 	else
 		if $loc = 'vanrPar':
-			if indorf = 1:
+			if locat['Fam_inGad'] = 1:
 				'<b>thump</b><b>thump</b><b>thump</b><b>thump'
 				*nl
 				'<i>Ahh~! Aaahhhh~! Ahhhh~! Aaaaahhhh~!</i>'
@@ -653,9 +653,9 @@ if $ARGS[0] = 'sis_prov':
 	$AnyaMsg = ''
 
 	if $loc = 'bedrPar':
-		gs 'family'
+		gs 'family_schedule'
 
-		if sister_indorf = 0:
+		if locat['Anya_Gad'] = 0:
 			if locat['Anya_inroom'] = 0 and proverkasisterhere = 0:proverkasisterhere = 1
 
 			if locat['Anya_inroom'] = 1:
@@ -681,7 +681,7 @@ end
 
 ! WD: Masturbating at night only has 10% chance to be discovered
 if $ARGS[0] = 'van_vtor':
-	if indorf = 0 and (hour >= 6 or Rand(1, 10) = 1):
+	if locat['Fam_inGad'] = 0 and (hour >= 6 or Rand(1, 10) = 1):
 		cls
 		pcs_horny -= 50
 		pcs_mood -= 10

locations/shulgahall.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = '':
 	end
 
 	if momslut >= 1 and sexev_momgg_day ! daystart:
-		if indorf = 0 and hour < 23 and ((week < 6 and hour >= 15) or (week >= 6 and hour >= 10)):
+		if locat['Fam_inGad'] = 0 and hour < 23 and ((week < 6 and hour >= 15) or (week >= 6 and hour >= 10)):
 			if rand(1,5) = 1:
 				if rand(1,10) < 6:
 					'You hear some strange sounds coming from uncle Sergey''s room. You could go <a href="exec: gt ''shulgahall'',''shulga_home_momgg1''">see</a> what''s causing them.'

locations/sister.qsrc

@@ -17,6 +17,21 @@ exit
 end
 
 if $ARGS[0] = 'pav_commcenter':
+	if sisboyparty_day + 1 = daystart and hour > 18 and sisboypartyQW = 1:
+		if sisboyparty = 1: sisboyparty = -1
+		if sisboyparty = 2:
+			*clr & cla
+			menu_off = 1
+			minut += 5
+			sisboyparty = -1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_7.jpg"></center>'
+			'You forgot to go to Rexs'' birthday party.'
+			'You brush it off thinking, '+$OpenInnerThought+'Oh well, hopefully he won''t be offended.'+$CloseInnerThought
+			act 'Move away':gt $loc, $loc_arg
+			exit
+		end
+	end
 	*clr & cla
 	if npc_rel['A33'] < 20:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'

locations/sister_chat.qsrc

@@ -584,7 +584,7 @@ if $ARGS[0] = 'sister_chat':
 			act 'Chat': gt 'sister_chat', 'sister_chat'
 			exit
 		else
-			if $loc = 'kuhrPar' and indorf = 1:
+			if $loc = 'kuhrPar' and locat['Fam_inGad'] = 1:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat_kitchen_easteregg.jpg"></center>' & ! Snegurochka''s easter egg for when mom''s not around
 			elseif $loc = 'kuhrPar':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat_kitchen<<rand(1,3)>>.jpg"></center>'
@@ -608,7 +608,7 @@ if $ARGS[0] = 'sister_chat':
 				npc_rel['A33'] += 1
 				*clr & cla
 				temp = rand (1,15)
-				if $loc = 'kuhrPar' and indorf = 1:
+				if $loc = 'kuhrPar' and locat['Fam_inGad'] = 1:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat_kitchen_easteregg.jpg"></center>' & ! Snegurochka''s easter egg for when mom''s not around
 				elseif $loc = 'kuhrPar':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat_kitchen<<rand(1,3)>>.jpg"></center>'

locations/sitrPar.qsrc

@@ -2,8 +2,6 @@
 
 if $ARGS[0] = '':
 	CLOSE ALL
-	act 'Leave the room':gt 'korrPar'
-
 	$loc_arg = ''
 	$loc = 'sitrPar'
 	$menu_loc = 'sitrPar'
@@ -11,32 +9,51 @@ if $ARGS[0] = '':
 	menu_off = 0
 	$location_type = 'private'
 	$locclass = 'livingr'
-	clr
+	locat['Fam_livingroom'] = 0
 	minut += 1
 	gs 'stat'
 	gs 'themes', 'indoors'
+	gs 'family_schedule'
+	gs 'sitrPar', 'occupied'
+	*clr & cla
 	'<center><b><font color="maroon">Living Room</font></b></center>'
 	if locat['Mother'] = 19 and locat['Stepdad'] = 10:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/momvladtv.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
 	end
+	act 'Leave the room':gt 'korrPar'
+	act 'Sit on the sofa':gt 'sitrPar', 'sofa'
 	''
-	'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a>, which is near the window. In front of the TV is a <a href="exec:gt ''family'',''sofa''">sofa bed</a>, on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
-	*nl
-	gs 'family'
-	gs 'family_schedule'
+	'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a>, which is near the window. In front of the TV is a <a href="exec:gt ''sitrPar'',''sofa''">sofa bed</a>, on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
 	*nl
-	gs 'subkid'
+	if locat['Fam_livingroom'] = 0 and locat['Mother'] ! 24 and locat['Mother'] ! 19:
+		'No one else is here right now, so you''re free to use the room how you like.'
+		gs 'exercise','start'
+	end
 
+	if locat['Kolka'] = 2 and brothermorningsex = daystart:
+		'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is getting ready for school.'
+	elseif locat['Kolka'] = 1:
+		'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the sofa.'
+	elseif locat['Kolka'] = 7:
+		'Your little brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
+	elseif locat['Kolka'] = 11:
+		if locat['Mother'] = 19 or locat['Stepdad'] = 10:
+			'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
+		else
+			'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, playing video games.'
+		end
+	end
+	*nl
 	if month = 12 and day >= 20:'A Christmas tree stands next to the TV, decorated with tinsel garlands and other ornaments.'
 	if month = 12 and day = 31 and hour >= 20:
 		act 'Celebrate the New Year with your family.':
 			cls
-			npc_rel['A29'] += 10
-			npc_rel['A28'] += 10
-			npc_rel['A33'] += 10
-			npc_rel['A34'] += 10
+			gs 'npc_relationship', 'modify', 'A29', 10
+			gs 'npc_relationship', 'modify', 'A28', 10
+			gs 'npc_relationship', 'modify', 'A33', 10
+			gs 'npc_relationship', 'modify', 'A34', 10
 			money += 5000
 			hour = 23
 			minut = 0
@@ -47,29 +64,30 @@ if $ARGS[0] = '':
 			gs 'stat'
 			'You sit at the festive table laid in front of the TV and celebrate the New Year with your family, the TV providing some background noise. At the table, people strike up a conversation and common problems are forgotten for a while, everyone is having fun talking to each other. At midnight, everyone wishes one another a happy New Year and enjoys the champagne and fireworks outside. Your <<$npc_nickname[''A29'']>> gives you an envelope with a greeting card and 5000 <b>₽</b>. For a while, you continue to watch TV, enjoying the champagne and company of your family, but eventually, everyone is kind of tired and one by one they go to bed.'
 
-			act 'Leave':gt $loc, $loc_arg
+			act 'Leave': gt 'korrPar'
 		end
 	elseif month = 1 and day = 1:
 		act 'Eat some leftovers at the festive table.':
-			cla
-			*clr
 			frost = 0
-			minut += 15
+			minut += 10
 			pcs_health += 10
 			pcs_mood += 20
-			fat += 2
-			pcs_energy += 20
-			pcs_hydra += 20
+			fat += 8
+			pcs_energy += 60
+			if pcs_hydra >= 100:
+				pcs_hydra += 30
+			else
+				pcs_hydra += 60
+			end
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0
-
 			gs 'stat'
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/shared/food/leftovers.jpg"></center>'
 			'You finish the leftovers remaining on the table from the holidays.'
 
-		act 'Get up from the table':gt $loc, $loc_arg
-
+			act 'Get up from the table': gt 'sitrPar'
 		end
 	elseif locat['Mother'] = 24:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/uborka1.jpg"></center>'
@@ -110,21 +128,70 @@ if $ARGS[0] = '':
 		end
 	elseif locat['Mother'] = 19:
 		!!Mom by herself watching TV
-		ocpd_room = 1
 		'As you walk into the living room, you see your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> sitting on the couch watching TV.'
+	elseif locat['Stepdad'] = 10:
+		!!Dad watching TV by himself
+		'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
 	end
 
-	if ocpd_room = 0 and breastpump = 1 and bp_unbox <= 0:
-		'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
-	elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:
-		'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
-	elseif ocpd_room = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 40:
-		'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
-	elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 30:
-		'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
+	gs 'subkid'
+	if kid >= 1:
+		if breastpump = 1 and bp_unbox = 1 and pcs_inhib > 30:
+			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
+		elseif breastpump = 1 and bp_unbox <= 0:
+			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
+		end
+	elseif locat['Fam_livingroom'] = 0:
+		if breastpump = 1 and bp_unbox = 1:
+			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
+		elseif breastpump = 1 and bp_unbox <= 0:
+			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
+		end
 	end
 end
 
+if $ARGS[0]='sofa':
+	$menu_loc = 'sitrPar'
+	$menu_arg = 'sofa'
+	menu_off = 0
+	$loc_arg = 'sofa'
+	$loc = 'sitrPar'
+	gs 'family_schedule'
+	gs 'sitrPar', 'occupied'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sofa.jpg"></center>'
+	*nl
+	'<center>A small sofa bed, when not folded out into a bed, is just big enough for you to curl up on and take a nap.</center>'
+
+	act 'Get up':gt 'sitrPar'
+	act 'Watch TV':gt 'TV','pav'
+
+	if locat['Fam_livingroom'] = 0 and pornMagazine > 0:
+		'<br>There is a porn magazine under the sofa cushions'
+		gs 'events', 'read_porn'
+		if pcs_horny >= 50:
+			act 'Masturbate':gt 'selfplay', 'start'
+		end
+	end
+
+	gs 'events', 'read'
+
+	if locat['Fam_livingroom'] = 0:
+		act 'Take a nap (1:00)':
+			if pcs_sleep < 90:
+				pcs_sleep += 10
+				pcs_health += 5
+				minut += 60
+				gs 'stat'
+				'You sleep about an hour.'
+			else
+				minut += 5
+				gs 'stat'
+				'You are not tired enough to sleep, even for a short nap.'
+			end
+		end
+	end
+end
 
 if $ARGS[0] = 'TVfam':
 	cla & *clr
@@ -134,17 +201,24 @@ if $ARGS[0] = 'TVfam':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
 	'You continue to watch TV with the family. Everyone seems very engrossed in the program and almost never says anything, though Kolka occasionally makes a crack about what is happening, often getting shushed by Vlad or <<$npc_nickname[''A29'']>>.'
-	if locat['Mother'] = 19: act'Keep watching TV with your family': gt 'sitrPar', 'TVfam'
+	if locat['Mother'] = 19: act 'Keep watching TV with your family': gt 'sitrPar', 'TVfam'
 	act 'Finish watching':gt 'sitrPar', 'TVend'
 end
 
 if $ARGS[0] = 'TVend':
 	cla & *clr
+	gs 'family_schedule'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
 	'Once the show is over, Vladimir picks up the remote and turns the TV off. He gets up then stretches before he turns and walks out of the room, likely heading to bed. <<$npc_nickname[''A29'']>> gets up and says to you, "You should go to bed or at least go to your room so your brother can get his rest." She then turns to Kolka and says to him, "Don''t stay up, go to bed." With that, she also leaves after making sure you leave as well. As you walk out, you see Kolka putting his pillow and sheet on the couch.'
 	act 'leave':gt 'korrPar'
 end
 
+if $ARGS[0] = 'occupied':
+	if (locat['Kolka'] = 2 and brothermorningsex = daystart) or locat['Kolka'] = 1 or locat['Kolka'] = 7 or locat['Kolka'] = 11 or locat['Stepdad'] = 10 or locat['Mother'] = 19 or locat['Mother'] = 24:
+		locat['Fam_livingroom'] = 1
+	end
+end
+
 --- sitrPar ---------------------------------
 

locations/vanrPar.qsrc

@@ -58,7 +58,7 @@ end
 if $ARGS[0] = 'peek':
 	menu_off = 1
 
-	if locat['sdad_athome'] = 1 and locat['Mom_athome'] = 0 and indorf = 0 and stepdadqw_day ! daystart and iif(stepdadqw>0,1,rand(0,1)) = 1:
+	if locat['sdad_athome'] = 1 and locat['Mom_athome'] = 0 and locat['Fam_inGad'] = 0 and stepdadqw_day ! daystart and iif(stepdadqw>0,1,rand(0,1)) = 1:
 		*clr & cla
 		stepdadqw_day = daystart
 		if npc_rel['A28'] < 60 or stepdadqw < 3:
@@ -77,7 +77,7 @@ if $ARGS[0] = 'peek':
 				act 'Go away': gs 'vanrPar', 'stepdad_sex_no'
 			end
 		end
-	elseif locat['Kolka_athome'] = 1 and brother_ev1 ! daystart and rand(0,4) < 2 and indorf = 0:
+	elseif locat['Kolka_athome'] = 1 and brother_ev1 ! daystart and rand(0,4) < 2 and locat['Fam_inGad'] = 0:
 		*clr & cla
 		brother_ev1 = daystart
 		'Despite the pattering sound of the water, you hear the bathroom door creaking open slightly. Through the crack in the door, you notice your brother Kolka watching you.'