Parcourir la source

[Fixed][Added] a bunch of edits, small bug fixes and such to family stuff, mostly Mom

Alaratt il y a 2 ans
Parent
commit
d4ecda10c1
4 fichiers modifiés avec 192 ajouts et 139 suppressions
  1. 9 1
      locations/family.qsrc
  2. 2 2
      locations/kuhrPar.qsrc
  3. 163 126
      locations/mother.qsrc
  4. 18 10
      locations/sitrPar.qsrc

+ 9 - 1
locations/family.qsrc

@@ -98,7 +98,15 @@ if StoryLine = 1:
 				'Your little brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
 			elseif kolloc = 11:
 				ocpd_room = 1
-				'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, playing video games.'
+				if momloc = 19 and sdadloc = 10:
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing playing on his phone.'
+				elseif momloc = 19:
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing playing on his phone.'
+				elseif sdadloc = 10:
+					'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing 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 sdadloc = 10:

+ 2 - 2
locations/kuhrPar.qsrc

@@ -55,9 +55,9 @@ if hour = 7 and week < 6 and indorf = 0:
 elseif hour = 7 and week > 5 and indorf = 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 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.'
+	'<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:
-	'<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.'
+	'<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, <<$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.'
 end

+ 163 - 126
locations/mother.qsrc

@@ -382,13 +382,24 @@ if $ARGS[0] = '':
 			'<center><b><font color="maroon">Your <<$npc_nickname[''A29'']>>, Natasha <<$pcs_lastname>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 
-			if npc_rel['A29'] < 80:
-				'You barely have any memories of your real father, and are curious about him. When you see your <<$npc_nickname[''A29'']>> in the kitchen you decide to ask: "<<$npc_nickname[''A29'']>>... about my real father... what was he like? What happened between you two?"'
-				'You seem to have struck a sore spot. Your <<$npc_nickname[''A29'']>>''s face saddens, and after a few seconds she replies: "<<$pcs_nickname>>, I don''t want to talk about him, it brings back too many bad memories. Just know that Vladimir, your stepfather, raised you and Anya as if they were his own daughters."'
+			if $loc = 'kuhrPar':
+				if npc_rel['A29'] < 80:
+					'You barely have any memories of your real father, and are curious about him. When you see your <<$npc_nickname[''A29'']>> in the kitchen you decide to ask: "<<$npc_nickname[''A29'']>>... about my real father... what was he like? What happened between you two?"'
+					'You seem to have struck a sore spot. Your <<$npc_nickname[''A29'']>>''s face saddens, and after a few seconds she replies: "<<$pcs_nickname>>, I don''t want to talk about him, it brings back too many bad memories. Just know that Vladimir, your stepfather, raised you and Anya as if they were his own daughters."'
+				else
+					'You barely have any memories of your real father, and are curious about him. When you see your <<$npc_nickname[''A29'']>> in the kitchen you decide to ask: "<<$npc_nickname[''A29'']>>... about my real father... what was he like? What happened between you two?"'
+					'You seem to have struck a sore spot. Your <<$npc_nickname[''A29'']>>''s face saddens, and after a few seconds she replies: "I have no idea where Mikhail is and what he does now, I haven''t seen him in many years. We went to the same school when we were young, and were dating back then... nothing serious. Things weren''t great between us, but then I got pregnant with your sister Anya. Our parents forced us to get married. We tried to make the most of it, and for a while things didn''t seem so bad. A few months after I had you, we got into a huge argument though. We decided we couldn''t live together any more, and got divorced." You can''t help but notice she won''t tell you what the argument was about, but you don''t interrupt her. It''s rare enough to get her to talk about your real father as it is.'
+					'"A year later I married Vladimir, your stepfather. We had Kolka together, but Vladimir always treated you and Anya as if they were his own daughters too. He looked after you, bathed you, told you stories at night and took you for walks whenever he could." Those memories seem to have cheered her up, and she has a serene smile on her face. "Vladimir really is a wonderful man..." she adds, while you thank her for the story.'
+				end
 			else
-				'You barely have any memories of your real father, and are curious about him. When you see your <<$npc_nickname[''A29'']>> in the kitchen you decide to ask: "<<$npc_nickname[''A29'']>>... about my real father... what was he like? What happened between you two?"'
-				'You seem to have struck a sore spot. Your <<$npc_nickname[''A29'']>>''s face saddens, and after a few seconds she replies: "I have no idea where Mikhail is and what he does now, I haven''t seen him in many years. We went to the same school when we were young, and were dating back then... nothing serious. Things weren''t great between us, but then I got pregnant with your sister Anya. Our parents forced us to get married. We tried to make the most of it, and for a while things didn''t seem so bad. A few months after I had you, we got into a huge argument though. We decided we couldn''t live together any more, and got divorced." You can''t help but notice she won''t tell you what the argument was about, but you don''t interrupt her. It''s rare enough to get her to talk about your real father as it is.'
-				'"A year later I married Vladimir, your stepfather. We had Kolka together, but Vladimir always treated you and Anya as if they were his own daughters too. He looked after you, bathed you, told you stories at night and took you for walks whenever he could." Those memories seem to have cheered her up, and she has a serene smile on her face. "Vladimir really is a wonderful man..." she adds, while you thank her for the story.'
+				if npc_rel['A29'] < 80:
+					'You barely have any memories of your real father, and are curious about him. When you see your <<$npc_nickname[''A29'']>> watching TV you decide to ask: "<<$npc_nickname[''A29'']>>... about my real father... what was he like? What happened between you two?"'
+					'You seem to have struck a sore spot. Your <<$npc_nickname[''A29'']>>''s face saddens, and after a few seconds she replies: "<<$pcs_nickname>>, I don''t want to talk about him, it brings back too many bad memories. Just know that Vladimir, your stepfather, raised you and Anya as if you were his own daughters."'
+				else
+					'You barely have any memories of your real father, and are curious about him. When you see your <<$npc_nickname[''A29'']>> watching TV you decide to ask: "<<$npc_nickname[''A29'']>>... about my real father... what was he like? What happened between you two?"'
+					'You seem to have struck a sore spot. Your <<$npc_nickname[''A29'']>>''s face saddens, and after a few seconds she replies: "I have no idea where Mikhail is and what he does now, I haven''t seen him in many years. We went to the same school when we were young, and were dating back then... nothing serious. Things weren''t great between us, but then I got pregnant with your sister Anya. Our parents forced us to get married. We tried to make the most of it, and for a while things didn''t seem so bad. A few months after I had you, we got into a huge argument though. We decided we couldn''t live together any more, and got divorced." You can''t help but notice she won''t tell you what the argument was about, but you don''t interrupt her. It''s rare enough to get her to talk about your real father as it is.'
+					'"A year later I married Vladimir, your stepfather. We had Kolka together, but Vladimir always treated you and Anya as if you were his own daughters too. He looked after you, bathed you, told you stories at night and took you for walks whenever he could." Those memories seem to have cheered her up, and she has a serene smile on her face. "Vladimir really is a wonderful man..." she adds, while you thank her for the story.'
+				end
 			end
 			act 'Continue':gt 'mother'
 		end
