14 次代码提交 90dc2666ec ... 7236d71f4c

作者 SHA1 备注 提交日期
  hdb 7236d71f4c Merge branch 'cameraLoc' 3 年之前
  hdb 1d30183f1d Merge branch 'master' of https://git.catrenelle.com/hashdotbang/glife 3 年之前
  hdb 142692e16f Connecting locations for photography 3 年之前
  hdb 2b447b4b2d Sorted out the dynamic issues in camera code 3 年之前
  hdb 24aa0180e6 WIP camera loc changes 3 年之前
  hdb 331ff0be1f Minor fixes to photo store 3 年之前
  Kevin_Smarts 41cff77402 [added] [changed] More school tweaks and changes from nutluck with a little code check from me 3 年之前
  Kevin_Smarts e0a0d5d1a4 Merge remote-tracking branch 'origin/master' 3 年之前
  Kevin_Smarts 834e9729ad [fixed]2 sex scenes rewritten to match changed images 3 年之前
  Vengeance11 d3797e6a78 Text edits and fixes 3 年之前
  Kevin_Smarts 4cc86f32bb [fixed] Active time for game night changed to set time as potential overrun was making it go until 3am from nutluck 3 年之前
  hdb c871860fc4 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 年之前
  Kevin_Smarts 64e52aca92 [added] Code to make it a 75% change you stay and 25% you get kicked out by Albina as per Vengeance's instructions 3 年之前
  Vengeance11 cbe11c7ad1 Text edits 3 年之前

+ 1 - 0
glife.qproj

@@ -174,6 +174,7 @@
 		<Location name="purses"/>
 		<Location name="$purse_image"/>
 		<Location name="sewing"/>
+		<Location name="camera"/>
 	</Folder>
 	<Folder name="Phone">
 		<Location name="telefon"/>

+ 1 - 0
locations/ParChurch.qsrc

@@ -52,6 +52,7 @@ if $ARGS[0] = 'start':
 			act 'Enter the church': gt 'ParChurch' , 'Narthex'
 		end
 	end
+	gs 'camera', 'check_location'
 end
 
 if $ARGS[0] = 'Mom':

+ 22 - 11
locations/albinahome.qsrc

@@ -611,7 +611,7 @@ if $ARGS[0] = 'receive_strapon':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag2.jpg"></center>'
-				'She proceeds to fuck you hard, but not too hard, settling into a near perfect rhythm that you enjoy, feeling youself slowly getting wetter. She seems to be enjoying it as much as you, moaning softly and squeezing her breast as she fucks you. She leans in and kisses you before suddenly stopping and pulling out. "OK that''s enough of that, but I''m not finished with you just yet. Roll over so I can fuck that tight little ass of yours."'
+				'She proceeds to fuck you hard, but not too hard, settling into a near perfect rhythm that you enjoy, feeling youself slowly getting wetter. She seems to be enjoying it as much as you, moaning softly and squeezing her breast as she fucks you. She leans in and kisses you before suddenly stopping and pulling out. "Okay, that''s enough of that, but I''m not finished with you just yet. Roll over so I can fuck that tight little ass of yours."'
 				gs 'arousal', 'vaginal_strap', 7, 'lesbian'
 				gs 'stat'
 				act 'Take it up the ass': gt 'albinahome', 'albina_ass_fucks_you'
@@ -635,8 +635,8 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
-		'Once you are comfortable with her in your ass, she stands up over you and starts getting harder and faster with the ass fucking she is giving you. When it starts getting a little too rough, she seems to notice and backs off just a little before getting into a nice rhythm of slamming the dildo in and out of your ass. She enjoys fucking you hard, growing more aroused over time.' 
-		'Just as it is starting to hurt, she stops and lets out a pleasured moan before pulling out of you. You feel a rush of cold air around your gaping asshole. "You were such a good little butt slut <<$pcs_nickname>>." she says as you turn and see her sliding the harness off, apparently finished with you. You also notice the wet patch on the bed. She obviously greatly enjoyed hammering your ass.'
+		'Once you are comfortable with her in your ass, she stands up over you and pins your head to the bed with her foot. "Get ready, because now I''m <i>really</i> going to fuck your ass!" she laughs before she starts slamming the full length of the dildo in and out of your ass, causing you to grip the sheets tightly. Despite this, she isn''t too rough and you start enjoying the pleasurable sensation. Albina seemingly grows more aroused the more she fucks you.' 
+		'Just as it is starting to hurt, she stops and lets out a loud pleasured moan before lifting her foot off your head and pulling out of you. You feel a rush of cold air around your gaping asshole. "You were such a good little butt slut <<$pcs_nickname>>." she says as you turn and see her sliding the harness off, apparently finished with you. You also notice the wet patch on the bed. She obviously greatly enjoyed hammering your ass.'
 		gs 'arousal', 'anal_strap', 10, 'lesbian'
 		gs 'stat'
 		act 'Finish': gt 'albinahome', 'strapon_finish'
@@ -649,13 +649,24 @@ if $ARGS[0] = 'strapon_finish':
 	npc_sex['A23'] += 1
 	lesbian += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
-	'Albina pushes you down onto the bed and climbs in on top of you. You spend the next few minutes passionately making out while fondling each other before Albina gives you a sly smile and moves into position to start scissoring you. Before she can, her phone buzzes and she looks at it, obviously reading a text message and frowns in disappointment. "Sorry, but I need to go <<$pcs_nickname>>. I''ll see later?"'
-	'You nod in understanding. "Sure, not a problem. I had fun." you smirk. "I''ll see you later." You share a final kiss with each other before you both quickly get dressed. Albina then wipes the dildo clean and shoves it back in the drawer before ushering you out of her room.'
-	gs 'arousal', 'foreplay', 5, 'lesbian'
-	gs 'arousal', 'end'
-	gs 'stat'
-	act 'Finish':gt 'albinahome', 'bedroom'
+	if rand(0,3) = 0:
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
+		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she gives you a sly smile and moves into position to start scissoring you. Before she can, her phone buzzes and she looks at it, obviously reading a text message and frowns in disappointment. "Sorry, but I need to go <<$pcs_nickname>>. I''ll see later?"'
+		'You nod in understanding. "Sure, not a problem. I had fun." you smirk. "I''ll see you later." You share a final kiss with each other before you both quickly get dressed. She wipes the dildo clean and shoves it back in the drawer before ushering you out of her room. She walks with you into town before leaving you to attend to her business.'
+		gs 'arousal', 'foreplay', 5, 'lesbian'
+		gs 'arousal', 'end'
+		gs 'stat'
+		act 'Finish':gt 'pav_residential'
+	else
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
+		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she collapses next to you and you both just lie naked on her bed in silence. She eventually gets up and cleans the dildo before shoving it back in the drawer and getting dressed.'
+		'You get dressed yourself and when you finish, she smiles at you. "Okay, what do you want to do now?" she asks.'
+		gs 'arousal', 'foreplay', 5, 'lesbian'
+		gs 'arousal', 'end'
+		gs 'stat'
+		act 'Finish' :gt 'albinahome', 'bedroom'
+	end
 end
 
---- albinahome ---------------------------------
+--- albinahome ---------------------------------
+

+ 3 - 3
locations/bed2.qsrc

@@ -457,7 +457,7 @@ if $ARGS[0] = 'wake':
 	if MarishaQW["marisha_sleepover"] = 1: gs 'marisha_ev', 'morning'
 	if daystart < 10 and StoryLine = 0 and ntstart = 0:'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
 	if daystart >= 10 and daystart < 30 and StoryLine = 0 and ntstart = 0:'Looking at your female body, you are still a little surprised it''s actually you.'
-	if slept_in = 1 and kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 9 and hour < 14:
+	if slept_in = 1 and kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 9 and hour < 14 and suspended['on'] ! 1:
 		if schoolprogul > 2 and schoolPredupr = 2:
 			pcs_mood -= 35
 			gs 'stat'
@@ -477,7 +477,7 @@ if $ARGS[0] = 'wake':
 		end
 	end
 	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
-		if slept_in = 1 and (hour = 7 or hour = 8):
+		if slept_in = 1 and (hour = 7 or hour = 8) and suspended['on'] ! 1:
 			pcs_mood -= 10
 			gs 'stat'
 			msg '<center>Damn it''s <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>, you''ve slept too long! You need to hurry or you''re going to be late for school!</center>'
@@ -509,7 +509,7 @@ if $ARGS[0] = 'wake':
 			end
 			gs 'bed2', 'end'
 		end
-		if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
+		if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9 and suspended['on'] ! 1:
 			act 'Full morning routine for School (01:00)':
 				fullmorrout = 1
 				minut += 15

+ 371 - 0
locations/camera.qsrc

@@ -0,0 +1,371 @@
+# camera
+
+! $camera_locations is an array of dynamics that describe various camera event locations that a player can photograph.
+! The named index in $camera_locations should match the $loc name where a player may want to take a picture
+! Other variables:
+!	$camera_description = the text rendered in photo actions
+!	$camera_event = a named event in the camera location that has special handling for the location
+!	$camera_return_loc = the location the player should be returned to after the event
+!	$camera_return_loc_arg = argument for the location
+$camera_locations['city_library'] = {
+	$camera_description = 'City Library'
+	$camera_event = 'city_library'
+	$camera_return_loc = 'city_center'
+	$camera_return_loc_arg = ''
+}
+
+$camera_locations['city_island'] = {
+	$camera_description = 'University'
+	$camera_event = 'city_uni'
+	$camera_return_loc = 'city_island'
+	$camera_return_loc_arg = ''
+}
+
+$camera_locations['gadukino'] = {
+	$camera_description = 'Gadukino Village'
+	$camera_event = 'gadukino'
+	$camera_return_loc = 'gadukino'
+	$camera_return_loc_arg = ''
+}
+
+$camera_locations['gadforest'] = {
+	$camera_description = 'Gadukino Forest'
+	$camera_event = 'gadforest'
+	$camera_return_loc = 'gadforest'
+	$camera_return_loc_arg = 'forest_edge'
+}
+
+$camera_locations['pav_complex'] = {
+	$camera_description = 'Pavlovsk Five Estates'
+	$camera_event = 'pav_complex'
+	$camera_return_loc = 'pav_complex'
+	$camera_return_loc_arg = 'start'
+}
+
+$camera_locations['pav_train'] = {
+	$camera_description = 'Pavlovsk Train Station'
+	$camera_event = 'pav_train'
+	$camera_return_loc = 'pav_train'
+	$camera_return_loc_arg = 'start'
+}
+
+$camera_locations['gschool_grounds'] = {
+	$camera_description = 'Pavlovsk School'
+	$camera_event = 'pav_school'
+	$camera_return_loc = 'gschool_grounds'
+	$camera_return_loc_arg = 'main'
+}
+
+$camera_locations['pav_park'] = {
+	$camera_description = 'Pavlovsk Park'
+	$camera_event = 'pav_park'
+	$camera_return_loc = 'pav_park'
+	$camera_return_loc_arg = 'start'
+}
+
+$camera_locations['glake'] = {
+	$camera_description = 'Pavlovsk Lake'
+	$camera_event = 'pav_lake'
+	$camera_return_loc = 'glake'
+	$camera_return_loc_arg = ''
+}
+
+$camera_locations['ParChurch'] = {
+	$camera_description = 'Pavlovsk Church'
+	$camera_event = 'pav_church'
+	$camera_return_loc = 'ParChurch'
+	$camera_return_loc_arg = 'start'
+}
+
+! People that should show up when the player is looking at her camera
+! considering who to photograph. Also used by events that attempt to
+! inject camera opportunities into existing locations
+$camera_people['mother'] = {
+	$camera_description = $npc_nickname['A29']
+	$camera_event = ''
+	$camera_return_loc = ''
+	$camera_return_loc_arg = ''
+	$camera_requirement = (npc_rel['A29'] >= 50)
+}
+
+$camera_people['sister'] = {
+	$camera_description = 'Anya'
+	$camera_event = ''
+	$camera_return_loc = ''
+	$camera_return_loc_arg = ''
+	$camera_requirement = ($npc_rel['A33'] >= 50)
+}
+
+$camera_people['anushka'] = {
+	$camera_description = 'Anushka'
+	$camera_event = ''
+	$camera_return_loc = ''
+	$camera_return_loc_arg = ''
+	$camera_requirement = ($npc_rel['A144'] >= 50)
+}
+
+$camera_people['lazar'] = {
+	$camera_description = 'Lazar'
+	$camera_event = ''
+	$camera_return_loc = ''
+	$camera_return_loc_arg = ''
+	$camera_requirement = ($npc_rel['A149'] >= 50)
+}
+
+$camera_people['eugene'] = {
+	$camera_description = 'Eugene'
+	$camera_event = ''
+	$camera_return_loc = ''
+	$camera_return_loc_arg = ''
+	$camera_requirement = (LCEugenefirst >= 1)
+}
+
+
+if $ARGS[0] = 'start':
+	*clr & cla
+	'<center><img src="images/pc/items/accessories/camera.jpg"></center>'
+	'You can''t help but smile as you check your camera. You love capturing life as it happens, but sometimes it is hard to decided exactly what you want to take photo''s of.'
+	'You spend a few moments thinking about places and people that might make for interesting photographs. Perhaps...'
+	*nl
+	! Get the number of locations in the array
+	location_count = ARRSIZE('$camera_locations')
+	iterator = 0
+	! For every location
+	if location_count > 0:
+		:location_loop
+		! Assign the variables
+		dynamic $camera_locations[iterator]
+		! Show the player unphotographed locations
+		if $camera_found[$camera_event] <> 1: '<<$camera_description>>'
+		iterator += 1
+		if iterator < location_count: jump 'location_loop'
+	end
+	*nl
+	people_count = ARRSIZE('$camera_people')
+	iterator = 0
+	! For every person in the array
+	if people_count > 0:
+		:people_loop
+		! Assign the variables
+		dynamic $camera_people[iterator]
+		! If the subject has not been photographed and requirements are met (-1), show the name
+		if $camera_found[$camera_event] <> 1 and $camera_requirement = -1: '<<$camera_description>>'
+		iterator += 1
+		if iterator < people_count: jump 'people_loop'
+	end
+
+	act 'Put Camera away': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'check_location':
+	! If the player has a camera and this location exists in the array
+	if photographyEv >= 2 and $camera_locations[$loc] <> 0:
+		! Assign the variables
+		dynamic $camera_locations[$loc]
+		! If they have not already photographed the location
+		if $camera_found[$camera_event] <> 1:
+			! Offer the action
+			act 'Photograph the <<$camera_description>>':
+				$camera_found[$camera_event] = 1
+				$loc = $camera_return_loc
+				$loc_arg = $camera_return_loc_arg
+				gt 'camera', $camera_event
+			end
+		! If they photographed the lake but did not trigger the sonia conditions, offer her
+		elseif $camera_event = 'pav_lake' and $camera_found['sonia'] <> 1 and sunWeather = 1 and soniaPS > 0:
+			gs 'camera', 'pav_lake_sonia', 'describe'
+		end
+	end
+end
+
+if $ARGS[0] = 'city_library':
+	*clr & cla
+	minut += 15
+	photoskl_exp += rand(3,5)
+	gs 'stat'
+	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
+	'You make your way over to the city library, it is a grand building and would make a wonderful photograph. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. Happy with your results you know you have something to add to your portfolio.'
+	act 'Put Camera away': gt $loc, $loc_arg
+	!!this will take the player to the city center streets.
+end
+!!this will put the city_library image in the portfolio
+
+if $ARGS[0] = 'city_uni':
+	*clr & cla
+	minut += 25
+	photoskl_exp += rand(5,7)
+	gs 'stat'
+	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
+	'You make your way over to the city University, it is a grand building and would make a wonderful photograph. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. You can''t help but also notice all the students moving around the quad and feel that would be a amazing photo as well. You stop and take several photos of the students moving around. Happy with your results you know you have something to add to your portfolio.'
+	act 'Put Camera away': gt $loc, $loc_arg
+	!!this will take the player to the city island streets.
+end
+!!this will put the city_uni and city_uni_quad images in the portfolio
+
+if $ARGS[0] = 'gadukino':
+	*clr & cla
+	minut += 25
+	photoskl_exp += rand(5,7)
+	gs 'stat'
+	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
+	'Standing in the village you realize what a wonderful photo this place would make. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. You can''t help but also notice the houses and feel they would be a amazing photo as well. You stop and take several photos of different houses, finally settling on your grandparents home. Happy with your results you know you have something to add to your portfolio.'
+	act 'Put Camera away': gt $loc, $loc_arg
+	!!this will take the player to the gadukino.
+end
+!!this will put the gadukino and dachi images in the portfolio
+
+if $ARGS[0] = 'gadforest':
+	*clr & cla
+	minut += 15
+	photoskl_exp += rand(3,5)
+	gs 'stat'
+	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
+	'Standing in the forest you amazed by how breath takingly beautiful it is out here. You walk around taking photos of the trees until you are happy with the results. Checking one last time all the photo''s you took, you feel confident you found something to add to your portfolio and put the camera away.'
+	act 'Put Camera away': gt $loc, $loc_arg
+	!!this will take the player to the gadukino forest.
+end
+!!this will put the gadforest image in the portfolio
+
+if $ARGS[0] = 'pav_church':
+	*clr & cla
+	minut += 25
+	photoskl_exp += rand(5,7)
+	gs 'stat'
+	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
+	'Standing in front of the local church you realize what a wonderful photo this place would make. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. With that done you spot the cemetery and walk near it and start taking photos of it as well. Happy with your results you know you have something to add to your portfolio.'
+	act 'Put Camera away': gt $loc, $loc_arg
+	!!this will take the player to pav resident? where ever the church is located in pav
+end
+!!this will put the pav_church and graveyard images in the portfolio
+
+if $ARGS[0] = 'pav_train':
+	*clr & cla
+	minut += 15
+	photoskl_exp += rand(3,5)
+	gs 'stat'
+	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
+	'Standing in front of the local train station you realize what a wonderful photo this place would make. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. Happy with your results you know you have something to add to your portfolio.'
+	act 'Put Camera away': gt $loc, $loc_arg
+	!!this will take the player to pav train station
+end
+!!this will put the pav_train image in the portfolio
+
+if $ARGS[0] = 'pav_complex':
+	*clr & cla
+	minut += 15
+	photoskl_exp += rand(3,5)
+	gs 'stat'
+	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
+	'Standing in the courtyard you realize what a wonderful photo this place would make. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. Happy with your results you know you have something to add to your portfolio.'
+	act 'Put Camera away': gt $loc, $loc_arg
+	!!this will take the player to pav complex
+end
+!!this will put the pav_complex image in the portfolio
+
+if $ARGS[0] = 'pav_school':
+	*clr & cla
+	minut += 15
+	photoskl_exp += rand(3,5)
+	gs 'stat'
+	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
+	'Standing in front of the school you realize what a wonderful photo this place would make. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. Happy with your results you know you have something to add to your portfolio.'
+	act 'Put Camera away': gt $loc, $loc_arg
+	!!this will take the player to pav school grounds
+end
+!!this will put the pav_school image in the portfolio
+
+if $ARGS[0] = 'pav_park':
+	*clr & cla
+	minut += 15
+	photoskl_exp += rand(3,5)
+	gs 'stat'
+	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
+	'Walking through the park you realize what a wonderful photo this place would make. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. Happy with your results you know you have something to add to your portfolio.'
+	act 'Put Camera away': gt $loc, $loc_arg
+	!!this will take the player to pav park
+end
+!!this will put the pav_park image in the portfolio
+
+if $ARGS[0] = 'pav_lake':
+	*clr & cla
+	minut += 15
+	photoskl_exp += rand(3,5)
+	gs 'stat'
+	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
+	'As you look out over the lake you realize what a wonderful photo this place would make. You walk around the shore looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. Happy with your results you know you have something to add to your portfolio.'
+	if soniaPS > 0 and sunWeather = 1:
+		'Just as you are about ready to put your camera away, you notice a girl sunbathing topless. It takes you a moment to realize it is Sonia, she appears to be alone. You wonder if she would make a good subject to photograph, a take on how innocents can get lost in a cruel world.'
+		gs 'camera', 'pav_lake_sonia'
+	else
+		act 'Put Camera away': gt $loc, $loc_arg
+	end
+end
+!!this will put the pav_lake image in the portfolio
+
+if $ARGS[0] = 'pav_lake_sonia':
+	if $ARGS[1] = 'describe': 'You notice a girl sunbathing topless. It takes you a moment to realize it is Sonia, she appears to be alone. You wonder if she would make a good subject to photograph, a take on how innocents can get lost in a cruel world.'
+	act 'Take Sonia''s photograph':
+		*clr & cla
+		minut += 5
+		$camera_found['sonia'] = 1
+		photoskl_exp += rand(3,5)
+		gs 'stat'
+		'<center><img src="images/characters/pavlovsk/school/girls/sonia/lake/photography/photo1.jpg"></center>'
+		'You get a little closer to her and then start taking her photograph, you move around and take a couple of photo''s from different places and angles. It seems you made to much noise as she suddenly sits up partial and looks your direction.'
+		act 'Caught':
+			*clr & cla
+			minut += 2
+			photoskl_exp += rand(3,5)
+			gs 'stat'
+			'<center><img src="images/characters/pavlovsk/school/girls/sonia/lake/photography/photo2.jpg"></center>'
+			'She covers herself up and looks at you in surprise. "What the fuck <<$pcs_nickname>>! What are you doing?"'
+			'You smile and take another photo of her. "Sorry I was just taking your photo, you was just so beautiful I couldn''t help myself."'
+			'She smiles a bit at the compliment. "Really?"'
+			'You nod as you take another photo of her. "Yes, now won''t don''t you get up and stop covering up." You tell her.'
+			'She smiles even more. "Ok but just a few." Then she gets up to her knee''s and removes her hands from covering herself up. Now giving you a nice shot of her topless body.'
+			act 'Take more photo''s':
+				*clr & cla
+				minut += 5
+				photoskl_exp += rand(3,5)
+				gs 'stat'
+				'<center><img src="images/characters/pavlovsk/school/girls/sonia/lake/photography/photo3.jpg"></center>'
+				'At first she is a bit awkward, seeming not knowing what to do. But as you take more photo''s she starts to relax and become more natural in her poses for you. Eventually she even starts to get into herself and enjoy it.'
+				act 'Take more photo''s':
+					*clr & cla
+					minut += 5
+					photoskl_exp += rand(3,5)
+					gs 'stat'
+					'<center><img src="images/characters/pavlovsk/school/girls/sonia/lake/photography/photo4.jpg"></center>'
+					'As you take even more photo''s she starts teasing you by pulling on her bottoms, not enough to show off her pussy but almost. While her hands run along her body or play with her breasts as you take more photo''s of her.'
+					'You can''t help but smile and see how far she wants to go you tell her. "Come on loose the bottoms, you know you want too."'
+					act 'No bottoms':
+						*clr & cla
+						minut += 5
+						photoskl_exp += rand(3,5)
+						gs 'stat'
+						'<center><img src="images/characters/pavlovsk/school/girls/sonia/lake/photography/photo5.jpg"></center>'
+						'She grins and then unties her bottoms from one hip, which lets the bottoms partially fall off her, exposing her pussy. You take more photo''s as she pulls the other tie loose and her bottoms fall completely away.'
+						act 'Naked':
+							*clr & cla
+							minut += 5
+							photoskl_exp += rand(3,5)
+							gs 'stat'
+							'<center><img src="images/characters/pavlovsk/school/girls/sonia/lake/photography/photo6.jpg"></center>'
+							'With her now completely naked you keep taking photo''s of her and start getting a lot closer to her as you. The longer it goes on the more turned on she seems to get, eventually she starts playing with her pussy as you take her photographs. Finally haven taken several dozen photo''s you feel you have taken enough and stop taking her photographs. "Thanks Sonia, I got what I needed."'
+							'For a moment she frowns then bobs her head slightly and smiles. "It was my pleasure, I really liked it." Then she hesitantly adds. "Maybe we can do it again sometime?" For a moment sounding more like her shy sweet former self before she feel into becoming the school slut.'
+							'You feel bad for her, you know almost no one just talks to her anymore. "Yeah sure, I would like that."'
+							'She breaks into a huge smile and looks happier than you have seen her in some time. "Ok just let me know or maybe just stop by my house and we can do more photo''s."'
+							'You nod to her. "I will, but for now I got all I need. So I will let you get back to sunbathing. Thanks again." With that you put your camera away and start to walk off, as you do you she starts to get dressed and you hear her say. "Bye."'
+							!!this will put sonia image in portfolio
+							act 'Leave': gt $loc, $loc_arg
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+
+--- camera ---------------------------------
+

+ 3 - 0
locations/cikl.qsrc

@@ -1345,6 +1345,9 @@ killvar 'pcs_drank'
 !!2 - agreed to go to the party
 !!3 - Missed the party
 
+!!suspension ends
+if suspended['day'] = daystart:	suspended['on'] = 0
+
 if storyline = 1:
 !!Party refresh if you didn''t see sis
 	if week = 1 and sisboyparty ! 2:

+ 2 - 0
locations/city_center.qsrc

@@ -287,6 +287,8 @@ if hour >= 20 or hour <= 4:
 	end
 end
 
+gs 'camera', 'check_location'
+
 
 !! Savegame Compatibility
 if tanwork ! 0:

+ 1 - 1
locations/city_island.qsrc

@@ -46,6 +46,7 @@ if car > 0 and cardrive = 25:'In the parking stands your <a href="exec:GS ''carF
 act 'Wait':gs 'obj_din', 'wait'
 
 gs 'taxi'
