Преглед изворни кода

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

hornguy6 пре 1 година
родитељ
комит
a3325cdb03

+ 57 - 49
locations/KatjaHomeTalk.qsrc

@@ -561,7 +561,7 @@ if $ARGS[0] = 'katjaknows':
 	cla
 	npc_pregtalk['A14'] = 1
 	*nl
-	if katjaQW['slut'] < 60 and $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
+	if katjaQW['slut'] < 60 and $wombthfathID = 'A34' and npc_rel['A34'] > 50:
 		minut += 10
 		'"So, who''s the baby-daddy?" Katja teases.'
 		*nl
@@ -570,7 +570,7 @@ if $ARGS[0] = 'katjaknows':
 		'"I wouldn''t be pregnant if he wasn''t," you laugh. "I only let the best cock inside me."'
 		'Katja blushes and you give her a quick kiss before she can react.'
 
-	elseif katjaQW['slut'] < 60 and $wombthfath = 'Stepfather' and npc_rel['A28'] > 50:
+	elseif katjaQW['slut'] < 60 and $wombthfathID = 'A28' and npc_rel['A28'] > 50:
 		minut += 10
 		'"So, who''s the baby-daddy?" Katja teases.'
 		*nl
@@ -578,7 +578,7 @@ if $ARGS[0] = 'katjaknows':
 		'"You were knocked up by your step-dad!? That''s so crazy!"'
 		'Katja blushes and you give her a quick kiss before she can react.'
 
-	elseif katjaQW['slut'] < 60 and $wombthfath = 'Biological Father' and npc_rel['A29'] > 50:
+	elseif katjaQW['slut'] < 60 and $wombthfathID = 'A29' and npc_rel['A29'] > 50:
 		minut += 10
 		'"So, who''s the baby-daddy?" Katja teases.'
 		*nl
@@ -586,7 +586,7 @@ if $ARGS[0] = 'katjaknows':
 		'"You were knocked up by your own father!? That''s so crazy!"'
 		'Katja blushes and you give her a quick kiss before she can react.'
 
-	elseif katjaQW['slut'] < 60 and $wombthfath = '':
+	elseif katjaQW['slut'] < 60 and ($wombthfath = '' or $wombthfathID = 'unknown'):
 		minut += 10
 		'"So, who''s the baby-daddy?" Katja teases.'
 		*nl
@@ -596,7 +596,7 @@ if $ARGS[0] = 'katjaknows':
 		'Katja places a hand on your shoulder "<<$pcs_nickname>>, if I can do anything to make your life a little easier, please let me know."'
 		'You blush and thank her before planting a quick kiss on her cheek.'
 
-	elseif katjaQW['slut'] >= 60 and $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
+	elseif katjaQW['slut'] >= 60 and $wombthfathID = 'A34' and npc_rel['A34'] > 50:
 		minut += 10
 		'"Who''d you let dump their load into that wonderful body of yours?" Katja asks while biting her bottom lip.'
 		*nl
@@ -606,7 +606,7 @@ if $ARGS[0] = 'katjaknows':
 		'Katja chuckles. "I appreciate honesty and I think everyone should be free to explore their passions. Even if those passions revolve around riding your brother''s dick."'
 		'You find yourself questioning what you did to deserve such a wonderful woman in your life.'
 
-	elseif katjaQW['slut'] >= 60 and $wombthfath = 'Stepfather' and npc_rel['A28'] > 50:
+	elseif katjaQW['slut'] >= 60 and $wombthfathID = 'A28' and npc_rel['A28'] > 50:
 		minut += 10
 		'"Who''d you let dump their load into that wonderful body of yours?" Katja asks while biting her bottom lip.'
 		*nl
@@ -616,7 +616,7 @@ if $ARGS[0] = 'katjaknows':
 		'Katja chuckles. "I appreciate honesty and I think everyone should be free to explore their passions. Even if those passions are part of an Electra complex."'
 		'You find yourself questioning what you did to deserve such a wonderful woman in your life.'
 
-	elseif katjaQW['slut'] >= 60 and $wombthfath = 'Biological Father' and npc_rel['A29'] > 50:
+	elseif katjaQW['slut'] >= 60 and $wombthfathID = 'A29' and npc_rel['A29'] > 50:
 		minut += 10
 		'"Who''d you let dump their load into that wonderful body of yours?" Katja asks while biting her bottom lip.'
 		*nl
@@ -626,7 +626,7 @@ if $ARGS[0] = 'katjaknows':
 		'Katja chuckles. "I appreciate honesty and I think everyone should be free to explore their passions. Even if those passions are part of an Electra complex."'
 		'You find yourself questioning what you did to deserve such a wonderful woman in your life.'
 
-	elseif katjaQW['slut'] >= 60 and $wombthfath = '':
+	elseif katjaQW['slut'] >= 60 and ($wombthfath = '' or $wombthfathID = 'unknown'):
 		minut += 10
 		'"Who''d you let dump their load into that wonderful body of yours?" Katja asks while biting her bottom lip.'
 		*nl
@@ -640,7 +640,7 @@ if $ARGS[0] = 'katjaknows':
 		minut += 10
 		'"So, who''s the baby-daddy?" Katja teases.'
 		*nl
-		iif( $wombthfath = '', '"I don''t know who the father is "', '"It looks like I got knocked up by <<$wombthfath>>"')
+		iif( ($wombthfath = '' or $wombthfathID = 'unknown'), '"I don''t know who the father is "', '"It looks like I got knocked up by <<$wombthfath>>"')
 		'"I hope they know how lucky they are," she says while clearly blushing.'
 	end
 	act 'Continue':
@@ -661,48 +661,56 @@ if $ARGS[0] = 'katjaknows1':
 		'"Fuck, I love seeing you pregnant. I hope you''re up for having lots of babies." She blushes intensely and kisses you. "So, who put this one into you?"'
 	end
 	*nl
-	if katjaQW['slut'] < 60 and arrpos('$ChildThFath',$wombthfath) >= 0 and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1 and (($wombthfath = 'Kolka' and npc_rel['A34'] > 50) or ($wombthfath = 'Stepfather' and npc_rel['A28'] > 50) or ($wombthfath = 'Biological Father' and npc_rel['A29'] > 50)):
-		'You tell Katja that <<$wombthfath>> got you pregnant again.'
-		'"Damn, I never thought I''d meet someone who wanted to be an incest baby factory."'
-		'"I just hope he makes you happy. It''s sometimes hard to believe that you''re the woman I fell in love with." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
-
-	elseif katjaQW['slut'] >= 60 and arrpos('$ChildThFath',$wombthfath) >= 0 and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1 and (($wombthfath = 'Kolka' and npc_rel['A34'] > 50) or ($wombthfath = 'Stepfather' and npc_rel['A28'] > 50) or ($wombthfath = 'Biological Father' and npc_rel['A29'] > 50)):
-		'You tell Katja that <<$wombthfath>> got you pregnant again.'
-		'"Damn, I never thought I''d meet someone who wanted to be an incest baby factory."'
-		'"God, you''re the hottest bitch I know. I didn''t think I could be any more in love with you." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
-		'After a few minutes, she breaks the kiss, but keeps her lips inches from yours. "Don''t let this distract from my wanting you to become his breeding bitch. I want him to keep you pregnant. I need something to masturbate about when you’re not around." As soon as she finishes speaking, her lips are magnetically pulled back to yours.'
-
-	elseif katjaQW['slut'] < 60 and arrpos('$ChildThFath',$wombthfath) = arrsize('$ChildThFath')-1 and (($wombthfath = 'Kolka' and npc_rel['A34'] > 50) or ($wombthfath = 'Stepfather' and npc_rel['A28'] > 50) or ($wombthfath = 'Biological Father' and npc_rel['A29'] > 50)):
-		'Blushing, you tell Katja that a member of your family impregnated you, but this time it was <<$wombthfath>>.'
-		'Her eyes widen. "wow, your family must be really close," she giggles.'
-		'"To think I''d fall in love with a woman who lets multiple members of her own family knock her up." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
-
-	elseif katjaQW['slut'] >= 60 and arrpos('$ChildThFath',$wombthfath) = arrsize('$ChildThFath')-1 and (($wombthfath = 'Kolka' and npc_rel['A34'] > 50) or ($wombthfath = 'Stepfather' and npc_rel['A28'] > 50) or ($wombthfath = 'Biological Father' and npc_rel['A29'] > 50)):
-		'Blushing, you tell Katja that a member of your family impregnated you, but this time it was <<$wombthfath>>.'
-		'Her eyes widen. "Wow, your family must be really close," she giggles.'
-		'"Shit, ''which of your family members did you like being knocked up by the most?'' might be the hottest question anyone has ever made me think of. Just when I started thinking I couldn''t love you any more." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
-		'After a few minutes, she breaks the kiss, but keeps her lips inches from yours. "Don''t think I''ll forget the image of you being passed around your family like a good little slut. I need something to masturbate about when you''re not around." As soon as she finishes speaking, her lips are magnetically pulled back to yours.'
-
-	elseif arrpos('$ChildThFath',$wombthfath) >= 0 and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1 and ($wombthfath ! 'Kolka' and $wombthfath ! 'Stepfather' and $wombthfath ! 'Biological Father'):
-		'You tell Katja that you don''t that the father is <<$wombthfath>> again.'
-		'"I hope he makes you happy. And that he doesn''t mind sharing you with me," she blushes. "I would hate to completely lose the woman I love." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
-
-	elseif arrpos('$ChildThFath',$wombthfath) = arrsize('$ChildThFath')-1 and ($wombthfath ! 'Kolka' and $wombthfath ! 'Stepfather' and $wombthfath ! 'Biological Father'):
-		'You tell Katja that you don''t that the father is <<$wombthfath>>.'
-		'"I''m glad you realize you''re too special to limit yourself to one man. I love you too much to let you do anything less." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
-
-	elseif katjaQW['slut'] >= 60 and $wombthfath = '':
-		'You tell Katja that you don''t know you the father is.'
-		'"Seems like you had a little too much fun then," she chuckles.'
-		'"I hope you''ll include me next time."'
-
-	elseif katjaQW['slut'] < 60 and npc_rel['A14'] >= 40 and $wombthfath = '':
-		'You tell Katja that you don''t know you the father is.'
-		'"Seems like you had a little too much fun then," she chuckles.'
+!!The family reactions
+	if ($wombthfathID = 'A34' and npc_rel['A34'] > 50) or ($wombthfathID = 'A28' and npc_rel['A28'] > 50) or ($wombthfathID = 'A29' and npc_rel['A29'] > 50):
+		if $wombthfathID = $ChildThFath[kid-1]:
+			if katjaQW['slut'] >= 60:
+				'You tell Katja that <<$wombthfath>> got you pregnant again.'
+				'"Damn, I never thought I''d meet someone who wanted to be an incest baby factory."'
+				'"God, you''re the hottest bitch I know. I didn''t think I could be any more in love with you." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
+				'After a few minutes, she breaks the kiss, but keeps her lips inches from yours. "Don''t let this distract from my wanting you to become his breeding bitch. I want him to keep you pregnant. I need something to masturbate about when you’re not around." As soon as she finishes speaking, her lips are magnetically pulled back to yours.'
+			else
+				'You tell Katja that <<$wombthfath>> got you pregnant again.'
+				'"Damn, I never thought I''d meet someone who wanted to be an incest baby factory."'
+				'"I just hope he makes you happy. It''s sometimes hard to believe that you''re the woman I fell in love with." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
+			end
+		else
+			if katjaQW['slut'] >= 60:
+				'Blushing, you tell Katja that a member of your family impregnated you, but this time it was <<$wombthfath>>.'
+				'Her eyes widen. "Wow, your family must be really close," she giggles.'
+				'"Shit, ''which of your family members did you like being knocked up by the most?'' might be the hottest question anyone has ever made me think of. Just when I started thinking I couldn''t love you any more." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
+				'After a few minutes, she breaks the kiss, but keeps her lips inches from yours. "Don''t think I''ll forget the image of you being passed around your family like a good little slut. I need something to masturbate about when you''re not around." As soon as she finishes speaking, her lips are magnetically pulled back to yours.'
+			else
+				'Blushing, you tell Katja that a member of your family impregnated you, but this time it was <<$wombthfath>>.'
+				'Her eyes widen. "wow, your family must be really close," she giggles.'
+				'"To think I''d fall in love with a woman who lets multiple members of her own family knock her up." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
+			end
+		end
+!!The non-family reactions
 	else
-		'You tell Katja that you prefer not to say who the father is.'
-		'"Seems like you had a little too much fun then," she chuckles.'
+		if $wombthfathID = $ChildThFath[kid-1]:
+			'You tell Katja that <<$wombthfath>> is the father again.'
+			'"I hope he makes you happy. And that he doesn''t mind sharing you with me," she blushes. "I would hate to completely lose the woman I love." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
+		elseif $wombthfath = '' or $wombthfathID = 'unknown':
+			if katjaQW['slut'] >= 60:
+				'You tell Katja that you don''t know you the father is.'
+				'"Seems like you had a little too much fun then," she chuckles.'
+				'"I hope you''ll include me next time."'
+			else
+				if npc_rel['A14'] >= 40:
+					'You tell Katja that you don''t know you the father is.'
+					'"Seems like you had a little too much fun then," she chuckles.'
+				else
+					'You tell Katja that you prefer not to say who the father is.'
+					'"Seems like you had a little too much fun then," she chuckles.'
+				end
+			end
+		else
+			'You tell Katja that the father is <<$wombthfath>>.'
+			'"I''m glad you realize you''re too special to limit yourself to one man. I love you too much to let you do anything less." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
+		end
 	end
+
 	act 'Continue':
 		minut += 10
 		if $loc = 'katja_dorm':

+ 2 - 2
locations/albina_starlets.qsrc

@@ -335,7 +335,7 @@ if $ARGS[0] = 'starlets':
 							if AlbinaQW['StarletCustomer'] = 1:
 								AlbinaQW['StarletsCustomerCount'] = 1
 								AlbinaQW['StarletPay'] = rand(3,6)
-								'You see a flabby, balding Armenian man in his 50s wearing an expensive suit approach Albina and start talking to her. She avoids eye contact and looks rather uncomfortable talking to him.'
+								'You see a flabby and balding middle aged Armenian man wearing an expensive suit approach Albina and start talking to her. She avoids eye contact and looks rather uncomfortable talking to him.'
 							elseif AlbinaQW['StarletCustomer'] = 2:
 								AlbinaQW['StarletsCustomerCount'] = 2
 								AlbinaQW['StarletPay'] = rand(6,9)
@@ -1494,7 +1494,7 @@ if $ARGS[0] = 'StarletsPracticeMissed':
 		act 'Train with Starlets': gt 'albina_starlets', 'starlets'
 	else
 	  gs 'npc_relationship', 'set', 'A23', 10
-		'You are walk into the hall and freeze when you clock a furious Albina heading straight for you. You barely have time to react before she grabs your shirt and pulls you up close, silencing the hall as everyone looks at you.'
+		'You walk into the hall and freeze when you clock a furious Albina heading straight for you. You barely have time to react before she grabs your shirt and pulls you up close, silencing the hall as everyone looks at you.'
 		'Albina glares directly into your eyes. "ARE YOU DOING THIS TO MOCK ME YOU FUCKING BITCH?! I GAVE YOU ONE. LAST. FUCKING. CHANCE AND YOU THROW IT BACK IN MY FUCKING FACE?!" She releases you, but still gets up in your face. "You''re done. Get the fuck out of here and don''t let me catch you here again, you hear me?!"'
 		'She then crosses her arms and glares at you until you leave. With the other girls staring at you, you shamefully walk out of the hall.'
 		act 'Leave':AlbinaQW['StarletsJoined'] = -1 & gt 'pav_commcenter'

+ 0 - 2
locations/booty_call_cowgirl.qsrc

@@ -74,8 +74,6 @@ if $ARGS[0] = 'cowgirl_start':
 			elseif $booty_call['position'] = 'cowgirl':
 				'You crawl forward back into position, throwing your legs over his.'
 				'"I''m not done riding you."'
-			else
-				'You push him back onto the bed and throw your legs over his.'
 			elseif $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl':
 				'"I want to be on top this time," you say, giving <<$npc_firstname[$boy]>> a smouldering look as you mount his cock.'
 			else

+ 0 - 2
locations/booty_call_doggy.qsrc

@@ -112,8 +112,6 @@ if $ARGS[0] = 'doggy_start':
 				'"Fuck me from behind."'
 			elseif $booty_call['position'] = 'doggy':
 				'You get back on your knees, waggling your ass enticingly at him.'
-			else
-				'You turn around and get on your knees, presenting your ass towards him.'
 			elseif $booty_call['position'] = 'miss' or $booty_call['position'] = 'cowgirl':
 				'"I want you to fuck me from behind this time," you say, giving him a sultry look over your shoulder.'
 			else

+ 2 - 2
locations/booty_call_pillow_talk2.qsrc

@@ -308,7 +308,7 @@ if $ARGS[0] = 'made_me_late1':
 	if schoolprogul > 0 and npc_school_absences[$boy] < schoolprogul and npc_school_absences[$boy] > 0:
 		act'Made me late for school again':
 			cla
-			act'Annoyed'
+			act'Annoyed':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 				if npc_last_sex[$boy] = daystart:
@@ -328,7 +328,7 @@ if $ARGS[0] = 'made_me_late1':
 	elseif schoolprogul > 0:
 		act'Made me late for school':
 			cla
-			act'Annoyed'
+			act'Annoyed':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 				if npc_last_sex[$boy] = daystart:

+ 23 - 14
locations/brother.qsrc

