Bladeren bron

[fixed] missing 'Pee' option in zaprF Gas Station.
[added] Pee option to gschool_lessons2, at the end of gym.
[fixed] missing gym image and description to gschool_grounds changing room.
[added] shower and pee options to sports ground change room.
[changed] pee now takes 4 minutes, change tampon or pad 2 minutes. Updated action description.

3xpurt 5 jaren geleden
bovenliggende
commit
58c445a108
4 gewijzigde bestanden met toevoegingen van 137 en 124 verwijderingen
  1. 29 23
      locations/din_van.qsrc
  2. 77 72
      locations/gschool_grounds.qsrc
  3. 26 25
      locations/gschool_lessons2.qsrc
  4. 5 4
      locations/zaprF.qsrc

+ 29 - 23
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
@@ -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)")

+ 77 - 72
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 ---------------------------------

+ 26 - 25
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 ---------------------------------

+ 5 - 4
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 ---------------------------------