+gs 'camera', 'check_location'
 
 if hour >= 8 and hour <= 22:
 	'You can see the <a href="exec:$loc = ''city_island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
@@ -70,6 +71,5 @@ end
 if func('uniutil', 'student', 'enrolled') or hour >= 6:'The <a href="exec:gt ''dorm'', ''start''">University dorms</a> offers small, but cheap, living space, for university students.'
 
 
-
 --- city_island ---------------------------------
 

+ 1 - 1
locations/city_library.qsrc

@@ -103,7 +103,7 @@ if hour >= 8 and hour <= 18:
 else
 	'The library is closed.'
 end
-
+gs 'camera', 'check_location'
 
 
 --- city_library ---------------------------------

+ 1 - 1
locations/din_bad.qsrc

@@ -231,7 +231,7 @@ if $ARGS[0] = 'd_bag':
 	if used_pattest > 0: 'You have <b><<used_pattest>></b> <a href="exec:dynamic $test_purse">used</a> paternity test'+iif(used_pattest > 1, 's ', ' ')+'in your purse.'
 	*nl
 	if $pursepantytype ! '' or $pursebratype ! '': 'You also have '+iif($pursepantytype ! '','<a href="exec:view''<<func(''$panty_image'', $pursepantytype, pursepantynumber)>>''">a pair of panties</a>','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','<a href="exec:view''<<func(''$bra_image'', $pursebratype, pursebranumber)>>''">a bra</a>','')+' in your purse, which you can put on in the nearest bathroom.'
-	
+	if photographyEv >= 2: 'You have <a href="exec:gt''camera'',''start''">a camera</a> in your purse.'
 	act 'Return':gt 'obj_din', 'menu_exit'
 	'</td></tr></table></center>'
 end

+ 1 - 0
locations/gadforest.qsrc

@@ -339,6 +339,7 @@ if $ARGS[0] = 'forest_edge':
 	gs 'gadforest', 'walking'
 
 	gs 'gadforest', 'picking'
+	gs 'camera', 'check_location'
 end
 
 if $ARGS[0] = 'forest_outskirts':

+ 1 - 0
locations/gadukino.qsrc

@@ -153,6 +153,7 @@ if $ARGS[0] = '':
 		if (hour <= 5 or hour >= 21) and succubusQW = 5 and suchuntday ! daystart:
 			act 'Go Hunting (this can take a lot of time)': suchunt = 1 & gt 'gadukino', 'succubus_hunt'
 		end
+		gs 'camera', 'check_location'
 	end
 end
 

+ 2 - 0
locations/glake.qsrc