@@ -1516,10 +1516,10 @@ if $ARGS[0] = 'pregreact':
 			cla
 			'Surprised, your brother looks at your stomach, "Are you really pregnant? It... it''s not mine, is it?"'
 			*nl
-			if $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
+			if $wombthfathID = 'A34' and npc_rel['A34'] > 50:
 				act 'Yes (Happy)':gt 'brother', 'brotherknows1'
 				act 'Yes (Angry)':gt 'brother', 'brotherknows2'
-			elseif $wombthfath = '':
+			elseif arrpos('$wombpotfath', 'A34') >= 0:
 				act 'Maybe (Happy)':gt 'brother', 'brotherknows3'
 				act 'Maybe (Angry)':gt 'brother', 'brotherknows4'
 			else
@@ -1541,10 +1541,10 @@ if $ARGS[0] = 'pregreact':
 		cla
 		'Kolka looks at your stomach for moment before asking, "Wow, you''re pregnant again? Is it mine?"'
 		*nl
-		if $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
-			act 'Yes':gt 'brother', 'brotherknows6'
-		elseif $wombthfath = '':
+
+		if arrpos('$wombpotfath', 'A34') >= 0:
 			act 'Maybe':gt 'brother', 'brotherknows7'
+			if $wombthfathID = 'A34' and npc_rel['A34'] > 50: act 'Yes':gt 'brother', 'brotherknows6'
 		else
 			act 'No':gt 'brother', 'brotherknows8'
 		end
@@ -1641,7 +1641,7 @@ end
 if $ARGS[0] = 'brotherknows6':
 	npc_pregtalk['A34'] = 1
 	*nl
-	if arrpos('$ChildThFath','Kolka') >= 0 and arrpos('$ChildThFath','Kolka') ! arrsize('$ChildThFath')-1 and BrotherHappy = 1:
+	if arrpos('$ChildThFath','A34') >= 0 and BrotherHappy = 1:
 		cla
 		'"Yeah, you knocked me up again," you smile at him. "I think you''re doing this on purpose." You walk closer to your brother and straddle his lap. You affectionately wrap your arms around his neck and lean your face close to his, "You like knocking up your sister, don''t you? You just love that this belly shows the whole world that I let my own brother fuck me, huh?"'
 		'Kolka stares into your <<$pcs_eyecol>> eyes, his face bright red and a bulge growing in his pants.'
@@ -1684,7 +1684,7 @@ if $ARGS[0] = 'brotherknows6':
 
 			act 'Continue':minut += 10 & gt 'sitrPar'
 		end
-	elseif arrpos('$ChildThFath','Kolka') >= 0 and arrpos('$ChildThFath','Kolka') ! arrsize('$ChildThFath')-1 and BrotherAngry = 1:
+	elseif arrpos('$ChildThFath','A34') >= 0 and BrotherAngry = 1:
 		cla
 		'"Yeah, it''s yours. I can''t believe you got me pregnant again." You shake your head, "I don''t know why the hell I thought you''d be more careful after the first time."'
 		'"You thought I''d be more careful? It takes two, sweetheart." He chuckles, "And besides, I didn''t hear you complaining while we were fucking."'
@@ -1705,7 +1705,7 @@ if $ARGS[0] = 'brotherknows6':
 
 			act 'Continue':minut += 10 & gt 'sitrPar'
 		end
-	elseif arrpos('$ChildThFath','Kolka') >= 0 and arrpos('$ChildThFath','Kolka') ! arrsize('$ChildThFath')-1 and BrotherHappy = 1:
+	elseif $wombthfathID = 'A34' and BrotherHappy = 1:
 		cla
 		act 'Happy':gt 'brother', 'brotherknows1'
 		act 'Angry':gt 'brother', 'brotherknows2'
@@ -1713,7 +1713,7 @@ if $ARGS[0] = 'brotherknows6':
 		cla
 		*pl
 		'If you see this text, report it please as a bug and remember a few variables:'
-		'arrposkolka = <<arrpos(''$ChildThFath'',''Kolka'')>>'
+		'arrposkolka = <<arrpos(''$ChildThFath'',''A34'')>>'
 		'arrsizeChild = <<arrsize(''$ChildThFath'')-1>>'
 		'momKnowsKolka = <<momKnowsKolka>>'
 		'brotherBlackmail = <<brotherBlackmail>>'
@@ -1727,18 +1727,19 @@ if $ARGS[0] = 'brotherknows7':
 	cla
 	npc_pregtalk['A34'] = 1
 	*nl
-	if arrpos('$ChildThFath','Kolka') >= 0 and arrpos('$ChildThFath','Kolka') ! arrsize('$ChildThFath')-1 and BrotherHappy = 1:
+!! $ChildThFath gets applied in labor so it is relatively good way to check if you think you already have babies with somebody
+	if arrpos('$ChildThFath','A34') >= 0 and BrotherHappy = 1:
 		'"It could be, I''m still not sure yet. I just wanted to give you a heads up." You then add with a wink, "Honestly, I''m kind of hoping it is. I would love to be carrying another one of my brother''s children."'
 		'"I hope so, too," he states just a little too eagerly. He then quickly moves his lips to yours and you share a passionate kiss.'
 
 		act 'Continue' :gt 'sitrPar'
-	elseif arrpos('$ChildThFath','Kolka') >= 0 and arrpos('$ChildThFath','Kolka') ! arrsize('$ChildThFath')-1 and BrotherAngry = 1:
+	elseif arrpos('$ChildThFath','A34') >= 0 and BrotherAngry = 1:
 		'"I''m still not sure," you say. "But if it is, you had better take responsibility."'
 		'Your brother rolls his eyes, "Then I really hope it''s someone else''s problem."'
 		'"Fuck off! If it''s yours then I''ll make sure you take responsibility!" You then storm away, leaving Kolka to stew.'
 
 		act 'Continue' :gt 'sitrPar'
-	elseif $wombthfath ! 'Kolka' and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1:
+	else
 		act 'Happy':gt 'brother', 'brotherknows3'
 		act 'Angry':gt 'brother', 'brotherknows4'
 	end
@@ -1748,19 +1749,27 @@ if $ARGS[0] = 'brotherknows8':
 	cla
 	npc_pregtalk['A34'] = 1
 	*nl
-	if arrpos('$ChildThFath','Kolka') = arrsize('$ChildThFath')-1:
+	if $wombthfathID ! 'A34' and arrpos('$ChildThFath','A34') >= 0 and $wombthfathID ! 'unknown':
 		'"Not this time. It''s actually <<$wombthfath>>''s. Why, were you hoping you''d give me more children? Sorry, but this body is just too good to limit myself to one man, even if that man is my cute younger brother," you giggle.'
 		'Kolka licks his lips, "Well, you do have a great body, so I''ll concede that point."'
 		'"You know I love you, but please don''t take this as an invitation to try to get me pregnant again. I don''t know if I''m ready for more kids." Your brother nods, clearly disappointed. "Hey, you can still fuck me, you just have to be careful."'
 
 		act 'Continue' :gt 'sitrPar'
-	elseif $wombthfath ! 'Kolka' and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1:
+	elseif $wombthfathID ! 'A34' and arrpos('$ChildThFath','A34') < 0 and $wombthfathID ! 'unknown':
 		'You shake your head, "No, not this time either. It''s actually <<$wombthfath>>''s."'
 		'"Oh, congratulations again, then." You still catch disappointment in his voice.'
 		'You question him, "You weren''t trying to get me pregnant, were you?"'
 		'"Wh-what? No, of course not. I''m really happy for you." You''re pretty sure he''s lying, but you''re not going to push the subject. He''s lucky he''s cute.'
 		'"Hey, you''re my brother and I''ll love you no matter what happens. But don''t try to get me pregnant after I give birth this time. I am really not ready for more children." He nods in agreement.'
 
+		act 'Continue' :gt 'sitrPar'
+	else
+	!! Somebody with writing skills should add flavor.
+		'No, it is not.'
+		if $wombthfathID = 'unknown':
+			'I actually have no idea whose this one is.'
+		end
+
 		act 'Continue' :gt 'sitrPar'
 	end
 end

+ 8 - 12
locations/brother_shower_sex.qsrc

@@ -408,8 +408,7 @@ if $ARGS[0] = 'brother_shower_anal_vagv_analv':
 end
 
 if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
-	*clr
-	cla
+	cla & *clr
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 	'You chew your lip, debating with yourself internally before just spitting it out.'
 	*nl
@@ -425,8 +424,7 @@ if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
 	*nl
 	'While you''re not sure if you like the label ''pussy juice'', it''s the only plan you''ve got.'
 	act '"Okay, let''s do that."':
-		*clr
-		cla
+		cla & *clr
 		'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/showeranal2.mp4"></center>'
 		'Moving in behind you, Kolka lines up with your pussy before thrusting in. Feeling this, you consider hitting the abort button and returning to what you''re more familiar with, but you want that new experience and still feel the need to try it.'
 		'You widen your stance and push your ass towards Kolka. He grips your hip and his cock slowly pushes at your virgin hole. As the head of Kolka''s cock enters you, he pauses and lets out an annoyed grunt.'
@@ -437,8 +435,7 @@ if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
 		gs 'arousal', 'vaginal', 2
 		gs 'stat'
 		act 'This is nice':
-			*clr
-			cla
+			cla & *clr
 			'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/showeranal3.mp4"></center>'
 			'You briefly think about switching back to ''normal'' shower sex, but you still want to try this and want to see it though.'  
 			'"Keep going," you say, and Kolka pushes deeper, stopping every few seconds to let you breathe before continuing.'  
@@ -446,6 +443,7 @@ if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
 			'"Sorry, I''ll try to stop..."' 
 			'"No, it''s not a complaint, it was just unexpected," he replies.'
 			act 'Try to relax':
+				cla & *clr
 				'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/showeranal6.mp4"></center>'
 				'After another minute, Kolka asks "Can I start to move now?"'  
 				'You take a deep breath. "Yes, but go slow."'  
@@ -453,8 +451,7 @@ if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
 				gs 'arousal', 'anal', 2
 				gs 'stat'
 				act 'Enjoy':
-					*clr
-					cla
+					cla & *clr
 					'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/showeranal6.mp4"></center>'
 					'You find yourself needing to brace yourself on the wall with your hands. You didn''t even notice, but you''ve bent forward, allowing Kolka better access as his speed increases.'
 					'You''re really getting into it now, and are surprised by how good you feel.'
@@ -464,14 +461,13 @@ if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
 					gs 'cum_call', 'anal', 'A34', 1
 					gs 'stat'
 					act 'Wash yourselves':
-						gs 'arousal', 'end'
-						gs 'stat'
-						*clr
-						cla
+						cla & *clr
 						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brotherwash.jpg"></center>'
 						'As you both quickly rewash yourselves, Kolka asks "So, was it good? More importantly, will you want to do it again?"'  
 						'You''re slightly annoyed by the ''more importantly'' part, but can''t deny that you''ve enjoyed your first butt fucking.'  
 						'"It was..." you say, letting it hang for a moment before finishing with "Good. Will it happen again? I''ll think about it."'
+						gs 'arousal', 'end'
+						gs 'stat'
 						act'Finish':mirror_steam = hour & gt $loc
 					end
 				end

+ 1 - 1
locations/clothing_QV.qsrc

@@ -1359,7 +1359,7 @@ if $ARGS[0] = 'change':
 					end
 				end
 			else
-				if CloThinness < 6:		
+				if CloThinness < 6 or $clothingworntype = 'salacious_outfits' or $clothingworntype = 'salacious_dress':	
 					act 'Wear this outfit':
 						cla
 						*clr		

+ 2 - 2
locations/ender.qsrc

@@ -130,7 +130,7 @@ if $ARGS[0] = 'loss':
 		Loss += 1
 		if rikudo > 10:rikudo -= 10
 		if $loc = 'pav_park' or $loc = 'city_park':
-			gt'rape_events','park_fight_rape'
+			gt'rape_events','park_rape_solo'
 		elseif $region = 'pav' or $region = 'city':
 			gt'rape_events','urban_fight_rape'
 		end
@@ -812,7 +812,7 @@ if $ARGS[0] = 'surrender':
 		Loss += 1
 		if rikudo > 10:rikudo -= 10
 		if $loc = 'pav_park' or $loc = 'city_park':
-			gt'rape_events','park_fight_rape'
+			gt'rape_events','park_rape_solo'
 		elseif $region = 'pav' or $region = 'city':
 			gt'rape_events','urban_fight_rape'
 		end

+ 33 - 29
locations/femcyc.qsrc

@@ -15,11 +15,12 @@
 !!
 !!------------------------------------------------------------------------------------------------------------
 !!
-!!	$ChildFath : array for names of the childs biological father
+!!	$ChildFath : array for names of the childs biological father. This should be the absolute truth, not readily available information for the characters.
 !!	$ChildFathDNA : array for the DNA of the childs father
-!!	$ChildThFath : array for the names of the childs believed father (can be different from the biological father)
+!!	$ChildThFath : array for the IDs of the childs believed father (can be different from the biological father and should be in form of ID ie. 'A34' or 'unknown' if Sveta has no idea) Do not use for pregnancy events as it is only updated when going to labor. This is probably the variable you want to work with when doing paternity tests, or if father reacts to physical traits not matching despite Sveta claiming they are the dad.
+!!		arrpos('$ChildThFath', 'A34') >= 0 can be used to test if the person 'A34' (Kolka, for example) has already had a child with you
 !!	$childtype : child type. single child, fraternal twin, identical twin ...
-!!	$cumfthname : the name of the father if sveta is sure
+!!	$cumfthname : Array of IDs of the possible fathers (conscious acts) 'unknown' if otherwise empty
 !!	$cycreport_txt : Text for the current menstruation cycle. e.g. In labour.
 !!	$d_cycreport_update : Dynamic variable to update cycle report
 !!	$d_pregmovement : Dynamic variable for kid movement
@@ -29,7 +30,10 @@
 !!	$pcs_dna : Svetas DNA
 !!	$wombDNA : sperm in womb potent enough to cause pregnancy
 !!	$wombName : the identifier of the NPC
-!!	$wombpotfath : the used name of the potential father, if sveta is not sure
+!!	$wombpotfath : the array of IDs of the potential fathers
+!!	$wombthfath : The name of the person Sveta believes to be the father of ongoing pregnancy, updated from the cycle menu decision.
+!!	$wombthfathID : The ID of the person Sveta believes to be the father of ongoing pregnancy, updated from the cycle menu decision. - Might be best variable for pregnancy events with the dad
+!!		arrpos('$wombpotfath', 'A34') >= 0  can be used to test if the person 'A34' (Kolka, for example) is in the list of potential fathers
 !!	arrmodtmp : temp array used in pregnancy progression
 !!	babyembryo : used during implant phase. if the fertegg successfully nests, babyembryo is +1. BabyEmbryo is for how many unborn babies are inside Sveta.
 !!	Babyptype : pregnancy type of unborn babies. they might be unimplanted 0, healthy 1, or Ectopic 2.
@@ -112,7 +116,6 @@
 !!	succubusflag : used for succubus story arc. If Sveta is a succubus, the sperm will be absorbed
 !!	succubxp : succubus experience
 !!	succycletmp : succubus cycle temp var. Used during sperm absorption function.
-!!	tempbabyi : temp var for baby variable removal.
 !!	tempovbonus : temp var for ovulation bonus. Fertility bonus.
 !!	temprand : used as temp var for randomizer
 !!	tempwbbonus : temp variable for womb bonus during egg implant function
@@ -139,10 +142,10 @@
 !!
 !!	sparrloc : Location of the sperm, as per cumarrdel
 !!	sparrnam : Spatter Owner