@@ -400,91 +411,105 @@ if $ARGS[0] = '':
 				gs 'stat'
 				'<center><b><font color="maroon">Your <<$npc_nickname[''A29'']>>, Natasha <<$pcs_lastname>></font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-				
-				'Since you were little, your grandparents in Gadukino have always been just that to you - your ''grandparents''. It''s what your <<$npc_nickname[''A29'']>> told you they are, and what they seemed very happy to be referred to as. You learned some time later that they''re actually your great-grandparents. Your real grandparents - <<$npc_nickname[''A29'']>>''s parents - died when she herself was barely more than a toddler. But she never talks about them.'
-				'Today, your <<$npc_nickname[''A29'']>> seems to be in a pretty good mood as she wipes the countertops, so you decide to ask her the question.'
-				'"<<$npc_nickname[''A29'']>>, what were your parents like?"'
-				'She stops what she''s doing and turns to you, clearly surprised by your question. "Where''s this coming from so suddenly?"'
-				'"I''m just curious. Do you remember them at all?"'
-				'<<$npc_nickname[''A29'']>> sighs, leaning back against the counter. "It was a long time ago, but I still remember a little. My mother died giving birth to me, so the most I knew of her was from photos and keepsakes she left for me. She was a very beautiful woman. Grandmother said she always dressed in colorful, flowing skirts. She caught the eye of quite a few men, before she met my father and fell in love. When I look at you, I see a little of her in your features, <<$pcs_nickname>>."'
-				'"As for my father, I lived with him until I was four. I don''t remember that much about him, but I do recall he was a tall, solid man. With a big bushy beard, and very blue eyes." She smiles, wistfully. "He was very gentle, too, and smiled a lot. He would take me for walks in the flower fields after he got home from work, hoisting me up on his shoulders wherever the grass grew too tall. Then, at night, he''d sit by the fire smoking his pipe and reading the paper, while I played until bedtime. He called me Zvonochek and I called him Papulia."'
-				'These memories are old and scant, but your <<$npc_nickname[''A29'']>>''s eyes sparkle and dance as she recalls them, almost as if she''d been transported back to that time. It''s strange to see her like this, considering the expressions you''re more used to her having, and you find yourself openly staring.'
-				'"Like many men at the time, he eventually got called to war. I don''t remember anything beyond him being there one day, and seeing him driving off in the back of a truck the next." She stops and thinks for a moment, eyes dimming. "Sometime I''m not even sure I remember that much, or if my mind has filled in the gaps over time. I do recall missing him terribly, and often wishing my grandfather would hoist me on his shoulders like Papulia did." She swallows. "He never came back home. Grandmother told me that they said he was taken prisoner by the Afghans and died in their camp, but his body was never found."'
-				'Your <<$npc_nickname[''A29'']>> turns back around and starts wiping the countertop again. You''re not sure if she''s crying or not, but she doesn''t turn around as she says "now, let''s not talk about that anymore."'
+				if $loc = 'kuhrPar':
+					'Since you were little, your grandparents in Gadukino have always been just that to you - your ''grandparents''. It''s what your <<$npc_nickname[''A29'']>> told you they are, and what they seemed very happy to be referred to as. You learned some time later that they''re actually your great-grandparents. Your real grandparents - <<$npc_nickname[''A29'']>>''s parents - died when she herself was barely more than a toddler. But she never talks about them.'
+					'Today, your <<$npc_nickname[''A29'']>> seems to be in a pretty good mood as she wipes the countertops, so you decide to ask her the question.'
+					'"<<$npc_nickname[''A29'']>>, what were your parents like?"'
+					'She stops what she''s doing and turns to you, clearly surprised by your question. "Where''s this coming from so suddenly?"'
+					'"I''m just curious. Do you remember them at all?"'
+					'<<$npc_nickname[''A29'']>> sighs, leaning back against the counter. "It was a long time ago, but I still remember a little. My mother died giving birth to me, so the most I knew of her was from photos and keepsakes she left for me. She was a very beautiful woman. Grandmother said she always dressed in colorful, flowing skirts. She caught the eye of quite a few men, before she met my father and fell in love. When I look at you, I see a little of her in your features, <<$pcs_nickname>>."'
+					'"As for my father, I lived with him until I was four. I don''t remember that much about him, but I do recall he was a tall, solid man. With a big bushy beard, and very blue eyes." She smiles, wistfully. "He was very gentle, too, and smiled a lot. He would take me for walks in the flower fields after he got home from work, hoisting me up on his shoulders wherever the grass grew too tall. Then, at night, he''d sit by the fire smoking his pipe and reading the paper, while I played until bedtime. He called me Zvonochek and I called him Papulia."'
+					'These memories are old and scant, but your <<$npc_nickname[''A29'']>>''s eyes sparkle and dance as she recalls them, almost as if she''d been transported back to that time. It''s strange to see her like this, considering the expressions you''re more used to her having, and you find yourself openly staring.'
+					'"Like many men at the time, he eventually got called to war. I don''t remember anything beyond him being there one day, and seeing him driving off in the back of a truck the next." She stops and thinks for a moment, eyes dimming. "Sometime I''m not even sure I remember that much, or if my mind has filled in the gaps over time. I do recall missing him terribly, and often wishing my grandfather would hoist me on his shoulders like Papulia did." She swallows. "He never came back home. Grandmother told me that they said he was taken prisoner by the Afghans and died in their camp, but his body was never found."'
+					'Your <<$npc_nickname[''A29'']>> turns back around and starts wiping the countertop again. You''re not sure if she''s crying or not, but she doesn''t turn around as she says "now, let''s not talk about that anymore."'
+				else
+					'Since you were little, your grandparents in Gadukino have always been just that to you - your ''grandparents''. It''s what your <<$npc_nickname[''A29'']>> told you they are, and what they seemed very happy to be referred to as. You learned some time later that they''re actually your great-grandparents. Your real grandparents - <<$npc_nickname[''A29'']>>''s parents - died when she herself was barely more than a toddler. But she never talks about them.'
+					'Today, your <<$npc_nickname[''A29'']>> seems to be in a pretty good mood as she watches TV, so you decide to ask her the question.'
+					'"<<$npc_nickname[''A29'']>>, what were your parents like?"'
+					'She stops watching and turns to you, clearly surprised by your question. "Where''s this coming from so suddenly?"'
+					'"I''m just curious. Do you remember them at all?"'
+					'<<$npc_nickname[''A29'']>> sighs, leaning back against the counter. "It was a long time ago, but I still remember a little. My mother died giving birth to me, so the most I knew of her was from photos and keepsakes she left for me. She was a very beautiful woman. Grandmother said she always dressed in colorful, flowing skirts. She caught the eye of quite a few men, before she met my father and fell in love. When I look at you, I see a little of her in your features, <<$pcs_nickname>>."'
+					'"As for my father, I lived with him until I was four. I don''t remember that much about him, but I do recall he was a tall, solid man. With a big bushy beard, and very blue eyes." She smiles, wistfully. "He was very gentle, too, and smiled a lot. He would take me for walks in the flower fields after he got home from work, hoisting me up on his shoulders wherever the grass grew too tall. Then, at night, he''d sit by the fire smoking his pipe and reading the paper, while I played until bedtime. He called me Zvonochek and I called him Papulia."'
+					'These memories are old and scant, but your <<$npc_nickname[''A29'']>>''s eyes sparkle and dance as she recalls them, almost as if she''d been transported back to that time. It''s strange to see her like this, considering the expressions you''re more used to her having, and you find yourself openly staring.'
+					'"Like many men at the time, he eventually got called to war. I don''t remember anything beyond him being there one day, and seeing him driving off in the back of a truck the next." She stops and thinks for a moment, eyes dimming. "Sometime I''m not even sure I remember that much, or if my mind has filled in the gaps over time. I do recall missing him terribly, and often wishing my grandfather would hoist me on his shoulders like Papulia did." She swallows. "He never came back home. Grandmother told me that they said he was taken prisoner by the Afghans and died in their camp, but his body was never found."'
+					'Your <<$npc_nickname[''A29'']>> turns back and starts watching TV again. "Let''s not talk about that anymore," she says, her voice sounding a bit strained.'
+				end
 				act 'Continue':gt 'mother'
 			end
 		end
 
