[fixed] Sister enjoying dinner and Roma at the same time

[added] Outstanding mom mini-events in the salon and the correct event for when the family are watching TV

locations/bedrPar.qsrc

@@ -52,7 +52,7 @@ end
 
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and sisterHere < 2:gt 'tobiQW', 'start'
 
-if sisboyday + 1 = daystart and hour = 18: gt 'sisterQW', 'sisboyQW_expel'
+if anyaloc = 25: gt 'sisterQW', 'sisboyQW_expel'
 
 if sisterHere = 2 and popugai2 = 1 and sispopconf = 0:
 	*clr & cla

locations/family_schedule.qsrc

@@ -38,6 +38,9 @@ if sister_opr_indorf = 0:
 		elseif hour < 18:
 			!!Personal activities: Relaxing in bedroom, working out at the community center, etc (this is also the time frame Roma comes over some times)
 			anyaloc = func('shortgs', 'rand_pick', '', 9, 10, 11)
+		elseif sisboyday + 1 = daystart and hour = 18:
+			!!in bedroom with Roma
+			anyaloc = 25
 		elseif hour = 18 and minut < 30:
 			!!Family dinner
 			anyaloc = 12
@@ -103,6 +106,8 @@ if sister_opr_indorf = 0:
 end
 
 !!---MOM--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+!!momloc [11] = daystart check in salon
 !!indorf = 1 means mom is in the village
 if indorf = 0:
 	if week <= 5:

locations/kuhrPar.qsrc

@@ -49,8 +49,10 @@ if hour = 7 and week < 6 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</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 breakfast. You could sit down and join them for breakfast or just grab something and go.'
 elseif hour = 7 and week > 5 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, 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:
+elseif hour = 18 and minut <= 30 and indorf = 0 and anyaloc = 25:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</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:
+	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</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, <<$npc_nickname[''A29'']>> usually pre-cooks some meals and stores them in the fridge, to be handy for later. Of course, you could also just have a snack if you''re not that hungry.'
 end

locations/salon.qsrc

@@ -2,6 +2,7 @@
 $location_type = 'public_indoors'
 
 if $ARGS[0] = 'start':
+	if momloc = 15 and momloc[11] ! daystart: gt 'mom'
 	$sexloc = $CURLOC
 	if week = 1 and hour >= 9 and hour <= 10 and worksalon = 1:gt 'salon', 'beginwork'
 	if week = 3 and hour >= 9 and hour <= 10 and worksalon = 1:gt 'salon', 'beginwork'
@@ -48,6 +49,51 @@ if $ARGS[0] = 'start':
 	end
 	act 'Leave':minut += 3 & gt 'torgcentr'
 end
+	
+if $ARGS[0] = 'mom':
+	*clr & cla
+	menu_off = 1
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/salon.jpg"></center>'
+	'As you enter the salon you see you <<$npc_nickname[''A29'']>> waiting with your Aunt Luda. They haven''t seen you yet, they seem to just be chatting as they wait for their turn. The place seems to be fairly busy today.'
+	
+	act 'Ignore them and leave':gt 'torgcentr'
+	
+	act 'Go talk to them':
+		*clr & cla
+		minut += 5
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/momsalon.jpg"></center>'
+		'You walk over to your <<$npc_nickname[''A29'']>> and Luda. "Hi <<$npc_nickname[''A29'']>>, Luda. You guys getting your hair cut?"'
+		'Your <<$npc_nickname[''A29'']>> looks up at you and seems a little surprised to see you. "Yes and we are going to get a manicure as well, you should join us. I''ll pay."'
+		'Luda speaks up as well. "Yes dear you should join us." Just then your <<$npc_nickname[''A29'']>> name is called and she gets up and takes a seat to get her hair styled. A free manicure would be nice, but that also means having to spend time with them and listening to them talk about boring stuff.'
+		
+		act 'Tell her your busy':
+			*clr & cla
+			npc_rel['A29'] -= 1
+			minut += 5
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/salon.jpg"></center>'
+			'You shakes your head. "Sorry I can''t, I already have plans."'
+			'Your <<$npc_nickname[''A29'']>> sighs a little, obviously disappointed. "Well ok then, don''t stay out to late." You tell them bye and the say the same back to you, With that her and Luda go back to talking again as you leave.'
+			act 'Leave':gt 'torgcentr'
+		end
+		
+		act 'Agree':
+			*clr & cla
+			npc_rel['A29'] += 1
+			npc_rel['A30'] += 1
+			momloc[11] = daystart
+			minut += 20
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/momsvetsalon.jpg"></center>'
+			'You sit down next to Luda but only for a moment when her name is called and she gets up and gets her hair done. Next they are both taken to have a manicure done and you are called over to join them. The three of you sit near each other as you get manicures. Luda and your mom talk about a variety of topics, mostly gossip about what''s going on in Pavlovsk of the people they both know or stories about what happened at their work.'
+			'You chime in occasionally telling them about some stuff you have been up to of late. All and all it is a surprisingly fun time and you got a nice manicure out of it. Once you are finished, your <<$npc_nickname[''A29'']>> pays for both of you and Luda pays for herself. You all walk out together, Luda says. "Well I should get back and make dinner for me and Olu."'
+			'You <<$npc_nickname[''A29'']>> and Luda share a brief hug. "Same here, Vlad wouldn''t know what to do and would likely starve if I don''t get dinner started soon." The both laugh at that, Luda tells you bye as she walks off and your mothers starts for home as well, as she says to you. "Diner will be ready in about half a hour, you should come home and join us." You tell her you might and with that she walks off as well.'
+			act 'Leave':gt 'torgcentr'
+		end
+	end
+end
 
 if $ARGS[0] = 'solyariy':
 	cla & *clr