@@ -67,6 +67,8 @@ if StoryLine = 1 and SchoolAtestat = 0 and ((month >= 3 and month <= 5) or (mont
 	end
 end
 
+gs 'camera', 'check_location'
+
 act'Return to Pavlovsk':
 	*clr & cla
 	if konki_cloth = 1:

+ 393 - 216
locations/gschool_boys_bathroom.qsrc

@@ -1329,125 +1329,152 @@ if $ARGS[0] = 'caughtb1':
 			end
 		end
 	end
-
 	act 'Suggest a blowjob':
 		*clr & cla
-		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
+		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
 		'You get down on your knees in front of him and hike up your skirt just a little bit to reveal more of your legs. When you are sure you have his eyes on you, you look up at him and suggestively lick your lips. "You seem tense, sir. How about I help you relax a little bit and you just pretend you didn''t see me here?"'
-
-		gs 'gschool_events', 'sweet', 'sex'
-		if rand(1,100) < Sweet_talk:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
-			'Mr. Vasilyev looks at you and snorts. "Please don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "Come on, I''m taking you to the principal''s office."'
-			'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
-			act 'Go to Principal''s Office':
-				demerit += 10
-				if school_bunk = 1:demerit += 5
-				gt 'gschool_office', 'principal'
-			end
-		else
+		act 'Continue':
 			*clr & cla
-			gs 'boyStat', 'A128'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtbj.jpg"></center>'
-			'He looks down at you and seems to freeze. He doesn''t say anything, doesn''t move away either - all he does is look at you, transfixed with your lips. You decide to take that as a yes, stretch out your hand and unzip his pants. You reach inside and feel that his dick is almost hard already.'
+			gs 'gschool_events', 'sweet', 'sex'
+			if rand(1,100) < Sweet_talk:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
+				'Mr. Vasilyev looks at you and snorts. "Please don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
+				'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
+				act 'Go to principal''s office':
+					demerit += 10
+					if school_bunk = 1:demerit += 5
+					gt 'gschool_office', 'principal'
+				end
+			else
+				gs 'boyStat', 'A128'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtbj.jpg"></center>'
+				'He looks down at you and seems to freeze. He doesn''t say anything, doesn''t move away either - all he does is look at you, transfixed with your lips. You decide to take that as a yes, stretch out your hand and unzip his pants. You reach inside and feel that his dick is almost hard already.'
 				*nl
 				'He pulls his pants down a little bit, just enough to release his manhood and make it easier for you. You give him an appreciative look and stroke his dick a few times until it is fully hard, then lean forward and start licking it; you lick up and down the shaft and run your tongue around the head, your eyes locked with his all the while before you smile at him and take his <<dick>>cm <<$dick_girth>> cock into your mouth. You wrap your <<$liptalk>> tightly around his dick and start bobbing your head, stroking his cock with your lips, your tongue still making its rounds. He rests one hand on the top of your head, but he lets you completely control the action.'
 				*nl
 				'You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him as deep into your mouth as you can without gagging. He starts moaning and you feel his hand dig into your hair, telling you that he is getting close to cumming.'
-			gs 'arousal', 'bj', 15
-			gs 'stat'
-			act 'Continue':
-				*clr & cla
-				'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtcum.jpg"></center>'
-				'You pick up the pace even more, you want him finish soon. "I''m about to cum!" he mutters weakly, as if trying to warn you, but you don''t care and suck him even harder. He starts grunting and you feel his dick throbbing in your mouth, when he suddenly pulls your head away, his hand in your hair firmly gripping you.'
-				*nl
-				'As soon his dick loudly pops out of your mouth, he jerks it a couple of times while pointing it at you. It soon starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth. When he finishes, he rubs the tip of his dick against your lips and then shoves it back into your mouth, the sight of you covered in his cum emboldening him. You look up at him while you suck his cock clean, smiling around him as you feel him getting soft in your mouth. He then pulls out of your mouth and tucks his dick back into his pants.'
-				*nl
-				'Without a word, your teacher walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he''s looking at you in the mirror. Finally, he smiles and says: "Feel free to cut class any time you like, <<$pcs_firstname>>. I''ll happily keep your secret." With a chuckle, he leaves - in fact, you think you can hear him whistling outside as he walks away.' 
-				'You go to the mirror yourself, clean yourself up and fix your hair. That wasn''t too bad, you think, and at least you have the rest of the period to yourself.'
-				gs 'arousal', 'bj', 5
+				gs 'arousal', 'bj', 10, 'dom'
 				gs 'arousal', 'end'
-				gs 'cum_call', 'mouth', $boy
 				gs 'stat'
-				if school_bunk = 0:
-					act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
-				else
-					act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
+				act 'Continue':
+					*clr & cla
+					gs 'stat'
+					'<center><b><font color="maroon">Girls bathroom</font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtcum.jpg"></center>'
+					'You pick up the pace even more, you want him finish soon. "I''m about to cum!" he mutters weakly, as if trying to warn you, but you don''t care and suck him even harder. He starts grunting and you feel his dick throbbing in your mouth, when he suddenly pulls your head away, his hand in your hair firmly gripping you.'
+					*nl
+					'As soon his dick loudly pops out of your mouth, he jerks it a couple of times while pointing it at you. It soon starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth. When he finishes, he rubs the tip of his dick against your lips and then shoves it back into your mouth, the sight of you covered in his cum emboldening him. You look up at him while you suck his cock clean, smiling around him as you feel him getting soft in your mouth. He then pulls out of your mouth and tucks his dick back into his pants.'
+					*nl
+					'Without a word, your teacher walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he''s looking at you in the mirror. Finally, he smiles and says: "Feel free to cut class any time you like, <<$pcs_firstname>>. I''ll happily keep your secret." With a chuckle, he leaves - in fact, you think you can hear him whistling outside as he walks away.' 
+					'You go to the mirror yourself, clean yourself up and fix your hair. That wasn''t too bad, you think, and at least you have the rest of the period to yourself. Still, you wonder what he was doing in the girls bathroom in the first place.'
+					if school_bunk = 0:
+						act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
+					else
+						act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
+					end
 				end
 			end
 		end
 	end
 	act 'Offer sex':
 		*clr & cla
-		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
+		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/bendover.jpg"></center>'
-		'You get up and walk past him, out of the stall, then bend over against the wall. One of your hands runs down to your ass and you hike your skirt a bit, then a bit more... then a little bit more, just enough to see a hint of your crotch. All the while, you are looking at Mr. Vasilyev over your shoulder. "I know I''ve been a bad, bad girl... and I don''t want any demerits. If you don''t report me, sir, I will let you fuck me." You follow your offer up with an inviting wiggle of your ass.'
-
-		gs 'gschool_events', 'sweet', 'sex'
-		if rand(1,100) < Sweet_talk:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
-			'Mr. Vasilyev looks at you and snorts. "Please don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "Come on, I''m taking you to the principal''s office."'
-			'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
-			act 'Go to principal''s office':
-				demerit += 10
-				if school_bunk = 1:demerit += 5
-				gt 'gschool_office', 'principal'
-			end
-		else
+		'You get up and walk past him, out of the stall, then bend over against the wall. One of your hands runs down to your ass and you hike your skirt a bit, then a bit more... then a little bit more, just enough to see a hint of your crotch. All the while, you are looking at him over your shoulder. "I know I''ve been a bad, bad girl... and I don''t want any demerits. If you don''t report me, sir, I will let you fuck me." You follow your offer up with an inviting wiggle of your ass.'
+		act 'Continue':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
-			'Mr. Vasilyev looks at you for a long moment. You can tell that he is seriously considering his options; you can also see one of those ''options'' getting hard in his pants while he stares at your ass. You smile and tug at your skirt, causing it to rise and fall just a tiny bit every time. Only a few seconds later, he walks towards you, pulling out his dick and stroking it. When he reaches you, he pushes you down. "Get on your knees and give me a blowjob."'
-			'You do as he says and reach out for his cock.'
-			act 'Blow him':
-				*clr & cla
-				gs 'boyStat', 'A128'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtbj.jpg"></center>'
-				'You stroke his dick a few times until it is fully hard, then lean forward and start licking it; you lick up and down the shaft and run your tongue around the head, your eyes locked with his all the while before you smile at him and take his <<dick>>cm <<$dick_girth>> cock into your mouth. You wrap your <<$liptalk>> tightly around his dick and start bobbing your head, stroking his cock with your lips, your tongue still making its rounds. He rests one hand on the top of your head, but he lets you completely control the action.'
-					*nl
-					'You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him as deep into your mouth as you can without gagging.'
-				$orgasm_or = 'no'
-				gs 'arousal', 'bj', 5
-				gs 'stat'
-				act 'Have sex':
+			gs 'gschool_events', 'sweet', 'sex'
+			if rand(1,100) < Sweet_talk:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
+				'Your teacher looks at you and snorts. "Please don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
+				'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
+				act 'Go to principal''s office':
+					demerit += 10
+					if school_bunk = 1:demerit += 5
+					gt 'gschool_office', 'principal'
+				end
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
+				'Your teacher looks at you for a long moment. You can tell that he is seriously considering his options; you can also see one of those ''options'' getting hard in his pants while he stares at your ass. You smile and tug at your skirt, causing it to rise and fall just a tiny bit every time. Only a few seconds later, he walks towards you while pulling out his dick and stroking it. When he reaches you, he pushes you down. "Get on your knees and give me a blowjob."' 
+				'You do as he says and reach out for his cock.'
+				act 'Suck him':
 					*clr & cla
-					sexcontra = 3
-					'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtsex.jpg"></center>'
-					if $pantyworntype = 'true':
-						'He has you get up on one of the sinks while pulling your skirt up. His fingers find your pussy a few moments later and it seems he''s making sure you are good and wet. Then you see a condom in his hand and he puts it on. As he does that, you try to get comfortable, but it is not easy with the faucet jabbing you in the back.'
-					else
-						'He has you get up on one of the sinks, pushes up your skirt all the way and pulls down your panties, tossing them aside. His fingers find your pussy a few moments later and it seems he''s making sure you are good and wet. Then you see a condom in his hand and he puts it on. As he does that, you try to get comfortable, but it is not easy with the faucet jabbing you in the back.'
-					end
+					gs 'boyStat', 'A128'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtbj.jpg"></center>'
+					'You stroke his dick a few times until it is fully hard, then lean forward and start licking it; you lick up and down the shaft and run your tongue around the head, your eyes locked with his all the while before you smile at him and take his <<dick>>cm <<$dick_girth>> cock into your mouth. You wrap your <<$liptalk>> tightly around his dick and start bobbing your head, stroking his cock with your lips, your tongue still making its rounds. He rests one hand on the top of your head, but he lets you completely control the action.'
 					*nl
-					'Once the condom is in place, he rubs the tip of his dick against your pussy lips, making sure it is well lubricated, then gently pushes his <<dick>>cm <<$dick_girth>> cock inside you, causing you to gasp. His movements are slow and he is taking all the time in the world to work his way deeper into you, one of his hands rubbing your clit all the while. You groan in pleasure; you hardly even notice the faucet jabbing into your back anymore.'
-					*nl
-					'He might have been slow at first, but he''s steadily picking up the pace now that he is balls deep inside you; he stays gentle with you the whole time, though, and keeps stimulating your clit and occasionally kneads your breasts as well. You didn''t expect this to feel so good and cry out, "Oh God! Fuck me, Mr. Vasilyev! Fuck me harder!" He smiles and indeed gets a little rougher with you. Once or twice, he lifts his fingers from your wet pussy and sticks them into your mouth for you to suck them, tasting your own juices.'
-					$orgasm_txt = 'With an unexpectedly considerate lover like that, it doesn''t take long until you orgasm and you scream out your ecstasy, your wet folds twitching around Mr. Vasilyev''s hard cock.'
-					$orgasm_or = 'custom'
-					gs 'arousal', 'vaginal', 10
-					$orgasm_txt = 'He doesn''t let up, though, and his stamina seems to know no limit. A second orgasm and even a third shake you before he finally starts to grunt.'
-					$orgasm_or = 'custom'
-					gs 'arousal', 'vaginal', 5
-					$orgasm_txt = ''
-					$orgasm_or = 'custom'
-					gs 'arousal', 'vaginal', 5
+					'You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him as deep into your mouth as you can without gagging.'
+					gs 'arousal', 'bj', 5, 'dom'
 					gs 'stat'
-					act 'Continue':
-						*clr & cla
-						gs 'arousal', 'end'
-						gs 'cum_call', 'mouth', $boy
-						'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtcum.jpg"></center>'
-						'Mr. Vasilyev pulls out of you and drags you off the sink, gently pushing you down to your knees while he gets rid of the condom. He holding his dick near your face, right in front of your mouth, and jerks it a couple of times. It starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth, a small flood of white he must have been saving up for several days, at least. When the well in his balls dries up, he rubs the tip of his dick against your lips and then shoves it back into your mouth, the sight of you covered in his cum emboldening him. You look up at him while you suck his cock clean, smiling around him as you feel him getting soft in your mouth. He pulls himself out of your mouth again and tucks his dick back into his pants.'
-						*nl
-						'Without a word, Mr. Vasilyev walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he''s giving you sideways glances. Finally, he smiles. "Feel free to cut class any time you like, <<$pcs_firstname>>. I''ll happily keep your secret."'
-						'You smile back, "If I get ''punished'' like that every time I skip class, I will." He chuckles at that, shakes his head, then leaves the bathroom - you think you can hear him whistling outside as he walks away. You get up to the mirror now and clean yourself up and fix your hair. That was amazing and you have the rest of the period to yourself.'
-						if school_bunk = 0:
-							act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
-						else
-							act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
+					'He enjoys your blowjob in silence and after several minutes.'
+					if pcs_vag = 0:
+						act 'Cum':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtcum.jpg"></center>'
+							'You suck him for a little bit longer but then he starts to moan and he pulls his dick out of your mouth. He holds his dick near your face, right in front of your mouth, and jerks it a couple of times. It starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth. When he finishes, he rubs the tip of his dick against your lips and then shoves it back into your mouth, the sight of you covered in his cum emboldening him. You look up at him while you suck his cock clean, smiling around him as you feel him getting soft in your mouth. He pulls out of your mouth and tucks his dick back into his pants.'
+							*nl
+							'Without a word, he walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he''s giving you sideways glances. Finally, he smiles and says: "Feel free to cut class any time you like, <<$pcs_firstname>>. I''ll happily keep your secret."' 
+							'You smile back. "If I get ''punished'' like that every time I skip class, I will." He chuckles at that, shakes his head, then leaves the bathroom - you think you can hear him whistling outside as he walks away. That was amazing and you also have the rest of the period to yourself, even if you have his cum dripping down your face.'
+							gs 'cum_call', 'face', 'A128', 1
+							gs 'arousal', 'end'
+							if school_bunk = 0:
+								act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
+							else
+								act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
+							end
+						end
+					else
+						act 'Continue':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughteat.jpg"></center>'
+							if $pantyworntype = 'true':
+						        'He grabs you and manhandles you until you are laying on your back on top of the toilet seat, while pushing your skirt up. His fingers find your pussy a few moments later and he rubs your clit as he gets down on his knees. Once down he lowers his face and starts licking your pussy eating you out, he is fairly talented at this. You just moan, as you lay back and enjoy it. Just as it starts to really feel good he stops, then you see a condom in his hand and he puts it on. As he does that, you try to get comfortable.'
+					        else
+							    'He grabs you and manhandles you until you are laying on your back on top of the toilet seat, pushes up your skirt all the way and pulls your panties off, tossing them aside. His fingers find your pussy a few moments later and he rubs your clit as he gets down on his knees. Once down he lowers his face and starts licking your pussy eating you out, he is fairly talented at this. You just moan, as you lay back and enjoy it. Just as it starts to really feel good he stops, then you see a condom in his hand and he puts it on. As he does that, you try to get comfortable.'
+							gs 'arousal', 'cuni', 5, 'dom'
+							gs 'stat'
+							act 'Continue':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtvag1.jpg"></center>'
+							    'Once the condom is in place, he rubs the tip of his dick against your pussy lips, making sure it is well lubricated, then gently pushes his <<dick>>cm <<$dick_girth>> cock inside you, causing you to gasp. His movements are slow and he is taking all the time in the world to work his way deeper into you, one of his hands rubbing your clit all the while. You moan in pleasure.'
+							    *nl
+							    'He might have been slow at first, but he''s steadily picking up the pace now that he is balls deep inside you; he stays gentle with you the whole time though and keeps stimulating your clit and occasionally kneads your breasts as well. You didn''t expect this to feel so good and cry out: "Oh God! Fuck me, sir! Fuck me harder!"'
+								'Just then he stops and pulls out of you, as he does, he says. "Get up and bend over."'
+								gs 'arousal', 'vaginal', 10, 'dom'
+							    gs 'stat'
+								act 'Bend over':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtvag2.jpg"></center>'
+									'You get up and kneel one knee on the toilet seat and the other foot on the floor, as you bend over in front of him. He smiles and slides his dick back into your wet pussy, indeed he gets a little rougher with you. Once or twice, he even smacks your ass cheeks as he fucks you doggy style over the toilet.'
+									gs 'arousal', 'vaginal', 10, 'dom'
+									gs 'stat'
+									act 'Keep getting fucked':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtvag3.jpg"></center>'
+										'He keeps fucking you, not to hard and fast, but a nice stead pace. Just a little rough with out being to rough, he seems he wants you to enjoy this as much as he is. For several more minutes he fucks you like this until he starts moaning loudly.'
+										$orgasm_txt = 'With an unexpectedly considerate lover like that, it doesn''t take long until you orgasm and scream out your ecstasy, your wet folds twitching around your teacher''s hard cock. He doesn''t let up though, and his stamina seems to know no limit, violating your pussy in all the right ways. A second orgasm and even a third shake you before he finally starts to grunt.'
+										$orgasm_or = 'custom'
+										gs 'arousal', 'vaginal', 10, 'dom'
+										gs 'stat'
+										act 'Cum':
+											*clr & cla
+											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtcum.jpg"></center>'
+											'Your teacher pulls out of you and drags you off the toilet, gently pushing you down to your knees while he gets rid of the condom. He holding his dick near your face, right in front of your mouth, and jerks it a couple of times. It starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth. When he finishes, he rubs the tip of his dick against your lips and then shoves it back into your mouth, the sight of you covered in his cum emboldening him. You look up at him while you suck his cock clean, smiling around him as you feel him getting soft in your mouth. He pulls out of your mouth and tucks his dick back into his pants.'
+											*nl
+											'Without a word, he walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he''s giving you sideways glances. Finally, he smiles and says: "Feel free to cut class any time you like, <<$pcs_firstname>>. I''ll happily keep your secret."' 
+											'You smile back. "If I get ''punished'' like that every time I skip class, I will." He chuckles at that, shakes his head, then leaves the bathroom - you think you can hear him whistling outside as he walks away. That was amazing and you also have the rest of the period to yourself, even if you have his cum dripping down your face.'
+											gs 'cum_call', 'face', 'A128', 1
+											gs 'arousal', 'end'
+											if school_bunk = 0:
+												act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
+											else
+												act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
+											end
+										end
+									end
+								end
+                            end
 						end
 					end
 				end
@@ -1463,84 +1490,82 @@ if $ARGS[0] = 'caughtb2':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/caught.jpg"></center>'
 	'After a few minutes, you hear someone else in the bathroom with you. You peek out and see one of your teachers, Mr. Ivanov, standing at the mirror. You duck back into the stall, close the door as quietly as you can and sit down on the toilet, your heart beating like crazy, hoping he didn''t notice you. You hear his footsteps coming closer, closer... and stop, right outside your stall door.'
 	*nl
-	'"I saw you in the mirror, girl." he says menacingly as he pushes the door open. "What do you think you are doing in the boy''s room? Skipping class, I presume?"'
-	if school_bunk = 1:'His eyes fall on the smoldering cigarette on the ground and his eyes narrow. "And smoking in school too, huh? I shouldn''t be surprised."'
-	'Mr. Ivanov looks at you disgustedly. "Well, what are you waiting for, an invitation?! Get your ass out of here and over to the principal''s office!" He points at the bathroom door.'
-	'You don''t know what to say, if or how you could get out of this mess. He never really liked you and of course he knows you are supposed to be in class, so there''s no point in trying to lie to him about that, but maybe you can convince him to let you off with a warning or something.'
-	act 'Go to Principal''s Office':
-		demerit += 10
-		if school_bunk = 1:demerit += 5
-		gt 'gschool_office', 'principal'
-	end
-	act 'Sweet talk him':
-		*clr & cla
-		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-
-		gs 'gschool_events', 'sweet', 'normal'
-		if rand(1,100) < Sweet_talk:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
-			'You hang your head and feign shame as best you can. "I know, and I''m sorry Mr. Ivanov, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have, but I couldn''t help it." You give him a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
-			'Mr. Ivanov snorts. "Do you think I''m stupid, girl?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "We are going to the principal''s office, right now!"'
-			'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
-			act 'Go to principal''s office':
-				demerit += 10
-				if school_bunk = 1:demerit += 5
-				gt 'gschool_office', 'principal'
-			end
-		else
+	if Ivanov_toilet = 1
+		'"I saw you in the mirror, girl." he says menacingly as he pushes the door open, the menacing look is replaced with a hungry, lustful one.  "Well well well, what do we have here? My new little slut, well you know the drill." He waits a moment and when you don''t move. "Strip now!"'
+		act 'Strip': gt 'gschool_boys_bathroom', 'caughtb2_slut'
+		act 'Refuse':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sweettalk'+rand(1,2)+'.jpg"></center>'
-			'You hang your head and feign shame as best you can. "I know, and I''m sorry Mr. Vasilyev, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have but I couldn''t help it." You give him a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
-			'Mr. Ivanov gives you a long, hard look. You can see a vein twitch at his temple and he seems to be struggling with himself but, eventually, he nods curtly. "Okay." he hisses."I''ll let you off with a warning today Miss <<$pcs_lastname>>, but I expect you to be at the top of my class and, so help me god, if I find out you''re cutting class again..." he trails off meaningfully. "Do we understand each other?" You nod vehemently - you definitely don''t want to get caught by him again. Without another word, he turns and walks out of sight. You think you can hear him mutter and curse under his breath but a few seconds later, the bathroom door closes and the room is quiet again.'
-			if school_bunk = 0:
-				act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
+			'His eye glint in anger. "You either do what I tell you like a good little slut, or I will haul you to the principal''s office and tell her how I caught you taking drugs, but you flushed them before I could take them from you."'
+			'You look at him shocked. "I wasn''t doing drugs."'
+			'He laughs. "Who is she going to believe, someone with your rep or me? Now we both know the answer to that one, you will get suspended, is that what you want?"'
+			act 'Strip': gt 'gschool_boys_bathroom', 'caughtb2_slut'
+			gs 'willpower', 'sex', 'resist', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Refuse (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					'You shake your head. "No! I''m not your whore."'
+					'He laughs. "Suit yourself, maybe next time you will reconsider my kind offer." With that he drags you by the arm to the principal''s office.'
+					act 'Go to Principal''s Office': gt 'gschool_office', 'ivanov_revenge'
+				end
 			else
-				act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
+				act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-	end
-
-	act 'Suggest a blowjob':
-		*clr & cla
-		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
-		'You get down on your knees in front of him and hike up your skirt just a little bit to reveal more of your legs. When you are sure you have his eyes on you, you look up at him and suggestively lick your lips. "You seem tense, sir. How about I help you relax a little bit and you just pretend you didn''t see me here?"'
-
-		gs 'gschool_events', 'sweet', 'sex'
-		if rand(1,100) < Sweet_talk:
+	elseif (grupTipe = 4 and hotcat >= 6 and pav_slut > 150):
+		'"I saw you in the mirror, girl." he says menacingly as he pushes the door open, the menacing look is replaced with a hungry, lustful one. "Well well well, what do we have here? A little gopnik whore, I remember girls like you from school, always spreading those legs for any boy that would look your way." He waits a moment and when you don''t move. "Strip now!"'
+		act 'Strip': gt 'gschool_boys_bathroom', 'caughtb2_slut'
+		act 'Refuse':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
-			'Mr. Ivanov snorts. "Don''t embarrass yourself, girl. Do you really think that acting like a prostitute would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "We are going to the principal''s office, right now!" And so you do.'
-			'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
-			act 'Go to principal''s office':
-				demerit += 10
-				if school_bunk = 1:demerit += 5
-				gt 'gschool_office', 'principal'
+			'His eye glint in anger. "You either do what I tell you like a good little slut, or I will haul you to the principal''s office and tell her how I caught you taking drugs, but you flushed them before I could take them from you."'
+			'You look at him shocked. "I wasn''t doing drugs."'
+			'He laughs. "Who is she going to believe, someone with your rep or me? Now we both know the answer to that one, you will get suspended, is that what you want?"'
+			act 'Strip': gt 'gschool_boys_bathroom', 'caughtb2_slut'
+			gs 'willpower', 'sex', 'resist', 'hard'
+			if will_cost <= pcs_willpwr:
+				act 'Refuse (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					'You shake your head. "No! I''m not your whore."'
+					'He laughs. "Suit yourself, maybe next time you will reconsider my kind offer." With that he drags you by the arm to the principal''s office.'
+					act 'Go to Principal''s Office': gt 'gschool_office', 'ivanov_revenge'
+				end
+			else
+				act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
+		end
+	else
+		'"I saw you in the mirror, girl." he says menacingly as he pushes the door open. "What do you think you are doing in the boy''s room? Skipping class, I presume?"'
+		if school_bunk = 1:'His eyes fall on the smoldering cigarette on the ground and his eyes narrow. "And smoking in school too, huh? I shouldn''t be surprised."'
+		'Mr. Ivanov looks at you disgustedly. "Well, what are you waiting for, an invitation?! Get your ass out of here and over to the principal''s office!" He points at the bathroom door.'
+		'You don''t know what to say, if or how you could get out of this mess. He never really liked you and of course he knows you are supposed to be in class, so there''s no point in trying to lie to him about that, but maybe you can convince him to let you off with a warning or something.'
+		act 'Go to Principal''s Office':
+			demerit += 10
+			if school_bunk = 1:demerit += 5
+			gt 'gschool_office', 'principal'
+		end
+		act 'Sweet talk him':
 			*clr & cla
-			gs 'boyStat', 'A129'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtbj.jpg"></center>'
-			'He looks down at you and, one second later, unzips his pants and pulls his dick out. It is not even hard yet, but he seems to have made his choice and so you stroke his dick a few times until it is rock hard, then lean forward and start licking it; you lick up and down the shaft and run your tongue around the head while looking up at him to gauge his nonexistent reaction, before you take his <<dick>>cm <<$dick_girth>> cock into your mouth. You wrap your <<$liptalk>> tightly around his dick when you feel him grab the back of your head and shove your head down, forcing his dick deep into your mouth and down your throat. You start gagging almost at once, but he doesn''t relent - he pulls out briefly, only to shove his cock right back in.'
-			*nl
-			'You have no control over what is happening and so, in the hopes of speeding this up, caress and fondle his balls with one of your hands while he fucks your head. "That''s right, you dirty little slut, take my cock! Gag on it!" He continues to say demeaning things like that as he jams his cock down your throat over and over again. Making you gag seems to be what he enjoys the most.'
-			gs 'arousal', 'bj', 10, 'deepthroat'
-			gs 'stat'
-			act 'Continue':
+			gs 'gschool_events', 'sweet', 'normal'
+			if rand(1,100) < Sweet_talk:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
+				'You hang your head and feign shame as best you can. "I know, and I''m sorry Mr. Ivanov, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have, but I couldn''t help it." You give him a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
+				'Mr. Ivanov snorts. "Do you think I''m stupid, girl?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "We are going to the principal''s office, right now!"'
+				'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
+				act 'Go to principal''s office':
+					demerit += 10
+					if school_bunk = 1:demerit += 5
+					gt 'gschool_office', 'principal'
+				end
+			else
 				*clr & cla
-				'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtcum.jpg"></center>'
-				'He picks up the pace even more, barely even giving you a moment to catch your breath anymore. Drool leaks out of your mouth, dripping down your chin, and tears are running down your cheeks. Without warning, he starts grunting and you feel his dick throbbing in your mouth before he suddenly jerks your head away, pulling your hair painfully in the process and twisting your neck slightly.'
-				*nl
-				'As soon his dick is out of your mouth, he jerks it a few times while pointing it at you. It starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth. Once the last spurt of sperm is out, he shoves his cock back into your mouth and you dutifully lick him clean, feeling him go limp in your mouth. He pulls out of your mouth and tucks his dick back into his pants.'
-				*nl
-				'Wordlessly, Mr. Ivanov walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he''s looking at you in the mirror. He gives you a cold smile. "Don''t think this will get me to cut you any slack in my class, <<$pcs_lastname>>. And don''t you <i>dare</i> skip my lessons. I''ll be seeing you soon." With that, he walks out of the bathroom.'
-				*nl
-				'You go to the mirror yourself and clean yourself up and fix your hair. Your throat is burning and you like Mr. Ivanov even less than ever before, but you are also kind of glad you didn''t have to go the principal. You also have the rest of the period to yourself.'
-				gs 'arousal', 'bj', 10, 'deepthroat'
-				gs 'arousal', 'end'
-				gs 'cum_call', 'mouth', $boy
-				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sweettalk'+rand(1,2)+'.jpg"></center>'
+				'You hang your head and feign shame as best you can. "I know, and I''m sorry Mr. Vasilyev, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have but I couldn''t help it." You give him a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
+				'Mr. Ivanov gives you a long, hard look. You can see a vein twitch at his temple and he seems to be struggling with himself but, eventually, he nods curtly. "Okay." he hisses."I''ll let you off with a warning today Miss <<$pcs_lastname>>, but I expect you to be at the top of my class and, so help me god, if I find out you''re cutting class again..." he trails off meaningfully. "Do we understand each other?" You nod vehemently - you definitely don''t want to get caught by him again. Without another word, he turns and walks out of sight. You think you can hear him mutter and curse under his breath but a few seconds later, the bathroom door closes and the room is quiet again.'
 				if school_bunk = 0:
 					act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
 				else
@@ -1548,72 +1573,175 @@ if $ARGS[0] = 'caughtb2':
 				end
 			end
 		end
-	end
-
-	act 'Offer sex':
-		*clr & cla
-		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/bendover.jpg"></center>'
-		'You get up and walk past him, out of the stall, then bend over against the wall. One of your hands runs down to your ass and you hike the skirt a bit, then a bit more... then a little bit more, just enough to see a hint of your crotch. All the while, you are looking at Mr. Ivanov over your shoulder. "I know I''ve been a bad, bad girl... and I don''t want any demerits. If you don''t report me, sir, I will let you fuck me." You follow your offer up with an inviting wiggle of your butt.'
-
-		gs 'gschool_events', 'sweet', 'sex'
-		if rand(1,100) < Sweet_talk:
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
-			'Mr. Ivanov snorts. "Don''t embarrass yourself, girl. Do you really think that acting like a prostitute would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall and leads you out of the bathroom. "We are going to the principal''s office, right now!"'
-			'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
-			act 'Go to principal''s office':
-				demerit += 10
-				if school_bunk = 1:demerit += 5
-				gt 'gschool_office', 'principal'
-			end
-		else
+		act 'Suggest a blowjob':
 			*clr & cla
+			'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
-			'Mr. Ivanov looks at you for a long moment. You can tell that he is seriously considering his options; you can also see one of those ''options'' getting hard in his pants while he stares at your ass. You smile and tug at your skirt, causing it to rise and fall just a tiny bit every time. Only a few seconds later, he walks towards you, pulling out his dick and stroking it. When he reaches you, he roughly pulls off your skirt and undresses you, tossing your clothes haphazardly around the bathroom. Once you are stark naked, he pushes you down.'
-			'"Get on your knees and suck my cock, like the good little slut you are," he commands as he pulls his dick out in front of your face.'
-			act 'Blow him':
+			'You get down on your knees in front of him and hike up your skirt just a little bit to reveal more of your legs. When you are sure you have his eyes on you, you look up at him and suggestively lick your lips. "You seem tense, sir. How about I help you relax a little bit and you just pretend you didn''t see me here?"'
+			gs 'gschool_events', 'sweet', 'sex'
+			if rand(1,100) < Sweet_talk:
 				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
+				'Mr. Ivanov snorts. "Don''t embarrass yourself, girl. Do you really think that acting like a prostitute would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "We are going to the principal''s office, right now!" And so you do.'
+				'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
+				act 'Go to principal''s office':
+					demerit += 10
+					if school_bunk = 1:demerit += 5
+					gt 'gschool_office', 'principal'
+				end
+			else
+				*clr & cla
+				Ivanov_toilet = 1
 				gs 'boyStat', 'A129'
-				$orgasm_or = 'no'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtbj.jpg"></center>'
-				'You do as you are told and stroke his dick a few times until it is fully hard, then lean forward and start licking it; you lick up and down the shaft and run your tongue around the head while looking up at him to gauge his nonexistent reaction, before you take his <<dick>>cm <<$dick_girth>> cock into your mouth. You wrap your <<$liptalk>> tightly around his dick and start bobbing your head, stroking his cock with your lips, your tongue still making its rounds. He rests one hand on the top of your head, but he lets you control the action.'
-				*nl
-				'You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him as deep into your mouth as you can without gagging. He enjoys your blowjob in silence and after several minutes of this, he grabs you by the hair and roughly pulls you up and over to the sinks.'
-				gs 'arousal', 'bj', 5
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtbj1.jpg"></center>'
+				'He looks down at you and, one second later, unzips his pants and pulls his dick out. It is not even hard yet, but he seems to have made his choice and so you stroke his dick a few times until it is rock hard, then lean forward and start licking it; you lick up and down the shaft and run your tongue around the head while looking up at him to gauge his nonexistent reaction, before you take his <<dick>>cm <<$dick_girth>> cock into your mouth. You wrap your <<$liptalk>> tightly around his dick when you feel him grab the back of your head and shove your head down, forcing his dick deep into your mouth and down your throat. You start gagging almost at once, but he doesn''t relent - he pulls out briefly, only to shove his cock right back in.'
+				gs 'arousal', 'bj', 10, 'deepthroat'
 				gs 'stat'
-				act 'Anal':
+				act 'Continue':
 					*clr & cla
-					Ivanov_toilet = 1
-					'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtanal.jpg"></center>'
-					'Mr. Ivanov has you get up on one of the sinks and rubs his fingers against your pussy. When he notices that you are relatively wet, he slips them inside, fingerfucking you to lubricate his fingers with your juices and eliciting soft moans from you. He keeps rubbing his wet fingers all over his dick before shoving them back in, repeating the process every few strokes. The third time he pulls his fingers out of you, however, he rubs them against your asshole instead and slips one of them inside your puckered hole. You moan in pleasure, with a little bit of pain mixed in, then louder when he adds a second finger and have to bite your lip and flinch a little when he shoves the third one. Mr. Ivanov gets your asshole lubed up and stretches it out a bit, and you doubt he''s only doing that for the fun of it.'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtbj2.jpg"></center>'
+					'You have no control over what is happening and so, in the hopes of speeding this up, caress and fondle his balls with one of your hands while he fucks your head. "That''s right, you dirty little slut, take my cock! Gag on it!" He continues to say demeaning things like that as he jams his cock down your throat over and over again. Making you gag seems to be what he enjoys the most.'
 					*nl
-					'When he feels you are sufficiently prepared, he rubs the tip of his dick against your backdoor and, once he has it good and lined up, he shoves his <<dick>>cm <<$dick_girth>> cock into your ass. You groan loudly in pleasure and pain, and barely even notice the faucet jabbing you in the back. He wraps his hands around one of your thighs to hold you in place, but with the mirror behind you, you have nowhere to go anyway. In a few uncomfortable strokes, he shoves his cock all the way into your bowels until he is balls deep inside. You cry out at the last stroke, the pain too intense to keep quiet, and he pauses for a moment to give your ass a little time to adjust, but once that grace period is over, he begins the proper fucking.'
-					*nl
-					'He quickly works up the speed of his thrusts and is soon pounding your ass balls deep with every stroke, slamming your shoulders against the mirror with each hard thrust. He grunts, clearly taking pleasure from violating your ass like that, and you too can''t deny that a part of you loves being pounded like this as you''re rubbing your clit.'
-					$orgasm_txt = 'Despite the rough treatment he is giving your ass, you feel an orgasm roll in and when it hits with loud screams, Mr. Ivanov has to slow down and hold you down so you don''t fall off the sink.'
-					gs 'arousal', 'vaginal_finger', 4
-					gs 'arousal', 'anal_finger', 1,'lube'
-					$orgasm_or = 'custom'
-					gs 'arousal', 'anal', 15, 'rough'
+					'He picks up the pace even more, barely even giving you a moment to catch your breath anymore. Drool leaks out of your mouth, dripping down your chin, and tears are running down your cheeks. Without warning, he starts grunting and you feel his dick throbbing in your mouth before he suddenly jerks your head away, pulling your hair painfully in the process and twisting your neck slightly.'
+					gs 'arousal', 'bj', 10, 'deepthroat'
 					gs 'stat'
 					act 'Continue':
 						*clr & cla
-						gs 'cum_call', 'mouth', $boy
-						'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtcum.jpg"></center>'
-						'Your climax has barely ebbed off when Mr. Ivanov pulls out of you and then drags you off the sink, roughly shoving you down onto your knees. He immediately pushes his dick into your mouth and starts fucking you. You can taste your own ass on his dick, but he gives you no choice, holding you tight by your hair, keeping your head in place as he violates your throat.'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/teachercum.jpg"></center>'
+						'As soon his dick is out of your mouth, he jerks it a few times while pointing it at you. It starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth. Once the last spurt of sperm is out, he shoves his cock back into your mouth and you dutifully lick him clean, feeling him go limp in your mouth. He pulls out of your mouth and tucks his dick back into his pants.'
+						*nl
+						'Wordlessly, Mr. Ivanov walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he''s looking at you in the mirror. He gives you a cold smile. "Don''t think this will get me to cut you any slack in my class, <<$pcs_lastname>>. And don''t you <i>dare</i> skip my lessons. I''ll be seeing you soon." With that, he walks out of the bathroom.'
+						*nl
+						'Your throat is burning and you like Mr. Ivanov even less than ever before, you think to yourself as you watch him walk out with droplets of his cum run down your fave. At least you are also kind of glad you didn''t have to go the principal. You also have the rest of the period to yourself.'
+						gs 'arousal', 'end'
+						gs 'cum_call', 'face', 'A129', 1
+						gs 'stat'
+						if school_bunk = 0:
+							act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
+						else
+							act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
+						end
+					end
+				end
+			end
+		end
+		act 'Offer sex':
+			*clr & cla
+			'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/bendover.jpg"></center>'
+			'You get up and walk past him, out of the stall, then bend over against the wall. One of your hands runs down to your ass and you hike the skirt a bit, then a bit more... then a little bit more, just enough to see a hint of your crotch. All the while, you are looking at Mr. Ivanov over your shoulder. "I know I''ve been a bad, bad girl... and I don''t want any demerits. If you don''t report me, sir, I will let you fuck me." You follow your offer up with an inviting wiggle of your butt.'
+			gs 'gschool_events', 'sweet', 'sex'
+			if rand(1,100) < Sweet_talk:
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
+				'Mr. Ivanov snorts. "Don''t embarrass yourself, girl. Do you really think that acting like a prostitute would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall and leads you out of the bathroom. "We are going to the principal''s office, right now!"'
+				'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
+				act 'Go to principal''s office':
+					demerit += 10
+					if school_bunk = 1:demerit += 5
+					gt 'gschool_office', 'principal'
+				end
+			else
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
+				'Mr. Ivanov looks at you for a long moment. You can tell that he is seriously considering his options; you can also see one of those ''options'' getting hard in his pants while he stares at your ass. You smile and tug at your skirt, causing it to rise and fall just a tiny bit every time. Only a few seconds later, he walks towards you, pulling out his dick and stroking it. When he reaches you, he roughly pulls off your skirt and undresses you, tossing your clothes haphazardly around the bathroom. Once you are stark naked, he pushes you down.'
+				'"Get on your knees and suck my cock, like the good little slut you are," he commands as he pulls his dick out in front of your face.'
+				act 'Blow him':
+					*clr & cla
+					gs 'boyStat', 'A129'
+					$orgasm_or = 'no'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtbj1.jpg"></center>'
+					'You do as you are told and stroke his dick a few times until it is fully hard, then lean forward and start licking it; you lick up and down the shaft and run your tongue around the head while looking up at him to gauge his nonexistent reaction, before you take his <<dick>>cm <<$dick_girth>> cock into your mouth. You wrap your <<$liptalk>> tightly around his dick and start bobbing your head, stroking his cock with your lips, your tongue still making its rounds. He rests one hand on the top of your head, but he lets you control the action.'
+					*nl
+					'You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him as deep into your mouth as you can without gagging. He enjoys your blowjob in silence and after several minutes of this, he grabs you by the hair and roughly pulls you up and bends you over.'
+					gs 'arousal', 'bj', 5
+					gs 'stat'
+					act 'Anal':
+						*clr & cla
+						Ivanov_toilet = 1
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtanal.jpg"></center>'
+						'Once you are bent over in the stall Mr. Ivanov, rubs his fingers against your pussy. When he notices that you are relatively wet, he slips them inside, finger fucking you to lubricate his fingers with your juices and  he pulls his fingers out of you, he rubs them against your asshole and slips one of them inside your puckered hole. You moan in pleasure, with a little bit of pain mixed in, then louder when he adds a second finger and have to bite your lip and flinch a little when he shoves the third one. Mr. Ivanov gets your asshole lubed up and stretches it out a bit, and you doubt he''s only doing that for the fun of it.'
 						*nl
-						'Next thing you know, you feel a spurts of hot cum hit the back of your throat. With a loud groan, he pulls out and the rest of the spurts of cum rain down on your lips, cheeks, chin, and also your chest and shoulders. Once the last spurt of sperm is out, he shoves his cock back into your mouth and you dutifully lick him clean, feeling him go limp in your mouth. He pulls out of your mouth and tucks his dick back into his pants.'
+						'When he feels you are sufficiently prepared, he rubs the tip of his dick against your backdoor and, uses one of his hands to spread your ass cheeks wide. Once he has your ass cheeks spread wide and his cock lined up, he shoves his <<dick>>cm <<$dick_girth>> cock into your ass. You groan loudly in pleasure and pain. In a few uncomfortable strokes, he shoves his cock all the way into your bowels until he is balls deep inside. You cry out at the last stroke, the pain too intense to keep quiet, and he doesn''t pauses to give your ass a little time to adjust, he just begins to give you a proper hard fucking.'
+						gs 'arousal', 'vaginal_finger', 4
+						gs 'arousal', 'anal_finger', 1,'lube'
+						gs 'arousal', 'anal', 5, 'rough'
+						gs 'stat'
+						act 'Anal':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtanal.jpg"></center>'
+							'He quickly works up the speed of his thrusts and is soon pounding your ass balls deep with every stroke, slamming your shoulders against the mirror with each hard thrust. He grunts, clearly taking pleasure from violating your ass like that, and you too can''t deny that a part of you loves being pounded like this as you''re rubbing your clit.'
+							$orgasm_txt = 'Despite the rough treatment he is giving your ass, you feel an orgasm roll in and when it hits with loud screams, Mr. Ivanov fucks you even harder as you orgasm, he pounds your ass all the way through your orgasm.'
+							$orgasm_or = 'custom'
+							gs 'arousal', 'anal', 10, 'rough'
+							gs 'stat'
+							act 'Continue':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtcum.jpg"></center>'
+								'Next thing you know, you feel a spurts of hot cum filling your ass. With a loud groan, he buries his cock balls deep up your ass. You feel his dick twitching as he blows his load deep inside of you. He pulls out of your gapping ass, you can feel his cum leaking out of you, as tucks his dick back into his pants.'
+								*nl
+								'Wordlessly, Mr. Ivanov walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see he is giving you sideways glances. He breaks his silence with a cruel smile. "We will be doing this again, <<$pcs_lastname>>. Next time I feel like it, I will keep you after class and fuck that cute little ass of yours." He laughs and, without waiting for a reply from you, walks out of the bathroom.'
+								*nl
+								'You go to the mirror yourself and clean yourself up and fix your hair. Your ass and throat are burning and his ''promise'' still rings in your ears. You are also kind of glad you didn''t have to go the principal and you also have the rest of the period to yourself.'
+								gs 'cum_call', 'anus', 'A129', 1
+								gs 'arousal', 'end'
+								gs 'stat'
+								if school_bunk = 0:
+									act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
+								else
+									act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'caughtb2_slut':
+	*clr & cla
+	menu_off = 1
+	gs 'boyStat', 'A129'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtbj1.jpg"></center>'
+	'You strip out of your clothes like he demands. Once you are completely naked, he roughly shoves you down to your knees, pulling his cock out. He rubs his cock against your lips and the pushes it between them, you open your mouth and let him stick his cock in your mouth. At this point there is no point fighting it. You start sucking his dick, but before long he just starts fucking your mouth instead.'
+	gs 'arousal', 'bj', 5, 'rough'
+	gs 'stat'
+	act 'Get mouth fucked':
+		*clr & cla
+		Ivanov_toilet = 1
+		gs 'boyStat', 'A129'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtbj2.jpg"></center>'
+		'He places his hand at the back of your head, to keep you from pulling away, as he jams his dick down your throat. As you gag on his <<dick>>cm <<$dick_girth>> dick, you feel his balls slap against your chin. You feel your own slobber running out of your mouth as he gags you over and over, violently deep throating you. Finally he pulls his dick out of your mouth and pulls you up to your feet by your hair. His slips one hand between your legs to your pussy and slides is fingers inside of you.'
+		*nl
+		if stat['vaginal'] = 0:
+			'He snorts in surprise. "Well I can''t believe a slut like you is still a virgin. Well that''s ok, you have another hole for fucking, isn''t that right?" He asks you rhetorically, as he still holding you by the hair turns you around and bends you over in the bathroom stall. While bent over you feel him spit between your ass cheeks and then his fingers work your spit into your asshole. Before you realize it, you feel the tip of his dick pressed up against you anus.'
+			gs 'arousal', 'bj', 5, 'rough', 'deepthroat'
+			gs 'stat'
+			act 'Get butt fucked':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtanal1.jpg"></center>'
+				'He holds onto your hip with one hand, while the other grabs your ass cheek and spreads it wide. With that he forces his dick painfully into your ass, the spit on your ass and your slobber on his dick helps some. But not enough, as he soon forces his cock balls deep up your ass and just starts fucking it with out mercy. With each thrust you feel his balls slap against your slit. You grit your teeth against the pain and do your best to enjoy it.'
+				gs 'arousal', 'anal', 10, 'rough'
+				gs 'stat'
+				act 'Anal pounding':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtanal2.jpg"></center>'
+					'He grabs both of your hips and starts grunting with effort as he just hammers away at your ass with no regard for your feelings at all, in fact the more you groan in pain, or hiss, or make any other noise like you are not enjoying it, the harder he hammers himself into your butt. He seems to be getting off on your pain. Not wanting to give him the satisfaction, you bite you lower lip and do your best to not make any noise at all.'
+					gs 'arousal', 'anal', 10, 'rough'
+					gs 'stat'
+					act 'Cum filled':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtcum.jpg"></center>'
+						'After what feels like forever he finally gives one more thrust burying himself balls deep in your ass. You feel his dick start twitching, followed by the sensation of his hot cum filling your bowels. Once the last squirt of cum fills you, he pulls his dick out of you. As he puts his dick away you can feel his hot cum leaking out of your gapping asshole.'
 						*nl
 						'Wordlessly, Mr. Ivanov walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see he is giving you sideways glances. He breaks his silence with a cruel smile. "We will be doing this again, <<$pcs_lastname>>. Next time I feel like it, I will keep you after class and fuck that cute little ass of yours." He laughs and, without waiting for a reply from you, walks out of the bathroom.'
 						*nl
-						'You go to the mirror yourself and clean yourself up and fix your hair. Your ass and throat are burning and his ''promise'' still rings in your ears, but... well, there''s no denying that he made you cum really hard. You are also kind of glad you didn''t have to go the principal and you also have the rest of the period to yourself.'
-						gs 'arousal', 'bj', 10, 'sub','deepthroat'
+						'You go to the mirror yourself and clean yourself up and fix your hair. Your ass and throat are burning and his ''promise'' still rings in your ears. You are also kind of glad you didn''t have to go the principal and you also have the rest of the period to yourself.'
+						gs 'cum_call', 'anus', 'A129', 1
 						gs 'arousal', 'end'
 						gs 'stat'
-!!ToDo: This last one will eventually trigger one of my after class events. I am debating naming this teacher (nutluck)
 						if school_bunk = 0:
 							act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
 						else
@@ -1622,6 +1750,55 @@ if $ARGS[0] = 'caughtb2':
 					end
 				end
 			end
+		else
+			'He digs his fingers deep inside or you pussy. "Not surprising how loose you feel whore." He says, as he still holding you by the hair turns you around and bends you over in the bathroom stall. While bent over you feel the tip of his dick rubbing up and down against your slit, making you wet as he does.'
+			gs 'arousal', 'bj', 5, 'rough', 'deepthroat'
+			gs 'stat'
+			act 'Get fucked':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtvag1.jpg"></center>'
+				'He slides his dick into your wet twat, he at once starts fucking you hard and deep. Obviously not caring, as he doesn''t let you get warmed up before he starts hammering your cunt. His balls slap against your clit with each thrust, causing your to moan in pleasure. Which only encourages him to get harder and rougher with you.'
+				gs 'arousal', 'vaginal', 5, 'rough'
+				gs 'stat'
+				act 'Pussy pounding':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtvag2.jpg"></center>'
+					'He grunts with each thrust, seemingly enjoying himself a great deal. He doesn''t say anything to you, just pounds you. The only sound his his grunts, your moans and the slapping of his flesh against yours with each thrust. Then just as it is really starting to feel good he pulls out of your. "Lets see if your other hole is any tighter."'
+					gs 'arousal', 'vaginal', 5, 'rough'
+					gs 'stat'
+					act 'Get butt fucked':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtanal1.jpg"></center>'
+						'He holds onto your hip with one hand, while the other grabs your ass cheek and spreads it wide, then he spits on your butt hole. He uses his fingers to work the spit into you anus a moment, before you feel the tip of his cock pressed against your asshole. With that he forces his dick painfully into your ass, the spit on your ass and the wetness on his dick from your pussy helps some. He soon forces his cock balls deep up your ass and just starts fucking it with out mercy. "That''s better, at least your ass isn''t completely wore out, not yet anyways." He says with a laugh. With each thrust you feel his balls slap against your slit. You grit your teeth against the pain and do your best to enjoy it.'
+						gs 'arousal', 'anal', 5, 'rough'
+						gs 'stat'
+						act 'Anal pounding':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtanal2.jpg"></center>'
+							'He grabs both of your hips and starts grunting with effort as he just hammers away at your ass with no regard for your feelings at all, in fact the more you groan in pain, or hiss, or make any other noise like you are not enjoying it, the harder he hammers himself into your butt. He seems to be getting off on your pain. Not wanting to give him the satisfaction, you bite you lower lip and do your best to not make any noise at all.'
+							gs 'arousal', 'anal', 5, 'rough'
+							gs 'stat'
+							act 'Cum filled':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/caughtcum.jpg"></center>'
+								'After what feels like forever he finally gives one more thrust burying himself balls deep in your ass. You feel his dick start twitching, followed by the sensation of his hot cum filling your bowels. Once the last squirt of cum fills you, he pulls his dick out of you. As he puts his dick away you can feel his hot cum leaking out of your gapping asshole.'
+								*nl
+								'Wordlessly, Mr. Ivanov walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see he is giving you sideways glances. He breaks his silence with a cruel smile. "We will be doing this again, <<$pcs_lastname>>. Next time I feel like it, I will keep you after class and fuck that cute little ass of yours." He laughs and, without waiting for a reply from you, walks out of the bathroom.'
+								*nl
+								'You go to the mirror yourself and clean yourself up and fix your hair. Your ass and throat are burning and his ''promise'' still rings in your ears. You are also kind of glad you didn''t have to go the principal and you also have the rest of the period to yourself.'
+								gs 'cum_call', 'anus', 'A129', 1
+								gs 'arousal', 'end'
+								gs 'stat'
+								if school_bunk = 0:
+									act 'Continue to play on phone':gt 'gschool_boys_bathroom', 'bathroom2'
+								else
+									act 'Keep smoking':gt 'gschool_boys_bathroom', 'bathroom2'
+								end
+							end
+						end
+					end
+				end
+			end
 		end
 	end
 end

+ 60 - 16
locations/gschool_events.qsrc

@@ -364,10 +364,9 @@ if $ARGS[0] = 'break_events':
 			AlbinaBlockHumiliation = 1
 			minut += 60
 			'During the break, you are approached by Vitek and some other gopniks. "I know why you look so glum <<$pcs_nickname>>, you miss our cocks! Ain''t that right, cocksucker? Don''t worry, you can come with us and we''ll give you all the dick you want."'
-			*nl
-			'They tightly grab your arms and begin to drag you to the restrooms. Your futile attempts to resist are met with laughter and you are forcefully pulled along, hoping for some miracle to get you out of this nightmare. Just when you arrive at the restrooms, Albina suddenly blocks the doorway. They try to shove her out of the way and pull you into the restroom, but she stands firm and doesn''t budge an inch, glaring straight at Vitek. "Leave her alone and get the fuck out of here! If I see you pestering <<$pcs_nickname>> again, I''ll cut your balls off and feed them to your sister. Got it!?'
-			*nl
-			'The guys look at each other for a moment, stunned by the violent threat, before letting you go, cursing loudly as they storm off. You give Albina a weak smile in gratitude and she returns an encouraging nod and a pat on the shoulder before continuing on her way."'
+			'They tightly grab your arms and begin to drag you to the restrooms. Your futile attempts to resist are met with laughter and you are forcefully pulled along, hoping for some miracle to get you out of this nightmare. When you arrive at the restrooms, Albina suddenly blocks the doorway. They try to shove her out the way and pull you into the restroom, but she stands firm and doesn''t budge an inch, which annoys Vitek. "Get the fuck out of my way rich bitch! Or do you want to join us? I know you''d love having my dick in your ass, right between those big juicy cheeks of yours!" he says with a laugh and the others join in.' 
+			'Albina is not amused and gets right up in Vitek''s face. "Like I''d actually feel anything. My little pinky here is bigger than your micro dick. Now let <<$pcs_nickname>> go and fuck off! If I see you pestering her again, I''ll cut your little balls off and feed them to your sister. Got it!?'
+			'The other gopniks look at each other for a moment, both amused and stunned by what Albina said as Vitek stands fuming, his fists clenched in anger before he loudly scoffs and storms off. "Come on boys, these whores aren''t worth it. Let''s find a girl who actually knows what she''s good for!" The gopniks quickly let you go and follow Vitek away. You give Albina a weak smile in gratitude and she returns an encouraging nod and a pat on the shoulder before continuing on her way."'
 			gs 'gschool_events', 'leave_break_events'
 		else
 			'During the break, you are approached by some gopniks. "<<$pcs_firstname>>, I hear you''re an amazing cocksucker. I think you should show us. Come on, let''s go to a restroom and you can show us your skills."'
@@ -382,7 +381,7 @@ if $ARGS[0] = 'break_events':
 					gs 'fame', 'pav', 'sex', -1
 					npc_rel['A9'] -= 5
 					grupvalue[4] -= 5
-					'"Let me go or I will scream and then you will have to explain to the teachers exactly what it was you were trying to do to me." Vitek grabs you by the throat and slams you up against the wall, squeezing until you can''t breathe.'
+					'"Let me go or I''ll scream! Then you''ll have to explain to the teachers what you were trying to do to me." Vitek grabs you by the throat and slams you up against the wall, squeezing until you can''t breathe.'
 					*nl
 					'"You threatening me bitch? I should beat the shit out of you for that." He growls as you struggle in his grip, but his friends notice everyone is starting to stare at what is going on and they grab him by the arm.'
 					*nl
@@ -2022,8 +2021,7 @@ if $ARGS[0] = 'rand_scoolboy':
 		else
 			act 'Continue': gt 'gschool_events', 'leave_break_events2'
 		end
-!! or npcsex[r]	> 0 can be removed if all remnants of the old school ID-System are gone	
-	elseif npc_sex[$school_static_num] > 0 or npcsex[mid($school_static_num,2)] > 0:
+	elseif npc_sex[$school_static_num] > 0:
 		'You notice the confident stares of <<$rand_boy>>. It must''ve been him.'
 		act 'Taunt him':
 			*clr & cla
@@ -2291,6 +2289,14 @@ if $ARGS[0] = 'toilet_bj':
 end
 
 !!Sweet talk function
+!!I have a request for you, now that we have cha as a stat and spots that raise it can you adjust the sweet_talk I am thinking
+!!cha 1-20 = -20
+!!cha 21-40 = 0
+!!41-60 = +10
+!!61-80 = +20
+!!81-90 = +30
+!!91+ = +40
+!!so charisma matters on sweet talking
 if $ARGS[0] = 'sweet':
 	if $ARGS[1] = 'normal' or $ARGS[1] = '':
 		if pcs_grades >= 90:
@@ -2306,10 +2312,28 @@ if $ARGS[0] = 'sweet':
 		else
 			Sweet_talk = -20
 		end
-		if grupTipe = 3: Sweet_talk += 10
-		if grupTipe = 2: Sweet_talk += 10
-		if grupTipe = 1: Sweet_talk += 5
-		if grupTipe = 4: Sweet_talk -= 10
+		if grupTipe = 1:
+			Sweet_talk += 10
+		elseif grupTipe = 2:
+			Sweet_talk += 5
+		elseif grupTipe = 3:
+			Sweet_talk += 20
+		elseif grupTipe = 4:
+			Sweet_talk -= 10
+		end
+		if pcs_chrsm < 20:
+			Sweet_talk -= 20
+		elseif pcs_chrsm < 40:
+!! no change
+		elseif pcs_chrsm < 60:
+			Sweet_talk += 10
+		elseif pcs_chrsm < 80:
+			Sweet_talk += 20
+		elseif pcs_chrsm < 90:
+			Sweet_talk += 30
+		else
+			Sweet_talk += 40
+		end
 		sweet_talk += rand(0,10)
 		if hotcat < 5: Sweet_talk += (hotcat - 5) * 5
 	elseif $ARGS[1] = 'sex':
@@ -2326,12 +2350,32 @@ if $ARGS[0] = 'sweet':
 		else
 			Sweet_talk = 20
 		end
-		if grupTipe = 1: Sweet_talk += 10
-		if grupTipe = 2: Sweet_talk += 10
-		if grupTipe = 3: Sweet_talk -= 40
-		if grupTipe = 4: Sweet_talk += 20
+!!I tweaked the stats, I think it was backwards before with the nerds have a -40 which would have made sex more likely not less likely. I think now it is correct nerds less likely to get sex and the others more likely to get sex
+		if grupTipe = 1:
+			Sweet_talk -= 10
+		elseif grupTipe = 2:
+			Sweet_talk -= 10
+		elseif grupTipe = 3:
+			Sweet_talk += 40
+		elseif grupTipe = 4:
+			Sweet_talk -= 20
+		end
+		if pcs_chrsm < 20:
+			Sweet_talk -= 20
+		elseif pcs_chrsm < 40:
+!! no change
+		elseif pcs_chrsm < 60:
+			Sweet_talk += 10
+		elseif pcs_chrsm < 80:
+			Sweet_talk += 20
+		elseif pcs_chrsm < 90:
+			Sweet_talk += 30
+		else
+			Sweet_talk += 40
+		end
 		Sweet_talk += rand(15,35)
-		if hotcat < 5: Sweet_talk += (hotcat - 5) * 5
+!!tweaked hotcat as well, this one the better looking Sveta is the more likely they will accept sex, it was backwards before I think.
+		if hotcat < 5: Sweet_talk -= (hotcat - 5) * 5
 	end
 end
 

+ 194 - 89
locations/gschool_girls_bathroom.qsrc

@@ -697,16 +697,23 @@ if $ARGS[0] = 'caught1':
 	act 'Sweet talk her':
 		*clr & cla
 		gs 'gschool_events', 'sweet'
-		if rand(1,100) < Sweet_talk + 25:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/eartwist.jpg"></center>'
-			'You hang your head and feign shame as best you can. "I know, and I''m sorry Ms. Braakman. I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have, but I couldn''t help it." You give her a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
-			'Ms. Braakman looks at you in silence. For a moment, you think you''ve convinced her, but then you see something change in her eyes: She wasn''t angry before, but she definitely is now. "You <i>dare</i> lie to my face like that? Do you really think I''m dumb enough to fall for that?" She doesn''t give you a chance to reply but reaches out, grabs you by the arm and, with surprising strength, pulls you out of the stall before leading you out of the bathroom. "I''m taking you to the principal''s office. And you should pray that she''s feeling more lenient than I do right now."' 
-			*nl
-			'True to her word, she drags you around the school by your arm, furiously muttering under her breath, until you are standing in front of the principal''s office.'
-			act 'Go to Principal''s Office':
-				demerit += 10
-				if school_bunk = 1:demerit += 5
-				gt 'gschool_office', 'principal'
+		if rand(1,100) < Sweet_talk:
+			if pav_slut >= 200:
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/eartwist.jpg"></center>'
+				'You hang your head and feign shame as best you can. "I know, and I''m sorry Ms. Braakman. I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have, but I couldn''t help it." You give her a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
+				'Ms. Braakman looks at you in silence. For a moment, you think you''ve convinced her, but then you see something change in her eyes: She wasn''t angry before, but she definitely is now. "You <i>dare</i> lie to my face like that? Do you really think I''m dumb enough to fall for that? I know what kind of girl you are, everyone talks about what kind of girl you are." She doesn''t give you a chance to reply but you see something in her eye, maybe a glint of excitement. Then she reaches out, grabs you by the arm and, with surprising strength, pulls you out of the stall before leading you to the sinks. She pushes you forward, bending over the sink.'
+				act 'What now': gt 'gschool_girls_bathroom', 'caught1_slut_punishment'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/eartwist.jpg"></center>'
+				'You hang your head and feign shame as best you can. "I know, and I''m sorry Ms. Braakman. I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have, but I couldn''t help it." You give her a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
+				'Ms. Braakman looks at you in silence. For a moment, you think you''ve convinced her, but then you see something change in her eyes: She wasn''t angry before, but she definitely is now. "You <i>dare</i> lie to my face like that? Do you really think I''m dumb enough to fall for that?" She doesn''t give you a chance to reply but reaches out, grabs you by the arm and, with surprising strength, pulls you out of the stall before leading you out of the bathroom. "I''m taking you to the principal''s office. And you should pray that she''s feeling more lenient than I do right now."' 
+				*nl
+				'True to her word, she drags you around the school by your arm, furiously muttering under her breath, until you are standing in front of the principal''s office.'
+				act 'Go to Principal''s Office':
+					demerit += 10
+					if school_bunk = 1:demerit += 5
+					gt 'gschool_office', 'principal'
+				end
 			end
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sweettalk'+rand(1,2)+'.jpg"></center>'
@@ -727,7 +734,7 @@ if $ARGS[0] = 'caught1':
 		act 'Continue':
 			*clr & cla
 			gs 'gschool_events', 'sweet'
-			if rand(1,100) < Sweet_talk + 35:
+			if rand(1,100) < Sweet_talk:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/eartwist.jpg"></center>'
 				'Ms. Braakman looks at you in silence. For a moment, you think you''ve convinced her, but then you see something change in her eyes: She wasn''t angry before, but she definitely is now. "You <i>dare</i> trying to manipulate me like that? Do you really think I''d be base enough to fall for such juvenile attempts at seduction?" She doesn''t give you a chance to reply but reaches out, grabs you by the arm and, with surprising strength, pulls you to your feet before leading you out of the bathroom. "I''m taking you to the principal''s office. And you should pray that she''s feeling more lenient than I do right now."' 
 				*nl
@@ -738,7 +745,15 @@ if $ARGS[0] = 'caught1':
 					gt 'gschool_office', 'principal'
 				end
 			else
-				if rand(0,100) <= 75:
+				if pav_slut < 200:
+					act 'Not the punishment you had in mind':
+						*clr & cla
+						'<center><b><font color="maroon">Girls bathroom</font></b></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/strap.jpg"></center>'
+						'Ms. Braakman looks at you for a long moment. You can tell that she is seriously considering her options, can see a hardness in her eyes, a desire to punish you that seems greater than you expected. A moment later, she has made up her mind and walks over to you. "I suppose the principal doesn''t have to know about this, as long as you get properly punished." She grabs you by the hair, pulls you over to the sinks and bends you over, your head nearly touching the mirror. "And make no mistake: I will make sure you''ll remember this lesson."'
+						act 'What now': gt 'gschool_girls_bathroom', 'caught1_slut_punishment'
+					end
+				else
 					act 'Spanking':
 						*clr & cla
 						gs 'pain', 2, 'asscheeks', 'spank'
@@ -768,35 +783,6 @@ if $ARGS[0] = 'caught1':
 							end
 						end
 					end
-				else
-					act 'Strapon':
-						*clr & cla
-						'<center><b><font color="maroon">Girls bathroom</font></b></center>'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/strap.jpg"></center>'
-						'Ms. Braakman looks at you for a long moment. You can tell that she is seriously considering her options, can see a hardness in her eyes, a desire to punish you that seems greater than you expected. A moment later, she has made up her mind and walks over to you. "I suppose the principal doesn''t have to know about this, as long as you get properly punished." She grabs you by the hair, pulls you over to the sinks and bends you over, your head nearly touching the mirror. "And make no mistake: I will make sure you''ll remember this lesson." She pulls your skirt up and your panties down with an ease that speaks of habit, then strips off your shirt and bra too - maybe those rumors about the principal being a dominatrix were about the wrong teacher? You watch her rummage through her purse and bite your lower lip, a bit turned on by her display of dominance and experience and looking forward to a little spanking... but then your eyes grow wide: The object she had been looking for is a large black strapon. It looks like it could hurt a bit, but you''re already a little wet, so maybe it won''t be so bad. Steeling yourself, you reach down between your legs and spread your pussy lips to make it easier for her to enter.'
-						*nl
-						'She notices and chuckles: "You were right, I''d love to punish you... but I''m going to punish you how <i>I</i> want." She tightens the strapon into place and squirts some lube over it. "If she''s even lubing it up, maybe this won''t be so bad?" you hope. You start rubbing your pussy as she comes closer, planning to enjoy this.'
-						act 'Continue':
-							*clr & cla
-							'<center><b><font color="maroon">Girls bathroom</font></b></center>'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfstrap.jpg"></center>'
-							'You wince in pain when instead of feeling it slip into your pussy, the lubed-up tip force its way into your asshole. It hurts, and you try to pull away, but she grabs your hips and keeps you in place. "You''ve been a bad little girl, <<$pcs_firstname>>!" Ms. Braakman states, her voice somewhere between imperious and gleeful, "and bad little girls deserve to have their asses punished." You shiver in fearful anticipation as she slowly pushes the massive dildo deeper inside.'
-							*nl
-							'It''s not exactly pleasant, and she seems to have no intention of stopping until at least a good part of it is inside you, but the pain is bearable. After a few seconds, she seems content with how much of your ass she has claimed and pulls out again, commencing the assfuck proper. However, that too proves much gentler than you''d expect, going neither very fast nor hard. In fact, now that your backdoor has had some time to adjust to the intrusion, it''s slowly starting to feel good. You remember that your hand is still resting on your pussy and tentatively brush against your clit. As you play with your now wet pussy, pleasure replaces pain and a moan of desire escapes you. You hear a buzz coming from the harness now - sounds like that strapon came with gadgets.'
-							*nl
-							'Her rhythm is steadily increasing, Ms. Braakman pounding your ass harder and deeper and, in turn, causing you to cry out louder. She''s starting to pant and whatever regard she displayed for your comfort is evidently gone now as she mercilessly hammers the strapon into you, going tip to root almost every time. You then realize that you don''t want her to be gentle anymore as the eroticism of the situation catches up with you. Your moans are loud, almost matching hers, as you feel a warmth pool in your belly.'
-							gs 'arousal', 'anal_strap', 10, 'lesbian', 'sub'
-							gs 'arousal', 'end'
-							gs 'stat'
-							*nl
-							'All too soon, she cries out and goes still, nearly collapsing on your back when her orgasm hits, the strapon fully buried in your ass. You can feel her kisses on the back of your neck, a display of affection to contrast the rough anal you received, and she whispers: "My my, I really think you earned the rest of the period off." She gently pulls the strapon out of you and takes the harness off, then moves to the sinks to clean it up. "This will be our little secret, <<$pcs_firstname>>." she promises, smiling absentmindedly as she dries the dildo. After checking her appearance, she walks towards the exit and gives you one last look, a hint of desire gleaming through the cracks of her mask of authority and indifference, before she silently leaves the bathroom. You rub your ass and get dressed while your mind goes over what you just experienced, and you eventually find yourself back in your stall where you have to decide what to do with the rest of the period.'
-							if school_bunk = 0:
-								act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
-							else
-								act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
-							end
-						end
-					end
 				end
 			end
 		end
@@ -809,7 +795,7 @@ if $ARGS[0] = 'caught1':
 		act 'Continue': 
 			*clr & cla
 			gs 'gschool_events', 'sweet'
-			if rand(1,100) < Sweet_talk + 30:
+			if rand(1,100) < Sweet_talk:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/eartwist.jpg"></center>'
 				'Ms. Braakman looks at you in silence. For a moment, you think you''ve convinced her, but then you see something change in her eyes: She wasn''t angry before, but she definitely is now. "You <i>dare</i> trying to manipulate me like that? Do you really think I''d be base enough to fall for such juvenile attempts at seduction?" She doesn''t give you a chance to reply but reaches out, grabs you by the arm and, with surprising strength, pulls you to your feet before leading you out of the bathroom. "I''m taking you to the principal''s office. And you should pray that she''s feeling more lenient than I do right now."' 
 				*nl
@@ -828,23 +814,87 @@ if $ARGS[0] = 'caught1':
 				gs 'arousal', 'vaginal_finger', 10, 'lesbian'
 				gs 'stat'
 				'Just as you''re approaching the edge, she stops, pulls her fingers out of you and steps away. You want to protest, but her order preempts it: "Take off the rest of your clothes."'
-				
-				act 'Continue':
+				act 'Strip':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfvag.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfeat1.jpg"></center>'
 					'Tense and frustrated, you do as you''re told, watching from the corner of your eyes as Ms. Braakman removes her blouse, skirt and panties, leaving her naked save for her stockings and corset. She grabs you by your hair and pulls you into the stall; there, she puts one foot up on the disabled bar and presses your face against her crotch.'
 					*nl
 					'Even if the silent command wasn''t clear on its own, the glistening pussy in front of you leaves no room for doubt. You immediately attack her pussy and clit with your tongue, lapping at her inviting slit and occasionally taking her engorged button between your lips and sucking on it. Her grip on your head tightens and she grinds her pussy against your face, trying to increase the sensations you''re giving her. You can hear her moan softly from your ministrations and she seems to be getting wetter still. Minutes pass as you work her cunt with your mouth and she''s covered most of your face with her liquid before her sounds change, the telltale sign you''ve been waiting for.'
-					*nl
-					'You keep up your rhythm but move with more force, pushing your lips and tongue harder against her weak spots, and slip your fingers inside of her too, fingerfucking her like she did you. Within moments, she shudders and cries out, quivering against her mouth, her juices running down your chin and hand.'
-					gs 'arousal', 'cuni_give', 10, 'lesbian', 'sub'
-					gs 'arousal', 'end'
+					act 'Continue':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfeat2.jpg"></center>'
+						'You keep up your rhythm but move with more force, pushing your lips and tongue harder against her weak spots, and slip your fingers inside of her too, fingerfucking her like she did you. Within moments, she shudders and cries out, quivering against her mouth, her juices running down your chin and hand.'
+						gs 'arousal', 'cuni_give', 10, 'lesbian', 'sub'
+						gs 'arousal', 'end'
+						gs 'stat'
+						'She basks in the afterglow, rhythmically moving against you still but without the need that drove her before. Once she has come back to her senses, she immediately lets go off your hair and moves her leg back down. She awkwardly moves past you and starts getting dressed, and even as you join her at the sinks to wash her secretions off, she avoids your curious gaze. "This never happened, you understand? You stay in this stall until I leave, and we will both forget this ever happened." It would seem that she''s regretting your encounter, now that her lust is sated and she''s cleaning herself up. You nod, and a few seconds later, she hastily leaves the bathroom. Alone once more, you gather up your clothes and get dressed - looks like you still have a little bit of time to kill before the bell rings.'
+						if school_bunk = 0:
+							act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
+						else
+							act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'caught1_slut_punishment':
+	*clr & cla
+	menu_off = 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfspank.jpg"></center>'
+	'She pulls your skirt up and your panties down with an ease that speaks of habit, then strips off your shirt and bra too - maybe those rumors about the principal being a dominatrix were about the wrong teacher? You watch her rummage through her purse and bite your lower lip, a bit turned on by her display of dominance and experience and looking forward to a little spanking. Just as you expected she pulls out a black paddle.'
+	*nl
+	'She pulls your skirt up and your panties down with an ease that speaks of habit - maybe those rumors about the principal being a dominatrix were about the wrong teacher? You watch her rummage through her purse and bite your lower lip, a bit turned on by her display of dominance and experience and looking forward to a little spanking... but then your eyes grow wide: The object she had been looking for is a large black wooden paddle. You suddenly wonder if the principal might have been the better alternative.'
+	*nl
+	'Before you even have a chance to protest, she brings the paddle down on your bare ass. The smack echoes in the room, as does your yelp of pain. After just one swing, your ass is already stinging sharply, and her swings come quickly, each one bringing her full force and anger down on your cheeks. Each of them makes you jump inadvertently; you even hit your head against the mirror several times. Out of instinct, you try to shield your tender flesh from the paddle''s next blow, but Ms. Braakman quickly grabs your hands with her free one and pulls them out of the way, once again exhibiting a strength you wouldn''t expect from this slender woman.'
+	gs 'arousal', 'foreplay', 10, 'sub', 'maso'
+	gs 'stat'
+	act 'Continue':
+		*clr & cla
+		gs 'pain', 2, 'asscheeks', 'spank'
+		gs 'arousal', 'end'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtffinger.jpg"></center>'
+		'With your ass still stinging from the paddling she says: "Take off your skirt and panties." You do as she tells you and get naked from the waist down. Once you are, she bends you over the sink, sucking on two of her fingers as she goes. With her other hand, she gives your bare ass several hard swats that make you yelp and leaves your ass red and stinging, but you almost immediately forget about that when she slides her wet fingers inside your pussy and starts finger-banging you with one hand. She doesn''t ease up on the spanking, but the pain adds to the pleasure.'
+		*nl
+		'Moans start to escape you; her fingers seem to touch all the right spots inside you with unerring ease and you can feel the heat in your pussy build up - it looks like this woman is going to make you cum in record time!'
+		$orgasm_or = 'no'
+		gs 'arousal', 'vaginal_finger', 5, 'lesbian'
+		gs 'stat'
+		'Just as you''re approaching the edge, she stops, pulls her fingers out of you and steps away. You want to protest, but her order preempts it: "Take off the rest of your clothes."'
+		act 'Strip':
+			*clr & cla
+			if stat['vaginal'] = 0:
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfanal1.jpg"></center>'
+				'You do as she says and strip out of the rest of your uniform. As you do you notice she went back to her purse and pulled out a strapon harness with a large black dildo attached to it. It looks like it could hurt a bit, but you''re already a wet, so maybe it won''t be so bad. Steeling yourself, you reach down between your legs and spread your pussy lips to make it easier for her to enter.'
+				*nl
+				'She tightens the strapon into place and squirts some lube over it. If she''s even lubing it up, maybe this won''t be so bad? you hope. You start rubbing your pussy as she comes closer, planning to enjoy this. She grabs you and drags you into the bathroom stall you was in before. She bends you over, you wince in pain when instead of feeling it slip into your pussy, the lubed-up tip force its way into your asshole. It hurts, and you try to pull away, but she grabs your hips and keeps you in place. "You''ve been a bad little girl, <<$pcs_firstname>>!" Ms. Braakman states, her voice somewhere between imperious and gleeful, "and bad little girls deserve to have their asses punished." You shiver in fearful anticipation as she slowly pushes the massive dildo deeper inside.'
+				gs 'arousal', 'anal_strap', 10, 'lesbian', 'sub', 'lube'
+				gs 'stat'
+				act 'Continue': gt 'gschool_girls_bathroom', 'caught1_anal'
+			else
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfvag1.jpg"></center>'
+				'You do as she says and strip out of the rest of your uniform. As you do you notice she went back to her purse and pulled out a strapon harness with a large black dildo attached to it. It looks like it could hurt a bit, but you''re already a wet, so maybe it won''t be so bad. Steeling yourself, you reach down between your legs and spread your pussy lips to make it easier for her to enter.'
+				*nl
+				'She tightens the strapon into place and squirts some lube over it. If she''s even lubing it up, maybe this won''t be so bad? you hope. You start rubbing your pussy as she comes closer, planning to enjoy this. She grabs you and drags you into the bathroom stall you was in before. She bends you over, you feel the tip of the dildo rub against your wet slit, before she slides it deeply into your cunt.'
+				gs 'arousal', 'vaginal_strap', 10, 'lesbian', 'sub'
+				gs 'stat'
+				act 'Continue':
+					*clr & cla
+					'<center><b><font color="maroon">Girls bathroom</font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfanal1.jpg"></center>'
+					'You shiver in anticipation as she slowly pushes the massive dildo deeper inside. The large dildo completely fills you up, stretching you pussy in a pleasant way. The buzzing coming from the harness lets you know she is enjoying this at least as much as you are if not more. She doesn''t say anything just keeps fucking you, she gets into a nice rhythm which suggest she has done this before. Though that seems obvious, any woman that carries a strapon in their purse likely uses it a lot. After several minutes she pulls out of your twat.'
+					gs 'arousal', 'vaginal_strap', 10, 'lesbian', 'sub'
 					gs 'stat'
-					'She basks in the afterglow, rhythmically moving against you still but without the need that drove her before. Once she has come back to her senses, she immediately lets go off your hair and moves her leg back down. She awkwardly moves past you and starts getting dressed, and even as you join her at the sinks to wash her secretions off, she avoids your curious gaze. "This never happened, you understand? You stay in this stall until I leave, and we will both forget this ever happened." It would seem that she''s regretting your encounter, now that her lust is sated and she''s cleaning herself up. You nod, and a few seconds later, she hastily leaves the bathroom. Alone once more, you gather up your clothes and get dressed - looks like you still have a little bit of time to kill before the bell rings.'
-					if school_bunk = 0:
-						act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
-					else
-						act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
+					act 'Up the butt':
+						*clr & cla
+						'<center><b><font color="maroon">Girls bathroom</font></b></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfanal1.jpg"></center>'
+						'You wince in pain when instead of feeling it slip back into your pussy, the lubed-up tip force its way into your asshole. It hurts, and you try to pull away, but she grabs your hips and keeps you in place. "You''ve been a bad little girl, <<$pcs_firstname>>!" Ms. Braakman states, her voice somewhere between imperious and gleeful, "and bad little girls deserve to have their asses punished." You shiver in fearful anticipation as she slowly pushes the massive dildo deeper inside.'
+						gs 'arousal', 'anal_strap', 10, 'lesbian', 'sub', 'lube'
+						gs 'stat'
 					end
 				end
 			end
@@ -852,18 +902,44 @@ if $ARGS[0] = 'caught1':
 	end
 end
 
+if $ARGS[0] = 'caught1_anal':
+	*clr & cla
+	menu_off = 1
+	gs 'boyStat', 'D4' 
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfanal2.jpg"></center>'
+	'It''s not exactly pleasant, and she seems to have no intention of stopping until at least a good part of it is inside you, but the pain is bearable. After a few seconds, she has worked the <<dick>>cm <<$dick_girth>> dildo balls deep into your ass. Once she has worked it all the way in your ass, she pulls out again until only the tip is still inside of you and commencing the assfuck proper. However, that too proves much gentler than you''d expect, going neither very fast nor hard. In fact, now that your backdoor has had some time to adjust to the intrusion, it''s slowly starting to feel good. You remember that your hand is still resting on your pussy and tentatively brush against your clit. As you play with your now wet pussy, pleasure replaces pain and a moan of desire escapes you. You hear a buzz coming from the harness now - sounds like that strapon came with gadgets.'
+	gs 'arousal', 'anal_strap', 10, 'lesbian', 'sub', 'lube'
+	gs 'stat'
+	act 'Continue':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfanal2.jpg"></center>'
+		'Her rhythm is steadily increasing, Ms. Braakman pounding your ass harder and deeper and, in turn, causing you to cry out louder. She''s starting to pant and whatever regard she displayed for your comfort is evidently gone now as she mercilessly hammers the strapon into you, going tip to root almost every time. You then realize that you don''t want her to be gentle anymore as the eroticism of the situation catches up with you. Your moans are loud, almost matching hers, as you feel a warmth pool in your belly.'
+		gs 'arousal', 'anal_strap', 10, 'lesbian', 'sub', 'lube'
+		gs 'arousal', 'end'
+		gs 'stat'
+		*nl
+		'All too soon, she cries out and goes still, nearly collapsing on your back when her orgasm hits, the strapon fully buried in your ass. You can feel her kisses on the back of your neck, a display of affection to contrast the rough anal you received, and she whispers: "My my, I really think you earned the rest of the period off." She gently pulls the strapon out of you and takes the harness off, then moves to the sinks to clean it up. "This will be our little secret, <<$pcs_firstname>>." she promises, smiling absentmindedly as she dries the dildo. After checking her appearance, she walks towards the exit and gives you one last look, a hint of desire gleaming through the cracks of her mask of authority and indifference, before she silently leaves the bathroom. You rub your ass and get dressed while your mind goes over what you just experienced, and you eventually find yourself back in your stall where you have to decide what to do with the rest of the period.'
+		if school_bunk = 0:
+			act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
+		else
+			act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
+		end
+	end
+end
+
 if $ARGS[0] = 'caught2':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/caught'+ rand(1,2) +'.jpg"></center>'
-	'After a couple of minutes, you hear someone else in the bathroom with you. You peek out and see one of your male teachers standing at the mirror. You duck back into the stall, close the door as quietly as you can and sit down on the toilet, your heart beating like crazy, hoping he didn''t notice you. What the hell is he doing in the girls bathroom anyways?! You hear his footsteps coming closer, closer... and stop, right outside your stall door.' 
+	'After a couple of minutes, you hear someone else in the bathroom with you. You peek out and see Mr. Vasilyev standing at the mirror. You duck back into the stall, close the door as quietly as you can and sit down on the toilet, your heart beating like crazy, hoping he didn''t notice you. What the hell is he doing in the girls bathroom anyways?! You hear his footsteps coming closer, closer... and stop, right outside your stall door.' 
 	*nl
 	'"I saw you in the mirror, young lady." he says sternly as he pushes the door open. "What do you think you''re doing anyways? Skipping class?"'
 	if school_bunk = 1:'His eyes fall on the smoldering cigarette on the ground. His eyes narrow. "Smoking in school, I see. I really thought you were smarter than that, Miss <<$pcs_lastname>>."'
 	*nl
-	'Your teacher shakes his head. He looks more disappointed than angry, you think. "Well, come on young lady. Get down to the principal''s office." He points in the direction of the bathroom door.'
+	'Mr. Vasilyev shakes his head. He looks more disappointed than angry, you think. "Well, come on young lady. Get down to the principal''s office." He points in the direction of the bathroom door.'
 	'You don''t know what to say, if or how you could get out of this mess. Of course he knows you are supposed to be in class, so there''s no point in trying to lie to him about that, but maybe you can convince him to let you off with a warning or something.'
 	act 'Go to principal''s office':
 		demerit += 10
@@ -904,7 +980,7 @@ if $ARGS[0] = 'caught2':
 			gs 'gschool_events', 'sweet', 'sex'
 			if rand(1,100) < Sweet_talk:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
-				'The teacher looks at you and snorts. "Please don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
+				'Mr. Vasilyev looks at you and snorts. "Please don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
 				'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
 				act 'Go to principal''s office':
 					demerit += 10
@@ -970,31 +1046,76 @@ if $ARGS[0] = 'caught2':
 					'You stroke his dick a few times until it is fully hard, then lean forward and start licking it; you lick up and down the shaft and run your tongue around the head, your eyes locked with his all the while before you smile at him and take his <<dick>>cm <<$dick_girth>> cock into your mouth. You wrap your <<$liptalk>> tightly around his dick and start bobbing your head, stroking his cock with your lips, your tongue still making its rounds. He rests one hand on the top of your head, but he lets you completely control the action.'
 					*nl
 					'You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him as deep into your mouth as you can without gagging.'
-					gs 'arousal', 'bj', 10, 'dom'
+					gs 'arousal', 'bj', 5, 'dom'
 					gs 'stat'
-					'He enjoys your blowjob in silence and after several minutes, he grabs you by the hair and roughly pulls you up and over to the sinks.'
+					'He enjoys your blowjob in silence and after several minutes.'
 					if pcs_vag = 0:
-						act 'Cum': gs 'arousal', 'end' & gt 'gschool_girls_bathroom', 'caught2_cum'
+						act 'Cum':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtcum.jpg"></center>'
+							'You suck him for a little bit longer but then he starts to moan and he pulls his dick out of your mouth. He holds his dick near your face, right in front of your mouth, and jerks it a couple of times. It starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth. When he finishes, he rubs the tip of his dick against your lips and then shoves it back into your mouth, the sight of you covered in his cum emboldening him. You look up at him while you suck his cock clean, smiling around him as you feel him getting soft in your mouth. He pulls out of your mouth and tucks his dick back into his pants.'
+							*nl
+							'Without a word, he walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he''s giving you sideways glances. Finally, he smiles and says: "Feel free to cut class any time you like, <<$pcs_firstname>>. I''ll happily keep your secret."' 
+							'You smile back. "If I get ''punished'' like that every time I skip class, I will." He chuckles at that, shakes his head, then leaves the bathroom - you think you can hear him whistling outside as he walks away. That was amazing and you also have the rest of the period to yourself, even if you have his cum dripping down your face. Still, you can''t help but wonder what he was doing in the girls bathroom in the first place.'
+							gs 'cum_call', 'face', 'A128', 1
+							gs 'arousal', 'end'
+							if school_bunk = 0:
+								act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
+							else
+								act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
+							end
+						end
 					else
-						act 'Vaginal':
+						act 'Continue':
 							*clr & cla
-							'<center><b><font color="maroon">Girls bathroom</font></b></center>'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtsex.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughteat.jpg"></center>'
 							if $pantyworntype = 'true':
-						        'He has you get up on one of the sinks while pulling your skirt up. His fingers find your pussy a few moments later and it seems he''s making sure you are good and wet. Then you see a condom in his hand and he puts it on. As he does that, you try to get comfortable, but it is not easy with the faucet jabbing you in the back.'
+						        'He grabs you and manhandles you until you are laying on your back on top of the toilet seat, while pushing your skirt up. His fingers find your pussy a few moments later and he rubs your clit as he gets down on his knees. Once down he lowers his face and starts licking your pussy eating you out, he is fairly talented at this. You just moan, as you lay back and enjoy it. Just as it starts to really feel good he stops, then you see a condom in his hand and he puts it on. As he does that, you try to get comfortable.'
 					        else
-							    'He has you get up on one of the sinks, pushes up your skirt all the way and pulls down your panties, tossing them aside. His fingers find your pussy a few moments later and it seems he''s making sure you are good and wet. Then you see a condom in his hand and he puts it on. As he does that, you try to get comfortable, but it is not easy with the faucet jabbing you in the back.'
-							    *nl
-							    'Once the condom is in place, he rubs the tip of his dick against your pussy lips, making sure it is well lubricated, then gently pushes his <<dick>>cm <<$dick_girth>> cock inside you, causing you to gasp. His movements are slow and he is taking all the time in the world to work his way deeper into you, one of his hands rubbing your clit all the while. You moan in pleasure; you hardly even notice the faucet jabbing into your back anymore.'
+							    'He grabs you and manhandles you until you are laying on your back on top of the toilet seat, pushes up your skirt all the way and pulls your panties off, tossing them aside. His fingers find your pussy a few moments later and he rubs your clit as he gets down on his knees. Once down he lowers his face and starts licking your pussy eating you out, he is fairly talented at this. You just moan, as you lay back and enjoy it. Just as it starts to really feel good he stops, then you see a condom in his hand and he puts it on. As he does that, you try to get comfortable.'
+							gs 'arousal', 'cuni', 5, 'dom'
+							gs 'stat'
+							act 'Continue':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtvag1.jpg"></center>'
+							    'Once the condom is in place, he rubs the tip of his dick against your pussy lips, making sure it is well lubricated, then gently pushes his <<dick>>cm <<$dick_girth>> cock inside you, causing you to gasp. His movements are slow and he is taking all the time in the world to work his way deeper into you, one of his hands rubbing your clit all the while. You moan in pleasure.'
 							    *nl
-							    'He might have been slow at first, but he''s steadily picking up the pace now that he is balls deep inside you; he stays gentle with you the whole time though and keeps stimulating your clit and occasionally kneads your breasts as well. You didn''t expect this to feel so good and cry out: "Oh God! Fuck me, sir! Fuck me harder!" He smiles and indeed gets a little rougher with you. Once or twice, he lifts his fingers from your wet pussy and sticks them into your mouth for you to suck them, tasting your own juices.'
-							    $orgasm_txt = 'With an unexpectedly considerate lover like that, it doesn''t take long until you orgasm and scream out your ecstasy, your wet folds twitching around your teacher''s hard cock. He doesn''t let up though, and his stamina seems to know no limit, violating your pussy in all the right ways. A second orgasm and even a third shake you before he finally starts to grunt.'
-							    $orgasm_or = 'custom'
-							    gs 'arousal', 'vaginal', 10, 'dom'
-							    gs 'arousal', 'end'
+							    'He might have been slow at first, but he''s steadily picking up the pace now that he is balls deep inside you; he stays gentle with you the whole time though and keeps stimulating your clit and occasionally kneads your breasts as well. You didn''t expect this to feel so good and cry out: "Oh God! Fuck me, sir! Fuck me harder!"'
+								'Just then he stops and pulls out of you, as he does, he says. "Get up and bend over."'
+								gs 'arousal', 'vaginal', 10, 'dom'
 							    gs 'stat'
+								act 'Bend over':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtvag2.jpg"></center>'
+									'You get up and kneel one knee on the toilet seat and the other foot on the floor, as you bend over in front of him. He smiles and slides his dick back into your wet pussy, indeed he gets a little rougher with you. Once or twice, he even smacks your ass cheeks as he fucks you doggy style over the toilet.'
+									gs 'arousal', 'vaginal', 10, 'dom'
+									gs 'stat'
+									act 'Keep getting fucked':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtvag3.jpg"></center>'
+										'He keeps fucking you, not to hard and fast, but a nice stead pace. Just a little rough with out being to rough, he seems he wants you to enjoy this as much as he is. For several more minutes he fucks you like this until he starts moaning loudly.'
+										$orgasm_txt = 'With an unexpectedly considerate lover like that, it doesn''t take long until you orgasm and scream out your ecstasy, your wet folds twitching around your teacher''s hard cock. He doesn''t let up though, and his stamina seems to know no limit, violating your pussy in all the right ways. A second orgasm and even a third shake you before he finally starts to grunt.'
+										$orgasm_or = 'custom'
+										gs 'arousal', 'vaginal', 10, 'dom'
+										gs 'stat'
+										act 'Cum':
+											*clr & cla
+											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtcum.jpg"></center>'
+											'Your teacher pulls out of you and drags you off the toilet, gently pushing you down to your knees while he gets rid of the condom. He holding his dick near your face, right in front of your mouth, and jerks it a couple of times. It starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth. When he finishes, he rubs the tip of his dick against your lips and then shoves it back into your mouth, the sight of you covered in his cum emboldening him. You look up at him while you suck his cock clean, smiling around him as you feel him getting soft in your mouth. He pulls out of your mouth and tucks his dick back into his pants.'
+											*nl
+											'Without a word, he walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he''s giving you sideways glances. Finally, he smiles and says: "Feel free to cut class any time you like, <<$pcs_firstname>>. I''ll happily keep your secret."' 
+											'You smile back. "If I get ''punished'' like that every time I skip class, I will." He chuckles at that, shakes his head, then leaves the bathroom - you think you can hear him whistling outside as he walks away. That was amazing and you also have the rest of the period to yourself, even if you have his cum dripping down your face. Still, you can''t help but wonder what he was doing in the girls bathroom in the first place.'
+											gs 'cum_call', 'face', 'A128', 1
+											gs 'arousal', 'end'
+											if school_bunk = 0:
+												act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
+											else
+												act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
+											end
+										end
+									end
+								end
                             end
-							act 'Cum': gt 'gschool_girls_bathroom', 'caught2_cum'
 						end
 					end
 				end
@@ -1003,22 +1124,6 @@ if $ARGS[0] = 'caught2':
 	end
 end
 
-if $ARGS[0] = 'caught2_cum':
-	*clr & cla
-	menu_off = 1
-	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtcum.jpg"></center>'
-	'Your teacher pulls out of you and drags you off the sink, gently pushing you down to your knees while he gets rid of the condom. He holding his dick near your face, right in front of your mouth, and jerks it a couple of times. It starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth. When he finishes, he rubs the tip of his dick against your lips and then shoves it back into your mouth, the sight of you covered in his cum emboldening him. You look up at him while you suck his cock clean, smiling around him as you feel him getting soft in your mouth. He pulls out of your mouth and tucks his dick back into his pants.'
-	*nl
-	'Without a word, he walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he''s giving you sideways glances. Finally, he smiles and says: "Feel free to cut class any time you like, <<$pcs_firstname>>. I''ll happily keep your secret."' 
-	'You smile back. "If I get ''punished'' like that every time I skip class, I will." He chuckles at that, shakes his head, then leaves the bathroom - you think you can hear him whistling outside as he walks away. You get up to the mirror, clean yourself up and fix your hair. That was amazing and you also have the rest of the period to yourself. Still, you can''t help but wonder what he was doing in the girls bathroom in the first place.'
-	if school_bunk = 0:
-		act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
-	else
-		act 'Keep smoking':gt 'gschool_girls_bathroom', 'bathroom2'
-	end
-end
-
 if $ARGS[0] = 'caught3':
 	*clr & cla
 	menu_off = 1

+ 43 - 39
locations/gschool_grounds.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'main':
 	'Pavlovsk''s only school, where all the local children go for their education. Next to the school is the athletic field and a parking lot for the teachers, with a large grove of trees just beyond them.' 
 	'Hidden behind these trees is the old school building, which was supposed to be renovated and used for advance classes after the new one was built, but budget cuts meant the project was cancelled and now the old building stands empty and abandoned. It''s a popular spot for students to skip class or hang out outside of school.'
 
-	if ((hour = 6 and minut >= 30) or (hour >= 7 and hour < 18)) and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0:
+	if ((hour = 6 and minut >= 30) or (hour >= 7 and hour < 18)) and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and suspended['on'] ! 1:
 		'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
@@ -50,7 +50,7 @@ if $ARGS[0] = 'main':
 		end
 	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 and suspended['on'] ! 1:
 		afterschool_day = daystart
 		if rand(0,3) = 0:
 			$eventtype = 'after_school'
@@ -64,10 +64,10 @@ if $ARGS[0] = 'main':
 	if hour = 14 and cheerleadingQW['quest_stage'] = 1:
 		if pregtime < 90: gt 'gschool_cheerleading', 'tryouts'
 	!! Sveta attends training after school every Tuesday and Thursday.
-	elseif hour = 14 and cheerleadingQW['day'] ! daystart and (week = 2 or week = 4) and kanikuli = 0 and cheerleadingQW['quest_stage'] > 1:
+	elseif hour = 14 and cheerleadingQW['day'] ! daystart and (week = 2 or week = 4) and kanikuli = 0 and cheerleadingQW['quest_stage'] > 1 and suspended['on'] ! 1:
 		if npc_pregtalk['A23'] = 0: gt 'gschool_cheerleading', 'afterschool_practice'
 	!! A football game is played once every 2nd Friday and the cheerleaders perform out on the field. 
-	elseif hour = 14 and cheerleadingQW['day'] ! daystart and week = 5 and (daystart - (daystart mod 7)) mod 2 = 1 and kanikuli = 0 and (cheerleadingQW['quest_stage'] >= 3 or cheerleadingQW['backup_game'] = 1):
+	elseif hour = 14 and cheerleadingQW['day'] ! daystart and week = 5 and (daystart - (daystart mod 7)) mod 2 = 1 and kanikuli = 0 and (cheerleadingQW['quest_stage'] >= 3 or cheerleadingQW['backup_game'] = 1) and suspended['on'] ! 1:
 		if npc_pregtalk['A23'] = 0: gt 'gschool_cheerleading', 'afterschool_game'
 	end
 	
@@ -140,7 +140,7 @@ if $ARGS[0] = 'main':
 
 !!	act 'Go to the Principals Office': gt
 
-	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and SchoolBlock = 0:
+	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and SchoolBlock = 0 and suspended['on'] ! 1:
 		if PCloStyle2 = 4 or Enable_sforma = 1:
 			gs 'gschool_socialchg', 'group_student_rel_change_2'
 			if hour = 6:
@@ -183,6 +183,8 @@ if $ARGS[0] = 'main':
 		end
 	end
 
+	gs 'camera', 'check_location'
+
 	act 'Return to town': minut += 2 & gt 'pav_residential'
 
 	act 'Go to the sports field': minut += 1 & gt 'gschool_grounds', 'sports'
@@ -193,40 +195,42 @@ if $ARGS[0] = 'main':
 
 	if christinaQW['dompath'] = 4: gt 'gschool_grounds', 'KristinaFight'
 
-	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
-	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'
-	elseif week < 6 and hour = 14 and dimaRevenge = 7 and dimaRevChoice = 1:
-		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'
-	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 = 7 and dimaRevenge = 5 and  dimaRevChoice = 3:
-		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'
-	elseif week < 6 and hour = 14 and dimaRevenge = 6 and dimaRevChoice = 4:
-		gt 'dimaRevenge', 5, 'after'
-	elseif week < 6 and hour = 7 and dimaRevenge = 7 and dimaRevChoice = 4 and dimaRevengedaystart >= daystart:
-		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
-	elseif week < 6 and hour = 7 and dimaRevenge = 4 and dimaRevChoice = 6:
-		gt 'dimaRevenge', dimaRevenge
+	if suspended['on'] ! 1 and kanikuli = 0:
+		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
+		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'
+		elseif week < 6 and hour = 14 and dimaRevenge = 7 and dimaRevChoice = 1:
+			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'
+		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 = 7 and dimaRevenge = 5 and  dimaRevChoice = 3:
+			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'
+		elseif week < 6 and hour = 14 and dimaRevenge = 6 and dimaRevChoice = 4:
+			gt 'dimaRevenge', 5, 'after'
+		elseif week < 6 and hour = 7 and dimaRevenge = 7 and dimaRevChoice = 4 and dimaRevengedaystart >= daystart:
+			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
+		elseif week < 6 and hour = 7 and dimaRevenge = 4 and dimaRevChoice = 6:
+			gt 'dimaRevenge', dimaRevenge
+		end
 	end
 
 	if hour >= 14 and pav_slut >= 250 and SchoolGossip > 0 and afterschoolday ! daystart: gt 'gschool_sex', 'suck'

+ 18 - 2
locations/gschool_lessonsev1.qsrc

@@ -91,11 +91,27 @@ if $ARGS[0] = 'fiz_rand':
 		'During class, Albina gives you a tap on the shoulder, giggling and pointing at Vitek. You look over and see the tip of his dick hanging out the leg of his shorts. You giggle as well, but you are also quite impressed and maybe just a little turned on at the sight... he is certainly very well endowed. It takes him a while to notice the girls giggling at him and even longer to figure out why. Once he does, he makes a big show of tucking his dick away by adjusting his shorts, all the while standing there with a huge smile on his face.'
 		gs 'arousal', 'erotic_nudity', 2
 		gs 'arousal', 'end'
-	elseif fizperand = 10:
+	elseif fizperand = 10 and hotcat >= 5 and pav_slut >= 150:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/supply.jpg"></center>'
-		'The coach asks you to help him get some equipment out of the storage room. You go along and he starts pointing out several things you need for the class. He gets uncomfortably close and touches you way more than is necessary. At one point, you are reaching for something high on a shelf and he stands so close behind you, you can feel his crotch against your ass as his hands grip your waist, telling you to be careful and and to let him steady you.'
+		'The coach asks you to help him get some equipment out of the storage room. You go along and he starts pointing out several things you need for the class. He gets uncomfortably close and touches you way more than is necessary. At one point, you are reaching for something high on a shelf and he stands so close behind you, you can feel his crotch against your ass as his hands grip your waist. "Careful we wouldn''t want you to fall, let me steady you." He says.'
 		gs 'arousal', 'foreplay', 5, 'sub'
+		act 'Do nothing':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage1.jpg"></center>'
+			'When you don''t object his hands slide up under your shirt and squeeze your boobs, then he pulls your shirt off over your head before you can even protest.'
+			gs 'arousal', 'foreplay', 2, 'sub'
+			act 'Say nothing': gt 'gschool_sex', 'storagesex'
+			act 'Tell him no':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storageno.jpg"></center>'
+				'You jerk away from him and snatch your shirt out of his hand. "Mr Pavlovich, I''m not that kind of girl."'
+				'He laughs. "Thats not what I hear."'
+				'He give him a dirty look and put your shirt back on and storm out.'
+				gs 'arousal', 'end'
+				act 'End of lesson':gt 'gschool_lessons4', 'postphys'
+			end
+		end
 		act 'Leave the creep':
 			*clr & cla
 			gs 'arousal', 'end'

+ 62 - 0
locations/gschool_office.qsrc

@@ -639,6 +639,68 @@ if $ARGS[0] = 'whore2':
 	end
 end
 
+if $ARGS[0] = 'ivanov_revenge':
+	*clr & cla
+	menu_off = 1
+	gs 'stat'
+	'<center><b><font color="maroon">Principal''s Office</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/office.jpg"></center>'
+	'The office is, in a word, impressive: It must have cost a full year''s worth of the school''s budget to decorate it. At least now you know why so much of the rest of the school has cracked and faded paint, or is in need of repair that never seems to happen - all the money is spent on this one room. As Mr. Ivanov drags you into the office you see Miss Volkov''s sitting behind the desk. She looks up at once. "Whats the meaning of this?"'
+	'Mr. Ivanov lets go of you and says. "I caught her in the bathroom doing some kind of drugs, before I could grab the bagging from her she flushed it down the toilet."'
+	'You start to say something but one look from Miss Volkov silences you, you know your only chance is if she believes you and disobeying her won''t help. She looks at him a moment and then to you. "This is very serious it carries a one week suspension, is this true?"'
+	act 'Admit it':
+		*clr & cla
+		gs 'stat'
+		'<center><b><font color="maroon">Principal''s Office</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/office.jpg"></center>'
+		'You sigh, you know there is no way anyone will believe you over Mr. Ivanov, so might as well just admit it. "Yes Miss Volkov, I was taking drugs and I am very sorry."'
+		'She leans back and regards you a moment. "I appreciate your honesty but this is very serious, I am afraid I can''t let you off with a warning. You are suspended for one week. Go wait in the outer office until one of your parents can come get you." Your heart sinks, you just nod and go wait in the outer office.'
+		act 'Wait': gt 'gschool_office', 'suspended'
+	end
+	act 'Say nothing':
+		*clr & cla
+		gs 'stat'
+		'<center><b><font color="maroon">Principal''s Office</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/office.jpg"></center>'
+		'You sigh, you know there is no way anyone will believe you over Mr. Ivanov, so you decided to say nothing at all. After several moments of you not talking, she leans back and regards you a moment. "I appreciate you not lying to me at least, even if you refuse to talk. You are suspended for one week. Go wait in the outer office until one of your parents can come get you." Your heart sinks, you just nod and go wait in the outer office.'
+		act 'Wait': gt 'gschool_office', 'suspended'
+	end
+	act 'Deny it':
+		*clr & cla
+		gs 'stat'
+		'<center><b><font color="maroon">Principal''s Office</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/office.jpg"></center>'
+		'You angrily reply. "I didn''t do it Miss Volkov, I wasn''t doing drugs." You glance at Mr. Ivanov. "Maybe he thought he saw it but I wasn''t I swear."'
+		'She leans back and regards you a moment. "I would like to believe you, but you was obviously skipping class, so it is not a stretch to believe you was doing more than that, I am afraid I can''t let you off with a warning. You are suspended for one week. Go wait in the outer office until one of your parents can come get you." Your heart sinks, you just nod and go wait in the outer office.'
+		act 'Wait': gt 'gschool_office', 'suspended'
+	end
+	act 'Say he is lying':
+		*clr & cla
+		gs 'stat'
+		'<center><b><font color="maroon">Principal''s Office</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/office.jpg"></center>'
+		'You angrily reply. "I didn''t do it Miss Volkov, he''s lying, he tried to blackmail me into having sex with him."'
+		'She leans back and regards you a moment. "That''s a very serious accusation miss. Do you have any proof of this?"'
+		'You shake your head no. "No just my word."'
+		*nl
+		'She shakes her head and then says angrily to you. "I''m sorry but if Mr. Ivanov says he saw you, I am inclinded to believe him. He has no reason to lie, as for your accusation, well I just don''t believe he would ever do that. I never thought you would stoop to such low tactics to keep out of trouble to try and ruin a mans reputation? Shame on you. You are suspended for one week, if I could I would expel you. Now go wait in the outer office until one of your parents can come get you." Your heart sinks, you just nod and go wait in the outer office.'
+		act 'Wait': gt 'gschool_office', 'suspended'
+	end
+end
+
+if $ARGS[0] = 'suspended':
+	*clr & cla
+	menu_off = 1
+	suspended['day'] = daystart += 7
+	suspended['on'] = 1
+	minut += 30
+	gs 'npc_relationship', 'modify', 'A29', -25
+	gs 'stat'
+	'<center><b><font color="maroon">Office</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
+	'You wait around for half a hour, when your <<$npc_nickname[''A29'']>> shows up and she looks about as pissed as you have ever seen her. She walks over, you start to open your mouth but she interrupts you. "I don''t want to hear it, you know how ashamed I am of you right now? They called me at work, so I had to come get you. Now everyone at work knows. You are so selfish, all you have to do is go to school and get good grades. But apparently that is to hard for you." She grabs you arm and drags you out of the school. She lectures you the whole way, in fact she never stops talking until she drops you off at the apartment. "Now I have to go back to work, make yourself useful for once and clean this place up." Then before you can reply she walks out and slams the door'
+	act 'Now what': gt 'korrPar'
+end
 
 --- gschool_office ---------------------------------
 

+ 120 - 80
locations/gschool_sex.qsrc

@@ -701,62 +701,76 @@ end
 if $ARGS[0] = 'storagesex':
 	*clr & cla
 	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage2.jpg"></center>'
-	'You squat down in front of him, placing one hand on his leg and the other on the bulge in his pants. You can feel his rock hard cock straining against his pants and you pull them down to his knees, watching his cock spring free in your face.'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage1.jpg"></center>'
+	'He stands behind you and starts undressing you. Soon he has you completely naked, once he does he suddenly jerks you around to face him. No sooner are you facing him, he pushes you roughly down to your knees.'
 	gs 'arousal', 'foreplay', 2, 'sub'
 	gs 'stat'
-	act 'Suck his dick':
+	act 'Kneel':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage4.jpg"></center>'
+		'What awaits you is his hard dick already out in your face, he rubs the tip of his dick against your lips, you can feel his wet pre-cum on your lips as he does. "Lick my dick, like a lollipop." He tells you.'
+		gs 'arousal', 'bj', 3, 'sub'
+		gs 'stat'
+	act 'Lick his dick':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage3.jpg"></center>'
-		'You take hold of his hard cock with one hand and start stroking it. You glance up and see him looking down at you expectantly. You open your mouth and take his dick into it as you wrap your lips around his shaft. You start bobbing your head and sucking his dick as you use one hand to stroke it as well. After a couple of minutes, you feel his hand on the back of your head forcing you to take him deeper in your mouth.'
+		'You start licking along the shaft of his dick up and down, you swirl your tongue around the head of his dick each time you reach the top again. "Enough, stop teasing me and suck it girl."'
 		gs 'arousal', 'bj', 3, 'sub'
 		gs 'stat'
-		act 'Deepthroat':
+		act 'Suck his dick':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage4.jpg"></center>'
-			'You have to stop stroking him as he pushes your head down and his cock slides further in your mouth. He keeps pushing your head forward until you feel his dick going down your throat and his balls against your chin. He deepthroat fucks your mouth for a couple of minutes before he says "Stand up. I want to fuck you."'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage2.jpg"></center>'
+			'You open your mouth and take his dick into it as you wrap your lips around his shaft. You start bobbing your head and sucking his dick for a couple of minutes before he says "Stand up. So I can fuck you."'
 			gs 'arousal', 'bj', 3, 'sub', 'deepthroat'
 			gs 'stat'
 			if pcs_vag = 0:
 				act 'Let him':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage5.jpg"></center>'
-					'He pulls you up off your knees and then starts pulling your clothes off, one piece at a time while making comments about your firm ass and perky tits. His hands roam all over your naked body, squeezing your boobs, ass and tweaking your nipples gently. "Lay down on your back." he says, indicating a bench in the room.'
-					gs 'arousal', 'foreplay', 3, 'sub'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage6.jpg"></center>'
+					'He pulls you up off your knees and sits down on the bench. He pulls you over and into his lap, you staddle him and feel his dick slide into you. You slowly start riding him, fucking him. After a few minutes he slaps your ass kinda hard. "Turn around."'
+					gs 'arousal', 'vaginal', 3, 'sub'
 					gs 'stat'
-					act 'Lay down':
+					act 'Turn around':
 						*clr & cla
-						gs 'boyStat', 'A131'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage6.jpg"></center>'
-						'You lay down on the bench and he pulls you towards the end of the bench, your legs hanging off the edge. He pulls your legs apart and kneels down between them and rubs the tip of his dick against your pussy lips, getting his tip and your pussy wet. Once he seems content that you are wet enough, he slides his <<dick>>cm <<$dick_girth>> cock in your pussy. You can feel him fill you nicely as he slowly pushes himself all the way inside you and starts fucking you. After several minutes, he stops and pulls out of you. "Get up and get on your knees."'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage7.jpg"></center>'
+						'You get up and turn around, he grabs your hips and pulls you back down on his dick hard. You start fucking him again, he keeps his hands on your hips to control the pace as hard and fast. Once you are going hard and fast enough on your own, he lets go and leans back, letting you do all the work. Several minutes go by before he says. "Get up and lay on the bench."'
 						gs 'arousal', 'vaginal', 5, 'sub'
 						gs 'stat'
-						act 'Bend over':
+						act 'Laydown':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage7.jpg"></center>'
-							'You get up and turn around. You barely even get on your knees when you feel his dick push into you again, sliding balls deep inside of you as he starts fucking you again. He gives your ass a couple of soft smacks. "You have a really fine ass. I''m going to fuck it." he states. You feel him pull out and rub the tip of his dick against your asshole as he tries to penetrate your ass before you can object.'
+							gs 'boyStat', 'A131'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage8.jpg"></center>'
+							'You lay down on the bench and he pulls you towards the end of the bench, your legs hanging off the edge. He pulls your legs apart and kneels down between them and rubs the tip of his dick against your pussy lips, getting his tip and your pussy wet. Once he seems content that you are wet enough, he slides his <<dick>>cm <<$dick_girth>> cock in your pussy. You can feel him fill you nicely as he slowly pushes himself all the way inside you and starts fucking you. After several minutes, he starts groaning and you can tell he is about to cum. Suddenly he and pulls out of you.'
 							gs 'arousal', 'vaginal', 5, 'sub'
 							gs 'stat'
-							act 'Take it in the ass': 
+							act 'Cum': 
 								*clr & cla
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage8.jpg"></center>'
-								'You feel the head of his cock pop into your asshole, causing you to groan in slight pain. He pauses a moment to give you time to get used to it and then starts to slowly fuck your ass, working his dick slowly deeper into you. He tightly grips your hips with both hands to keep you from pulling away. He slowly but steadily fucks your ass deeper and faster, easing up a bit when he feels you tense up. Once he is sure you are not longer trying to pull away, he leaves only one hand on your hip.'
-								act 'Ass fucking': gt 'gschool_sex', 'storagesex_anal'
-								gs 'willpower', 'anal', 'resist', 'hard'
-								if will_cost <= pcs_willpwr:
-									act 'Refuse (<<will_cost>> Willpower)':
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage9.jpg"></center>'
+								'Just as his dick pulls out of your pussy, you feel hot jets of cum splattering against your stomach. A couple more spurts hit your tits as well as he loudly moans, as he jerks off. Once the last spurt has landed, he rubs the tip of his dick against your stomach, wiping off the last bit of cum. Satisfied, he pulls up his pants and smiles to you. "Your reputation is well earned girl. We will have to do this again. Now get cleaned up and get home." He walks out of the storage room, leaving you naked on your knees with his cum covering your stomach and tits.'
+								gs 'arousal', 'foreplay', 2, 'sub'
+								gs 'arousal', 'end'
+								gs 'cum_call', 'tits', 'A131'
+								gs 'cum_call', 'stomach', 'A131'
+								gs 'stat'
+								act 'Leave school': gt 'gschool_lessons', 'short_break'
+								act 'Go take a shower':
+									*clr & cla
+									menu_off = 1
+									minut += 10
+									pcs_mood += 10
+									shower_shave = 0
+									gs 'stat'
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
+									'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers. You enjoy the sensation of the hot water on your skin. The steam filling the room gives it an almost sauna-like feel and makes you feel very relaxed.'
+									act 'Go to the locker room':
 										*clr & cla
-										gs 'willpower', 'pay', 'resist'
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage7.jpg"></center>'
-										'"Please don''t!" you beg him as you reach back and try and guide his dick back to your pussy.'
-										'He lets out a little growl of frustration and shoves his dick back in your pussy and starts roughly fucking you this time. He grabs onto your hips and starts pounding your pussy with hard, deep thrusts. He seems to be taking out his frustration on you for not letting him fuck your ass. After a few minutes, he starts moaning loudly and pulls out of you. "Get on your knees!" he tells you.'
-										'You turn back and around and just drop down to your knees in time.'
-										gs 'arousal', 'vaginal', 5, 'sub', 'rough'
+										minut += 5
 										gs 'stat'
-										act 'Cum catching': gt 'gschool_sex', 'storagesex_cum'
+										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic2.jpg"></center>'
+										'You take your clothes out of your locker and start putting them on. With no one else here to distract you, it doesn''t take you too long to get dressed.'
+										'You can choose another outfit while you''re here.'
+										act 'Continue': gt 'gschool_lessons4', 'post_dress'
 									end
-								else
-									act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 								end
 							end
 						end
@@ -766,12 +780,12 @@ if $ARGS[0] = 'storagesex':
 			act 'Just my ass': 
 				*clr & cla
 				gs 'boyStat', 'A131'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage5.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker5.jpg"></center>'
 				'You really don''t want him to fuck your pussy, but surely he won''t mind just fucking your ass instead. You turn around with your back facing him and get down on all fours on the bench instead, wiggling your ass at him. "Why don''t you fuck my tight little asshole instead?" you tease.'
 				'He gives you a look of slight surprise and then smiles. "I don''t mind if I do." He grabs a bottle off one of the shelves. He rubs some of the contents onto his dick and then on your asshole. You''re not sure what it is, but you can feel it''s slickness, so it''s obviously something he uses for lube.'
 				'With his dick and your asshole lubed up, he moves up behind you. You feel the tip of his dick against your anus and the pressure building up until it suddenly pops into your asshole. It hurts a little at first, but he doesn''t move, giving you a moment to relax and adjust to the feeling of his <<dick>>cm <<$dick_girth>> cock in your ass. He then starts slowly fucking your ass, but not too deeply, letting you get use to it so it doesn''t hurt as much.'
 				anal_slip += 10
-				gs 'arousal', 'anal', 5, 'sub'
+				gs 'arousal', 'anal', 5, 'sub', 'lube'
 				gs 'stat'
 				act 'Take it up the ass': gt 'gschool_sex', 'storagesex_anal'
 			end
@@ -785,7 +799,35 @@ if $ARGS[0] = 'storagesex':
 					'He gives you a slightly disbelieving look. You don''t think he believes you, but then he nods. "Fine, but strip off so I can see your naked body." You nod and start sucking his dick again as you start taking off your clothes. He puts his hand on the back of your head and forces his dick all the way down your throat again as you strip. He starts to moan loudly, taking his hand from the back of your head. You pull your head back just in time as he grabs a hold of his dick and starts to stroke it.'
 					gs 'arousal', 'bj', 3, 'sub', 'deepthroat'
 					gs 'stat'
-					act 'Cum catching': gt 'gschool_sex', 'storagesex_cum'
+					act 'Cum catching':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker9.jpg"></center>'
+						'With a couple more strokes, you feel hot jets of cum splattering against your cheek. A couple more spurts hit your face as well as he loudly moans. Once the last spurt has landed, he rubs the tip of his dick against your lips, wiping off the last bit of cum. Satisfied, he pulls up his pants and smiles to you. "Your reputation is well earned girl. We will have to do this again. Now get cleaned up and get home." He walks out of the storage room, leaving you naked on your knees with his cum running down your cheek.'
+						gs 'arousal', 'foreplay', 2, 'sub'
+						gs 'arousal', 'end'
+						gs 'cum_call', 'face', 'A131'
+						gs 'stat'
+						act 'Leave school': gt 'gschool_lessons', 'short_break'
+						act 'Go take a shower':
+							*clr & cla
+							menu_off = 1
+							minut += 10
+							pcs_mood += 10
+							shower_shave = 0
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
+							'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers. You enjoy the sensation of the hot water on your skin. The steam filling the room gives it an almost sauna-like feel and makes you feel very relaxed.'
+							act 'Go to the locker room':
+								*clr & cla
+								minut += 5
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic2.jpg"></center>'
+								'You take your clothes out of your locker and start putting them on. With no one else here to distract you, it doesn''t take you too long to get dressed.'
+								'You can choose another outfit while you''re here.'
+								act 'Continue': gt 'gschool_lessons4', 'post_dress'
+							end
+						end
+					end
 				end
 			else
 				act 'Just suck him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -797,39 +839,37 @@ end
 if $ARGS[0] = 'storagesex_anal':
 	*clr & cla
 	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage8.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker6.jpg"></center>'
 	'He steadily works his dick as deep into your asshole as you can comfortably take and starts fucking you harder and faster. Each time you tense up or cry out, he eases up a bit until he finds just the right spot where he can go as deep as you can take and as hard as you can handle and keeps that rhythm, pumping your ass in a fairly pleasant fucking. It starts feeling surprisingly good after a few minutes and you find yourself moaning and getting into it almost as much as he is. Just then, he pulls his dick out of your asshole. "Get on your knees." he says. You turn around and just barely get down on your knees in time.'
 	gs 'arousal', 'anal', 5, 'sub'
 	gs 'stat'
-	act 'Cum catching': gt 'gschool_sex', 'storagesex_cum'
-end
-	
-if $ARGS[0] = 'storagesex_cum':
-	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/storage9.jpg"></center>'
-	'With a couple more strokes, you feel hot jets of cum splattering against your cheek. A couple more spurts hit your face as well as he loudly moans. Once the last spurt has landed, he rubs the tip of his dick against your lips, wiping off the last bit of cum. Satisfied, he pulls up his pants and smiles to you. "Your reputation is well earned girl. We will have to do this again. Now get cleaned up and get home." He walks out of the storage room, leaving you naked on your knees with his cum running down your cheek.'
-	gs 'arousal', 'foreplay', 2, 'sub'
-	gs 'arousal', 'end'
-	gs 'cum_call', 'face', 'A131'
-	gs 'stat'
-	act 'Leave school': gt 'gschool_lessons', 'short_break'
-	act 'Go take a shower':
+	act 'Cum catching':
 		*clr & cla
-		menu_off = 1
-		minut += 10
-		pcs_mood += 10
-		shower_shave = 0
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker9.jpg"></center>'
+		'With a couple more strokes, you feel hot jets of cum splattering against your cheek. A couple more spurts hit your face as well as he loudly moans. Once the last spurt has landed, he rubs the tip of his dick against your lips, wiping off the last bit of cum. Satisfied, he pulls up his pants and smiles to you. "Your reputation is well earned girl. We will have to do this again. Now get cleaned up and get home." He walks out of the storage room, leaving you naked on your knees with his cum running down your cheek.'
+		gs 'arousal', 'foreplay', 2, 'sub'
+		gs 'arousal', 'end'
+		gs 'cum_call', 'face', 'A131'
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
-		'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers. You enjoy the sensation of the hot water on your skin. The steam filling the room gives it an almost sauna-like feel and makes you feel very relaxed.'
-		act 'Go to the locker room':
+		act 'Leave school': gt 'gschool_lessons', 'short_break'
+		act 'Go take a shower':
 			*clr & cla
-			minut += 5
+			menu_off = 1
+			minut += 10
+			pcs_mood += 10
+			shower_shave = 0
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic2.jpg"></center>'
-			'You take your clothes out of your locker and start putting them on. With no one else here to distract you, it doesn''t take you too long to get dressed.'
-			'You can choose another outfit while you''re here.'
-			act 'Continue': gt 'gschool_lessons4', 'post_dress'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
+			'By the time you arrive in the girls locker room, you realize all the other girls have left. You quickly get undressed and head to the showers. You enjoy the sensation of the hot water on your skin. The steam filling the room gives it an almost sauna-like feel and makes you feel very relaxed.'
+			act 'Go to the locker room':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic2.jpg"></center>'
+				'You take your clothes out of your locker and start putting them on. With no one else here to distract you, it doesn''t take you too long to get dressed.'
+				'You can choose another outfit while you''re here.'
+				act 'Continue': gt 'gschool_lessons4', 'post_dress'
+			end
 		end
 	end
 end
@@ -1531,7 +1571,7 @@ if $ARGS[0] = 'victor_lockerroom':
 		act 'Suck his dick':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker4.jpg"></center>'
-			'As you keep stroking his dick, you lean forward and open your mouth, letting the head of his cock pass your lips. You wrap your lips around his shaft and start sucking on his dick, bobbing your head back and forth in rhythm with the stroking of your hand. For a couple of minutes, you just suck on his dick while stroking it before you feel his hand on the back of your head and he starts forcing you to take more and more of his dick into your mouth. You eventually  have to move your hand away as he forces you to deepthroat him. After a minute or so of this, he says "Take your clothes off and lie down on the bench."'
+			'As you keep stroking his dick, you lean forward and open your mouth, letting the head of his cock pass your lips. You wrap your lips around his shaft and start sucking on his dick, bobbing your head back and forth in rhythm with the stroking of your hand. For a couple of minutes, you just suck on his dick while stroking it before you feel his hand on the back of your head and he starts forcing you to take more and more of his dick into your mouth. You eventually  have to move your hand away as he forces you to deepthroat him. After a minute or so of this, he says "Take your clothes off."'
 			gs 'arousal', 'bj', 5, 'deepthroat'
 			gs 'stat'
 			gs 'willpower', 'sex', 'resist', 'medium'
@@ -1547,52 +1587,52 @@ if $ARGS[0] = 'victor_lockerroom':
 					'He lets you alternate between using your hand to stroke him at the same time and deep throating you. Several more minutes of this pass by before he says "I''m about to cum. Take off your shirt."'
 					gs 'arousal', 'bj', 5, 'deepthroat'
 					gs 'stat'
-					act 'Cum on tits': gt 'gschool_sex', 'victor_lockerroom_cum'
+					act 'Cum': gt 'gschool_sex', 'victor_lockerroom_cum'
 				end
 			else
 				act 'I just want to suck you off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			act 'Strip and lie down':
+			act 'Strip':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker5.jpg"></center>'
-				'You start to strip down, but you only manage to get your shirt off before he pushes you down on the bench. He kneels down between your legs and starts licking your pussy. He is very good at it and you quickly get very wet and not just from his tongue. He alternates from caressing your clit with his tongue to slipping his tongue inside you. Then he abruptly stops, stands up and starts man handling you to turn over as he says "Get on your hands and knees."'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker8.jpg"></center>'
+				'You start to strip down, you remove most of your clothes before he pushes you up against the lockers and lifts up one your legs. From behind you, you feel his dick slide into your wet pussy as he starts fucking you. Then he abruptly stops, dragging you over to the bench, he pushes you forward while your back is to him, as he says "Bend over."'
 				gs 'arousal', 'cuni', 10
 				minut -=5
 				gs 'stat'
-				act 'Get on your hands and knees':
+				act 'Bend over':
 					*clr & cla
 					gs 'boyStat', 'A131'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker6.jpg"></center>'
-					'Between him man handling you and you trying to turn over, you quickly find yourself kneeling on the bench on your hands and knees with your ass presented to him. He quickly strips his clothes off before he straddles the bench and moves up behind you. You feel the tip of his dick rub against your slit, getting it and your pussy wetter before he eases his <<dick>>cm <<$dick_girth>> cock about half way inside of you and starts fucking you. He is slow and gentle at first, but as you start moaning more, he starts going balls deep and fucking you harder.'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker5.jpg"></center>'
+					'With him man handling you, you quickly find yourself standing bent over the bench, with your ass presented to him. He quickly strips his clothes off before he straddles the bench and moves up behind you. You feel the tip of his dick rub against your slit, getting it and your pussy wetter before he eases his <<dick>>cm <<$dick_girth>> cock about half way inside of you and starts fucking you. He is slow and gentle at first, but as you start moaning more, he starts going balls deep and fucking you harder.'
 					gs 'arousal', 'vaginal', 5
 					gs 'stat'
 					act 'Get ploughed':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker7.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker6.jpg"></center>'
 						'He grabs your hip with his hand as he starts pounding your wet pussy hard and fast. The locker room echoes with the sounds of moans and slapping flesh. His hand pulls your hips back just as he thrusts forward and you can feel your tits bouncing with each impact of your bodies. Then on one of his strokes, he pulls all the way out of you, but when he goes to put it back in, he aims high and you feel his dick slide into your ass. You don''t know if it was an accident or if he did it on purpose, all you know is he just started fucking your ass.'
 						gs 'arousal', 'vaginal', 5
 						anal_slip += 4
 						gs 'stat'
 						act 'Wrong hole!':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker8.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker6.jpg"></center>'
 							'A dick suddenly popping into your ass makes you cry out and you try to pull away, but his hand holds you firm. "Wrong hole!" you cry out.'
 							'He doesn''t slow down as he fucks your ass. At first you think he is ignoring you as you look back at him over your shoulder, then he gets a slightly confused look on his face. "What?"'
 							'You grit your teeth as he keeps fucking your ass. "I said wrong hole! You''re fucking my ass! Please, stop!" you whine.'
 							'Hearing your words, he looks down, but doesn''t stop fucking you. "Are you sure?"'
 							'Exacerbated, you shout "Yes! I am fucking sure that''s my ass!"'
-							'He looks a bit more then says "Oh sorry! Well, I''m almost done." True to his word, a few seconds later he starts moaning loudly and pulls out of your ass. "I''m about to cum. Get on your knees and take off your shirt." You turn around and drop to your knees.'
+							'He looks a bit more then says "Oh sorry! Well, I''m almost done." True to his word, a few seconds later he starts moaning loudly and pulls out of your ass. "I''m about to cum. Get on your knees." You turn around and drop to your knees.'
 							gs 'arousal', 'anal', 5
 							gs 'stat'
-							act 'Cum on tits': gt 'gschool_sex', 'victor_lockerroom_cum'
+							act 'Cum': gt 'gschool_sex', 'victor_lockerroom_cum'
 						end
 						act 'Say nothing':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker8.jpg"></center>'
-							'You moan and groan loudly, gripping the bench tightly as he pounds your little ass hard and fast. Part of you is really enjoying this, but you are still unsure if he did it on purpose until he moans out "Fuck you have a tight little ass." He keeps pounding away at your ass for a couple more minutes before he starts moaning loudly and pulls out of you. "I''m about to cum. Get on your knees and take off your shirt." You turn around and drop to your knees.'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker6.jpg"></center>'
+							'You moan and groan loudly, gripping the bench tightly as he pounds your little ass hard and fast. Part of you is really enjoying this, but you are still unsure if he did it on purpose until he moans out "Fuck you have a tight little ass." He keeps pounding away at your ass for a couple more minutes before he starts moaning loudly and pulls out of you. "I''m about to cum. Get on your knees." You turn around and drop to your knees.'
 							gs 'arousal', 'anal', 5
 							gs 'stat'
-							act 'Cum on tits': gt 'gschool_sex', 'victor_lockerroom_cum'
+							act 'Cum': gt 'gschool_sex', 'victor_lockerroom_cum'
 						end
 					end
 				end
@@ -1605,11 +1645,11 @@ if $ARGS[0] = 'victor_lockerroom_cum':
 	*clr & cla
 !!to do note: to raise PE grade when we redo school grades.
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker9.jpg"></center>'
-	'He reaches down and helps you pull your shirt off before you have a chance to do it yourself. You start to suck him again and he stops you. "Just jerk it. I want to cum on your tits." So you do as he asks and just jerk him off with your hand. It doesn''t take long before he starts moaning loudly and hot sperm comes streaming out. Most of it lands on your chest and tits, but a little ends up on your chin. You keep stroking him until no more streams of cum emerge and only a last few drops are milked out of him. You lick the tip of his dick, licking up the last couple of drops of cum.'
+	'He grabs you by the hair with one hand to hold your face right in front of his cock, while he jerks off with his other hand. It doesn''t take long before he starts moaning loudly and hot sperm comes streaming out. Most of it lands on your face, but a little ends up in your open mouth. He keeps stroking his dick until no more streams of cum emerge and only a last few drops are milked out of him. You lick the tip of his dick, licking up the last couple of drops of cum.'
 	*nl
 	'He pulls up his shorts, tucking his dick away as he looks around, apparently making sure no one is coming to find out what the noise was. He looks down at you and smiles. "Congratulations you just passed P.E. Now you better get cleaned up." Satisfied, he turns and and walks out of the locker room, leaving you on your knees with his cum all over your tits.'
-	gs 'arousal', 'hj', 5
-	gs 'cum_call', 'breasts', 'A131'
+	gs 'arousal', 'foreplay', 5
+	gs 'cum_call', 'face', 'A131'
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'

+ 6 - 24
locations/nerd_game_night.qsrc

@@ -89,6 +89,7 @@ if $ARGS[0] = 'game_night1':
 	*clr & cla
 	nerd_game['stage'] = 1
 	menu_off = 1
+	minut += 180
 	grupvalue[3] += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
 	if grupTipe['joined_nerds'] = 1:
@@ -108,7 +109,6 @@ if $ARGS[0] = 'game_night1':
 	gs 'stat'
 	act 'Introduction':
 		*clr & cla
-		minut += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/character.jpg"></center>'
 		'Feofan glances to Petka and sighs a little, "Anyways I should tell you a little something about your fellow adventures. Artem is playing a Dwarven male Fighter, Gerasim is playing a half-orc male Ranger, Julia is playing a Human female Cleric of the Lady or Morning, Zinaida is playing a Human male Fighter, Petka was playing a Halfling male rogue but he got killed last game session and he wanted to try something different, so now he is playing Half Elven female Wizard." As he talks the others smile to you when he talks about their character.'
@@ -140,7 +140,6 @@ if $ARGS[0] = 'game_on':
 	menu_off = 1
 	act 'Game on':
 		*clr & cla
-		minut += 90
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/playing.jpg"></center>'
 		'Feofan clears his throat, "Now then, the last time we stopped at the turn when Zinaida was supposed to make her move."'
@@ -154,7 +153,6 @@ if $ARGS[0] = 'game_on':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'like'
 			gs 'npc_relationship', 'modify', 'A153', 'dislike'
-			minut += 3
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 			'You think about it for a short while and tell the others. "I think Artem is right, the element of surprise shouldn''t be wasted."'
@@ -165,7 +163,6 @@ if $ARGS[0] = 'game_on':
 			*clr & cla
 			gs 'npc_relationship', 'modify', 'A2', 'dislike'
 			gs 'npc_relationship', 'modify', 'A153', 'like'
-			minut += 3
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big153.jpg"></center>'
 			'You think about it for a short while and tell the others. "I think it is more important to make Zindaida''s character as tough as we can, so she is better able to survive the dragons attack."'
@@ -178,7 +175,6 @@ if $ARGS[0] = 'game_on':
 			gs 'npc_relationship', 'modify', 'A153', 'dislike'
 			npc_rel['A2'] -= 1
 			npc_rel['A153'] -= 1
-			minut += 3
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
 			'You excuse yourself as you explain that it wouldn''t be fair for you to take this kind of decision as you''re new at this and don''t even know how tough a dragon is, though it sounds dangerous. "I mean it''s a dragon right, should we even be attacking it? Can we win?"'
@@ -192,7 +188,6 @@ if $ARGS[0] = 'keep_playing_on1':
 	menu_off = 1
 	*clr & cla
 	pcs_mood += 10
-	minut += 90
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/playing.jpg"></center>'
 	'The battle with the dragon begins, Feofan weaves a scarying sounding battle as everyone takes turns taking a action. At one point most of the group is down, only Julia and Petka''s characters are still up. Julia is trying to heal Zinaida and Artem''s characters, while Petka''s sorceress is trying to cast a powerful spell. It looks like the dragon is about to finish off Petka''s character for sure and maybe Julia''s as well, but you have managed to sneak around the dragon as it is distracted, focusing on the rest of the party. At that point you decided to try out your back stab ability Feofan told you about that your character could do earlier. "I want to back stab the dragon."'
@@ -201,7 +196,6 @@ if $ARGS[0] = 'keep_playing_on1':
 	'Feofan nods with a smile. "Ok then <<$pcs_nickname>> roll your attack.'
 	act 'Roll the dice':
 		*clr & cla
-		minut += 10
 		temp = rand(1,20)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/rollingdice.jpg"></center>'
 		if temp = 20:
@@ -220,7 +214,6 @@ if $ARGS[0] = 'keep_playing_on1':
 		gs 'stat'
 		act 'Finish the game night':
 			*clr & cla
-			minut += 30
 			pcs_mood += 20
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
@@ -239,7 +232,7 @@ if $ARGS[0] = 'game_night2':
 	*clr & cla
 	nerd_game['stage'] = 2
 	menu_off = 1
-	minut += 120
+	minut += 180
 	grupvalue[3] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
@@ -281,7 +274,6 @@ end
 if $ARGS[0] = 'keep_playing_on2':
 	menu_off = 1
 	*clr & cla
-	minut += 120
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/camp.jpg"></center>'
 	'You continue on walking towards a nearby village as Feofan is lividly describing the areas that you pass through. You travel for several days and Feofan makes it sound both beautiful and grueling. You couldn''t imagine walking that long, only stopping to eat and make camp at night. Finally Feofan announces the group is less day from town but night will soon be falling hours before you could reach town. He describes it as a nice clearing at the edge of a forest with a river of fresh water just beyond the tree''s.'
@@ -324,7 +316,7 @@ if $ARGS[0] = 'game_night3':
 	*clr & cla
 	nerd_game['stage'] = 3
 	menu_off = 1
-	minut += 120
+	minut += 180
 	grupvalue[3] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
@@ -351,7 +343,6 @@ if $ARGS[0] = 'game_night3':
 				'"It''s quite easy, there was a reason why you were brought along <<$pcs_nickname>>. Don''t you have high charisma and social skills?" Artem asks. You quickly go through your character sheet and nod, "There we have it then, head back inside and have him eat out of your hand." He adds.'
 				act 'Re-enter the blacksmith shop':
 					*clr & cla
-					minut += 100
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/blacksmith.jpg"></center>'
 					'You cautiously enter the blacksmith shop, "I''m not interested in what you have to say, girl!" The familiar clonking sound starting all over again.'
 					'"I-I..." you start hesitating losing some of your composure as Feofan is a really good role-player. Suddenly you feel a light nudge, "Say that you want to roll the dice for a persuasion check." Julia reminds you.'
@@ -360,7 +351,6 @@ if $ARGS[0] = 'game_night3':
 					'Feofan smiles, "Great, then roll the dice!"'
 					act 'Roll the dice':
 						*clr & cla
-						minut += 20
 						temp = rand(10,30)
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/rollingdice.jpg"></center>'
 						if temp <= 18:
@@ -442,7 +432,6 @@ if $ARGS[0] = 'game_night3':
 			'After a short discussion you all agree on the details and head out.'
 			act 'Head to the blacksmith shop':
 				*clr & cla
-				minut += 120
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/blacksmith_shop.jpg"></center>'
 				'Upon entering the blacksmith shop you can hear the clonking of a hammer hitting on heated iron. A tall man with broad shoulders is hammering away not really paying attention towards you, "Excuse me, sir!" The banging continues on, "Sir!" Artem and Feofan are role-playing to the point as the rest of you listen on, "My good sir, we would like to see what wares you have to offer."'
@@ -489,7 +478,7 @@ if $ARGS[0] = 'game_night4':
 	*clr & cla
 	nerd_game['stage'] = 4
 	menu_off = 1
-	minut += 120
+	minut += 180
 	grupvalue[3] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
@@ -525,7 +514,6 @@ end
 
 if $ARGS[0] = 'woman':
 	*clr & cla
-	minut += 60
 	nerd_game['tavernwoman'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/tavernwoman.jpg"></center>'
@@ -542,7 +530,6 @@ end
 
 if $ARGS[0] = 'group':
 	*clr & cla
-	minut += 60
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/taverngroup.jpg"></center>'
 	!Will turn into bandits that want to rob you later on
@@ -597,7 +584,6 @@ end
 if $ARGS[0] = 'oldman':
 	!Will send you out to old ruins where the players will meet his old dead crew
 	*clr & cla
-	minut += 60
 	nerd_game['tavernman'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/tavernman.jpg"></center>'
@@ -626,7 +612,6 @@ if $ARGS[0] = 'inform_them':
 		if nerd_game['taverngroup'] = 0: act 'Go talk to the group': gt 'nerd_game_night', 'group'
 		if nerd_game['tavernman'] = 0: act 'Go talk to the old man': gt 'nerd_game_night', 'oldman'
 	else
-		minut += 120
 		gs 'stat'
 		'You walk back to the group and tell them about the different adventures you''ve discovered from the patrons of the tavern. They all listen attentively to what you have to say, "Well, I feel like we should go and bash that Necromancer''s head in." Artem says.'
 		'"I disagree, I''m not too fond of that, I''d rather do something else." Julia counters. The arguing then starts getting more intensive as all of the players are trying to get their point across. The yelling is getting louder and louder as Feofan gets fed up and slams the table, "Now that I have your attention! Since you can''t decide what you should do, I suggest that you have a vote on what the next adventure will be."'
@@ -664,7 +649,7 @@ if $ARGS[0] = 'game_night5':
 	*clr & cla
 	nerd_game['stage'] = 5
 	menu_off = 1
-	minut += 120
+	minut += 180
 	grupvalue[3] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
@@ -674,7 +659,6 @@ if $ARGS[0] = 'game_night5':
 	'The group quickly packs up everything from the rooms in the inn, pays for their stay and then heads outside.'
 	act 'Leave the inn':
 		*clr & cla
-		minut += 120
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/partymeet.jpg"></center>'
 		'You''re heading out, you quickly throw one last gaze at the beautiful village map that Feofan painted. You gather just outside of town, everyone takes a moment to double check the supplies to make sure you didn''t miss anything in a small field just beyond the outskirts of the village. Once everyone is sure you are not missing anything you start to travel in the direction of your next adventure. You run into a few wandering encounters but nothing to serious, as your group stops to camp for the night. You expect to see Feofan pull out the map of our camp, but to everyone''s disappointment Feofan isn''t pulling anything out. All of you look confused at each other, searching for some answers.'
@@ -700,7 +684,7 @@ end
 if $ARGS[0] = 'board_games':
 	*clr & cla
 	menu_off = 1
-	minut += 60
+	minut += 180
 	grupvalue[3] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/board1.jpg"></center>'
@@ -717,14 +701,12 @@ if $ARGS[0] = 'board_games':
 	end
 	act 'Start playing':
 		*clr & cla
-		minut += 120
 		nerd_game['boardgames'] = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/board1.jpg"></center>'
 		'The group sits for quite a while, laughing, having and good time, and sometimes even arguing. Despite even the arguments over rules occasionally you all end up enjoying yourselves. As the game goes on a few start to pull away, but it is still to close and there''s no way to say who''s going to win.'
 		act 'Finish up':
 			*clr & cla
-			minut += 60
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/board1.jpg"></center>'
 			'You continue on playing with even more laughter and before you know it the game is over for the night. All of you are buzzing and praising Feofan for picking a really good game.'

+ 56 - 55
locations/nyp_school.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'start':
 			pl '<a href="exec: music_on = 1 & gt ''nyp_school'', ''start''">Play music</a>'
 		end
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/picture.jpg"></center>'
-		'Within half an hour all the tea has been drank and the buns devoured. After everyone has finished, a teacher takes out a music player, placing it on the table. "Why don''t we have a little dance?" The music starts blasting from the speakers and he contently returns to join the other two teachers, who pay less and less attention to what''s going on. A few couples and some of the girls get up to dance, but most of your fellow students further separate into their respective cliques.'
+		'Within half an hour all the tea has been drank and the buns devoured. After everyone has finished, a teacher takes out a music player and places it on the table. "Why don''t we have a little dance?" The music starts blasting from the speakers and he contently returns to join the other two teachers, who pay less and less attention to what''s going on. A few couples and some of the girls get up to dance, but most of your fellow students further separate into their respective cliques.'
 		*nl
 		'A teacher that seems to be the only one into this New Years "party" approaches. "Well guys, Happy New Year! It''s time for pictures." He takes several pictures, with one of the whole class, another of just the boys and then one of just the girls. He then takes pictues of groups of friends or mostly, whether he knows it or not, of social groups. He then moves off for a while as the next half hour passes by very slowly. The enthusastic teacher then comes back over. "Well guys, Happy New Year, but I need to go home. I still need to prepare for the holiday at home." Discordant chorus wishes the teacher a Happy New Year. "Before I leave, how about you guys help me clean up?" they ask.'
 		act 'Help clear the table':
@@ -48,18 +48,18 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/spike.jpg"></center>'
 			'You help clear the table with the other girls. The boys don''t help with the cleanup and just keep talking with each other. Once everything is cleaned up, the teachers speak up. "You can stay here for a while and have fun guys. Rolan will come through in a few hours to lock the place up. Until then, feel free to stay and dance and we''ll see everyone after winter break." The teachers then pack up and leave, acting like they can''t wait to get out of here, leaving only Mr. Yenotin to watch over everyone.'
 			*nl
-			'With most of the teachers gone, some of the boys begin to whisper among themselves and all of a sudden, some of them pull out some fruit juice, while a couple of the girls cut up fresh fruit slices to add to it. Lena and Lera add the final ingredient; pouring a whole bottle of vodka into the mix, much to the joy of most of the students and to the dismay of the nerds.'
+			'With most of the teachers gone, some of the boys begin whispering among themselves before pulling out some fruit juice, while a few of the girls cut up fresh fruit slices to add to it. Lena and Lera add the final ingredient; pouring a whole bottle of vodka into the mix, much to the joy of most of the students and to the dismay of the nerds.'
 			if pav_slut > 200 and grupTipe ! 4:
 				!!If Sveta is a slut and not a Gopnik this happens instead of the options below.
 				!!slut and not a gopnik
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/boywant.jpg"></center>'
-				'Vasily comes up to you and slaps you hard on the ass, saying "Hey slut, why did you even come here? This is for ordinary people. Your place is behind some building sucking a cock."'
+				'Vasily comes up to you and slaps you hard on the ass. "Hey slut, why did you even come here? This is for ordinary people. Your place is behind some building sucking a cock."'
 				gs 'stat'
 
 				act 'You came for cock':
 					cla
-					'You smile at him and tell him. "I was hoping to find some cock to suck, you know where I might find one?" He blinks a moment, apparently taking a moment to process what you just said before he smiles and grabs you by the arm, dragging you off towards the boys locker room. "Then come on slut! I will give you all the cock you can handle!"'
+					'You smile at him. "I was hoping to find some cock to suck, you know where I might find one?" He blinks, apparently taking a moment to process what you just said before he smiles and grabs you by the arm, dragging you off towards the boys locker room. "Then come on slut! I''ll give you all the cock you can handle!"'
 
 					act 'Go to the locker room': gt 'nyp_school', 'slut'
 				end
@@ -67,15 +67,15 @@ if $ARGS[0] = 'start':
 				act 'Ignore him':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
-					'You silently turn away from Vasily, ignoring his comment. He grabs you by the arm: "What do you think you''re doing, bitch? Answer me when I talk to you!"'
+					'You silently turn away from Vasily, ignoring his comment, but he suddenly grabs you by the arm. "What do you think you''re doing, bitch? Answer me when I talk to you!"'
 					if AlbinaBlockHumiliation = 1:
 						if pav_prostitute > 10: pav_prostitute -= 10
 						if pav_sex > 10: pav_sex -= 10
-						'You hear the clattering of heels and turn to Albina storming over with a none too kind expression on her face, her furious gaze directed towards Vasily. "I distincly remember telling you and the other tiny dick morons to fuck off and leave <<$pcs_nickname>> alone, or has your tiny dick brain forgotten that conversation?"'
+						'You hear the clattering of heels and turn to see Albina storming over, her furious gaze directed towards Vasily. "I distinctly remember telling you and the other tiny dick morons to fuck off and leave <<$pcs_nickname>> alone, or has your tiny dick brain forgotten that conversation?"'
 						'Vasily has already let go of you and bravely - or stupidly - lunged for Albina. "What did you call me, you buttslut whore? You want me to fuck you instead?"'
-						'Albina gives him her most charming smile and then, with lightning-fast reflexes, launches her knee right into his crotch, causing the howling Vasily to fall to the floor. Albina then squats down beside him as he rolls back and forth in pain and sweetly says "If you touch <<$pcs_nickname>> or attack, insult or even look at me again, I''ll bury you alive somewhere nobody will ever find you..."'
+						'Albina gives him her most charming smile and then, with lightning-fast reflexes, launches her knee right into his crotch, causing the howling Vasily to fall to the floor. Albina then squats down beside him as he rolls back and forth in pain and sweetly says "If you approach <<$pcs_nickname>> or attack, insult or even look at me again, I''ll bury you alive where nobody will ever find you..."'
 						*nl
-						'Vasily curls into a ball on the floor, nursing the pain in his crotch. Either he didn''t listen to her or he doesn''t know when to stop, because the next thing he utters between incoherent moans of pain is clearly "Cock sucking bitch!" Albina rises to her feet and smiles. Then, without warning, she viciously stomps on his crotch and then painfully twists her heel into him. "You''re testing my fucking patience! Do I need to burst your little balls in front of everyone?"'
+						'Vasily curls into a ball on the floor, nursing the pain in his crotch. Either he didn''t listen to her or he doesn''t know when to stop, because the next thing he utters between incoherent moans of pain is clearly "Fuck you, you dirty anal-loving whore!" Albina rises to her feet and smiles. Then, without warning, she viciously stomps on his crotch and then painfully twists her heel into him. "You''re testing my fucking patience! Do you want me to burst your little balls in front of everyone?"'
 						*nl
 						'Vasily squeals pathetically in pain. "No!! I''m sorry! I''m sorry! Just please, stop!" A strangely satisified, almost erotic grin creeps onto Albina''s face and she squats down next to him again, patting his head like a dog while mocking him. "Who''s a good boy? You are! Yes you!" She then stands and looks at you. "<<$pcs_nickname>>, you better leave before somebody sees you here. With what people already think of you, you really don''t want them to think you did this."'
 						*nl
@@ -84,7 +84,7 @@ if $ARGS[0] = 'start':
 
 						act 'Leave':gt 'gschool_grounds', 'main'
 					else
-						'"What do you want?" you cry out. Vasily just grins. "What do I want? I''d like a New Year''s gift. Nothing big, just a little kiss on the cheek... or how about we continue this in the locker room and I get to fuck you raw? That would be quite the gift." He grabs you by the arm and pulls you along, with the rest of the students either ignoring what''s going on or cheer Vasily on. A few of the other gopniks join him in dragging you into the locker room.'
+						'"What do you want?" you cry out and Vasily just grins. "What do I want? I''d like a New Year''s gift. Nothing big, just a little kiss on the cheek... or how about we continue this in the locker room and I get to fuck you raw? That would be quite the gift." He grabs you by the arm and pulls you along, with the rest of the students either ignoring what''s going on or cheer Vasily on. A few of the other gopniks join him in dragging you into the locker room.'
 						gs 'stat'
 
 						act 'Get dragged into the locker room': gt 'nyp_school', 'slut'
@@ -95,7 +95,7 @@ if $ARGS[0] = 'start':
 				act 'Approach':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/gopniks.jpg"></center>'
-					'You walk up to the guys who are standing in a circl laughing. You notice one of them holding a bottle of vodka. Dan offers you a glass.'
+					'You walk up to the guys, who are standing in a circle laughing. You notice one of them holding a bottle of vodka. Dan offers you a glass.'
 					minut += 5
 					gs 'stat'
 
@@ -140,9 +140,9 @@ if $ARGS[0] = 'start':
 					if grupTipe = 5:
 						act 'Go stand against the wall alone':gt 'nyp_school', 'outcast'
 					else
-						act 'Hangout with the cool kids and jocks':gt 'nyp_school', 'cool jocks'
-						act 'Hangout with the nerds':gt 'nyp_school', 'nerds'
-						act 'Hangout with the gopniks':gt 'nyp_school', 'gopniks'
+						act 'Hang out with the cool kids and jocks':gt 'nyp_school', 'cool jocks'
+						act 'Hang out with the nerds':gt 'nyp_school', 'nerds'
+						act 'Hang out with the gopniks':gt 'nyp_school', 'gopniks'
 						act 'Leave':gt 'gschool_grounds', 'main'
 					end
 					act 'Leave':gt 'gschool_grounds', 'main'
@@ -179,7 +179,7 @@ if $ARGS[0] = 'cool jocks':
 			'You shake your head. "No, I don''t feel like it right now. Maybe later?"'
 			'He frowns a bit and nods. "Ok, well we can just talk if you want."'
 			'You smile at him. "Of course." You talk with him for a bit, but gradually you start paying more attention to what the other girls are talking about and soon, the conversation is all about girl gossip and topics. Igor seems to enjoy this even more and doesn''t seem to mind the strange looks from some of the girls when he fully engages with good fashion tips. All and all, you are having a good time.'
-			act 'Hangout until the party ends':gt 'nyp_school', 'end'
+			act 'Hang out until the party ends':gt 'nyp_school', 'end'
 		end
 		act 'Dance with Igor':
 			*clr & cla
@@ -209,7 +209,7 @@ if $ARGS[0] = 'cool jocks':
 			'You shake your head. "No, I don''t feel like it right now. Maybe later?"'
 			'He looks a little embarrassed as some of the girls giggle when you reject him. "Oh, OK. Well, if you change your mind let me know."'
 			'You smile at him. "Of course." You lean over and give him a quick kiss, which gets a lot of woos from the other girls. He then walks off and the girls tease you about it for a bit, while some ask you about him. Before long, all the girls are talking about which boys they think are cute or have the biggest dick.'
-			act 'Hangout until the party ends':gt 'nyp_school', 'end'
+			act 'Hang out until the party ends':gt 'nyp_school', 'end'
 		end
 		act 'Dance with Marcus':
 			*clr & cla
@@ -240,7 +240,7 @@ if $ARGS[0] = 'cool jocks':
 			'You slightly lower your head as you say "I would love to, but I''m really tired and just want to chat with my friends for a bit. Maybe next time." You can see Fedor look noticeably sad as he responds "Alright, I didn''t mean to interrupt your chat. I''ll just go..." Not wanting Fedor to be sad, you give him a smile as you approach him then lean forward, planting a soft kiss on his cheek before saying "Awww, don''t give me that sad puppy face. How about a kiss instead?"' 
 			*nl
 			'Fedor chuckles before nodding and giving you a passionate kiss before saying "Alright <<$pcs_nickname>>, have a good time and I''ll see you later." You wave to Fedor as he walks away.'
-			act 'Hangout until the party ends':gt 'nyp_school', 'end'
+			act 'Hang out until the party ends':gt 'nyp_school', 'end'
 		end
 
 		act 'Dance with Fedor':
@@ -275,7 +275,7 @@ if $ARGS[0] = 'cool jocks':
 			'She frowns a bit and nods. "Okay. If you change your mind, come join us." She then grabs Vicky by the hand, who drags Vanya along. Soon all three of them are dancing together.'
 			'You watch them for a bit before turning back to engage in conversation with the other girls.'
 
-			act 'Hangout until the party ends':gt 'nyp_school', 'end'
+			act 'Hang out until the party ends':gt 'nyp_school', 'end'
 		end
 
 		act 'Dance with Katja':
@@ -300,7 +300,7 @@ if $ARGS[0] = 'cool jocks':
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/hangout.jpg"></center>'
 		'The next half hour passes by very slowly and is uneventful. You spend most of the time just talking to the other girls about the latest fashion, what''s going on in school or recent events. To kill time for a while, all the girls go out and dance together as a group. At least those not already dancing with one of the boys.'
-		act 'Hangout until the party ends':gt 'nyp_school', 'end'
+		act 'Hang out until the party ends':gt 'nyp_school', 'end'
 	end
 end
 
@@ -324,7 +324,7 @@ if $ARGS[0] = 'nerds':
 		minut += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/nerds.jpg"></center>'
-		'You see the others sitting at a table lively discussing something. As you approach you hear Natasha. "Ugh, you always talk about this damn role play game. It''s no wonder everyone sees you as nerds. Can''t we talk about something else?"'
+		'You see the others sitting at a table lively discussing something. As you approach you hear Natasha complaining. "Ugh, you always talk about this damn role play game. It''s no wonder everyone sees you as nerds. Can''t we talk about something else?"'
 		'The group look at her with a blank stare and instead turn towards you. "So <<$pcs_nickname>>, how do you think we should face the undead ruler?" You can hear Natasha ironically yawn.'
 		act 'Head on':
 			*clr & cla
@@ -342,7 +342,7 @@ if $ARGS[0] = 'nerds':
 			npc_rel['A12'] += 1
 			gs 'stat'
 
-			act 'Hangout until the party ends':gt 'nyp_school', 'end'
+			act 'Hang out until the party ends':gt 'nyp_school', 'end'
 		end
 		act 'Methodically approach it':
 			*clr & cla
@@ -360,7 +360,7 @@ if $ARGS[0] = 'nerds':
 			npc_rel['A12'] += 1
 			gs 'stat'
 
-			act 'Hangout until the party ends':gt 'nyp_school', 'end'
+			act 'Hang out until the party ends':gt 'nyp_school', 'end'
 		end
 	elseif grupTipe = 4:
 		*clr & cla
@@ -412,8 +412,8 @@ if $ARGS[0] = 'nerds':
 						npc_rel['A16'] += 1
 						gs 'stat'
 
-						act 'Hangout with the cool kids and jocks':gt 'nyp_school', 'cool jocks'
-						act 'Hangout with the gopniks':gt 'nyp_school', 'gopniks'
+						act 'Hang out with the cool kids and jocks':gt 'nyp_school', 'cool jocks'
+						act 'Hang out with the gopniks':gt 'nyp_school', 'gopniks'
 					end
 					act 'Not interested':
 						*clr & cla
@@ -424,8 +424,8 @@ if $ARGS[0] = 'nerds':
 						npc_rel['A16'] -= 1
 						gs 'stat'
 
-						act 'Hangout with the cool kids and jocks':gt 'nyp_school', 'cool jocks'
-						act 'Hangout with the gopniks':gt 'nyp_school', 'gopniks'
+						act 'Hang out with the cool kids and jocks':gt 'nyp_school', 'cool jocks'
+						act 'Hang out with the gopniks':gt 'nyp_school', 'gopniks'
 					end
 				end
 			end
@@ -467,7 +467,7 @@ if $ARGS[0] = 'nerds':
 				npc_rel['A16'] -= 1
 				gs 'stat'
 
-				act 'Hangout until the party ends':gt 'nyp_school', 'end'
+				act 'Hang out until the party ends':gt 'nyp_school', 'end'
 			end
 			act 'I''ll think about it':
 				*clr & cla
@@ -482,7 +482,7 @@ if $ARGS[0] = 'nerds':
 				npc_rel['A16'] += 1
 				gs 'stat'
 
-				act 'Hangout until the party ends':gt 'nyp_school', 'end'
+				act 'Hang out until the party ends':gt 'nyp_school', 'end'
 			end
 		end
 	end
@@ -554,7 +554,7 @@ if $ARGS[0] = 'gopniks':
 						minut += 10
 						gs 'stat'
 
-						act 'Hangout until the party ends':gt 'nyp_school', 'end'
+						act 'Hang out until the party ends':gt 'nyp_school', 'end'
 					end
 				end
 			end
@@ -585,7 +585,7 @@ if $ARGS[0] = 'gopniks':
 						minut += 10
 						gs 'stat'
 
-						act 'Hangout until the party ends':gt 'nyp_school', 'end'
+						act 'Hang out until the party ends':gt 'nyp_school', 'end'
 					end
 				end
 			end
@@ -615,7 +615,7 @@ if $ARGS[0] = 'gopniks':
 						minut += 10
 						gs 'stat'
 
-						act 'Hangout until the party ends':gt 'nyp_school', 'end'
+						act 'Hang out until the party ends':gt 'nyp_school', 'end'
 					end
 				end
 			end
@@ -647,7 +647,7 @@ if $ARGS[0] = 'gopniks':
 						minut += 10
 						gs 'stat'
 
-						act 'Hangout until the party ends':gt 'nyp_school', 'end'
+						act 'Hang out until the party ends':gt 'nyp_school', 'end'
 					end
 				end
 			end
@@ -666,7 +666,7 @@ if $ARGS[0] = 'gopniks':
 				minut += 5
 				gs 'stat'
 
-				act 'Hangout until the party ends':gt 'nyp_school', 'end'
+				act 'Hang out until the party ends':gt 'nyp_school', 'end'
 			end
 		else
 			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -728,7 +728,7 @@ if $ARGS[0] = 'gopniks':
 						minut += 10
 						gs 'stat'
 
-						act 'Hangout until the party ends':gt 'nyp_school', 'end'
+						act 'Hang out until the party ends':gt 'nyp_school', 'end'
 					end
 				end
 				gs 'willpower', 'drugs', 'resist'
@@ -749,7 +749,7 @@ if $ARGS[0] = 'gopniks':
 						npc_rel['A144'] += 1
 						gs 'stat'
 
-						act 'Hangout until the party ends':gt 'nyp_school', 'end'
+						act 'Hang out until the party ends':gt 'nyp_school', 'end'
 					end
 				else
 					act 'Have second thoughts (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -768,7 +768,7 @@ if $ARGS[0] = 'gopniks':
 				'"Yeah, you better keep that mouth shut." Arkadi aggressively tells you off.'
 				'"There there Arkadi. Take it easy! <<$pcs_nickname>> said she wouldn''t say anything. And even if she did, it''s not like this is a big secret after all." Anushka tries to calm Arkadi down.'
 				'"As I said, she better keep that mouth shut!" he yells out as he moves away from you. The rest of the group quickly chase after him as you''re left alone, standing by yourself.'
-				act 'Hangout until the party ends':gt 'nyp_school', 'end'
+				act 'Hang out until the party ends':gt 'nyp_school', 'end'
 			end
 		else
 			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -780,7 +780,7 @@ if $ARGS[0] = 'gopniks':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/gopniks.jpg"></center>'
 		'Feeling bored, you scan around the room searching for something to kill off some time. It doesn''t take long before you see Petia standing alone in the corner.'
-		'You quickly move over to Vitek and tell him that you have the perfect plan to killsome time. You quickly explain to Vitek how you want it to play out and he calls on the others to join in.'
+		'You quickly move over to Vitek and tell him that you have the perfect plan to kill some time. You quickly explain how you want it to play out and he calls on the others to join in.'
 		'Agreeing on the plan, you begin to move towards Petia with a take no prisoners aura around you, not stopping until you are standing in front of him.'
 		act 'Talk to him':
 			cla & *clr
@@ -839,7 +839,7 @@ if $ARGS[0] = 'gopniks':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/gopniks.jpg"></center>'
 								'With the act done, you head back to the party in the gym. You sneak back in and it doesn''t seem anyone noticed you were gone. Settling down, you spend the next few minutes talking and laughing about what you just did.'
-								act 'Hangout until the party ends':gt 'nyp_school', 'end'
+								act 'Hang out until the party ends':gt 'nyp_school', 'end'
 							end
 						end
 					end
@@ -869,8 +869,8 @@ if $ARGS[0] = 'outcast':
 		minut += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
-		'You stand on the circumference with Sonia to avoid drawing any attention to yourselves. You''re actually quite enjoying yourself and Sonia is happily talking about her latest sexual endeavors.'
-		'The two of you let your guard down and as you talk, you hardly notice that some of the gopniks clique have snuck upon you.'
+		'You stand at the edge of the hall with Sonia to avoid drawing any attention to yourselves. You''re actually quite enjoying yourself and Sonia is happily talking about her latest sexual endeavors.'
+		'The two of you let your guard down and as you talk, you hardly notice that some of the gopniks have snuck upon you.'
 		'"Ohhh, what is this I hear? <<$pcs_nickname>> and Sonia exchanging tips on how to suck a cock properly?" Vitek says to the others as they begin to laugh.'
 		'The two of you throw a quick look at each other, afraid of what might happen next.'
 		act 'What do you want?':
@@ -881,13 +881,13 @@ if $ARGS[0] = 'outcast':
 			'Just as you''re about to say something back, you feel something bumping your leg. It''s Sonia discreetly shaking her head for you not to engage with them.'
 			'You look at her with a reassuring glance and say "What do you want Vitek? Just leave us alone. We''re not bothering anyone and we''ve made sure we stay out of everyone''s way."'
 			'Vitek patiently waits for you to finish and before you know it, grabs you by the neck and forces you down towards his crotch. "I think this one is ready for a good old fashioned fuck session. Who''s in?" he asks the others.'
-			'You grunt and moan as you try to break free, but he''s too strong and is easily holds you down.'
+			'You grunt and moan as you try to break free, but he''s too strong and easily holds you down.'
 			act 'Let go of me':
 				cla & *clr
 				minut += 2
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
-				'You yell out, hoping that someone will come to your aid, but to no avail. There''s no one daring to help you out.'
+				'You yell out, hoping that someone will come to your aid, but to no avail. There''s no one feeling daring enough to help you.'
 				'While he''s holding you down, Vitek turns his attention towards Sonia. "Do you want to help out your little friend here?" he asks her.'
 				'Sonia, teary eyed, nods. "I''ll do whatever you want!  Just leave her be!"'
 				'"See, even the whores take care of each other." he grins to his friends. "This gives me an idea. The two of you can give us a little warm-up show and after that, we''ll decide among ourselves who gets who."'
@@ -905,7 +905,7 @@ if $ARGS[0] = 'outcast':
 					act 'Leave the party':
 						cla
 						'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
-						'Once the gopniks hurry off, you glance at Sonia and say "We should get out of here before they come back. See you later." You quickly leave the party before things get worse.'
+						'Once the gopniks hurry off, you glance at Sonia. "We should get out of here before they come back. See you later." You quickly leave the party before things get worse.'
 						act 'Leave':gt 'gschool_grounds', 'main'
 					end
 				end
@@ -925,7 +925,7 @@ if $ARGS[0] = 'outcast':
 						act 'Leave the party':
 							cla
 							'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
-							'Once the gopniks hurry off, you glance at Sonia and say "We should get out of here before they come back. See you later." You quickly leave the party before things get worse.'
+							'Once the gopniks hurry off, you glance at Sonia. "We should get out of here before they come back. See you later." You quickly leave the party before things get worse.'
 							act 'Leave':gt 'gschool_grounds', 'main'
 						end
 					end
@@ -939,7 +939,7 @@ if $ARGS[0] = 'outcast':
 		minut += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
-		'You stand by yourself with your back to wall as you try to draw as little attention to yourself as possible. People pass by, not paying attention to you, but all of a sudden, you hear someone shouting your name.'
+		'You stand by yourself with your back to the wall, trying to draw as little attention to yourself as possible. People pass by, not paying attention to you, but all of a sudden, you hear someone shouting your name.'
 		'"We haven''t been fucking around with <<$pcs_nickname>> for quite some time. Let''s go and fuck around with her." you overhear Lena tell Vitek. He nods and before you know it, the majority of the gopniks stand in front of you.'
 		'"Hi <<$pcs_nickname>>!" Lena says. "Sucked many cocks today?" she asks as the others start to laugh. "What do you say guys, she''s truly a good piece of ass. Who here hasn''t fucked her yet? I''m sure she''ll be willing to please you."'
 		act 'Leave me alone':
@@ -948,16 +948,16 @@ if $ARGS[0] = 'outcast':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 			'Frightened by the sheer number of people that surround you, you try to plead with them. "I haven''t done anything to you! Please just leave me alone."'
-			'As they hear your meekly plead, they all start to laugh. "Listen here <<$pcs_nickname>>! We decide when you''ve had enough and when to stop" Lena angrily berates you."'
+			'They all laugh at your pathetic plea. "Listen here <<$pcs_nickname>>! We decide when you''ve had enough and when to stop!" Lena angrily berates you."'
 			'Once again she turns towards the crowd. "Come on, who here hasn''t fucked <<$pcs_nickname>> yet? Any takers? Doesn''t matter if you''re male or female, I''m sure <<$pcs_nickname>> is up to it."'
-			'Vitek steps up to you and grabs you by the neck and forces you down to his crotch while the others laugh loudly. "See! I told you she was willing!"'
+			'Vitek steps up to you, grabs you by the neck and forces you down to his crotch while the others laugh loudly. "See! I told you she was willing!"'
 			act 'Let go of me':
 				cla & *clr
 				minut += 2
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 				'You push him away, yelling "What''s wrong with you?"'
-				'Vitek only laughs. "You didn''t complain the last time I fucked you when it got rough, did you?" he asks as he shakes your head.'
+				'Vitek just laughs. "You didn''t complain the last time I fucked you when it got rough, did you?" he asks as he shakes your head.'
 				'True or not, you just want it to be over with as you quietly answer "N-No I didn''t."'
 				'You can hear the whispers from the others. "Did you hear that? She just admitted to getting fucked by Vitek..."'
 				act 'Plead':
@@ -966,8 +966,8 @@ if $ARGS[0] = 'outcast':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 					'You begin to reason with Vitek and Lena. "Please, just let me go! You''ve made your point and humiliated me enough!"'
-					'Vitek sighs and lets go of you. "I thought you would put a bigger fight... It''s more fun if you try to squirm away..." while Lena starts laughing. "Don''t believe her lies! She''s just trying to get away."'
-					'She walks up to you. "How about you show a little skin for the group?" as she grabs hold of your clothes and tries to expose your body.'
+					'Vitek sighs and lets go of you. "I thought you would put a bigger fight. It''s more fun when you try to squirm away." Lena starts laughing. "Don''t believe her lies! She''s just trying to get away."'
+					'She walks up to you. "How about you show a little skin for the group?" she says as she grabs hold of your clothes and tries to expose your body.'
 					'You try your hardest to keep Lena at a distance and after a few moments, she gives up and angirly walks away, pushing away some people standing in the crowd.'
 					'"That''s it! The show is over!" Vitek yells. "Until next time <<$pcs_nickname>>." he winks.'
 					act 'Leave the party':
@@ -986,7 +986,8 @@ if $ARGS[0] = 'end':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 	'It seems time has flown by. Someone turns off the music and you hear one of the teachers say "Okay everyone, it is time to go home. Have a happy and safe holiday and I''ll see everyone back at school once the winter break is over."'
-	'The students begin to pick up their stuff and head for the door. All of a sudden, you hear Dimka yell out. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at 18:00 on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is." he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia. You may come. I''m sure you''ll show your gratitude in one way or another."'
+	'The students begin to pick up their stuff and head for the door. All of a sudden, you hear Dimka yell out. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at 18:00 on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is." he says with a laugh, which gets several of the other students to join in.'
+	if npc_grupTipe['A25'] = 5: 'He then smirks at Sonia. "You can come though. I''m sure you''ll show your gratitude one way or another."'
 	if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor as he begins to talk. "<<$pcs_nickname>>, you and I have had some disagreements. I sincerely apologize for my behavior. I hope you will still come to my party."'
 	InvitationToDimkaNYparty = 1
 	'Everyone then slowly makes their way out of the school.'
@@ -1004,7 +1005,7 @@ if $ARGS[0] = 'slut':
 	act 'Suck him off':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snybj.jpg"></center>'
-		'You kneel down in front of Vasily and begin sucking his cock. After a few moments, you hear the door open and a few guys from your class wander in. Before you know it all the boys in your class except Kotova, who was rumored to have already passed out, are surrounding you. You hear someone unzipping their fly and pulling out their cock. Shortly thereafter, the others follow suit.'
+		'You kneel down in front of Vasily and begin sucking his cock. After a few moments, you hear the door open and a few guys from your class wander in. Before you know it all the boys in your class except Vitek, who was rumored to have already passed out, are surrounding you. You hear someone unzipping their fly and pulling out their cock. Shortly thereafter, the others follow suit.'
 		$rand_boy = $npc_firstname['A9']
 		pav_sex += 60
 		gs 'boyStat', 'A11', '1'
@@ -1015,7 +1016,7 @@ if $ARGS[0] = 'slut':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/sex/snyfilming.jpg"></center>'
-			'You slurp on one cock in your mouth, while you use your hands to jerk off two others, casually looking up you see that Nosov has taken out a camera and started filming it all. "Don''t worry, <<$pcs_nickname>>. This is for all our private collections. I''m sure no one will spread this video around." he winks.'
+			'You slurp on one cock in your mouth, while you use your hands to jerk off two others, casually looking up you see that Dimka has taken out a camera and started filming it all. "Don''t worry, <<$pcs_nickname>>. This is for all our private collections. I''m sure no one will spread this video around." he winks.'
 			gs 'gschool_events', 'rand_boy_arg1',1,2
 			gs 'boyStat', $static_num, '2'
 			gs 'arousal', 'bj', 5, 'dick[2]', 'sub'
@@ -1101,9 +1102,9 @@ if $ARGS[0] = 'drink more':
 		act 'Go stand against the wall alone':gt 'nyp_school', 'outcast'
 	else
 		act 'Drink some more':gt 'nyp_school', 'drink more'
-		act 'Hangout with the cool kids and jocks':gt 'nyp_school', 'cool jocks'
-		act 'Hangout with the nerds':gt 'nyp_school', 'nerds'
-		act 'Hangout with the gopniks':gt 'nyp_school', 'gopniks'
+		act 'Hang out with the cool kids and jocks':gt 'nyp_school', 'cool jocks'
+		act 'Hang out with the nerds':gt 'nyp_school', 'nerds'
+		act 'Hang out with the gopniks':gt 'nyp_school', 'gopniks'
 		act 'Leave':gt 'gschool_grounds', 'main'
 	end
 	act 'Leave':gt 'gschool_grounds', 'main'

+ 1 - 0
locations/pav_complex.qsrc

@@ -141,6 +141,7 @@ if $ARGS[0] = 'start':
 	end
 !!	if StoryLine = 1: act 'Go to the old apartment building':minut += 1 & gt 'pavComplexOld', 'etaj_1'
 	act 'Sit on a bench':gt 'pav_aptcourtev', 'bench'
+	gs 'camera', 'check_location'
 end
 
 if $ARGS[0] = 'garages':

+ 2 - 0
locations/pav_park.qsrc

@@ -280,6 +280,8 @@ if $ARGS[0] = 'start':
 		end
 		act 'Sleep on a bench': gt'placer_sex','sleeping_park_bench'
 	end
+
+	gs 'camera', 'check_location'
 end
 
 if $ARGS[0] = 'alb_father_meeting_1':

+ 1 - 0
locations/pav_train.qsrc

@@ -272,6 +272,7 @@ act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to Pushkin (0:15)':minut += 15 & nroad = 19 & gt 'liam'
 
 act 'Enter the station building': minut += 3 & gt 'pav_train_hall'
+gs 'camera', 'check_location'
 
 --- pav_train ---------------------------------
 

+ 2 - 2
locations/shop_photography.qsrc

@@ -8,6 +8,8 @@
 !	2 = Bought camera, unlocks portfolio sharing
 ! photography_job = Track progression through job events
 ! photojob_daystart = Track when job last accepted - only allowed one job per week
+
+! The owner of the shop is Branko Volenskii
 if $ARGS[0] = 'start':
 	$loc = 'shop_photography'
 	$loc_arg = 'start'
@@ -401,7 +403,5 @@ if $ARGS[0] = 'photocourt':
 end
 
 
-
-
 --- shop_photography ---------------------------------
 

+ 3 - 1
locations/torgcentr.qsrc

@@ -63,8 +63,10 @@ if hour >= 8 and hour <= 20:
 	*p '<a href="exec: minut += 3 & gt ''shop_materinstvo'',''start''"><img src="images/locations/city/citycenter/mall/mommy.png"></a>'
 !! Pregnancy store	
 
+	*p '<a href="exec: minut += 3 & gt ''shop_photography'',''start''"><img src="images/locations/city/citycenter/mall/photoshop.png"></a>'
+!! Photography store
+
 	act 'Leave': minut += 5 & gt 'city_center'
-	act 'Go to the photography shop': gt 'shop_photography', 'start'
 	act 'Go to the supermarket': gt 'shop', 'start'
 	act 'Go bowling': gt 'bouling'
 	act 'Play pool': gt 'billiard'