-		act 'Ask for some new clothes':
-			*clr & cla
-			minut += 5
-			gs 'stat'
-			'<center><b><font color="maroon">Your <<$npc_nickname[''A29'']>>, Natasha <<$pcs_lastname>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-			'You wait until your <<$npc_nickname[''A29'']>> is in a good mood, and then quickly swoop in: "<<$npc_nickname[''A29'']>>, I have nothing nice to wear. Can I please have some new clothes?"'
-			if fame['pav_prostitute'] >= 100 and motherKnowWhore >= 1:
-				'Your <<$npc_nickname[''A29'']>> is outraged by the suggestion. "Really <<$pcs_nickname>>? You have lots of customers, and you''re still asking me for clothes? You should have plenty of whore money, you can afford them yourself. Besides, I don''t know where to buy clothes for a whore."'
+		if hour < 19:
+			act 'Ask for some new clothes':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><b><font color="maroon">Your <<$npc_nickname[''A29'']>>, Natasha <<$pcs_lastname>></font></b></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
+				'You wait until your <<$npc_nickname[''A29'']>> is in a good mood, and then quickly swoop in: "<<$npc_nickname[''A29'']>>, I have nothing nice to wear. Can I please have some new clothes?"'
+				if fame['pav_prostitute'] >= 100 and motherKnowWhore >= 1:
+					'Your <<$npc_nickname[''A29'']>> is outraged by the suggestion. "Really <<$pcs_nickname>>? You have lots of customers, and you''re still asking me for clothes? You should have plenty of whore money, you can afford them yourself. Besides, I don''t know where to buy clothes for a whore."'
 
-				act 'Move away from her':gt $loc, $loc_arg
-			else
-				if SchoolAtestat = 0:
-					if npc_rel['A29'] >= 80:
-						if motherClotheMonth ! month:
-							'Your <<$npc_nickname[''A29'']>> lets out an exasperated sigh and throws her hands in the air. "Here we go again... <<$npc_nickname[''A29'']>>, I have nothing to wear!" she says, mocking your voice in a high pitch. You both laugh. "Alright then <<$pcs_nickname>>, let''s go see if we can find something."'
-
-							act 'Go to the store':
-								cla
-								npc_rel['A29'] = 70
-								motherClotheMonth = month
-								minut += 30
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/clothes_shopping.jpg"></center>'
-								'Going clothes shopping with your <<$npc_nickname[''A29'']>> is always an interesting experience. You never get to pick your own clothes, but she brings your clothes that she thinks would suit you and lets you try them on. You would argue but her taste in clothing is actually very good, always picking out cute outfits for you to wear that are quite trendy too. You directly go towards the changing booths, wondering what she''ll bring you this time.'
-
-								act 'Try on the clothes she brings you':
-									*clr & cla
+					act 'Move away from her':gt $loc, $loc_arg
+				else
+					if SchoolAtestat = 0:
+						if npc_rel['A29'] >= 80:
+							if motherClotheMonth ! month:
+								'Your <<$npc_nickname[''A29'']>> lets out an exasperated sigh and throws her hands in the air. "Here we go again... <<$npc_nickname[''A29'']>>, I have nothing to wear!" she says, mocking your voice in a high pitch. You both laugh. "Alright then <<$pcs_nickname>>, let''s go see if we can find something."'
+
+								act 'Go to the store':
+									cla
+									npc_rel['A29'] = 70
+									motherClotheMonth = month
+									minut += 30
 									gs 'stat'