locations/sitrPar.qsrc

@@ -1,107 +1,150 @@
 # sitrPar
-CLOSE ALL
-act 'Leave the room':gt 'korrPar'
 
-$metka = ''
-$loc = 'sitrPar'
-$menu_loc = 'sitrPar'
-$menu_arg = ''
-menu_off = 0
-$location_type = 'private'
-$locclass = 'livingr'
-clr
-minut += 1
-gs 'stat'
-gs 'themes', 'indoors'
-'<center><b><font color="maroon">Living Room</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
-''
-'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'
-*nl
-gs 'subkid'
+if $ARGS[0] = '':
+	CLOSE ALL
+	act 'Leave the room':gt 'korrPar'
 
-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
-		money += 5000
-		hour = 23
-		minut = 0
-		minut += 120
-		pcs_sleep = 0
-		pcs_mood += 100
-		wipo += 1000
-		gs 'food', 'l_meal'
-		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 after a while everyone is kind of tired and one by one they go to bed.'
+	$metka = ''
+	$loc = 'sitrPar'
+	$menu_loc = 'sitrPar'
+	$menu_arg = ''
+	menu_off = 0
+	$location_type = 'private'
+	$locclass = 'livingr'
+	clr
+	minut += 1
+	gs 'stat'
+	gs 'themes', 'indoors'
+	'<center><b><font color="maroon">Living Room</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
+	''
+	'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'
+	*nl
+	gs 'subkid'
 
-		act 'Leave':gt $loc, $metka
-	end
-elseif month = 1 and day = 1:
-	act 'Eat some leftovers at the festive table.':
-		cla
-		*clr
-		frost = 0
-		minut += 15
-		pcs_health += 10
-		pcs_mood += 20
-		fat += 2
-		pcs_energy += 20
-		pcs_hydra += 20
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		pcs_breath = 0
+	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
+			money += 5000
+			hour = 23
+			minut = 0
+			minut += 120
+			pcs_sleep = 0
+			pcs_mood += 100
+			wipo += 1000
+			gs 'food', 'l_meal'
+			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 after a while everyone is kind of tired and one by one they go to bed.'
 
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/shared/food/leftovers.jpg"></center>'
-		'You have finished the leftovers remaining on the table from the holidays.'
+			act 'Leave':gt $loc, $metka
+		end
+	elseif month = 1 and day = 1:
+		act 'Eat some leftovers at the festive table.':
+			cla
+			*clr
+			frost = 0
+			minut += 15
+			pcs_health += 10
+			pcs_mood += 20
+			fat += 2
+			pcs_energy += 20
+			pcs_hydra += 20
+			cumspclnt = 2
+			gs 'cum_cleanup'
+			pcs_breath = 0
 
-	act 'Get up from the table':gt $loc, $metka
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/shared/food/leftovers.jpg"></center>'
+			'You have finished the leftovers remaining on the table from the holidays.'
 