-!!	sparrppt : Spatter Potential Potency (Used to increase potency if you don't clean yourself out)
+!!	sparrppt : Spatter Potential Potency (Used to increase potency if you do not clean yourself out)
 !!	sparridt : Did you know/realize who did it?
 !!	sparrvol : Volume of the spatter. 40 is average.
-!!	sparrslc : Spread status of the spatter. High volume can spread the contaminant from it's starting place.
+!!	sparrslc : Spread status of the spatter. High volume can spread the contaminant from it is starting place.
 !!	sparrcnt : Unique identifier of the exact which time the MC has had this spatter incident occur.
 !!
 !!	Values of 'cumarrdel' as defined by the cum_arr (taken from Cum_Manage.qsrc):
@@ -545,7 +548,6 @@ if $ARGS[0] = 'cyc2':
 				$wombDNA[y] = $npc_dna[$cumarrnam[can_idx]]
 				wombAmount[y] = cumarrcpt[can_idx]
 				$wombName[y] = $cumarrnam[can_idx]
-
 			else
 				!! This DNA is in the womb, but does it belong to the same guy?
 				x = 0
@@ -580,8 +582,8 @@ if $ARGS[0] = 'cyc2':
 			end
 
 			cum_total += cumarrcpt[can_idx]
-
-		if can_idx < can_sz:can_idx += 1 & jump 'FatherCumAnalyze'
+		can_idx += 1 
+		if can_idx < can_sz: jump 'FatherCumAnalyze'
 
 		!! setting the default believed father if there is no difficult choice or there is no choice
 		if arrsize('$cumfthname') = 2 and cumtime[0] = 0:
@@ -641,11 +643,6 @@ if $ARGS[0] = 'cyc2':
 				$kid_dna[nextbaby] = func('DNA', 'generate', $pcs_dna, $npc_dna[$cumfathlotto[lotto_idx]])
 				$ChildFath[nextbaby] = $cumfathlotto[lotto_idx]
 				$ChildFathDNA[nextbaby] = $cumfatherDNA[lotto_idx]
-				if arrsize('$wombpotfath') = 1:
-					$ChildThFath[nextbaby] = $wombpotfath[0]
-				else
-					$ChildThFath[nextbaby] = 'unknown'
-				end
 				hairkid[nextbaby] = rand(0, 3)
 				eyeskid[nextbaby] = rand(0, 3)
 				ChildConType[nextbaby] = cumarrcon[nextbaby]
@@ -787,18 +784,17 @@ if $ARGS[0] = 'cyc3':
 		:lutcycloop
 		if rej_idx < rej_sz:
 			if Babyptype[rej_idx] = 0:
-				killvar 'polkid',tempbabyi
-				killvar '$kidname',tempbabyi
-				killvar 'kidage',tempbabyi
-				killvar 'daykid',tempbabyi
-				killvar 'monthkid',tempbabyi
-				killvar 'yearkid',tempbabyi
-				killvar 'Babyptype',tempbabyi
-				killvar '$ChildFath',tempbabyi
-				killvar '$ChildThFath',tempbabyi
-				killvar 'hairkid',tempbabyi
-				killvar 'eyeskid',tempbabyi
-				killvar 'cumarrcon',tempbabyi
+				killvar 'polkid',rej_idx
+				killvar '$kidname',rej_idx
+				killvar 'kidage',rej_idx
+				killvar 'daykid',rej_idx
+				killvar 'monthkid',rej_idx
+				killvar 'yearkid',rej_idx
+				killvar 'Babyptype',rej_idx
+				killvar '$ChildFath',rej_idx
+				killvar 'hairkid',rej_idx
+				killvar 'eyeskid',rej_idx
+				killvar 'cumarrcon',rej_idx
 				FertEgg -= 1
 			end
 			rej_idx += 1
@@ -902,11 +898,19 @@ if $ARGS[0] = 'preg':
 		if lactation['active'] < 1: func('lact_lib','lact_switch')
 		$cycreport_txt = 'In labour'
 		arrmodtmp = arrsize('$ChildFath')
-		arrmodtmp -= (babyembryo+1)
+		arrmodtmp -= (babyembryo)
 		:babyfinalpreploop
 		if arrmodtmp < arrsize('$ChildFath') and daykid[arrmodtmp] = 0:
 			daykid[arrmodtmp] = 42
-			$ChildThFath[arrmodtmp] = $wombthfath
+			!! $wombthfathID is the ID of the character Sveta has chosen as believed father in the cycle menu
+			!! checking the there is a valid ID that resolves into a name, if yes then applying that ID as believed father
+			if $npc_usedname[$wombthfathID] ! '':
+				$ChildThFath[arrmodtmp] = $wombthfathID
+			else
+			!! if the ID does not resolve into a name then it is probably some legacy event father
+			!! like 'A sperm donor' or else 'unknown'. In either case it should not cause issues if all outliers are designated 'unknown'
+				$ChildThFath[arrmodtmp] = 'unknown'
+			end
 			arrmodtmp += 1
 			jump 'babyfinalpreploop'
 		end

+ 2 - 2
locations/fertility.qsrc

@@ -484,10 +484,10 @@ if $ARGS[0] = 'cum_arrcheat':
 			$cycletemp[4] = 'improperly defined'
 		end
 		$cycletemp[5] = $npc_usedname[$ChildFath[cycletemp]]
-		if $ChildThFath[cycletemp] ! 'unknown':
+		if $npc_usedname[$ChildThFath[cycletemp]] ! '':
 			$cycletemp[7] = $npc_usedname[$ChildThFath[cycletemp]]
 		else
-			$cycletemp[7] = ''
+			$cycletemp[7] = $ChildThFath[cycletemp]
 		end
 		!'Index number: <<cycletemp>>. Name of the kid: <<$kidname[cycletemp]>>. Age of the kid: <<kidage[cycletemp]>>. Born(M/D/Y): <<monthkid[cycletemp]>> / <<daykid[cycletemp]>> / <<yearkid[cycletemp]>>. Sex: <<$cycletemp[2]>>. Pregnancy Type: <<$cycletemp[3]>>. Biological Father: <<$ChildFath[cycletemp]>>. Believed Father: <<$ChildThFath[cycletemp]>>. Child Eye Color: <<eyeskid[cycletemp]>>. Child Hair Color: <<hairkid[cycletemp]>>. Child Type: <<$childtype[cycletemp]>>. Child Contraceptive Type: <<$cycletemp[4]>>'
 		*P '<TR><TD><<cycletemp>></TD><TD><<$kidname[cycletemp]>></TD><TD><<kidage[cycletemp]>></TD><TD><<monthkid[cycletemp]>> / <<daykid[cycletemp]>> / <<yearkid[cycletemp]>></TD><TD><<$cycletemp[2]>></TD><TD><<$cycletemp[3]>></TD><TD><<$ChildFath[cycletemp]>> - <<$cycletemp[5]>></TD><TD><<$ChildThFath[cycletemp]>> - <<$cycletemp[7]>></TD><TD><<eyeskid[cycletemp]>></TD><TD><<hairkid[cycletemp]>></TD><td><<$childtype[cycletemp]>></td><TD><<$cycletemp[4]>></TD><TD><<$kid_dna[cycletemp]>></TD></TR>'

+ 100 - 105
locations/gschool_nerd_chats.qsrc

@@ -838,7 +838,7 @@ if $ARGS[0] = 'zinaida':
 			'You understand she''s only available because she has nothing better to do, but you''re glad you don''t have to spend the break all alone at least.'
 			*nl
 			'She soon starts talking about video games. It seems she doesn''t mind who she''s talking to as long as somebody listens. She tells you some interesting stories that happened to her, and complains about the prices of the games.'
-			'"On the other hand, there are always free games to play..." she continues but points out why free to play games can be more expensive than some of the most popular video games in the long run.'
+			'"On the other hand, there are always free games to play..." she continues, but points out why free to play games can be more expensive than some of the most popular video games in the long run.'
 			'After continuing to talk for a few more minutes, she takes her notes out of her backpack. "We''ll continue this next time, maybe. But for now, I''d like to check my homework before the lesson starts. See you." With that, she turns to her desk and starts revising her homework.'
 		end
 	end
@@ -856,132 +856,127 @@ if $ARGS[0] = 'natalia':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big240.jpg"></center>'
 	if VKAftermathEvent > 0 and VKNatFollowup = 0:
 		VKNatFollowup = 1
-		'You sit next to Natalia and she quickly turns to you with a warm smile. "<<$pcs_nickname>>! It''s so great to see you! I hope you''re feeling better? You''ve been through so much." You give her a forced smile as you reply. "I''m fine Nat. Thanks for caring, though."' 
-		'Natalia''s smile turns to a frown as she responds. "You''re still having the nightmares, aren''t you? I''m looking for a way to help you with those. I plan on asking my mother for something. She used to get a lot of nightmares when she was young, so she might know of some good ways to get rid of them." You place your hand on her shoulder. "Don''t worry about me Nat. I''ll be fine." Nat places her hand on yours, then nods before you get up and head back to class.'
+		'You sit next to Natalia and she quickly turns to you with a warm smile. "<<$pcs_nickname>>! It''s so great to see you! I hope you''re feeling better? You''ve been through so much."' 
+		'You give her a forced smile as you reply. "I''m fine Nat. Thanks for caring, though."' 
+		'Natalia''s smile turns to a frown as she responds. "You''re still having the nightmares, aren''t you? My mother used to get a lot of nightmares when she was young, so she might know of some good ways to get rid of them."' 
+		'You place your hand on her shoulder. "Don''t worry about me, Nat. I''ll be fine." Natalia places her hand on yours, then nods before you get up and head back to class.'
 	else
 		if NikoEv >= 17 and VKNatFollowup = 1:
 			VKNatFollowup = 2
-			'You approach Natalia and her eyes immediately light up. "Hey <<$pcs_nickname>>! It''s always good to see you. I hope things have been going better with Niko?" You give her an approving nod. "Well if you ever need to talk about anything, then please stop by. I always look forward to chatting with you." You rub Natalia''s shoulder as she gives you a warm smile before you get up to go to your next class.'
+			'You approach Natalia and her eyes immediately light up. "Hey <<$pcs_nickname>>! It''s always good to see you. I hope things have been going better with Niko?"' 
+			'You give her an approving nod. "Well if you ever need to talk about anything, then please stop by. I always look forward to chatting with you." You rub Natalia''s shoulder as she gives you a warm smile before you get up to go to your next class.'
 		else
 			if nataliaQW['introduction'] = 0: 
 				gs 'natalia_pavlova', 'first_chat'
 			else
 				if fame['pav_slut'] > 175:
 					if npc_rel['A240'] <= 30:
-						'You see Natalia sitting with the nerds, reading a book as you approach her. As Natalia notices you, she glances up at you and says in a nervous voice, "Oh, hello, <<$pcs_nickname>>."'
-						'"Hi Natalia, just thought I''d come and say hello," you say. "I see you are reading again. May I ask what it''s about?"'
-						'"It''s called Anna Karenina by Leo Tolstoy. It''s a famous book about a woman named Anna who doesn''t love her husband but loves a man named Alexei Vronsky and explores the relationship with her son to whom she''s totally devoted."'
-						'"Sounds interesting, Natalia. But, I bet it won''t end well." You say with a smile.'
-						'"Probably not <<$pcs_nickname>>. It''s written by a Russian, after all." Natalia says with a rueful smile. "Look, <<$pcs_nickname>>, I don''t want to be rude, but unless you clean up your act, I can''t be seen talking to you as I don''t want to get a bad reputation too." With that, she looks away from you and returns to reading her book.'
-						'"Okay, Natalia, I''d best start heading to class anyway."'
-						'You turn away and wait for the next class to begin thinking she seems nice. At least she didn''t completely blank you, and she was polite, which made a nice change from the typical rudeness you encounter from most of your classmates.'
+						'You see Natalia sitting with the nerds, reading a book. She glances up when she notices you. "Oh. Hey <<$pcs_nickname>>..." she says in a nervous voice.'
+						'"Hey Natalia, just thought I''d come and say hello," you reply. "I see you''re reading again. What''s it about?"'
+						'"It''s called ''Anna Karenina'' by Leo Tolstoy. It''s a famous book about a woman who loves a man that isn''t her husband. It also explores her relationship with her son, to whom she''s totally devoted."'
+						'"Sounds interesting. I bet it won''t end well, though," you reply with a smile.'
+						'"Probably not. It''s written by a Russian after all," she says before frowning. "Look, I don''t want to be rude, but unless you clean up your act, I can''t be seen talking to you. I don''t want to get a bad reputation." She returns to reading her book without waiting for an answer.'
+						'You turn away and wait for the next class. At least she didn''t completely blank you, and she was polite, which made a nice change from the typical attitude you get from most of your classmates.'
 					elseif npc_rel['A240'] <= 40:
-						'You see Natalia sitting with the nerds, reading a book as you approach her. As Natalia notices you, she glances up at you and says in a nervous voice, "Hello, <<$pcs_nickname>>."'
-						'"Hi Natalia, I see you are reading again. What is this one about?"'
-						'"It''s called The Master and Margarita by Mikhail Bulgakov. It''s quite a famous book with loads of magical stuff like cats riding on trams and money falling from the sky."'
-						'"Well, we could all do with a bit of fantasy to take away our troubles." You say with a rueful smile.'
-						'"Umm... Yes, <<$pcs_nickname>>, I guess so." Natalia slightly lowers her already quiet voice and continues, "Sorry, <<$pcs_nickname>>, I''m sorry, but I can''t be associated with you unless you improve your reputation." With that, she looks away from you and returns to reading her book.'
-						'You turn away, feeling sad, and wait for the next class. Although you have a bad reputation, you could work on improving it as it might make your days easier at school and with your parents. Plus, doing so may also make it easier to gain some friends.'
+						'You see Natalia sitting with the nerds, reading a book. She glances up when she notices you. "Oh. Hey <<$pcs_nickname>>..." she says in a nervous voice.'
+						'"Hey Natalia, I see you''re reading again. What''s this one about?"'
+						'"It''s called ''The Master and Margarita'' by Mikhail Bulgakov. It''s quite a famous book with loads of magical stuff like cats riding on trams and money falling from the sky."'
+						'"Well, we could all do with a bit of fantasy to take away our troubles," you say with a rueful smile.'
+						'"Umm... Yeah, I guess so." Natalia slightly lowers her already quiet voice. "I''m sorry <<$pcs_nickname>>, but I can''t be associated with you unless you improve your reputation." She returns to reading her book without waiting for an answer.'
+						'You turn away and wait for the next class. Although you have a bad reputation, you could work on improving it in order to gain some friends.'
 					elseif npc_rel['A240'] <= 50:
-						'As usual, Natalia sits with the nerds, reading a book as you approach her. As Natalia notices you, she looks up and quietly says, "Hi, <<$pcs_nickname>>."'
-						'"Hi Natalia, You''re reading again, not that I''m surprised. So what''s this book all about, another romantic novel?" You ask with a smile.'
-						'Natalia looks back at you. "Yes, it is, and it''s another famous Russian love story. This is one of the most famous short stories."'
-						'"Oh! A short love story. In that case, it can''t be Russian!"'
-						'"Well, it is actually; it''s called The Lady With The Little Dog, and it''s by Anton Chekhov."'
-						'"Really, Natalia! I didn''t think a Russian could ever write a short love story!" you reply.'
-						'"Well, he did in this case. It''s about Anna and Dmitri, who have unhappy marriages and meet in Yalta, where they are on holiday without their spouses. Although the affair ends at the end of the holiday, their feelings remain."'
-						'"Sounds sad, Natalia." You reply.'
-						'"Yes, I guess it is. Such a shame if you don''t have love in your life with your partner. Also, is it better for them to have experienced it but know it was only fleeting? Look, Sveta, it''s not that I don''t like you. Still, I can''t associate with you unless you do something to improve your reputation." With that, she looks away from you and returns to reading her book.'
-						'You turn away, and as and wait for the next class, you reflect on what she said. You know you have a bad reputation, but there is still time to improve it. Things could improve for you in school and at home with time and effort.'
+						'You see Natalia sitting with the nerds, reading a book. She glances up when she notices you. "Oh. Hey <<$pcs_nickname>>..." she says in a quiet voice.'
+						'"Hey Natalia. So what''s this book about? Another romantic novel?" you ask with a smile.'
+						'Natalia looks back at you. "Yes, it is. It''s another famous Russian love story, and one of the most famous short stories."'
+						'"What''s it called?" you ask.'
+						'"''The Lady With The Little Dog'' by Anton Chekhov. It''s about Anna and Dmitri, who both have unhappy marriages. They''re both on holiday in Yalta without their spouses and end up having an affair. Although their affair ends with the holiday, their feelings for each other remain."'
+						'"Sounds sad," you reply.'
+						'"Yes, I guess it is." She looks up at you. "Look <<$pcs_nickname>>, it''s not that I don''t like you, but I can''t associate with you unless you do something to improve your reputation." She returns to reading her book without waiting for an answer.'
+						'You turn away, and as and wait for the next class, you reflect on what she said.'
 					elseif npc_rel['A240'] <= 70:
-						'Natalia is sitting with the nerds at her desk, and as usual, she''s reading a book as you approach. As Natalia notices you, she looks up and quietly says, "Hi, <<$pcs_nickname>>."'
-						'"Hi, Natalia, What a surprise... you''re reading again!." You say with a friendly smile. "So, what''s book is this?"'
-						'"You know me too well, <<$pcs_nickname>>. This is one of the most famous Russian romantic novels. It was even awarded the Nobel prize in Literature."'
-						'"Oh! Wow! So what''s it called? Come on Natalia, wet my appetite for it..."'
-						'Natalia has a short quiet giggle. "Okay, this one is Doctor Zhivago by Boris Pasternak, and it''s an epic story set during the Russian civil war..."'
-						'At this point, you interject, "Well, this one won''t end well then! Anyway, whoever heard of war being civil?" you reply.'
-						'"Well, in this story, Yuri, the doctor, loves his wife."'
-						'"Well, I''m glad to hear that. But I guess tragedy strikes." You reply.'
-						'"Well, he gets sent off to war and while at the front, he meets someone else and also falls in love with her. The book explores the torment he feels between his love for both of them."'
-						'"So come on, Natalia, what happens next."'
-						'"Nope, <<$pcs_nickname>>, I''m not going to spoil it for you. You''ll just have to get the book and read it yourself." She replies with a broad grin. "Sorry, <<$pcs_nickname>>, I have to go. I''ve probably already spent too long talking to you and want to avoid rumours about my reputation. Oh, the bell sounds, so we best head to class." She turns away and heads to the next lesson.'
-						'You leave and again reflect on what she just said. You still have a terrible reputation, but if you improve it, with time and effort, things could improve for you, and your school life may get more pleasant.'
+						'Natalia is sitting with the nerds, reading a book. She glances up when she notices you. "Hey <<$pcs_nickname>>," she says in a quiet voice.'
+						'"Hey Nat," you say with a friendly smile. "So what book is this?"'
+						'She smiles. "This is one of the most famous Russian romantic novels. It was even awarded the Nobel prize in Literature."'
+						'"Oh? What''s it called?"'
+						'"''Doctor Zhivago'' by Boris Pasternak," she replies. "It''s an epic story set during the Russian civil war."'
+						'"Well, this one won''t end well then! Whoever heard of war being civil?" you reply.'
+						'"Well, in this story, Yuri, the doctor, loves his wife..."'
+						'"But I guess tragedy strikes?" you ask.'
+						'"He gets sent off to war and while at the front, he meets someone else and also falls in love with her. The book explores the torment he feels between his love for both of them."'
+						'"And what happens next?"'
+						'"No, I''m not going to spoil it for you! You''ll just have to read it yourself," she replies with a broad grin. "Sorry <<$pcs_nickname>>, but I have to go. I''ve probably already spent too long talking to you and want to avoid rumours about my reputation." She turns away without waiting for your reply.'
+						'You reflect on what she just said. You still have a terrible reputation, but if you improve it, your school life may get more pleasant.'
 					else
-						'Natalia is at her usual desk with the nerds, and as usual, she''s engrossed in a book as you approach. However, as Natalia notices you, she looks up at you and quietly says, "Hi, <<$pcs_nickname>>."'
-						'"Hi, Natalia, What a surprise... you''re reading again!." You say with a friendly smile and a small giggle. "So let me guess... Another romantic novel that ends in some sort of tragedy?" You ask, giggling.'
-						'Natalia gives you a short smile. "Ahh! Caught you there, <<$pcs_nickname>>. But, unfortunately, you''re only half right this time."'
-						'"Oh! Well, you''re definitely reading, so it''s not a historical romance, then... So what''s this one about?"'
-						'Natalia has a small giggle. "Well, this isn''t a novel at all."'
-						'You are confused. "Eh? Surely not schoolwork, Natalia? Did you get behind or something?" you reply.'
-						'Natalia laughs. "No, <<$pcs_nickname>>, I always do my homework at home or the library. No, this is a book of poems by Marina Tsvetaeva."'
-						'"Right, well, that''s a bit different then." You reply.'
-						'"Sort of..." Natalia replies. "It still explores love, heartbreak and disappointment but has some lovely stuff where the poems explore fluttery feelings and infatuation and look at the differences between infatuation and love."'
+						'Natalia is sitting with the nerds, engrossed in a book. She glances up when she notices you. "Hey <<$pcs_nickname>>," she says in a quiet voice.'
+						'"Hey Natalia," you reply with a friendly smile. "Let me guess. Another romantic novel that ends in some sort of tragedy?"'
+						'She gives you a short smile. "Unfortunately, you''re only half right this time."'
+						'"Oh? So what''s this one about?"'
+						'She giggles. "Well, this isn''t a novel at all."'
+						'You''re confused. "Eh? Surely not schoolwork? Did you fall behind or something?" you reply.'
+						'She laughs. "No! This is a book of poems by Marina Tsvetaeva."'
+						'"That is different then," you reply.'
+						'"Sort of..." she replies. "It still explores love, heartbreak and disappointment but has some lovely stuff where the poems explore fluttery feelings and infatuation. They also look at the differences between infatuation and love."'
 						'"Guess there''s a big mixture of sad and happy stuff then?"'
-						'"Yep, <<$pcs_nickname>>. If you like that sort of work, it might be worth getting a copy; you can skip one of them if you don''t like it too much." Then, after a brief pause, she continues, "Look, <<$pcs_nickname>>, I know you must think I''m trying to mother you when I keep telling you to improve your reputation, but you seem nice and friendly, and I just want to see you happy and not be bullied all the time. So please think about it."'
-						'"Actually, Natalia, it makes a nice change that someone cares and doesn''t bully or mock me. You are a good friend Natalia, thank you."'
-						'Just then, the bell sounds, so you both head to the next class separately.'
-						'As you leave, you take a moment to reflect on what she just said. Although you have a terrible reputation, improving it may still be possible. For example, suppose you are more discrete with time and effort. In that case, you could improve it, and things would get more manageable for you at school and home with the benefit that life may get more pleasant. Maybe you could even go to church and spend some quiet reflection.'
+						'"Yes. If you like that sort of thing, then it might be worth getting a copy; you can skip one of them if you don''t like it too much." After a brief pause, she continues. "Look <<$pcs_nickname>>, I know you must be tired of me always telling you to improve your reputation, but you seem nice, and I just want to see you happy and not being bullied all the time."'
+						'"Actually, it makes a nice change that someone actually cares and doesn''t mock me. You''re a good friend, Natalia."'
+						'The bell then sounds, so you both head to the next class separately.'
 					end
 				else
 					if npc_rel['A240'] <= 30:
-						'You see Natalia sitting with the nerds, reading a book as you approach her. As Natalia notices you, she glances up at you and says quietly, "Hi, <<$pcs_nickname>>."'
-						'"Hi Natalia, just thought I''d come and say hello," you say. "I see you are reading again. May I ask what it''s about?"'
-						'"Yes, well, it''s a famous Russian love story."'
-						'You giggle. "Oh, which one?"'
-						'"Really? I didn''t think anyone else was interested in this stuff <<$pcs_nickname>>."'
-						'"Yes, I''d like to know. It''s also a way of getting to know you better, too," you reply.'
-						'"Well, it''s called Anna Karenina by Leo Tolstoy. It''s a very famous book about a woman named Anna. She doesn''t love her husband but instead loves a man named Alexei Vronsky and explores the relationship with her son to whom she''s devoted."'
-						'"Sounds interesting, Natalia. I bet it won''t end well." You say with a smile.'
-						'"Probably not <<$pcs_nickname>>. It''s written by a Russian, after all." Natalia says with a rueful smile.'
-						'"Okay thanks Natalia, I think we''d best start heading to class. Bye for now."'
+						'You see Natalia sitting with the nerds, reading a book. She glances up when she notices you. "Hey <<$pcs_nickname>>," she says in a quiet voice.'
+						'"Hey Natalia, just thought I''d come and say hello," you reply. "I see you''re reading again. What''s it about?"'
+						'"Yes. It''s a famous Russian love story."'
+						'You smile. "Oh? Which one?"'
+						'"Really? I didn''t think anyone else was interested in this sort of thing..."'
+						'"Yes, I''d like to know. It''s a way of getting to know you better," you reply.'
+						'"It''s called ''Anna Karenina'' by Leo Tolstoy. It''s about a woman who loves a man that isn''t her husband. It also explores her relationship with her son, to whom she''s totally devoted."'
+						'"Sounds interesting. I bet it won''t end well, though," you reply with a smile.'
+						'"Probably not. It''s written by a Russian after all," she replies with a rueful smile.'
+						'"I think I''d best start heading to class. Bye for now," you say with a smile.'
 					elseif npc_rel['A240'] <= 40:
-						'You see Natalia sitting with the nerds, and as usual, she''s reading a book as you approach her. As Natalia notices you, she glances up at you and says quietly, "Hi, <<$pcs_nickname>>."'
-						'"Hi Natalia, I see you are reading again. So what''s this book?"'
-						'"Yes, it''s another famous Russian love story, but this one has loads of magical stuff, like cats riding on trams and money falling from the sky."'
-						'You giggle. "Oh! Cats riding on trams, well, that''d be cool, and money falling from the sky?... Shame that doesn''t happen in real life!"'
-						'Natalia giggles along with you. "Yes, it''s a shame it''s only fantasy, <<$pcs_nickname>>!" She continues, "In this story, Margarita''s love for the master helps him as he''s afraid of his own ideas, but she has to make a huge sacrifice so that his novel doesn''t vanish and they can be safe together forever."'
-						'"So what''s it called, and who wrote it, Natalia?" you reply.'
-						'"Sounds interesting, Natalia. But, I bet it won''t end well." You say with a smile.'
-						'"Ah, yes, it''s called The Master and Margarita by Mikhail Bulgakov. It''s quite a famous book. Have you read it?"'
-						'"No, not yet, but it does sound interesting, Natalia. Thanks."'
-						'Just then, the bell sounds, so you start heading to class.'
+						'You see Natalia sitting with the nerds, reading a book. She glances up when she notices you. "Hey <<$pcs_nickname>>..." she says in a quiet voice.'
+						'"Hey Natalia. So what''s this book about?"'
+						'"It''s another famous Russian love story, but this one has loads of magical stuff, like cats riding on trams and money falling from the sky."'
+						'You giggle. "Money falling from the sky? Shame that doesn''t happen in real life!"'
+						'Natalia giggles along with you. "In this story, Margarita''s love for the master helps him as he''s afraid of his own ideas, but she has to make a huge sacrifice so that his novel doesn''t vanish and they can be safe, together forever."'
+						'"So what''s it called?" you ask.'
+						'"It''s called ''The Master and Margarita'' by Mikhail Bulgakov. It''s quite a famous book. Have you read it?"'
+						'"No, but it does sound interesting. I bet it won''t end well though."'
+						'The bell then sounds, so you start heading to class.'
 					elseif npc_rel['A240'] <= 50:
-						'As usual, Natalia sits with the nerds, reading a book as you approach her. As Natalia notices you, she looks up at you and, with a slight smile, says in a quiet voice, "Hi, <<$pcs_nickname>>."'
-						'"Hi Natalia, You''re reading again, not that I''m surprised. So what''s this book all about, another romantic novel?" You ask with a smile.'
-						'Natalia smiles back at you. "Yes, it is, and it''s another famous Russian love story. This is one of the most famous short stories."'
-						'"Oh! A short love story. In that case, it can''t be Russian!"'
-						'Natalia giggles. "Well, it is actually; it''s called The Lady With The Little Dog, and it''s by Anton Chekhov."'
-						'"Really, Natalia! I didn''t think a Russian could ever write a short love story!" you reply.'
-						'"Well, he did in this case. It''s about Anna and Dmitri, who have unhappy marriages and meet in Yalta, where they are on holiday without their spouses. Although the affair ends at the end of the holiday, their feelings remain."'
-						'"Sounds sad, Natalia." You reply.'
-						'"Yes, it is. Such a shame if you don''t have love in your life with your partner. Also, is it better for them to have experienced it but know it was only fleeting?"'
-						'"Wow, that''s a deep question, Natalia. I hope that either circumstance won''t happen to either of us."'
-						'"Yes, <<$pcs_nickname>>, I don''t know which would be worse. There''s the bell, so we should get going to class."'
+						'You see Natalia sitting with the nerds, reading a book. She glances up when she notices you. "Hey <<$pcs_nickname>>," she says in a quiet voice with a slight smile.'
+						'"Hey Natalia. So what''s this book about? Another romantic novel?" you ask with a smile.'
+						'Natalia smiles back at you. "Yes, it is. It''s another famous Russian love story, and one of the most famous short stories."'
+						'"''The Lady With The Little Dog'' by Anton Chekhov. It''s about Anna and Dmitri, who both have unhappy marriages. They''re both on holiday in Yalta without their spouses and end up having an affair. Although their affair ends with the holiday, their feelings for each other remain."'
+						'"Sounds sad," you reply.'
+						'"Yes, it is, but is it better for them to have experienced love knowing it was only fleeting, than none at all?"'
+						'"Wow, that''s a deep question," you reply.'
+						'"Yeah, I don''t know which would be worse. Oh, there''s the bell! We should get going to class."'
 					elseif npc_rel['A240'] <= 70:
-						'Natalia is sitting with the nerds at her desk, and as usual, she''s reading a book as you approach. As Natalia notices you, she looks up at you and, with a big smile, says in a quiet voice, "Hi, <<$pcs_nickname>>."'
-						'"Hi, Natalia, What a surprise... you''re reading again!." You say with a friendly smile and a small giggle. "So, what''s book is this?" You ask, smiling back at her.'
-						'Natalia smiles back at you. "You know me too well, <<$pcs_nickname>>. This is one of the most famous Russian romantic novels. It was even awarded the Nobel prize for literature."'
-						'"Oh! Wow! So what''s it called? Come on Natalia, wet my appetite for it..."'
-						'Natalia giggles. "Okay, well this one is called Doctor Zhivago by BNoris Pasternak and it''s an epic story set during the Russian civil war..."'
-						'At this point, you interject, "Well, this one won''t end well then! Anyway, whoever heard of war being civil?" you reply.'
-						'"Well, in this story, Yuri, the doctor, loves his wife."'
-						'"Well, I''m glad to hear that. But I guess tragedy strikes." You reply.'
-						'"Well, he gets sent off to war and while at the front, he meets someone else and also falls in love with her. The book explores the torment he feels between his love for both of them."'
-						'"So come on, Natalia, what happens next?"'
-						'"Nope, <<$pcs_nickname>>, I''m not going to spoil it for you. You''ll just have to get the book and read it yourself." She replies with a broad grin. "Oh, the bell sounds, so we best head to class." Again, she grins at you and gives you a friendly wave as she heads to the next lesson.'
+						'Natalia is sitting with the nerds, reading a book. She glances up when she notices you. "Hey <<$pcs_nickname>>," she says in a quiet voice with a smile.'
+						'"Hey Nat," you say with a friendly smile. "So what book is this?"'
+						'She smiles. "This is one of the most famous Russian romantic novels. It was even awarded the Nobel prize in Literature."'
+						'"Oh? What''s it called?"'
+						'"''Doctor Zhivago'' by Boris Pasternak," she replies. "It''s an epic story set during the Russian civil war."'
+						'"Well, this one won''t end well then! Whoever heard of war being civil?" you reply.'
+						'"Well, in this story, Yuri, the doctor, loves his wife..."'
+						'"But I guess tragedy strikes?" you ask.'
+						'"He gets sent off to war and while at the front, he meets someone else and also falls in love with her. The book explores the torment he feels between his love for both of them."'
+						'"And what happens next?"'
+						'"No, I''m not going to spoil it for you! You''ll just have to read it yourself," she replies with a broad grin. "Oh, there''s the bell! We best head to class." She grins at you and gives you a friendly wave as she heads to the next lesson.'
 					else
-						'Natalia is at her usual desk with the nerds, and as usual, she''s engrossed in a book as you approach. But, as Natalia notices you, she looks up at you and, with a big smile, says in a quiet voice, "Hi, <<$pcs_nickname>>."'
-						'"Hi, Natalia, What a surprise... you''re reading again!." You say with a friendly smile and a small giggle. "So let me guess... Another romantic novel that ends in some sort of tragedy?" You ask, giggling.'
-						'Natalia smiles back at you. "Ahh! Caught you there, Sveta. But, unfortunately, you''re only half right this time."'
-						'"Oh! Well, you''re definitely reading, so it''s not a historical romance, then... So what''s this one about?"'
-						'Natalia giggles. "Well, this isn''t a novel at all."'
-						'You are confused. "Eh? Surely not schoolwork, Natalia? Did you get behind or something?" you reply.'
-						'Natalia laughs. "No, <<$pcs_nickname>>, I always do my homework at home or the library. No, this is a book of poems by Marina Tsvetaeva."'
-						'"Right, well, that''s a bit different then." You reply.'
-						'"Sort of..." Natalia replies. "It still explores love, heartbreak and disappointment. Though it has some lovely stuff. The poems explore fluttery feelings and infatuation and look at the differences between infatuation and love."'
+						'Natalia is sitting with the nerds, engrossed in a book. She glances up when she notices you. "Hey <<$pcs_nickname>>," she says in a quiet voice.'
+						'"Hey Natalia," you reply with a friendly smile. "Let me guess. Another romantic novel that ends in some sort of tragedy?"'
+						'She gives you a short smile. "Unfortunately, you''re only half right this time."'
+						'"Oh? So what''s this one about?"'
+						'She giggles. "Well, this isn''t a novel at all."'
+						'You''re confused. "Eh? Surely not schoolwork? Did you fall behind or something?" you reply.'
+						'She laughs. "No! This is a book of poems by Marina Tsvetaeva."'
+						'"That is different then," you reply.'
+						'"Sort of..." she replies. "It still explores love, heartbreak and disappointment but has some lovely stuff where the poems explore fluttery feelings and infatuation. They also look at the differences between infatuation and love."'
 						'"Guess there''s a big mixture of sad and happy stuff then?"'
-						'"Yep, <<$pcs_nickname>>. If you like that sort of work, it might be worth getting a copy; you can skip one of them if you don''t like it too much." She pauses, then continues. "You know, <<$pcs_nickname>>, I sometimes go to the community center library on non-school days at lunchtime. So if you fancy meeting me there sometime, that''d be great."'
-						'Just then, the bell sounds, so you both head to the next class, still chatting.'				
+						'"Yes. If you like that sort of thing, then it might be worth getting a copy; you can skip one of them if you don''t like it too much." She pauses, then continues. "I sometimes go to the community center library on non-school days at lunchtime. If you fancy meeting me there sometime, that''d be great."'
+						'The bell then sounds, so you both head to the next class while still chatting.'				
 					end
 				end
 			end

+ 12 - 12
locations/gschool_post_shower.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'post_shower':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/locker/peekdress' + rand(1,2) + '.jpg"></center>'
-		'You let your eyes wander around the room, checking out the other girls in your class. Some are almost finished getting dressed, a few are in their underwear and a few are still naked. It''s a nice view, one thing you''ll always appreciate about gym class.'
+		'You let your eyes wander around the room, checking out the other girls in your class. Some are almost finished dressing, a few are in their underwear and a few are still naked. It''s a nice view, one thing you''ll always appreciate about gym class.'
 		gs'arousal','erotic_nudity', 2
 		gs 'stat'
 		act 'Get dressed':gs 'arousal', 'end' & gt 'gschool_lessons4', 'dress'
@@ -593,15 +593,15 @@ if $ARGS[0] = 'post_shower':
 				sveta_dyke_rumor += 1
 				if rand (1,4) = 1:
 					if fame['pav_slut'] >= 175:
-						'After finishing her shower and returning to the changing room she opens her locker and starts getting dressed when she seems to realize someone is looking at her and suddenly turns and looks in your direction. Seeing you looking at her, she gives you an icy glare and turns away covering herself up as best she can. You''re embarrassed that you got caught but are glad that she didn''t say anything as that would have been awkward for you. You turn away and finish dressing yourself before leaving.'
+						'After finishing her shower and returning to the changing room, she opens her locker and starts getting dressed when she seems to realize someone is looking at her and suddenly turns and looks in your direction. Seeing you looking at her, she gives you an icy glare and turns away while covering herself up as best she can. You''re embarrassed that you got caught but are glad that she didn''t say anything. You turn away and finish dressing yourself before leaving.'
 					elseif grupTipe = 5:
-						'After finishing her shower and returning to the changing room she opens her locker and starts getting dressed when she seems to realize someone is looking at her and suddenly turns and looks in your direction. Seeing you looking at her, she glares at you and is obviously unhappy that you were staring at her so she turns away covering herself up as best she can. You''re embarrassed at your actions and thankful that she didn''t say anything as that wouldn''t have helped in your efforts to make friends with your classmates. You turn away and finish dressing yourself before leaving.'
+						'After finishing her shower and returning to the changing room, she opens her locker and starts getting dressed when she seems to realize someone is looking at her and suddenly turns and looks in your direction. Seeing you looking at her, she glares at you, clearly unhappy that you were staring at her as she turns away covering herself up as best she can. You''re embarrassed at your actions, but are thankful that she didn''t say anything. You turn away and finish dressing yourself before leaving.'
 					elseif npc_rel['A240'] >= 60:
-						'After finishing her shower and returning to the changing room she opens her locker and starts getting dressed when she seems to realize someone is looking at her and suddenly turns and looks in your direction. Seeing you looking at her, she gives you a fleeting shy smile then immediately blushes but quickly winks at you before turning away a little embarrassed by your actions and probably at her own reaction as well. You smile inwardly and are glad that she didn''t say anything as that would have been awkward for you. as you finish getting dressed before leaving.'
+						'After finishing her shower and returning to the changing room, she opens her locker and starts getting dressed when she seems to realize someone is looking at her and suddenly turns and looks in your direction. Seeing you looking at her, she gives you a fleeting shy smile and blushes, but quickly winks at you before turning away, probably embarrassed at her own reaction as well. You smile inwardly and are glad that she didn''t say anything as you finish getting dressed before leaving.'
 					elseif npc_rel['A240'] <= 20:
-						'After finishing her shower and returning to the changing room she opens her locker and starts getting dressed when she seems to realize someone is looking at her and suddenly turns and looks in your direction. Seeing you looking at her, she gives you an icy glare and turns away covering herself up as best she can. For a moment it looked as though she''d call you out but for some reason she didn''t. You''re thankful for that as it was embarrassing enough that you got caught without her adding to it! You turn away and finish dressing yourself before leaving.'
+						'After finishing her shower and returning to the changing room, she opens her locker and starts getting dressed when she seems to realize someone is looking at her and suddenly turns and looks in your direction. Seeing you looking at her, she gives you an icy glare and turns away while covering herself up as best she can; it looked as though she was about to call you out, but chose not to for some reason. You''re thankful for that as it was embarrassing enough that you got caught. You turn away and finish dressing yourself before leaving.'
 					else
-						'After finishing her shower and returning to the changing room she opens her locker and starts getting dressed when she seems to realize someone is looking at her and suddenly turns and looks in your direction. Seeing you looking at her, she shakes her head and is obviously disappointed in you then turns away and continuers dressing. You''re embarrassed that you got caught and turn away before you cause her any further discomfort and finish dressing yourself before leaving.'
+						'After finishing her shower and returning to the changing room, she opens her locker and starts getting dressed when she seems to realize someone is looking at her and suddenly turns and looks in your direction. Seeing you looking at her, she shakes her head in disappointment before she turns away and continues dressing. You''re embarrassed that you got caught and turn away to finish dressing yourself before leaving.'
 					end
 					gs'arousal','erotic_nudity', 3
 					gs 'stat'
@@ -897,7 +897,7 @@ if $ARGS[0] = 'post_shower2':
 	$menu_arg = 'post_shower2'
 	menu_off = 0
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/shower/postphyssho' + rand(1,7) + '.jpg"></center>'
-	'You let your eyes wander around the room, checking out the other girls in your class. They are chatting as they shower, some are getting close to done showering while a couple of others wander in to begin showering. It''s a nice view, one thing you''ll always appreciate about gym class.'
+	'You let your eyes wander around the room, checking out the other girls as they chat and shower. It''s a nice view, one thing you''ll always appreciate about gym class.'
 	act 'Go to the locker room':gs 'arousal', 'end' & gt 'gschool_lessons4','dress'
 	act 'Check out Albina':
 		*clr & cla
@@ -1469,15 +1469,15 @@ if $ARGS[0] = 'post_shower2':
 			cla
 			if rand (1,4) = 1:
 				if fame['pav_slut'] >= 175:
-					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you looking at her, she glares at you as she turns away covering herself up as best she can. You''re a little embarrassed that you got caught but are glad that she didn''t say anything as that would have been awkward for you. You turn away and finish your shower before leaving.'
+					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you looking at her, she glares at you as she turns away while covering herself up as best she can. You''re a little embarrassed that you got caught, but are glad that she didn''t say anything. You turn away and finish your shower before leaving.'
 				elseif grupTipe = 5:
-					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you looking at her, she immediately turns away covering herself up as best she can. You''re embarrassed that she caught you but glad she didn''t say anything as that wouldn''t have helped you in your efforts to make friends with your classmates. You turn away and finish your shower before leaving.'
+					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you looking at her, she immediately turns away while covering herself up as best she can. You''re embarrassed that she caught you but glad she didn''t say anything. You turn away and finish your shower before leaving.'
 				elseif npc_rel['A240'] >= 60:
-					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you looking at her, she smiles shyly and blushes then winks at you before turning away clearly somewhat embarrassed. You smile inwardly but are glad that she didn''t say anything as that would have been awkward while finishing your shower and leaving.'
+					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you looking at her, she smiles shyly and blushes before winking at you and turning away, clearly somewhat embarrassed. You smile inwardly but are glad that she didn''t say anything as you finish your shower and leave.'
 				elseif npc_rel['A240'] <= 20:
-					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you looking at her, she glares at you giving you an icy look before immediately turning away covering herself up as best she can. You''re embarrassed that she caught you and you feel that you need to respect her privacy going forward. You turn away and finish your shower before leaving.'
+					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you looking at her, she gives you an icy look before immediately turning away while covering herself up as best she can. You''re embarrassed that she caught you as you turn away and finish your shower before leaving.'
 				else
-					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you looking at her, she turns away covering herself up as best she can. You feel that your actions have caused embarrassment for both of you. You turn away and finish your shower before leaving.'
+					'She seems to be enjoying her shower when she suddenly stops and looks in your direction. Seeing you looking at her, she turns away while covering herself up as best she can. You feel that your actions have caused embarrassment for both of you as you turn away and finish your shower before leaving.'
 				end
 				gs'arousal','erotic_nudity', 3
 				gs 'stat'

+ 3 - 0
locations/katja_chat.qsrc

@@ -138,6 +138,7 @@ if $ARGS[0] = 'uni_cafe':
 end
 
 if $ARGS[0] = 'chat':
+	killvar '$carry_arg'
 	gs 'katja_meynold_schedule' 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -192,6 +193,7 @@ if $ARGS[0] = 'chat':
 end
 
 if $ARGS[0] = 'chat1':
+	killvar '$carry_arg'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	!! Reaction on the first time you meet Sofia, Katja''s roommate.
 	if sofiaQW['know'] = 1 and sofiaQW['QWstage'] = 0: gt 'katja_chat', 'sofia1'
@@ -297,6 +299,7 @@ if $ARGS[0] = 'coffee_hole':
 end
 
 if $ARGS[0] = 'brunch':
+	killvar '$carry_arg'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 	gs 'npc_relationship', 'modify', 'A14', 'like', 3, 'coffe_hole2'
 	minut += 10

+ 1 - 1
locations/katja_dorm.qsrc

@@ -389,7 +389,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 		if katjaQW['QWstage'] < 6 and katjaQW['anal_quest'] < 3:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 			'"You know, <<$pcs_nickname>>, meeting Lazar at the café got me thinking," Katja says.'
-			if katjaQW['QWstage'] <= 4:
+			if katjaQW['QWstage'] = 4:
 				'"We talked about how I would like to try having... sex... with a guy," Katja says with some pause. "I know you said you didn''t want to arrange it, but I''m sure with Lazar that you wouldn''t have to arrange anything; just call him and I''m sure he''ll agree," she continues before you can say anything.'
 				act 'Agree':
 					if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5

+ 6 - 4
locations/katja_procedural.qsrc

@@ -166,6 +166,8 @@ if $ARGS[0] = 'face_color':
 end
 
 if $ARGS[0] = 'makeup':
+	$carry_arg[1] = $ARGS[1]
+	$carry_arg[2] = $ARGS[2]
 	'Katja looks at you with a smile. "<<$pcs_nickname>>, I bet you would look great with a little make-up on you! What do you say?"'
 	act 'Let her put makeup on you':
 		*clr & cla
@@ -182,7 +184,7 @@ if $ARGS[0] = 'makeup':
 			'Katja subtly applies some neutral tones, with a light application of makeup to bring out your natural beauty.'
 			if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
-			act 'Thank Katja for the makeup': gt $ARGS[1], $ARGS[2]
+			act 'Thank Katja for the makeup': gt $carry_arg[1], $carry_arg[2]
 		end
 
 		act 'Normal make-up':
@@ -191,7 +193,7 @@ if $ARGS[0] = 'makeup':
 			'Katja applies some mildly vibrate tones and colors of makeup to cover your minor imperfections and enhance your best features.'
 			if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
-			act 'Thank Katja for the makeup': gt $ARGS[1], $ARGS[2]
+			act 'Thank Katja for the makeup': gt $carry_arg[1], $carry_arg[2]
 		end
 
 		act 'Heavy make-up':
@@ -200,9 +202,9 @@ if $ARGS[0] = 'makeup':
 			'Katja applies some deeper, richer shades of makeup that are thick enough to cover most imperfections while drawing attention to your eyes and lips.'
 			if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
-			act 'Thank Katja for the makeup': gt $ARGS[1], $ARGS[2]
+			act 'Thank Katja for the makeup': gt $carry_arg[1], $carry_arg[2]
 		end
-		act 'You really don''t need it': gt $ARGS[1], $ARGS[2]
+		act 'You really don''t need it': gt $carry_arg[1], $carry_arg[2]
 	end
 end
 

+ 5 - 5
locations/mother.qsrc

@@ -1076,7 +1076,7 @@ end
 if $ARGS[0] = 'pregreact1':
 	menu_off = 1
 	*nl
-	if $wombthfath = 'Kolka' and npc_rel['A34'] > 50 and brotherSecret = 1 and momKnowsKolka = 0:
+	if $wombthfathID = 'A34' and npc_rel['A34'] > 50 and brotherSecret = 1 and momKnowsKolka = 0:
 		'"I... I don''t actually know. I was," you stammer as you struggle to get the next word out. "I was raped."'
 		'"What? Are you okay? Why did''t you tell me sooner?"'
 		'"I was scared and ashamed and I didn''t know how you would react." Your lip quivers as tears begin to flow down your face. "I''m sorry. I should have said something."'
@@ -1096,9 +1096,9 @@ if $ARGS[0] = 'pregreact1':
 
 			act 'Continue':gt 'mother', 'pregreactbrother'
 		end
-	elseif $wombthfath = 'Kolka' and npc_rel['A34'] > 50 and brotherSecret = 0 and momKnowsKolka = 0:
+	elseif $wombthfathID = 'A34' and npc_rel['A34'] > 50 and brotherSecret = 0 and momKnowsKolka = 0:
 		gt 'mother', 'pregreactbrother'
-	elseif $wombthfath = 'Vladimir' and npc_rel['A28'] > 50 and stepdadSecret = 1 and momKnowsVladimir = 0:
+	elseif $wombthfathID = 'A28' and npc_rel['A28'] > 50 and stepdadSecret = 1 and momKnowsVladimir = 0:
 		'"I... I don''t actually know. I was," you stammer as you struggle to get the next word out. "I got jumped one night, I tried to fight back but they were too strong. They raped me..."'
 		'"What? Are you okay? Why did''t you tell me sooner?"'
 		'"I was scared and ashamed and I didn''t know how you would react." Your lip quivers as tears begin to flow down your face. "I''m sorry. I should have said something earlier."'
@@ -1118,9 +1118,9 @@ if $ARGS[0] = 'pregreact1':
 
 			act 'Continue':gt 'mother', 'pregreactstepdad'
 		end
-	elseif $wombthfath = 'Vladimir' and npc_rel['A28'] > 50 and stepdadSecret = 0 and momKnowsVladimir = 0:
+	elseif $wombthfathID = 'A28' and npc_rel['A28'] > 50 and stepdadSecret = 0 and momKnowsVladimir = 0:
 		gt 'mother', 'pregreactstepdad'
-	elseif $wombthfath = '':
+	elseif $wombthfath = '' or $wombthfathID = 'unknown':
 		cla
 		if stat['think_virgin'] = 1:
 			'"I don''t know!", you wail, freaking out a bit. "I did not have sex, ever!"'

+ 108 - 115
locations/natalia_pavlova.qsrc

@@ -3,57 +3,58 @@
 
 if $ARGS[0] = 'first_chat':
 	nataliaQW['introduction'] = 1
-	if grupTipe = 4:
-		'You see Natalia sitting with the nerds, reading a book as you approach her. As Natalia notices you, she looks at you with a worried expression.'
-		'You slow your approach and smile at her. "Hi Natalia, you''re new here, so I wanted to say hello. I''m <<$pcs_nickname>>."'
-		'Natalia looks at you and responds in a quiet voice, "Umm... Hi <<$pcs_nickname>>. I thought you were one of the Gopnik, so I''m not sure why you''d want to speak to me?"'
-		'You decide to reassure her, so you smile and reply, "Look, I''m not here to cause trouble. Yes, I''m one of the Gopnik, but we''re not all bad, you know."'
-		'"Okay. Yes, sorry about that. I didn''t mean to offend you. I was just a little surprised, is all."'
-		'You giggle. "Actually, I get that, and I''m not offended. Anyway, hello and welcome to our school. Maybe we''ll chat again at some point."'
-		'"Yes, I''d like that", Natalia answers. "See you later, <<$pcs_nickname>>."'
-	elseif grupTipe = 1:
-		'You see Natalia sitting with the nerds, reading a book as you approach her. As Natalia notices you, she glances up at you and smiles.'
-		'You smile back at her. "Hi Natalia, you''re new here, so I thought I''d come and say hello. I''m <<$pcs_nickname>>."'
-		'Natalia looks at you and responds in a quiet voice, "Umm... Hi <<$pcs_nickname>>. I thought you were one of the cool kids, so I''m surprised you''re here."'
-		'You smile and reply, "Well, I just thought I''d be friendly and welcome you to our school."'
-		'"Thank you, <<$pcs_nickname>>. I was surprised, that is all. So please don''t take offence."'
-		'You giggle. "Don''t worry I''m not offended and I get it, a new school is daunting. Maybe we''ll chat again at some point."'
-		'"Yes, I''d like that", Natalia answers. "See you later,  <<$pcs_nickname>>."'
+	if grupTipe = 1:
+		'You see Natalia sitting with the nerds, reading a book. When she notices you, she glances up and smiles.'
+		'You smile back at her. "Hey Natalia. I thought I''d come and say hello. I''m <<$pcs_nickname>>."'
+		'She just stares at you. "Umm... Hi? Sorry, I thought you were one of the ''cool kids'', so I''m just surprised that you''re here."'
+		'You smile. "I just thought I''d be friendly and welcome you to our school."'
+		'"Oh. Thank you, <<$pcs_nickname>>."'
+		'You smile. "Don''t worry, I get it. A new school is daunting. Maybe we''ll chat again at some point?"'
+		'"Yes, I''d like that," she answers. "See you later, <<$pcs_nickname>>."'
 	elseif grupTipe = 2:
-		'You see Natalia sitting with the nerds reading a book as you approach her. As Natalia notices you, she glances up at you and smiles.'
-		'You smile back at her. "Hi Natalia, you''re new here, so I thought I''d come and say hello. I''m <<$pcs_nickname>>."'
-		'Natalia looks at you and responds in a quiet voice, "Umm... Hi <<$pcs_nickname>>. I thought you were one of the sporty kids, so I''m a little surprised you''re here."'
-		'You smile and reply, "Well, I just thought I''d be friendly and welcome you to our school."'
-		'"Thank you, <<$pcs_nickname>>. I was surprised, that is all. Please don''t take offence."'
-		'You giggle. "Don''t worry, I''m not offended, and I get it. A new school is daunting. Maybe we''ll chat again at some point."'
-		'"Yes, I''d like that", Natalia answers. "See you later, <<$pcs_nickname>>."'
+		'You see Natalia sitting with the nerds, reading a book. When she notices you, she glances up and smiles.'
+		'You smile back at her. "Hey Natalia. I''m <<$pcs_nickname>>."'
+		'She just stares at you. "Umm... Hi? Sorry, I thought you were one of the sporty kids, so I''m just surprised you''re here."'
+		'You smile. "I thought I''d be friendly and welcome you to our school."'
+		'"Oh. Thank you, <<$pcs_nickname>>."'
+		'You smile. "Don''t worry, I get it. A new school is daunting. Maybe we''ll chat again at some point?"'
+		'"Yes, I''d like that," she answers. "See you later, <<$pcs_nickname>>."'
 	elseif grupTipe = 3:
-		'You see Natalia sitting with the other nerds, reading a book as you approach her. As Natalia notices you, she glances up at you and smiles.'
-		'You smile back at her. "Hi Natalia, you''re new here, so I wanted to say hello. I''m <<$pcs_nickname>>."'
-		'Natalia looks at you and responds in a quiet voice, "Hi, <<$pcs_nickname>>. Thank you for taking the time. It''s nice to speak to you."'
-		'You smile and reply, "Well, I just thought I''d be friendly and welcome you to our school."'
-		'"Thank you, <<$pcs_nickname>>. I''m just a little overwhelmed getting to know loads of new people and a different environment. It''s a bit daunting."'
-		'You giggle. "Don''t worry, and yes, a new school is daunting. Maybe we''ll chat again soon. Can I ask you something, please?."'
-		'"Yes of course, <<$pcs_nickname>>."'
-		'"Well, Natalia, you don''t go to the game nights, so I just wondered why."'
-		'"Ah, right... Not really my scene. I prefer my books, and I also want to focus on my studies, so it doesn''t allow for many distractions."'
-		'"Oh, okay, Natalia, I just wondered. So let''s chat about what you like to read at some point."'
-		'"Yes, I''d like that, <<$pcs_nickname>>", Natalia answers, smiling at you.'
-		'"Okay, See you later, Natalia. I think it''s time for class."'
+		'You see Natalia sitting with the other nerds, reading a book. When she notices you, she glances up and smiles.'
+		'You smile back at her. "Hey Natalia. I''m <<$pcs_nickname>>."'
+		'"Hi, <<$pcs_nickname>>. It''s nice to meet you," she replies in a quiet voice.'
+		'You smile. "I just thought I''d be friendly."'
+		'"Thanks, I''m just a little overwhelmed getting to know loads of new people and a different environment. It''s a bit daunting."'
+		'You smile. "Don''t worry. Maybe we''ll chat again soon, but before I go; Can I ask you something?"'
+		'"Of course," she replies with a smile.'
+		'"You don''t go to the game nights. I just wondered why?"'
+		'"Ah, right. Not really my scene. I prefer my books, and I also want to focus on my studies, which doesn''t allow for many distractions."'
+		'"Oh, okay. I''d like to chat about what you like to read at some point."'
+		'"Yes, I''d like that," she answers while smiling at you.'
+		'"Okay, see you later. I think it''s time for class."'
+	elseif grupTipe = 4:
+		'You see Natalia sitting with the nerds, reading a book. When she notices you, she glances up with a worried expression.'
+		'You smile at her. "Hey Natalia. I''m <<$pcs_nickname>>."'
+		'She just stares at you. "Umm... Hi? Sorry, I thought you were one of the gopniks, so I''m not sure why you''d want to speak to me?"'
+		'You decide to reassure her. "I''m not here to cause trouble. We''re not all bad, you know."'
+		'"I didn''t mean to offend you, I was just a little surprised is all."'
+		'You smile. "I get that. Anyway, hello and welcome to our school. Maybe we''ll chat again at some point?"'
+		'"Yes, I''d like that," she answers. "See you later, <<$pcs_nickname>>."'
+	
 	elseif grupTipe = 5 and fame['slut'] < 175:
-		'You see Natalia sitting with the nerds reading a book as you approach her. As Natalia notices you, she glances up at you.'
-		'As you approach, you smile at Natalia and say, "Hi, I''m <<$pcs_nickname>>."'
-		'Natalia turns to you, "Umm... Hi, <<$pcs_nickname>>. What brings you here?"'
-		'"I wanted to welcome you to the school is all." You reply'
-		'"Thank you, <<$pcs_nickname>>. That''s nice of you." She replies with a smile. "However, I''d like to get to the end of this chapter before class." She then looks away from you and continues reading her book.'
-		'You turn away and wait for the next class to begin thinking she seems nice. At least she was polite and reasonably friendly, unlike many of your classmates.'
+		'You see Natalia sitting with the nerds, reading a book. When she notices you, she glances up at you.'
+		'You smile. "Hi, I''m <<$pcs_nickname>>."'
+		'Natalia turns to you. "Umm... Hi? What brings you here?"'
+		'"I wanted to welcome you to the school is all," you reply'
+		'"That''s nice of you," she replies with a smile. "However, I''d like to get to the end of this chapter before class." She returns to reading her book without waiting for your reply.'
+		'You turn away and wait for the next class to start, thinking she seems nice. At least she was reasonably friendly, unlike many of your classmates.'
 	else
-		'You see Natalia sitting with the nerds, reading a book as you approach her. As Natalia notices you, she glances up at you.'
-		'As you approach, you smile at Natalia and say, "Hi, I''m <<$pcs_nickname>>."'
-		'Natalia turns to you, "Umm... Hi <<$pcs_nickname>>. What brings you here?"'
-		'"I wanted to welcome you to the school, is all." You reply.'
-		'"Thank you, <<$pcs_nickname>>. That''s nice of you." She replies with a smile. "However, I can''t be seen to get associated with you, given your reputation. It''s difficult enough for me as it is. I''d like to get to the end of this chapter before class." She then looks away from you and continues reading her book.'
-		'You turn away and wait for the next class to begin thinking she seems nice and isn''t rude to you. At least she was polite and reasonably friendly compared to many of your classmates.'
+		'You see Natalia sitting with the nerds, reading a book. When she notices you, she glances up at you.'
+		'You smile. "Hi, I''m <<$pcs_nickname>>."'
+		'Natalia turns to you. "Umm... Hi? What brings you here?"'
+		'"I wanted to welcome you to the school is all," you reply.'
+		'"That''s nice of you," she replies with a smile. "However, I can''t be seen associating with you, given your reputation. It''s difficult enough for me as it is. If you''ll excuse men, I''d like to get to the end of this chapter before class." She returns to reading her book without waiting for your reply.'
+		'You turn away and wait for the next class to start, thinking she seems nice. At least she was reasonably friendly compared to many of your classmates.'
 	end
 end
 
@@ -65,82 +66,80 @@ if $ARGS[0] = 'library':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big240.jpg"></center>'
 	if npc_rel['A240'] < 60:
-		'You spot Natalia in the library, walk over to her, and greet her. "Hi Natalia, how are you?" You say in a quiet voice.'
-		'"I''m fine, <<$pcs_nickname>>, thanks and you?"'
-		'"Mustn''t grumble." You answer.'
+		'You spot Natalia in the library, so you walk over and greet her. "Hey Natalia, how are you?" you ask in a quiet voice.'
+		'"I''m fine, <<$pcs_nickname>>. You?"'
+		'"Mustn''t grumble," you answer.'
 		'You spend a few minutes chatting about developments in school and some of the latest news.'
-		'After a brief pause, she leans in close to you. "Look, <<$pcs_nickname>>, please don''t take this the wrong way, but... Umm..." She stops and blushes..'
-		'You are somewhat puzzled by her behaviour and ask her about it. "Sorry, Natalia, I have no clue what you''re talking about. Do you want to start again?"'
-		'She looks at you and reaches a decision. "Sorry, <<$pcs_nickname>>, it was a silly idea. Please just forget it."'
-		'Still confused, you reply. "Oh, okay, Natalia, consider it forgotten. As I said, there is nothing to forget, really, as I didn''t catch what you wanted anyway. Okay, see you later."'
+		'After a brief pause, she leans in close to you. "Look <<$pcs_nickname>>, please don''t take this the wrong way, but... Umm..." She stops and blushes.'
+		'You''re somewhat puzzled by her behaviour. "Sorry Natalia, but I have no clue what you''re talking about. Do you want to start again?"'
+		'She looks at you and reaches a decision. "Sorry, <<$pcs_nickname>>, it was a silly idea. Please just forget about it."'
+		'"Oh. Okay. See you later."'
 		act 'Go back to the library': gt $loc, $loc_arg
 	else
 		if nataliaQW['sex_agree'] = 0:
-			'You spot Natalia in the library, walk over to her, and greet her. "Hi Natalia, how are you?" You say in a quiet voice.'
-			'"I''m fine, <<$pcs_nickname>>, thanks and you?"'
-			'"Mustn''t grumble." You answer.'
+			'You spot Natalia in the library, so you walk over and greet her. "Hey Natalia, how are you?" you ask in a quiet voice.'
+			'"I''m fine, <<$pcs_nickname>>. You?"'
+			'"Mustn''t grumble," you answer.'
 			'You spend a few minutes chatting about developments in school and some of the latest news then she leans close to you. "Look, <<$pcs_nickname>>, please don''t take this the wrong way, but... Umm..." She stops and blushes.'
-			'You are somewhat puzzled by her behaviour and ask her about it. "Come on Natalia, I think we''re good friends aren''t we? What is it?"'
-			'She looks embarrassed but replies. "Okay, Sveta, but this must stay our secret. So how to put this... Okay, here goes. Well, I''m very focused on my studies and can''t have any distractions, but sometimes I just need a bit of relief; do you know what I mean?"'
-			'You look at her, still puzzled, and suddenly realise what she means. "Oh... Oh! Okay, I get it, Natalia. Sorry not quick on the uptake today... Yes, I get what you''re saying and yes, I guess that''s one of the disadvantages of being our age, but it can be nice too." You reply and wink at her. "So what do you mean by what you said?"'
-			'"Well, <<$pcs_nickname>>, we could help each other and enjoy some light relaxation together. Nothing serious, though, as my studies come first, so I can''t afford the distraction of a serious relationship."'
+			'You''re somewhat puzzled by her behaviour. "Come on Nat, we''re friends, aren''t we? What is it?"'
+			'She looks embarrassed as she replies. "Okay, but this must stay our secret. So how to put this... Well, I''m very focused on my studies and can''t have any distractions, but sometimes I just need a bit of... ''relief'', if you know what I mean?"'
+			'You look at her as you realise what she means. "Oh... Oh! I guess that''s one of the disadvantages of being our age, but it can be nice too," you reply and wink at her. "So what do you mean?"'
+			'"Well... we could help each other? Nothing serious though, as my studies come first. I can''t afford the distraction of a serious relationship."'
 			act 'No':
 				cla
 				nataliaQW['sex_agree'] = -1
-				'"I''m sorry, Natalia, you''re my friend, and I value that, but that''s not something I''d want to get into now. Maybe another time."'
-				'"Okay, <<$pcs_nickname>>, no problem, and if you change your mind, just let me know. Sorry if I embarrassed you."'
-				'"That''s cool, Natalia and no, of course, you didn''t embarrass me. You''re my friend, and that''s unchanged." You smile at her and wave goodbye.'
+				'"I''m sorry, but you''re my friend and I value that. This isn''t something I''d want to get into now. Maybe another time."'
+				'"Okay, <<$pcs_nickname>>, no problem. If you change your mind, just let me know. Sorry if I embarrassed you."'
+				'"Of course. You''re my friend, and that''s unchanged." You smile at her and wave goodbye.'
 				act 'Go back to the library': gt $loc, $loc_arg
 			end
 			act 'Yes':			
 				cla
 				nataliaQW['sex_agree'] = 1
-				'"You know what, Natalia, that would be great. I know that must have been difficult to ask, so thank you for confiding in me. You''re a good friend." You smile at her and make to leave.'
+				'"You know what, that would be great. I know that must have been difficult to ask, so thanks for confiding in me," you smile at her before leaving.'
 				act 'Go back to the library': gt $loc, $loc_arg
 			end
 		elseif nataliaQW['sex_agree'] = -1 or nataliaQW['library_sex_day'] = daystart:
-			'You spot Natalia in the library, walk over to her, and greet her. "Hi Natalia, how are you?" You say in a quiet voice.'
-			'"I''m fine, <<$pcs_nickname>>, thanks and you?"'
-			'"Mustn''t grumble." You answer.'
+			'You spot Natalia in the library, so you walk over and greet her. "Hey Natalia, how are you?" you ask in a quiet voice.'
+			'"I''m fine, <<$pcs_nickname>>. You?"'
+			'"Mustn''t grumble," you answer.'
 			'You spend a few minutes chatting about developments in school and some of the latest news.'
 			act 'Go back to the library': gt $loc, $loc_arg
 			if nataliaQW['sex_agree'] = -1:
-				act 'Tell her that you are ready for a sexual relationship':
+				act 'Tell her that you''re ready for a sexual relationship':
 					nataliaQW['sex_agree'] = 1
 					cla
-					'After your friendly catch up you prod Natalia in the arm to get her attention.'
-					'When she turns to you, you lean in very close to her and with a sheepish look and nervously wisper. "Erm... Natalia, I''ve been thinking on yuor earlier suggestion." You pause to gather yourself as you realise your face is getting redder and redder. You nervously clear your throat and continue. "Well I''ve thought about it and yes that would be great Natalia although I''d understand if..."'
-					'Clearly realising you''re finding this difficult she cuts you off to save you further embarasement. "It''s okay <<$pcs_nickname>> I understand and yes that''s fine. I''ll look forward to it." She pauses before continuing. "I can''t now as I''ve got to go but maybe next time, guess we''ll see." She gives you a quick hug before getting up and leaving.'
+					'After your friendly catch up, you prod Natalia in the arm to get her attention.'
+					'When she turns to you, you lean in very close to her. "Erm... I''ve been thinking about your earlier suggestion..." You pause to gather yourself as you realise your face is getting redder and redder. You nervously clear your throat and continue. "Well I''ve thought about it, and yes that would be great. Although I''d understand if..."'
+					'Clearly realising you''re finding this difficult, she cuts you off to save you further embarasement. "It''s okay, <<$pcs_nickname>>. I understand. I''ll look forward to it." She pauses before continuing. "I can''t now, but maybe next time?" She gives you a quick hug before getting up and leaving.'
 					act 'Go back to the library': gt $loc, $loc_arg				
 				end
 			end
 		else
-			'You spot Natalia in the library, walk over to her, and greet her. "Hi Natalia, how are you?" You say in a quiet voice.'
-			'"I''m fine, <<$pcs_nickname>>, thanks and you?"'
-			'"Mustn''t grumble." You answer.'
-			'You spend a few minutes chatting about developments in school and some of the latest news then she leans close to you. "Look, <<$pcs_nickname>>, you remember our conversation about helping each other out?" She asks.'
-			'You nod to confirm that you do.'
-			'"So <<$pcs_nickname>>, I know a spare room here that''s never used, shall we?"'
+			'You spot Natalia in the library, so you walk over and greet her. "Hey Natalia, how are you?" you ask in a quiet voice.'
+			'"I''m fine, <<$pcs_nickname>>. You?"'
+			'"Mustn''t grumble," you answer.'
+			'You spend a few minutes chatting about developments in school and some of the latest news before she leans close to you. "<<$pcs_nickname>>... You remember our conversation about ''helping'' each other out?" she asks.'
+			'You nod.'
+			'"So... There''s a spare room here that''s never used. Shall we?"'
 			act 'No':
 				cla
-				'"Sorry, Natalia, I''m not in the mood now, and I have to get going. But I wanted to say hi before heading off."'
-				'"No problem, <<$pcs_nickname>>. See you soon." She replies.'
+				'"Sorry, but I''m not in the mood now, and I have to get going. I just wanted to say hi before heading off."'
+				'"No problem. See you soon," she replies.'
 				act 'Go back to the library': gt $loc, $loc_arg
 			end
-			act 'Oh yes!':
+			act 'Yes':
 				*clr & cla
 				nataliaQW['library_sex_day'] = daystart
 				gs 'arousal', 'kiss', 3, 'lesbian'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/kiss1.mp4"></video></center>'
-				'"Oh yes, Natalia, let''s go!" You say.'
-				'Natalia looks around and whispers to you, "Come on, <<$pcs_nickname>>, follow me."'
-				'You both quickly leave the library and enter a small bathroom. Then, pushing a cabinet under the handle, she effectively locks the door.'
-				'Natalia reaches over to you, brings her face close to you, and gives you a passionate kiss.'
-				'"Okay, <<$pcs_nickname>>, clothes off... Now!"'
-				'You giggle. "Desperate are you... or just practicing to be a dominatrix?"'
-				'Natalia laughs and replies "The former I guess... So what are you waiting for?!"'
-				'"Right, well, you too, then. Guess I''d better see to your needs first, seeing as you''re so desperate!" You reply.'
-				'"Umm... Now you''re talking <<$pcs_nickname>>."'
+				'You silently nod before Natalia looks around. "Come on, <<$pcs_nickname>>, follow me," she whispers.'
+				'You both quickly leave the library and enter a small bathroom. Pushing a cabinet under the handle, she effectively locks the door before she gives you a passionate kiss.'
+				'"Okay <<$pcs_nickname>>, clothes off... Now!"'
+				'You giggle. "Desperate, or just practicing to be a dominatrix?"'
+				'She laughs. "The former, I guess... So what are you waiting for?!"'
+				'"Right. Well, you too then. Guess I''d better see to your needs first, seeing as you''re so desperate!" you reply.'
+				'"Now you''re talking!" she laughs.'
 				act 'Get busy':
 					*clr & cla
 					gs 'arousal', 'foreplay_give', 3, 'lesbian'
@@ -153,39 +152,36 @@ if $ARGS[0] = 'library':
 						gs 'arousal', 'foreplay_give', 3, 'lesbian'
 						gs 'stat'
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/3.mp4"></video></center>'
-						'"Right, Natalia, lie back and let me get to work on you."'
-						'Natalia lies back on the bath, and you slowly kiss your way down her body to her pussy.'
+						'"Just lie back and let me get to work on you."'
+						'Natalia lies back and you slowly kiss your way down her body to her pussy.'
 						act 'Continue':
 							*clr & cla
 							gs 'arousal', 'cuni_give', 3, 'lesbian'
 							gs 'stat'
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/4.mp4"></video></center>'
-							'Natalia starts moaning as you continue.'
-							'You soon feel her pushing you back. "Let me sit up." She pants.'
+							'Natalia starts moaning as you continue and you soon feel her pushing you back. "Let me sit up," she pants.'
 							'Once she''s sat up, you get back to work, flicking your tongue in and out whilst sucking at her clit.'
 							act 'Getting her off':
 								*clr & cla
 								gs 'arousal', 'cuni_give', 3, 'lesbian'
 								gs 'stat'
 								'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/5.mp4"></video></center>'
-								'Soon her body starts to shake, and she lies down again, unable to sit up as she nears the point of no return.'
-								'You redouble your efforts as she starts to shake and moan softly.'
-								'Suddenly she quivers and lets out a gasp as she reaches her peak and squirts cum into your mouth.'
+								'Her body soon starts to shake, and she lies down again, unable to sit up as she nears the point of no return.'
+								'You redouble your efforts as she starts to shake and moan softly before she suddenly quivers and lets out a gasp as she reaches her peak and squirts into your mouth.'
 								act 'Ending kiss':
 									*clr & cla
 									gs 'arousal', 'kiss', 3, 'lesbian'
 									gs 'stat'
 									'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/6.mp4"></video></center>'
-									'After sucking her dry, you slowly work your way up her body to her lips and kiss her.'
-									'It''s a long sensual kiss, and she sucks up her juices from around your mouth.'
-									'You slowly pull apart, and she smiles at you. "Fuck <<$pcs_nickname>>, you dyke! You''re too good at that!"'
-									'Well, my turn now, and you know the required standard. So, you say, smiling at her.'
+									'After sucking her dry, you slowly work your way up her body to her lips and kiss her. It''s a long sensual kiss, and she sucks up her juices from around your mouth.'
+									'You then slowly pull apart, and she smiles at you. "Fuck <<$pcs_nickname>>, you''re too good at that!"'
+									'"My turn now, and you know the required standard," you say while smiling at her.'
 									act 'Boobs':
 										*clr & cla
 										gs 'arousal', 'foreplay', 3, 'lesbian'
 										gs 'stat'
 										'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/2.mp4"></video></center>'
-										'You both slowly stand as the bath fills with water, and Natalia looks at you lustfully, gives you a kiss, and then moves down to your boobs.'
+										'You both slowly stand as the bath fills with water, and Natalia looks at you lustfully as she gives you a kiss before moving down to your breasts.'
 										'She starts kissing them and playing with your nipple as you bite your lip.'
 										act 'Sit down':
 											*clr & cla
@@ -193,43 +189,40 @@ if $ARGS[0] = 'library':
 											gs 'stat'
 											'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/3.mp4"></video></center>'
 											'Sitting on the bath corner, you spread your legs to allow Natalia to work on your pussy.'
-											'Breathing heavily, you grab the shelf to your left to keep your balance.'
-											'Natalia begins softly licking your pussy, quickening her pace before slowing again.'
+											'She starts softly licking your pussy, quickening her pace before slowing again.'
 											act 'Teasing':
 												*clr & cla
 												gs 'arousal', 'cuni', 3, 'lesbian'
 												gs 'stat'
 												'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/4.mp4"></video></center>'
 												'Natalia continues to tease, and your breathing starts to get shallow, enjoying her touch.'
-												'Her tongue flicks in an out of you as she fingers your arse, your excitement building all the while!'
+												'Her tongue flicks in and out of you as she fingers your ass, your excitement slowly building.'
 												act 'Bliss':
 													*clr & cla
 													$orgasm_or = 'yes'
 													gs 'arousal', 'cuni', 3, 'lesbian', 'no_orgasm_msg'
 													gs 'stat'
 													'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/5.mp4"></video></center>'
-													'It doesn''t take long for you to reach the edge as her tongue licks you and flicks in an out of your soaked pussy.'
-													'You suddenly moan louder than you intended as your shake and spasm as you reach the moment of utter bliss.'
+													'It doesn''t take long for you to reach the edge as her tongue licks you and flicks in and out of your soaked pussy.'
+													'You suddenly moan louder than you intended as you shake and spasm as you reach the moment of utter bliss.'
 													act 'Sensual kiss':
 														*clr & cla
 														gs 'arousal', 'kiss', 3, 'lesbian'
 														gs 'stat'
 														'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/6.mp4"></video></center>'
-														'You slowly come down from your high as Natalia leans back in the bath and smiles. "So, <<$pcs_nickname>>, how did I do?"'
-														'You climb on top of her and give her a long soft passionate kiss. "Does that answer your question? Umm, and you called me a dyke! Guess it takes one to know one!" You say, winking at her.'
-														'"Yeah, maybe." She replies, smiling at you.'
+														'You slowly come down from your high as Natalia leans back in the bath and smiles. "So? How did I do?"'
+														'You climb on top of her and give her a long, passionate kiss. "Does that answer your question?" you reply while winking at her.'
 														act 'Need a wash':
 															*clr & cla
 															gs 'arousal', 'foreplay', 3, 'lesbian'
 															gs 'stat'
 															gs 'arousal', 'end'
 															'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/1.mp4"></video></center>'
-															'"Okay, Natalia, we both need a good wash as we''re all sweaty and sticky... Again!"'
-															'"Let''s shower quickly and then be on our way before we get caught?"'
-															'"Umm, yeah, <<$pcs_nickname>>. Sounds good." She replies in a low lusty voice.'
+															'"We both need a good wash as we''re all sweaty and sticky... Again! Let''s shower quickly and then be on our way before we get caught?"'
+															'"Yeah, sounds good," she replies in a low, lusty voice.'
 															'You step into the bath, pour some gel on each other, and wash each down, occasionally pausing to enjoy each other''s bodies.'
-															'"Shit, not too much of that or we''ll have to go another round!" You say to Natalia.'
-															'"Yeah, you''re right, <<$pcs_nickname>>. This has been fun but let''s not push our luck."'
+															'"Shit, not too much of that or we''ll have to go another round!" you say to her.'
+															'"Yeah, you''re right. This has been fun, but let''s not push our luck."'
 															'You both quickly finish up, dry off and get dressed before leaving.'
 															act 'Go back to the library': gt $loc, $loc_arg
 														end

+ 25 - 19
locations/natbel_chat.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'chat':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
 				'"You''re pregnant? Who''s the father?"'
-				if $wombthfath = '':
+				if $wombthfath = '' or $wombthfathID = 'unknown':
 					'"Honestly, I don''t even know."'
 					'"Really? That''s crazy." Natasha whispers, rubbing her midriff longingly.'
 
@@ -468,12 +468,12 @@ if $ARGS[0] = 'natknows':
 		'"So, who''s the father?"'
 	end
 	*nl
-	if $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
+	if $wombthfathID = 'A34' and npc_rel['A34'] > 50:
 		'You smile. "I''m sure you won''t be surprised to hear that Kolka got me pregnant."'
 		'"Wow. He really has a thing for knocking girls up." She says while touching her own pregnant belly. "I didn''t expect that to extend to his own sister, though."'
 		'"Yeah, you know how it is. Some men just want to conquer as many wombs as they can, it doesn''t matter who they''re attached to," you reply. "But don''t worry, he still has a permanent claim on yours. We''ll make sure he has plenty of opportunities to keep getting you pregnant. Who knows how many of his children you''ll have before he''s finished."'
 		'Natasha''s face goes completely red with embarrassment, and she starts to mumble something before you cut her off with a passionate kiss. When you finally break the kiss, she is still visibly red, but she isn''t protesting your suggestion. You know what she wants.'
-	elseif $wombthfath = '':
+	elseif $wombthfath = '' or $wombthfathID = 'unknown':
 		'"I don''t actually know." You laugh. "I guess my life has gotten a little out of hand recently."'
 		'"Yeah, it sounds like it has." She smiles. "Regardless, I''m glad I won''t be going through pregnancy alone."'
 	else
@@ -493,23 +493,29 @@ if $ARGS[0] = 'natknows1':
 		'"Is it the same father as last time?"'
 	end
 	*nl
-	if $wombthfath = 'Kolka' and npc_rel['A34'] > 50 and arrpos('$ChildThFath',$wombthfath) >= 0 and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1:
-		'"Yeah, I think you''re right. I''m not sure if I''ll let him get me pregnant again after this though." You pull your face as close to Natasha''s as you can without actually touching her and sultrily whisper, "You, on the other hand, are going to be his personal breeding bitch. There won''t be a single moment where your womb doesn''t contain either his baby or his cum. He is going to keep you knocked up until he gets bored with you and leaves you a single mother."'
-		'As soon as you finish speaking, you give Natasha a deep, passionate kiss. You pull away, a string of saliva still hanging between you. Natasha just stares at you, unable to respond, but very visibly aroused.'
-	elseif arrpos('$ChildThFath','Kolka') = arrsize('$ChildThFath')-1:
-		'"Not this time. My body is far too fantastic to limit myself. My brother can''t be the only person to put a baby in me," you joke. "Plus, he already has a baby factory. That''s your job." You punctuate your sentence by kissing Natasha. After you pull away, she stares at you in silence, face red, trying to determine if you were serious.'
-	elseif $wombthfath = 'Kolka' and npc_rel['A34'] > 50 and arrpos('$ChildThFath',$wombthfath) = arrsize('$ChildThFath')-1:
-		'"No, this time it''s Kolka''s," you inform her.'
-		'"Wow. He really has a thing for knocking girls up," she says.'
-		'"Yeah, it seems like he does," you reply. "But don''t worry, we''ll make sure he has plenty of opportunities to keep getting you pregnant. Who knows how many of his children you''ll have before he''s finished."'
-		'Natasha''s face goes completely red with embarrassment, and she starts to mumble something before you cut her off with a passionate kiss. When you finally break the kiss, she is still visibly red, but she isn''t protesting your suggestion. You know what she wants.'
-	elseif $wombthfath ! 'Kolka' and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1:
-		'"Yeah. I guess I needed him to give me another baby before I could be satisfied," you say jokingly.'
-		'"Well, I hope you find satisfaction," she laughs.'
-	elseif $wombthfath ! 'Kolka' and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1:
-		'"No, I needed to test drive someone else before I could decide what father I like best."'
-		'"If you''re going that route, you might as well keep shopping around." You laugh together for a while before moving on to another topic.'
+!! testing if believed same dad as last born kid
+	if $wombthfathID = $ChildThFath[kid-1]:
+		if $wombthfathID = 'A34':
+			'"Yeah, I''m not sure if I''ll let him get me pregnant again after this though." You pull your face as close to Natasha''s as you can without actually touching her and sultrily whisper, "You, on the other hand, are going to be his personal breeding bitch. There won''t be a single moment where your womb doesn''t contain either his baby or his cum. He is going to keep you knocked up until he gets bored with you and leaves you a single mother."'
+			'As soon as you finish speaking, you give Natasha a deep, passionate kiss. You pull away, a string of saliva still hanging between you. Natasha just stares at you, unable to respond, but very visibly aroused.'
+		else
+			'"Yeah. I guess I needed him to give me another baby before I could be satisfied," you say jokingly.'
+			'"Well, I hope you find satisfaction," she laughs.'
+		end
+	else
+!! reactions of different dads
+		if $wombthfathID = 'A34':
+			'"No, this time it''s Kolka''s," you inform her.'
+			'"Wow. He really has a thing for knocking girls up," she says.'
+			'"Yeah, it seems like he does," you reply. "But don''t worry, we''ll make sure he has plenty of opportunities to keep getting you pregnant. Who knows how many of his children you''ll have before he''s finished."'
+			'Natasha''s face goes completely red with embarrassment, and she starts to mumble something before you cut her off with a passionate kiss. When you finally break the kiss, she is still visibly red, but she isn''t protesting your suggestion. You know what she wants.'
+		elseif $ChildThFath[kid-1] = 'A34':
+			'"Not this time. My body is far too fantastic to limit myself. My brother can''t be the only person to put a baby in me," you joke. "Plus, he already has a baby factory. That''s your job." You punctuate your sentence by kissing Natasha. After you pull away, she stares at you in silence, face red, trying to determine if you were serious.'
+		else
+			'"No, I needed to test drive someone else before I could decide what father I like best."'
+			'"If you''re going that route, you might as well keep shopping around." You laugh together for a while before moving on to another topic.'
 		end
+	end
 	act 'Continue':gt 'natbelapt', 'natroom'
 end
 

+ 2 - 2
locations/natbelapt.qsrc

@@ -628,7 +628,7 @@ if $ARGS[0] = 'natroom':
 							if rand(0,7) = 0:
 								dynamic $d_pregmovement
 								'"As if on queue..." you happily muse aloud.'
-								if $wombthfath = 'Kolka': 'With a tinge of wonder Natasha mumbles "Your little brother makes some energetic children, doesn''t he?"'
+								if $wombthfathID = 'A34': 'With a tinge of wonder Natasha mumbles "Your little brother makes some energetic children, doesn''t he?"'
 							end
 						end
 					end
@@ -648,7 +648,7 @@ if $ARGS[0] = 'natroom':
 							if rand(0,7) = 0:
 								dynamic $d_pregmovement
 								'"As if on queue..." you happily muse aloud.'
-								if $wombthfath = 'Kolka': 'You see Natasha blush slightly before she says with a wink "Just like their dad, huh?"'
+								if $wombthfathID = 'A34': 'You see Natasha blush slightly before she says with a wink "Just like their dad, huh?"'
 							end
 						end
 					end

+ 5 - 0
locations/pattest.qsrc

@@ -1,6 +1,11 @@
 # pattest
 !! It is called like "gs 'pattest','Kolka'", or "gs 'pattest',$boy"
 !! It needs some automatic call, usable when a named guy has cum in or on you, and only his cum is in/on the area (do not call this with "rapist", "unknown" or "gopnik")
+!! Calls should be done with unique IDs 'A34' for Kolka etc.
+!!	$ChildFath : array for names of the childs biological father. This should be the absolute truth, not readily available information for the characters.
+!!	$ChildFathDNA : array for the DNA of the childs father
+!!	$ChildThFath : array for the IDs of the childs believed father (can be different from the biological father and should be in form of ID ie. 'A34' or 'unknown' if Sveta has no idea) Do not use for pregnancy events as it is only updated when going to labor. This is probably the variable you want to work with when doing paternity tests, or if father reacts to physical traits not matching despite Sveta claiming they are the dad.
+
 !! There needs to be an option to call it selectively when certain circumstances are met ($boy gives sample voluntarily).
 
 if ARGS[1] ! 1 and pattest > 0:

+ 1 - 1
locations/pornfilm.qsrc

@@ -1041,7 +1041,7 @@ if $ARGS[0] = '11':
 				*clr & cla
 				minut += 5
 				porncream += 1
-				'<center><video autoplay loop src="images/locations/city/redlight/studio_porn/sex/porncp<<rand(1,4)>>.mp4" width="500"></video></center>'
+				'<center><video autoplay loop src="images/locations/city/redlight/studio_porn/sex/porncp<<rand(1,3)>>.mp4" width="500"></video></center>'
 				cumnostd = 1
 				gs 'cum_call', '', $pactorID[1], 1, 0, 10000, 40
 				cumnostd = 1

+ 108 - 110
locations/rape_events.qsrc

@@ -509,134 +509,132 @@ if $ARGS[0] = 'park_rape_struggle_start':
 end
 
 if $ARGS[0] = 'park_rape_solo':
-	act'Continue':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape8.jpg"></center>'
-		if $pantyworntype ! 'none':
-			if PCloSkirt > 0:
-				'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. Below your skirt, you feel your panties get pulled aside.'
-			else
-				'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. At the same time, you feel your pants violently yanked down over your ass. You think you hear the sound of the elastic in your panties snapping.'
-			end
-			'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!"'
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape8.jpg"></center>'
+	if $pantyworntype ! 'none':
+		if PCloSkirt > 0:
+			'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. Below your skirt, you feel your panties get pulled aside.'
 		else
-			if PCloSkirt > 0:
-				'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth.'
-				'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!"  You feel your skirt pulled up and something between your legs. "No panties! You fucking <i>whore!</i>"'
+			'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. At the same time, you feel your pants violently yanked down over your ass. You think you hear the sound of the elastic in your panties snapping.'
+		end
+		'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!"'
+	else
+		if PCloSkirt > 0:
+			'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth.'
+			'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!"  You feel your skirt pulled up and something between your legs. "No panties! You fucking <i>whore!</i>"'
+		else
+			'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. '
+			'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!" You feel your pants violently yanked down over your ass. "No panties! You fucking <i>whore!</i>"'
+		end
+	end
+	
+	if rand(0,1) = 1:
+		!! vaginal rape
+		act'<i><b>MMMMMRRMMPH-!!!</b></i>':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/shared/street/sex/rape.mp4"></video></center>'
+			'<i><b>"MMMMMRRMMPH-!!!"</b></i>'
+			if pcs_vag = 0:
+				'You try to scream again when something stabs into your vagina, tearing straight through your hymen, but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut and your insides feel like they''re on fire as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, while your virginity is violently robbed from you by a stranger.'
 			else
-				'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. '
-				'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!" You feel your pants violently yanked down over your ass. "No panties! You fucking <i>whore!</i>"'
+				'You try to scream again when you feel something stab into your vagina but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, your most intimate place being thoroughly violated by a stranger.'
 			end
-		end
-		
-		if rand(0,1) = 1:
-			!! vaginal rape
-			act'<i><b>MMMMMRRMMPH-!!!</b></i>':
+			gs 'arousal', 'vaginal', rand(5,10), 'rough', 'rape'
+			gs 'stat'
+			act'The end...':
 				cla & *clr
-				'<center><video autoplay loop src="images/locations/shared/street/sex/rape.mp4"></video></center>'
-				'<i><b>"MMMMMRRMMPH-!!!"</b></i>'
-				if pcs_vag = 0:
-					'You try to scream again when something stabs into your vagina, tearing straight through your hymen, but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut and your insides feel like they''re on fire as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, while your virginity is violently robbed from you by a stranger.'
-				else
-					'You try to scream again when you feel something stab into your vagina but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, your most intimate place being thoroughly violated by a stranger.'
-				end
-				gs 'arousal', 'vaginal', rand(5,10), 'rough', 'rape'
-				gs 'stat'
-				act'The end...':
+				gs 'cum_call','', 'rapist'
+				gs'stat'
+				'<center><video autoplay loop src="images/locations/shared/street/sex/rape_cum.mp4"></video></center>'
+				'After what feels like an eternity, the man thrusts into you several times, much harder than before before completely burying his cock inside you.'
+				'"Mmmmph-!" You feel him pulsing inside you and you groan uselessly into his hand. The stranger climbs off of you and his cock withdraws from inside you, eliciting a whimper from your lips. With that final act, you''re left shivering on the ground, completely spent, not even enough strength left to belatedly cry out for help. You hear the clinking of metal behind you again and you feel something leak from your pussy.'
+				'"You''re a pretty good fuck girlie. Maybe we can have another ''date'' like this again some time." Even though you can''t see his face, you can hear the smile in his voice. Moments later, you hear footsteps sound in the alley, slowly fading away until you''re left in silence.'
+				act'Cry':
 					cla & *clr
-					gs 'cum_call','', 'rapist'
 					gs'stat'
-					'<center><video autoplay loop src="images/locations/shared/street/sex/rape_cum.mp4"></video></center>'
-					'After what feels like an eternity, the man thrusts into you several times, much harder than before before completely burying his cock inside you.'
-					'"Mmmmph-!" You feel him pulsing inside you and you groan uselessly into his hand. The stranger climbs off of you and his cock withdraws from inside you, eliciting a whimper from your lips. With that final act, you''re left shivering on the ground, completely spent, not even enough strength left to belatedly cry out for help. You hear the clinking of metal behind you again and you feel something leak from your pussy.'
-					'"You''re a pretty good fuck girlie. Maybe we can have another ''date'' like this again some time." Even though you can''t see his face, you can hear the smile in his voice. Moments later, you hear footsteps sound in the alley, slowly fading away until you''re left in silence.'
-					act'Cry':
-						cla & *clr
-						gs'stat'
-						minut += 3
-						'<center><video autoplay loop src="images/locations/shared/street/sex/rape_after1.mp4"></video></center>'
-						if $pantyworntype ! 'none':
-							'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel soaking through your panties.'
+					minut += 3
+					'<center><video autoplay loop src="images/locations/shared/street/sex/rape_after1.mp4"></video></center>'
+					if $pantyworntype ! 'none':
+						'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel soaking through your panties.'
+					else
+						if PCloSkirt > 0:
+							'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the thick liquid you feel dribbling down your leg.'
 						else
-							if PCloSkirt > 0:
-								'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the thick liquid you feel dribbling down your leg.'
-							else
-								'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel spreading through your pants.'
-							end
-						end
-						act'Go to the police station':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
-							if $loc = 'pav_commercial' or $loc = 'pav_residential':
-								'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the train depot and the police station that resides next to it.'
-							else
-								'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the city center and the police station that resides in it.'
-							end
-							act'Continue':gt'rape_events', 'rape_report'
+							'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel spreading through your pants.'
 						end
-						
-						act'Don''t go':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
-							'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
-							*nl
-							'You slowly limp away, clutching your arms around your belly, trying your best to leave the events of tonight in the alley behind you...'
-							act'Leave':gt $loc, $loc_arg
+					end
+					act'Go to the police station':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+						if $loc = 'pav_commercial' or $loc = 'pav_residential':
+							'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the train depot and the police station that resides next to it.'
+						else
+							'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the city center and the police station that resides in it.'
 						end
+						act'Continue':gt'rape_events', 'rape_report'
+					end
+					
+					act'Don''t go':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+						'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
+						*nl
+						'You slowly limp away, clutching your arms around your belly, trying your best to leave the events of tonight in the alley behind you...'
+						act'Leave':gt $loc, $loc_arg
 					end
 				end
 			end
-		else
-			!! anal rape
-			act'<i><b>MMMMMRRMMPH-!!!</b></i>':
+		end
+	else
+		!! anal rape
+		act'<i><b>MMMMMRRMMPH-!!!</b></i>':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/shared/street/sex/rape.mp4"></video></center>'
+			gs 'arousal', 'anal', rand(5,10), 'rough', 'rape'
+			gs 'stat'
+			'<i><b>"MMMMMRRMMPH-!!!"</b></i>'
+			'You try to scream again when you feel something stab into your anus but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, your ass being violently stretched out by a stranger.'
+			act'The end...':
+				gs'arousal','end'
 				cla & *clr
-				'<center><video autoplay loop src="images/locations/shared/street/sex/rape.mp4"></video></center>'
-				gs 'arousal', 'anal', rand(5,10), 'rough', 'rape'
-				gs 'stat'
-				'<i><b>"MMMMMRRMMPH-!!!"</b></i>'
-				'You try to scream again when you feel something stab into your anus but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, your ass being violently stretched out by a stranger.'
-				act'The end...':
-					gs'arousal','end'
+				gs 'cum_call','anus', 'rapist'
+				gs'stat'
+				'<center><video autoplay loop src="images/locations/shared/street/sex/rape_cum.mp4"></video></center>'
+				'After what feels like an eternity, the man thrusts into you several times, much harder than before before completely burying his cock inside you.'
+				'"Mmmmph-!" You feel him pulsing inside you and you groan uselessly into his hand. The stranger climbs off of you and his cock withdraws from your ass, eliciting a whimper from your lips. With that final act, you''re left shivering on the ground, completely spent, not even enough strength left to belatedly cry out for help. You hear the clinking of metal behind you again and you feel something trickle out of your ruined asshole.'
+				'"You''re a real buttslut, girlie. Maybe we can have another ''date'' like this again some time." Even though you can''t see his face, you can hear the smile in his voice. Moments later, you hear footsteps sound in the alley, slowly fading away until you''re left in silence.'
+				act'Cry':
 					cla & *clr
-					gs 'cum_call','anus', 'rapist'
 					gs'stat'
-					'<center><video autoplay loop src="images/locations/shared/street/sex/rape_cum.mp4"></video></center>'
-					'After what feels like an eternity, the man thrusts into you several times, much harder than before before completely burying his cock inside you.'
-					'"Mmmmph-!" You feel him pulsing inside you and you groan uselessly into his hand. The stranger climbs off of you and his cock withdraws from your ass, eliciting a whimper from your lips. With that final act, you''re left shivering on the ground, completely spent, not even enough strength left to belatedly cry out for help. You hear the clinking of metal behind you again and you feel something trickle out of your ruined asshole.'
-					'"You''re a real buttslut, girlie. Maybe we can have another ''date'' like this again some time." Even though you can''t see his face, you can hear the smile in his voice. Moments later, you hear footsteps sound in the alley, slowly fading away until you''re left in silence.'
-					act'Cry':
-						cla & *clr
-						gs'stat'
-						minut += 3
-						'<center><video autoplay loop src="images/locations/shared/street/sex/rape_after1.mp4"></video></center>'
-						if $pantyworntype ! 'none':
-							'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel soaking through the back of your panties.'
+					minut += 3
+					'<center><video autoplay loop src="images/locations/shared/street/sex/rape_after1.mp4"></video></center>'
+					if $pantyworntype ! 'none':
+						'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel soaking through the back of your panties.'
+					else
+						if PCloSkirt > 0:
+							'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the thick liquid you feel leaking from between your cheeks and dribbling down your leg.'
 						else
-							if PCloSkirt > 0:
-								'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the thick liquid you feel leaking from between your cheeks and dribbling down your leg.'
-							else
-								'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel spreading through your pants.'
-							end
+							'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel spreading through your pants.'
 						end
-						act'Go to the police station':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
-							if $loc = 'pav_commercial' or $loc = 'pav_residential':
-								'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the train depot and the police station that resides next to it.'
-							else
-								'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the city center and the police station that resides in it.'
-							end
-							act'Continue':gt'rape_events', 'rape_report'
-						end
-						
-						act'Don''t go':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
-							'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
-							*nl
-							'You slowly limp away, clutching your arms around your belly, trying your best to leave the events of tonight in the alley behind you...'
-							act'Leave':gt $loc, $loc_arg
+					end
+					act'Go to the police station':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+						if $loc = 'pav_commercial' or $loc = 'pav_residential':
+							'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the train depot and the police station that resides next to it.'
+						else
+							'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the city center and the police station that resides in it.'
 						end
+						act'Continue':gt'rape_events', 'rape_report'
+					end
+					
+					act'Don''t go':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+						'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
+						*nl
+						'You slowly limp away, clutching your arms around your belly, trying your best to leave the events of tonight in the alley behind you...'
+						act'Leave':gt $loc, $loc_arg
 					end
 				end
 			end

+ 56 - 37
locations/salon.qsrc

@@ -112,7 +112,7 @@ end
 if $ARGS[0] = 'discount':
 		!! Set staff discount
 		if masseuse['jobtype'] > 0: 
-			salon_rate = ARGS[1] /2
+			salon_rate = ARGS[1] / 2
 		else
 			salon_rate = ARGS[1]
 		end
@@ -131,14 +131,14 @@ if $ARGS[0] = 'services':
 	$epayments['banner']  = 'locations/city/citycenter/mall/salon/xian.jpg'
 
 	act 'Move away':gs 'salon', 'cleanvar' & gt 'salon', 'start'
-	
 	gs 'salon', 'discount', 1000
 	if money >= salon_rate or karta + bankDebtLimit >= salon_rate:
 		act 'Tanning booth <<salon_rate>> <b>₽</b>':
+			gs 'salon', 'discount', 1000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 1000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'tanning_booth'
 			$epayments['description'] = 'tanning session'
@@ -155,12 +155,13 @@ if $ARGS[0] = 'services':
 	act 'See the eyelash specialist':gt'salon','eyelashes'
 	
 	gs 'salon', 'discount', 5000
-	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and salon['skin_care_day'] < max(daystart - 7,1):
+	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and salon['skin_care_day'] < max(daystart - 7,1):	
 		act 'Skin care <<salon_rate>> <b>₽</b>':
+			gs 'salon', 'discount', 5000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 2500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 5000
+				epayments['value'] = salon_rate
 			end
 			epayments['value'] = salon_rate
 			$epayments['loc_arg'] = 'skin_care'
@@ -177,13 +178,14 @@ if $ARGS[0] = 'services':
 		end
 	end
 	
-	gs 'salon', 'discount', 25000
+	gs 'salon', 'discount', 25000	
 	if money >= salon_rate or karta + bankDebtLimit >= salon_rate:
-		act 'Full body rejuvination <<salon_rate>> <b>₽</b>':				
+		act 'Full body rejuvination <<salon_rate>> <b>₽</b>':
+			gs 'salon', 'discount', 25000			
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 12500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 25000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'rejuvination'
 			$epayments['description'] = 'full body rejuvination'
@@ -197,7 +199,10 @@ if $ARGS[0] = 'services':
 	
 	gs 'salon', 'discount', 1000
 	if (pcs_pubes > 9 or pcs_leghair > 9) and money >= salon_rate or karta + bankDebtLimit >= salon_rate:
-		act 'Partial or full body hair removal up to <<salon_rate>> <b>₽</b>':gt'salon','hair_removal'
+		act 'Partial or full body hair removal up to <<salon_rate>> <b>₽</b>':
+			gs 'salon', 'discount', 1000
+			gt'salon','hair_removal'
+		end
 	elseif (pcs_pubes > 9 or pcs_leghair > 9)  and (money < salon_rate and karta + bankDebtLimit  < salon_rate):
 		act 'Body hair removal <font color="red"><<salon_rate>> <b>₽</b> </font>':
 			msg'You don''t have enough money for this!'
@@ -208,13 +213,14 @@ if $ARGS[0] = 'services':
 		end
 	end
 
-	gs 'salon', 'discount', 500
+	gs 'salon', 'discount', 500	
 	if pcs_pubes > 20 and money >= salon_rate or karta + bankDebtLimit >= salon_rate:
-		act 'Dye your pubic hair <<salon_rate>> <b>₽</b>':				
+		act 'Dye your pubic hair <<salon_rate>> <b>₽</b>':
+			gs 'salon', 'discount', 500			
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 250
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 500
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'pubes'
 			$epayments['description'] = 'dye your pubic hair'
@@ -1109,10 +1115,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 5000
 	if ( money >= salon_rate or karta + bankDebtLimit >= salon_rate) and pcs_naturallashes < 2:
 		act 'Eyelash growth treatment</a> - <<salon_rate>><b> ₽</b>': 
+			gs 'salon', 'discount', 5000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 2500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 5000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashTreatment'
 			$epayments['description'] = 'eyelash growth treatment'
@@ -1127,10 +1134,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 500
 	if ( money >= salon_rate or karta + bankDebtLimit >= salon_rate) and pcs_lashes < 3 and false_lashes <= 0:
 		act 'Simple false lashes':
+			gs 'salon', 'discount', 500
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 250
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 500
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashFalsies'
 			$epayments['description'] = 'simple false eyelashes'
@@ -1146,10 +1154,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 1000
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and pcs_lashes < 4 and false_lashes <= 0:
 		act 'Dramatic false lashes':
+			gs 'salon', 'discount', 1000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 1000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashFalsies'
 			$epayments['description'] = 'Dramatic false lashes'
@@ -1165,10 +1174,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 2000
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and lashextensionduration <= 0:
 		act '2D volume eyelash extensions':
+			gs 'salon', 'discount', 2000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 1000
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 2000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			$epayments['description'] = '2D volume eyelash extensions'
@@ -1186,10 +1196,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 5000
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and lashextensionduration <= 0:
 		act '4D volume eyelash extensions':
+			gs 'salon', 'discount', 5000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 2500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 5000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			$epayments['description'] = '4D volume eyelash extensions'
@@ -1206,10 +1217,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 10000
 	if ( money >= salon_rate or karta + bankDebtLimit >= salon_rate) and lashextensionduration <= 0:
 		act '6D volume eyelash extensions':
+			gs 'salon', 'discount', 10000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 5000
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 10000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			$epayments['description'] = '6D volume eyelash extensions'
@@ -1226,10 +1238,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 1000
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and lashextensionduration >= 1 and lashextensionduration <= 4 and lashextensionstyle = 2:
 		act 'Refill your 2D lash extension':
+			gs 'salon', 'discount', 1000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 1000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			$epayments['description'] = 'refill your 2D lash extensions'
@@ -1245,10 +1258,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 2500
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate)and lashextensionduration >= 1 and lashextensionduration <= 4 and lashextensionstyle = 4:
 		act 'Refill your 4D lash extension':