-									loop_counter = 0
-									:markbuyclomother
-									loop_counter += 1
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/dressing_room.jpg"></center>'
-									if loop_counter = 300:
-										'After 30 minutes of trying on various outfits you are unable to find any that you either don''t already own or that you are willing to wear.'
-									else
-										numrand = rand(1, 150)
-
-										gs 'clothing_attributes', 'gm_outfits', numrand
-										!!not prostitute
-										if CloStyle = 4:jump 'markbuyclomother'
-										!!Sveta can wear it and not too revealing
-										if CloInhibit > pcs_inhib or CloInhibit > 30:jump 'markbuyclomother'
-
-										if gm_outfits[numrand] = 0:
-											gm_outfits[numrand] = 1
-											gm_outfits_h[numrand] = 50
-											gm_outfits_b[numrand] = pcs_hips
-											'<center><img <<$set_imgh>> src="images/pc/items/gm/outfits/<<numrand>>.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/clothes_shopping.jpg"></center>'
+									'Going clothes shopping with your <<$npc_nickname[''A29'']>> is always an interesting experience. You never get to pick your own clothes, but she brings your clothes that she thinks would suit you and lets you try them on. You would argue but her taste in clothing is actually very good, always picking out cute outfits for you to wear that are quite trendy too. You go straight towards the changing booths, wondering what she''ll bring you this time.'
+
+									act 'Try on the clothes she brings you':
+										*clr & cla
+										gs 'stat'
+										loop_counter = 0
+										:markbuyclomother
+										loop_counter += 1
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/dressing_room.jpg"></center>'
+										if loop_counter = 300:
+											'After 30 minutes of trying on various outfits you are unable to find any that you either don''t already own or that you are willing to wear.'
 										else
-											jump 'markbuyclomother'
+											numrand = rand(1, 150)
+
+											gs 'clothing_attributes', 'gm_outfits', numrand
+											!!not prostitute
+											if CloStyle = 4:jump 'markbuyclomother'
+											!!Sveta can wear it and not too revealing
+											if CloInhibit > pcs_inhib or CloInhibit > 30:jump 'markbuyclomother'
+
+											if gm_outfits[numrand] = 0:
+												gm_outfits[numrand] = 1
+												gm_outfits_h[numrand] = 50
+												gm_outfits_b[numrand] = pcs_hips
+												'<center><img <<$set_imgh>> src="images/pc/items/gm/outfits/<<numrand>>.jpg"></center>'
+											else
+												jump 'markbuyclomother'
+											end
 										end
-									end
 
-									'You enter a changing booth and spend 30 minutes trying on various outfits: short ones, long ones, light ones, dark ones... Then finally her eyes light up, and she beams: "This one! This one is perfect!" She buys the outfit for you, and you go back home together. You thank your <<$npc_nickname[''A29'']>> and give her a hug.'
+										'You enter a changing booth and spend 30 minutes trying on various outfits: short ones, long ones, light ones, dark ones... Then finally her eyes light up, and she beams: "This one! This one is perfect!" She buys the outfit for you, and you go back home together. You thank your <<$npc_nickname[''A29'']>> and give her a hug.'
 
-									act 'Continue':gt 'mother'
+										act 'Continue':gt 'mother'
+									end
 								end
+							else
+								'Your <<$npc_nickname[''A29'']>> sadly shakes her head: I''m sorry <<$pcs_nickname>>, our budget is limited and we already went clothes shopping this month. You''ll have to manage with what you have in your closet for a little while, maybe we can go again next month."'
+								act 'Continue':gt 'mother'
 							end
 						else
-							'Your <<$npc_nickname[''A29'']>> sadly shakes her head: I''m sorry <<$pcs_nickname>>, our budget is limited and we already went clothes shopping this month. You''ll have to manage with what you have in your closet for a little while, maybe we can go again next month."'
+							'Your <<$npc_nickname[''A29'']>> shakes her head: "I''m sorry <<$pcs_nickname>>, money is tight. We just can''t afford it right now."'
 							act 'Continue':gt 'mother'
 						end
 					else
-						'Your <<$npc_nickname[''A29'']>> shakes her head: "I''m sorry <<$pcs_nickname>>, money is tight. We just can''t afford it right now."'
+						'Your <<$npc_nickname[''A29'']>> shakes her head: "No <<$pcs_nickname>>, you''re old enough to earn your own money and buy your own clothes. Get a job if you want new clothes."'
 						act 'Continue':gt 'mother'
 					end
-				else
-					'Your <<$npc_nickname[''A29'']>> shakes her head: "No <<$pcs_nickname>>, you''re old enough to earn your own money and buy your own clothes. Get a job if you want new clothes."'
-					act 'Continue':gt 'mother'
 				end
 			end
 		end
@@ -520,19 +545,29 @@ if $ARGS[0] = '':
 				'You offer to help your <<$npc_nickname[''A29'']>> out around the house.'
 				'Your <<$npc_nickname[''A29'']>> asks you to iron some clothes. You spend an hour in the hallway ironing clothes.'
 			elseif MomPom = 6:
-				sdacharand = rand(10, 50)
-				money += sdacharand
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/grocery.jpg"></center>'
-				'You offer to help your <<$npc_nickname[''A29'']>> out around the house.'
-				'Your <<$npc_nickname[''A29'']>> asks you to run to the store, and buy some groceries. You head to the store and purchase the food, hauling the heavy bags home. The groceries cost you <<sdacharand>> <b>₽</b>, she gives you some money to cover the cost when you return home.'
-				'You have gain a few rubles for your effort.'
+				if hour < 19:
+					sdacharand = rand(10, 50)
+					money += sdacharand
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/grocery.jpg"></center>'
+					'You offer to help your <<$npc_nickname[''A29'']>> out around the house.'
+					'Your <<$npc_nickname[''A29'']>> asks you to run to the store, and buy some groceries. You head to the store and purchase the food, hauling the heavy bags home. The groceries cost you <<sdacharand>> <b>₽</b>, she gives you some money to cover the cost when you return home.'
+					'You have gain a few rubles for your effort.'
+				else
+					MomPom = 1
+					jump 'MomPom_jump'
+				end
 			elseif MomPom = 7:
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/pharmacy.jpg"></center>'
-				'You offer to help your <<$npc_nickname[''A29'']>> out around the house.'
-				'Your <<$npc_nickname[''A29'']>> asks you to go to the pharmacy, to get some medicine. Your <<$npc_nickname[''A29'']>>''s sister, Lyudmila, works there and always gives your family the medicine you need for free. Your <<$npc_nickname[''A29'']>> gave you a list of the items you need, and when you enter the pharmacy you see your aunt Luda behind the counter as always. She smiles when she recognizes you. "Hi <<$pcs_nickname>>! How are you? I hope everything is okay?"'
-				'"Hello aunt!" You greet her back, and have a chat with her before you give her list your <<$npc_nickname[''A29'']>> made. Aunt Luda quickly gathers the items your <<$npc_nickname[''A29'']>> wrote down, gathers them in a paper bag and hands the bag over to you. "Here you go, <<$pcs_nickname>>! Have a nice day, tell your <<$npc_nickname[''A29'']>> I said hi!"'
-				'You say you will and wave her goodbye. When you come home, you give your <<$npc_nickname[''A29'']>> the bag. After a few minutes you realize you forgot to pass on aunt Luda''s regards to your <<$npc_nickname[''A29'']>>, but decide to not bother now.'
+				if hour < 19:
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/pharmacy.jpg"></center>'
+					'You offer to help your <<$npc_nickname[''A29'']>> out around the house.'
+					'Your <<$npc_nickname[''A29'']>> asks you to go to the pharmacy, to get some medicine. Your <<$npc_nickname[''A29'']>>''s sister, Lyudmila, works there and always gives your family the medicine you need for free. Your <<$npc_nickname[''A29'']>> gave you a list of the items you need, and when you enter the pharmacy you see your aunt Luda behind the counter as always. She smiles when she recognizes you. "Hi <<$pcs_nickname>>! How are you? I hope everything is okay?"'
+					'"Hello aunt!" You greet her back, and have a chat with her before you give her list your <<$npc_nickname[''A29'']>> made. Aunt Luda quickly gathers the items your <<$npc_nickname[''A29'']>> wrote down, gathers them in a paper bag and hands the bag over to you. "Here you go, <<$pcs_nickname>>! Have a nice day, tell your <<$npc_nickname[''A29'']>> I said hi!"'
+					'You say you will and wave her goodbye. When you come home, you give your <<$npc_nickname[''A29'']>> the bag. After a few minutes you realize you forgot to pass on aunt Luda''s regards to your <<$npc_nickname[''A29'']>>, but decide to not bother now.'
+				else
+					MomPom = 1
+					jump 'MomPom_jump'
+				end
 			elseif MomPom = 8:
 				MomPom = 1
 				jump 'MomPom_jump'
@@ -651,7 +686,9 @@ if $ARGS[0] = '':
 		gt 'mother', 'referral_fail'
 	end
 
-	gs 'mother', 'check_workout'
+	if $loc = 'kuhrPar' or $loc = 'sitrPar':
+		gs 'mother', 'check_workout'
+	end
 end
 
 ! Called from mother and gadhouse, injects options for asking about workout sessions or starting a session
@@ -661,7 +698,7 @@ if $ARGS[0] = 'check_workout':
 	end
 
 	if (CloStyle = 5 or $clothingworntype = 'danilovich_outfits') and hour >= 6 and hour < 12 and motherQW['workout'] = 1 and motherQW['workout_day'] ! daystart:
-		if $loc = 'kuhrPar':
+		if $loc = 'kuhrPar' or $loc = 'sitrPar':
 			act 'Ask <<$npc_nickname[''A29'']>> to workout': gt 'mother', 'mother_workout_pav'
 		elseif $loc = 'gadhouse':
 			act 'Ask <<$npc_nickname[''A29'']>> to workout': gt 'mother', 'mother_workout_gad'
@@ -964,7 +1001,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'"<<$npc_nickname[''A29'']>>, I''m s-"'
 		'She slaps you hard across the face before you can finish the sentence.'
 		'"No, I don''t want to hear it. I can''t deal with you anymore. You need to leave this apartment right now! I don''t ever want to see you here again!"'
-		'She can''t really just toss you out, can she?'
+		+$OpenInnerThought+'She can''t really just toss you out, can she?'+$CloseInnerThought
 		'"But"'
 		'"Get. Out."'
 		'You run out of the apartment and slump to the floor as soon as you''re outside. What are you going to do now? Can you even afford your own apartment? You continue to sob in the same position for several minutes, too distraught to even notice if anyone else was around.'
@@ -985,7 +1022,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'You stare at the floor, only giving your <<$npc_nickname[''A29'']>> the smallest nod you can manage as a reply.'
 		'Kolka follows your example.'
 		'"How could you?" She gasps. "What were you thinking?"'
-		'You start to reply before you <<$npc_nickname[''A29'']>> cuts you off.'
+		'You start to reply before your <<$npc_nickname[''A29'']>> cuts you off.'
 		'"It doesn''t matter; you can''t stay here. You have to leave."'
 		'Your brother grabs your hand before rising to your defense. "<<$npc_nickname[''A29'']>>, that''s not fair. You can’t just kick <<$pcs_nickname>> out."'
 		'"Kolka, sweetheart. Let go of your sister''s hand right now and shut up. Now is not the time."'
@@ -1006,7 +1043,7 @@ if $ARGS[0] = 'pregreactbrother':
 		'"<<$npc_nickname[''A29'']>>, I''m s-"'
 		'She slaps you hard across the face before you can finish the sentence.'
 		'"No, I don''t want to hear it. I can''t deal with you anymore. You need to leave this apartment right now! I don''t ever want to see you here again!"'
