Merge branch 'master' into dev

locations/Meadow.qsrc

@@ -68,6 +68,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			'In a clearing you see <a href="exec: gt ''Meadow'', ''9''">Mira</a>.'
 		end
 	end
+	
+	act 'Leave':minut += 20 & MiraLoc = 0 & gt 'gadroad'
+	
 	if sunWeather = 1:
 		if pcs_stam >=15 or (pcs_stam >= 10 and bookYog + obruch > 0):
 			if $clothingworntype ! 'exercise' and pcs_inhib < 35 and Miraloc ! 2:
@@ -78,7 +81,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				*nl
 				'Your meadow is a perfect place to do some <a href="exec: gt ''Meadow'', ''workout''">exercises</a>. There is no one around, so you could probably <a href="exec: gs ''clothing'', ''strip'', ''Meadow''& gs ''underwear'', ''remove'' & gt ''Meadow'', ''workout'', ''nude''">exercise nude</a>.'
 				act 'Exercise': gt 'Meadow', 'workout'
-				act 'Exercise nude': gt 'Meadow', 'workout', 'nude'
+				act 'Exercise nude': 
+					gs 'clothing', 'strip', 'Meadow'
+					gs 'underwear', 'remove'
+					gt 'Meadow', 'workout', 'nude'
+				end
 			elseif Miraloc = 2:
 				*nl
 				'It''s a nice day to exercise, but you don''t feel comfortable working out with an audience.'
@@ -93,8 +100,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	else
 		'It''s currently raining. You could do some exercises here if the weather improves..'
 	end
-
-	act 'Leave':minut += 20 & MiraLoc = 0 & gt 'gadroad'
 end
 
 if $ARGS[0] = 'Mira':
@@ -1093,9 +1098,7 @@ if $ARGS[0] = 'workout':
 		end
 		clothesAtLocation = FUNC('lost_clothes_here','Meadow')
 		gs 'clothing', 'strip', $sportloc
-		gs 'arousal', 'voyeur', 15, 'exhibitionism'
-		gs 'arousal', 'end'
-		minut -= 15
+		gs 'exhibitionism', 3
 		gs 'stat'
 		act 'Continue': gt 'exercise', 'workout'
 	else

locations/bed2.qsrc

@@ -525,7 +525,7 @@ if $ARGS[0] = 'extra':
 		menu_off = 1
 		slept_in = 1
 		stime = 0
-		minut = (100-pcs_sleep)*6
+		minut += (100-pcs_sleep)*6
 		pcs_sleep += 100
 		gs 'stat'
 		gt 'bed2', 'dream'

locations/din_van.qsrc