+			gs 'salon', 'discount', 2500
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 1250
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 2500
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			lashextensionnew = 0
@@ -1260,13 +1274,15 @@ if $ARGS[0] = 'eyelashes':
 	else
 		act 'Refill your 4D lash extension <font color="red"><<salon_rate>> <b>₽</b> </font>': msg 'You don''t need this service!'
 	end
+
 	gs 'salon', 'discount', 5000
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate)and lashextensionduration >= 1 and lashextensionduration <= 4 and lashextensionstyle = 6:
 		act 'Refill your 6D lash extension':
+			gs 'salon', 'discount', 5000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 2500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 5000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			$epayments['description'] = 'refill your 6D lash extensions'
@@ -1281,10 +1297,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 500
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and lashextensionduration > 0:
 		act 'Remove your eyelash extensions':
+			gs 'salon', 'discount', 500
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 250
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 500
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			$epayments['description'] = 'remove your eyelash extensions'
@@ -2396,9 +2413,10 @@ end
 
 if $ARGS[0] = 'cosmetic_tattoo_start':
 	cla & *clr
-	gs 'salon', 'discount', 2000
+	
 	'<br>We currently offer five levels of cosmetic tattoos: light, vibrant, sultry, professional and celebrity.<br>Please keep in mind that these procedures are permanent.<br>Also, be aware that after procedure using regular cosmetics will be difficult.<br>Price is set at <<salon_rate>><b>₽</b>'
 	if money >= salon_rate or karta + bankDebtLimit >= salon_rate:
+		gs 'salon', 'discount', 2000
 		if masseuse['jobtype'] > 0:  
 			epayments['value'] = 1000
 		else
@@ -2480,6 +2498,7 @@ if $ARGS[0] = 'cleanvar':
 	killvar 'partialservice'
 	killvar 'fullservice'
 	killvar 'epayments'
+	killvar 'salon_rate'
 end
 
 --- salon ---------------------------------

+ 1 - 1
locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 8
 version_revision = 9
-version_patch = 1
+version_patch = 2
 --- saveg ---------------------------------
 

+ 3 - 0
locations/version.qsrc

@@ -2,6 +2,9 @@
 
 act 'Return': gt 'start'
 
+'0.8.9.2'
+'- Bug fixes'
+
 '0.8.9.1'
 '- Photography shop - started migration over to new event system and preparing for new content'
 '- Mira''s 3 wishes Added to the Quest Journal by Derryth_Love and Anya'