-		'She can''t really just toss you out, can she?'
+		+$OpenInnerThought+'She can''t really just toss you out, can she?'+$CloseInnerThought
 		'"But"'
 		'"Get. Out."'
 		'You run out of the apartment and slump to the floor as soon as you''re outside. What are you going to do now? Can you even afford your own apartment? You continue to sob in the same position for several minutes, too distraught to even notice if anyone else was around.'
@@ -1478,10 +1515,10 @@ if $ARGS[0] = 'condom_steal':
 		!! TEMPORARY PICTURE
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'You''re in the corridor as you overhear your parents talking in their bedroom, "I looked everywhere but I can''t find them anywhere..." your <<$npc_nickname[''A29'']>> lets out a dejected sigh.'
-		'"They can''t have just went up in flames..." your step-father answers...'
+		'"They can''t have just went up in flames..." your step-father answers.'
 		'"Well..." <<$npc_nickname[''A29'']>> ponders, "Have you been using several as a safety meassure?"'
-		'"No!" Vladimir answers assertivly, "Maybe it''s one of the kids that got into the stash?"'
-		'"Y-You really think so..." <<$npc_nickname[''A29'']>> gasps...'
+		'"No!" Vladimir answers assertively, "Maybe it''s one of the kids that got into the stash?"'
+		'"Y-You really think so..." <<$npc_nickname[''A29'']>> gasps.'
 		'Not wanting to get into middle of that you quietly continue on, not getting noticed by them.'
 	end
 	act 'Quietly walk away': gt $loc, $loc_arg
@@ -1549,7 +1586,7 @@ if $ARGS[0] = 'condom_find':
 						!! TEMPORARY PICTURE
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 						'You look at her with a straight face and begin to lie, "No, I haven''t had sex! I remember all the talks we had and I would never do anything to break your trust." you confidently reply.'
-						'Your <<$npc_nickname[''A29'']>> looks at you, talling you up from head to toe, "Well then since you''re so confident you won''t mind going to the doctors for a check up then?!"'
+						'Your <<$npc_nickname[''A29'']>> looks at you, tallying you up from head to toe, "Well then since you''re so confident you won''t mind going to the doctors for a check up then?!"'
 						'Deep into your lie and being your only way out you agree to go and get checked, "Fine, I''ll go get checked and then I expect an apology from you when we get the results!"'
 						'"Oh you''ll get an apology if you pass the test..." your <<$npc_nickname[''A29'']>> replies, "But until then I''m keeping you on a short leash..."'
 						'The two of you go back and forth as you decide the details and after a while your <<$npc_nickname[''A29'']>> leaves the room...'
@@ -1684,23 +1721,23 @@ if $ARGS[0] = 'dildo_find':
 					'"Fine, fine... I still don''t understand why you need so many of them..." <<$npc_nickname[''A29'']>> comments as she leaves the room.'
 				elseif dildo = 1 or middildo = 1:
 					'"I''ll give you this at least, you picked a perfect starting dildo. The size should fit someone unexperienced..." <<$npc_nickname[''A29'']>> starts talking about it.'
-					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 					'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 					'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 				elseif largedildo = 1 or bigdildo = 1:
 					'"Isn''t this a bit too big for you? It''s... a bit bigger than I expected to find if I were ever to find something like this..." <<$npc_nickname[''A29'']>> starts talking about it.'
-					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 					'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 					'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 				elseif extradildo = 1 or superdildo = 1:
 					'<<$npc_nickname[''A29'']>> starts laughing, "Well, you didn''t buy a correct one. There is now way this will fit in any hole..."'
-					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 					'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 					'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 				else
-					'"What were you thinking, <<$pcs_nickname>>?! This would ruin you forever! I forbid you to even try using this!" <<$npc_nickname[''A29'']>> is reacting out of line.'
-					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
-					'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
+					'"What were you thinking, <<$pcs_nickname>>?! This would ruin you forever! I forbid you to even try using this!" <<$npc_nickname[''A29'']>> is acting way out of line.'
+					'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
+					'"Okay, okay. Just so you know I''m not too fond of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on.'
 					'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 				end
 				act 'Put away the dildo'+iif(dildo + middildo + largedildo + bigdildo + extradildo + superdildo + maddildo > 1, 's',''): gt 'bedrPar'
@@ -1726,22 +1763,22 @@ if $ARGS[0] = 'dildo_find':
 			'"Fine, fine... I still don''t understand why you need so many of them..." <<$npc_nickname[''A29'']>> comments as she leaves the room.'
 		elseif dildo = 1 or middildo = 1:
 			'"I''ll give your friend this at least, she picked the perfect starting dildo. The size should fit someone unexperienced..." <<$npc_nickname[''A29'']>> starts talking about it.'
-			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 			'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 			'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 		elseif largedildo = 1 or bigdildo = 1:
 			'"Isn''t this a bit too big for you and your friend? It''s... a bit bigger than I expected to find if I were ever to find something like this..." <<$npc_nickname[''A29'']>> starts talking about it.'
-			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 			'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 			'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 		elseif extradildo = 1 or superdildo = 1:
 			'<<$npc_nickname[''A29'']>> starts laughing, "Well, I understand why your friend gave it away, she didn''t buy a correct one. There is now way this will fit in any hole..."'
-			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 			'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 			'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 		else
 			'"What was your friend thinking, <<$pcs_nickname>>?! This would ruin anyone''s lady parts forever! I forbid you to even try using this! Who is your friend that gave you this? I need to call and tell her mother too..." <<$npc_nickname[''A29'']>> is reacting out of line.'
-			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing...'
+			'You quickly yank the dildo out of her hand and start yelling, "I don''t want to talk with you about this! This is so awkward..." as you start blushing.'
 			'"Okay, okay. Just so you know I''m not too found of you owning a dildo but it''s better than having you running around, having sex with boys..." she continues on...'
 			'"<<$npc_nickname[''A29'']>>! Leave! Now!" you start shouting.'
 		end
@@ -1775,8 +1812,8 @@ if $ARGS[0] = 'plug_find':
 			'"I... have..." you meekly answer.'
 			'<<$npc_nickname[''A29'']>> sighs deeply, "Why the hell would you use a butt plug? Are you having anal sex?"'
 			'"No, no..." you swallow hard, "I just wanted to know how it feels..."'
