浏览代码

Merge https://git.catrenelle.com/Kevin_Smarts/glife into dev

jhawkkaw 5 年之前
父节点
当前提交
80a3d879b2

+ 2 - 4
locations/MartinTalk.qsrc

@@ -445,7 +445,6 @@ if $ARGS[0] = '':
 				'Martin chuckles. "Alright, you can have your secrets." But you can tell that he is a little disappointed you didn''t tell him more about yourself.'
 				*nl
 				'Still, he does what he can to hide that and give the conversation a new direction. "So, where do you live?"'
-			
 			else
 				'"I know that you are... doing porn," Martin tells you quietly.'
 				'Your face falls. You try to keep your cool, but you''re feeling cold all of a sudden. Why is he bringing this up?'
@@ -467,10 +466,9 @@ if $ARGS[0] = '':
 				'His smile infects you too. "Yeah, maybe."'
 				*nl
 				'Despite your relief, both of you fall silent for a while. It''s a lot to process, after all, and the question that goes through your head - if Martin had been jerking off to your videos - is annoyingly persistent. But with apparently nobody in the bar requiring his attention yet, Martin eventually feels like continuing the conversation somehow:' 
-				'"So, where do you live?"'
-					
-				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
+				'"So, where do you live?"'	
 			end
+			act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 		end
 			
 		if SchoolAtestat = 0: 

+ 2 - 2
locations/Miroslava.qsrc

@@ -1116,7 +1116,7 @@ if $ARGS[0] = 'miratalk':
 		gs 'stat'
 
 		act 'Finish':gt $loc, $metka
-		if mirasextimes > 3:
+		!if mirasextimes > 3:
 			act 'Ask Mira if she likes Mitka...':
 				*clr & cla
 				minut += 2
@@ -1129,7 +1129,7 @@ if $ARGS[0] = 'miratalk':
 
 				act 'Finish':gt $loc, $metka
 			end
-		end
+		!end
 	elseif npc_QW['A60'] = 3:
 		*clr & cla
 		minut += 10

+ 34 - 60
locations/Snpc.qsrc

@@ -119,77 +119,51 @@ if numnpc = 45:
 				minut -= 5
 				gs 'stat'
 				act 'Um that''s not what I meant': gt 'Snpc', 'anushnottoday'
-				act 'Kiss her back.':
-					*clr & cla
-					Anush_lunch = 1
-					npc_rel['A144'] += 1
-					pav_sex +=1
-					gs 'stat'
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/anushka/makeout.mp4"></video></center>'
-					'You kiss her back. Your hands are roaming each others bodies, several of the other gopniks are checking the two of you out, especially the guys. Several of them starting hooting, hollering or whistling as the two of you make out hard right in front of them. After a couple of minutes she grabs you by the hands and says "Come on lets go some place more private to continue this.'
-					gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
-					minut -= 5
-					gs 'stat'
-					act 'Not today': gt 'Snpc', 'anushnottoday'
-					act 'Go with it':
-						*clr & cla
-						Anush_lunch = 1
-						pcs_horny += 10
-						npc_rel['A144'] += 1
-						grupvalue[4] +=1
-						pav_sex +=1
-						gs 'stat'
-						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/anushka/makeout.mp4"></video></center>'
-						'You breath heavily feeling yourself turned on. "Ok, where?"'
-						'Her hand slides up your skirt and rubs your clit. "Come with me, I know just the place." With that she takes you by the hand and the two of your head off, with the whistles and cat calls of the other gopniks behind you.'
-						gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
-						minut -= 5
-						gs 'stat'
-						act 'Go somewhere private':  gt 'gschool_sex', 'Anush_private'
-					end
-				end
+				act 'Kiss her back.': gt 'Snpc', 'kissback'
 			else
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/anushka/makeout.mp4"></video></center>'
 				'Noticing she is looking fairly turned on today, well more so than usual, you say to her. "You ok? You are looking pretty flush again today."'
-				'You barely even have time to get the words out when she is leaning in and kissing you, her hands reach around to squeeze you butt.'
+				'You barely even have time to get the words out when she is leaning in and kissing you, her hands reach around to squeeze your butt.'
 				gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
 				minut -= 5
 				gs 'stat'
 				act 'Not today': gt 'Snpc', 'anushnottoday'
-				act 'Kiss her back.':
-					*clr & cla
-					Anush_lunch = 1
-					npc_rel['A144'] += 1
-					pav_sex +=1
-					gs 'stat'
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/anushka/makeout.mp4"></video></center>'
-					'You kiss her back. Your hands are roaming each others bodies, several of the other gopniks are checking the two of you out, especially the guys. Several of them starting hooting, hollering or whistling as the two of you make out hard right in front of them. After a couple of minutes she grabs you by the hands and says "Come on lets go some place more private to continue this.'
-					gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
-					minut -= 5
-					gs 'stat'
-					act 'Not today': gt 'Snpc', 'anushnottoday'
-					act 'Go with it':
-						*clr & cla
-						Anush_lunch = 1
-						pcs_horny += 10
-						npc_rel['A144'] += 1
-						grupvalue[4] +=1
-						pav_sex +=1
-						gs 'stat'
-						'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/anushka/makeout.mp4"></video></center>'
-						'You breath heavily feeling yourself turned on. "Ok, where?"'
-						'Her hand slides up your skirt and rubs your clit. "Come with me, I know just the place." With that she takes you by the hand and the two of your head off, with the whistles and cat calls of the other gopniks behind you.'
-						gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
-						minut -= 5
-						gs 'stat'
-						act 'Go somewhere private':  gt 'gschool_sex', 'Anush_private'
-					end
-				end
+				act 'Kiss her back.': gt 'Snpc', 'kissback'
 			end
 		end
 	end
 end
 
+if $ARGS[0] = 'kissback':
+	*clr & cla
+	Anush_lunch = 1
+	npc_rel['A144'] += 1
+	pav_sex +=1
+	gs 'stat'
+	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/anushka/makeout.mp4"></video></center>'
+	'You kiss her back. Your hands are roaming each others bodies, several of the other gopniks are checking the two of you out, especially the guys. Several of them starting hooting, hollering or whistling as the two of you make out hard right in front of them. After a couple of minutes she grabs you by the hands and says "Come on lets go some place more private to continue this.'
+	gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
+	minut -= 5
+	gs 'stat'
+	act 'Not today': gt 'Snpc', 'anushnottoday'
+	act 'Go with it':
+		*clr & cla
+		Anush_lunch = 1
+		pcs_horny += 10
+		npc_rel['A144'] += 1
+		grupvalue[4] +=1
+		pav_sex +=1
+		gs 'stat'
+		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/anushka/makeout.mp4"></video></center>'
+		'You breath heavily feeling yourself turned on. "Ok, where?"'
+		'Her hand slides up your skirt and rubs your clit. "Come with me, I know just the place." With that she takes you by the hand and the two of your head off, with the whistles and cat calls of the other gopniks behind you.'
+		gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
+		minut -= 5
+		gs 'stat'
+		act 'Go somewhere private':  gt 'gschool_sex', 'Anush_private'
+	end
+end
+
 if $ARGS[0] = 'anushnottoday':
 	*clr & cla
 	npc_rel['A144'] -= 2
@@ -419,7 +393,7 @@ if numnpc = 14:
 			minut += 1
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss1.jpg"></center>'
-		elseif $loc ! 'gdkin':
+		else
 			minut += 1
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'

+ 204 - 389
locations/brother.qsrc

@@ -167,128 +167,13 @@ if $ARGS[0] = 'start':
 				else
 					'He adds, "Or you could just watch us."'
 					act 'Play football':
-						*clr & cla
-						minut += 60
-						if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
-						agil_exp += rand(0, 2)
-						pcs_sweat += 30
-						run_exp += rand(0, 2)
-						fat -= rand(2, 7)
-						gs 'stat'
-						'You spend an hour running around, chasing the ball across the field with Kolka and his friends Mishan and Zhendos.'
-
-						if rand(0, 1) = 0 and seepornofut = 0:
-							'The three boys gather together and begin whispering between themselves while giving you conspiratorial looks.'
-							act 'Ask what they''re talking about':
-								*clr & cla
-								gs 'stat'
-								'The boys hesitate, exchanging nervous glances with each other, "It''s nothing…"'
-
-								if pcs_dom > 0 and kolkaseepornday ! daystart:
-									'You can tell they''re lying, so you decide to tease them, "I know, you''re talking about which boys in school you want to kiss, aren''t you?"'
-									'They glare at you and shout, "No!"'
-									'"We wanted to—" Mishan starts before getting cut off when your brother elbows him in the side.'
-									'"Shut up! Don''t tell her," Kolka says sharply. Next thing you know, Kolka and Mishan are arguing, while Zhendos stands there watching them with an annoyed look.'
-									'"Hey, it’s not a big deal. I was just kidding," you say.'
-									'"Porn!" Zhendos blurts out, causing your brother and his friend to stop arguing and fall silent. "We wanted to go watch some porn but you’re here."'
-									'You see Kolka’s face flush red with embarrassment while Mishan laughs and Zhendos rolls his eyes.'
-									'"A girl like you would just get grossed out," Mishan says proudly. "All girls are like that."'
-									act 'Leave':gt $loc, $metka
-									act 'Prove them wrong':
-										*clr & cla
-										gs 'stat'
-										'You tell them if they''re going to watch porn, they''ll need a babysitter. The boys don''t look very pleased, but you don''t give them a choice.'
-										'They have found a spare key for an AV lounge in the school that is not used at this time of day and you all sneak in.'
-
-										act 'Go watch porn':minut += 5 & gt 'seeporn'
-									end
-
-								elseif npc_QW['A34'] >= 3 and kolkaseepornday ! daystart:
-									'Kolka hesitates for a moment before giving you a funny look. "Actually, <<$pcs_nickname>>, we want to go watch some porn but we weren''t sure with having you around... But I think a girl like you could handle it."'
-									act 'Leave':gt $loc, $metka
-									act 'Show interest':
-										*clr & cla
-										gs 'stat'
-										'You let them know that you would like to join them. Mishan and Zhendos don''t look pleased, but Kolka persuades them.'
-										'They have found a spare key for an AV lounge in the school that is not used at this time of day and you all sneak in.'
-
-										act 'Go watch porn':minut += 5 & gt 'seeporn'
-
-									end
-								else
-									act 'Leave':gt $loc, $metka
-
-								end
-							end
-						end
-						if seepornofut >= 1 and kolkaseepornday ! daystart:
-							'The guys gather together and ask you, "<<$pcs_nickname>>, want to watch some porn?"'
-
-							act 'Go watch porn':minut += 5 & gt 'seeporn'
-						end
-
-						act 'Leave':gt $loc, $metka
+						playfootball = 1
+						gt 'brother', 'playfootball'
 					end
 				end
 				act'Watch as they play':
-					*clr & cla
-					picrand = RAND(1,2)
-					minut += 60
-					gs 'stat'
-					if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
-						'<center><b><font color = maroon>School - football field</font></b></center>'
-					if month=1 or month=2 or month=12:
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football4.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football<<picrand>>.jpg"></center>'
-					end
-					'You spend an hour sitting on the bench, watching the guys play football.'
-					if rand(0, 1) = 0 and seepornofut = 0:
-						'The three boys gather together and begin whispering between themselves while giving you conspiratorial looks.'
-						act 'Ask what they''re talking about':
-							*clr & cla
-							gs 'stat'
-							'The boys hesitate before one of them responds, "Err... nothing."'
-
-							if pcs_dom > 0 and kolkaseepornday ! daystart:
-								'You can tell they''re lying, so you decide to tease them, "I know, you''re talking about which boys in school you want to kiss, aren''t you?"'
-								'One of the boys immediately spits out, "No, we want to go watch some porn, but didn''t think a girl like you could handle it!"'
-								act 'Leave':gt $loc, $metka
-								act 'Prove them wrong':
-									*clr & cla
-									gs 'stat'
-									'You tell them if they''re going to watch porn, they''ll need a babysitter. The boys don''t look very pleased, but you don''t give them a choice.'
-									'They have found a spare key for an AV lounge in the school that is not used at this time of day and you all sneak in.'
-
-									act 'Go watch porn':minut += 5 & gt 'seeporn'
-								end
-
-							elseif npc_QW['A34'] >=3 and kolkaseepornday ! daystart:
-								'Kolka hesitates for a moment before giving you a funny look, "Actually, <<$pcs_nickname>>, we want to go watch some porn but we weren''t sure with having you around... But I think a girl like you could handle it."'
-								act 'Leave':gt $loc, $metka
-								act 'Show interest':
-									*clr & cla
-									gs 'stat'
-									'You let them know that you would like to join them. Mishan and Zhendos don''t look pleased, but Kolka persuades them.'
-									'They have found a spare key for an AV lounge in the school that is not used at this time of day and you all sneak in.'
-
-									act 'Go watch porn':minut += 5 & gt 'seeporn'
-
-								end
-							else
-								act 'Leave':gt $loc, $metka
-
-							end
-						end
-					end
-
-					if seepornofut >= 1 and kolkaseepornday ! daystart:
-						'The guys gather together and ask you, "<<$pcs_nickname>>, want to watch some porn?"'
-
-						act 'Go watch porn':minut += 5 & gt 'seeporn'
-					end
-
-					act 'Leave':gt $loc, $metka
+					playfootball = 0
+					gt 'brother', 'playfootball'
 				end
 				!if brotherSex >= 5:
 				!	act'Ask him if he wants to sneak off to fool around':
@@ -307,6 +192,9 @@ if $ARGS[0] = 'start':
 				elseif brotherkisstalk = 1 or brotherSex > 4:
 					act'Make out with your brother':gt 'brother2', 'kiss'
 				end
+				if natkolkatease = 1:
+					act 'Ask if he liked the show': gt 'brother2', 'nattalk'
+				end
 			end
 		end
 
@@ -340,8 +228,8 @@ if $ARGS[0] = 'start':
 					gs 'arousal', 'breasts', 1, 'incest'
 					gs 'stat'
 				end
-					gs 'arousal', 'end'
-					gs 'stat'
+				gs 'arousal', 'end'
+				gs 'stat'
 				act 'Leave':gt 'sitrPar'
 				exit
 			end
@@ -375,6 +263,7 @@ if $ARGS[0] = 'start':
 					npc_rel['A34'] += 3
 					brothersawpirsF=1
 					pcs_horny += 10
+					gs 'stat'
 					act 'Leave':gt 'sitrPar'
 					exit
 				end
@@ -489,6 +378,84 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'playfootball':
+	if playfootball = 0:
+		*clr & cla
+		picrand = RAND(1,2)
+		minut += 60
+		gs 'stat'
+		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
+			'<center><b><font color = maroon>School - football field</font></b></center>'
+		if month=1 or month=2 or month=12:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football4.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football<<picrand>>.jpg"></center>'
+		end
+		'You spend an hour sitting on the bench, watching the guys play football.'
+	else
+		*clr & cla
+		minut += 60
+		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
+		agil_exp += rand(0, 2)
+		pcs_sweat += 30
+		run_exp += rand(0, 2)
+		fat -= rand(2, 7)
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football3.jpg"></center>'
+		'You spend an hour running around, chasing the ball across the field with Kolka and his friends Mishan and Zhendos.'
+	end
+	if rand(0, 1) = 0 and seepornofut = 0:
+		'The three boys gather together and begin whispering between themselves while giving you conspiratorial looks.'
+		act 'Ask what they''re talking about':
+			*clr & cla
+			gs 'stat'
+			'The boys hesitate before one of them responds, "Err... nothing."'
+
+			if pcs_dom > 0 and kolkaseepornday ! daystart:
+				'You can tell they''re lying, so you decide to tease them, "I know, you''re talking about which boys in school you want to kiss, aren''t you?"'
+				'They glare at you and shout, "No!"'
+				'"We wanted to—" Mishan starts before getting cut off when your brother elbows him in the side.'
+				'"Shut up! Don''t tell her," Kolka says sharply. Next thing you know, Kolka and Mishan are arguing, while Zhendos stands there watching them with an annoyed look.'
+				'"Hey, it’s not a big deal. I was just kidding," you say.'
+				'"Porn!" Zhendos blurts out, causing your brother and his friend to stop arguing and fall silent. "We wanted to go watch some porn but you’re here."'
+				'You see Kolka’s face flush red with embarrassment while Mishan laughs and Zhendos rolls his eyes.'
+				'"A girl like you would just get grossed out," Mishan says proudly. "All girls are like that."'
+				act 'Leave':gt $loc, $metka
+				act 'Prove them wrong':
+					*clr & cla
+					gs 'stat'
+					'You tell them if they''re going to watch porn, they''ll need a babysitter. The boys don''t look very pleased, but you don''t give them a choice.'
+					'They have found a spare key for an AV lounge in the school that is not used at this time of day and you all sneak in.'
+
+					act 'Go watch porn':minut += 5 & gt 'seeporn'
+				end
+
+			elseif npc_QW['A34'] >=3 and kolkaseepornday ! daystart:
+				'Kolka hesitates for a moment before giving you a funny look, "Actually, <<$pcs_nickname>>, we want to go watch some porn but we weren''t sure with having you around... But I think a girl like you could handle it."'
+				act 'Leave':gt $loc, $metka
+				act 'Show interest':
+					*clr & cla
+					gs 'stat'
+					'You let them know that you would like to join them. Mishan and Zhendos don''t look pleased, but Kolka persuades them.'
+					'They have found a spare key for an AV lounge in the school that is not used at this time of day and you all sneak in.'
+
+					act 'Go watch porn':minut += 5 & gt 'seeporn'
+				end
+			else
+				act 'Leave':gt $loc, $metka
+			end
+		end
+	end
+
+	if seepornofut >= 1 and kolkaseepornday ! daystart:
+		'The guys gather together and ask you, "<<$pcs_nickname>>, want to watch some porn?"'
+
+		act 'Go watch porn':minut += 5 & gt 'seeporn'
+	end
+
+	act 'Leave':gt $loc, $metka
+end
+
 if $ARGS[0] = 'kiss_talk':
 	menu_off = 1
 	brotherkisstalk = 1
@@ -617,8 +584,7 @@ if $ARGS[0] = 'sleepsexcum':
 
 		if rand(0, 100) < pcs_horny:
 			!!Inside
-			sexpartkno = 1
-			gs 'cum_manage'
+			gs 'cum_call', '', 'Kolka', 1
 			'<<$boydesc>> groans and you feel a jet of sperm fill your pussy.'
 			pcs_mood -= 15
 			pcs_willpwr -= 15
@@ -628,32 +594,27 @@ if $ARGS[0] = 'sleepsexcum':
 			!!Outside
 			if pose = 0:
 				if rand(0,1) = 0:
-					spafinloc = 14
+					gs 'cum_call', 'stomach', 'Kolka', 1
 					'<<$boydesc>> groans and you quickly pull yourself off of his dick. His hot sperm squirts on your stomach.'
 				else
-					spafinloc = 1
+					gs 'cum_call', 'labia', 'Kolka', 1
 					'<<$boydesc>> groans and you quickly pull yourself off of his dick. His hot sperm squirts on your exposed pussy.'
 				end
-				sexpartkno = 1
-				gs 'cum_manage'
 			elseif pose = 1:
 				if rand(0,1) = 0:
-					spafinloc = 8
+					gs 'cum_call', 'back', 'Kolka', 1
 					'<<$boydesc>> groans and you quickly pull yourself off of his dick. His hot sperm squirts on your back.'
 				else
-					spafinloc = 4
+					gs 'cum_call', 'butt', 'Kolka', 1
 					'<<$boydesc>> groans and you quickly pull yourself off of his dick. His hot sperm squirts on your ass.'
 				end
-				sexpartkno = 1
-				gs 'cum_manage'
 			end
 		end
 	elseif protect = 1:
 		protect = 0
 
 		if rand(0, 89) = 0:sexcontra = 4
-		sexpartkno = 1
-		gs 'cum_manage'
+		gs 'cum_call', '', 'Kolka', 1
 		if sexcontra = 4:
 			'You pull off of <<$boydesc>>, look at his dick and think, <i>Oh shit! The condom ripped.</i>'
 		elseif sexcontra = 5:
@@ -753,9 +714,7 @@ if $ARGS[0] = 'brotherSexStart':
 	act 'Jerk your brother off':
 		*clr & cla
 		npc_rel['A34'] += 2
-		spafinloc = 13
-		sexpartkno = 1
-		gs 'cum_manage'
+		gs 'cum_call', 'hands', 'Kolka', 1
 		if brotherSex < 5:brotherSex = 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj1.jpg"></center>'
@@ -785,9 +744,7 @@ if $ARGS[0] = 'brotherSexStart':
 			act 'Keep sucking':
 				*clr & cla
 				gs 'boyStat', 'A34'
-				spafinloc = 12
-				sexpartkno = 1
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth', 'Kolka', 1
 				swallow += 1
 				gs 'stat'
 
@@ -808,9 +765,7 @@ if $ARGS[0] = 'brotherSexStart':
 				brotherfuck += 1
 				npc_rel['A34'] += 5
 				gs 'boyStat', 'A34'
-				spafinloc = 11
-				sexpartkno = 1
-				gs 'cum_manage'
+				gs 'cum_call', 'face', 'Kolka', 1
 				facial += 1
 				gs 'stat'
 
@@ -820,172 +775,96 @@ if $ARGS[0] = 'brotherSexStart':
 				gs 'brother', 'brotherSexEnd'
 			end
 			if brotherSex >= 6:
-				act 'Fuck your brother (Vaginal)':
-					if brotherSex < 7:brotherSex = 7
-					*clr & cla
-					minut += 5
-					pcs_horny += 10
-					brotherfuck += 1
-					npc_rel['A34'] += 5
-					gs 'boyStat', 'A34'
-
-					gs 'stat'
-
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/kolka/sex/sex,<<rand(0,11)>>.mp4"></video></center>'
-					'You lie back on the sofa and spread your legs. You slip a finger inside yourself and smile seductively at Kolka. You push your digit in and out a few times before adding a second, your brother staring at you hypnotically. You remove your slickened fingers and use them to beckon Kolka closer, before licking them clean. You embrace your sibling as he lies on top of you.'
-					
-					$risk_boy = 'your own brother'
-					gs 'dinsex', 'boy_puts_condom'
-					gs 'dinsex','vaginal_sex',10
-					gs 'dinsex','sexcum'
-
-					gs 'brother', 'brotherSexEnd'
-				end
+				act 'Fuck your brother (Vaginal)': gt 'brother', 'fuckvaginal'
 			end
 			if brotherSex >= 6:
-				act 'Fuck your brother (Anal)':
-					*clr & cla
-					minut += 5
-					pcs_horny += 10
-					npc_rel['A34'] += 5
-					brotherfuck += 1
-					if brotherSex < 8:brotherSex = 8
-					gs 'boyStat', 'A34'
-
-					gs 'stat'
-
-					!Pictures already in folder - Gifs should be added.
-					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/kolka/sex/anal,<<rand(0,4)>>.mp4"></video></center>'
-					'You lie back on the sofa, pulling your knees up to your chest and expose your <<$pcdesc_anus>> asshole to your sibling. "I want you to fuck my ass, Kolka," you tell him. Your brother practically pounces you, not needing more encouragement from you.'
-					
-					gs 'dinSex','boy_wants_anal','Kolka' & gs 'dinsex','analsex'
-
-					gs 'brother', 'brotherSexEnd'
-				end
+				act 'Fuck your brother (Anal)': gt 'brother', 'fuckanal'
 			end
 		end
 	end
 	if brotherSex >= 6:
-		act 'Fuck your brother (Vaginal)':
-			brotherfuck += 1
-			npc_rel['A34'] += 5
-			if brotherSex < 7:brotherSex = 7
-			*clr & cla
-			minut += 5
-			pcs_horny += 10
-			gs 'boyStat', 'A34'
+		act 'Fuck your brother (Vaginal)': gt 'brother', 'fuckvaginal'
+	end
+	if brotherSex >= 7:
+		act 'Fuck your brother (Anal)': gt 'brother', 'fuckanal'
+	end
+end
 
-			gs 'stat'
+if $ARGS[0] = 'fuckvaginal':
+	if brotherSex < 7:brotherSex = 7
+	*clr & cla
+	pcs_horny += 10
+	brotherfuck += 1
+	npc_rel['A34'] += 5
+	gs 'boyStat', 'A34'
+	gs 'arousal', 'vaginal', 5, 'incest'
+	gs 'arousal', 'end'
+	gs 'stat'
 
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/kolka/sex/sex,<<rand(0,11)>>.mp4"></video></center>'
-			'You lie back on the sofa and spread your legs. You slip a finger inside yourself and smile seductively at Kolka. You push your digit in and out a few times before adding a second, your brother staring at you hypnotically. You remove your slickened fingers and use them to beckon Kolka closer, before licking them clean. You embrace your sibling as he lies on top of you.'
-			
-			$risk_boy = 'your own brother'
-			gs 'dinsex', 'boy_puts_condom'
-			gs 'dinsex','vaginal_sex',10
-			gs 'dinsex','sexcum'
+	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/kolka/sex/sex,<<rand(0,11)>>.mp4"></video></center>'
+	'You lie back on the sofa and spread your legs. You slip a finger inside yourself and smile seductively at Kolka. You push your digit in and out a few times before adding a second, your brother staring at you hypnotically. You remove your slickened fingers and use them to beckon Kolka closer, before licking them clean. You embrace your sibling as he lies on top of you.'
+					
+	$risk_boy = 'your own brother'
+	gs 'dinsex', 'boy_puts_condom'
+	gs 'dinsex','vaginal_sex',10
+	gs 'dinsex','sexcum'
 
-			gs 'brother', 'brotherSexEnd'
-		end
-	end
-	if brotherSex >= 7:
-		act 'Fuck your brother (Anal)':
-			brotherfuck += 1
-			npc_rel['A34'] += 5
-			*clr & cla
-			minut += 5
-			pcs_horny += 10
-			if brotherSex < 8:brotherSex = 8
-			gs 'boyStat', 'A34'
+	gs 'brother', 'brotherSexEnd'
+end
 
-			gs 'stat'
+if $ARGS[0] = 'fuckanal':
+	brotherfuck += 1
+	npc_rel['A34'] += 5
+	*clr & cla
+	pcs_horny += 10
+	if brotherSex < 8:brotherSex = 8
+	gs 'boyStat', 'A34'
+	gs 'arousal', 'anal', 5, 'incest'
+	gs 'arousal', 'end'
+	gs 'stat'
 
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/kolka/sex/anal,<<rand(0,4)>>.mp4"></video></center>'
-			'You lie back on the sofa, pulling your knees up to your chest and expose your <<$pcdesc_anus>> asshole to your sibling. "I want you to fuck my ass, Kolka," you tell him. Your brother practically pounces you, not needing more encouragement from you.'
+	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/kolka/sex/anal,<<rand(0,4)>>.mp4"></video></center>'
+	'You lie back on the sofa, pulling your knees up to your chest and expose your <<$pcdesc_anus>> asshole to your sibling. "I want you to fuck my ass, Kolka," you tell him. Your brother practically pounces you, not needing more encouragement from you.'
 						