-	end
-elseif momloc = 24:
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/uborka1.jpg"></center>'
-	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
-		if $clothingworntype = 'school':
-			'As you walk into the living room you see your mother sweeping the floor. She looks up at and gives you a disappointed look. "What are you still doing home? Go to school, now!" With that she practically pushes you out of the apartment and closes the door. As she does she adds ones more. "Go to school."' 
-			act 'Continue': gt'pod_ezd','etaj_2'
-		else
-			if schtype = 0:
-				$schbrand = 'school'
-				schtype = 6
-			end
-			if schoolH[schtype] = 0:
-				$schbrand = 'school'
-				schtype = 6
+		act 'Get up from the table':gt $loc, $metka
+
+		end
+	elseif momloc = 24:
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/uborka1.jpg"></center>'
+		if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
+			if $clothingworntype = 'school':
+				'As you walk into the living room you see your mother sweeping the floor. She looks up at and gives you a disappointed look. "What are you still doing home? Go to school, now!" With that she practically pushes you out of the apartment and closes the door. As she does she adds ones more. "Go to school."' 
+				act 'Continue': gt'pod_ezd','etaj_2'
+			else
+				if schtype = 0:
+					$schbrand = 'school'
+					schtype = 6
+				end
+				if schoolH[schtype] = 0:
+					$schbrand = 'school'
+					schtype = 6
+				end
+				gs 'clothing', 'wear', $schbrand, schtype
+				'As you walk into the living room you see your mother sweeping the floor. She looks up at and gives you a disappointed look. "What are you still doing home? Why are you not wearing your unifrom? Go get changed and go to school, now!" She follows you back to your room and watches as you change into your uniform, after that she practically pushes you out of the apartment and closes the door. As she does she adds ones more. "Go to school."' 
+				act 'Continue':  gt'pod_ezd','etaj_2'
 			end
-			gs 'clothing', 'wear', $schbrand, schtype
-			'As you walk into the living room you see your mother sweeping the floor. She looks up at and gives you a disappointed look. "What are you still doing home? Why are you not wearing your unifrom? Go get changed and go to school, now!" She follows you back to your room and watches as you change into your uniform, after that she practically pushes you out of the apartment and closes the door. As she does she adds ones more. "Go to school."' 
-			act 'Continue':  gt'pod_ezd','etaj_2'
+		else
+			'As you walk into the living room you see your mother sweeping the floor. She hasn''t noticed you, she is intent on cleaning.'
+			act 'leave': gt 'korrPar'
 		end
-	else
-		'As you walk into the living room you see your mother sweeping the floor. She hasn''t noticed you, she is intent on cleaning.'
-		act 'leave': 'korrPar'
+		exit
+	elseif momloc = 19:
+		!! Watches TV with Vladimir
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/momvladtv.jpg"></center>'
+		'As you walk into the living room you see your <<$npc_nickname[''A29'']>> and Vladimir sitting on the couch watching tv, while Kolka sits in the armchair watching tv.'
+		act 'leave':gt 'korrPar'
+		
+		act 'Join them':
+			cla & *clr
+			pcs_mood += 10
+			minut += 30
+			npc_rel['A28'] += 1
+			npc_rel['A29'] += 1
+			npc_rel['A34'] += 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
+			'You move over to join them and your <<$npc_nickname[''A29'']>> scoots away from Vladmir and pat the spot between her and him. You take a seat between them, Vlad barely even glances as you with a brief smile before he goes back to watching tv. Kolka never even looks up, your <<$npc_nickname[''A29'']>> pats you on the shoulder before returning her attention to the tv, apparently happy the family is spending time together.'
+			act 'leave':gt 'korrPar'
+			
+			act 'Keep watching':gt 'sitrPar', 'TVmom'
+			act 'Finish watching':gt 'sitrPar', 'TVend'
+		end		
+	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_inbition > 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_inbition > 30:
+		'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
 	end
-	exit
-elseif momloc = 19:
-	'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here watching TV with Vladimir.'
 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_inbition > 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_inbition > 30:
-	'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
+
+if $ARGS[0] = 'TVmom':
+	cla & *clr
+	pcs_mood += 10
+	minut += 30
+	gs 'family_schedule'
+	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 much. Though Kolka occasional makes a crack about what is happening, often getting shushed by Vlad or <<$npc_nickname[''A29'']>>.'
+	if momloc = 19: act'Keep watching TV with your family': gt 'sitrPar', 'TVmom'
+	act 'Finish watching':gt 'sitrPar', 'TVend'
+end
+
+if $ARGS[0] = 'TVend':
+	cla & *clr
+	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 he 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
 
 --- sitrPar ---------------------------------