-			'"Feel what?! How to have something shoved up your butt?!" <<$npc_nickname[''A29'']>> is clearly getting more and more upset, "I expected better than this <<$pcs_nickname>>, I''m quite disappointed to be honest..."'
-			'You stand in front of her with your head down, your cheeks are flaming red and you don''t know what to answer...'
+			'"Feel what?! How to have something shoved up your butt?!" <<$npc_nickname[''A29'']>> is clearly getting more and more upset, "I expected better than this <<$pcs_nickname>>, I''m quite disappointed to be honest."'
+			'You stand in front of her with your head down, your cheeks are flaming red and you don''t know what to answer.'
 			'"I won''t be able to stop you now that you''ve started to use it... But I better not hear about you having anal sex with the boys from around here you get it?!" <<$npc_nickname[''A29'']>> sternly tells you off.'
 			act 'Hide the butt plug again': gt 'bedrPar'
 		end
@@ -1826,10 +1863,10 @@ if $ARGS[0] = 'condom_steal':
 		!! TEMPORARY PICTURE
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 		'You''re in the corridor as you overhear your parents talking in their bedroom, "I looked everywhere but I can''t find them anywhere..." your <<$npc_nickname[''A29'']>> lets out a dejected sigh.'
-		'"They can''t have just went up in flames..." your step-father answers...'
+		'"They can''t have just went up in flames..." your step-father answers.'
 		'"Well..." <<$npc_nickname[''A29'']>> ponders, "Have you been using several as a safety meassure?"'
 		'"No!" Vladimir answers assertivly, "Maybe it''s one of the kids that got into the stash?"'
-		'"Y-You really think so..." <<$npc_nickname[''A29'']>> gasps...'
+		'"Y-You really think so..." <<$npc_nickname[''A29'']>> gasps.'
 		'Not wanting to get into middle of that you quietly continue on, not getting noticed by them.'
 	end
 	act 'Quietly walk away': gt $loc, $loc_arg
@@ -1847,7 +1884,7 @@ if $ARGS[0] = 'ask_mother_workout':
 		'"You know what <<$pcs_firstname>>, that sounds like it could be fun. Grab me whenever I''m home or when we''re visiting your grandparents; it''d be nice to get out into the countryside. You''d better be dressed and ready, though!"'
 	else 
 		'"No thanks <<$pcs_firstname>>, I''ll leave all that to people younger than me"'
-		'I guess I need to work at it more. Maybe get more confident about my body to be convincing, improve my relationship with her and find that something to get her to open up... you think to yourself.'
+		+$OpenInnerThought+'I guess I need to work at it more. Maybe get more confident about my body to be convincing or improve my relationship with her and find that extra something to get her to open up.'+$CloseInnerThought
 	end
 	act 'Accept her decision': gt 'mother'
 end
@@ -1860,10 +1897,10 @@ if $ARGS[0] = 'mother_workout_pav':
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	'"You ready to go work out?" You ask her.'
-	'"Ok <<$pcs_firstname>>, I''ll get ready and meet you outside"'
-	'With that you wait outside for your <<$npc_nickname[''A29'']>> to appear'
+	'"Ok <<$pcs_firstname>>, I''ll get ready and meet you outside."'
+	'With that you wait outside for your <<$npc_nickname[''A29'']>> to appear.'
 	act 'Meet her outside for a jog': gt 'mother' , 'mother_jog_pav'
-	act 'Meet her outside for Yoga': gt 'mother' , 'mother_yoga_pav'
+	act 'Meet her outside for yoga': gt 'mother' , 'mother_yoga_pav'
 end
 
 if $ARGS[0] = 'mother_workout_gad':
@@ -1874,10 +1911,10 @@ if $ARGS[0] = 'mother_workout_gad':
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
 	'"You ready to go work out?" You ask her.'
-	'"Ok <<$pcs_firstname>>, I''ll get ready and meet you outside"'
-	'With that you wait outside for your <<$npc_nickname[''A29'']>> to appear'
+	'"Ok <<$pcs_firstname>>, I''ll get ready and meet you outside."'
+	'With that you wait outside for your <<$npc_nickname[''A29'']>> to appear.'
 	act 'Meet her outside for a jog': gt 'mother', 'mother_jog_gad'
-	act 'Meet her outside for Yoga': gt 'mother', 'mother_yoga_gad'
+	act 'Meet her outside for yoga': gt 'mother', 'mother_yoga_gad'
 end
 	
 if $ARGS[0] = 'mother_jog_pav':
@@ -1886,7 +1923,7 @@ if $ARGS[0] = 'mother_jog_pav':
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/resident/mom/ready_run.jpg"></center>'
 	'You are waiting outside in the courtyard when you see your <<$npc_nickname[''A29'']>> appear from around the corner. She does a few stretches before announcing to you that she is ready to get moving. The two of you walk to the park, as you do you chat about a variety of things. Once you get to the park you both do a little stretching before you start jogging.'
-	act 'Get Jogging': 
+	act 'Go Jogging': 
 		*clr & cla
 		gs 'exercise', 'tier1', 60, 'run_exp'
 		fat -= rand(2,6)
@@ -1913,7 +1950,7 @@ if $ARGS[0] = 'mother_yoga_pav':
 	npc_rel['A29'] += rand(5,10)
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-	'You ask your <<$npc_nickname[''A29'']>> if she would like to do some yoga up at the park. "Of course, I''d love to give Yoga a try! I''ll just go and put on some more appropriate clothing"'
+	'You ask your <<$npc_nickname[''A29'']>> if she would like to do some yoga up at the park. "Of course, I''d love to give yoga a try! I''ll just go and put on some more appropriate clothing"'
 	act 'Meet her outside':
 		*clr & cla
 		minut += rand(2,4)
@@ -1925,8 +1962,8 @@ if $ARGS[0] = 'mother_yoga_pav':
 			minut += rand(20,30)
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/mom/pavyoga2.jpg"></center>'
-			'You and your <<$npc_nickname[''A29'']>> do some simple yoga routines together. It isn''t as pressing as when you do them by yourself, but you enjoy being able to spend time with her. Sometimes men walk by and leer at you both for a while, seeming to enjoy the free show.'
-			act 'Just see how your partner is doing': 
+			'You and your <<$npc_nickname[''A29'']>> do some simple yoga routines together. It isn''t as pressing as when you do them by yourself, but you enjoy being able to spend time with her. Sometimes men walk by and leer at you both for awhile, seeming to enjoy the free show.'
+			act 'Check on her': 
 				*clr & cla
 				minut += rand(2,4)
 				gs 'stat'