-			gs 'dinSex','boy_wants_anal','Kolka' & gs 'dinsex','analsex'
+	gs 'dinSex','boy_wants_anal','Kolka' & gs 'dinsex','analsex'
 
-			gs 'brother', 'brotherSexEnd'
-		end
-	end
+	gs 'brother', 'brotherSexEnd'
 end
 
 if $ARGS[0] = 'brotherSexEnd':
+	minut += 15
+	gs 'arousal', 'end'
+	gs 'stat'
 	if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
 		if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 23:
-			minut += 15
-			gs 'stat'
-
 			'Panting, Kolka looks at you and says, "That was great, <<$pcs_nickname>>!" He puts his softening cock back in his pants, "Just remember, this is our little secret!" He quickly turns his attention to something else.'
-			
-			gs 'arousal', 'end'
-			gs 'stat'
-			
 			act 'Leave': gt 'sitrPar'
-			
 		elseif $loc = 'sitrPar' and npc_rel['A34'] >= 80:
-			minut += 15
-			gs 'stat'
 			'Kolka lets out a deep yawn, "Ah, thanks <<$pcs_nickname>>. You''re the best." The words barely leave his lips before he''s back under the blanket and dozing off.'
-			
-			gs 'arousal', 'end'
-			gs 'stat'
-			
 			act 'Leave': gt 'sitrPar'
-		
 		elseif $loc = 'sitrPar':
-			minut += 15
-			gs 'stat'
 			'Still somewhat out of breath, Kolka pats your head gently and says, "Nice one, <<$pcs_nickname>>, you''re well trained. Now remember, don''t tell anyone!" He quickly falls asleep.'
-			
-			gs 'arousal', 'end'
-			gs 'stat'
-			
 			act 'Leave': gt 'sitrPar'
 		else
-			'Kolka gives you an appreciative nod, "Nice one, <<$pcs_nickname>>, you''re well trained. Now, don''t tell anyone!"'
-			
-			gs 'arousal', 'end'
+			minut -= 15
 			gs 'stat'
-			
+			'Kolka gives you an appreciative nod, "Nice one, <<$pcs_nickname>>, you''re well trained. Now, don''t tell anyone!"'
 			act 'Continue':gt $loc, $metka
 		end
 	else
 		if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 23:
-			minut += 15
-			gs 'stat'
 			'With a wide grin on his face, Kolka tells you, "Many thanks, <<$pcs_nickname>>, you''ve helped me a lot." He resumes his prior business.'
-			
-			gs 'arousal', 'end'
-			gs 'stat'
-			
 			act 'Leave': gt 'sitrPar'
-		
 		elseif $loc = 'sitrPar' and npc_rel['A34'] >= 80:
-			minut += 15
-			gs 'stat'
 			'Completely sated, Kolka mumbles to you, "Thanks <<$pcs_nickname>>, you''re the best..." In just a few seconds, he''s already dozing off into a blissfull sleep.'
-			
-			gs 'arousal', 'end'
-			gs 'stat'
-			
 			act 'Leave': gt 'sitrPar'
-		
 		elseif $loc = 'sitrPar':
-			minut += 15
-			gs 'stat'
 			'Kolka gives his deflating member a quick shake, "Thanks, <<$pcs_nickname>>, you saved me. Now I can finally sleep..." He slides under his covers and promptly falls asleep.'
-			
-			gs 'arousal', 'end'
-			gs 'stat'
-			
 			act 'Leave': gt 'sitrPar'
 		else
-			'Kolka lets out a very satisfied sigh, "Ah, thanks so much for that, <<$pcs_nickname>>. I gotta go." He puts his drained cock back into his pants and leaves.'
-			
-			gs 'arousal', 'end'
+			minut -= 15
 			gs 'stat'
-			
+			'Kolka lets out a very satisfied sigh, "Ah, thanks so much for that, <<$pcs_nickname>>. I gotta go." He puts his drained cock back into his pants and leaves.'
 			act 'Continue':gt $loc, $metka
 		end
 	end
@@ -1047,11 +926,11 @@ if $ARGS[0] = 'brother_voyeur_end':
 	picrand = RAND(1,2)
 	npc_rel['A34'] += 5
 	pcs_mood += 10
-	pcs_willpwr = pcs_willpwr + 10
+	pcs_willpwr += 10
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/shower/b (end<<picrand>>).jpg"></center>'
 !--- Need to expand
 !	if npc_QW['A34'] < 5
-		'Confused, surreptitiously looking at your brother, You take a towel and wrap around your flushed, steamed body.'
+		'Confused, surreptitiously looking at your brother, You take a towel and wrap it around your flushed, steamed body.'
 		'You shudder at the realization this is wrong. Kolka quietly closes the door and tiptoes out.'
 		'You feel uncomfortable and ashamed, but smile at recalling his wide open eyes, his flushed face and red ears and how they increased the more you decided to tease him.'
 !	else
@@ -1152,32 +1031,19 @@ if $ARGS[0] = 'brother_voyeur_ev3_2':
 			'You turn your ass to Kolka as he strokes his hardening <<npc_dick[''A34'']>> cm long member, before guiding it into your waiting pussy.'
 			if stat['hidden_vaginal'] > 0:
 				'To your surprise his entry in your pussy does not cause you any pain. Of course you have heard about stories that say it didn''t hurt, but you always thought it fake. You feel lucky to be wrong about that.'
-				
-				gs 'arousal','vaginal', 5, 'incest'
-				gs 'stat'
-	
 			else
 				'You feel a small, sharp pain between your legs, like a needle, but it quickly fades. You turn your head to look back at Kolka, his expression pure rapture.'
-				
-				gs 'arousal','vaginal', 5, 'incest'
-				gs 'stat'
-				
 			end
-		elseif npc_dick['A34'] > pcs_vag:
-			'You turn your ass to Kolka as he strokes his hardening <<npc_dick[''A34'']>> cm long member, before guiding it into your waiting pussy.'
-			'Kolka''s dick causes you to flinch a little as your pussy stretches to accept his size.'
-			
-			gs 'arousal','vaginal', 5, 'incest'
-			gs 'stat'
-				
 		else
 			'You turn your ass to Kolka as he strokes his hardening <<npc_dick[''A34'']>> cm long member, before guiding it into your waiting pussy.'
-			'Kolka''s dick causes you to groan a little as your pussy readily accepts him into your depth.'
-			
-			gs 'arousal','vaginal', 5, 'incest'
-			gs 'stat'
-				
+			if npc_dick['A34'] > pcs_vag:
+				'Kolka''s dick causes you to flinch a little as your pussy stretches to accept his size.'
+			else
+				'Kolka''s dick causes you to groan a little as your pussy readily accepts him into your depth.'
+			end
 		end
+		gs 'arousal','vaginal', 5, 'incest'
+		gs 'stat'
 		brother_knows_not_virgin = 1
 	end
 	'Your brother quickly starts to move his cock inside of you and it doesn''t take you long to start feeling the oncoming waves of an orgasm. You suddenly grasp at his hands around your hips as you''re overtaken by a powerful climax. Your pussy pulsates as your walls clamp down around Kolka''s cock; your greedy, hungry box wanting every drop of your brother''s cum. A few seconds later, Kolka joins you in orgasm as he shoots his load deep inside of you.'
@@ -1255,41 +1121,7 @@ if $ARGS[0] = 'brother_voyeur_ev5':
 			gs 'brother', 'anus_check'
 		end
 		'"Oh..." is all Kolka can manage to say as he stares at your nakedness.'
-		'You chastise him, "Hey, you little creep, are you ready to learn or are you just going to stare?"'
-		'"N-no, no, I want to... learn," he stutters out.'
-		'You begin to explain to your brother all the differences between the male and female body, why a woman has breasts , etc., simultaneously struggling with excitement and shame knowing that you are naked in front of your brother.'
-		'Kolka suddenly interrupts you. "Does it hurt?" he asks.'
-		'You blink in confusion, "Does what hurt?"'
-		'He sits for a moment, silently, before asking slowly, "When a boy puts <i>it</i> in?"'
-		if pcs_vag > 0:
-			brother_knows_not_virgin = 1
-			'"Only the first time or two," you respond.'
-			'Kolka inquires, "Have you tried?"'
-			if stat['vaginal'] = 0:
-				'You really don''t want to have this conversation. You try to brush it off, "Never mind..."'
-				'"Well, tell me!" Kolka implores you.'
-				'You look at the floor, "No, I'' still a virgin."'
-			elseif stat['vaginal'] < 10:
-				'You''re not sure you want to have this conversation with your brother, "Never mind..."'
-				'"Well, tell me!" Kolka implores you.'
-				'You blush lightly thinking of the number of times you''ve had sex, "I have a few times."'
-			elseif stat['vaginal'] < 20:
-				'This isn''t a conversation you want to have with your brother, "Never mind..."'
-				'"Well, tell me!" Kolka implores you.'
-				'"Yes, I''ve had sex," you answer.'
-				'Kolka keeps prodding. "How many times?" he asks.'
-				'You stop this line of questioning, "Enough times to know what I''m talking about, okay?"'
-			else
-				'You don''t want to talk about this with Kolka, "Never mind..."'
-				'"Well, tell me!" Kolka implores you.'
-				'You sigh, somewhat loudly, "Yes, I''ve had sex, okay?"'
-				'"How many times?" he asks.'
-				'Fed up, you reply, "A lot, alright. Enough about my sex life. That won''t be on your exams!"'
-			end
-		else
-			'You shrug, "I don''t know, I haven''t tried it."'
-			'Kolka blushes, "Oh..."'
-		end
+		gs 'brother', 'virginitydialog'
 		act'Continue':gt 'brother','brother_voyeur_ev6'
 	elseif npc_QW['A34'] > 4:
 		if analplugIN = 1:
@@ -1300,47 +1132,50 @@ if $ARGS[0] = 'brother_voyeur_ev5':
 			gs 'brother', 'anus_check'
 		end
 		'"Wow, nice view!" Kolka says after a short pause.'
-		'You chastise him, "Hey, you little creep, are you ready to learn or are you just going to stare?"'
-		'"N-no, no, I want to... learn," he stutters out.'
-		'You begin to explain to your brother all the differences between the male and female body, why a woman has breasts , etc., simultaneously struggling with excitement and shame knowing that you are naked in front of your brother.'
-		'Kolka suddenly interrupts you. "Does it hurt?" he asks.'
-		'You blink in confusion, "Does what hurt?"'
-		'He sits for a moment, silently, before asking slowly, "When a boy puts <i>it</i> in?"'
-		if pcs_vag > 0:
-			brother_knows_not_virgin = 1
-			'"Only the first time or two," you respond.'
-			'Kolka inquires, "Have you tried?"'
-			if stat['vaginal'] = 0:
-				'You really don''t want to have this conversation. You try to brush it off, "Never mind..."'
-				'"Well, tell me!" Kolka implores you.'
-				'You look at the floor, "No, I''m still a virgin."'
-			elseif stat['vaginal'] < 10:
-				'You''re not sure you want to have this conversation with your brother, "Never mind..."'
-				'"Well, tell me!" Kolka implores you.'
-				'You blush lightly thinking of the number of times you''ve had sex, "I have a few times."'
-			elseif stat['vaginal'] < 20:
-				'This isn''t a conversation you want to have with your brother, "Never mind..."'
-				'"Well, tell me!" Kolka implores you.'
-				'"Yes, I''ve had sex," you answer.'
-				'Kolka keeps prodding. "How many times?" he asks.'
-				'You stop this line of questioning, "Enough times to know what I''m talking about, okay?"'
-			else
-				'You don''t want to talk about this with Kolka, "Never mind..."'
-				'"Well, tell me!" Kolka implores you.'
-				'You sigh, somewhat loudly, "Yes, I''ve had sex, okay?"'
-				'"How many times?" he asks.'
-				'Fed up, you reply, "A lot, alright. Enough about my sex life. That won''t be on your exams!"'
-			end
-		else
-			'You shrug, "I don''t know, I haven''t tried it."'
-			'Kolka blushes, "Oh..."'
-
-		end
+		gs 'brother', 'virginitydialog'
 		act'Continue':gt 'brother','brother_voyeur_ev6'
 
 	end
 end
 
+if $ARGS[0] = 'virginitydialog':
+	'You chastise him, "Hey, you little creep, are you ready to learn or are you just going to stare?"'
+	'"N-no, no, I want to... learn," he stutters out.'
+	'You begin to explain to your brother all the differences between the male and female body, why a woman has breasts , etc., simultaneously struggling with excitement and shame knowing that you are naked in front of your brother.'
+	'Kolka suddenly interrupts you. "Does it hurt?" he asks.'
+	'You blink in confusion, "Does what hurt?"'
+	'He sits for a moment, silently, before asking slowly, "When a boy puts <i>it</i> in?"'
+	if pcs_vag > 0:
+		brother_knows_not_virgin = 1
+		'"Only the first time or two," you respond.'
+		'Kolka inquires, "Have you tried?"'
+		if stat['vaginal'] = 0:
+			'You really don''t want to have this conversation. You try to brush it off, "Never mind..."'
+			'"Well, tell me!" Kolka implores you.'
+			'You look at the floor, "No, I''m still a virgin."'
+		elseif stat['vaginal'] < 10:
+			'You''re not sure you want to have this conversation with your brother, "Never mind..."'
+			'"Well, tell me!" Kolka implores you.'
+			'You blush lightly thinking of the number of times you''ve had sex, "I have a few times."'
+		elseif stat['vaginal'] < 20:
+			'This isn''t a conversation you want to have with your brother, "Never mind..."'
+			'"Well, tell me!" Kolka implores you.'
+			'"Yes, I''ve had sex," you answer.'
+			'Kolka keeps prodding. "How many times?" he asks.'
+			'You stop this line of questioning, "Enough times to know what I''m talking about, okay?"'
+		else
+			'You don''t want to talk about this with Kolka, "Never mind..."'
+			'"Well, tell me!" Kolka implores you.'
+			'You sigh, somewhat loudly, "Yes, I''ve had sex, okay?"'
+			'"How many times?" he asks.'
+			'Fed up, you reply, "A lot, alright. Enough about my sex life. That won''t be on your exams!"'
+		end
+	else
+		'You shrug, "I don''t know, I haven''t tried it."'
+		'Kolka blushes, "Oh..."'
+	end
+end
+
 if $ARGS[0] = 'anus_check':
 	if analplugIN = 1:
 		if brother_saw_analplug = 0:
@@ -1454,27 +1289,15 @@ if $ARGS[0] = 'brother_voyeur_ev7':
 				'Without another word, you slip a finger into your vagina and push it in and out a few times. A sudden heat erupts in your gut and you can''t help but add a second finger. Your free hand moves to your clitoris and you start rubbing the sensitive nub.'
 				if pcs_vag < 5:
 					'The slippery walls of your pussy are very tightly clasped around your fingers.'
-					
-					gs 'arousal','vaginal_finger', 5, 'incest'
-					gs 'stat'
-					
-					elseif pcs_vag >= 5 and pcs_vag < 10:
+				elseif pcs_vag >= 5 and pcs_vag < 10:
 					pcs_horny += RAND(5,10)
 					'You feel your pussy''s slippery walls around your fingers.'
-					
-					gs 'arousal','vaginal_finger', 5, 'incest'
-					gs 'stat'
-					
 				elseif pcs_vag >= 10:
 					pcs_horny += RAND(2,5)
 					'Your pussy is used to bigger insertions by now; you can feel the wetness of your walls as you move your fingers about.'
-					
-					gs 'arousal','vaginal_finger', 5, 'incest'
-					gs 'stat'
-					
 				end
-				'You''ve given into your desires and have begun masturbating in front of your brother. Kolka simply sits in front of you, hypnotized by your erotic display.'
-				
+				'You give into your desires and begin masturbating in front of your brother. Kolka simply sits in front of you, hypnotized by your erotic display.'
+				gs 'arousal','vaginal_finger', 5, 'incest'
 				gs 'arousal','masturbate', 5, 'incest'
 				gs 'stat'
 				
@@ -1486,18 +1309,14 @@ if $ARGS[0] = 'brother_voyeur_ev7':
 				'"Can you help me relieve some tension?" Kolka asks.'
 				'Confused, you ask, "How?"'
 				'A small grin grows on his face, "Just lie on the floor and don''t move! I''ll do everything myself!"'
-				if sub < 30:
-					act'Refuse and get dressed':gt $loc, $metka
-				end
-				act'Lie on the floor':gt 'brother','brother_voyeur_ev8'
 			elseif npc_QW['A34'] > 5:
 				'You ask him, "What now?" You smile at him, because you''re pretty sure you know what''s coming.'
-				'Kolka smiles back, "Will you lie on the floor again?"'
-				if sub < 30:
-					act'Refuse and get dressed':gt $loc, $metka
-				end
-				act'Get down on the floor':gt 'brother','brother_voyeur_ev8'
+				'Kolka smiles back, "Will you lie on the floor again?"'		
+			end
+			if sub < 30:
+				act'Refuse and get dressed':gt $loc, $metka
 			end
+			act'Get down on the floor':gt 'brother','brother_voyeur_ev8'
 		end
 
 	end
@@ -1561,9 +1380,7 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 	elseif brotherSex >= 4:
 		*clr & cla
 		gs 'boyStat', 'A34'
-		spafinloc = 12
-		sexpartkno = 1
-		gs 'cum_manage'
+		gs 'cum_call', 'mouth', 'A34', 1, 0, 0, rand(20,30)
 		swallow += 1
 		brotherSexCount -= 1
 		brotherEvSex = daystart
@@ -1600,9 +1417,7 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 	elseif brotherConfidence > 10 and brotherSex < 4:
 		*clr & cla
 		gs 'boyStat', 'A34'
-		spafinloc = 12
-		sexpartkno = 1
-		gs 'cum_manage'
+		gs 'cum_call', 'mouth', 'A34', 1, 0, 0, rand(20,30)
 		swallow += 1
 		if brotherSex < 4:brotherSex = 4
 		brotherSexCount -= 1

+ 155 - 122
locations/brother2.qsrc

@@ -86,8 +86,58 @@ if $ARGS[0] = 'chat':
 	act'Continue':gt'brother','start'
 end
 
+if $ARGS[0] = 'nattalk':
+	*clr & cla
+	minut += 15
+	gs 'stat'
+	'<center><b><font color="maroon">Kolka</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'"So Kolka, did you like what you saw in the stairway?" You ask him coyly.'
+	'"I was wondering if you did that for my benefit." He says hesitantly.'
+	'"Well? Did you like it?"'
+	'"Ofcourse I did, Natasha wasn''t wearing any panties, I could see everything."'
+	'"She was wearing panties." You say with a grin. "I had stuffed them in her tight pussy."'
+	'"You? Wow. That''s hot."'
+	if kolkawantsnat = 0:
+		act 'Offer to set something up between them':
+			*clr & cla
+			natkolkatease += 1
+			kolkawantsnat = 1
+			'<center><b><font color="maroon">Kolka</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+			if brotherSex > 6:	
+				'"Would you like to fuck Natasha too? I could arrange something."'
+				'"Could I?" He asks in disbelief.'
+				'"Only if you promise to do exactly as I say."'
+			elseif npc_rel['A34'] >= 50:
+				'"Since you''re constantly sporting a boner lately I thought I''d help you out a bit. Would you like me to set something up with Natasha?"'
+				'"You''d be the best sister ever if you did." He says, grinning from ear to ear.'
+				'"But you''ll have to promise to do exactly as I say."'
+			else
+				'"Look Kolka, I know we haven''t been very close lately. So I wanted to try and make it up to you. I was thinking I could help you hook you up with Natasha."'
+				'Kolka looks at you dubiously. "Why would you do that?"'
+				'"Do I need a reason to try and be a better sister? Do you want me to set it up or not?"'
+				'"How would that work?"'
+				'"Just trust me. As long as you do as I tell you it''ll work out."'
+			end
+			'"Ofcourse, I promise." He says without hesitation.'
+			'"Good, I''ll keep you informed."'
+			act'Continue':gt'brother','start'
+		end
+	end
+	act 'Tease him':
+		*clr & cla
+		'<center><b><font color="maroon">Kolka</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+		'"She was dripping wet all day long." You say, eyeing the growing bulge in his pants.'
+		'You lean in close to him and whisper in his ear: "Now you''ll have something to jerk off to tonight."'
+		act'Continue':gt'brother','start'
+	end
+end
+
 if $ARGS[0] = 'kiss':
 	gs 'arousal', 'kiss', rand(1,5)
+	gs 'stat'
 	brotherkiss += 1
 	'<center><video autoplay loop src="images/shared/sex/kiss/kiss_lips.mp4"></video></center>'
 	'With your stepfather gone, you take the opportunity you have and start kissing your brother.'
@@ -119,13 +169,14 @@ if $ARGS[0] = 'kiss2':
 end
 
 if $ARGS[0] = 'kiss_end':
-	gs 'arousal', 'end'
 	cla & *clr
 	'<center><b><font color = maroon>Kolka</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
 	'Eventually, you the two of you reluctantly pull apart.'
 	'"Better stop before we get caught," you say breathlessly.'
 	'"Yeah..."'
+	gs 'arousal', 'end'
+	gs 'stat'
 	act'Finish':gt 'sitrPar'
 end
 
@@ -134,6 +185,7 @@ if $ARGS[0] = 'hj':
 	npc_rel['A34'] += 1
 	cla & *clr
 	gs 'arousal', 'hj', rand(1,3)
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/hj.jpg"></center>'
 	'Snaking your hand into his pants, you pull out his cock, jerking him off with the same vigor you continue to kiss him with.'
 	brohj = 1
@@ -141,6 +193,7 @@ if $ARGS[0] = 'hj':
 		cla
 		*nl
 		gs 'arousal', 'hj', rand(1,3)
+		gs 'stat'
 		'You continue to give him a handjob while making out with him until you feel his body start to stiffen beneath yours. You think he''s probably about to cum.'
 		act'Let him cum in your hand':
 			cla & *clr
@@ -148,6 +201,7 @@ if $ARGS[0] = 'hj':
 			'Not stopping, you quicken your pace until you feel ropes of his thick cum spattering against your hand.'
 			'Moving your head back, you survey your handiwork before smiling back at him and leaning in for a peck on the lips before getting up to find some tissues for your brother and to wash off your hand.'
 			gs 'arousal', 'end'
+			gs 'stat'
 			act 'Finish': gt 'sitrPar'
 		end
 		act'Put your lips over the tip':
@@ -155,6 +209,7 @@ if $ARGS[0] = 'hj':
 			gs 'arousal', 'bj', 1
 			gs 'cum_call', 'mouth', 'A34', 1
 			gs 'arousal', 'end'
+			gs 'stat'
 			npc_rel['A34'] += 3
 			swallow += 1
 			if brotherSex < 6: brotherSex = 6
@@ -174,6 +229,7 @@ if $ARGS[0] = 'bj':
 	cla & *clr
 	npc_rel['A34'] += 2
 	gs 'arousal', 'bj', rand(1,5)
+	gs 'stat'
 	if brotherSex < 6: brotherSex = 6
 	brotherbj += 1
 	if $clothingworntype = 'nude' and $braworntype = 'none':
@@ -194,6 +250,7 @@ if $ARGS[0] = 'bj':
 		swallow += 1
 		gs 'cum_call', 'mouth', 'A34', 1
 		gs 'arousal', 'end'
+		gs 'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/homework/swallow.mp4"></video></center>'
 		'You diligently continue to blow him until you feel his hot cum spurting into your mouth. Gathering it all up, your remove your lips from Kolka''s cock, tilting your head back and swallowing at the same time.'
 		'"I can''t believe you just swallowed like that," he says, breathless.'
@@ -207,6 +264,7 @@ if $ARGS[0] = 'bj':
 		'<center><video src="images/shared/sex/cum/facial/facial0,3.mp4"></center>'
 		gs 'cum_call', 'face', 'A34', 1
 		gs 'arousal', 'end'
+		gs 'stat'
 		'You quickly pull back and kneel in front of Kolka as he furiously jerks off in front of you. You close your eyes just as you feel his hot cum spatter against your face, flinching as it does. When he''s finally done, you feel a few droplets drip down your cheeks onto the carpeted floor.'
 		'Peeking through cum-slathered eyes, you look at your brother, saying, "Maybe we shouldn''t have done it like this. Now we need to clean up before someone spots us."'
 		'Leaving Kolka to clean his semen out of the carpet, you slink towards the bathroom to wash off your face.'
@@ -234,6 +292,7 @@ if $ARGS[0] = 'bj':
 			'"Maybe we shouldn''t have finished like that..." you say, smiling wistfully at your brother.'
 			'Leaving Kolka to clean his semen out of the carpet, you slink towards the bathroom to wipe off .'
 			gs 'arousal', 'end'
+			gs 'stat'
 			act'Finish':gt'vanrPar'
 		end
 	end
@@ -295,96 +354,24 @@ if $ARGS[0] = 'wakeup':
 			cla	
 			*nl
 			'"I''ll tell you what Kolka, if you get up now, I''ll let you look at my tits."'
-			if $clothingworntype = 'nude' and $braworntype = 'none':
-				'He cracks open an eye. "I don''t need to get up to do that."'
-				'You look down at yourself and remember that you''re already topless. Right. That wasn''t a very good plan...'
-				act'Back to the drawing board':gt'brother2','wakeup'
-			end
-			
+			gs 'brother2', 'wakeupresponse', 'tits'
 			if $clothingworntype ! 'nude':
 				act'Pull up your top':
-					brotherMorningSex = daystart
-					cla & *clr
-					npc_rel['A34'] += 4
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/titflash<<rand(1,4)>>.jpg"></center>'
-					'Following through on your promise, you lift up your top, revealing your breasts to your brother. Still tired, he smiles only faintly in satisfaction.'
-					'"There. Happy now?"'
-					if brotherwaketrick = 1:
-						'"Pretty happy, yeah. Especially since you actually kept your promise this time."'
-						'You gently lower your top again, not really sure what to say to that. He is right. You didn''t keep your promise last time.'
-						'"Well, I followed through this time. Hopefully you''ll forgive me. Now go get dressed Kolka."'
-						brotherwaketrick = 2
-					else
-						'"Very."'
-						'"Good." You cover yourself up, putting your clothes back in place. "Now go get dressed."'
-					end
-					'"Alright," he says, yawning one more time before folding his blanket for storage and beginning the process of getting ready for school.'
-					act'Move away':gt $loc, $metka
+					$whatshow = 'top'
+					gt 'brother2', 'show'
 				end
-			end
-			if $braworntype ! 'none':
+			elseif $clothingworntype = 'nude' and $braworntype ! 'none':
 				act'Pull down your bra':