@@ -89,7 +89,7 @@ $shower = {
 			'<b>You notice that your muscles are starting to show through your skin.</b>'
 			act 'Examine yourself closer while drying off and getting dressed...': gt 'din_van', 'buffpick'
 		end
-		
+
 		if lactation['active'] > 0 and pain['nipples'] < 60 and lactation['pc_aware'] <= 0:
 			if pcs_usedbreastpumponherself > 0 and pcs_massagedherbreasts <= 0:
 				'During showering you clean your breasts and something catches your eye. White drops come from your nipples. It is milk.<br>Using the breast pump regularily probably made you lactate!'
@@ -142,12 +142,12 @@ $shower = {
 				dynamic $dryOff
 			end
 		end
-		
+
 		act 'Take a selfie':
 			gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
 		end
 		dynamic $brit
-		
+
 		if vanr_lock = 0 and $loc = 'vanrPar':
 			*nl
 			'In your absentmindedness you forgot to close the door.'
@@ -178,7 +178,7 @@ $bath = {
 			bath_daystart = daystart
 			pcs_skin += rand(1,2)
 		end
-		
+
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash4.jpg"></center>'
 		*nl
@@ -228,7 +228,7 @@ $bath = {
 			gs 'arousal', 'end'
 			dynamic $dryOff
 		end
-		
+
 		act 'Take a selfie':
 			gs 'telefon', 'Phone_selfie_image_bathing', 'bath'
 		end
@@ -396,12 +396,12 @@ $brit = {
 
 $tampon = {
 	if sanpad > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprokp = 0 and isprok = 0 and $pantyworntype ! 'none' and knowpreg = 0:
-		act 'Use a sanitary pad (0:05)':
+		act 'Use a sanitary pad (0:02)':
 			menu_off = 1
 			*clr & cla
 			sanpad -= 1
 			isprokp = 1
-			minut += 5
+			minut += 2
 			pcs_mood -= 5
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
 			*nl
@@ -410,12 +410,12 @@ $tampon = {
 		end
 	end
 	if tampon > 0 and (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0:
-		act 'Use a tampon (0:05)':
+		act 'Use a tampon (0:02)':
 			menu_off = 1
 			*clr & cla
 			tampon -= 1
 			isprok = 1
-			minut += 5
+			minut += 2
 			pcs_mood -= 5
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
 			*nl
@@ -452,7 +452,7 @@ $quickwash = {
 
 $wearpan = {
 	if $pantyworntype = 'none':
-		act 'Wear panties (0:02)': 
+		act 'Wear panties (0:02)':
 			minut += 2
 			gs 'stat'
 			gt 'panties', 'view_panty_list', 'bathroom'
@@ -460,7 +460,7 @@ $wearpan = {
 	end
 
 	if $braworntype = 'none':
-		act 'Wear a bra (0:02)': 
+		act 'Wear a bra (0:02)':
 			minut += 2
 			gs 'stat'
 			gt 'bras', 'view_bra_list', 'bathroom'
@@ -512,7 +512,7 @@ $basin = {
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
-	
+
 	if cumloc[13] = 1:
 		act 'Wash the cum from your hands (0:05)':
 			menu_off = 1
@@ -527,7 +527,7 @@ $basin = {
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
-		
+
 	if cumloc[11] = 1 and cumloc[16] = 0:
 		act 'Wash the cum from your face (0:05)':
 			menu_off = 1
@@ -583,7 +583,7 @@ $basin = {
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
-	
+
 	if cumloc[2] = 1 or cumloc[5] = 1 or cumloc[6] = 1 or cumloc[7] = 1:
 		act 'Wash the cum off your clothes (0:10)':
 			menu_off = 1
@@ -600,7 +600,7 @@ $basin = {
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
-	
+
 	if body_write > 0 or face_write > 0:
 		act 'Wash the writings off your body (0:10)':
 			menu_off = 1
@@ -997,9 +997,9 @@ if $ARGS[0] = 'private':
 
 	act 'Change clothes and toys':
 		cla
-		
+
 		act 'Return':menu_off = 0 & gt $loc, $metka
-		
+
 		dynamic $wearpan
 		dynamic $removepan
 
@@ -1102,7 +1102,7 @@ if $ARGS[0] = 'private':
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
-	
+
 	!!breast pump is now in the menu, not on the screen
 	if breastpump > 0 and bp_unbox >= 1:
 		act 'Use breast pump':
@@ -1247,7 +1247,7 @@ if $ARGS[0] = 'ArousedReact1':
 			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'
 			'The taboo knowledge that you could have gotten pregnant from incest turns you on even more.'
 		else
-			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'	
+			'You pick up speed as you recall willingly allowing yourself to be pumped full of all of that wonderful semen. Knowing that you would get pregnant filled you with joy every time someone shot rope after rope of their baby batter into you.'
 		end
 		'After several minutes of this you orgasm hard. You spend a moment panting before cleaning up and straightening your clothes. Once you''ve freshened up, you move on with your day, still aroused.'
 	act 'Finish' :menu_off = 0 & gt $loc, $metka
@@ -1282,9 +1282,10 @@ end
 
 !!Private bathrooms: One of these text should be randomly selected if using a private restroom, such as one in a home.
 if $ARGS[0] = 'prvt_pee':
-	act 'Go pee':
+	act 'Go pee (0:04)':
 		*clr & cla
 		menu_off = 1
+		minut += 4
 		'<center><img <<$set_imgh>> src="images/pc/pee/pee-private/' + rand(1,19) + '.jpg"></center>'
 		!!Get random pee-private picture
 		rand_pee = rand(0,7)
@@ -1309,8 +1310,9 @@ if $ARGS[0] = 'prvt_pee':
 !!If PC is on her period and using tampon, then the following options should appear as well as the standard "Finish and wipe" act:
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry tampons with them.
 		if isprok = 1 and tampon > 0:
-			act 'Change tampon':
+			act 'Change tampon (0:02)':
 				*clr & cla
+				minut += 2
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 				'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into you.'
 
@@ -1320,8 +1322,9 @@ if $ARGS[0] = 'prvt_pee':
 !!If PC is on her period and using pad, then the following options should appear as well as the standard "Finish and wipe" act:
 !!This may require an addition check to see if the PC has a purse since I think they need that to carry pads with them.
 		if isprokp = 1 and sanpad > 0:
-			act 'Change pad':
+			act 'Change pad (0:02)':
 				*clr & cla
+				minut += 2
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 				'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 
@@ -1351,10 +1354,11 @@ if $ARGS[0] = 'prvt_pee_end':
 end
 
 !!Public bathrooms: These texts should be randomly selected if using a public restroom
-if $ARGS[0] = 'pblc_pee':	
-	act 'Go pee':
+if $ARGS[0] = 'pblc_pee':
+	act 'Go pee (0:04)':
 		*clr & cla
 		menu_off = 1
+		minut += 4
 		'<center><img <<$set_imgh>> src="images/pc/pee/pee-public/' + rand(1,11) + '.jpg"></center>'
 		rand_pee = rand(0,7)
 		if rand_pee = 0:
@@ -1422,8 +1426,9 @@ if $ARGS[0] = 'pblc_pee':
 		end
 
 		if mesec > 0 and (isprok = 1 or (isprok = 0 and isprokp = 0)) and tampon > 0 and bag = 1:
-			act 'Change tampon':
+			act 'Change tampon (0:02)':
 				*clr & cla
+				minut += 2
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/tampon/' + rand(1,12) + '.jpg"></center>'
 				'Reaching down and taking the string between your fingers, you slowly pull the used tampon from your vagina. You wrap it in toilet paper to be thrown in the trash bin. Opening your purse, you retrieve a fresh one before unpackaging it and carefully inserting it into you.'
 
@@ -1432,8 +1437,9 @@ if $ARGS[0] = 'pblc_pee':
 		end
 
 		if mesec > 0 and (isprokp = 1 or (isprok = 0 and isprokp = 0)) and sanpad > 0 and bag = 1:
-			act 'Change pad':
+			act 'Change pad (0:02)':
 				*clr & cla
+				minut += 2
 				'<center><img <<$set_imgh>> src="images/pc/pee/period/pad/' + rand(1,6) + '.jpg"></center>'
 				'Checking your pad, you decide it''s time for a new one. You carefully peel it off of your panties before folding it into thirds and setting it aside to be thrown away. Digging in your bag, you pull out a fresh pad, unpackage it, peel off the adhesive strip, and place it into your underwear. Finally, you wrap the wings around the sides of the gusset to make sure it is nice and secure.'
 
@@ -1581,7 +1587,7 @@ if $ARGS[0] = 'shave_options':
 	*nl
 	'<center>Your current routine <<$shave_chosen>> <br><<$shave_time>></center>'
 	'</table></center>'
-	
+
 	act 'Return':menu_off = 0 & gt $loc, $metka
 	act 'Set image height for this view':
 		shave_img_hgt = input("Enter height in pixels you want for images on this page<br>(default 100, min 50, max 500)")

locations/gadforestlost.qsrc

@@ -26,7 +26,8 @@ if $ARGS[0] = 'forestrescue':
 	'Suddenly you spot a man dressed as a forest ranger.'
 	'He walks up to you and says, "And here is our lost girl. Your grandfather and grandmother are very worried about you. They asked me to help find you. Follow me, I will take you home."'
 
-	!rescued during rest
+	!rescued during rest 
+	!is this possible? isn''t $loc = 'gadforestlost' ??? (julzor)
 	if $loc = 'gadforestrelax':
 		!have fire
 		if bonfire = 1:
@@ -119,8 +120,7 @@ if $ARGS[0] = '2':
 	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
 
 	act 'Look for the road':
-		cla
-		*clr
+		*clr & cla
 		menu_off = 1
 		minut += 60
 		pcs_mood -= 5
@@ -163,8 +163,7 @@ if $ARGS[0] = '3':
 	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
 
 	act 'Look for the road':
-		cla
-		*clr
+		*clr & cla
 		menu_off = 1
 		minut += 60
 		pcs_mood -= 5
@@ -198,9 +197,7 @@ if $ARGS[0] = '4':
 	gs 'gadukino_event', 'sound'
 	gs'stat'
 
-	cla
-	*clr
-
+	*clr & cla
 
 	wolfrand = rand(1,10)
 	huntrand = rand(1,10)
@@ -212,8 +209,7 @@ if $ARGS[0] = '4':
 	if huntrand = 1 and hour > 8 and hour < 20 :forest_lost = 1 & gt 'gadforest_event', 'forest_hunters'
 
 	act 'Look for the road':
-		cla
-		*clr
+		*clr & cla
 		menu_off = 1
 		minut += 60
 		pcs_mood -= 5
@@ -224,7 +220,7 @@ if $ARGS[0] = '4':
 
 		gs 'gadforestlost', 'lostclothes'
 		act 'Continue looking for the road':
-			if goforest > lostrand: gs 'gadforestlost', 'gadforestlostfinish4'
+			if goforest >= lostrand: gs 'gadforestlost', 'gadforestlostfinish4'
 			if goforest < lostrand and temp > 7:gt 'gadforestswamp','1'
 			if goforest < lostrand and temp <= 7:gt 'gadforestlost','4'
 		end
@@ -289,8 +285,7 @@ if $ARGS[0] = 'gadforestlostfinish':
 end
 
 if $ARGS[0] = 'gadforestlostfinish1':
-	cls
-	*clr
+	*clr & cla
 	menu_off = 1
 	temp = RAND(1,3)
 	lost = 0
@@ -302,12 +297,10 @@ if $ARGS[0] = 'gadforestlostfinish1':
 	if temp = 1:act 'Leave the woods':minut += 15 & gt'gadforest','1'
 	if temp = 2:act 'Leave the woods':minut += 15 & gt'gadfield','field'
 	if temp = 3:act 'Leave the woods':minut += 15 & gt'gadroad'
-
 end
 
 if $ARGS[0] = 'gadforestlostfinish2':
-	cls
-	*clr
+	*clr & cla
 	menu_off = 1
 	temp = RAND(1,5)
 	lost = 0
@@ -324,8 +317,7 @@ if $ARGS[0] = 'gadforestlostfinish2':
 end
 
 if $ARGS[0] = 'gadforestlostfinish3':
-	cls
-	*clr
+	*clr & cla
 	menu_off = 1
 	temp = RAND(1,7)
 	lost = 0
@@ -344,8 +336,7 @@ if $ARGS[0] = 'gadforestlostfinish3':
 end
 
 if $ARGS[0] = 'gadforestlostfinish4':
-	cls
-	*clr
+	*clr & cla
 	menu_off = 1
 	temp = RAND(1,9)
 	lost = 0
@@ -369,8 +360,7 @@ end
 if $ARGS[0] = 'searchfood':
 	if hour >= 6 and hour <= 20 and month >= 6 and month <= 9 and boletus + bilberry < 10:
 		act 'Look for mushrooms and berries':
-			cla
-			*clr
+			*clr & cla
 			menu_off = 1
 			minut += 30
 			new_boletus += rand(1,2)

locations/gopsex.qsrc

@@ -176,7 +176,7 @@ if $ARGS[0] = 'gopsex_select':
 			gs 'gopsex', 'shgopsex'
 		end
 	end
-	if week < 6 and hour >= 0 and hour < 3:
+	if week < 5 and hour >= 20:
 		act 'Have sex with Dan': 
 			if shgopsex_den_count <= 0:
 				cla

locations/gschool_chats1.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = 'dimka':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if dimka_debt > 0:
 		'As you walk up the first thing Dimka says is. "Do you have my money?"'
@@ -14,7 +14,7 @@ if $ARGS[0] = 'dimka':
 				money -= dimka_debt
 				dimka_debt = 0
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 				'You nod your head and dig in your purse, pulling out enough money, you hand it over to him. He takes his time slowly counting it out, then nods as it seems to all be their. You briefly talk back and forth, as he puts the money away.'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 				if dimarudorient = 1: act 'Ask for some pale lady': gt 'gschool_chats1', 'dim_drugs' 
@@ -71,7 +71,7 @@ end
 
 if $ARGS[0] = 'dim_drugs':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 	'You don''t want to but the you feel miserable and everything hurts, you crave the rush that you''ve come to enjoy so much'
 	'"Please Dimka, can I have some pale lady?"'
 	'He smiles at you with a smug knowing smile. "Sure do you have any money?"'
@@ -168,7 +168,7 @@ if $ARGS[0] = 'igor':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
 	if IgorloverQW > 0:
@@ -176,7 +176,7 @@ if $ARGS[0] = 'igor':
 		'When Igor sees you, his face lights up and he smiles warmly. "I was hoping I''d see you. I, uh, kinda missed you..." he says shyly, and it makes you giggle. While you talk with each other, his warm hand finds yours. You remain holding hands and chatting until break is over, with a smile you give him a quick kiss goodbye.'
 		act 'Help with homework':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 			'Igor is almost offended that you''d even have to ask that. "What kind of boyfriend would I be if I didn''t help my girlfriend?" he chuckles. "Of course I''ll help you."'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
@@ -185,17 +185,17 @@ if $ARGS[0] = 'igor':
 			act 'Tease him':
 				*clr & cla
 				npc_rel['A4'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				'You decide to tease Igor a little bit. "I hope you''re not too sore after last time," You whisper with a smirk. Igor''s cheeks flush pink as he looks around nervously, hoping no one overheard.'
 				act 'Just chat':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 					'You don''t press it anymore and start talking to him about a variety of topics.'
 					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 				end
 				act 'Tell him you have a surprise':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 					'You keep whispering in his ear. "I want to fuck you right now." He gives you a shocked look and then you open up your purse and show him your strapon nestled inside, which makes him blush even more.'
 					'"What if we get caught?" He sounds scared and excited at the same time.'
 					'You pat him on the cheek. "Trust me, I know a place and no one will ever find out." He thinks on it for a moment and then finally nods.'
@@ -203,7 +203,7 @@ if $ARGS[0] = 'igor':
 				end
 				act 'Help with homework':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 					'"Oh... yeah I can help you with your homework..." Igor smiles but glances down and shuffles a bit restlessly.'
 					'You smirk and lean in closer. "Don''t look so disappointed. Who knows, the quicker we finish with that, the more time we have for <i>other</i> things."'
 					'Hearing this, Igor''s eyes widen and his cheeks flush as he tries to play it cool, but you notice how he''s suddenly more excited.'
@@ -218,7 +218,7 @@ if $ARGS[0] = 'igor':
 			'"Oh, it''s not that weird," Igor blushes a bit. "I have a sister so I hear about these things all the time..."'
 			act 'Help with homework':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				'Igor''s face lights up. "Yeah, of course I''ll help you."'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
@@ -226,7 +226,7 @@ if $ARGS[0] = 'igor':
 			'As usual, Igor is hanging around Dimka but with you here, Igor pays closer attention to you. With a smile, he asks you how your day has been so far and before long you''re talking about all kinds of things, even taking an interest in the more "girly" topics.'
 			act 'Help with homework':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				'"Oh, you need my help?" Igor asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I''ll help you."'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
@@ -237,7 +237,7 @@ if $ARGS[0] = 'igor':
 			'The conversation feels forced as Igor does little to keep talking to you. You get the feeling he''s just doing this as a courtesy since you''re in the same clique.'
 			act 'Help with homework':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				'Igor hesitates, making the whole encounter extremely awkward. "I would... but I can''t. I''ve got... other things I need to do."'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
@@ -246,7 +246,7 @@ if $ARGS[0] = 'igor':
 			'"Uh, hello?" Igor is unamused to see you and completely ignores you as you try to keep a one-sided conversation going. Eventually he just walks away without saying a word.'
 			act 'Help with homework':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 				'"No," Igor says flatly as he slams his locker closed and walks away.'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
@@ -255,7 +255,7 @@ if $ARGS[0] = 'igor':
 		'Igor is hanging with Dimka, Stasya and Albina when you approach. The others are quick to throw some insults your way, but Igor hesitates. It isn''t until Stasya puts him on the spot for being so silent that he finally speaks up to agree with the rest of the group. "I''m surprised the gopniks are finished with her so early. Must have had another cocksleeve waiting for them, or maybe she''s just gotten too loose."'
 		act 'Help with homework':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 			'Igor can''t help but laugh a bit at your request. "Of course you''re behind on your work. Maybe if you spent less time whoring around..." He doesn''t finish the sentence before walking away with a look of disgust.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
@@ -266,7 +266,7 @@ if $ARGS[0] = 'igor':
 		'The two of you spend some time chatting while he waits for Dimka. Eventually he shows up, and Igor is ready to leave. "Maybe we can talk some other time?" he says with a small smile as he waves goodbye.'
 		act 'Help with homework':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 			'Igor smiles apologetically. "I would but I''ve kinda got my hands full at the moment. Maybe some other time?"'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
@@ -309,7 +309,7 @@ if $ARGS[0] = 'igor_peg':
 					gs 'stat'
 					act 'Clean up':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big4.jpg"></center>'
 						'Feeling better and knowing he feels better. You give him a few last hard deep thrusts before pulling out of him. You take the harness off and clean up the dildo before putting them back in your purse. Then you both get dressed, just as you both finish getting dressed the bell rings for next class. You slap him on the ass which makes him yelp a little, as you walk out of the class room with him. "Talk to you later Igor." You say to him with a wink.'
 						'He blushes and nods, as he replies. "Talk to you later <<$pcs_nickname>>." With that you both hurry to your next class.'
 						act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -324,7 +324,7 @@ if $ARGS[0] = 'katja':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 	if KatjaOTN > 0:
 		if KatjaHorny < 20:
 			'Katja looks calm and stoic.'
@@ -372,7 +372,7 @@ if $ARGS[0] = 'katja':
 			meynoldQW = 2
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 			'You approach Katja and thank her for taking you home from the disco when you were drunk, the other night. Katja gives you a knowing smile and says: "Don''t mention it, <<$pcs_nickname>>! You really shouldn''t get that drunk at the disco though, that could end badly. Some of the guys there are real pigs..." she says. "Do you want to hang out after school? We could do our homework together."'
 			'"Sure, why not," you reply.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -384,7 +384,7 @@ if $ARGS[0] = 'katja':
 			pcs_hairbsh = 1
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 			'Katja happily grins as she quickly straightens your hair: "What do you want? A light touch-up, some normal make-up or shall I just shovel it on?"'
 			act 'Light touch-up':
 				cla
@@ -419,7 +419,7 @@ if $ARGS[0] = 'katja':
 				artemIzdev = 1
 				gs 'stat'
 				'<center><b><font color = maroon><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 				'You make sure no one else is paying attention, and tell Katja about what Artem and Petka are doing to you on Mondays. At first she doesn''t believe you. After a while, all of the nasty details you''re sharing convince her that there is no way you''re making this up. Katja is shocked!'
 				'You tell her that the only way you have thought of to get rid of their blackmailing, is to get blackmailing material of your own. Katja nods and says: "That makes sense, actually... if you could somehow make it look violent, I bet it would work even better! I don''t know where you would be able to find a tiny camera though... maybe Albina can help you?"'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -438,7 +438,7 @@ if $ARGS[0] = 'katja':
 				else
 					*clr & cla
 					'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/14.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big14.jpg"></center>'
 					'You slowly lean in towards Katja to kiss her. Unable to resist, Katja almost closing her eyes, slowly opening her mouth, leans in and meets your kiss.'
 					gs 'katjaEv', 'kiss_events'
 				end
@@ -460,7 +460,7 @@ if $ARGS[0] = 'albina':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/23.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
 	if albinaQWdance > 0 and AlbinaBlokDance = 0 and ZvezdEnd = 0:
 		'Albina offers you a friendly smile and says: "<<$pcs_nickname>>, you''re progressing very well in your training. Don''t forget to keep attending!"'
 	end
@@ -513,7 +513,7 @@ if $ARGS[0] = 'lizaveta':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/31.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big140.jpg"></center>'
 	if npc_rel['A140'] >= 50 and pav_slut < 125:
 		npc_rel['A140'] += 1
 		if grupTipe = 1:
@@ -546,7 +546,7 @@ end
 
 if $ARGS[0] = 'latest_gossip':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/31.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big140.jpg"></center>'
 	'"So Lizaveta hear any good gossip of late?"'
 	'As you ask that her face lights up and she leans in close like she has the best secret in the world to share with you. "Oh my god yes! I was... well it doesn''t matter what I was doing but I overheard some others talking and they said..."'
 	gs 'gschool_gossip', 'Lizaveta'
@@ -557,7 +557,7 @@ if $ARGS[0] = 'marcus':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/27.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big146.jpg"></center>'
 	if npc_rel['A146'] >= 50 and pav_slut < 125:
 		npc_rel['A146'] += 1
 		if grupTipe = 1:
@@ -591,7 +591,7 @@ if $ARGS[0] = 'andrey':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/28.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big147.jpg"></center>'
 	if npc_rel['A147'] >= 50 and pav_slut < 125:
 		npc_rel['A147'] += 1
 		if grupTipe = 1:
@@ -625,7 +625,7 @@ if $ARGS[0] = 'mefodiy':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/29.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big148.jpg"></center>'
 	if npc_rel['A148'] >= 50 and pav_slut < 125:
 		npc_rel['A148'] += 1
 		if grupTipe = 1:
@@ -657,7 +657,7 @@ if $ARGS[0] = 'viktoria':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/15.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big15.jpg"></center>'
 		
 	if npc_rel['A15'] >= 50 and pav_slut < 125:
 		npc_rel['A15'] += 1
@@ -695,7 +695,7 @@ if $ARGS[0] = 'stasya':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/30.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big139.jpg"></center>'
 	if npc_rel['A139'] >= 50 and pav_slut < 125:
 		npc_rel['A139'] += 1
 		if grupTipe = 1:
@@ -728,7 +728,7 @@ if $ARGS[0] = 'irina':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/17.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big17.jpg"></center>'
 	if npc_rel['A17'] >= 50 and pav_slut < 125:
 		npc_rel['A17'] += 1
 		if grupTipe = 1:
@@ -822,7 +822,7 @@ if $ARGS[0] = 'lazar':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/32.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 	if npc_rel['A149'] >= 50 and pav_slut < 125:
 		npc_rel['A149'] += 1
 		if grupTipe = 2:
@@ -868,7 +868,7 @@ if $ARGS[0] = 'svyatoslav':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/8.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big8.jpg"></center>'
 	if npc_rel['A8'] >= 50 and pav_slut < 125:
 		npc_rel['A8'] += 1
 		if grupTipe = 2:
@@ -908,7 +908,7 @@ if $ARGS[0] = 'vanya':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/59.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big165.jpg"></center>'
 	if npc_rel['A165'] >= 50 and pav_slut < 125:
 		npc_rel['A165'] += 1
 		if grupTipe = 2:
@@ -959,7 +959,7 @@ if $ARGS[0] = 'erast':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/33.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big150.jpg"></center>'
 	if npc_rel['A150'] >= 50 and pav_slut < 125:
 		npc_rel['A150'] += 1
 		if grupTipe = 2:
@@ -1002,7 +1002,7 @@ if $ARGS[0] = 'christina':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"></center>' 
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big18.jpg"></center>' 
 	if zverRageQW = 10:
 		'As you pass by Christina, she looks at you triumphantly, "Don''t forget my little slave, showers after the gym class..."'
 		'Before you''re able to respond she turns around and walks away...'
@@ -1060,7 +1060,7 @@ if $ARGS[0] = 'bella':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/22.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big22.jpg"></center>'
 	if npc_rel['A22'] >= 50 and pav_slut < 125:
 		npc_rel['A22'] += 1
 		if grupTipe = 2:
@@ -1100,7 +1100,7 @@ if $ARGS[0] = 'veronika':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/34.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big141.jpg"></center>'
 	if npc_rel['A141'] >= 50 and pav_slut < 125:
 		npc_rel['A141'] += 1
 		if grupTipe = 2:
@@ -1144,7 +1144,7 @@ if $ARGS[0] = 'lina':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/19.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big19.jpg"></center>'
 	if npc_rel['A19'] >= 50 and pav_slut < 125:
 		npc_rel['A19'] += 1
 		if grupTipe = 2:
@@ -1184,7 +1184,7 @@ if $ARGS[0] = 'lariska':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/13.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big13.jpg"></center>'
 	if lariskaHelp = -1:
 		'She looks at you rejectingly, and softly says: "Leave me alone, <<$pcs_nickname>>. I want nothing to do with you any more."'
 	elseif npc_rel['A13'] >= 50 and pav_slut < 125:
@@ -1240,7 +1240,7 @@ if $ARGS[0] = 'ivan':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/3.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big3.jpg"></center>'
 	if pav_slut < 125 and IvanShowerQW = 1:
 		IvanShowerQW = 11
 		'Ivan thinks for a moment, before he says: "<<$pcs_nickname>>, I would like to talk to you about what happened in the shower. You''re a great girl, and I had a great time, but I''m not ready for a relationship. I need to put all my energy into my athletics, I think I have a good shot at getting to the Russian National Championships this year. I really cannot afford to be distracted by girls, even girls as attractive as you. So how about we just stick to fooling around a little?"'

locations/gschool_grounds.qsrc

@@ -34,8 +34,8 @@ if $ARGS[0] = 'main':
 		killvar 'InvitationToDimkaNYparty'
 		act 'Follow Dimka to his home at the New Year party':  minut += 30 & gt 'sny', '3'
 	end
-	
-	if week < 6 and hour = 14 and kanikuli = 0 and afterschool_day ! daystart:		
+
+	if week < 6 and hour = 14 and kanikuli = 0 and afterschool_day ! daystart:
 		afterschool_day = daystart
 		if rand(0,3) = 0:
 			$eventtype = 'after_school'
@@ -44,36 +44,36 @@ if $ARGS[0] = 'main':
 			gt 'gschool_events', 'afterschool_events'
 		end
 	end
-	
+
 	if hour <= 8 and kanikuli = 6:
 		'Today is graduation day! The school prom is tonight as well.'
 
 		act 'Go to your graduation':
 			*clr & cla
 			menu_off = 1
-            hour = 10
+			hour = 10
 			minut = 0
 			SchoolAtestat = 1
 			kanikuli = 7
 			gs 'stat'
-            
-            if ParHomeBlock = 1:
-                'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. Nobody from your family showed up.'
-            else
-                'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. You turn your head and see your mother and your brother sitting among them.'
-            end
-            
+
+			if ParHomeBlock = 1:
+				'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. Nobody from your family showed up.'
+			else
+				'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. You turn your head and see your mother and your brother sitting among them.'
+			end
+
 			'Your Principial begins calling your classmates in alphabetical order. Finally it''s your turn.'
-            
-            if pcs_grades >= 90:
-                'You go up to the podium. As the Principal shakes your hand she announces "As every year I''d like to honor our best student of the year. Miss <<$pcs_lastname>> here performed exceptionally well in her studies and I think that deserves some recognition." She starts applaude and the auditorium quickly joins in the applause.'
-                if ParHomeBlock = 0:'As you return to your place you see your mother smiling brightly.'
-            elseif pcs_grades >= 70:
-                'You go up to the podium. The Principal shakes your hand and gives you your diploma. "Well done, Miss <<$pcs_lastname>>!" she says before you return to your place.'
-            else
-                'You go up to the podium. The Principal shakes your hand and gives you your diploma and you return to your place.'
-            end
-            
+
+			if pcs_grades >= 90:
+				'You go up to the podium. As the Principal shakes your hand she announces "As every year I''d like to honor our best student of the year. Miss <<$pcs_lastname>> here performed exceptionally well in her studies and I think that deserves some recognition." She starts applaude and the auditorium quickly joins in the applause.'
+				if ParHomeBlock = 0:'As you return to your place you see your mother smiling brightly.'
+			elseif pcs_grades >= 70:
+				'You go up to the podium. The Principal shakes your hand and gives you your diploma. "Well done, Miss <<$pcs_lastname>>!" she says before you return to your place.'
+			else
+				'You go up to the podium. The Principal shakes your hand and gives you your diploma and you return to your place.'
+			end
+
 			act 'Return to town': minut += 2 & gt 'pavResidential'
 
 			act 'Go to the prom party':
@@ -93,7 +93,7 @@ if $ARGS[0] = 'main':
 	exit
 	end
 
-    if SchoolAtestat = -1 and week < 6 and hour >= 6 and hour < 14:
+	if SchoolAtestat = -1 and week < 6 and hour >= 6 and hour < 14:
 		act 'Get your diploma':
 			*clr & cla
 			menu_off = 1
@@ -103,14 +103,14 @@ if $ARGS[0] = 'main':
 			gs 'stat'
 			if pcs_grades >= 70:
 				'The Principal hands you your diploma. "Well done, Miss <<$pcs_lastname>>! Good luck in your future!" she says as she shakes your hand.'
-			else 
+			else
 				'The Principal hands you your diploma. "Good luck in your future!" she says as she shakes your hand.'
 			end
-				
-			act 'Return to town': minut += 2 & gt 'pavResidential'    
-        end
-    end
-    
+
+			act 'Return to town': minut += 2 & gt 'pavResidential'
+		end
+	end
+
 !!	act 'Go to old school building': gt
 
 !!	act 'Go to the Principals Office': gt
@@ -158,11 +158,11 @@ if $ARGS[0] = 'main':
 	end
 
 	act 'Return to town': minut += 2 & gt 'pavResidential'
-	
+
 	act 'Go to the sports field': minut += 1 & gt 'gschool_grounds', 'sports'
 
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint behind the school building': gs 'drugs', 'joint' & gt $loc, $metka
-	
+
 	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and schoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
 
 	if zverRageQW = 1:gt 'gschool_grounds', 'KristinaFight'
@@ -170,35 +170,35 @@ if $ARGS[0] = 'main':
 	if week < 6 and hour = 14 and dimaRevenge = 5 and dimaRevChoice = 0:
 		gt 'dimaRevenge', dimaRevenge
 	elseif week < 6 and hour = 14 and dimaRevenge = 4 and dimaRevChoice = 1:
-		gt 'dimaRevenge', dimaRevenge	
+		gt 'dimaRevenge', dimaRevenge
 	elseif week < 6 and hour = 7 and dimaRevenge = 5 and dimaRevChoice = 1:
 		gt 'dimaRevenge', 5, 'before'
 	elseif week < 6 and hour = 7 and dimaRevenge = 6 and dimaRevChoice = 1:
-		gt 'dimaRevenge', 6, 'before'	
+		gt 'dimaRevenge', 6, 'before'
 	elseif week < 6 and hour = 14 and dimaRevenge = 7 and dimaRevChoice = 1:
-		gt 'dimaRevenge', dimaRevenge		
+		gt 'dimaRevenge', dimaRevenge
 	elseif week < 6 and hour = 7 and dimaRevenge = 4 and dimaRevChoice = 2:
 		gt 'dimaRevenge', dimaRevenge, 'day4jockbefore'
 	elseif week < 6 and hour = 7 and dimaRevenge = 5 and dimaRevChoice = 2:
-		gt 'dimaRevenge', dimaRevenge, 'day5jockbefore'		
+		gt 'dimaRevenge', dimaRevenge, 'day5jockbefore'
 	elseif week < 6 and hour = 14 and dimaRevenge = 6 and dimaRevChoice = 2:
 		gt 'dimaRevenge', 5, 'day5jockafter'
-	!elseif week < 6 and hour = 11 and dimaRevenge = 4 and  dimaRevChoice = 3:
-	!    gt 'gschool_lessons', 'short_break'	
+	!elseif week < 6 and hour = 11 and dimaRevenge = 4 and	dimaRevChoice = 3:
+	!	 gt 'gschool_lessons', 'short_break'
 	elseif week < 6 and hour = 7 and dimaRevenge = 5 and  dimaRevChoice = 3:
-	    gt 'dimaRevenge', dimaRevenge	
+		gt 'dimaRevenge', dimaRevenge
 	elseif week < 6 and hour = 14 and dimaRevenge = 4 and dimaRevChoice = 4:
 		gt 'dimaRevenge', dimaRevenge, 'after'
 	elseif week < 6 and hour = 7 and dimaRevenge = 5 and dimaRevChoice = 4:
-		gt 'dimaRevenge', dimaRevenge, 	'before'
+		gt 'dimaRevenge', dimaRevenge,	'before'
 	elseif week < 6 and hour = 14 and dimaRevenge = 6 and dimaRevChoice = 4:
-		gt 'dimaRevenge', 5, 'after'	
+		gt 'dimaRevenge', 5, 'after'
 	elseif week < 6 and hour = 7 and dimaRevenge = 7 and dimaRevChoice = 4:
-		gt 'dimaRevenge', 6	
+		gt 'dimaRevenge', 6
 	elseif week < 6 and hour = 7 and dimaRevenge = 5 and dimaRevChoice = 5:
 		gt 'dimaRevenge', dimaRevenge, 'before'
 	elseif week < 6 and hour = 7 and dimaRevenge = 4 and dimaRevChoice = 5:
-		gt 'dimaRevenge', 5	
+		gt 'dimaRevenge', 5
 	elseif week < 6 and hour = 7 and dimaRevenge = 4 and dimaRevChoice = 6:
 		gt 'dimaRevenge', dimaRevenge
 	end
@@ -215,7 +215,7 @@ if $ARGS[0] = 'main':
 			elseif NikoVolkovQW = 5 and NikoEv = 6 and NikoDate = 0:
 				gt 'NikoDates', 'After School'
 			elseif NikoVolkovQW = 5 and NikoEv = 8 and NikoDate = 0:
-				gt 'NikoDates', 'After School 2'		
+				gt 'NikoDates', 'After School 2'
 			elseif (NikoVolkovQW = 5 and NikoDate = 1) or NikoEv = 11:
 				'You can see <a href="exec:gt ''NikoEv'', ''Niko Dates''">Nikolai Volkov</a> smoking outside of the school.'
 			elseif NikoVolkovQW = 10 and NikoEv >= 17 and NikoEv <= 20:
@@ -224,7 +224,7 @@ if $ARGS[0] = 'main':
 				gt 'NikoEv2', 'Recovery'
 			end
 		end
-		
+
 		if ivan_afterschool = 1: act 'Meet Ivan after school': gt 'gschool_sex', 'afterschool'
 
 		if LinaSlut > 0 and rand(1,10) < 3:'You see Lina, Dan and Vasily leaving the school together.'
@@ -252,7 +252,7 @@ if $ARGS[0] = 'main':
 				'You can see <a href="exec:gt ''FedorEv'', ''Start''">Fedor</a> with his backpack around his arm, standing by himself.'
 			end
 		else
-			!display friends in table if switch is on. 
+			!display friends in table if switch is on.
 			st_count=0 & $show_table=''
 			if LariskaHomeIn > 0:gs'show_table','<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>','5'
 			if JuliaMilLernQW >= 1:gs'show_table','<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milov</a>','5'
@@ -280,7 +280,7 @@ if $ARGS[0] = 'main':
 			end
 		end
 		if albinaCarday ! daystart and AlbFrend >= 1 and albrideday ! daystart:'<a href="exec:minut += 15 & gt ''albinaRide''">Albina Barlovskaya</a> is waiting behind the wheel of a large black SUV, parked near the school.'
-		
+
 		! meynold`s events
 		if hour = 14 and vicky_afterschool ! daystart: gs 'mey_vika_events', 'near_school'
 		if mey_vika['mey_vika_qw'] = 35 or mey_vika['mey_vika_qw'] = 36 and minut < 45:
@@ -318,11 +318,11 @@ if $ARGS[0] = 'sports':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school//grounds/fieldwinter.jpg"></center>'
 	end
 	'There is a football field and around it is a track, often before and after school kids use the field and track.'
-	
+
 	if week = 5 and hour >= 16 and hour <= 18: 'As you pass by the sports field you hear lots of cheering and yelling coming from the younger kids on the field. As you approach you see <a href="exec:gt ''gschool_socialchg1'', ''tLazar''">Lazar</a> is on the football field showing off his skills.'
-	
+
 	if (week = 1 or week = 3) and hour >= 16 and hour <= 18: 'Looking toward what you can barely describe as a running track, you notice <a href="exec:gt ''gschool_socialchg1'', ''tSvyatoslav''">Svyatoslav</a> doing sprints by the football field.'
-	
+
 	act 'Leave the sports field': minut += 1 & gt 'gschool_grounds', 'main'
 
 	if schoolrunday ! daystart and $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
@@ -355,7 +355,7 @@ if $ARGS[0] = 'sports':
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
 			act 'Participate in the 400m sprint event':gt 'gschool_grounds', 'SchoolRun2'
-		else 
+		else
 			'You need to wear exercise clothes to participate.'
 		end
 	end
@@ -397,7 +397,7 @@ if $ARGS[0] = 'bulding':
 			if rand(0,3) = 0:
 				gt 'gschool_events', 'teacher_greet'
 			else
-				$eventtype = 'before_school' 
+				$eventtype = 'before_school'
 				gt 'gschool_events', 'break_events'
 			end
 		end
@@ -410,7 +410,7 @@ if $ARGS[0] = 'bulding':
 		"I know what you did, bitch. Did you really thing I wouldn''t figure out it was you that wiped my harddrive."
 		Before you can deny anything he continues: "I don''t even need that video to ruin your life. Just you wait. Soon the whole school will know what a whore you are."
 		His words fill you with dread as you make your way to class.'
-	end		
+	end
 
 	if zverSlutQW = 1 and week = 1 and lariskaQwestDay < daystart and lariskaQwestDay ! 0 and zverRageQW = 2:
 		zverSlutQW = 2
@@ -481,7 +481,7 @@ if $ARGS[0] = 'KristinaFight':
 end
 
 if $ARGS[0] = 'SchoolRun':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	*clr & cla
 	menu_off = 1
 	minut += 30
@@ -535,12 +535,12 @@ if $ARGS[0] = 'SchoolRun':
 
 		if swinbeg = 3 and LocalRun = 0:
 			LocalRun = 1
-            if razradbeg < 1:
-                'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, announces that your success has not gone unnoticed. He smiles and awards you the third tier sports trophy in running, which you proudly accept and show to everyone.'
-                razradbeg = 1
+			if razradbeg < 1:
+				'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, announces that your success has not gone unnoticed. He smiles and awards you the third tier sports trophy in running, which you proudly accept and show to everyone.'
+				razradbeg = 1
 			else
-                'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, smiles and awards you a local competition trophy which you proudly accept and show to everyone.'
-            end
+				'You have won the school running competition three times now and Mr. Pavlovich, the P.E. teacher at your school, smiles and awards you a local competition trophy which you proudly accept and show to everyone.'
+			end
 		end
 
 		gs 'stat'
@@ -550,7 +550,7 @@ if $ARGS[0] = 'SchoolRun':
 end
 
 if $ARGS[0] = 'SchoolRun2':
-    $location_type = 'event_outdoors'
+	$location_type = 'event_outdoors'
 	*clr & cla
 	menu_off = 1
 	minut += 30
@@ -614,13 +614,13 @@ if $ARGS[0] = 'SchoolRun2':
 			LocalRun = 2
 			npc_rel['A18'] = 0
 			zverevaQW = 1
-            if razradbeg < 2:
-                'You have won the competition three more times and Mr. Pavlovich awards you the second tier sports trophy in running.'
-                razradbeg = 2
-            else
-                'You have won the competition three more times and Mr. Pavlovich awards you another trophy.'
-            end
-            'Christina Zvereva stands nearby glaring at you the whole time, her hands balled into fists. She''s seething with rage, realizing she cannot beat you.'
+			if razradbeg < 2:
+				'You have won the competition three more times and Mr. Pavlovich awards you the second tier sports trophy in running.'
+				razradbeg = 2
+			else
+				'You have won the competition three more times and Mr. Pavlovich awards you another trophy.'
+			end
+			'Christina Zvereva stands nearby glaring at you the whole time, her hands balled into fists. She''s seething with rage, realizing she cannot beat you.'
 		elseif swinbeggor = 2 and begresult >= 130:
 			npc_rel['A18'] = 0
 			'Christina Zvereva is gasping for breath at the finish line. She was unable to overtake you, and came second again. Christina avoids your gaze, not wanting to look you in the eye.'
@@ -646,6 +646,7 @@ if $ARGS[0] = 'change_room':
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/lockerroom.jpg"></center>'
 
 	act 'Leave the school building':
 		if $clothingworntype = 'nude':
@@ -666,23 +667,27 @@ if $ARGS[0] = 'change_room':
 			gt 'gschool_grounds', 'sports'
 		end
 	end
-
-	'You can <a href="exec:gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here.'
+	*nl
+	'The locker room is accessed through the school gym, and is left unlocked until 18:30 each day, to be utilised by students using the sports ground for training and events outside school hours. The room is cold, damp and filled with lockers, benches, and not much else. You can <a href="exec:gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here'+iif(pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0,', and <a href="exec:dynamic $pirManage">manage your piercings</a>', '.')+''
 
 	if (hour = 18 and minut >= 30) or hour > 18:
 		'The school is closing for the night and you have to leave so you don''t get stuck here all night.'
 		exit
 	end
 
+	gs 'wardrobe', 'sports_outfit'
+	act 'Change you outfit':
+		cla
+		gt 'wardrobe', 'start'
+	end
+	dynamic $removepan
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
-
-	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
-
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	dynamic $shower
+	dynamic $tampon
+	gs 'din_van', 'pblc_pee'
 end
 
 --- gschool_grounds ---------------------------------

locations/gschool_lessons2.qsrc

@@ -80,7 +80,7 @@ if $ARGS[0] = 'computer':
 					'The whole class bursts into loud laughter, Mr. turns and gives the rest of class a hard look. "Silence now!" Then he turns back to you.'
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 					gs 'willpower', 'misc'
-					if will_cost <= pcs_willpwr:	
+					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'resist'
@@ -93,7 +93,7 @@ if $ARGS[0] = 'computer':
 							'"What good would that do? Are you trying to get me to start smoking to pass the time? I''m not interrupting your classes, just leave me alone. I''m having some... girl problems. Would you like me to talk about those instead?" you answer brashly, not having any intentions of getting up.'
 							'He leans in close to you. "Get out of my classroom right now or I will drag you out!"'
 							gs 'willpower', 'misc'
-							if will_cost <= pcs_willpwr:	
+							if will_cost <= pcs_willpwr:
 								act 'Refuse (<<will_cost>> Willpower)':
 									cla
 									gs 'willpower', 'resist'
@@ -198,7 +198,7 @@ if $ARGS[0] = 'computer':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Mr. Ivanov walking towards your desk.'
 							'When Mr. Ivanov arrives at your desk, he tells you, "And what could you be doing on your phone that''s more important than paying attention in class, Miss <<$pcs_lastname>>? Hand it over."'
@@ -302,9 +302,9 @@ if $ARGS[0] = 'science':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/bored.jpg"></center>'
 					'"Of course. Please continue your super-fascinating lesson. Just keep it a bit up-beat please. If you talk any slower, I might fall asleep!" you answer boldly.'
 					'The whole class bursts into loud laughter, Miss Orlov seems a bit stunned by your comment, after a moment to regain her composure she quietly asks you "Miss <<$pcs_lastname>>, please leave class and report to the principal."'
-					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'	
+					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
 					gs 'willpower', 'misc'
-					if will_cost <= pcs_willpwr:	
+					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'resist'
@@ -397,7 +397,7 @@ if $ARGS[0] = 'science':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Miss Orlov walking towards your desk.'
 							'When Miss Orlov arrives at your desk, she tells you, "Please give me your phone <<$pcs_nickname>>, this is important you need to pay attention."'
@@ -507,7 +507,7 @@ if $ARGS[0] = 'music':
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
 					gs 'willpower', 'misc'
-					if will_cost <= pcs_willpwr:	
+					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'resist'
@@ -523,7 +523,7 @@ if $ARGS[0] = 'music':
 						end
 					else
 						'<br>You don''t have enough willpower to stay inside the classroom.'
-					end		
+					end
 				end
 			else
 				'<br> You don''t have enough willpower to be a smart ass.'
@@ -610,7 +610,7 @@ if $ARGS[0] = 'music':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Mr. Vasilyev walking towards your desk.'
 							'When the teacher arrives at your desk, they tell you, "And what could you be doing on your phone that''s more important than paying attention in class, Mrs. <<$pcs_lastname>>? Hand it over."'
@@ -678,17 +678,17 @@ if $ARGS[0] = 'art':
 		*nl
 		'Just as he reaches for his phone Anushka snatches it up off the floor and starts looking at it. "Oooo what''s this? Who''s panties are these Erast?" He grabs ahold of her and takes a moment to wrestle his phone away from her. He obviously is trying to be gentle and yet urgently trying to get his phone back, as she keeps talking. Her voice strained abit as Erast easily over powers her, but you have to give it to her. She doesn''t make it easy on him, holding onto the phone as long as she can.'
 		temp = rand(0,5)
-		if temp=0: 
+		if temp=0:
 			'"White cotton panties by the look of it, must be Julia''s." The whole time Mr. Vasilyev is trying to get class to calm down. You notice Julia blushing, guess Anushka know''s her panties.'
-		elseif temp = 1: 
+		elseif temp = 1:
 			'"Expensive white lacy panties by the look of it, must be Katja''s." The whole time Mr. Vasilyev is trying to get class to calm down. You notice Katja blushing, guess Anushka know''s her panties.'
-		elseif temp = 2: 
+		elseif temp = 2:
 			'"Black thong panties by the look of it, must be Albina''s." The whole time Mr. Vasilyev is trying to get class to calm down. You notice Albina rolling her eyes, guess Anushka know''s her panties.'
-		elseif temp = 3: 
+		elseif temp = 3:
 			'"Black and yellow slippery when wet panties." The whole time Mr. Vasilyev is trying to get class to calm down. Then Anushka laughs after a moment. "Those are mine!" She grins at Erast and places a hand on his chest and looks him right in the eyes. "If you wanted to see, all you had to do was ask." She says as she hikes up her skirt to show off her black and yellow panties. Mr Vasilyev opens his jacket wide to try and block most of the classes view.'
-		elseif temp = 4: 
+		elseif temp = 4:
 			'"Stylish red cotton panties by the look of it, must be Natasha''s." The whole time Mr. Vasilyev is trying to get class to calm down. You notice Natasha blushing, guess Anushka know''s her panties.'
-		elseif temp = 5: 
+		elseif temp = 5:
 			'"What is that? Comic book character panties? They must be Zinaida''s." The whole time Mr. Vasilyev is trying to get class to calm down. You notice Zinaida looking mortified, guess Anushka know''s her panties.'
 		end
 		killvar 'temp'
@@ -735,7 +735,7 @@ if $ARGS[0] = 'art':
 					'"Miss <<$pcs_lastname>>, get out of class! Report to the Principal now!"'
 					act 'Go to principal''s office': demerit += 10+school_bunk*5 & gt 'gschool_office', 'principal'
 					gs 'willpower', 'misc'
-					if will_cost <= pcs_willpwr:	
+					if will_cost <= pcs_willpwr:
 						act 'Don''t leave the classroom (<<will_cost>> Willpower)':
 							*clr & cla
 							gs 'willpower', 'resist'
@@ -751,7 +751,7 @@ if $ARGS[0] = 'art':
 						end
 					else
 						'<br>You don''t have enough willpower to stay inside the classroom.'
-					end		
+					end
 				end
 			else
 				'<br> You don''t have enough willpower to be a smart ass.'
@@ -834,7 +834,7 @@ if $ARGS[0] = 'art':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Mr. Vasilyev walking towards your desk.'
 							'When the teacher arrives at your desk, they tell you, "And what could you be doing on your phone that''s more important than paying attention in class, Mrs. <<$pcs_lastname>>? Hand it over."'
@@ -866,7 +866,7 @@ if $ARGS[0] = 'art':
 				end
 			else
 				'<br>You don''t have enough willpower to keep using your phone.'
-			end			
+			end
 		end
 	end
 end
@@ -917,7 +917,7 @@ if $ARGS[0] = 'shop':
 				*clr & cla
 				pcs_grades -= rand(0,1)
 				grupvalue[4] -= 1
-				grupvalue[3] += 1 
+				grupvalue[3] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 				'You don''t want to get in trouble so you straighten up in your chair. "Sorry." The teacher gives you one final look and then goes back to teacher the class, you do your best to pay attention for the rest of class.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
@@ -1020,7 +1020,7 @@ if $ARGS[0] = 'shop':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirtselfie.jpg"></center>'
 							else
 								gs 'exhibitionism', 2
-								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'	
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nopanties_upskirt.jpg"></center>'
 							end
 							'You decide to have some fun with your teacher, and quickly move the phone between your legs and snap some photos under your skirt as you see Mr. Kuznetsov walking towards your desk.'
 							'When the teacher arrives at your desk, they tell you, "And what could you be doing on your phone that''s more important than paying attention in class, Mrs. <<$pcs_lastname>>? Hand it over."'
@@ -1309,7 +1309,7 @@ if $ARGS[0] = 'postphys':
 						end
 					end
 				else
-					'<br>You don''t have enough willpower to burst into the room.'	
+					'<br>You don''t have enough willpower to burst into the room.'
 				end
 				act 'Keep looking':
 					*clr & cla
@@ -1321,7 +1321,7 @@ if $ARGS[0] = 'postphys':
 					gs 'arousal', 'voyeur', 5, 'unkown'
 					gs 'arousal', 'end'
 					gs 'stat'
-!!Event missing for bursting into the room when christina already sucked him off 
+!!Event missing for bursting into the room when christina already sucked him off
 					!!act 'Burst into the room':gt 'gschool_lessons2', 'postphys'
 					act 'Admit defeat':
 						*clr & cla
@@ -1342,7 +1342,7 @@ if $ARGS[0] = 'postphys':
 		end
 	elseif fizrukSex > 0 and kristinaSex > 0:
 		'When the class is finished, Christina approaches you, "<<$pcs_nickname>>, sweetie, Mr. Pavlovich wants you to join me again in his office. He wants us to ''entertain him'', if you know what I mean. Want to join me?"'
-		gs 'willpower', 'bj' 
+		gs 'willpower', 'bj'
 		if will_cost <= pcs_willpwr:
 			act 'No thanks (<<will_cost>> Willpower)':
 				gs 'willpower', 'resist'
@@ -1421,7 +1421,7 @@ if $ARGS[0] = 'shower2':
 		*nl
 		'As you wash off the soap, you turn just in time to see one girl start spanking another one; most of the girls in the shower room stop what they''re doing to watch the antics of the two of them. After several fairly hard smacks, they stop and laugh about it, the ''victim'' rubbing her butt with strange glee, before everyone returns to showering.'
 	end
-	
+
 !!Does it really makes sense that you can shave in the school??
 !!Also, shaving code must be updated to the new shaving system
 !!If you uncomment this code, also uncomment the code in the 'shower' scene
@@ -1569,6 +1569,7 @@ if $ARGS[0] = 'post_dress':
 	act 'Choose a different outfit':postphys_event = daystart & gt 'wardrobe', 'start'
 	act 'Use the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	gs 'din_van', 'pblc_pee'
 end
 
 --- gschool_lessons2 ---------------------------------

locations/lact_lib.qsrc

@@ -252,11 +252,16 @@ if $ARGS[0] = 'BreastGrowth':
 		lactation['magicf2bccm'] = ((lactation['breastccm'] - ((lactation['breastccm']*lactation['siliconepercent'])/100))*lactation['magicf2bpercent_wos'])/100
 		lactation['nbsizebccm'] = lactation['breastccm'] - lactation['breastsiliconeccm'] - lactation['magicf2bccm']
 		lactation['nbsizepercent'] = ((lactation['nbsizebccm']*100)/lactation['breastccm'])
-		lactation['magicf2bpercent'] = ((lactation['magicf2bccm']*100)/lactation['nbsizebccm'])
+		lactation['magicf2bpercent'] = ((lactation['magicf2bccm']*100)/lactation['breastccm'])
+		!!	fixing QSP rounding issue
+		if (lactation['magicf2bpercent'] + lactation['nbsizepercent'] + lactation['siliconepercent']) < 100:
+			lactation['nbsizepercent'] += (100 - (lactation['magicf2bpercent'] + lactation['nbsizepercent'] + lactation['siliconepercent']))
+		elseif (lactation['magicf2bpercent'] + lactation['nbsizepercent'] + lactation['siliconepercent']) > 100:
+			lactation['nbsizepercent'] -= (100 - (lactation['magicf2bpercent'] + lactation['nbsizepercent'] + lactation['siliconepercent']))
+		end
 		!!	writing back nbsize and magicf2b. Silicone does not change
 		nbsize = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['nbsizepercent'])/100
-		!!	switching off the magicf2b recalculation. Seems to cause issues, and will not caused issues to gameplay if removed.
-		!!	magicf2b = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['magicf2bpercent'])/100
+		magicf2b = (func('lact_lib','bccmtosize',lactation['breastccm'])*lactation['magicf2bpercent'])/100
 		lactation['nbsizechange'] = nbsize
 		lactation['magicf2bchange'] = magicf2b
 		lactation['siliconechange'] = silicone

locations/lesbisubhouse.qsrc

@@ -1146,7 +1146,7 @@ if $ARGS[0] = 'ev1':
 		gs'stat'
 		
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/dom.jpg"></center>'
-		'To your surprise, the woman dressed up in a pretty outfit this time - one that is basically completely transparent and allows you to see every detail of her body. Most notably: Her big boobs. She''s clasping her hands in front her groin and expectantly stands in front of you.'
+		'To your surprise, Natalya dressed up in a pretty outfit this time - one that is basically completely transparent and allows you to see every detail of her body. Most notably: Her big boobs. She''s clasping her hands in front her groin and expectantly stands in front of you.'
 		
 		gs 'arousal', 'voyeur', 5, 'dom', 'lesbian', 'exhibitionism'
 		gs 'stat'

locations/natbelapt.qsrc

@@ -455,17 +455,13 @@ if $ARGS[0] = 'natroom':
 		
 		act 'Talk with her': gt 'natbelapt', 'chat'
 		
-		if natpregday > 0 and daystart-natpregday > 84:
+		if natpregday > 0 and daystart-natpregday > 90 and nataskedbaby ! daystart:
 			act 'Touch her belly':
-				if nataskedbaby = 1:
-					delact 'Touch her belly'
-					nataskedbaby = 0
-				end
+				nataskedbaby = daystart
 				*nl
 				'She looks at you with a strange smile.'
 				'"Yes," she answers the question you didn''t voice, "your little brother has actually knocked me up. I hope you are happy with that because I can''t afford an abortion."'
 				'Her tone is a lot less accusing than you''d expected. In fact, she seems... happy.'
-				nataskedbaby = 1
 			end
 		end
 			
@@ -764,6 +760,7 @@ if $ARGS[0] = 'hwundress':
 					*clr & cla
 					minut += 20
 					NatashaNakedHW += 1
+					natunderwear = 0
 					'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/nakedhomework2.jpg"></center>'
 					'"Then your mom will see you naked, this is what happens when you borrow money from people and can''t pay them back. You pay it back in other ways. Now do as you''re told and take off your clothes, all of your clothes."'
 					'Natasha looks as if she wants to object but then hangs her head and begins to remove her clothing. Once she''s completely naked, she shyly walks over to her desk and sits down as she starts in on your homework. Though after a while you think she''s actually enjoying it.'
@@ -1827,7 +1824,7 @@ if $ARGS[0] = 'natmother':
 		end
 		act 'Leave':gt 'natbelapt','hallway'
 }
-	elseif hour > 7 or hour < 21 and NatashaLoc = 5:
+	elseif hour > 7 and hour < 21 and NatashaLoc = 5:
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natdressing01.jpg"></center>'

locations/npcstatic1.qsrc

@@ -1221,7 +1221,7 @@ $npc_nickname['A<<npctemp>>'] = 'Kolka'
 $npc_lastname['A<<npctemp>>'] = $pcs_lastname
 $npc_usedname['A<<npctemp>>'] = 'Kolka'
 $npc_notes['A<<npctemp>>'] = 'Your Brother'
-npc_dob['A<<npctemp>>'] = 20011219
+npc_dob['A<<npctemp>>'] = 20001219
 npc_cyc['A<<npctemp>>'] = -1
 npc_fert['A<<npctemp>>'] = -1
 $npc_firstpart['A<<npctemp>>'] = 'V'

locations/saveupdater.qsrc

@@ -566,5 +566,7 @@ if grupTipe[25] = 5: grupTipe[25] = 0 & npc_grupTipe['A25'] = 5
 
 if npcSex[14] > 0: npcSex[14] = 0 and npc_sex['A14'] = 1
 
+if npc_dob['A34'] ! 20001219: npc_dob['A34'] = 20001219
+
 --- saveupdater ---------------------------------
 

locations/stat_display.qsrc

@@ -1335,7 +1335,15 @@ if pfilmday[0] > 0:
 end
 if pornmiss = 1: $stat_msg += '<br><b>You missed a scheduled porno shoot!</b>'
 if prodcosttrue > 0: $stat_msg += '<br><b>You owe money to the porn studio <<prodcost>>?</b>'
-if firstkasting > 0 and pfilmNO < 1: $stat_msg += '<br>You can contract '+iif(pornstack < 9,'up to <<10-pornstack>> porn shoots','<<10-pornstack>> porn shoot')+' at the Porn Studio.'
+if firstkasting > 0 and pfilmNO < 1:
+	if pornstack <= 10:
+		$stat_msg += '<br>You are currently unable to book any more porn shoots at the Porn Studio.'
+	elseif pornstack = 11:
+		$stat_msg += '<br>You can contract <<10-pornstack>> porn shoot at the Porn Studio.'
+	else
+		$stat_msg += '<br>You can contract up to <<10-pornstack>> porn shoots at the Porn Studio.'
+	end
+end
 if hour < 22 and week >= 2 and week <= 4 and workKafe = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift at The Roadhouse cafe starting at 11:00.</font></b>'
 if hour < 17 and week < 5 and workSec >= 1 or hour < 17 and week < 5 and workSec = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Titran-Express from 9:00 to 17:00</font></b>'
 if hour < 17 and week < 5 and PersSecWork = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Diner Bystroeshka from 9:00 to 17:00</font></b>'

locations/succubus.qsrc

@@ -15,21 +15,24 @@
 if $ARGS[0] = 'init':
 	if succubusQW = 5 and scpopt = 1 and succhungry < 1:
 		'You sense <<$sucself1>> perk up, ready to spring forth...'
-		act 'Call your power and feed (takes a lot of time)': scpopt = 0 & gt 'succubus', 'init'
-		act 'Refrain from feeding, you don''t have the time now':
+		act 'Call your power and feed (Takes a lot of time)': scpopt = 0 & gt 'succubus', 'init'
+		act 'Try to control your urges':
 			cla
 			'You try to contain <<$sucself1>>...'
-			if pcs_willpwr >= rand(20,40) + (40 * succublvl):
-				!!the willpower check values are based on a willpowermax of 200
+			gs 'willpower', 'misc'
+			will_cost = will_cost * succublvl
+			if will_cost <= pcs_willpwr:
+				gs 'willpower', 'resist'
 				'And you''re successful, <<$sucself1>> returns to your core.'
 				act 'Continue': scpopt = 2 & gt $sclocrt, $scargrt
 			else
-				'And you fail, <<$sucself1>> continues rising toward the surface of your being.'
+				'<br>You don''t have enough willpower to control your urges.'
+				'<<$sucself1>> continues rising toward the surface of your being.'
 				succonfail = 1
 				scpopt = 0
 				xgt 'succubus', 'init'
 			end
-		end
+		end	
 	elseif succubusQW = 4:
 		gt 'succubus', 'firsttime'
 	else

locations/zaprF.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 	'When the weather is nice sometimes girls will offer a car washing service for some tips, there''s no structure to it so you could always try it.'
 	'The petrol price is 30 <b>₽</b> per liter.'
 	*nl
-	
+
 	act 'Leave':
 		if cardrive = 6:
 			minut += 5
@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 			gt 'pavCommercial'
 		end
 	end
-	
+
 	if temper < 10:
 		'It''s too cold outside to wash cars. You''re more likely to get ill than make money. Maybe try again when the weather is warmer?'
 	elseif sunWeather = 0:
@@ -62,7 +62,7 @@ if $ARGS[0] = 'start':
 			act 'Disengage from the pump':gt 'zaprF', 'start'
 		end
 	end
-	
+
 	zprbenz = 40 - benz
 
 	if benz < 40 and car > 0 and cardrive = 6 or benz < 40 and car > 0 and cardrive = 21:
@@ -111,7 +111,7 @@ if $ARGS[0] = 'toilet':
 	'You are in a dirty gas station toilet. At least it provides some privacy.'
 
 	act 'Leave the restroom':gt 'zaprF', 'start'
-	
+
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
@@ -119,6 +119,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $quickwash
 	dynamic $basin
 	dynamic $removepan
+	gs 'din_van', 'pblc_pee'
 end
 
 --- zaprF ---------------------------------