@@ -1944,9 +1981,9 @@ if $ARGS[0] = 'mother_jog_gad':
 	minut += rand(2,5)
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/resident/mom/ready_run.jpg"></center>'
-	'You go outside to wait for your <<$npc_nickname[''A29'']>> and do a little stretching whilst waiting.'
-	'Your <<$npc_nickname[''A29'']>> is ready very quickly, and she''s showing quite a lot of enthusiasm for the run. She must be looking quite forward to it, or to spending time with you.'
-	'"Well, I''m ready! Shall we set off?"'
+	'You go outside to wait for your <<$npc_nickname[''A29'']>> and do a little stretching while you wait.'
+	'Your <<$npc_nickname[''A29'']>> is ready very quickly, and she''s showing quite a lot of enthusiasm for the run. She must be looking forward to it, or spending time with you.'
+	'"Well, I''m ready! Should we set off?"'
 	act 'Let her take the lead': 
 		*clr & cla
 		gs 'exercise', 'tier1', 60, 'run_exp'
@@ -1954,7 +1991,7 @@ if $ARGS[0] = 'mother_jog_gad':
 		gs 'sweat', 'add', 5
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/resident/mom/gadrun1.jpg"></center>'
-		'Your <<$npc_nickname[''A29'']>> leads you out of the house and into the countryside. You let her take the lead as she knows the area well. This also gives you the chance to chat with her as you jog along. You talk about a variety of topics and enjoy spending the time with your <<$npc_nickname[''A29'']>>, as well as getting the chance to jog around the countryside and see all the interesting routes your <<$npc_nickname[''A29'']>> knows about and enjoys taking.'
+		'Your <<$npc_nickname[''A29'']>> leads you out of the house and into the countryside. You let her take the lead since she knows the area well. This also gives you the chance to chat with her as you jog along. You talk about a variety of topics and enjoy spending time with her, as well as getting the chance to jog around the countryside and see all the interesting routes your <<$npc_nickname[''A29'']>> knows about and enjoys taking.'
 		act 'Return Home':
 			*clr & cla
 			minut += 30
@@ -1974,20 +2011,20 @@ if $ARGS[0] = 'mother_yoga_gad':
 	npc_rel['A29'] += rand(5,10)
 	gs 'stat'
 	'<center><img src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-	'You ask your <<$npc_nickname[''A29'']>> if she would like to do some yoga up at your meadow nearby, reassuring her as to how secluded it is. "Of course, I''d love to give Yoga a try. I''ll just go and put on some more appropriate clothing"'
+	'You ask your <<$npc_nickname[''A29'']>> if she would like to do some yoga up at your meadow nearby, reassuring her as to how secluded it is. "Of course, I''d love to give yoga a try. I''ll just go and put on some more appropriate clothing"'
 	act 'Meet her outside':
 		*clr & cla
 		minut += rand(2,4)
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/resident/mom/gadyoga1.jpg"></center>'
-		'You see your <<$npc_nickname[''A29'']>> has put on some very light clothing and you both head off towards the meadow, chatting as you go. It is not long before you arrive and you quickly get ready to start your routine.'
+		'You see your <<$npc_nickname[''A29'']>> has put on some very light clothing and you both head off towards the meadow, chatting as you go. It''s not long before you arrive and you quickly get ready to start your routine.'
 		act 'Do some yoga':
 			*clr & cla
 			minut += rand(20,30)
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/resident/mom/gadyoga2.jpg"></center>'
 			'You and your <<$npc_nickname[''A29'']>> do some simple yoga routines together. It isn''t as pressing as when you do them by yourself but you enjoy being able to spend time with her. The area is quite secluded and private, and you and your <<$npc_nickname[''A29'']>> are left to run your routine in peace and quiet. It is a nice experience and gives you plenty of time to talk whilst going through your poses and stretches.'
-			act 'Just see how your partner is doing': 
+			act 'Check on her': 
 				*clr & cla
 				minut += rand(2,4)
 				gs 'stat'

+ 18 - 10
locations/sitrPar.qsrc

@@ -16,7 +16,11 @@ if $ARGS[0] = '':
 	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>'
+	if momloc = 19 and sdadloc = 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
 	''
 	'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
@@ -84,10 +88,10 @@ if $ARGS[0] = '':
 			act 'leave': gt 'korrPar'
 		end
 		exit
-	elseif momloc = 19:
+	elseif momloc = 19 and sdadloc = 10:
 		!! 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 doing the same.'
+		!!'<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.'
 		act 'leave':gt 'korrPar'
 		
 		act 'Join them':
@@ -98,13 +102,17 @@ if $ARGS[0] = '':
 			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 Vladimir and pats the spot between her and him. You take a seat between them. Vlad barely even glances at you with a brief smile before he goes back to watching TV, and 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.'
+			!!'<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 Vladimir and pats the spot between her and him. You take a seat between them. Vlad barely even glances at you with a brief smile before he goes back to watching TV. 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 'Keep watching':gt 'sitrPar', 'TVfam'
 			act 'Finish watching':gt 'sitrPar', 'TVend'
-		end		
+		end
+	elseif momloc = 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.'
 	end
 
 	if ocpd_room = 0 and breastpump = 1 and bp_unbox <= 0:
@@ -119,7 +127,7 @@ if $ARGS[0] = '':
 end
 
 
-if $ARGS[0] = 'TVmom':
+if $ARGS[0] = 'TVfam':
 	cla & *clr
 	pcs_mood += 10
 	minut += 30
@@ -127,7 +135,7 @@ if $ARGS[0] = 'TVmom':
 	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 momloc = 19: act'Keep watching TV with your family': gt 'sitrPar', 'TVmom'
+	if momloc = 19: act'Keep watching TV with your family': gt 'sitrPar', 'TVfam'
 	act 'Finish watching':gt 'sitrPar', 'TVend'
 end