-					brotherMorningSex = daystart
-					cla & *clr
-					npc_rel['A34'] += 4
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/titflash5.jpg"></center>'
-					'Following through on your promise, you pull down your bra, revealing your breasts to your brother. Still tired, he smiles only faintly in satisfaction.'
-					'"There. Happy now?"'
-					if brotherwaketrick = 1:
-						'"Pretty happy, yeah. Especially since you actually kept your promise this time."'
-						'You gently lower your top again, not really sure what to say to that. He is right. You didn''t keep your promise last time.'
-						'"Well, I followed through this time. Hopefully you''ll forgive me. Now go get dressed Kolka."'
-						brotherwaketrick = 2
-					else
-						'"Very."'
-						'"Good." You cover yourself up, putting your clothes back in place. "Now go get dressed."'
-					end
-					'"Alright," he says, yawning one more time before folding his blanket for storage and beginning the process of getting ready for school.'
-					act'Move away':gt $loc, $metka
+					$whatshow = 'bra'
+					gt 'brother2', 'show'
 				end
-			end
-			
+			end		
 			if $clothingworntype ! 'nude' or $braworntype ! 'none':
 				act'Trick him and don''t do it':
-					cla & *clr
-					brotherMorningSex = daystart
-					brotherwaketrick = 1
-					npc_rel['A34'] -= 5
-					'<center><b><font color="maroon">Kolka</font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
-					'You wait for him to be more or less fully awake before snatching his blanket and move away.'
-					'"Hey!" he cries. "What are you doing?"'
-					'"I''m leaving. What the hell is wrong with you? You really thought I was gonna show you my tits?"'
-					if brotherSex = 2 or brotherSex = 3:
-						'"You''ve let me look at you before!"'
-						'"Yeah well, this isn''t ''before''. I''m not doing it today."'
-					elseif brotherSex >= 4:
-						'"You''ve done so much with me before!"'
-						'"Yeah well, this isn''t ''before''. I''m not doing anything today."'
-					end
-					'"Liar!" he screams at you.'
-					'"Listen here you little-!"'
-					'<b><i>"Hey!"</i></b> your mother shouts from the bedroom. "What is all this racket going on so early in the morning?! You two get along or so help me I will spank you! I don''t care how old you are!"'
-					'Glaring silently at one another, the two of you retreat after a ceasefire being called by your mother. This probably wasn''t good for your relationship though...'
-					act'Move away':gt $loc, $metka
+					$whatshow = 'tits'
+					gt 'brother2', 'trick'
 				end
 			end
-			
-			if brotherwaketrick = 1 and ($clothingworntype ! 'nude' or $braworntype ! 'none'):
-				'He opens his eyes slowly, looking at you with suspicion.'
-				'"You''re not just going to leave like you did last time are you?"'
-				'"No Kolka."'
-				'"You promise? For real this time?"'
-				'"I promise."'
-				'He pulls back his blanket and sits up, rubbing the sleep from his eyes to focus on you.'
-			elseif $clothingworntype ! 'nude' or $braworntype ! 'none':
-				'He opens his eyes slowly, looking at you with suspicion.'
-				'"This isn''t just some trick to get me out of bed?"'
-				'"No Kolka."'
-				'"You promise?"'
-				'"I promise."'
-				'He pulls back his blanket and sits up, rubbing the sleep from his eyes before focus on you.'
-			end
 		end
 	end
 	if brotherSex >= 3  or pcs_inhib >= 45 or npc_rel['A34'] >= 80:
@@ -392,25 +379,7 @@ if $ARGS[0] = 'wakeup':
 			cla
 			brotherMorningSex = daystart
 			'"I''ll tell you what Kolka, if you get up now, I''ll show you my pussy."'
-			if $clothingworntype = 'nude':
-				'He cracks open an eye. "I don''t need to get up to do that."'
-				'You look down at yourself and remember that you''re naked. Right. That wasn''t a very good plan...'
-				act'Back to the drawing board':gt'brother2','wakeup'
-			elseif brotherwaketrick = 1:
-				'He opens his eyes slowly, looking at you with suspicion.'
-				'"You''re not just going to leave like you did last time are you?"'
-				'"No Kolka."'
-				'"You promise? For real this time?"'
-				'"I promise."'
-				'He pulls back his blanket and sits up, rubbing the sleep from his eyes to focus on you.'
-			else
-				'He opens his eyes slowly, looking at you with suspicion.'
-				'"This isn''t just some trick to get me out of bed?"'
-				'"No Kolka."'
-				'"You promise?"'
-				'"I promise."'
-				'He pulls back his blanket and sits up, rubbing the sleep from his eyes before focus on you.'
-			end
+			gs 'brother2', 'wakeupresponse', 'pussy'
 			if $clothingworntype ! 'nude' or $pantyworntype ! 'none':
 				act'Expose yourself':
 					cla & *clr
@@ -432,32 +401,13 @@ if $ARGS[0] = 'wakeup':
 				end
 			
 				act'Trick him and don''t do it':
-					cla & *clr
-					brotherwaketrick = 1
-					npc_rel['A34'] -= 5
-					'<center><b><font color="maroon">Kolka</font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
-					'You wait for him to be more or less fully awake before snatching his blanket and move away.'
-					'"Hey!" he cries. "What are you doing?"'
-					'"I''m leaving. What the hell is wrong with you? You really thought I was gonna show you my pussy?"'
-					if brotherSex = 2 or brotherSex = 3:
-						'"You''ve let me look at you before!"'
-						'"Yeah well, this isn''t ''before''. I''m not doing it today."'
-					elseif brotherSex >= 4:
-						'"You''ve done so much with me before!"'
-						'"Yeah well, this isn''t ''before''. I''m not doing anything today."'
-					end
-					'"Liar!" he screams at you.'
-					'"Listen here you little-!"'
-					'<b><i>"Hey!"</i></b> your mother shouts from the bedroom. "What is all this racket going on so early in the morning?! You two get along or so help me I will spank you! I don''t care how old you are!"'
-					'Glaring silently at one another, the two of you retreat after a ceasefire being called by your mother. This probably wasn''t good for your relationship though...'
-					act'Move away':gt $loc, $metka
+					$whatshow = 'pussy'
+					gt 'brother2', 'trick'
 				end
 			end
 		end
 	end
 			
-	
 	if brotherSex >= 5 or pcs_inhib >= 50 or npc_rel['A34'] >= 85:
 		act'Tell him you''ll give him a handjob':
 			npc_rel['A34'] += 5
@@ -480,6 +430,7 @@ if $ARGS[0] = 'wakeup':
 				'Your duty done, you pull your now sticky hand back, saying, "Alright Kolka. A deal''s a deal. Now clean up and get dressed before <<$npc_nickname[''A29'']>> comes out here and sees you like this."'
 				'"Alright!" he says cheerfully, waddling away with his pants around his ankles to find some tissues to clean himself up.'
 				gs 'arousal', 'end'
+				gs 'stat'
 				act'Move away':gt $loc, $metka
 			end
 		end
@@ -512,12 +463,92 @@ if $ARGS[0] = 'wakeup':
 				'"Glad I could help I guess," you reply, giving his cock a few more licks to make sure it''s clean. "Now go get dressed for school. Before <<$npc_nickname[''A29'']>> comes out and yells at you for having your dick hanging out."'
 				'"Okay, okay," he says, getting up and tidying up the couch from where he was sleeping.'
 				gs 'arousal', 'end'
+				gs 'stat'
 				act'Move away':gt $loc, $metka
 			end
 		end
 	end
 end
 
+if $ARGS[0] = 'wakeupresponse':
+	if $ARGS[1] = 'tits' and $clothingworntype = 'nude' and $braworntype = 'none':
+		'He cracks open an eye. "I don''t need to get up to do that."'
+		'You look down at yourself and remember that you''re already topless. Right. That wasn''t a very good plan...'
+		act'Back to the drawing board':gt'brother2','wakeup'
+	elseif $ARGS[1] = 'pussy' and $clothingworntype = 'nude' and $pantyworntype = 'none':
+		'He cracks open an eye. "I don''t need to get up to do that."'
+		'You look down at yourself and remember that you''re naked. Right. That wasn''t a very good plan...'
+		act'Back to the drawing board':gt'brother2','wakeup'
+	elseif brotherwaketrick = 1:
+		'He opens his eyes slowly, looking at you with suspicion.'
+		'"You''re not just going to leave like you did last time are you?"'
+		'"No Kolka."'
+		'"You promise? For real this time?"'
+		'"I promise."'
+		'He pulls back his blanket and sits up, rubbing the sleep from his eyes before focusing on you.'
+	else
+		'He opens his eyes slowly, looking at you with suspicion.'
+		'"This isn''t just some trick to get me out of bed?"'
+		'"No Kolka."'
+		'"You promise?"'
+		'"I promise."'
+		'He pulls back his blanket and sits up, rubbing the sleep from his eyes before focusing on you.'
+	end
+end
+
+if $ARGS[0] = 'show':
+	brotherMorningSex = daystart
+	cla & *clr
+	npc_rel['A34'] += 4
+	if $whatshow = 'top':
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/titflash<<rand(1,4)>>.jpg"></center>'
+		'Following through on your promise, you lift up your top, revealing your breasts to your brother. Still tired, he smiles only faintly in satisfaction.'
+	elseif $whatshow = 'bra':
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/titflash5.jpg"></center>'
+		'Following through on your promise, you pull down your bra, revealing your breasts to your brother. Still tired, he smiles only faintly in satisfaction.'
+	end
+	'"There. Happy now?"'
+	if brotherwaketrick = 1:
+		'"Pretty happy, yeah. Especially since you actually kept your promise this time."'
+		if $whatshow = 'top':
+			'You gently lower your top again, not really sure what to say to that. He is right. You didn''t keep your promise last time.'
+		elseif $whatshow = 'bra':
+			'You gently pull your bra up again, not really sure what to say to that. He is right. You didn''t keep your promise last time.'
+		end
+		'"Well, I followed through this time. Hopefully you''ll forgive me. Now go get dressed Kolka."'
+		brotherwaketrick = 2
+	else
+		'"Very."'
+		'"Good." You cover yourself up, putting your clothes back in place. "Now go get dressed."'
+	end
+	'"Alright," he says, yawning one more time before folding his blanket for storage and beginning the process of getting ready for school.'
+	act'Move away':gt $loc, $metka
+end
+
+if $ARGS[0] = 'trick':
+	cla & *clr
+	brotherMorningSex = daystart
+	brotherwaketrick = 1
+	npc_rel['A34'] -= 5
+	'<center><b><font color="maroon">Kolka</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'You wait for him to be more or less fully awake before snatching his blanket and move away.'
+	'"Hey!" he cries. "What are you doing?"'
+	'"I''m leaving. What the hell is wrong with you? You really thought I was gonna show you my <<$whatshow>>?"'
+	if brotherSex = 2 or brotherSex = 3:
+		'"You''ve let me look at you before!"'
+		'"Yeah well, this isn''t ''before''. I''m not doing it today."'
+	elseif brotherSex >= 4:
+		'"You''ve done so much with me before!"'
+		'"Yeah well, this isn''t ''before''. I''m not doing anything today."'
+	end
+	'"Liar!" he screams at you.'
+	'"Listen here you little-!"'
+	'<b><i>"Hey!"</i></b> your mother shouts from the bedroom. "What is all this racket going on so early in the morning?! You two get along or so help me I will spank you! I don''t care how old you are!"'
+	'Glaring silently at one another, the two of you retreat after a ceasefire being called by your mother. This probably wasn''t good for your relationship though...'
+	act'Move away':gt $loc, $metka
+end
+
 if $ARGS[0] = 'morninghj':
 	cla & *clr
 	gs 'arousal', 'hj', 5
@@ -533,6 +564,7 @@ if $ARGS[0] = 'morninghj':
 	'As you think about what you should do to clean it off, you hear him saying, "Handjobs are great and everything, but do you think you could try a blowjob next time instead?"'
 	'"I''ll think about it," you say, rolling your eyes in amusement as you walk away, your brother automatically beginning to get ready for school.'
 	gs 'arousal', 'end'
+	gs 'stat'
 	act'Move away':gt $loc, $metka
 end
 
@@ -559,6 +591,7 @@ if $ARGS[0] = 'morningbj':
 	'Swallowing his cum, you flash him a toothy grin. "I know. Now up an at''em kiddo! I don''t do this just so you can go back to sleep."'
 	'Having been given sufficient positive reinforcement, he obediently gets up and starts going about tidying the sofa and getting ready to go to school.'
 	gs 'arousal', 'end'
+	gs 'stat'
 	act'Move away':gt $loc, $metka
 end
 --- brother2 ---------------------------------

+ 18 - 2
locations/brother_voyeur.qsrc

@@ -687,6 +687,7 @@ if $ARGS[0] = 'brother_shower_together':
 					act'Continue':
 						cla & *clr
 						gs 'arousal','masturbate', 5
+						gs 'stat'
 						mastr += 1
 						orgasm += 1
 						'<center><video src="images/shared/home/bathroom/wash2.mp4"></center>'
@@ -846,6 +847,7 @@ end
 if $ARGS[0] = 'showerfun':
 	if brothergrope < 4:
 		gs 'arousal','breasts', 1
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex1.jpg"></center>'
 		'	You squeak as you feel your brother''s hands grab you by the breasts, squeezing hard and pinching your nipples.'
 		if milkedvolume > 0:
@@ -905,6 +907,7 @@ if $ARGS[0] = 'showerfun':
 			*nl
 			gs 'arousal','breasts', 2
 			pcs_horny += 10
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 			'	"Ughh... Oh yeah... Keep doing <i>that...</i>"'
 			'	You lean into your brother''s touch, his hands roaming up and down your body, focusing mostly on your breasts. Your hand unconsciously reaches back and grabs hold of his dick, jerking it gently. You think about what you want to do next.'
@@ -913,6 +916,7 @@ if $ARGS[0] = 'showerfun':
 		end
 	else
 		gs 'arousal','breasts', 3
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 		'	Feeling turned on from your brother''s hands on you, you lean back into him, teasingly handling his package. He responds in kind, fondling your breasts, eliciting moans when he pinches your nipples.'
 		act'Blow him':gt'brother_voyeur','brother_shower_bj'
@@ -953,6 +957,7 @@ if $ARGS[0] = 'brother_shower_shave':
 				act'Continue':
 					if brotherfuck > 0 or brotherbj > 0 or brotherwash > 5:
 						gs 'arousal','vaginal_finger', 1
+						gs 'stat'
 						cla & *clr
 						'<center><video src="images/shared/home/bathroom/brotherpussyfeel.mp4"></center>'
 						'	"There," you say, rinsing off the last of the hair, stubble, and lather. "Satisfied?"'
@@ -964,6 +969,7 @@ if $ARGS[0] = 'brother_shower_shave':
 							cla
 							*nl
 							gs 'arousal','vaginal_finger', 5
+							gs 'stat'
 							'	Unable to help yourself, you grab his wrist and lean into it, letting his fingers work you even harder.'
 							act'Blow him':gt'brother_voyeur','brother_shower_bj'
 							act'Fuck him':gt'brother_voyeur','brother_shower_fuck'
@@ -1005,6 +1011,7 @@ if $ARGS[0] = 'brother_shower_shave':
 						if brotherfuck > 0 or brotherbj > 0 or brotherwash > 5:
 							act'Get frisky':
 								gs 'arousal','breasts', 1
+								gs 'stat'
 								'	Clean from your shower together, and now with freshly shaved legs, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
 								act'Blow him':gt'brother_voyeur','brother_shower_bj'
 								act'Fuck him':gt'brother_voyeur','brother_shower_fuck'
@@ -1049,6 +1056,7 @@ if $ARGS[0] = 'brother_shower_shave':
 						if brotherfuck > 0 or brotherbj > 0 or brotherwash > 5:
 							act'Have some fun':
 								gs 'arousal','breasts', 1
+								gs 'stat'
 								'	Clean from your shower together, and now with freshly shaved legs, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
 								act'Blow him':gt'brother_voyeur','brother_shower_bj'
 								act'Fuck him':gt'brother_voyeur','brother_shower_fuck'
@@ -1097,6 +1105,7 @@ if $ARGS[0] = 'brother_shower_shave':
 							if brotherfuck > 0 or brotherbj > 0 or brotherwash > 5:
 								act'Have some fun':
 									gs 'arousal','breasts', 1
+									gs 'stat'
 									'	Clean from your shower together, and now with freshly shaved legs, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
 									act'Blow him':gt'brother_voyeur','brother_shower_bj'
 									act'Fuck him':gt'brother_voyeur','brother_shower_fuck'
@@ -1150,6 +1159,7 @@ if $ARGS[0] = 'brother_shower_shave':
 								act'Have some fun':
 									cla & *clr
 									gs 'arousal','breasts', 1
+									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 									'	Clean from your shower together, and now with freshly shaved legs, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
 									act'Blow him':gt'brother_voyeur','brother_shower_bj'
@@ -1183,6 +1193,7 @@ if $ARGS[0] = 'brother_shower_shave':
 									*nl
 									gs 'arousal','vaginal_finger', 5
 									gs 'arousal','breasts', 1
+									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 									'	Clean from your shower together, and now with freshly a shaved pussy, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
 									act'Blow him':gt'brother_voyeur','brother_shower_bj'
@@ -1204,6 +1215,7 @@ if $ARGS[0] = 'brother_shower_shave':
 					act'Have some fun':
 						cla & *clr
 						gs 'arousal','breasts', 1
+						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 						'	Clean from your shower together, and now with freshly shaved legs, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
 						act'Blow him':gt'brother_voyeur','brother_shower_bj'
@@ -1252,6 +1264,7 @@ if $ARGS[0] = 'brother_shower_shave':
 							cla & *clr
 							gs 'arousal','vaginal_finger', 5
 							gs 'arousal','breasts', 1
+							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 							'	Clean from your shower together, and now with freshly a shaved pussy, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
 							act'Blow him':gt'brother_voyeur','brother_shower_bj'
@@ -1287,6 +1300,7 @@ if $ARGS[0] = 'brother_shower_shave':
 									cla & *clr
 									gs 'arousal','vaginal_finger', 5
 									gs 'arousal','breasts', 1
+									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 									'	Clean from your shower together, and now with freshly a shaved pussy, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
 									act'Blow him':gt'brother_voyeur','brother_shower_bj'
@@ -1308,6 +1322,7 @@ if $ARGS[0] = 'brother_shower_shave':
 					pcs_horny += 10
 					'<center><video src="images/shared/home/bathroom/brotherpussyfeel.mp4"></center>'
 					gs 'arousal','vaginal_finger', 1
+					gs 'stat'
 					'	"There," you say, taking your brother''s hand and pressing it against your freshly shaved pubic region. "Happy now?"'
 					'	He takes advantage of the opportunity sliding his fingers down your smooth front of your pussy to slip his fingers inside, forcing a moan from you.'
 					'	"Very," he grins back.'
@@ -1316,6 +1331,7 @@ if $ARGS[0] = 'brother_shower_shave':
 						cla & *clr
 						gs 'arousal','vaginal_finger', 5
 						gs 'arousal','breasts', 1
+						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 						'	Clean from your shower together, and now with freshly a shaved pussy, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
 						act'Blow him':gt'brother_voyeur','brother_shower_bj'
@@ -1643,7 +1659,7 @@ if $ARGS[0] = 'shower_swallow':
 					act'Only for you(sisterly)':
 						cla
 						*nl
-						'	"Only for you!" You wrap your arms around him, smothering him and rubbing your head against his cheek. "I just love you so so so so so very much! What sister could stop herself from slutting up for such a cute baby brother?"'
+						'	"Only for you!" You wrap your arms around him, smothering him and rubbing your head against his cheek. "I just love you so very much! What sister could stop herself from slutting up for such a cute baby brother?"'
 						'	"Ack!" he cries out and shoves you away. "Get off of me! Weirdo!"'
 						if broshowerfuck = daystart:
 							'	"Hey! What''s wrong with that?" you grin at him. "I''d say it''s pretty weird to for your sister to let you fuck her in the shower. I thought you liked that! Don''t you want me to be a slutty weirdo then?"'
@@ -2446,7 +2462,7 @@ if $ARGS[0] = 'brother_shower_fuck_end':
 			if pcs_vag >= 25:
 				'	"If it was your first time, how come you''re so loose?"'
 				'	<i>Shit!</i>'
-				'	"I always heard that virgins are supposed to be really really tight for their first time, but you weren''t. I mean, it still felt really good but I slid in so easily. How come?"'
+				'	"I always heard that virgins are supposed to be really tight for their first time, but you weren''t. I mean, it still felt really good but I slid in so easily. How come?"'
 				'	Unable to come up with a suitable explanation, you decide to retaliate with false offense.'
 				'	"What are you trying to say about me? Huh? That I''m a slut? That I would lie to you about giving you my virginity? How dare you!"'
 				'	Kolka shies away at your sudden burst of emotion.'

+ 4 - 2
locations/dinsister.qsrc

@@ -328,7 +328,8 @@ $d_sister[3]={
 			'You chat with your sister, discussing the latest trends in fashion.'
 		end
 		if sisterTalk = 12:
-			'Anya recognized, that before she was fond of diets, but they are deteriorated skin and went pryshi, and the start of this match, so now it cracks for three and it only gets more beautiful.'
+			'Anya tells you how used to try various fad diets to make herself beautiful. However she was under weight, her skin looked gaunt and she kept getting acne. Since quitting the diets she is much healthier and looks more beautiful every day.'
+			'The last part has you both laughing.'
 		end
 		if sisterTalk = 13:
 			'You chat with your sister and she tells you that she went dancing before, but she quickly got tired.'
@@ -344,9 +345,10 @@ $d_sister[3]={
 		end
 		if sisterTalk = 17:
 			'You chat with your sister, she says that her ex-boyfriend was a weirdo, "He told me, pier, I love you as much, I just a shit in the sea. Both out on the sea, but we do not go together..."'
+			'You wonder if she was dating Venom.'
 		end
 		if sisterTalk = 18:
-			'You chat with your sister, Anya, she asks you how you feel about womens sexual rights. You spend some time having a very frank and quite revealing conversation.'
+			'You chat with your sister, Anya, she asks you how you feel about women''s sexual rights. You spend some time having a very frank and quite revealing conversation.'
 		end
 	end
 }

+ 2 - 2
locations/foto.qsrc

@@ -81,7 +81,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if $pantyworntype ! 'none' and pcs_inhib < 60:
-		if studio_strip_talk < 3 and $braworntype ! 'none' and pcs_inhib < 60:
+		if studio_strip_talk < 3:
 			act'Just strip to your panties':
 				gs 'clothing', 'strip'
 				cla & *clr
@@ -106,7 +106,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if studio_strip_talk < 2 and pcs_inhib < 60:
+		if studio_strip_talk < 2 and $braworntype ! 'none':
 			act'Just strip to your underwear':
 				gs 'clothing', 'strip'
 				gs 'stat'

+ 1 - 1
locations/gadprostitutes.qsrc

@@ -215,7 +215,7 @@ if $ARGS[0] = 'just_mira':
 		act 'Leave Mira to her work': gt 'gadprostitutes', 'start'
 	else
 		'It is too late for Mira to work as a prostitute now.'
-		act 'Walk back to Gadukino together':MiraLoc = 0 & gt 'gadukino', 'start'
+		act 'Walk back to Gadukino together':MiraLoc = 0 & gt 'gadukino', ''
 	end
 end
 

+ 2 - 1
locations/gkafe.qsrc

@@ -94,7 +94,8 @@ if $ARGS[0] = '':
 				razvrand = rand(1, 10)
 
 				! WD: Allpw event to trigger even after talking to <<$npc_nickname[''A29'']>> about fucking her boss
-				if razvrand > 7 and hour > 16 and hour < 20 and age < 18 and dyadyamishaevent = 0 and momslut >= 1:
+				! SM: Change event to trigger once Misha has seen Sveta with cum on face in public at least once
+				if razvrand > 7 and hour > 16 and hour < 20 and age < 18 and dyadyamishaevent = 0 and sosedknow = 1:
 					''
 					'A male figure walks closely by your table. You look up and recognize uncle Misha, your neighbor. He stops and recognizes you as well, and sits down with you. He gives you a friendly smile as he says: "Oh, <<$pcs_nickname>>, hello. Listen, me and your stepfather were working late in the garage yesterday, and went for a nightcap at my place when we were finished. When your stepfather left, he accidentally left some of his tools behind. I''m fairly sure he needs them again today, and I could use a hand bringing them back to the garage. Could you help me out? I''ll give you money so you can get some ice cream for your troubles."'
 

+ 92 - 229
locations/grandmahelp.qsrc

@@ -9,120 +9,35 @@ frost = 0
 
 'You ask your grandmother if you there was something you could help out with something here at home. Your grandmother turns to you and says:'
 
-if month <= 4 and month >= 10:grandmahelping = RAND(0,2)
-if month = 5 or month = 6:grandmahelping = RAND(0,5)
-if month = 7:grandmahelping = RAND(0,6)
-if month = 8:grandmahelping = RAND(7,13)
-if month = 9:grandmahelping = RAND(14,19)
-
-if grandmahelping = 0:
-	'"- There is always something to do <<$pcs_nickname>>. I''ve gotten quite old and my strength is not what it used to be. Could you help me out by cleaning the floor?"'
-
-	act 'Clean the floor (1:00)':
-		cls
-		minut += 60
-		grandmahelp += 1
-		gs'stat'
+if month <= 4 or month >= 10:
+	grandmahelping = RAND(0,2)
+elseif month = 5 or month = 6:
+	grandmahelping = RAND(0,5)
+else
+	grandmahelping = RAND(0,6)
+end
 
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
-		'You grab a bucket and a rag, and get down on your knees and begin scrubbing the floor. Within the hour the floor shines and you are satisfied with the work you''ve done. You put the cleaning supplies into a corner and continue on with your day.'
-		
-		act 'Go':gt'Gadhouse'
-	end
+if grandmahelping = 0: 
+	gt 'grandmahelp', 'cleanfloor'
 elseif grandmahelping = 1:
-	'"- Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes."'
-
-	act 'Wash clothes (1:00)':
-		cls
-		minut += 60
-		grandmahelp += 1
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
-		'You pick up grandfathers dirty clothes and take it with you outside where you soak them in water for an hour.'
-		
-		act 'Hang the Laundry':
-		    cls
-		    minut += 10
-		    gs'stat'
-		    '<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
-		    'You are done with the washing and walk over to the yard to carefully hang the clothes to dry.'
-
-		    act 'Go':gt'Gaddvor'
-		end    
-	end
+	gt 'grandmahelp', 'washclothes'
 elseif grandmahelping = 2 and hour < 9 and hour > 20:
-	' "- <<$pcs_nickname>>, go to the barn and milk the cows."'
-
-	act 'Go to the barn (0:10)':
-		cls
-		minut += 10
-		milk_cow = 1
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You walk over to the shed where the cows are kept.'
-
-		act 'Further':gt'Gadsarai'
-	end	
+	gt 'grandmahelp', 'milkcows'
 elseif grandmahelping = 3:
-	'"- Of course my dear <<$pcs_nickname>>, could you go to the yard and feed the chickens?"'
-	
-	act 'Feed for the chickens (0:30)':
-		cls
-		feed_chickens = 1
-		minut += 30
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_chickens.jpg"></center>'
-		'You take the grain mix for the chickens with you and walk over to the yard.'
-
-		act 'Go':gt'Gaddvor'
-	end
+	gt 'grandmahelp', 'feedchickens'
 elseif grandmahelping = 4 and sunWeather = 1:
-	'"- <<$pcs_nickname>>, go to the garden and check on the plants."'
-
-	act 'Go to garden (0:10)':
-		cls
-        work_garden = 1
-		minut += 10
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You go to the garden.'
-
-		act 'Further':gt'Gadgarden','garden'
-	end	
+	gt 'grandmahelp', 'checkplants'
 elseif grandmahelping = 5 and sunWeather = 1:
-	'"- Dear <<$pcs_nickname>>, could you go and water the planted field in the garden?"'
-
-	act 'Go to the garden (0:10)':
-		cls
-        water_garden = 1
-		minut += 10
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You bring a bucket along with you to the garden.'
-
-		act 'Further':gt'Gadgarden','garden'
-	end
+	gt 'grandmahelp', 'waterplants'
 elseif grandmahelping = 6 and sunWeather = 1:
-	'"- <<$pcs_nickname>> dear, the strawberries are ripe to pick. Could you go over to the plot and pick them today?"'
-	
-	act 'Go to the strawberry plot (0:15)':
-		cls
-        collect_strawberries = 1
-		minut += 15
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You bring a basket with you and walk to the strawberry plot.'
+	gt 'grandmahelp', 'harvest'
+else
+	'"- There is nothing to do today <<$pcs_nickname>>, take a day off.'
+	act 'Go':gt'Gadhouse'			
+end
 
-		act 'Further':gt'Gadgarden','strawberry'
-	end
-elseif grandmahelping = 7:
-	'"- There is always something to do <<$pcs_nickname>>. I''ve gotten quite old and my knees hurt. Would you be kind and help me out by cleaning the floor?"'
+if $ARGS[0] = 'cleanfloor':
+	'"- There is always something to do <<$pcs_nickname>>. I''ve gotten quite old and my strength is not what it used to be. Could you help me out by cleaning the floor?"'
 
 	act 'Clean the floor (1:00)':
 		cls
@@ -131,117 +46,13 @@ elseif grandmahelping = 7:
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
-		'Armed with a bucket and a rag, you hunch over and begin to scrub the floor. The floor is shining. You are satisfied and put the cleaning supplies into a corner.'
-
-		act 'Go':gt'Gadhouse'
-	end
-elseif grandmahelping = 8:
-	'"- Of course, <<$pcs_nickname>>, you grandfather was out running around the field, could you help me wash his dirty clothes?"'
-	
-	act 'Do the laundry (1:00)':
-		cls
-		minut += 60
-		grandmahelp += 1
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
-		'You pick up grandfathers dirty clothes and take it with you outside where you soak them in water for an hour.'
+		'You grab a bucket and a rag, and get down on your knees and begin scrubbing the floor. Within the hour the floor shines and you are satisfied with the work you''ve done. You put the cleaning supplies into a corner and continue on with your day.'
 		
-		act 'Hang the Laundry':
-		    cls
-		    minut += 10
-		    gs'stat'
-		    '<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
-		    'You took the laundry out of the metal basin and carefully hung it in the yard.'
-
-		    act 'Go':gt'Gaddvor'
-		end    
-	end
-elseif grandmahelping = 9:
-	'"- Of course my dear <<$pcs_nickname>>, could you go and feed the chickens?"'
-	
-	act 'Feed the chickens (0:30)':
-		cls
-		feed_chickens = 1
-		minut += 30
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_chickens.jpg"></center>'
-		'You take the grain mix for the chickens with you and walk over to the yard.'
-
-		act 'Go':gt'Gaddvor'
-	end
-elseif grandmahelping = 10 and hour < 9 and hour > 20:
-	'"- <<$pcs_nickname>>, go to the barn to milk the cows."'
-
-	act 'Go to the barn (0:10)':
-		cls
-		minut += 10
-		milk_cow = 1
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You walk over to the shed where the cows are kept.'
-
-		act 'Further':gt'Gadsarai'
-	end
-elseif grandmahelping = 11 and sunWeather = 1:
-	'"- <<$pcs_nickname>>, go to the garden and check on the plants."'
-
-	act 'Go to the garden (0:10)':
-		cls
-        work_garden = 1
-		minut += 10
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You go to the garden.'
-
-		act 'Further':gt'Gadgarden','garden'
-	end		
-elseif grandmahelping = 12 and sunWeather = 1:
-	'"- Dear <<$pcs_nickname>>, could you go and water the field in the garden?"'
-
-	act 'Go to the garden (0:10)':
-		cls
-        water_garden = 1
-		minut += 10
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You bring a bucket along with you to the garden.'
-
-		act 'Further':gt'Gadgarden','garden'
-	end	
-elseif grandmahelping = 13 and sunWeather = 1:
-	'"- <<$pcs_nickname>> dear, the fruits are ripe and it is time to start collecting them, could you go and do it today?"'
-
-	act 'Go to the garden (0:15)':
-		cls
-        fruit_collect = 1
-		minut += 15
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You bring a basket with you and walk to the fruit garden.'
-
-		act 'Further':gt'Gadgarden','fruit_garden'
-	end
-elseif grandmahelping = 14:
-	'"- Sure <<$pcs_nickname>>. I''ve gotten quite old, could you help me out by cleaning the floor?"'
-
-	act 'Clean the floor (1:00)':
-		cls
-		minut += 60
-		grandmahelp += 1
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
-		'Armed with a bucket and a rag, you hunch over and begin to scrub the floor. The floor is shining. You are satisfied and put the cleaning supplies into a corner.'
-
 		act 'Go':gt'Gadhouse'
 	end
-elseif grandmahelping = 15:
+end
+
+if $ARGS[0] = 'washclothes':
 	'"- Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes."'
 	
 	act 'Wash clothes (1:00)':
@@ -263,7 +74,9 @@ elseif grandmahelping = 15:
 		    act 'Go':gt'Gaddvor'
 		end    
 	end
-elseif grandmahelping = 16:
+end
+
+if $ARGS[0] = 'feedchickens':
 	'"- Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
 	
 	act 'Feed the chickens (0:30)':
@@ -277,8 +90,10 @@ elseif grandmahelping = 16:
 
 		act 'Go':gt'Gaddvor'
 	end
-elseif grandmahelping = 17 and hour < 9 and hour > 20:
-	'"- <<$pcs_nickname>>, go to the barn and milk the cows."'
+end
+
+if $ARGS[0] = 'milkcows':
+	' "- <<$pcs_nickname>>, go to the barn and milk the cows."'
 
 	act 'Go to the barn (0:10)':
 		cls
@@ -290,9 +105,11 @@ elseif grandmahelping = 17 and hour < 9 and hour > 20:
 		'You walk over to the shed where the cows are kept.'
 
 		act 'Further':gt'Gadsarai'
-	end
-elseif grandmahelping = 18 and sunWeather = 1:
-	'"- <<$pcs_nickname>>, could you go to the garden and check on the plants?"'
+	end	
+end
+
+if $ARGS[0] = 'checkplants':
+	'"- <<$pcs_nickname>>, go to the garden and check on the plants."'
 
 	act 'Go to garden (0:10)':
 		cls
@@ -301,27 +118,73 @@ elseif grandmahelping = 18 and sunWeather = 1:
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You take a walk to the garden.'
+		'You go to the garden.'
 
 		act 'Further':gt'Gadgarden','garden'
 	end
-elseif grandmahelping = 19 and sunWeather = 1:
-	'"- <<$pcs_nickname>> dear, could you go to the garden today, it''s time to collect the harvest."'
+end
 
-	act 'Go to garden (0:10)':
+if $ARGS[0] = 'waterplants':
+	'"- Dear <<$pcs_nickname>>, could you go and water the planted field in the garden?"'
+
+	act 'Go to the garden (0:10)':
 		cls
-        harvest_garden = 1
+        water_garden = 1
 		minut += 10
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You bring the harvest tools with you and go over to the garden.'
+		'You bring a bucket along with you to the garden.'
 
 		act 'Further':gt'Gadgarden','garden'
 	end
-else
-	'"- There is nothing to do today <<$pcs_nickname>>, take a day off.'
-	act 'Go':gt'Gadhouse'			
 end
+
+if $ARGS[0] = 'harvest':
+	if month = 7:
+		'"- <<$pcs_nickname>> dear, the strawberries are ripe to pick. Could you go over to the plot and pick them today?"'
+		
+		act 'Go to the strawberry plot (0:15)':
+			cls
+			collect_strawberries = 1
+			minut += 15
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+			'You bring a basket with you and walk to the strawberry plot.'
+
+			act 'Further':gt'Gadgarden','strawberry'
+		end
+	elseif month = 8:
+		'"- <<$pcs_nickname>> dear, the fruits are ripe and it is time to start collecting them, could you go and do it today?"'
+
+		act 'Go to the garden (0:15)':
+			cls
+			fruit_collect = 1
+			minut += 15
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+			'You bring a basket with you and walk to the fruit garden.'
+
+			act 'Further':gt'Gadgarden','fruit_garden'
+		end
+	elseif month = 9:
+		'"- <<$pcs_nickname>> dear, could you go to the garden today, it''s time to collect the harvest."'
+
+		act 'Go to garden (0:10)':
+			cls
+			harvest_garden = 1
+			minut += 10
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+			'You bring the harvest tools with you and go over to the garden.'
+
+			act 'Further':gt'Gadgarden','garden'
+		end
+	end
+end
+
 --- grandmahelp ---------------------------------
 

+ 109 - 534
locations/grandpahelp.qsrc

@@ -6,47 +6,18 @@ gs'stat'
 '<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
 'You walk up to your grandfather and ask if he needs any help. Grandpa thinks for a moment and says:'
 
-if month = 1:grandpahelping = RAND(0,5)
-if month = 2:grandpahelping = RAND(0,5)
-if month = 3:grandpahelping = RAND(0,5)
-if month = 4:grandpahelping = RAND(0,5)
-if month = 5:grandpahelping = RAND(6,11)
-if month = 6:grandpahelping = RAND(12,21)
-if month = 7:grandpahelping = RAND(22,32)
-if month = 8:grandpahelping = RAND(22,32)
-if month = 9:grandpahelping = RAND(12,21)
-if month = 10:grandpahelping = RAND(0,4)
-if month = 11:grandpahelping = RAND(0,4)
-if month = 12:grandpahelping = RAND(0,4)
+if month <= 4 or month >= 10:
+	grandpahelping = RAND(0,5)
+elseif month = 5:
+	grandpahelping = RAND(3,8)
+elseif month = 6 or month = 9:
+	grandpahelping = RAND(3,12)
+else
+	grandpahelping = RAND(3,13)
+end
 
 !month >= 1 and month < 5 and month > 9
 if grandpahelping = 0:
-	'"- Of course <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
-
-	act 'Clean up the yard (1:00)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
-				'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
-			'Armed with a shovel, you begin clearing the yard from snow. You''re pleased with yourself seeing the courtyard is free from snow. You return the shovel to the shed and continue on with your business.'
-		end
-		minut += 60
-		grandmahelp += 1
-		if month >= 4 and month <= 10:
-			fat -= RAND(1,3)
-		else
-			stren_exp += 1
-			fat -= RAND(1,5)
-		end
-		gs'stat'
-
-		act 'Go':gt'Gaddvor'
-	end
-end
-
-if grandpahelping = 1:
 	'"- <<$pcs_nickname>>, could you bring firewood for the stove?"'
 
 	act 'Fetch firewood (0:15)':
@@ -65,9 +36,7 @@ if grandpahelping = 1:
 
 		act 'Go':gt'Gadhouse'
 	end
-end
-
-if grandpahelping = 2:
+elseif grandpahelping = 1:
 	'"- <<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
 
 	act 'Go to the barn (0:15)':
@@ -84,9 +53,7 @@ if grandpahelping = 2:
 
 		act 'Further':gt'Gadsarai'
 	end
-end
-
-if grandpahelping = 3:
+elseif grandpahelping = 2:
 	'"- <<$pcs_nickname>>, go to the barn to feed the cows."'
 
 	act 'Go to the barn (0:15)':
@@ -103,206 +70,81 @@ if grandpahelping = 3:
 
 		act 'Further':gt'Gadsarai'
 	end
-end
-
-if grandpahelping = 4:
-	'"- Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
-
-	act 'Go to the barn (0:15)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
-		end
-		'You went to the barn, took out a brush and started grooming Desperado.'
-		comb_horse = 1
-		minut += 15
-		gs'stat'
-
-		act 'Further':gt'Gadsarai'
-	end
-end
-
-if grandpahelping = 5:
-	'"- <<$pcs_nickname>>, could you go to the barn and feed the hogs."'
-
-	act 'Go to the barn (0:15)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
-		end
-		'You went to the barn and fed the hogs.'
-		feed_boar = 1
-		minut += 15
-		gs'stat'
-
-		act 'Further':gt'Gadsarai'
-	end
-end
+elseif grandpahelping = 3:
+	gt 'grandpahelp', 'cleanyard'
+elseif grandpahelping = 4:
+	gt 'grandpahelp', 'groomhorse'
+elseif grandpahelping = 5:
+	gt 'grandpahelp', 'feedhogs'
 !month = 5
-if grandpahelping = 6:
-	'"- Of course <<$pcs_nickname>>, I need your help cleaning the yard. Bring a garden tool with you."'
+elseif grandpahelping = 6 and hour >= 6 and hour < 9:
+	gt 'grandpahelp', 'grazehorse'
+elseif grandpahelping = 7 and hour >= 6 and hour < 9:
+	gt 'grandpahelp', 'leadcows'
+elseif grandpahelping = 8 and hour >= 6 and hour < 9:
+	gt 'grandpahelp', 'grazecows'
+!month = 6 or month = 9
+elseif grandpahelping = 9 and temper >= 15 and sunWeather = 1 and week > 5:
+	gt 'grandpahelp', 'washhorse'
+elseif grandpahelping = 10 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
+	gt 'grandpahelp', 'pickforest'
+elseif grandpahelping = 11 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
+	gt 'grandpahelp', 'pickforest'
+elseif grandpahelping = 12 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
+	gt 'grandpahelp', 'pickforest'
+!month = 7 or month = 8
+elseif grandpahelping = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
+	'"- <<$pcs_nickname>>, we need to help out with hay gathering today. We have to go to the field and help out."'
+	'"- Okay, grandfather," you replied. You grab a rake, and start walking towards the field.'
 
-	act 'Clean up the yard (1:00)':
+	act 'Go to the field (0:40)':
 		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
-			'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
-			'Armed with a shovel, you begin clearing the yard from snow. You''re pleased with yourself seeing the courtyard is free from snow. You return the shovel to the shed and continue on with your business.'
-		end
-		minut += 60
-		grandmahelp += 1
-		if month >= 4 and month <= 10:
-			fat -= RAND(1,3)
-		else
-			stren_exp += 1
-			fat -= RAND(1,5)
-		end
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
+		'With the rake in your hand you met up with the other local residents at the field. All the present at the field got assigned to a task. You work hard gathering the hay.'
+		haying_time = 1
+		minut += 40
 		gs'stat'
 
-		act 'Go':gt'Gaddvor'
+		act 'Further':gt'gadfield','field'
 	end
-end
-
-if grandpahelping = 7:
-	'"- <<$pcs_nickname>>, could you go to the barn and feed the hogs."'
-
-	act 'Go to the barn (0:15)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+else
+	if hour >= 9:
+		randmsg = rand(0,5):
+		if randmsg = 0:
+			'"- You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
+		elseif randmsg = 1:
+			'"- You can rest today child, there is nothing to do."'
+		elseif randmsg = 2:
+			'"- You can rest today <<$pcs_nickname>>, there is nothing to do."'
+		elseif randmsg = 3:
+			'"- There''s no work today <<$pcs_nickname>>, go and rest up."'
+		elseif randmsg = 4:
+			'"- You can rest today my dear granddaughter."'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
+			'"- You can take the day off to rest up."'
 		end
-		'You went to the barn and fed the hogs.'
-		feed_boar = 1
-		minut += 15
-		gs'stat'
-
-		act 'Further':gt'Gadsarai'
-	end
-end
-
-if grandpahelping = 8 and week > 5:
-	'"- Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
-
-	act 'Go to the barn (0:15)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+	else
+		randmsg = rand(0,1):
+		if randmsg = 0:
+			'"- You don''t need to help out today <<$pcs_nickname>>."'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
+			'"- You can take the day off."'
 		end
-		'You went to the barn, took out a brush and started grooming Desperado.'
-		comb_horse = 1
-		minut += 15
-		gs'stat'
-
-		act 'Further':gt'Gadsarai'
 	end
-elseif grandpahelping = 8 and week <= 5:
-	'"- You don''t need to help out today <<$pcs_nickname>>."'
-
 	act 'Go':gt'Gadhouse'
 end
 
-if grandpahelping = 9 and hour >= 6 and hour < 9:
-	'"- <<$pcs_nickname>>, take the horse to the field, my legs hurt so I need to rest for a bit. I`ll retrieve the horse up in the evening."'
-
-	act 'Go to the barn (0:15)':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You led the horse to the field.'
-		horse_field = 1
-		minut += 15
-		gs'stat'
-
-		act 'Further':& gt'Gadsarai'
-	end
-elseif grandpahelping = 9 and hour >= 9:
-	'"- You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 10 and hour >= 6 and hour < 9:
-	'"- I have sore feet today, <<$pcs_nickname>>. My dear granddaughter could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
-
-	act 'Go to the barn (0:15)':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You went to the shed where the cows are and led the herd to the field.'
-		cow_field = 1
-		minut += 15
-		gs'stat'
-
-		act 'Further':gt'Gadsarai'
-	end
-elseif grandpahelping = 10 and hour >= 9:
-	'"- You can rest today child, there is nothing to do."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 11 and hour >= 6 and hour < 9:
-	if graze_cow_exp = 0: '"- <<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat, lead the herd to the field. I''ll meet you there."'
-	if graze_cow_exp > 0: '"- <<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring back them back home."'
-
-	if graze_cow_exp = 0:
-		act 'Go to the barn (0:20)':
-			gs 'food', 'm_meal' &! use current one, *clr & cla will clear messages
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-			'You took a little nibble of a sandwich and went to the shed where the herd was. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
-			graze_cow = 1
-			pcs_mood += 20
-			pcs_health += 10
-			minut += 20
-			bottle += 1
-			buterbrod += 1
-			gs'stat'
-
-			act 'Further':gt'Gadsarai'
-		end
-	else
-		act 'Go to the field (0:20)':
-			gs 'food', 'm_meal' &! use current one, *clr & cla will clear messages
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_field.jpg"></center>'
-			'You had a quick bite and went to the field where the village herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
-			graze_cow = 1
-			pcs_mood += 20
-			pcs_health += 10
-			minut += 20
-			bottle += 1
-			buterbrod += 1
-			gs'stat'
-
-			act 'Further':gt'gadfield','cow'
-		end
-	end
-elseif grandpahelping = 11 and hour >= 9:
-	'"- You can rest today <<$pcs_nickname>>, there is nothing to do."'
-
-	act 'Go':gt'Gadhouse'
-end
-!month = 6 or month = 9
-if grandpahelping = 12:
-	'"– I need your help cleaning the yard, bring the garden tools."'
+if $ARGS[0] = 'cleanyard':
+	'"- Of course <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
 
 	act 'Clean up the yard (1:00)':
 		*clr & cla
 		if month >= 4 and month <= 10:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
-			 'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
+			'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
-			'Armed with a shovel, you begin clearing the yard from snow. You''re pleased with yourself seeing the courtyard is free from snow. You return the shovel to the shed and continue on with your business.'
+			'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
 		end
 		minut += 60
 		grandmahelp += 1
@@ -318,8 +160,8 @@ if grandpahelping = 12:
 	end
 end
 
-if grandpahelping = 13:
-	'"- <<$pcs_nickname>>, could you go to the barn and feed the pigs."'
+if $ARGS[0] = 'feedhogs':
+	'"- <<$pcs_nickname>>, could you go to the barn and feed the hogs."'
 
 	act 'Go to the barn (0:15)':
 		*clr & cla
@@ -328,7 +170,7 @@ if grandpahelping = 13:
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
 		end
-		'You went to the barn to fed the pigs.'
+		'You go to the barn and feed the hogs.'
 		feed_boar = 1
 		minut += 15
 		gs'stat'
@@ -337,111 +179,7 @@ if grandpahelping = 13:
 	end
 end
 
-if grandpahelping = 14 and week > 5:
-	'"- <<$pcs_nickname>>, I need your help to groom Desperado."'
-
-	act 'Go to the barn (0:15)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
-		end
-		'You went to the barn, took out a brush and started grooming Desperado.'
-		comb_horse = 1
-		minut += 15
-		gs'stat'
-
-		act 'Further':gt'Gadsarai'
-	end
-elseif grandpahelping = 14 and week <= 5:
-	'"- You can take the day off."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 15 and hour >= 6 and hour < 9:
-	'"- <<$pcs_nickname>>, take the horse to the field, my legs hurt so I need to rest for a bit. I`ll retrieve the horse up in the evening."'
-
-	act 'Go to the barn (0:15)':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You led the horse to the field.'
-		horse_field = 1
-		minut += 15
-		gs'stat'
-
-		act 'Further':& gt'Gadsarai'
-	end
-elseif grandpahelping = 15 and hour >= 9:
-	'"- There''s no work today <<$pcs_nickname>>, go and rest up."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 16 and hour >= 6 and hour < 9:
-	'"- I have sore feet today, <<$pcs_nickname>>. My dear granddaughter could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
-
-	act 'Go to the barn (0:15)':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You went to the shed where the cows are and led the herd to the field.'
-		cow_field = 1
-		minut += 15
-		gs'stat'
-
-		act 'Further':gt'Gadsarai'
-	end
-elseif grandpahelping = 16 and hour >= 9:
-	'"- You can rest today my dear granddaughter."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 17 and hour >= 6 and hour < 9:
-	if graze_cow_exp = 0: '"- <<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat, lead the herd to the field. I''ll meet you there."'
-	if graze_cow_exp > 0: '"- <<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring back them back home."'
-
-	if graze_cow_exp = 0:
-		act 'Go to the barn (0:20)':
-			gs 'food', 'm_meal'&!use current one, *clr & cla will clear messages
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-			'You took a little nibble of a sandwich and went to the shed where the herd was. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
-			graze_cow = 1
-			pcs_mood += 20
-			pcs_health += 10
-			minut += 20
-			bottle += 1
-			buterbrod += 1
-			gs'stat'
-
-			act 'Further':gt'Gadsarai'
-		end
-	else
-		act 'Go to the field (0:20)':
-			gs 'food', 'm_meal'&!use current one, *clr & cla will clear messages
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_field.jpg"></center>'
-			'You had a quick bite and went to the field where the village herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
-			graze_cow = 1
-			pcs_mood += 20
-			pcs_health += 10
-			minut += 20
-			bottle += 1
-			buterbrod += 1
-			gs'stat'
-
-			act 'Further':gt'gadfield','field'
-		end
-	end
-elseif grandpahelping = 17 and hour >= 9:
-	'"- You can take the day off to rest up."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 18 and temper >= 15 and sunWeather = 1 and week > 5:
+if $ARGS[0] = 'washhorse':
 	'"- It''s good weather today. Take Desperado to the river and give him a bath."'
 
 	act 'Go to the barn (0:10)':
@@ -452,103 +190,11 @@ if grandpahelping = 18 and temper >= 15 and sunWeather = 1 and week > 5:
 		minut += 10
 		gs'stat'
 
-		act 'Further':gt'Gadsarai'
-	end
-elseif grandpahelping = 18 and week <= 5 or grandpahelping = 18 and temper < 15 or grandpahelping = 18 and sunWeather = 0:
-	'"- You don''t need to help out today <<$pcs_nickname>>."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 19 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
-	grandpa_boletus = rand(2,3)
-	go_in_boletus = 1
-	'"- <<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
-	'"- How much should I pick, grandpa?", you asked.'
-	'"- <<grandpa_boletus>> kg will be enough," grandfather replied. "- Be careful so you don''t get lost."'
-
-	act 'Go':gt'Gadhouse'
-elseif grandpahelping = 19 and go_in_boletus = 1 or grandpahelping = 19 and go_in_bilberry = 1 or grandpahelping = 19 and go_in_boletus_bilberry = 1:
-	'"- You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 20 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
-	grandpa_bilberry = rand(3,5)
-	go_in_bilberry = 1
-	'"- <<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
-	'"- How much should I pick, grandpa?" you asked.'
-	'"- <<grandpa_bilberry>> kg will be enough," grandfather replied. "- Just be careful so you don''t get lost."'
-
-	act 'Go':gt'Gadhouse'
-elseif grandpahelping = 20 and go_in_boletus = 1 or grandpahelping = 20 and go_in_bilberry = 1 or grandpahelping = 20 and go_in_boletus_bilberry = 1:
-	'"- You can take the day off."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 21 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
-	grandpa_boletus = rand(2,3)
-	grandpa_bilberry = rand(2,3)
-	go_in_boletus_bilberry = 1
-	'"- <<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and has a craving for some fresh berries."'
-	'"- How much should I pick, grandpa?"'
-	'"- <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries will be enough," grandfather replied. "- Just don`t get lost."'
-
-	act 'Go':gt'Gadhouse'
-elseif grandpahelping = 21 and go_in_boletus = 1 or grandpahelping = 21 and go_in_bilberry = 1 or grandpahelping = 21 and go_in_boletus_bilberry = 1:
-	'"- There''s no work today <<$pcs_nickname>>, go and rest up."'
-
-	act 'Go':gt'Gadhouse'
-end
-!month = 7 or month = 8
-if grandpahelping = 22:
-	'"- Of course <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
-
-	act 'Clean up the yard (1:00)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
-			'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
-			'Armed with a shovel, you begin clearing the yard from snow. You''re pleased with yourself seeing the courtyard is free from snow. You return the shovel to the shed and continue on with your business.'
-		end
-		minut += 60
-		grandmahelp += 1
-		if month >= 4 and month <= 10:
-			fat -= RAND(1,3)
-		else
-			stren_exp += 1
-			fat -= RAND(1,5)
-		end
-		gs'stat'
-
-		act 'Go':gt'Gaddvor'
-	end
-end
-
-if grandpahelping = 23:
-	'"- <<$pcs_nickname>>, could you go to the barn and feed the hogs."'
-
-	act 'Go to the barn (0:15)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
-		end
-		'You went to the barn and fed the hogs.'
-		feed_boar = 1
-		minut += 15
-		gs'stat'
-
 		act 'Further':gt'Gadsarai'
 	end
 end
 
-if grandpahelping = 24 and week > 5:
+if $ARGS[0] = 'groomhorse':
 	'"- Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
 
 	act 'Go to the barn (0:15)':
@@ -558,67 +204,43 @@ if grandpahelping = 24 and week > 5:
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
 		end
-		'You went to the barn, took out a brush and started grooming Desperado.'
+		'You go to the barn, take out a brush and start grooming Desperado.'
 		comb_horse = 1
 		minut += 15
 		gs'stat'
 
 		act 'Further':gt'Gadsarai'
 	end
-elseif grandpahelping = 24 and week <= 5:
-	'"- You don''t need to help out today <<$pcs_nickname>>."'
-
-	act 'Go':gt'Gadhouse'
 end
 
-if grandpahelping = 25 and hour >= 6 and hour < 9:
+if $ARGS[0] = 'grazehorse':
 	'"- <<$pcs_nickname>>, take the horse to the field, my legs hurt so I need to rest for a bit. I`ll retrieve the horse up in the evening."'
 
-	act 'Go to the barn (0:10)':
+	act 'Go to the barn (0:15)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You led the horse to the field.'
+		'You lead the horse to the field.'
 		horse_field = 1
-		minut += 10
+		minut += 15
 		gs'stat'
 
 		act 'Further':& gt'Gadsarai'
 	end
-elseif grandpahelping = 25 and hour >= 9:
-	'"- There''s no work today <<$pcs_nickname>>, go and rest up."'
-
-	act 'Go':gt'Gadhouse'
 end
 
-if grandpahelping = 26 and hour >= 6 and hour < 9:
-	'"- I have sore feet today, <<$pcs_nickname>>. My dear granddaughter could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
-
-	act 'Go to the barn (0:10)':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You went to the shed where the cows are and led the herd to the field.'
-		cow_field = 1
-		minut += 10
-		gs'stat'
-
-		act 'Further':gt'Gadsarai'
+if $ARGS[0] = 'grazecows':
+	if graze_cow_exp = 0: 
+		'"- <<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat and lead the herd to the field. I''ll meet you there."'
+	else
+		'"- <<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring them back home."'
 	end
-elseif grandpahelping = 26 and hour >= 9:
-	'"- You can rest today my dear granddaughter."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 27 and hour >= 6 and hour < 9:
-	if graze_cow_exp = 0: '"- <<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat, lead the herd to the field. I''ll meet you there."'
-	if graze_cow_exp > 0: '"- <<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring back them back home."'
 
 	if graze_cow_exp = 0:
 		act 'Go to the barn (0:20)':
-			gs 'food', 'm_meal'&!use current one, *clr & cla will clear messages
+			gs 'food', 'm_meal' &! use current one, *clr & cla will clear messages
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-			'You took a little nibble of a sandwich and went to the shed where the herd was. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
+			'You take a little nibble of a sandwich and go to the shed where the herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
 			graze_cow = 1
 			pcs_mood += 20
 			pcs_health += 10
@@ -631,10 +253,10 @@ if grandpahelping = 27 and hour >= 6 and hour < 9:
 		end
 	else
 		act 'Go to the field (0:20)':
-			gs 'food', 'm_meal'&!use current one, *clr & cla will clear messages
+			gs 'food', 'm_meal' &! use current one, *clr & cla will clear messages
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_field.jpg"></center>'
-			'You had a quick bite and went to the field where the village herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
+			'You have a quick bite and go to the field where the village herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
 			graze_cow = 1
 			pcs_mood += 20
 			pcs_health += 10
@@ -643,95 +265,48 @@ if grandpahelping = 27 and hour >= 6 and hour < 9:
 			buterbrod += 1
 			gs'stat'
 
-			act 'Further':gt'gadfield','field'
+			act 'Further':gt'gadfield','cow'
 		end
 	end
-elseif grandpahelping = 27 and hour >= 9:
-	'"- You can take the day off to rest up."'
-
-	act 'Go':gt'Gadhouse'
 end
 
-if grandpahelping = 28 and temper >= 15 and sunWeather = 1 and week > 5:
-	'"- It''s good weather today. Take Desperado to the river and give him a bath."'
+if $ARGS[0] = 'leadcows':
+	'"- I have sore feet today, <<$pcs_nickname>>. My dear granddaughter could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
 
-	act 'Go to the barn (0:10)':
+	act 'Go to the barn (0:15)':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You went and got the horse from the barn and led it to the river.'
-		horse_river = 1
-		minut += 10
+		'You go to the shed where the cows are and lead the herd to the field.'
+		cow_field = 1
+		minut += 15
 		gs'stat'
 
 		act 'Further':gt'Gadsarai'
 	end
-elseif grandpahelping = 28 and week <= 5 or grandpahelping = 28 and temper < 15 or grandpahelping = 28 and sunWeather = 0:
-	'"- You don''t need to help out today <<$pcs_nickname>>."'
-
-	act 'Go':gt'Gadhouse'
 end
 
-if grandpahelping = 29 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
+if $ARGS[0] = 'pickforest':
 	grandpa_boletus = rand(2,3)
-	go_in_boletus = 1
-	'"- <<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
-	'"- How much should I pick, grandpa?", you asked.'
-	'"- <<grandpa_boletus>> kg will be enough," grandfather replied. "- Be careful so you don''t get lost."'
-
-	act 'Go':gt'Gadhouse'
-elseif grandpahelping = 29 and go_in_boletus = 1 or grandpahelping = 29 and go_in_bilberry = 1 or grandpahelping = 29 and go_in_boletus_bilberry = 1:
-	'"- You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 30 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
 	grandpa_bilberry = rand(3,5)
-	go_in_bilberry = 1
-	'"- <<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
-	'"- How much should I pick, grandpa?" you asked.'
-	'"- <<grandpa_bilberry>> kg will be enough," grandfather replied. "- Just be careful so you don''t get lost."'
-
-	act 'Go':gt'Gadhouse'
-elseif grandpahelping = 30 and go_in_boletus = 1 or grandpahelping = 30 and go_in_bilberry = 1 or grandpahelping = 30 and go_in_boletus_bilberry = 1:
-	'"- You can take the day off."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 31 and go_in_boletus = 0 and go_in_bilberry = 0 and go_in_boletus_bilberry = 0:
-	grandpa_boletus = rand(2,3)
-	grandpa_bilberry = rand(2,3)
-	go_in_boletus_bilberry = 1
-	'"- <<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and has a craving for some fresh berries."'
-	'"- How much should I pick, grandpa?"'
-	'"- <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries will be enough," grandfather replied. "- Just don`t get lost."'
-
-	act 'Go':gt'Gadhouse'
-elseif grandpahelping = 31 and go_in_boletus = 1 or grandpahelping = 31 and go_in_bilberry = 1 or grandpahelping = 31 and go_in_boletus_bilberry = 1:
-	'"- There''s no work today <<$pcs_nickname>>, go and rest up."'
-
-	act 'Go':gt'Gadhouse'
-end
-
-if grandpahelping = 32 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
-	'"- <<$pcs_nickname>>, we need to help out with hay gathering today. We have to go to the field and help out."'
-	'"- Okay, grandfather," you replied. You grabed a rake, and started walking towards the field.'
-
-	act 'Go to the field (0:40)':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
-		'With the rake in your hand you met up with the other local residents at the field. All the present at the field got assigned to a task. You work hard gathering the hay.'
-		haying_time = 1
-		minut += 40
-		gs'stat'
-
-		act 'Further':gt'gadfield','field'
+	if grandpahelping = 10:
+		go_in_boletus = 1
+		'"- <<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
+		'"- How much should I pick, grandpa?", you ask.'
+		'"- <<grandpa_boletus>> kg will be enough," grandfather replies. "- Be careful so you don''t get lost."'
+	elseif grandpahelping = 11:
+		go_in_bilberry = 1
+		'"- <<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
+		'"- How much should I pick, grandpa?" you ask.'
+		'"- <<grandpa_bilberry>> kg will be enough," grandfather replies. "- Just be careful so you don''t get lost."'
+	elseif grandpahelping = 12:
+		grandpa_bilberry = rand(2,3)
+		go_in_boletus_bilberry = 1
+		'"- <<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and has a craving for some fresh berries."'
+		'"- How much should I pick, grandpa?"'
+		'"- <<grandpa_boletus>> kg mushrooms and <<grandpa_bilberry>> kg of berries will be enough," grandfather replies. "- Just don`t get lost."'
 	end
-elseif grandpahelping = 32 and hour >= 9 or grandpahelping = 32 and temper < 15 or grandpahelping = 32 and sunWeather = 0:
-	'"- You don''t need to help out today <<$pcs_nickname>>."'
-
 	act 'Go':gt'Gadhouse'
 end
+
 --- grandpahelp ---------------------------------
 

+ 22 - 20
locations/gschool_boys_bathroom.qsrc

@@ -1227,7 +1227,7 @@ if $ARGS[0] = 'companyb4':
 		'You decide to keep watching them, she sucks his cock for awhile as you watch. Neither seem to be aware of your presence as they are engrossed in each other. Then he pulls her up standing and turns her around, he pushes her forward. Bending her over the sinks, as she pulls up her skirt, he pulls down her panties. With her panties around her ankles, he moves up and starts fucking her; at first he is slow but passionate. As she begins to moan louder he picks up his pace and before long he is pounding her like crazy.'
 		*nl
 		'It doesn''t take much longer until Miss Orlov is having a screaming orgasm, Mr. Kuznetsov, is forced to put his hand over her mouth as she orgasms while he fucks her to muffle her cries of ecstasy. Some time after she finishes, he pulls out of her. She turns around and gets back on her knees and starts sucking his cock again. Moment latter he starts grunting obviously cumming in her mouth. Not a single drop escapes her mouth, she milks his cock of ever last drop before removing it from her mouth. The grin at each other and then kiss, after that they get dressed and leave the bathroom.'
-		act 'Masturbate':gt 'gschool_boys_bathroom', 'bathroom2'
+		act 'Masturbate': gt 'gschool_boys_bathroom', 'masturbateb4'
 		if school_bunk = 0:
 			act 'Continue playing on phone':gt 'gschool_boys_bathroom', 'bathroom2'
 		else
@@ -1245,26 +1245,28 @@ if $ARGS[0] = 'companyb4':
 			act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
 		end
 	end
-	act 'Masturbate':
-		cla & *clr
-		stat['mast'] += 1
-		if pcs_inhib < 40:inhib_exp += rand(1,3)
-		orgasm += 1
-		pcs_horny = 0
-		gs 'arousal', 'mast', 10
-		gs 'stat'
-		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
-		'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/masturbate'+ rand(1,2) +'.mp4"></video></center>'
-		if $pantyworntype = 'true':
-			'Listening to Miss Orlov getting pounded, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You hike up your skirt and spread your legs. Your hand slides down your thigh, then back up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.'
-		else
-			'Listening to Miss Orlov getting pounded, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread your legs. Your hand slides down your thigh, then back up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.'
-		end
-		*nl
-		'You rub your sensitive little nub carefully, to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fucking Vice Principal Kuznetsov is giving Miss Orlov. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder. You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seats like you are having a seizure.'
-		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
-		act 'Go to class':gt 'gschool_lessons', 'short_break'
+	act 'Masturbate': gt 'gschool_boys_bathroom', 'masturbateb4'
+end
+
+if $ARGS[0]  'masturbateb4':
+	cla & *clr
+	stat['mast'] += 1
+	if pcs_inhib < 40:inhib_exp += rand(1,3)
+	orgasm += 1
+	pcs_horny = 0
+	gs 'arousal', 'mast', 10
+	gs 'stat'
+	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
+	'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/masturbate'+ rand(1,2) +'.mp4"></video></center>'
+	if $pantyworntype = 'true':
+		'Listening to Miss Orlov getting pounded, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You hike up your skirt and spread your legs. Your hand slides down your thigh, then back up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.'
+	else
+		'Listening to Miss Orlov getting pounded, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread your legs. Your hand slides down your thigh, then back up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.'
 	end
+	*nl
+	'You rub your sensitive little nub carefully, to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fucking Vice Principal Kuznetsov is giving Miss Orlov. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder. You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seats like you are having a seizure.'
+	'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
+	act 'Go to class':gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'caughtb':

+ 354 - 213
locations/gschool_lessons.qsrc

@@ -3082,6 +3082,8 @@ if $ARGS[0] = 'npc_data':
 !!4 - Gopnik
 !!5 - outcasts
 !!6 - teachers
+!!7 - Family
+!!8 - Pavlovsk
 
 !!
 !!===========================Male Students=======================
@@ -3090,191 +3092,218 @@ if $ARGS[0] = 'npc_data':
 	$school_static_num[1] = 'A1'
 	npcPol[1] = 0
 	grupTipe[1] = 1
+	selfieenable[1] = 1
 	$npcGo[1] = '<a href="exec:numnpc = 1 & gt ''Snpc''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
-	$npcSelfie[1] = '<a href="exec:numnpc = 1 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
+	$npcSelfie[1] = '<a href="exec:numnpc = 1 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></a>'
 
 !!Artem Chebotarev
 	$school_static_num[2] = 'A2'
 	npcPol[2] = 0
 	grupTipe[2] = 3
+	selfieenable[2] = 1
 	$npcGo[2] = '<a href="exec:numnpc = 2 & gt ''Snpc''"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></a>'
-	$npcSelfie[2] = '<a href="exec:numnpc = 2 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></a>'
+	$npcSelfie[2] = '<a href="exec:numnpc = 2 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></a>'
 
 !!Ivan Prokhorov
 	$school_static_num[3] = 'A3'
 	npcPol[3] = 0
 	grupTipe[3] = 2
+	selfieenable[3] = 1
 	$npcGo[3] = '<a href="exec:numnpc = 3 & gt ''Snpc''"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></a>'
-	$npcSelfie[3] = '<a href="exec:numnpc = 3 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></a>'
+	$npcSelfie[3] = '<a href="exec:numnpc = 3 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A3'']>> <<$npc_lastname[''A3'']>></a>'
 
 !!Igor Kruglov
 	$school_static_num[4] = 'A4'
 	npcPol[4] = 0
 	grupTipe[4] = 1
+	selfieenable[4] = 1
 	$npcGo[4] = '<a href="exec:numnpc = 4 & gt ''Snpc''"><<$npc_firstname[''A4'']>> <<$npc_lastname[''A4'']>></a>'
-	$npcSelfie[4] = '<a href="exec:numnpc = 4 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A4'']>> <<$npc_lastname[''A4'']>></a>'
+	$npcSelfie[4] = '<a href="exec:numnpc = 4 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A4'']>> <<$npc_lastname[''A4'']>></a>'
 
 !!Fedor Kozlov
 	$school_static_num[5] = 'A5'
 	npcPol[5] = 0
 	if fedormasha = 1: grupTipe[5] = 5
 	if fedormasha = 0: grupTipe[5] = 2
+	selfieenable[5] = 1
 	$npcGo[5] = '<a href="exec:numnpc = 5 & gt ''Snpc''"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></a>'
-	$npcSelfie[5] = '<a href="exec:numnpc = 5 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></a>'
+	$npcSelfie[5] = '<a href="exec:numnpc = 5 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>></a>'
 
 !!Petka Klyuyev
 	$school_static_num[6] = 'A6'
 	npcPol[6] = 0
 	grupTipe[6] = 3
+	selfieenable[6] = 1
 	$npcGo[6] = '<a href="exec:numnpc = 6 & gt ''Snpc''"><<$npc_firstname[''A6'']>> <<$npc_lastname[''A6'']>></a>'
-	$npcSelfie[6] = '<a href="exec:numnpc = 6 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A6'']>> <<$npc_lastname[''A6'']>></a>'
+	$npcSelfie[6] = '<a href="exec:numnpc = 6 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A6'']>> <<$npc_lastname[''A6'']>></a>'
 
 !!Lesco Tsarev
 	$school_static_num[7] = 'A7'
 	npcPol[7] = 0
 	grupTipe[7] = 5
+	selfieenable[7] = 1
 	$npcGo[7] = '<a href="exec:numnpc = 7 & gt ''Snpc''"><<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>></a>'
-	$npcSelfie[7] = '<a href="exec:numnpc = 7 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>></a>'
+	$npcSelfie[7] = '<a href="exec:numnpc = 7 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>></a>'
 
 !!Svyatoslav Voinov
 	$school_static_num[8] = 'A8'
 	npcPol[8] = 0
 	grupTipe[8] = 2
+	selfieenable[8] = 1
 	$npcGo[8] = '<a href="exec:numnpc = 8 & gt ''Snpc''"><<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>></a>'
-	$npcSelfie[8] = '<a href="exec:numnpc = 8 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>></a>'
+	$npcSelfie[8] = '<a href="exec:numnpc = 8 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>></a>'
 
 !!Vitek Kotov
 	$school_static_num[9] = 'A9'
 	npcPol[9] = 0
 	grupTipe[9] = 4
+	selfieenable[9] = 1
 	$npcGo[9] = '<a href="exec:numnpc = 9 & gt ''Snpc''"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></a>'
-	$npcSelfie[9] = '<a href="exec:numnpc = 9 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></a>'
+	$npcSelfie[9] = '<a href="exec:numnpc = 9 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></a>'
 
 !!Dan Ryzhov
 	$school_static_num[10] = 'A10'
 	npcPol[10] = 0
 	grupTipe[10] = 4
+	selfieenable[10] = 1
 	$npcGo[10] = '<a href="exec:numnpc = 10 & gt ''Snpc''"><<$npc_firstname[''A10'']>> <<$npc_lastname[''A10'']>></a>'
-	$npcSelfie[10] = '<a href="exec:numnpc = 10 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A10'']>> <<$npc_lastname[''A10'']>></a>'
+	$npcSelfie[10] = '<a href="exec:numnpc = 10 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A10'']>> <<$npc_lastname[''A10'']>></a>'
 
 !!Vasily Shulgin
 	$school_static_num[11] = 'A11'
 	npcPol[11] = 0
 	grupTipe[11] = 4
+	selfieenable[11] = 1
 	$npcGo[11] = '<a href="exec:numnpc = 11 & gt ''Snpc''"><<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>></a>'
-	$npcSelfie[11] = '<a href="exec:numnpc = 11 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>></a>'
+	$npcSelfie[11] = '<a href="exec:numnpc = 11 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>></a>'
 
 !!Marcus Larson
-	$school_static_num[27] = 'A146'
-	npcPol[27] = 0
-	grupTipe[27] = 1
-	$npcGo[27] = '<a href="exec:numnpc = 27 & gt ''Snpc''"><<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>></a>'
-	$npcSelfie[27] = '<a href="exec:numnpc = 27 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>></a>'
+	$school_static_num[146] = 'A146'
+	npcPol[146] = 0
+	grupTipe[146] = 1
+	selfieenable[146] = 1
+	$npcGo[146] = '<a href="exec:numnpc = 146 & gt ''Snpc''"><<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>></a>'
+	$npcSelfie[146] = '<a href="exec:numnpc = 146 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A146'']>> <<$npc_lastname[''A146'']>></a>'
 
 !!Andrey Aleksandrov
-	$school_static_num[28] = 'A147'
-	npcPol[28] = 0
-	grupTipe[28] = 1
-	$npcGo[28] = '<a href="exec:numnpc = 28 & gt ''Snpc''"><<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>></a>'
-	$npcSelfie[28] = '<a href="exec:numnpc = 28 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>></a>'
+	$school_static_num[147] = 'A147'
+	npcPol[147] = 0
+	grupTipe[147] = 1
+	selfieenable[147] = 1
+	$npcGo[147] = '<a href="exec:numnpc = 147 & gt ''Snpc''"><<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>></a>'
+	$npcSelfie[147] = '<a href="exec:numnpc = 147 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A147'']>> <<$npc_lastname[''A147'']>></a>'
 
 !!Mefodiy Utkin
-	$school_static_num[29] = 'A148'
-	npcPol[29] = 0
-	grupTipe[29] = 1
-	$npcGo[29] = '<a href="exec:numnpc = 29 & gt ''Snpc''"><<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>></a>'
-	$npcSelfie[29] = '<a href="exec:numnpc = 29 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>></a>'
+	$school_static_num[148] = 'A148'
+	npcPol[148] = 0
+	grupTipe[148] = 1
+	selfieenable[148] = 1
+	$npcGo[148] = '<a href="exec:numnpc = 148 & gt ''Snpc''"><<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>></a>'
+	$npcSelfie[148] = '<a href="exec:numnpc = 148 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A148'']>> <<$npc_lastname[''A148'']>></a>'
 
 !!Lazar Utkin
-	$school_static_num[32] = 'A149'
-	npcPol[32] = 0
-	grupTipe[32] = 2
-	$npcGo[32] = '<a href="exec:numnpc = 32 & gt ''Snpc''"><<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>></a>'
-	$npcSelfie[32] = '<a href="exec:numnpc = 32 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>></a>'
+	$school_static_num[149] = 'A149'
+	npcPol[149] = 0
+	grupTipe[149] = 2
+	selfieenable[149] = 1
+	$npcGo[149] = '<a href="exec:numnpc = 149 & gt ''Snpc''"><<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>></a>'
+	$npcSelfie[149] = '<a href="exec:numnpc = 149 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>></a>'
 
 !!Erast Vagin
-	$school_static_num[33] = 'A150'
-	npcPol[33] = 0
-	grupTipe[33] = 2
-	$npcGo[33] = '<a href="exec:numnpc = 33 & gt ''Snpc''"><<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>></a>'
-	$npcSelfie[33] = '<a href="exec:numnpc = 33 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>></a>'
+	$school_static_num[150] = 'A150'
+	npcPol[150] = 0
+	grupTipe[150] = 2
+	selfieenable[150] = 1
+	$npcGo[150] = '<a href="exec:numnpc = 150 & gt ''Snpc''"><<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>></a>'
+	$npcSelfie[150] = '<a href="exec:numnpc = 150 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A150'']>> <<$npc_lastname[''A150'']>></a>'
 
 !!Evgeny Kuznetsov
-	$school_static_num[35] = 'A151'
-	npcPol[35] = 0
-	grupTipe[35] = 3
-	$npcGo[35] = '<a href="exec:numnpc = 35 & gt ''Snpc''"><<$npc_firstname[''A151'']>> <<$npc_lastname[''A151'']>></a>'
-	$npcSelfie[35] = '<a href="exec:numnpc = 35 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A151'']>> <<$npc_lastname[''A151'']>></a>'
+	$school_static_num[151] = 'A151'
+	npcPol[151] = 0
+	grupTipe[151] = 3
+	selfieenable[151] = 1
+	$npcGo[151] = '<a href="exec:numnpc = 151 & gt ''Snpc''"><<$npc_firstname[''A151'']>> <<$npc_lastname[''A151'']>></a>'
+	$npcSelfie[151] = '<a href="exec:numnpc = 151 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A151'']>> <<$npc_lastname[''A151'']>></a>'
 
 !!Feofan Krupin
-	$school_static_num[36] = 'A152'
-	npcPol[36] = 0
-	grupTipe[36] = 3
-	$npcGo[36] = '<a href="exec:numnpc = 36 & gt ''Snpc''"><<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>></a>'
-	$npcSelfie[36] = '<a href="exec:numnpc = 36 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>></a>'
+	$school_static_num[152] = 'A152'
+	npcPol[152] = 0
+	grupTipe[152] = 3
+	selfieenable[152] = 1
+	$npcGo[152] = '<a href="exec:numnpc = 152 & gt ''Snpc''"><<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>></a>'
+	$npcSelfie[152] = '<a href="exec:numnpc = 152 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A152'']>> <<$npc_lastname[''A152'']>></a>'
 
 !!Gerasim Vasilyev
-	$school_static_num[37] = 'A153'
-	npcPol[37] = 0
-	grupTipe[37] = 3
-	$npcGo[37] = '<a href="exec:numnpc = 37 & gt ''Snpc''"><<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>></a>'
-	$npcSelfie[37] = '<a href="exec:numnpc = 37 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>></a>'
+	$school_static_num[153] = 'A153'
+	npcPol[153] = 0
+	grupTipe[153] = 3
+	selfieenable[153] = 1
+	$npcGo[153] = '<a href="exec:numnpc = 153 & gt ''Snpc''"><<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>></a>'
+	$npcSelfie[153] = '<a href="exec:numnpc = 153 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A153'']>> <<$npc_lastname[''A153'']>></a>'
 
 !!Radomir Popov
-	$school_static_num[39] = 'A154'
-	npcPol[39] = 0
-	grupTipe[39] = 4
-	$npcGo[39] = '<a href="exec:numnpc = 39 & gt ''Snpc''"><<$npc_firstname[''A154'']>> <<$npc_lastname[''A154'']>></a>'
-	$npcSelfie[39] = '<a href="exec:numnpc = 39 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A154'']>> <<$npc_lastname[''A154'']>></a>'
+	$school_static_num[154] = 'A154'
+	npcPol[154] = 0
+	grupTipe[154] = 4
+	selfieenable[154] = 1
+	$npcGo[154] = '<a href="exec:numnpc = 154 & gt ''Snpc''"><<$npc_firstname[''A154'']>> <<$npc_lastname[''A154'']>></a>'
+	$npcSelfie[154] = '<a href="exec:numnpc = 154 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A154'']>> <<$npc_lastname[''A154'']>></a>'
 
 !!Lavrenti Romanov
-	$school_static_num[40] = 'A155'
-	npcPol[40] = 0
-	grupTipe[40] = 4
-	$npcGo[40] = '<a href="exec:numnpc = 40 & gt ''Snpc''"><<$npc_firstname[''A155'']>> <<$npc_lastname[''A155'']>></a>'
-	$npcSelfie[40] = '<a href="exec:numnpc = 40 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A155'']>> <<$npc_lastname[''A155'']>></a>'
+	$school_static_num[155] = 'A155'
+	npcPol[155] = 0
+	grupTipe[155] = 4
+	selfieenable[155] = 1
+	$npcGo[155] = '<a href="exec:numnpc = 155 & gt ''Snpc''"><<$npc_firstname[''A155'']>> <<$npc_lastname[''A155'']>></a>'
+	$npcSelfie[155] = '<a href="exec:numnpc = 155 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A155'']>> <<$npc_lastname[''A155'']>></a>'
 
 !!Arkadi Fyodorov
-	$school_static_num[41] = 'A156'
-	npcPol[41] = 0
-	grupTipe[41] = 4
-	$npcGo[41] = '<a href="exec:numnpc = 41 & gt ''Snpc''"><<$npc_firstname[''A156'']>> <<$npc_lastname[''A156'']>></a>'
-	$npcSelfie[41] = '<a href="exec:numnpc = 41 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A156'']>> <<$npc_lastname[''A156'']>></a>'
+	$school_static_num[156] = 'A156'
+	npcPol[156] = 0
+	grupTipe[156] = 4
+	selfieenable[156] = 1
+	$npcGo[156] = '<a href="exec:numnpc = 156 & gt ''Snpc''"><<$npc_firstname[''A156'']>> <<$npc_lastname[''A156'']>></a>'
+	$npcSelfie[156] = '<a href="exec:numnpc = 156 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A156'']>> <<$npc_lastname[''A156'']>></a>'
 
 !!Roman Yakovlev
-	$school_static_num[42] = 'A157'
-	npcPol[42] = 0
-	grupTipe[42] = 4
-	$npcGo[42] = '<a href="exec:numnpc = 42 & gt ''Snpc''"><<$npc_firstname[''A157'']>> <<$npc_lastname[''A157'']>></a>'
-	$npcSelfie[42] = '<a href="exec:numnpc = 42 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A157'']>> <<$npc_lastname[''A157'']>></a>'
+	$school_static_num[157] = 'A157'
+	npcPol[157] = 0
+	grupTipe[157] = 4
+	selfieenable[157] = 1
+	$npcGo[157] = '<a href="exec:numnpc = 157 & gt ''Snpc''"><<$npc_firstname[''A157'']>> <<$npc_lastname[''A157'']>></a>'
+	$npcSelfie[157] = '<a href="exec:numnpc = 157 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A157'']>> <<$npc_lastname[''A157'']>></a>'
 
 !!Valentin Bogdanov
-	$school_static_num[43] = 'A158'
-	npcPol[43] = 0
-	grupTipe[43] = 4
-	$npcGo[43] = '<a href="exec:numnpc = 43 & gt ''Snpc''"><<$npc_firstname[''A158'']>> <<$npc_lastname[''A158'']>></a>'
-	$npcSelfie[43] = '<a href="exec:numnpc = 43 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A158'']>> <<$npc_lastname[''A158'']>></a>'
+	$school_static_num[158] = 'A158'
+	npcPol[158] = 0
+	grupTipe[158] = 4
+	selfieenable[158] = 1
+	$npcGo[158] = '<a href="exec:numnpc = 158 & gt ''Snpc''"><<$npc_firstname[''A158'']>> <<$npc_lastname[''A158'']>></a>'
+	$npcSelfie[158] = '<a href="exec:numnpc = 158 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A158'']>> <<$npc_lastname[''A158'']>></a>'
 
 !!Petia Alkaev
-	$school_static_num[47] = 'A159'
-	npcPol[47] = 0
-	grupTipe[47] = 5
-	$npcGo[47] = '<a href="exec:numnpc = 47 & gt ''Snpc''"><<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>></a>'
-	$npcSelfie[47] = '<a href="exec:numnpc = 47 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>></a>'
+	$school_static_num[159] = 'A159'
+	npcPol[159] = 0
+	grupTipe[159] = 5
+	selfieenable[159] = 1
+	$npcGo[159] = '<a href="exec:numnpc = 159 & gt ''Snpc''"><<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>></a>'
+	$npcSelfie[159] = '<a href="exec:numnpc = 159 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>></a>'
 
 !!Vanya Yanka
-	$school_static_num[59] = 'A165'
-	npcPol[59] = 0
-	grupTipe[59] = 2
-	$npcGo[59] = '<a href="exec:numnpc = 59 & gt ''Snpc''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
-	$npcSelfie[59] = '<a href="exec:numnpc = 59 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
+	$school_static_num[165] = 'A165'
+	npcPol[165] = 0
+	grupTipe[165] = 2
+	selfieenable[165] = 1
+	$npcGo[165] = '<a href="exec:numnpc = 165 & gt ''Snpc''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
+	$npcSelfie[165] = '<a href="exec:numnpc = 165 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A165'']>> <<$npc_lastname[''A165'']>></a>'
 	
 !!Nikolai Volkov
-	$school_static_num[61] = 'A189'
-	npcPol[61] = 0
-	grupTipe[61] = 4
-	$npcGo[61] = '<a href="exec:numnpc = 61 & gt ''Snpc''"><<$npc_firstname[''A189'']>> <<$npc_lastname[''A189'']>></a>'
-	$npcSelfie[61] = '<a href="exec:numnpc = 61 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A189'']>> <<$npc_lastname[''A189'']>></a>'
+	$school_static_num[189] = 'A189'
+	npcPol[189] = 0
+	grupTipe[189] = 4
+	selfieenable[189] = 1
+	$npcGo[189] = '<a href="exec:numnpc = 189 & gt ''Snpc''"><<$npc_firstname[''A189'']>> <<$npc_lastname[''A189'']>></a>'
+	$npcSelfie[189] = '<a href="exec:numnpc = 189 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A189'']>> <<$npc_lastname[''A189'']>></a>'
 
 !!
 !!===========================Female Students=======================
@@ -3283,43 +3312,49 @@ if $ARGS[0] = 'npc_data':
 	$school_static_num[12] = 'A12'
 	npcPol[12] = 1
 	grupTipe[12] = 3
+	selfieenable[12] = 1
 	$npcGo[12] = '<a href="exec:numnpc = 12 & gt ''Snpc''"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></a>'
-	$npcSelfie[12] = '<a href="exec:numnpc = 12 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></a>'
+	$npcSelfie[12] = '<a href="exec:numnpc = 12 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A12'']>> <<$npc_lastname[''A12'']>></a>'
 
 !!Lariska Gruzdeva
 	$school_static_num[13] = 'A13'
 	npcPol[13] = 1
 	grupTipe[13] = 2
+	selfieenable[13] = 1
 	$npcGo[13] = '<a href="exec:numnpc = 13 & gt ''Snpc''"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></a>'
-	$npcSelfie[13] = '<a href="exec:numnpc = 13 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></a>'
+	$npcSelfie[13] = '<a href="exec:numnpc = 13 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>></a>'
 
 !!Katja Meynold
 	$school_static_num[14] = 'A14'
 	npcPol[14] = 1
 	grupTipe[14] = 1
+	selfieenable[14] = 1
 	$npcGo[14] = '<a href="exec:numnpc = 14 & gt ''Snpc''"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></a>'
-	$npcSelfie[14] = '<a href="exec:numnpc = 14 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></a>'
+	$npcSelfie[14] = '<a href="exec:numnpc = 14 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></a>'
 
 !!Vicky Meynold
 	$school_static_num[15] = 'A15'
 	npcPol[15] = 1
 	grupTipe[15] = 1
+	selfieenable[15] = 1
 	$npcGo[15] = '<a href="exec:numnpc = 15 & gt ''Snpc''"><<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>></a>'
-	$npcSelfie[15] = '<a href="exec:numnpc = 15 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>></a>'
+	$npcSelfie[15] = '<a href="exec:numnpc = 15 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A15'']>> <<$npc_lastname[''A15'']>></a>'
 
 !!Natasha Belova
 	$school_static_num[16] = 'A16'
 	npcPol[16] = 1
 	grupTipe[16] = 3
+	selfieenable[16] = 1
 	$npcGo[16] = '<a href="exec:numnpc = 16 & gt ''Snpc''"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></a>'
-	$npcSelfie[16] = '<a href="exec:numnpc = 16 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></a>'
+	$npcSelfie[16] = '<a href="exec:numnpc = 16 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></a>'
 
 !!Inna Devyatova
 	$school_static_num[17] = 'A17'
 	npcPol[17] = 1
 	grupTipe[17] = 1
+	selfieenable[17] = 1
 	$npcGo[17] = '<a href="exec:numnpc = 17 & gt ''Snpc''"><<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>></a>'
-	$npcSelfie[17] = '<a href="exec:numnpc = 17 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>></a>'
+	$npcSelfie[17] = '<a href="exec:numnpc = 17 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A17'']>> <<$npc_lastname[''A17'']>></a>'
 
 !!Christina Zvereva
 	$school_static_num[18] = 'A18'
@@ -3329,50 +3364,56 @@ if $ARGS[0] = 'npc_data':
 	else
 		grupTipe[18] = 2
 	end
+	selfieenable[18] = 1
 	$npcGo[18] = '<a href="exec:numnpc = 18 & gt ''Snpc''"><<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>></a>'
-	$npcSelfie[18] = '<a href="exec:numnpc = 18 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>></a>'
+	$npcSelfie[18] = '<a href="exec:numnpc = 18 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>></a>'
 
 !!Lina Starov
 	$school_static_num[19] = 'A19'
 	npcPol[19] = 1
 	grupTipe[19] = 2
+	selfieenable[19] = 1
 	$npcGo[19] = '<a href="exec:numnpc = 19 & gt ''Snpc''"><<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>></a>'
-	$npcSelfie[19] = '<a href="exec:numnpc = 19 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>></a>'
+	$npcSelfie[19] = '<a href="exec:numnpc = 19 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>></a>'
 
 !!Lena Kotova
 	$school_static_num[20] = 'A20'
 	npcPol[20] = 1
 	grupTipe[20] = 4
+	selfieenable[20] = 1
 	$npcGo[20] = '<a href="exec:numnpc = 20 & gt ''Snpc''"><<$npc_firstname[''A20'']>> <<$npc_lastname[''A20'']>></a>'
-	$npcSelfie[20] = '<a href="exec:numnpc = 20 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A20'']>> <<$npc_lastname[''A20'']>></a>'
+	$npcSelfie[20] = '<a href="exec:numnpc = 20 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A20'']>> <<$npc_lastname[''A20'']>></a>'
 
 !!Lera Tsarev
 	$school_static_num[21] = 'A21'
 	npcPol[21] = 1
 	grupTipe[21] = 4
+	selfieenable[21] = 1
 	$npcGo[21] = '<a href="exec:numnpc = 21 & gt ''Snpc''"><<$npc_firstname[''A21'']>> <<$npc_lastname[''A21'']>></a>'
-	$npcSelfie[21] = '<a href="exec:numnpc = 21 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A21'']>> <<$npc_lastname[''A21'']>></a>'
+	$npcSelfie[21] = '<a href="exec:numnpc = 21 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A21'']>> <<$npc_lastname[''A21'']>></a>'
 
 !!Bella Artamonov
 	$school_static_num[22] = 'A22'
 	npcPol[22] = 1
 	grupTipe[22] = 2
+	selfieenable[22] = 1
 	$npcGo[22] = '<a href="exec:numnpc = 22 & gt ''Snpc''"><<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>></a>'
-	$npcSelfie[22] = '<a href="exec:numnpc = 22 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>></a>'
+	$npcSelfie[22] = '<a href="exec:numnpc = 22 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A22'']>> <<$npc_lastname[''A22'']>></a>'
 
 !!Albina Barlovskaya
 	$school_static_num[23] = 'A23'
 	npcPol[23] = 1
 	grupTipe[23] = 1
 	$npcGo[23] = '<a href="exec:numnpc = 23 & gt ''Snpc''"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></a>'
-	$npcSelfie[23] = '<a href="exec:numnpc = 23 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></a>'
+	$npcSelfie[23] = '<a href="exec:numnpc = 23 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></a>'
 
 !!Pauline Sebagotulina
 	$school_static_num[24] = 'A24'
 	npcPol[24] = 1
 	grupTipe[24] = 4
+	selfieenable[24] = 1
 	$npcGo[24] = '<a href="exec:numnpc = 24 & gt ''Snpc''"><<$npc_firstname[''A24'']>> <<$npc_lastname[''A24'']>></a>'
-	$npcSelfie[24] = '<a href="exec:numnpc = 24 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A24'']>> <<$npc_lastname[''A24'']>></a>'
+	$npcSelfie[24] = '<a href="exec:numnpc = 24 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A24'']>> <<$npc_lastname[''A24'']>></a>'
 
 !!Sonia Ivanko
 	$school_static_num[25] = 'A25'
@@ -3382,65 +3423,73 @@ if $ARGS[0] = 'npc_data':
 	else
 		grupTipe[25] = 1
 	end
+	selfieenable[25] = 1
 	$npcGo[25] = '<a href="exec:numnpc = 25 & gt ''Snpc''"><<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>></a>'
-	$npcSelfie[25] = '<a href="exec:numnpc = 25 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>></a>'
+	$npcSelfie[25] = '<a href="exec:numnpc = 25 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>></a>'
 
 !!Stasya Pavlov
-	$school_static_num[30] = 'A139'
-	npcPol[30] = 1
-	grupTipe[30] = 1
-	$npcGo[30] = '<a href="exec:numnpc = 30 & gt ''Snpc''"><<$npc_firstname[''A139'']>> <<$npc_lastname[''A139'']>></a>'
-	$npcSelfie[30] = '<a href="exec:numnpc = 30 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A139'']>> <<$npc_lastname[''A139'']>></a>'
+	$school_static_num[139] = 'A139'
+	npcPol[139] = 1
+	grupTipe[139] = 1
+	selfieenable[139] = 1
+	$npcGo[139] = '<a href="exec:numnpc = 139 & gt ''Snpc''"><<$npc_firstname[''A139'']>> <<$npc_lastname[''A139'']>></a>'
+	$npcSelfie[139] = '<a href="exec:numnpc = 139 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A139'']>> <<$npc_lastname[''A139'']>></a>'
 
 !!Lizaveta Petrov
-	$school_static_num[31] = 'A140'
-	npcPol[31] = 1
-	grupTipe[31] = 1
-	$npcGo[31] = '<a href="exec:numnpc = 31 & gt ''Snpc''"><<$npc_firstname[''A140'']>> <<$npc_lastname[''A140'']>></a>'
-	$npcSelfie[31] = '<a href="exec:numnpc = 31 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A140'']>> <<$npc_lastname[''A140'']>></a>'
+	$school_static_num[140] = 'A140'
+	npcPol[140] = 1
+	grupTipe[140] = 1
+	selfieenable[140] = 1
+	$npcGo[140] = '<a href="exec:numnpc = 140 & gt ''Snpc''"><<$npc_firstname[''A140'']>> <<$npc_lastname[''A140'']>></a>'
+	$npcSelfie[140] = '<a href="exec:numnpc = 140 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A140'']>> <<$npc_lastname[''A140'']>></a>'
 
 !!Veronika Sokolov
-	$school_static_num[34] = 'A141'
-	npcPol[34] = 1
-	grupTipe[34] = 2
-	$npcGo[34] = '<a href="exec:numnpc = 34 & gt ''Snpc''"><<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>></a>'
-	$npcSelfie[34] = '<a href="exec:numnpc = 34 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>></a>'
+	$school_static_num[141] = 'A141'
+	npcPol[141] = 1
+	grupTipe[141] = 2
+	selfieenable[141] = 1
+	$npcGo[141] = '<a href="exec:numnpc = 141 & gt ''Snpc''"><<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>></a>'
+	$npcSelfie[141] = '<a href="exec:numnpc = 141 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A141'']>> <<$npc_lastname[''A141'']>></a>'
 
 !!Zinaida Alkaev
-	$school_static_num[38] = 'A142'
-	npcPol[38] = 1
-	grupTipe[38] = 3
-	$npcGo[38] = '<a href="exec:numnpc = 38 & gt ''Snpc''"><<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>></a>'
-	$npcSelfie[38] = '<a href="exec:numnpc = 38 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>></a>'
+	$school_static_num[142] = 'A142'
+	npcPol[142] = 1
+	grupTipe[142] = 3
+	selfieenable[142] = 1
+	$npcGo[142] = '<a href="exec:numnpc = 142 & gt ''Snpc''"><<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>></a>'
+	$npcSelfie[142] = '<a href="exec:numnpc = 142 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A142'']>> <<$npc_lastname[''A142'']>></a>'
 	
 !!Alyona Alkaev
-	$school_static_num[44] = 'A143'
-	npcPol[44] = 1
-	grupTipe[44] = 4
-	$npcGo[44] = '<a href="exec:numnpc = 44 & gt ''Snpc''"><<$npc_firstname[''A143'']>> <<$npc_lastname[''A143'']>></a>'
-	$npcSelfie[44] = '<a href="exec:numnpc = 44 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A143'']>> <<$npc_lastname[''A143'']>></a>'
+	$school_static_num[143] = 'A143'
+	npcPol[143] = 1
+	grupTipe[143] = 4
+	selfieenable[143] = 1
+	$npcGo[143] = '<a href="exec:numnpc = 143 & gt ''Snpc''"><<$npc_firstname[''A143'']>> <<$npc_lastname[''A143'']>></a>'
+	$npcSelfie[143] = '<a href="exec:numnpc = 143 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A143'']>> <<$npc_lastname[''A143'']>></a>'
 
 !!Anushka Konstantinov
-	$school_static_num[45] = 'A144'
-	npcPol[45] = 1
-	grupTipe[45] = 4
-	$npcGo[45] = '<a href="exec:numnpc = 45 & gt ''Snpc''"><<$npc_firstname[''A144'']>> <<$npc_lastname[''A144'']>></a>'
-	$npcSelfie[45] = '<a href="exec:numnpc = 45 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A144'']>> <<$npc_lastname[''A144'']>></a>'
+	$school_static_num[144] = 'A144'
+	npcPol[144] = 1
+	grupTipe[144] = 4
+	selfieenable[144] = 1
+	$npcGo[144] = '<a href="exec:numnpc = 144 & gt ''Snpc''"><<$npc_firstname[''A144'']>> <<$npc_lastname[''A144'']>></a>'
+	$npcSelfie[144] = '<a href="exec:numnpc = 144 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A144'']>> <<$npc_lastname[''A144'']>></a>'
 
 !!Ekaterina Maksimov
-	$school_static_num[46] = 'A145'
-	npcPol[46] = 1
-	grupTipe[46] = 4
-	$npcGo[46] = '<a href="exec:numnpc = 46 & gt ''Snpc''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
-	$npcSelfie[46] = '<a href="exec:numnpc = 46 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
+	$school_static_num[145] = 'A145'
+	npcPol[145] = 1
+	grupTipe[145] = 4
+	selfieenable[145] = 1
+	$npcGo[145] = '<a href="exec:numnpc = 145 & gt ''Snpc''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
+	$npcSelfie[145] = '<a href="exec:numnpc = 145 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
 	
 !! Aleksandra Kirilenko
-	$school_static_num[62] = 'A231'
-	$npcPol[62] = 1
-	grupTipe[62] = 3
-	$npcGo[62] = '<a href="exec:numnpc = 62 & gt ''Snpc''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
-	$npcSelfie[62] = '<a href="exec:numnpc = 62 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
-
+	$school_static_num[231] = 'A231'
+	$npcPol[231] = 1
+	grupTipe[231] = 3
+	selfieenable[231] = 1
+	$npcGo[231] = '<a href="exec:numnpc = 231 & gt ''Snpc''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
+	$npcSelfie[231] = '<a href="exec:numnpc = 231 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>'
 
 !!
 !!===========================Teachers=======================
@@ -3449,92 +3498,184 @@ if $ARGS[0] = 'npc_data':
 	$school_static_num[26] = 'A26'
 	npcPol[26] = 0
 	grupTipe[26] = 6
+	selfieenable[26] = 1
 	$npcGo[26] = '<a href="exec:numnpc = 26 & gt ''Snpc''"><<$npc_firstname[''A26'']>> <<$npc_lastname[''A26'']>></a>'
-	$npcSelfie[26] = '<a href="exec:numnpc = 26 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A26'']>> <<$npc_lastname[''A26'']>></a>'
+	$npcSelfie[26] = '<a href="exec:numnpc = 26 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A26'']>> <<$npc_lastname[''A26'']>></a>'
+
+!!Mikhail Nikolaevich
+	$school_static_num[69] = 'A69'
+	npcPol[69] = 0
+	grupTipe[69] = 6
+	selfieenable[69] = 1
+	$npcGo[69] = '<a href="exec:numnpc = 69 & gt ''Snpc''"><<$npc_firstname[''A69'']>> <<$npc_lastname[''A69'']>></a>'
+	$npcSelfie[69] = '<a href="exec:numnpc = 69 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A69'']>> <<$npc_lastname[''A69'']>></a>'
+
+!!Makar Vasilyev
+	$school_static_num[128] = 'A128'
+	npcPol[128] = 0
+	grupTipe[128] = 6
+	selfieenable[128] = 1
+	$npcGo[128] = '<a href="exec:numnpc = 128 & gt ''Snpc''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
+	$npcSelfie[128] = '<a href="exec:numnpc = 128 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
 
+!!Serafim Ivanov
+	$school_static_num[129] = 'A129'
+	npcPol[129] = 0
+	grupTipe[129] = 6
+	selfieenable[129] = 1
+	$npcGo[129] = '<a href="exec:numnpc = 129 & gt ''Snpc''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
+	$npcSelfie[129] = '<a href="exec:numnpc = 129 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
+	
 !!Ilya Yenotin
-	$school_static_num[48] = 'A130'
-	npcPol[48] = 0
-	grupTipe[48] = 6
-	$npcGo[48] = '<a href="exec:numnpc = 48 & gt ''Snpc''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
-	$npcSelfie[48] = '<a href="exec:numnpc = 48 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
+	$school_static_num[130] = 'A130'
+	npcPol[130] = 0
+	grupTipe[130] = 6
+	selfieenable[130] = 1
+	$npcGo[130] = '<a href="exec:numnpc = 130 & gt ''Snpc''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
+	$npcSelfie[130] = '<a href="exec:numnpc = 130 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
 
 !!Viktor Pavlovich
-	$school_static_num[49] = 'A131'
-	npcPol[49] = 0
-	grupTipe[49] = 6
-	$npcGo[49] = '<a href="exec:numnpc = 49 & gt ''Snpc''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
-	$npcSelfie[49] = '<a href="exec:numnpc = 49 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
+	$school_static_num[131] = 'A131'
+	npcPol[131] = 0
+	grupTipe[131] = 6
+	selfieenable[131] = 1
+	$npcGo[131] = '<a href="exec:numnpc = 131 & gt ''Snpc''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
+	$npcSelfie[131] = '<a href="exec:numnpc = 131 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
+
+!!Ruslan Kuznetsov
+	$school_static_num[132] = 'A132'
+	npcPol[132] = 0
+	grupTipe[132] = 6
+	selfieenable[132] = 1
+	$npcGo[132] = '<a href="exec:numnpc = 132 & gt ''Snpc''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
+	$npcSelfie[132] = '<a href="exec:numnpc = 132 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
 
+!!Rolan Matveev
+	$school_static_num[133] = 'A133'
+	npcPol[133] = 0
+	grupTipe[133] = 6
+	selfieenable[133] = 1
+	$npcGo[133] = '<a href="exec:numnpc = 133 & gt ''Snpc''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
+	$npcSelfie[133] = '<a href="exec:numnpc = 133 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
+	
 !!Aleksandrina Volkov
-	$school_static_num[50] = 'A134'
-	npcPol[50] = 1
-	grupTipe[50] = 6
-	$npcGo[50] = '<a href="exec:numnpc = 50 & gt ''Snpc''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
-	$npcSelfie[50] = '<a href="exec:numnpc = 50 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
+	$school_static_num[134] = 'A134'
+	npcPol[134] = 1
+	grupTipe[134] = 6
+	selfieenable[134] = 1
+	$npcGo[134] = '<a href="exec:numnpc = 134 & gt ''Snpc''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
+	$npcSelfie[134] = '<a href="exec:numnpc = 134 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
 
 !!Yeva Sokoloff
-	$school_static_num[51] = 'A135'
-	npcPol[51] = 1
-	grupTipe[51] = 6
-	$npcGo[51] = '<a href="exec:numnpc = 51 & gt ''Snpc''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
-	$npcSelfie[51] = '<a href="exec:numnpc = 51 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
-
-!!Serafim Ivanov
-	$school_static_num[52] = 'A129'
-	npcPol[52] = 0
-	grupTipe[52] = 6
-	$npcGo[52] = '<a href="exec:numnpc = 52 & gt ''Snpc''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
-	$npcSelfie[52] = '<a href="exec:numnpc = 52 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
+	$school_static_num[135] = 'A135'
+	npcPol[135] = 1
+	grupTipe[135] = 6
+	selfieenable[135] = 1
+	$npcGo[135] = '<a href="exec:numnpc = 135 & gt ''Snpc''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
+	$npcSelfie[135] = '<a href="exec:numnpc = 135 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
 
 !!Olga Aleksandrov
-	$school_static_num[53] = 'A136'
-	npcPol[53] = 1
-	grupTipe[53] = 6
-	$npcGo[53] = '<a href="exec:numnpc = 53 & gt ''Snpc''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
-	$npcSelfie[53] = '<a href="exec:numnpc = 53 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
+	$school_static_num[136] = 'A136'
+	npcPol[136] = 1
+	grupTipe[136] = 6
+	selfieenable[136] = 1
+	$npcGo[136] = '<a href="exec:numnpc = 136 & gt ''Snpc''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
+	$npcSelfie[136] = '<a href="exec:numnpc = 136 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
 
 !!Raven Braakman
-	$school_static_num[54] = 'A137'
-	npcPol[54] = 1
-	grupTipe[54] = 6
-	$npcGo[54] = '<a href="exec:numnpc = 54 & gt ''Snpc''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
-	$npcSelfie[54] = '<a href="exec:numnpc = 54 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
+	$school_static_num[137] = 'A137'
+	npcPol[137] = 1
+	grupTipe[137] = 6
+	selfieenable[137] = 1
+	$npcGo[137] = '<a href="exec:numnpc = 137 & gt ''Snpc''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
+	$npcSelfie[137] = '<a href="exec:numnpc = 137 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
 
 !!Arina Orlov
-	$school_static_num[55] = 'A138'
-	npcPol[55] = 1
-	grupTipe[55] = 6
-	$npcGo[55] = '<a href="exec:numnpc = 55 & gt ''Snpc''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
-	$npcSelfie[55] = '<a href="exec:numnpc = 55 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
+	$school_static_num[138] = 'A138'
+	npcPol[138] = 1
+	grupTipe[138] = 6
+	selfieenable[138] = 1
+	$npcGo[138] = '<a href="exec:numnpc = 138 & gt ''Snpc''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
+	$npcSelfie[138] = '<a href="exec:numnpc = 138 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
 
-!!Ruslan Kuznetsov
-	$school_static_num[56] = 'A132'
+!!
+!!===========================Family=======================
+!!
+!!Vladimir Lebedev
+	$school_static_num[28] = 'A28'
+	npcPol[28] = 0
+	grupTipe[28] = 7
+	selfieenable[28] = 1
+	$npcGo[28] = '<a href="exec:numnpc = 28 & gt ''Snpc''"><<$npc_firstname[''A28'']>> <<$npc_lastname[''A28'']>></a>'
+	$npcSelfie[28] = '<a href="exec:numnpc = 28 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A28'']>> <<$npc_lastname[''A28'']>></a>'
+	
+!!Natasha Lebedev
+	$school_static_num[29] = 'A29'
+	npcPol[29] = 1
+	grupTipe[29] = 7
+	selfieenable[29] = 1
+	$npcGo[29] = '<a href="exec:numnpc = 29 & gt ''Snpc''"><<$npc_firstname[''A29'']>> <<$npc_lastname[''A29'']>></a>'
+	$npcSelfie[29] = '<a href="exec:numnpc = 29 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A29'']>> <<$npc_lastname[''A29'']>></a>'
+	
+!!Anya Lebedev
+	$school_static_num[33] = 'A33'
+	npcPol[33] = 1
+	grupTipe[33] = 7
+	selfieenable[33] = 1
+	$npcGo[33] = '<a href="exec:numnpc = 33 & gt ''Snpc''"><<$npc_firstname[''A33'']>> <<$npc_lastname[''A33'']>></a>'
+	$npcSelfie[33] = '<a href="exec:numnpc = 33 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A33'']>> <<$npc_lastname[''A33'']>></a>'
+	
+!!Kolka Lebedev
+	$school_static_num[34] = 'A34'
+	npcPol[34] = 0
+	grupTipe[34] = 7
+	selfieenable[34] = 1
+	$npcGo[34] = '<a href="exec:numnpc = 34 & gt ''Snpc''"><<$npc_firstname[''A34'']>> <<$npc_lastname[''A34'']>></a>'
+	$npcSelfie[34] = '<a href="exec:numnpc = 34 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A34'']>> <<$npc_lastname[''A34'']>></a>'
+
+!!Mikhail Kuznetsov
+	$school_static_num[35] = 'A35'
+	npcPol[35] = 0
+	grupTipe[35] = 7
+	selfieenable[35] = 1
+	$npcGo[35] = '<a href="exec:numnpc = 35 & gt ''Snpc''"><<$npc_firstname[''A35'']>> <<$npc_lastname[''A35'']>></a>'
+	$npcSelfie[35] = '<a href="exec:numnpc = 35 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A35'']>> <<$npc_lastname[''A35'']>></a>'
+
+!!Uncle Misha
+	$school_static_num[54] = 'A54'
+	npcPol[54] = 0
+	grupTipe[54] = 7
+	selfieenable[54] = 1
+	$npcGo[54] = '<a href="exec:numnpc = 54 & gt ''Snpc''"><<$npc_firstname[''A54'']>> <<$npc_lastname[''A54'']>></a>'
+	$npcSelfie[54] = '<a href="exec:numnpc = 54 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_nickname[''A54'']>>'
+	
+!!
+!!===========================Pavlovsk=======================
+!!
+!!Roma Meynold
+	$school_static_num[56] = 'A56'
 	npcPol[56] = 0
-	grupTipe[56] = 6
-	$npcGo[56] = '<a href="exec:numnpc = 56 & gt ''Snpc''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
-	$npcSelfie[56] = '<a href="exec:numnpc = 56 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
-
-!!Makar Vasilyev
-	$school_static_num[58] = 'A128'
-	npcPol[58] = 0
-	grupTipe[58] = 6
-	$npcGo[58] = '<a href="exec:numnpc = 58 & gt ''Snpc''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
-	$npcSelfie[58] = '<a href="exec:numnpc = 58 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
+	grupTipe[56] = 8
+	selfieenable[56] = 1
+	$npcGo[56] = '<a href="exec:numnpc = 56 & gt ''Snpc''"><<$npc_firstname[''A56'']>> <<$npc_lastname[''A56'']>></a>'
+	$npcSelfie[56] = '<a href="exec:numnpc = 56 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A56'']>> <<$npc_lastname[''A56'']>></a>'
 
-!!Rolan Matveev
-	$school_static_num[57] = 'A133'
+!!Rex
+	$school_static_num[57] = 'A57'
 	npcPol[57] = 0
-	grupTipe[57] = 6
-	$npcGo[57] = '<a href="exec:numnpc = 57 & gt ''Snpc''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
-	$npcSelfie[57] = '<a href="exec:numnpc = 57 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
-	
-!!Mikhail Nikolaevich
-	$school_static_num[60] = 'A69'
-	npcPol[60] = 0
-	grupTipe[60] = 6
-	$npcGo[60] = '<a href="exec:numnpc = 60 & gt ''Snpc''"><<$npc_firstname[''A69'']>> <<$npc_lastname[''A69'']>></a>'
-	$npcSelfie[60] = '<a href="exec:numnpc = 60 & gt ''phone_selfies'', ''schoolselfies''"><<$npc_firstname[''A69'']>> <<$npc_lastname[''A69'']>></a>'
+	grupTipe[57] = 8
+	selfieenable[57] = 1
+	$npcGo[57] = '<a href="exec:numnpc = 57 & gt ''Snpc''"><<$npc_firstname[''A57'']>> <<$npc_lastname[''A57'']>></a>'
+	$npcSelfie[57] = '<a href="exec:numnpc = 57 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A57'']>>'
+
+!!Sergey Shulgin
+	$school_static_num[112] = 'A112'
+	npcPol[112] = 0
+	grupTipe[112] = 8
+	selfieenable[112] = 1
+	$npcGo[112] = '<a href="exec:numnpc = 112 & gt ''Snpc''"><<$npc_firstname[''A112'']>> <<$npc_lastname[''A112'']>></a>'
+	$npcSelfie[112] = '<a href="exec:numnpc = 112 & gt ''phone_selfies'', ''listretrieve2''"><<$npc_firstname[''A112'']>> <<$npc_lastname[''A112'']>></a>'
+
 end
 
 --- gschool_lessons ---------------------------------

+ 3 - 3
locations/kiosk.qsrc

@@ -49,9 +49,9 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if sub >= 15:
+		if exhibitionist_lvl > 0:
 			act 'Suggest a blowjob in exchange for jumping the queue':
-				if cumloc[12] = 0 and cumloc[11] = 0:
+				if cumloc[11] = 0:
 					*clr & cla
 					pcs_throat += 1
 					gs 'npcgeneratec', 0, 'stranger from the post office', rand(19,45)
@@ -92,7 +92,7 @@ if $ARGS[0] = 'start':
 				else
 					*clr & cla
 					'<center><video autoplay loop src="images/locations/shared/postoffice/punch.mp4"></video></center>'	
-					'The Man punches you in the gut and says, <font color="#0D42C0">"Go away bitch, your mouth is full of sperm."</font> You stagger away from the kiosk and spend 2 hours curled up in a ball.'
+					'The Man punches you in the gut and says, <font color="#0D42C0">"Go away bitch, your face is covered in sperm."</font> You stagger away from the kiosk and spend 2 hours curled up in a ball.'
 					minut += 120
 					gs 'pain', 4, 'tummy', 'hit'
 					gs 'stat'

+ 5 - 0
locations/korrPar.qsrc

@@ -57,6 +57,11 @@ act '<b>Leave and go to the courtyard</b>':
 	end
 end
 
+!! is this vacation check correct?
+if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0:
+	act 'Go pick up Natasha before school': gt 'natbelEv', 'carrybooks'
+end
+
 if blockBedrPar = 0:
 	if sisboyday + 1 = daystart and hour = 18 and sisboytrioQW = 1:
 		act 'Go to your room':gt 'sisterQW', 'sisboytrioQW_bedroom', 'start'

+ 28 - 13
locations/natbelEv.qsrc

@@ -103,16 +103,7 @@ if $ARGS[0] = 'carrybooks':
 	'When you head over to Natasha''s apartment to pick her up her mother opens the door and tells you she''s in her room getting ready so you go there.'
 	'As you open the door you see Natasha sitting on her small sofa, pulling up her stockings'
 	'"Ready to go?" You ask her, as you put your bag next to her.'
-	if NatashaQW > 6:
-		act 'Lift her skirt':
-			*clr & cla
-			'<center><img src="images/characters/pavlovsk/school/girl/natasha/skirt.jpg"></center>'
-			'You can''t stop yourself from pulling up her skirt as she turns to grab your bag. "Cute panties Natasha, they match the stockings."'
-			'Natasha looks over her shoulder at you with a faint blush on her cheeks. "I... Uhm... Thank you <<$pcs_nickname>>." She lets out in a whisper.'
-			'Not wanting to lose your mule to school you let her skirt fall down again and head to school.'
-			gt 'gschool_grounds', 'main'
-		end
-	elseif NatashaQW > 8:
+	if NatashaQW > 7:
 		act 'Lift her skirt':
 			*clr & cla
 			'<center><img src="images/characters/pavlovsk/school/girl/natasha/skirt.jpg"></center>'
@@ -123,18 +114,42 @@ if $ARGS[0] = 'carrybooks':
 			'Natasha obediently opens her legs for you. showing off her pretty pussy. Not wasting any time you start playing with her, first rubbing her lips, then focussing more on her clit as you watch closely while Natasha''s pussy gets wetter and wetter.'
 			act 'Stuff her panties':
 				*clr & cla
-				'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/stuffpanties.mp4"></center>'
+				'<center><video <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/stuffpanties.mp4"></center>'
 				'You stop playing with her pussy and grab her panties, handing them over to her. "Put them inside your pussy."'
 				'Natasha looks at you in confusion for a second but then starts to slowly push them into her pussy.'
 				'When there''s only enough left to easily grab on in case you''d want to pull them out she stops and looks at you expectantly. "Like this <<$pcs_nickname>>?"'
 				'You reach down and push the last bit inside as well, holding them in with your finger for a bit before pulling your finger out again.'
 				'"This is how you''ll wear your panties for me at school today Natasha." You tell her. "Now put your skirt back on or we''ll be late.'
-				gt 'gschool_grounds', 'main'
+				act 'Go to school': gt 'natbelEv', 'schoolwalk'
 			end
 		end
+	elseif NatashaQW > 5:
+		act 'Lift her skirt':
+			*clr & cla
+			'<center><img src="images/characters/pavlovsk/school/girl/natasha/skirt.jpg"></center>'
+			'You can''t stop yourself from pulling up her skirt as she turns to grab your bag. "Cute panties Natasha, they match the stockings."'
+			'Natasha looks over her shoulder at you with a faint blush on her cheeks. "I... Uhm... Thank you <<$pcs_nickname>>." She lets out in a whisper.'
+			'Not wanting to lose your mule to school you let her skirt fall down again and head to school.'
+			act 'Go to school': gt 'gschool_grounds', 'main'
+		end
 	else
 		'Natasha grabs both of your bags and you head to school.'
-		gt 'gschool_grounds', 'main'	
+		act 'Go to school': gt 'gschool_grounds', 'main'	
+	end
+	act 'Go to school': gt 'gschool_grounds', 'main'	
+end
+
+if $ARGS[0] = 'schoolwalk':
+	if rand(0,4) = 0:
+		natkolkatease = 1
+		*clr & cla
+		'<center><img src="images/characters/pavlovsk/school/girl/natasha/tease.jpg"></center>'
+		'As you reach the bottom of the stairs, you notice Kolka coming down as well.'
+		'Deciding to tease him a bit you grab the bottom of Natasha''s skirt and pull it up while you bend over yourself to show him both of your asses.'
+		'Natasha quickly slaps your hand away and the two of you resume your walk to school. As you exit the hall you can''t hear Kolka''s footsteps. He must have stopped in his tracks at the sight.'
+		act 'Continue on to school': gt 'gschool_grounds', 'main'
+	else
+		gt 'gschool_grounds', 'main'
 	end
 end
 

+ 1 - 5
locations/natbelapt.qsrc

@@ -477,7 +477,7 @@ if $ARGS[0] = 'natroom':
 			if NatashaQW > 7:
 				act 'Make her lick your pussy': gs 'natbelapt', 'lick_pussy'
 			end
-			if NatashaQW > 8 and hour >= 18 and hour < 21 and natsub >= 6 and natfuckday < daystart:
+			if NatashaQW > 8 and hour >= 18 and hour < 21 and natsub >= 6 and natfuckday < daystart and kolkawantsnat = 1:
 				act 'Make her fuck Kolka': gs 'natbelapt', 'kolkabj'
 			end
 !! nutluck pulled this for now
@@ -568,7 +568,6 @@ if $ARGS[0] = 'natroom':
 										act 'Continue': gt 'natbelapt', 'natroom'
 									end
 								end
-!!NEW
 								act 'Eat me':
 									*clr & cla
 									'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natashabedroomsex06.jpg"></center>'
@@ -656,7 +655,6 @@ if $ARGS[0] = 'make_her_do_homework':
 	if NatashaQW = 3:
 		'"Well Natasha, since I won''t be seeing my money any time soon I think it''s best for now if you repay me by doing my homework for me." You tell her in a threatening voice.'
 	elseif NatashaQW = 4:
-!! This requires the event to be added in Sveta''s home on the morning of a any schoolday. After a few times it should raise NatashaQW to 5
 		'"Well Natasha, on top of you doing my homework for me, you''ll be carrying my books to school in the morning from now on." You tell her in a threatening voice.'
 	end
 	'Natasha looks close to tears as she nods meekly and starts working on your homework as well as hers.'
@@ -792,7 +790,6 @@ if $ARGS[0] = 'afterhomework':
 			end
 		end
 	end
-!! I will make an event in one of the stores so Sveta can buy the underwear for Natasha	
 	if natseethrough = 1:
 		act 'Make her wear the lingerie':
 			*clr & cla
@@ -2348,7 +2345,6 @@ if $ARGS[0] = 'livingroom':
 					'"Though I''m not sure you should be watching it when your mother can walk in at any moment."'
 					act 'Let''s go to your room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
 				else
-!! Watched porn stat should increase
 					! Randomly determine if it''s a porno featuring Sveta
 					if city_porn = 0:
 						YourPorn = 0

+ 4 - 0
locations/pavSharedApt.qsrc

@@ -278,6 +278,10 @@ if $ARGS[0] = 'start':
 		end
 	end
 	
+	if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0:
+		act 'Go pick up Natasha before school': gt 'natbelEv', 'carrybooks'
+	end
+	
 	if rentPaid = 1:
 		'A large apartment currently serves as shared living. As well as the normal living spaces, there are four bedrooms, one rented by you and three occupied by <a href="exec: gt ''pavShared_nd'', ''ndDick''"><font color=#<<$nd_font>>><<$nd_name>></font></a>, <a href="exec: gt ''pavShared_gp'', ''gpDick''"><font color=#<<$gp_font>>><<$gp_name>></font></a>, <a href="exec: gt ''pavShared_sp'', ''spDick''"><font color=#<<$sp_font>>><<$sp_name>></font></a>.'
 		'You stand in the hallway. '

+ 289 - 0
locations/pavaptcourtev.qsrc

@@ -1202,4 +1202,293 @@ if $ARGS[0] = 'homenaked':
 	end
 end
 
+if $ARGS[0] = 'naked_aptcomplex':
+	*clr & cla
+	menu_off = 1
+	minut += 2
+	gs 'exhibitionism', 4
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/complexnaked.jpg"></center>'
+	'There are several older women sitting out front of your building. So you make your way around to the back of the complex near the garages, you stop a moment to peek around one of the buildings. Not seeing anyone, you dart from one building to the next, leaving just the small courtyard behind your building to cross. You peek around a building and see a few people there, you keep yourself hidden as you wait, finally they move off and you rush across the courtyard and into the back door of the apartment building.'
+	act 'Sneak upstairs':
+		*clr & cla
+		rand(1,10)
+		if nakedrand = 1: 
+			gt 'pavaptcourtev', 'two_boys'
+		elseif nakedrand = 2: 
+			gt 'pavaptcourtev', 'misha'
+		else
+			gs 'exhibitionism', 4
+			minut += 1
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/aptstairsnaked.jpg"></center>'
+			'Once inside you sigh in relief, almost home finally. Taking a look around, you glance up the stairs and then slowly start creeping up them hoping no one suddenly comes out of their apartment or comes down the stairs, catching you naked.'
+			gs 'stat'
+
+			act 'Sneak to your apartment':
+				*clr & cla
+				minut += 22
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/homedoornaked.jpg"></center>'
+				'You make it to your door, fishing your keys out of your purse. You unlock the door and slip inside, closing the door behind you. You rush down the hall to your bedroom, finally making it to your bedroom and are able to get dressed.'
+!!this option should only show up if Sveta has another uniform or basic uniform should be equipped 
+!!				act 'Put on spare uniform and go back to school':
+!!					*clr & cla
+!!					minut += 12
+!!					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_home2.jpg"></center>'
+!!					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homew1.jpg"></center>'
+!!					'You change into your other school uniform quickly and then rush back to school.'
+!!					!!this should take Sveta back to school missing one period
+!!				end
+			end
+			act 'Stay home': gt 'bedrPar'
+		end
+	end
+end
+
+if $ARGS[0] = 'two_boys':
+	*clr & cla
+	minut += 3
+	gs 'exhibitionism', 4
+	killvar 'nakedrand'
+	
+	pavapt_boyrand = rand(1,2)
+	
+	if pavapt_boyrand = 1:
+		gs 'boyStat', 'A122', 1
+		gs 'boyStat', 'A123', 2
+	else
+		gs 'boyStat', 'A125', 1
+		gs 'boyStat', 'A126', 2	
+	end
+	
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/aptstairsnaked.jpg"></center>'
+	'Once inside you sigh in relief, almost home finally. Taking a look around, you glance up the stairs and then slowly start creeping up them hoping no one suddenly comes out of their apartment or comes down the stairs, catching you naked. Just before you make it to your door, you hear the clomping of boots on the stairs, as you reach your door you hear someone says. "Well well, look-y what we have here. What you doing <<pcs_nickname>>?"'
+	*nl
+	'You turn around and see <<$boydesc[1]>> and <<$boydesc[2]>>, standing behind you. One of them taking your picture with his phone, while the other walks over and leans against your apartment door, so you open it. "Please guys, I just need to get inside. Please share those pictures."'
+	'The one taking the pictures laughs and keeps taking them, while his friends leers at you, looking over your whole body. "Well if you are going to run around like a whore, we should treat you like one. So how about you come over here and let us fuck you and we will keep your secret and you can be our little whore, what do you say?"'
+	gs 'stat'
+	
+	act 'Tell them no and go home':
+!!willpower
+		*clr & cla
+		pav_sex += 4
+		minut += 1
+		gs 'exhibitionism', 4
+		killvar 'pavapt_boyrand'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/homedoornaked.jpg"></center>'
+		'You shake your head no. "No, I''ll be your personal whore, now move out of my way."'
+		'He laughs and gets off the door. "Whatever you say, whore." With that, you pull open the door and go into your apartment, with their laughter echoing out in the hall. Nothing you can do now, hopefully, they share the images with anyone, or at least anyone you know. Sighing you walk down the hall to your bedroom.'
+		gs 'stat'
+		
+!!this option should only show up if Sveta has another uniform	
+!!		act 'Put on spare uniform and Go back to school':
+!!			*clr & cla
+!!			minut += 12
+!!			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_home2.jpg"></center>'
+!!			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homew1.jpg"></center>'
+!!			'You change into your other school uniform quickly and then rush back to school.'
+!!this should take Sveta back to school missing one period
+!!		end
+		act 'Stay home': gt 'bedrPar'
+	end
+	
+	act 'Agree':
+		*clr & cla
+		pav_sex += 2
+		minut += 2
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/napt.jpg"></center>'
+		'You nod in agreement. "Ok fine, if you won''t tell anyone, just tell me what you want?"'
+		'"Well to fuck you like the whore you are, of course." He barks with a laugh, with that they take you to their apartment. Once inside one of them pushes you down to your knees and the stand on each side of you, with obvious bulges in their pants from having hard-ons.'
+		gs 'arousal', 'foreplay', 2, 'exhibitionism'
+		gs 'stat'
+		
+		act 'Suck dick':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nsuck1.jpg"></center>'
+			'They pull down their pants and let their hard dicks spring free. "Well start sucking our cocks whore, they won''t suck themselves." One of them says with a laugh. You do as you are told, you take one of their cocks into your mouth, while you jerk the other guy off.'
+			gs 'arousal', 'bj', 2, 'sub', 'group'
+			gs 'arousal', 'hj', 2, 'sub', 'group'
+			minut -= 2
+			gs 'stat'
+			
+			act 'Switch dicks':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nsuck2.jpg"></center>'
+				'As you are sucking and jerking the guys off, the one who is getting the hand job grabs your hair and pulls your face to his cock. "My turn to get my dick sucked." You do as you are told and now start sucking his dick, while jerking the other one off now.'
+				'After a few minutes, they stop and tell you. "Get your ass up there on the foot stole, so we can fuck you!" It looks rather large to be a foot stole, you don''t think that is what it is called but you can''t think of it''s name, regardless it doesn''t matter. You get up and move over to it.'
+				gs 'arousal', 'bj', 3, 'sub'
+				gs 'arousal', 'hj', 3, 'sub', 'group'
+				minut -= 3
+				gs 'stat'
+				
+				act 'Tell them you are a vigin':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nanal1.jpg"></center>'
+					'You sit down on the cushion and say. "Guys can''t I just suck you off? I''m still a virgin."'
+					'They both scoff at that. "Bull shit you are." You give him a serious look and nod that you are a virgin. They pause just a second and the other one says. "Well good thing you go more holes then lay down on your side." He grins as you do it before adding. "Don''t worry we won''t pop your cherry."'
+					*nl
+					'One of them walks over, pushes you over so you are laying on your side, and sticks his dick back in your mouth. Making you unable to see what the other one is doing, but you feel him sit or lay down next to you. A moment later you feel slick fingers lubing up your asshole before you feel the head of his cock against your asshole.'
+					*nl
+					'With a quick shove, he pops his cock in your ass and starts fucking it. It hurts a little, but at least he used lube and it isn''t to bad. You lay on your side as one of them fucks your mouth and the other fucks your ass.'
+					gs 'pain', 1, 'asshole', 'stretch'
+					gs 'arousal', 'bj', 5, 'sub', 'group'
+					gs 'arousal', 'anal', 5, 'sub', 'group'
+					minut -= 5
+					gs 'stat'
+					
+					act 'Switch dicks':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nanal2.jpg"></center>'
+						'As you lay there getting fucked you hear the one, currently with his dick in your mouth say to his friend. "Lets switch, I want to fuck her ass too." With that they switch positions and the dick that was in your ass, now slides in your mouth, leaving you to taste the lube among other things. While the other boy slides his dick in your ass and starts pumping it hard and fast.'
+						gs 'arousal', 'bj', 5, 'sub', 'group'
+						gs 'arousal', 'anal', 5, 'sub', 'group'
+						minut -= 5
+						gs 'stat'
+						
+						act 'Back on your knees':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/ncum.jpg"></center>'
+							'Several minutes go by until they both starting grunting, obviously getting close to cumming. They pull out of you as one of them tells you. "Get on your knee''s whore and open your mouth." You do as you are told, they both step up close with the dicks right in your facing jerking them a few times. Both of them starting cumming at almost the same time, some of it going in your mouth and on your tongue, most of the rest splattering your face with strains of thick seamen. Once they finish cumming on you, the first one grabs you by the arm and pulls you to your feet. Drags you over to the door, while his friend opens it and then they shove you out into the hall naked, with your face covered in their cum. "Get lost whore!" With that, they close the door in your face.'
+							gs 'arousal', 'foreplay', 2, 'sub', 'group', 'humiliation'
+							if pavapt_boyrand = 1:
+								gs 'cum_call', 'face', 'A122', 1
+								gs 'cum_call', 'mouth', 'A123', 1
+							else
+								gs 'cum_call', 'face', 'A125', 1
+								gs 'cum_call', 'mouth', 'A126', 1
+							end
+							gs 'arousal', 'end'
+							gs 'stat'
+							act 'Go home':
+								*clr & cla
+								killvar 'pavapt_boyrand'
+								minut +2
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/homedoornaked.jpg"></center>'
+								'You leave the apartment behind and walk back to your apartment. You unlock the door and walk down the hall to your bedroom and are finally able to get cleaned up and dressed.'
+								
+!!this option should only show up if Sveta has another uniform	
+!!								act 'Put on spare uniform and Go back to school':
+!!									*clr & cla
+!!									minut += 12
+!!									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_home2.jpg"></center>'
+!!									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homew1.jpg"></center>'
+!!									'You change into your other school uniform quickly and then rush back to school.'
+!!this should take Sveta back to school missing one period
+!!								end
+								
+								act 'Stay home': gt 'bedrPar'
+							end
+						end
+					end
+				end
+				if pcs_vag > 0:
+					act 'Let them do what they want':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nfuck1.jpg"></center>'
+						'You kneel down on your hands and knees on the cushion and say. One of them walks over and lays down on the cushion on his back, he pulls your head over and forces it back down on his dick. The other walks up behind you, you feel the head of his cock rub against your slit and then he slides it in your twat. Once you are good and wet he starts fucking your hard and face while his friend forces your head down to gag on his dick.'
+						gs 'arousal', 'bj', 5, 'sub', 'group'
+						gs 'arousal', 'vaginal', 5, 'sub', 'group'
+						minut -= 5
+						gs 'stat'
+						act 'Switch dicks':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nfuck2.jpg"></center>'
+							'As you kneel there getting fucked you hear the one, currently with his dick in your mouth say to his friend. "Lets switch, I want to fuck her too." With that they switch positions and the dick that was in your pussy, now slides in your mouth. While the other boy slides his dick in your pussy and starts pumping it hard and fast, while he rubs his thumb against your asshole.'
+							gs 'arousal', 'bj', 5, 'sub', 'group'
+							gs 'arousal', 'vaginal', 5, 'sub', 'group'
+							minut -= 5
+							gs 'stat'
+							act 'Double tap':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/ndp1.jpg"></center>'
+								'As you kneel there getting fucked the one, currently with his dick in your mouth speaks up. "Let us switch again, I want to fuck her some more."'
+								'His friend doesn''t stop fucking you. "You already had a turn." They argue a bit back and forth until they decided they should just fuck you, luckily you have a spare hole. They make you crawl up and mount the one laying on his back, once his cock is all the way in you, his friend moves up behind you and presses the head of his cock against your asshole until it pops in. You feel a moment of pain, then he slides it in further and they both start to fuck you.'
+								gs 'pain', 1, 'asshole', 'stretch'
+								gs 'pain', 1, 'asshole', 'stretch'
+								gs 'arousal', 'anal', 5, 'sub', 'group'
+								gs 'arousal', 'vaginal', 5, 'sub', 'group'
+								minut -= 5
+								gs 'stat'
+								act 'Switch holes':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/ndp2.jpg"></center>'
+									'Several minutes go by until they want to switch again, this time they make you roll over so the guy laying on his back can slide his dick up your ass and his friend slips his dick in your pussy. Once they are both in they start fucking you again, filling you up completely.'
+									gs 'arousal', 'anal', 5, 'sub', 'group'
+									gs 'arousal', 'vaginal', 5, 'sub', 'group'
+									minut -= 5
+									gs 'stat'
+									act 'Back on your knees':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/ncum.jpg"></center>'
+										'Several minutes go by until they both starting grunting, obviously getting close to cumming. They pull out of you as one of them tells you. "Get on your knee''s whore and open your mouth." You do as you are told, they both step up close with the dicks right in your facing jerking them a few times. Both of them starting cumming at almost the same time, some of it going in your mouth and on your tongue, most of the rest splattering your face with strains of thick seamen. Once they finish cumming on you, the first one grabs you by the arm and pulls you to your feet. Drags you over to the door, while his friend opens it and then they shove you out into the hall naked, with your face covered in their cum. "Get lost whore!" With that, they close the door in your face.'
+										gs 'arousal', 'foreplay', 2, 'sub', 'group', 'humiliation'
+										if pavapt_boyrand = 1:
+											gs 'cum_call', 'face', 'A122', 1
+											gs 'cum_call', 'mouth', 'A123', 1
+										else
+											gs 'cum_call', 'face', 'A125', 1
+											gs 'cum_call', 'mouth', 'A126', 1
+										end
+										gs 'arousal', 'end'
+										gs 'stat'
+										act 'Go home':
+											*clr & cla
+											minut += 2
+											killvar 'pavapt_boyrand'
+											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/homedoornaked.jpg"></center>'
+											'You leave the apartment behind and walk back to your apartment. You unlock the door and walk down the hall to your bedroom and are finally able to get cleaned up and dressed.'
+!!this option should only show up if Sveta has another uniform	
+!!											act 'Put on spare uniform and Go back to school':
+!!												*clr & cla
+!!												minut += 12
+!!												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_home2.jpg"></center>'
+!!												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homew1.jpg"></center>'
+!!												'You change into your other school uniform quickly and then rush back to school.'
+!!												this should take Sveta back to school missing one period
+!!											end
+											act 'Stay home': gt 'bedrPar'
+										end
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'misha':
+	*clr & cla
+	minut += 1
+	killvar 'nakedrand'
+	gs 'exhibitionism', 4
+	npc_rel['A54'] += 3
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/aptstairsnaked.jpg"></center>'
+	'Once inside you sigh in relief, almost home finally. Taking a look around, you glance up the stairs and then slowly start creeping up them hoping no one suddenly comes out of their apartment or comes down the stairs, catching you naked. You almost make it to your door when you hear a door behind you open, followed by a cough. You turn around and see Uncle Misha watching you with a raised eyebrow. "Should I ask why you are running around naked <<pcs_nickname>>?"'
+	*nl
+	'You blush as he stares at your naked body, having been caught by someone you know. "Some girls at school stole my clothes." You explain to him, he snorts a laugh and shakes his head.'
+	'"Well you best get inside then." He tells you, as you go unlock the door as quickly as you can, as you go inside you think you hear him say. "Where were girls like that when I was in school." Rushing down the hall you go to your bedroom.'
+	gs 'stat'
+	
+	act 'Go to your bedroom':
+		*clr & cla
+		minut += 2
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/homedoornaked.jpg"></center>'
+		'You finally make it to your bedroom and are able to get dressed.'
+		
+!! this option should only show up if Sveta has another uniform
+!!		act 'Put on spare uniform and go back to school':
+!!			*clr & cla
+!!			minut += 12
+!!			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_home2.jpg"></center>'
+!!			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homew1.jpg"></center>'
+!!			'You change into your other school uniform quickly and then quickly rush back to school.'
+!!			!!this should take Sveta back to school missing one period
+!!		end
+		
+		act 'Stay home': gt 'bedrPar'
+	end
+end
+
 --- pavaptcourtev ---------------------------------

+ 470 - 214
locations/phone_selfies.qsrc

@@ -14,13 +14,9 @@ if $ARGS[0] = 'selfies':
 	$undname = 'underwear'
 	$undnamecap = 'Underwear'
 	
-	'<center><h4><font color="maroon">Selfie overview</font></h4></center>'
-	*nl
-	
-	!!default images that are used in any location not set
-	if phone_selfie[1] = 1:'<a href="exec:view''images/system/phone/selfie/phone_selfie1.jpg''"><b>Selfie number1</b></a>'
-	if phone_selfie[2] = 1:'<a href="exec:view''images/system/phone/selfie/phone_selfie2.jpg''"><b>Selfie number2</b></a>'
+	'<center><h4><font color="maroon">Photo library</font></h4></center>'
 	*nl
+	'Selfies'
 	'<a href="exec:gt ''phone_selfies'', ''bathroom''">Bathroom selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''bedroom''">Bedroom selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''kitchen''">Kitchen selfies</a>'
@@ -29,10 +25,14 @@ if $ARGS[0] = 'selfies':
 	'<a href="exec:gt ''phone_selfies'', ''park''">Park selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''lockerroom''">Lockerroom selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''beach''">Beach selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''gym''">Gym selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''dance''">Dance selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''misc''">Misc selfies</a>'
 	*nl
-	'Selfies with family and friends'
-	'<a href="exec:gt ''phone_selfies'', ''family''">Family selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''school''">School selfies</a>'
+	'Family and friends'
+	'<a href="exec:gt ''phone_selfies'', ''family''">Family</a>'
+	'<a href="exec:gt ''phone_selfies'', ''school''">School friends</a>'
+	'<a href="exec:gt ''phone_selfies'', ''teacher''">Teachers</a>'
 	'<a href="exec:gt ''phone_selfies'', ''pavlovsk''">Pavlovsk friends</a>'
 	'<a href="exec:gt ''phone_selfies'', ''city''">City friends</a>'
 	!gt $loc, $metka
@@ -84,135 +84,7 @@ if $ARGS[0] = 'listretrieve':
 	end
 end
 
-if $ARGS[0] = 'bathroom':
-	'<center><h4><font color="maroon">Bathroom selfies</font></h4></center>'
-	$phone_loc = 'bathroom'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'bedroom':
-	'<center><h4><font color="maroon">Bedroom selfies</font></h4></center>'
-	$phone_loc = 'bedroom'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'kitchen':
-	'<center><h4><font color="maroon">Kitchen selfies</font></h4></center>'
-	$phone_loc = 'kitchen'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'livingroom':
-	'<center><h4><font color="maroon">Livingroom selfies</font></h4></center>'
-	$phone_loc = 'livingroom'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'changingroom':
-	'<center><h4><font color="maroon">Changingroom selfies</font></h4></center>'
-	$phone_loc = 'changingroom'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'park':
-	'<center><h4><font color="maroon">Park selfies</font></h4></center>'
-	$phone_loc = 'park'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'lockerroom':
-	'<center><h4><font color="maroon">Lockerroom selfies</font></h4></center>'
-	$phone_loc = 'lockerroom'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-		
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'beach':
-	'<center><h4><font color="maroon">Beach selfies</font></h4></center>'
-	$phone_loc = 'beach'
-	clovar = 0
-	$undname = 'bikini'
-	$undnamecap = 'Bikini'
-	*nl
-	gs 'phone_selfies', 'listretrieve'
-		
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'family':
-	'<center><h4><font color="maroon">Family members</font></h4></center>'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'school':
-	'<center><h4><font color="maroon">School friends</font></h4></center>'
-	gs 'gschool_lessons', 'npc_data'
-	$textgrup = ''
-	count1 = 0
-	i = 1
-	'<center><table cellspacing="3">'
-	:markgruploop	
-		if count1 = 6 : $textgrup += '<tr>'
-
-		if grupTipe[i] ! 6:
-			count1 += 1
-			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/characters/pavlovsk/school/head/<<i>>.jpg"><br>' + $npcSelfie[i]
-		end
-		if count1< 6 and grupTipe[i] ! 6 :
-			$textgrup += '</td>'
-		elseif count1 = 6 and grupTipe[i] ! 6:
-			$textgrup +='</td></tr><tr>' & count1 = 0
-		end
-		i += 1
-	if i <= ARRSIZE('school_static_num')-1:jump 'markgruploop'
-
-	'<<$textgrup>>'
-	
-	act 'Back': gt 'phone_selfies', 'selfies'
-	!gt $loc, $metka
-	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
-end
-
-if $ARGS[0] = 'schoolselfies':
+if $ARGS[0] = 'listretrieve2':
 	if numnpc = 1:
 		'<center><h4><font color="maroon">Dimka selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/dimka/selfies/'
@@ -388,177 +260,324 @@ if $ARGS[0] = 'schoolselfies':
 		loopmax = 45
 		loopmaxsveta = 25
 		loopmaxsex = 9
-	elseif numnpc = 27:
-		'<center><h4><font color="maroon">Marcus selfies</font></h4></center>'
-		$imgloc = 'images/characters/pavlovsk/school/boy/marcus/selfies/'
-		$selfienpc = 'marcus'
+	elseif numnpc = 26:
+		'<center><h4><font color="maroon">Anatoly selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/anatoly/selfies/'
+		$selfienpc = 'anatoly'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
 	elseif numnpc = 28:
-		'<center><h4><font color="maroon">Andrey selfies</font></h4></center>'
-		$imgloc = 'images/characters/pavlovsk/school/boy/andrey/selfies/'
-		$selfienpc = 'andrey'
+		'<center><h4><font color="maroon">Stepfather selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/resident/vladimir/selfies/'
+		$selfienpc = 'vladimir'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
 	elseif numnpc = 29:
-		'<center><h4><font color="maroon">Mefodiy selfies</font></h4></center>'
-		$imgloc = 'images/characters/pavlovsk/school/boy/mefodiy/selfies/'
-		$selfienpc = 'mefodiy'
+		'<center><h4><font color="maroon">Mother selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/resident/mom/selfies/'
+		$selfienpc = 'mom'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 33:
+		'<center><h4><font color="maroon">Anya selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/resident/anya/selfies/'
+		$selfienpc = 'anya'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 34:
+		'<center><h4><font color="maroon">Kolka selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/resident/kolka/selfies/'
+		$selfienpc = 'kolka'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 35:
+		'<center><h4><font color="maroon">Father selfies</font></h4></center>'
+!! Where are these located?
+		$imgloc = 'images/characters/pavlovsk/resident/???/selfies/'
+		$selfienpc = 'father'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 54:
+		'<center><h4><font color="maroon">Uncle Misha selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/resident/misha/selfies/'
+		$selfienpc = 'misha'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 56:
+		'<center><h4><font color="maroon">Roma selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/resident/roma/selfies/'
+		$selfienpc = 'roma'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 57:
+		'<center><h4><font color="maroon">Rex selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/resident/rex/selfies/'
+		$selfienpc = 'rex'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 69:
+		'<center><h4><font color="maroon">Mikhail selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/mikhail/selfies/'
+		$selfienpc = 'coachmikhail'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 54:
+		'<center><h4><font color="maroon">Sergey selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/resident/sergey/selfies/'
+		$selfienpc = 'sergey'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 128:
+		'<center><h4><font color="maroon">Makar selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/makar/selfies/'
+		$selfienpc = 'makar'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 129:
+		'<center><h4><font color="maroon">Serafim selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/serafim/selfies/'
+		$selfienpc = 'serafim'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 130:
+		'<center><h4><font color="maroon">Ilya selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/ilya/selfies/'
+		$selfienpc = 'ilya'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 30:
+	elseif numnpc = 131:
+		'<center><h4><font color="maroon">Viktor selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/viktor/selfies/'
+		$selfienpc = 'viktor'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 132:
+		'<center><h4><font color="maroon">Ruslan selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/ruslan/selfies/'
+		$selfienpc = 'ruslan'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 133:
+		'<center><h4><font color="maroon">Rolan selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/rolan/selfies/'
+		$selfienpc = 'rolan'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 134:
+		'<center><h4><font color="maroon">Aleksandrina selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/aleksandrina/selfies/'
+		$selfienpc = 'aleksandrina'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 135:
+		'<center><h4><font color="maroon">Yeva selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/yeva/selfies/'
+		$selfienpc = 'yeva'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 136:
+		'<center><h4><font color="maroon">Olga selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/olga/selfies/'
+		$selfienpc = 'olga'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 137:
+		'<center><h4><font color="maroon">Raven selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/raven/selfies/'
+		$selfienpc = 'raven'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 138:
+		'<center><h4><font color="maroon">Arina selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/teacher/arina/selfies/'
+		$selfienpc = 'arina'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 139:
 		'<center><h4><font color="maroon">Stasya selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/stasya/selfies/'
 		$selfienpc = 'stasya'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 31:
+	elseif numnpc = 140:
 		'<center><h4><font color="maroon">Lizaveta selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/lizaveta/selfies/'
 		$selfienpc = 'lizaveta'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 32:
+	elseif numnpc = 141:
+		'<center><h4><font color="maroon">Veronika selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/veronika/selfies/'
+		$selfienpc = 'veronika'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 142:
+		'<center><h4><font color="maroon">Zinaida selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/zinaida/selfies/'
+		$selfienpc = 'zinaida'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 143:
+		'<center><h4><font color="maroon">Alyona selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/alyona/selfies/'
+		$selfienpc = 'alyona'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 144:
+		'<center><h4><font color="maroon">Anushka selfies</font></h4></center>'	
+		$imgloc = 'images/characters/pavlovsk/school/girl/anushka/selfies/'
+		$selfienpc = 'anushka'
+		loopmax = 22
+		loopmaxsveta = 0
+		loopmaxsex = 7
+	elseif numnpc = 145:
+		'<center><h4><font color="maroon">Ekaterina selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/ekaterina/selfies/'
+		$selfienpc = 'ekaterina'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 146:
+		'<center><h4><font color="maroon">Marcus selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/marcus/selfies/'
+		$selfienpc = 'marcus'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 147:
+		'<center><h4><font color="maroon">Andrey selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/andrey/selfies/'
+		$selfienpc = 'andrey'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 148:
+		'<center><h4><font color="maroon">Mefodiy selfies</font></h4></center>'
+		$imgloc = 'images/characters/pavlovsk/school/boy/mefodiy/selfies/'
+		$selfienpc = 'mefodiy'
+		loopmax = 0
+		loopmaxsveta = 0
+		loopmaxsex = 0
+	elseif numnpc = 149:
 		'<center><h4><font color="maroon">Lazar selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/lazar/selfies/'
 		$selfienpc = 'lazar'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 33:
+	elseif numnpc = 150:
 		'<center><h4><font color="maroon">Erast selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/erast/selfies/'
 		$selfienpc = 'erast'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 34:
-		'<center><h4><font color="maroon">Veronika selfies</font></h4></center>'
-		$imgloc = 'images/characters/pavlovsk/school/boy/veronika/selfies/'
-		$selfienpc = 'veronika'
-		loopmax = 0
-		loopmaxsveta = 0
-		loopmaxsex = 0
-	elseif numnpc = 35:
+	elseif numnpc = 151:
 		'<center><h4><font color="maroon">Evgeny selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/evgeny/selfies/'
 		$selfienpc = 'evgeny'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 36:
+	elseif numnpc = 152:
 		'<center><h4><font color="maroon">Feofan selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/feofan/selfies/'
 		$selfienpc = 'feofan'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 37:
+	elseif numnpc = 153:
 		'<center><h4><font color="maroon">Gerasim selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/gerasim/selfies/'
 		$selfienpc = 'gerasim'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 38:
-		'<center><h4><font color="maroon">Zinaida selfies</font></h4></center>'
-		$imgloc = 'images/characters/pavlovsk/school/boy/zinaida/selfies/'
-		$selfienpc = 'zinaida'
-		loopmax = 0
-		loopmaxsveta = 0
-		loopmaxsex = 0
-	elseif numnpc = 39:
+	elseif numnpc = 154:
 		'<center><h4><font color="maroon">Radomir selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/radomir/selfies/'
 		$selfienpc = 'radomir'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 40:
+	elseif numnpc = 155:
 		'<center><h4><font color="maroon">Lavrenti selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/lavrenti/selfies/'
 		$selfienpc = 'lavrenti'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 41:
+	elseif numnpc = 156:
 		'<center><h4><font color="maroon">Arkadi selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/arkadi/selfies/'
 		$selfienpc = 'arkadi'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 42:
+	elseif numnpc = 157:
 		'<center><h4><font color="maroon">Roman selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/roman/selfies/'
 		$selfienpc = 'roman'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 43:
+	elseif numnpc = 158:
 		'<center><h4><font color="maroon">Valentin selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/valentin/selfies/'
 		$selfienpc = 'valentin'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 44:
-		'<center><h4><font color="maroon">Alyona selfies</font></h4></center>'
-		$imgloc = 'images/characters/pavlovsk/school/boy/alyona/selfies/'
-		$selfienpc = 'alyona'
-		loopmax = 0
-		loopmaxsveta = 0
-		loopmaxsex = 0
-	elseif numnpc = 45:
-		'<center><h4><font color="maroon">Anushka selfies</font></h4></center>'	
-		$imgloc = 'images/characters/pavlovsk/school/girl/anushka/selfies/'
-		$selfienpc = 'anushka'
-		loopmax = 22
-		loopmaxsveta = 0
-		loopmaxsex = 7
-	elseif numnpc = 46:
-		'<center><h4><font color="maroon">Ekaterina selfies</font></h4></center>'
-		$imgloc = 'images/characters/pavlovsk/school/boy/ekaterina/selfies/'
-		$selfienpc = 'ekaterina'
-		loopmax = 0
-		loopmaxsveta = 0
-		loopmaxsex = 0
-	elseif numnpc = 47:
+	elseif numnpc = 159:
 		'<center><h4><font color="maroon">Petia selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/petia/selfies/'
 		$selfienpc = 'petia'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 59:
+	elseif numnpc = 165:
 		'<center><h4><font color="maroon">Vanya selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/vanya/selfies/'
 		$selfienpc = 'vanya'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 61:
+	elseif numnpc = 189:
 		'<center><h4><font color="maroon">Nikolai selfies</font></h4></center>'
 		$imgloc = 'images/characters/pavlovsk/school/boy/nikolai/selfies/'
 		$selfienpc = 'nikolai'
 		loopmax = 0
 		loopmaxsveta = 0
 		loopmaxsex = 0
-	elseif numnpc = 62:
-		'<center><h4><font color="maroon">Aleksandra selfies</font></h4></center>'
-		$imgloc = 'images/characters/pavlovsk/school/girl/aleksandra/selfies/'
-		$selfienpc = 'aleksandra'
-		loopmax = 0
-		loopmaxsveta = 0
-		loopmaxsex = 0
-	
 	else
-		!! up to 62, based on the "head" folder
+		!! New npcs with selfies should be included above
 	end
 	
 	if loopmax > 0:
@@ -567,11 +586,11 @@ if $ARGS[0] = 'schoolselfies':
 		*nl
 		
 		i = 1
-		:temp_loopschoolselfies
+		:temp_loopselfies
             dynamic '$selfie = <<$selfienpc>>[<<i>>]'
             if $selfie = 1: *p '<a href="exec:view''<<$imgloc>><<i>>.jpg''"><img src="<<$imgloc>><<i>>.jpg"     height="150" /></a>  '
             i += 1
-        if i <= loopmax: jump'temp_loopschoolselfies'
+        if i <= loopmax: jump'temp_loopselfies'
 	end
 	
 	if loopmaxsveta > 0:
@@ -580,11 +599,11 @@ if $ARGS[0] = 'schoolselfies':
 		*nl
 		
 		i = 1
-		:temp_loopschoolselfiessveta
+		:temp_loopselfiessveta
 			dynamic '$selfie = <<$selfienpc>>sveta[<<i>>]'
 			if $selfie = 1: *p '<a href="exec:view''<<$imgloc>>sveta/<<i>>.jpg''"><img src="<<$imgloc>>sveta/<<i>>.jpg"     height="150" /></a>  '
 			i += 1
-		if i <= loopmaxsveta: jump'temp_loopschoolselfiessveta'
+		if i <= loopmaxsveta: jump'temp_loopselfiessveta'
 	end
 	
 	if loopmaxsex > 0:
@@ -593,20 +612,257 @@ if $ARGS[0] = 'schoolselfies':
 		*nl
 		
 		i = 1
-		:temp_loopschoolselfiessex
+		:temp_loopselfiessex
 			dynamic '$selfie = <<$selfienpc>>sex[<<i>>]'
 			if $selfie = 1: *p '<a href="exec:view''<<$imgloc>>sex/<<i>>.jpg''"><img src="<<$imgloc>>sex/<<i>>.jpg"     height="150" /></a>  '
 			i += 1
-		if i <= loopmaxsex: jump'temp_loopschoolselfiessex'
+		if i <= loopmaxsex: jump'temp_loopselfiessex'
 	end
 	
-	act 'Back': gt 'phone_selfies', 'school'
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+
+if $ARGS[0] = 'bathroom':
+	'<center><h4><font color="maroon">Bathroom selfies</font></h4></center>'
+	$phone_loc = 'bathroom'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'bedroom':
+	'<center><h4><font color="maroon">Bedroom selfies</font></h4></center>'
+	$phone_loc = 'bedroom'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'kitchen':
+	'<center><h4><font color="maroon">Kitchen selfies</font></h4></center>'
+	$phone_loc = 'kitchen'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'livingroom':
+	'<center><h4><font color="maroon">Livingroom selfies</font></h4></center>'
+	$phone_loc = 'livingroom'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'changingroom':
+	'<center><h4><font color="maroon">Changingroom selfies</font></h4></center>'
+	$phone_loc = 'changingroom'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'park':
+	'<center><h4><font color="maroon">Park selfies</font></h4></center>'
+	$phone_loc = 'park'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'lockerroom':
+	'<center><h4><font color="maroon">Lockerroom selfies</font></h4></center>'
+	$phone_loc = 'lockerroom'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+		
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'beach':
+	'<center><h4><font color="maroon">Beach selfies</font></h4></center>'
+	$phone_loc = 'beach'
+	clovar = 0
+	$undname = 'bikini'
+	$undnamecap = 'Bikini'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+		
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'gym':
+	'<center><h4><font color="maroon">Gym selfies</font></h4></center>'
+	$phone_loc = 'gym'
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+		
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'dance':
+	'<center><h4><font color="maroon">Dance selfies</font></h4></center>'
+	$phone_loc = 'dance'
+	undvar = 0
+	nudvar = 0
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+		
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'misc':
+	'<center><h4><font color="maroon">Misc selfies</font></h4></center>'
+	$phone_loc = 'dance'
+	undvar = 0
+	nudvar = 0
+	*nl
+	gs 'phone_selfies', 'listretrieve'
+		
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'family':
+	'<center><h4><font color="maroon">Family members</font></h4></center>'
+	gs 'gschool_lessons', 'npc_data'
+	$textgrup = ''
+	count1 = 0
+	i = 1
+	'<center><table cellspacing="3">'
+	:familygruploop	
+		if count1 = 6 : $textgrup += '<tr>'
+
+		if grupTipe[i] = 7 and selfieenable[i] = 1:
+			count1 += 1
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcSelfie[i]
+		end
+		if count1< 6 and grupTipe[i] = 7:
+			$textgrup += '</td>'
+		elseif count1 = 6 and grupTipe[i] = 7:
+			$textgrup +='</td></tr><tr>' & count1 = 0
+		end
+		i += 1
+	if i <= 231:jump 'familygruploop'
+
+	'<<$textgrup>>'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'school':
+	'<center><h4><font color="maroon">School friends</font></h4></center>'
+	gs 'gschool_lessons', 'npc_data'
+	$textgrup = ''
+	count1 = 0
+	i = 1
+	'<center><table cellspacing="3">'
+	:schoolgruploop	
+		if count1 = 6 : $textgrup += '<tr>'
+
+		if (grupTipe[i] = 1 or grupTipe[i] = 2 or grupTipe[i] = 3 or grupTipe[i] = 4 or grupTipe[i] = 5) and selfieenable[i] = 1:
+			count1 += 1
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcSelfie[i]
+		end
+		if count1< 6 and (grupTipe[i] = 1 or grupTipe[i] = 2 or grupTipe[i] = 3 or grupTipe[i] = 4 or grupTipe[i] = 5):
+			$textgrup += '</td>'
+		elseif count1 = 6 and (grupTipe[i] = 1 or grupTipe[i] = 2 or grupTipe[i] = 3 or grupTipe[i] = 4 or grupTipe[i] = 5):
+			$textgrup +='</td></tr><tr>' & count1 = 0
+		end
+		i += 1
+	if i <= 231:jump 'schoolgruploop'
+
+	'<<$textgrup>>'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
+	!gt $loc, $metka
+	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
+end
+
+if $ARGS[0] = 'teacher':
+	'<center><h4><font color="maroon">Teachers</font></h4></center>'
+	gs 'gschool_lessons', 'npc_data'
+	$textgrup = ''
+	count1 = 0
+	i = 1
+	'<center><table cellspacing="3">'
+	:teachergruploop	
+		if count1 = 6 : $textgrup += '<tr>'
+
+		if grupTipe[i] = 6 and selfieenable[i] = 1:
+			count1 += 1
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcSelfie[i]
+		end
+		if count1< 6 and grupTipe[i] = 6:
+			$textgrup += '</td>'
+		elseif count1 = 6 and grupTipe[i] = 6:
+			$textgrup +='</td></tr><tr>' & count1 = 0
+		end
+		i += 1
+	if i <= 231:jump 'teachergruploop'
+
+	'<<$textgrup>>'
+	
+	act 'Back': gt 'phone_selfies', 'selfies'
 	!gt $loc, $metka
 	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
 end
 
 if $ARGS[0] = 'pavlovsk':
 	'<center><h4><font color="maroon">Pavlovsk friends</font></h4></center>'
+	gs 'gschool_lessons', 'npc_data'
+	$textgrup = ''
+	count1 = 0
+	i = 1
+	'<center><table cellspacing="3">'
+	:pavgruploop	
+		if count1 = 6 : $textgrup += '<tr>'
+
+		if grupTipe[i] = 8 and selfieenable[i] = 1:
+			count1 += 1
+			$textgrup += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + $npcSelfie[i]
+		end
+		if count1< 6 and grupTipe[i] = 8:
+			$textgrup += '</td>'
+		elseif count1 = 6 and grupTipe[i] = 8:
+			$textgrup +='</td></tr><tr>' & count1 = 0
+		end
+		i += 1
+	if i <= 231:jump 'pavgruploop'
+
+	'<<$textgrup>>'
 	
 	act 'Back': gt 'phone_selfies', 'selfies'
 	!gt $loc, $metka

+ 2 - 2
locations/postoffice.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'start':
 			act 'Suggest a blowjob in exchange for jumping the queue':
 				*clr & cla
 				menu_off = 1
-				if cumloc[12] = 0 and cumloc[11] = 0:
+				if cumloc[11] = 0:
 					pcs_throat += 1
 					gs 'npcgeneratec', 0, 'stranger', rand(18,45)
 					gs 'boyStat', $npclastgenerated
@@ -106,7 +106,7 @@ if $ARGS[0] = 'start':
 				
 				else
 					'<center><video autoplay loop src="images/locations/shared/postoffice/punch.mp4"></video></center>'						
-					'The Man punches you in the gut and says, <font color="#0D42C0">"Go away bitch, your mouth is full of sperm."</font> You stagger away from the postoffice and spend 2 hours curled up like a ball.'
+					'The Man punches you in the gut and says, <font color="#0D42C0">"Go away bitch, your face is covered in sperm."</font> You stagger away from the postoffice and spend 2 hours curled up like a ball.'
 					minut += 120
 					gs 'pain', 4, 'tummy', 'hit'
 

+ 0 - 3
locations/underwear.qsrc

@@ -10,7 +10,6 @@ if $ARGS[0] = 'dispose':
 end
 
 if $ARGS[0] = 'remove':
-	if $pantyworntype = 'none' and $braworntype = 'none':exit
 	if $pantyworntype = 'none':
 		panty_none = 1
 	else
@@ -26,8 +25,6 @@ end
 if $ARGS[0] = 'wear':
 	if panty_none = 0: gs 'panties', 'wear'
 	if bra_none = 0: gs 'bras', 'wear'
-	panty_none = 0
-	bra_none = 0
 end
 
 if $ARGS[0] = 'dresser':