Forráskód Böngészése

Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

julzor 6 éve
szülő
commit
50700e9afc
47 módosított fájl, 490 hozzáadás és 490 törlés
  1. 1 0
      glife.qproj
  2. 1 2
      locations/MagEncounterFairy.qsrc
  3. 11 11
      locations/MartinSex.qsrc
  4. 10 10
      locations/MartinSex2.qsrc
  5. 6 4
      locations/Nudelake.qsrc
  6. 2 5
      locations/WorkHosp.qsrc
  7. 3 4
      locations/anushka.qsrc
  8. 2 2
      locations/balkon2.qsrc
  9. 1 2
      locations/din_pav.qsrc
  10. 20 12
      locations/etoexhib.qsrc
  11. 6 12
      locations/events.qsrc
  12. 35 0
      locations/exhibitionism.qsrc
  13. 121 109
      locations/foto.qsrc
  14. 3 3
      locations/foto_events.qsrc
  15. 1 1
      locations/foto_models.qsrc
  16. 1 1
      locations/gLakeNude.qsrc
  17. 29 25
      locations/gadriver.qsrc
  18. 1 1
      locations/gdktoilet.qsrc
  19. 2 3
      locations/gschool_detention.qsrc
  20. 6 6
      locations/gschool_events.qsrc
  21. 40 56
      locations/gschool_lessonsev1.qsrc
  22. 41 57
      locations/gschool_lessonsev2.qsrc
  23. 19 25
      locations/gschool_lessonsev3.qsrc
  24. 1 1
      locations/gschool_office.qsrc
  25. 6 6
      locations/gskver.qsrc
  26. 7 7
      locations/kiosk.qsrc
  27. 3 4
      locations/klofdomhouse.qsrc
  28. 2 2
      locations/lact_lib.qsrc
  29. 1 1
      locations/lesbidomhouse.qsrc
  30. 4 4
      locations/lesbimistress.qsrc
  31. 8 8
      locations/lover_change.qsrc
  32. 6 6
      locations/lug.qsrc
  33. 2 2
      locations/nastja.qsrc
  34. 10 10
      locations/park.qsrc
  35. 4 4
      locations/parkivent.qsrc
  36. 6 6
      locations/parks.qsrc
  37. 1 1
      locations/pirsingsalon.qsrc
  38. 4 4
      locations/podrsex.qsrc
  39. 5 8
      locations/postoffice.qsrc
  40. 3 6
      locations/qwBarBilliard.qsrc
  41. 4 4
      locations/qwBarEncounters.qsrc
  42. 1 1
      locations/rinok.qsrc
  43. 2 2
      locations/rolanapt.qsrc
  44. 20 20
      locations/street_event.qsrc
  45. 1 1
      locations/ugol.qsrc
  46. 1 1
      locations/ugol1.qsrc
  47. 26 30
      locations/zaprFWash.qsrc

+ 1 - 0
glife.qproj

@@ -103,6 +103,7 @@
 		<Location name="pain"/>
 		<Location name="arousal"/>
 		<Location name="orgasm"/>
+		<Location name="exhibitionism"/>
 		<Location name="dinSex"/>
 		<Location name="dinSex2"/>
 		<Location name="dinsexFX"/>

+ 1 - 2
locations/MagEncounterFairy.qsrc

@@ -226,8 +226,7 @@ if $ARGS[0] = 'fairychattopic':
 		'Today the fairy introduces you to fairy knock-knock jokes. She spends almost half an hour telling joke after joke, but you failed to understand a single one. By the time you''re ready to leave, she''s complaining about how humans have no sense of humor.'
 	end
 
-	act 'Go on your way': gt $loc, $metka
-	killvar 'frandchat'
+	act 'Go on your way': killvar 'frandchat' & gt $loc, $metka
 
 end
 

+ 11 - 11
locations/MartinSex.qsrc

@@ -461,7 +461,7 @@ if $ARGS[0] = 'MartinTease':
 		MartinSex = 1
 		MartinSexTalk = 2
 		if pcs_dancero <= 50:dancero_exp += rand(2,5)
-		pcs_exhib += rand(0,2)
+		inhib_exp += rand(1,3)
 
 		if $pantyworntype ! 'none':
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/tease1.jpg"></center>'
@@ -554,7 +554,7 @@ if $ARGS[0] = 'MartinTease':
 
 			act 'Time for a good look':
 				cls
-				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopant_tease2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease2.jpg"></center>'
 				'It wouldn''t be nice to tease Martin with a sight like that and keep him guessing if the carpets do indeed match the drapes.'
 				*nl
 				'Without putting the glass down, you turn your side to Martin and bare your lower half with your free hand. You can feel Martin''s eyes linger on your <<$pcdesc_legsrandom>> legs, but you know what he really wants to see, as much as he''d deny it.'
@@ -568,7 +568,7 @@ if $ARGS[0] = 'MartinTease':
 
 				act 'Then he''s gonna like what''s next':
 					cls
-					'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopant_tease3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease3.jpg"></center>'
 					'With an audience as appreciative as this, how could you possibly stop now?'
 					*nl
 					'Setting the glass, your trusty prop, aside, you pull down what little covers your ' + iif(tatbrst > 0,'tattooed ','') + 'chest and ' + iif(tatblly > 0 and tatbrst = 0,'tattooed ','') +'belly, giving Martin a good look at your <<$pcdesc_breastsrandom>> tits, your <<$pcdesc_nipplesrandom>> nipples standing hard thanks to the chilly, smoky air... and maybe also due to his intense stares.'
@@ -583,7 +583,7 @@ if $ARGS[0] = 'MartinTease':
 
 					act 'Go Lust!':
 						cls
-						'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopant_tease4.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease4.jpg"></center>'
 						'He''s staggering, but he isn''t out yet. You have to keep at it.'
 						*nl
 						'"I''m flexible, too. See?"'
@@ -612,7 +612,7 @@ if $ARGS[0] = 'MartinTease':
 
 						act 'Just one last push...':
 							cls
-							'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopant_tease5.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease5.jpg"></center>'
 							'Ridding yourself of what little items you have still left on you, you put your leg up on the bar and bend over. Your ass and <<$pcdesc_genitals>> aren''t just visible to Martin - they are also very much accessible.'
 							*nl
 							'"<<$pcs_firstname>>-" But you cut him off.'
@@ -639,7 +639,7 @@ if $ARGS[0] = 'MartinTease':
 	else
 		if $pantyworntype ! 'none':
 			if pcs_dancero <= 50:dancero_exp += rand(2,5)
-			pcs_exhib += rand(0,2)
+			inhib_exp += rand(1,3)
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/tease1.jpg"></center>'
 			'Feeling in the mood to give Martin a bit of a show today, you give him a soft push, just strong enough to make him get the hint and sit down on the chair behind him.'
 			'You then take a few steps back and slowly bend forward, giving him a generous look at your <<$pcdesc_breastsrandom>> cleavage and <<$pcdesc_legsrandom>> legs as you take off your lower garment.'
@@ -775,7 +775,7 @@ if $ARGS[0] = 'MartinTease':
 
 			act 'A little curiosity doesn''t hurt':
 				cls
-				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopant_tease2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease2.jpg"></center>'
 				'Without putting the glass down, you turn your side to Martin and bare your lower half with your free hand, making it blatantly obvious that you were indeed going commando. You can feel Martin''s eyes linger on your <<$pcdesc_legsrandom>> legs, but you know what he really wants to see - he wants you to confirm what he already knows.'
 				*nl
 				'You slowly turn to face Martin, revealing your <<$pcdesc_pubesrandom>> <<$pcdesc_genitals>> to him. Your boldness to strip for him, right here in the empty bar, and to walk around without underwear seem to turn him on immensely, if the bulge in his pants is any indication.'
@@ -788,7 +788,7 @@ if $ARGS[0] = 'MartinTease':
 
 				act 'He''s gonna like what''s next':
 					cls
-					'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopant_tease3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease3.jpg"></center>'
 					'With an audience as appreciative as this, how could you possibly stop now?'
 					*nl
 					'Setting the glass aside, you pull down what little covers your ' + iif(tatbrst>0,'tattooed ','') + 'chest and ' + iif(tatblly>0&tatbrst=0,'tattooed ','') +'belly, giving Martin a good look at your <<$pcdesc_breastsrandom>> tits, your <<$pcdesc_nipplesrandom>> nipples standing hard thanks to the chilly, smoky air... and maybe also due to his intense stares.'
@@ -804,7 +804,7 @@ if $ARGS[0] = 'MartinTease':
 
 					act 'The show must go on':
 						cls
-						'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopant_tease4.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease4.jpg"></center>'
 						'Well, if it''s a sexy torture he wants, you are happy to deliver.'
 						*nl
 						'"Want to see how flexible I am?"'
@@ -843,7 +843,7 @@ if $ARGS[0] = 'MartinTease':
 
 						act 'Better than okay':
 							cls
-							'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopant_tease5.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease5.jpg"></center>'
 							'Ridding yourself of what little items you have still left on you, you put your leg up on the bar and bend over. Your ass and pussy aren''t just visible to Martin - they are also very much accessible.'
 							*nl
 							'"So..." Your tone is about as casual as you can muster, but your glistening pussy gives away your true feelings. "What do you think of my body?"'
@@ -911,7 +911,7 @@ end
 if $ARGS[0] = 'MartinTeaseDildo':
 	cls
 	gs 'boyStat', 'A216'
-	pcs_exhib += rand(0,2)
+	inhib_exp += rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/teasedildo1.jpg"></center>'
 	'You roll to your ' + iif(tatside>0,'tattooed ','') + 'side. Grinning like a Cheshire cat, you rummage through your purse and, under the curious looks of Martin, pull out your ' + iif(dildo = 1,'10cm','15cm') + ' dildo.'
 	*nl

+ 10 - 10
locations/MartinSex2.qsrc

@@ -137,7 +137,7 @@ if $ARGS[0] = 'MartinSexDyn':
 	elseif $martinpos = 'rev_cowgirl':
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/rev_cowgirl/rev_cowgirl<<pic_rand>>.jpg"></center>'
 	elseif $martinpos = 'doggystyle':
-		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/doggystyle/doggystyle<<pic_rand>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/doggystyle/doggy<<pic_rand>>.jpg"></center>'
 	elseif $martinpos = 'missionary':
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/missionary/missionary<<pic_rand>>.jpg"></center>'
 	elseif $martinpos = 'sideways':
@@ -270,12 +270,12 @@ if $ARGS[0] = 'MartinSexDyn':
 			else
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/rev_cowgirl/rev_cowgirl<<pic_rand2>>.jpg"></center>'
 			end
-			'You are moving ever faster, trying to take Martin''s wonderful cock deeper into your <<$pcs_vag>> pussy, fucking him harder, moaning louder as you go. It may have started off gently but there''s no gentleness left to be found here anymore: You are riding this man in the middle of his bar, giving him a fantastic view of your ' + iif($martinpos='rev_cowgirl','ass','tits') + ' in the same spot some guys talked about their shitty jobs and marital problems a few hours ago.'
+			'You are moving ever faster, trying to take Martin''s wonderful cock deeper into your <<$pcdesc_pussyrandom>> pussy, fucking him harder, moaning louder as you go. It may have started off gently but there''s no gentleness left to be found here anymore: You are riding this man in the middle of his bar, giving him a fantastic view of your ' + iif($martinpos='rev_cowgirl','ass','tits') + ' in the same spot some guys talked about their shitty jobs and marital problems a few hours ago.'
 			*nl
 			'It only adds to the excitement of it all to know that this is a public place, even if nobody else is here right now.'
 			
 			if exhibitionist_lvl > 1 or exhibitionism['pref'] > 50: 'This idea, and the memories of your previous exhibitionist acts manifest themselves in a small fantasy: You imagine what it would be like if the bar wasn''t empty but bustling with people, what it might be like to fuck the bartender right here in the center, with all of their eyes on you...' & pcs_horny += 10
-			$orgasm_txt = 'And it''s this fantasy that sets you off, causing you to cry out in heat and your <<$pcs_vag>> pussy to quiver around Martin''s cock as you imagine how strangers jerk off to your fucking. As you come down from your high, you feel like a pervert... but that''s not a bad thing, right?'
+			$orgasm_txt = 'And it''s this fantasy that sets you off, causing you to cry out in heat and your <<$pcdesc_pussyrandom>> pussy to quiver around Martin''s cock as you imagine how strangers jerk off to your fucking. As you come down from your high, you feel like a pervert... but that''s not a bad thing, right?'
 			gs 'arousal', 'vaginal', 3, 'exhibitionism'
 			*nl
 			'Martin, who has been relatively passive so far, leaving you in control, shakes you out of your reverie when his hands move to your hips. No doubt he intends to take a little more initiative.'
@@ -299,7 +299,7 @@ if $ARGS[0] = 'MartinSexDyn':
 				'"Please what?"'
 				'"Please fuck me with your hard cock again. I need it!"'
 				*nl
-				'That was all he wanted to hear. In the blink of an eye, Martin is balls-deep inside you again, his pelvis slamming into your <<$pcs_vag>> hole from below. You cannot move, his strong arms firmly holding you in place, and are helpless to let him fuck you from below.' 
+				'That was all he wanted to hear. In the blink of an eye, Martin is balls-deep inside you again, his pelvis slamming into your <<$pcdesc_pussyrandom>> hole from below. You cannot move, his strong arms firmly holding you in place, and are helpless to let him fuck you from below.' 
 				'And you are loving every second of it.'
 				gs 'arousal', 'vaginal', 8, 'sub'
 				gs 'stat'
@@ -312,7 +312,7 @@ if $ARGS[0] = 'MartinSexDyn':
 			'It only adds to the excitement of it all to know that this is a public place, even if nobody''s here now.'
 			
 			if exhibitionist_lvl > 1 or exhibitionism['pref'] > 50: 'This idea, and the memories of your previous exhibitionist acts manifest themselves in a small fantasy: You imagine what it would be like if the bar wasn''t empty but bustling with people, what it might be like to be fuck by the bartender right here in the center, with all of their eyes on you...' & pcs_horny += 10
-			$orgasm_txt = 'And it''s this fantasy that sets you off, causing you to cry out in heat and your <<$pcs_vag>> pussy to quiver around Martin''s cock as you imagine how strangers jerk off to your fucking. As you come down from your high, you feel like a pervert... but that''s not a bad thing, right?'
+			$orgasm_txt = 'And it''s this fantasy that sets you off, causing you to cry out in heat and your <<$pcdesc_pussyrandom>> pussy to quiver around Martin''s cock as you imagine how strangers jerk off to your fucking. As you come down from your high, you feel like a pervert... but that''s not a bad thing, right?'
 			gs 'arousal', 'vaginal', 3, 'exhibitionism'
 			*nl
 			'Martin was firmly in control so far, but it seems like it''s not enough for him: All of a sudden, you can feel his hand at your neck, grabbing you, forcing you to look at him and increasing both his leverage and sense of power over you.'
@@ -349,7 +349,7 @@ if $ARGS[0] = 'MartinSexDyn':
 			'It only adds to the excitement of it all to know that this is a public place, even if nobody''s here now.'
 			
 			if exhibitionist_lvl > 1 or exhibitionism['pref'] > 50: 'This idea, and the memories of your previous exhibitionist acts manifest themselves in a small fantasy: You imagine what it would be like if the bar wasn''t empty but bustling with people, what it might be like to be fuck by the bartender right here in the center, with all of their eyes on you...' & pcs_horny += 10
-			$orgasm_txt = 'And it''s this fantasy that sets you off, causing you to cry out in heat and your <<$pcs_vag>> pussy to quiver around Martin''s cock as you imagine how strangers jerk off to your fucking. As you come down from your high, you feel like a pervert... but that''s not a bad thing, right?'
+			$orgasm_txt = 'And it''s this fantasy that sets you off, causing you to cry out in heat and your <<$pcdesc_pussyrandom>> pussy to quiver around Martin''s cock as you imagine how strangers jerk off to your fucking. As you come down from your high, you feel like a pervert... but that''s not a bad thing, right?'
 			gs 'arousal', 'vaginal', 3, 'exhibitionism'
 			*nl
 			'Martin was firmly in control so far, but it seems like it''s not enough to him: All of a sudden, you can feel his hand at your neck, grabbing you, forcing you to look at him and increasing both his leverage and sense of power over you.'
@@ -393,7 +393,7 @@ if $ARGS[0] = 'MartinSexDyn':
 			'It only adds to the excitement of it all to know that this is a public place, even if nobody''s here now.'
 			
 			if exhibitionist_lvl > 1 or exhibitionism['pref'] > 50: 'This idea, and the memories of your previous exhibitionist acts manifest themselves in a small fantasy: You imagine what it would be like if the bar wasn''t empty but bustling with people, what it might be like to be fuck by the bartender right here in the center, with all of their eyes on you...' & pcs_horny += 10
-			$orgasm_txt = 'And it''s this fantasy that sets you off, causing you to cry out in heat and your <<$pcs_vag>> pussy to quiver around Martin''s cock as you imagine how strangers jerk off to your fucking. As you come down from your high, you feel like a pervert... but that''s not a bad thing, right?'
+			$orgasm_txt = 'And it''s this fantasy that sets you off, causing you to cry out in heat and your <<$pcdesc_pussyrandom>> pussy to quiver around Martin''s cock as you imagine how strangers jerk off to your fucking. As you come down from your high, you feel like a pervert... but that''s not a bad thing, right?'
 			gs 'arousal', 'vaginal', 3, 'exhibitionism'
 			*nl
 			'Martin was firmly in control so far, and his switch of position only served to emphasize that, but it seems like it''s not enough to him: All of a sudden, you can feel one of his hands leave your hips and grab your neck, forcing you to look back at him and increasing both his leverage and sense of power over you.'
@@ -467,12 +467,12 @@ if $ARGS[0] = 'MartinSexDyn':
 			if $martinpos = 'cowgirl':
 				'"Did you enjoy yourself?" You ask coquettishly, leaning forward onto his chest.'
 				'Martin smiles up at you, and pulls you down to give you a kiss. "I think you know the answer."'
-				'"Perhaps..." You grin and lift yourself off, feeling his softening <<dick>>cm <<$dick_girth>> cock slide out of your <<$pcs_vag>> pussy.' 
+				'"Perhaps..." You grin and lift yourself off, feeling his softening <<dick>>cm <<$dick_girth>> cock slide out of your <<$pcdesc_pussyrandom>> pussy.' 
 			
 			elseif $martinpos = 'rev_cowgil':
 				'"Did you enjoy yourself?" You ask coquettishly, wiggling your butt as you look back over your shoulder.'
 				'Martin smiles up at you, and gives your ass a resounding smack. "I think you know the answer."'
-				'"Perhaps..." You grin and lift yourself off, feeling his softening <<dick>>cm <<$dick_girth>> cock slide out of your <<$pcs_vag>> pussy.'
+				'"Perhaps..." You grin and lift yourself off, feeling his softening <<dick>>cm <<$dick_girth>> cock slide out of your <<$pcdesc_pussyrandom>> pussy.'
 			
 			else
 				if $martinpos = 'doggystyle':
@@ -599,7 +599,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 	elseif MartinSurpAnal = 1:
 		'Your change of heart is a little sudden, no doubt, but when you tell Martin that you want him to fuck your ass instead, he doesn''t look unhappy about it. After all, what man would refuse an offer like that?'
 	else
-		'With your <<$pcs_vag>> pussy thoroughly plowed, you moan: "I want your hard cock in my ass right now!"'
+		'With your <<$pcdesc_pussyrandom>> pussy thoroughly plowed, you moan: "I want your hard cock in my ass right now!"'
 		'"You and me both, corazón," Martin murmurs as he pulls out.'
 	end
 	

+ 6 - 4
locations/Nudelake.qsrc

@@ -111,10 +111,12 @@ if $ARGS[0] = 'swim':
 	cumspclnt = 4
 	gs 'cum_cleanup'
 	minut += 60
-	if $clothingworntype = 'nude': gs 'exercise', 'tier1', 1, 'stren_exp', 'exhibition_exp'
-	if $clothingworntype = 'nude':inhib_exp += rand(1,3)
-	if $clothingworntype ! 'nude': gs 'exercise', 'tier1', 1, 'stren_exp'
-	if $clothingworntype ! 'nude':
+	if $clothingworntype = 'nude':
+		gs 'exercise', 'tier1', 1, 'stren_exp'
+		gs 'exhibitionism', 2
+		inhib_exp += rand(1,3)
+	else
+		gs 'exercise', 'tier1', 1, 'stren_exp'
 		if pcs_inhib < 50:inhib_exp += rand(1,3)
 	end
 	pcs_sweat = 10 + rand(0,4)

+ 2 - 5
locations/WorkHosp.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'start':
 				else
 					cla
 					*clr
-					pcs_exhib += rand(1,3)
+					gs 'exhibitionism', 1
 					picrand = 11
 					'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/mastr11.jpg"></center>'
 					'You begin to secretly masturbate whenever nobody is watching.'
@@ -172,7 +172,7 @@ if $ARGS[0] = '1':
 		'As you masturbate, you totally abandon yourself to the pleasure of your coming orgasm. A doctor enters the room but you are so absorbed in your own pleasure that you only notice him when his hand starts to guide your head to his erect cock.'
 		gs 'arousal', 'masturbate', 10
 		gs 'stat'
-		if pcs_horny < 50:act 'Break and run':gt 'WorkHosp', 'start'
+		if pcs_horny < 50:act 'Break and run':gs 'arousal', 'end' & gt 'WorkHosp', 'start'
 
 		act 'Go along with it':
 			guy += 1
@@ -180,9 +180,6 @@ if $ARGS[0] = '1':
 			gs 'WorkHosp', 'randdoc'
 			if docfuck[randdoc] = 1:guy += 1
 			gt 'sex', 'minet'
-			gs 'arousal', 'vaginal', 10, 'sub'
-			gs 'arousal', 'end'
-			gs 'stat'
 		end
 	else
 		picrand = rand(12, 13)

+ 3 - 4
locations/anushka.qsrc

@@ -240,7 +240,7 @@ if $ARGS[0] = 'wedgie fight':
 		act 'Punishment':
 			*clr
 			cla
-			exhibition_exp += 3
+			gs 'exhibitionism', 2
 			'<center><img src="images/locations/pavlovsk/school/detention/ffspank1.jpg"></center>'
 			'"Very well, since you both wanted to be naked so badly, take off your clothes." She says as she pulls a chair over near her leather couch, taking a seat. Anushka quickly takes off all her clothes seeming not to care in the slightest. You, however, are a little slower but finally you manage to remove all of your clothes as well. Once you are both naked, Miss Volkov motions you over. As soon as you are within an arms reach she grabs you and pulls you across her lap. She then proceeds to spank your bare ass until your buttcheeks are cherry red and stinging like crazy, while Anushka takes a seat on the couch and just watches you get spanked.'
 			act 'Next':
@@ -356,14 +356,14 @@ if $ARGS[0] = 'naked':
 	*clr
 	cla
 	npc_rel['A144'] += 3
-	exhibition_exp += 2
+	gs 'exhibitionism', 1
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img src="images/characters/pavlovsk/school/girl/anushka/getnaked2.jpg"></center>'
 	'As you start stripping off your clothes she steps out of her shorts and panties saying, "That''s the spirit, I knew you were a fun girl." Once the two of you are both naked she gathers up the clothes and stuffs them behind some books on the bottom shelf of one of the cases. She gives your naked body a quick look over before heading towards the library''s side door. "Come on, we have to go out this way."'
 	act 'Into the halls':
 		*clr
 		cla
-		exhibition_exp += 3
+		gs 'exhibitionism', 2
 		'<center><b><font color="maroon">Halls</font></b></center>'
 		'<center><img src="images/characters/pavlovsk/school/girl/anushka/halls.jpg"></center>'
 		'The two of you walk down the halls, Anushka seems completely at ease walking around without any clothes on. Apparently she really doesn''t care if anyone catches her naked, or hell maybe she would even enjoy it more. As you walk around a while longer, you start getting a bit more comfortable with the situation. The two of you talk about normal stuff, like what''s going on in school, any good movies you''ve watched and so on. Just then, you hear the noise of a machine being turned on and notice that the sound is getting closer.'
@@ -690,7 +690,6 @@ if $ARGS[0] = 'chatWhileWaiting':
 		act 'You hear that?':
 			*clr
 			cla
-			exhibition_exp += 3
 			'<center><b><font color="maroon">Classroom</font></b></center>'
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/hallcheck.jpg"></center>'
 			'You start to say something more when she raises her hand to stop you. "You hear that?"'

+ 2 - 2
locations/balkon2.qsrc

@@ -199,8 +199,8 @@ if $ARGS[0] = 'finger':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_mas1-4.jpg"></center>'
-				if pcs_exhibition >= 35:
-					exhibition_exp += 2
+				if exhibitionist_lvl > 0:
+					gs 'exhibitionism', 2
 					
 					'As you open your eyes, you lock eyes with one of your neighbors peering out the window in the house across...'
 					'You can''t help but smile as there''s someone enjoying the show...'

+ 1 - 2
locations/din_pav.qsrc

@@ -226,10 +226,9 @@ $pavser4 = {
                 cla
                 *clr
 				pcs_mood = 100
-				if pcs_exhibition < 30:exhibition_exp += rand(1,3)
                 '<center><video autoplay loop src="images/locations/oldtown/vacanthouse/11684312.mp4"></video></center>'
 				$orgasm_or = 'custom'
-                $orgasm_txt = 'Suddenly you if electric shock and abdomen began pleasant spasms ,you squirm biting her lip, that would not scream with pleasure.'
+                $orgasm_txt = 'Suddenly you if electric shock and abdomen began pleasant spasms, you squirm biting her lip, that would not scream with pleasure.'
 				gs 'arousal', 'masturbate', 5
 				gs 'arousal', 'end'
 				gs 'stat'

+ 20 - 12
locations/etoexhib.qsrc

@@ -22,6 +22,7 @@ if $ARGS[0] = 'pos1':
 			cla
 			*clr
 			pcs_mood += 10
+			minut += 20
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/solar9.jpg"></center>'
 			'You are tanned and relaxed. Satisfied, you go out of the solarium and dressed out into the hall salon.'
@@ -35,6 +36,7 @@ if $ARGS[0] = 'pos1':
 		*clr
 		pcs_mood += 10
 		pcs_horny += 10
+		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/solar1.jpg"></center>'
 		'You decide to fool around a bit and leave the door for the room open. You start to slowly undress, when you take your bra off and exposes your breasts, long chills run through your bare back. Now, all of a sudden, anybody could go inside the room and see my breasts, what they would think of me?'
@@ -51,6 +53,7 @@ if $ARGS[0] = 'pos1':
 				cla
 				*clr
 				pcs_horny += 10
+				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/solar4.jpg"></center>'
 				'You undressed and went naked into the solarium. There is just a person on the door looking at you. Of curiosity, you attach your legs and bent them to the side , peering into the darkness of the slightly open door. You can actually see and hear the shadow sniffing. There is no doubt, someone is obviously watching you. From the realization that someone is watching you, and that you are lying completely naked, your body begins to tremble. There is a pleasant feeling in the abdomen. You get so excited to the point that you start to spread your legs in different directions. To the joy of the mysterious stranger.'
@@ -67,22 +70,24 @@ if $ARGS[0] = 'pos1':
 						cla
 						*clr
 						pcs_horny += 20
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/solar6.jpg"></center>'
 						'You start furiously rubbing your pussy to finally finish your shameless adventure. Gradually, you get excited to such an extent that you can not hold back anymore. You start to moan and push your labia with your fingers, showing your pussy to a stranger in all its glory.'
+						gs 'arousal', 'mastubate', 10, 'exhibitionism'
+						gs 'stat'
 
 						act 'Next':
 							cla
 							*clr
-							orgasm += 1
-							pcs_horny -= 50
-							pcs_mood = 100
-							exhibition_exp += 3
+							gs 'exhibitionism', 2
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/solar7.jpg"></center>'
 							'Finally, you cover yourself in a powerful orgasms and you became exhausted. Also,you can not hear the sniff any more, it seems the secret observer finished with you.'
 							''
 							'Gradually you come to your senses, get dressed,and get out of the booth.'
+							$orgasm_or = 'yes'
+							gs 'arousal', 'mastubate', 10, 'exhibitionism'
+							gs 'arousal', 'end'
+							gs 'stat'
 
 							act 'Leave':gt 'salon', 'start'
 						end
@@ -127,7 +132,7 @@ if $ARGS[0] = 'pos3':
 		'You can see the mushroom picker far way from you.'
 
 		act 'Get his attention':gt 'etoexhib', 'pos4'
-	elseif foresrand > 90 and pcs_exhibition > 50:
+	elseif foresrand > 90 and exhibitionist_lvl > 1:
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/suburban/1fores.jpg"></center>'
@@ -152,7 +157,7 @@ if $ARGS[0] = 'pos4':
 		minut += 5
 		pcs_horny += sub
 
-		exhibition_exp += 3
+		gs 'exhibitionism', 2
 
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/suburban/2fores.jpg"></center>'
@@ -168,7 +173,7 @@ if $ARGS[0] = 'pos5':
 	minut += 5
 	pcs_horny += sub
 
-	exhibition_exp += 4
+	gs 'exhibitionism', 3
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/suburban/3fores.jpg"></center>'
@@ -524,11 +529,12 @@ if $ARGS[0] = 'pos16':
 	'<center><img <<$set_imgh>> src="images/locations/suburban/lake.jpg"></center>'
 
 	if temper >= 20 and bikini > 0 and hour >= 6 and hour <= 20:
-		act 'Swim with a swimsuit':
+		act 'Swim with a swimsuit (1 hour)':
 			cla
 			*clr
 			cumspclnt = 4
 			gs 'cum_cleanup'
+			pcs_inhib += rand(1,2)
 			minut += 60
 			gs 'exercise', 'tier1', 1, 'stren_exp'
 			pcs_sweat = 10 + rand(0,4)
@@ -541,12 +547,14 @@ if $ARGS[0] = 'pos16':
 	end
 
 	if temper >= 20 and hour >= 6 and hour <= 20:
-		act 'Swim naked':
+		act 'Swim naked (1 hour)':
 			cla
 			*clr
 			cumspclnt = 4
 			gs 'cum_cleanup'
-			gs 'exercise', 'tier1', 1, 'stren_exp', 'exhibition_exp'
+			pcs_inhib += 3
+			minut += 60
+			gs 'exercise', 'tier1', 1, 'stren_exp'
 			pcs_sweat = 10 + rand(0,4)
 			gs 'arousal', 'foreplay', 60, 'exhibition'
 			gs 'arousal', 'end'
@@ -1616,7 +1624,7 @@ if $ARGS[0] = 'pos53':
 			cla
 			*clr
 			minut += 60
-			if PCloExhibit + 10 > pcs_exhibition:exhibition_exp += rand(1,3)
+			if inhib_exp += rand(1,3)
 			if pcs_sweat < 35 : pcs_sweat += 5
 			pcs_mood += 5
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/zagar1.jpg"></center>'

+ 6 - 12
locations/events.qsrc

@@ -360,8 +360,7 @@ end
 
 if $ARGS[0] = 'flash_butt':
 	*clr
-	gs 'arousal', 'flashlite', ARGS[2]
-	gs 'arousal', 'end'
+	gs 'exhibitionism', 2
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
 			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/butt/' + rand(1,7) + '.jpg"></center>'
@@ -383,8 +382,7 @@ end
 
 if $ARGS[0] = 'flash_full':
 	*clr
-	gs 'arousal', 'flash', ARGS[2]
-	gs 'arousal', 'end'
+	gs 'exhibitionism', 3
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
 			if pcs_pubes <= 20:
@@ -422,8 +420,7 @@ end
 
 if $ARGS[0] = 'flash_panties':
 	*clr
-	gs 'arousal', 'flashlite', ARGS[2]
-	gs 'arousal', 'end'
+	gs 'exhibitionism', 2
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
 			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/panty/' + rand(1,4) + '.jpg"></center>'
@@ -445,8 +442,7 @@ end
 
 if $ARGS[0] = 'flash_panties_rear':
 	*clr
-	gs 'arousal', 'flashlite', ARGS[2]
-	gs 'arousal', 'end'
+	gs 'exhibitionism', 2
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
 			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/pantyrear/' + rand(1,4) + '.jpg"></center>'
@@ -468,8 +464,7 @@ end
 
 if $ARGS[0] = 'flash_pussy':
 	*clr
-	gs 'arousal', 'flash', ARGS[2]
-	gs 'arousal', 'end'
+	gs 'exhibitionism', 3
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
 			if pcs_pubes <= 20:
@@ -507,8 +502,7 @@ end
 
 if $ARGS[0] = 'flash_tits':
 	*clr
-	gs 'arousal', 'flash', ARGS[2]
-	gs 'arousal', 'end'
+	gs 'exhibitionism', 1
 	if PCloSkirt > 0:
 		if $ARGS[1] = 'inside':
 			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/tits/' + rand(1,8) + '.jpg"></center>'

+ 35 - 0
locations/exhibitionism.qsrc

@@ -0,0 +1,35 @@
+# exhibitionism
+
+!!{ 1 point for exposing breasts, 2 for ass and 3 for pussy. 4 for extreme nude situations
+use the following gosub to add to it:
+gs 'exhibitionism', 3
+The last number being the desired level
+Use of rand should still work
+}
+
+if ARGS[0] > 4: ARGS[0] = 4
+
+if ARGS[0] = 1:
+	pcs_exhib += 1
+	if exhibitionist_lvl = 1: arousal += 5
+	if exhibitionist_lvl = 2: arousal += 10
+	if exhibitionist_lvl = 3: arousal += 15
+elseif ARGS[0] = 2:
+	pcs_exhib += 2
+	if exhibitionist_lvl = 1: arousal += 10
+	if exhibitionist_lvl = 2: arousal += 20
+	if exhibitionist_lvl = 3: arousal += 30
+elseif ARGS[0] = 3:
+	pcs_exhib += 3
+	if exhibitionist_lvl = 1: arousal += 15
+	if exhibitionist_lvl = 2: arousal += 25
+	if exhibitionist_lvl = 3: arousal += 40
+elseif ARGS[0] = 4:
+	pcs_exhib += 4
+	if exhibitionist_lvl = 1: arousal += 20
+	if exhibitionist_lvl = 2: arousal += 40
+	if exhibitionist_lvl = 3: arousal += 80
+end
+
+--- exhibitionism ---------------------------------
+

+ 121 - 109
locations/foto.qsrc

@@ -411,10 +411,12 @@ if $ARGS[0] = 'interview':
 			howoldareyou = 2
 			'	I''m <<age>>.'
 			'	"I see. Alright, undress. Let me take a look at you."'
+			gs 'foto', 'interview_undress'
 		elseif fakepassport = 1:
 			howoldareyou = 2
 			'	"I''m 18."'
 			'	"I see. Alright, undress. Let me take a look at you."'
+			gs 'foto', 'interview_undress'
 		else
 			act 'Tell the truth':
 				age_truth = 1
@@ -429,74 +431,79 @@ if $ARGS[0] = 'interview':
 				gs'foto','interview'
 			end
 		end
-	elseif howoldareyou > 0:
-		if howoldareyou = 1:
-			howoldareyou = 2
-			if age_truth = 1 or age >= 18:
-				'	"I''m <<age>>."'
-				'	"I see. Alright, undress. Let me take a look at you."'
-			elseif fakepassport = 1:
-				'	"I''m 18."'
-				'	"I see. Alright, undress. Let me take a look at you."'
-			end
+	else
+		howoldareyou = 2
+		if age_truth = 1 or age >= 18:
+			'	"I''m <<age>>."'
+			'	"I see. Alright, undress. Let me take a look at you."'
+			gs 'foto', 'interview_undress'
+		elseif fakepassport = 1:
+			'	"I''m 18."'
+			'	"I see. Alright, undress. Let me take a look at you."'
+			gs 'foto', 'interview_undress'
 		end
-		if undress_ask = 0:
-			act'What? Why?':
-				undress_ask = 1
-				*clr
-				gs'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-				'	"What?? Why?"'
-				'	"Hmm? This is a modelling studio. That means sometimes we dress our models up in skimpy clothes and lingerie. Our studio is also popular for its nude spreads. You don''t necessarily need to do shoots with nudity, but you need to have your body inspected to make sure you match the criteria for working here."'
-			end
+	end
+end
+
+if $ARGS[0] = 'interview_undress':
+	if undress_ask = 0:
+		act'What? Why?':
+			undress_ask = 1
+			*clr
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'	"What?? Why?"'
+			'	"Hmm? This is a modelling studio. That means sometimes we dress our models up in skimpy clothes and lingerie. Our studio is also popular for its nude spreads. You don''t necessarily need to do shoots with nudity, but you need to have your body inspected to make sure you match the criteria for working here."'
+			gs 'foto', 'interview_undress'
 		end
-		if why_here = 0:
-			act'Right here?':
-				why_here = 1
-				*clr
-				gs'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-				'	"Right here?" you ask. "Shouldn''t we be doing this in some kind of interview room or something?"'
-				'	"Might as well be here," he shrugs. "If you want to work here, we have a dress code policy for the models."'
-				'	"So? What does that have to do with me getting naked in the middle of a workplace?"'
-				'	"The policy is that models don''t wear clothes while on the premises. It makes the logistics of dressing and undressing them for shoots easier. Come on. You want to work for a modelling studio that specializes in nude spreads. Don''t get shy about showing your body to a few people here when you might be on a magazine cover showing it to the entire country. Now are you going to undress so I can do my job or are you going to keep wasting my time here?"'
-			end
+	end
+	if why_here = 0:
+		act'Right here?':
+			why_here = 1
+			*clr
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'	"Right here?" you ask. "Shouldn''t we be doing this in some kind of interview room or something?"'
+			'	"Might as well be here," he shrugs. "If you want to work here, we have a dress code policy for the models."'
+			'	"So? What does that have to do with me getting naked in the middle of a workplace?"'
+			'	"The policy is that models don''t wear clothes while on the premises. It makes the logistics of dressing and undressing them for shoots easier. Come on. You want to work for a modelling studio that specializes in nude spreads. Don''t get shy about showing your body to a few people here when you might be on a magazine cover showing it to the entire country. Now are you going to undress so I can do my job or are you going to keep wasting my time here?"'
+			gs 'foto', 'interview_undress'
 		end
-		if pcs_inhib >= 40:
-			act 'Do as he says':
-				*clr & cla
-				gs 'clothing', 'strip'
-				gs 'underwear', 'remove'
-				gs 'stat'
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/strip2.mp4"></video></center>'
-				'	You take off your clothes and leave them on the floor while the photographer examines you.'
-				'	He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$vaginatipe>> pussy...'
-				'	He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
-				act'Continue':gt'foto','job_offer'
-			end
-		elseif pcs_inhib >= 15:
-			act'Reluctantly undress':
-				reluctant_undress = 1
-				*clr & cla
-				gs 'clothing', 'strip'
-				gs 'underwear', 'remove'
-				gs 'stat'
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/strip2.mp4"></video></center>'
-				'	You take a deep breath and begin to take off your clothes. As long as it''s just this one time, you can handle it for now. You leave them on the floor while the photographer examines you.'
-				!if pcs_inhib <= 20'	You instinctively cover up as he steps closer, your hands trying to shield your nipples and pussy.'
-				'	He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$vaginatipe>> pussy...'
-				'	He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
-				'	<i>This is so embarrassing!</i>'
-				act'Continue':gt'foto','job_offer'
-			end
+	end
+	if pcs_inhib >= 40:
+		act 'Do as he says':
+			*clr & cla
+			gs 'clothing', 'strip'
+			gs 'underwear', 'remove'
+			gs 'stat'
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/strip2.mp4"></video></center>'
+			'	You take off your clothes and leave them on the floor while the photographer examines you.'
+			'	He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$vaginatipe>> pussy...'
+			'	He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
+			act'Continue':gt'foto','job_offer'
 		end
-		act'I can''t do it':
+	elseif pcs_inhib >= 15:
+		act'Reluctantly undress':
+			reluctant_undress = 1
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-			'	Even if it''s just this one time, you can''t do it after all. It''s simply too embarrassing to get naked in front of a total stranger. You blush, apologize, and leave the studio.'
-			act 'Leave': minut += 1 & gt 'down'
+			gs 'clothing', 'strip'
+			gs 'underwear', 'remove'
+			gs 'stat'
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/strip2.mp4"></video></center>'
+			'	You take a deep breath and begin to take off your clothes. As long as it''s just this one time, you can handle it for now. You leave them on the floor while the photographer examines you.'
+			!if pcs_inhib <= 20'	You instinctively cover up as he steps closer, your hands trying to shield your nipples and pussy.'
+			'	He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$vaginatipe>> pussy...'
+			'	He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
+			'	<i>This is so embarrassing!</i>'
+			act'Continue':gt'foto','job_offer'
 		end
 	end
+	act'I can''t do it':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+		'	Even if it''s just this one time, you can''t do it after all. It''s simply too embarrassing to get naked in front of a total stranger. You blush, apologize, and leave the studio.'
+		act 'Leave': minut += 1 & gt 'down'
+	end
 end
 
 
@@ -570,7 +577,7 @@ if $ARGS[0] = 'job_offer':
 				end
 			end
 
-			if pcs_exhibition >= 40:
+			if exhibitionist_lvl > 1:
 				act 'Tell him the truth and tell him how horny this job makes you':
 					*clr & cla
 					pcs_horny += 90
@@ -721,44 +728,47 @@ if $ARGS[0] = 'showers':
 			act 'Use the shower head on your pussy':
 				cla
 				*clr
-				minut += 10
-				exhibition_exp += 10
-				gs 'arousal','masturbate', 5
+				gs 'exhibitionism', 1
 				'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></video></center>'
 				*nl
 				'Despite the openness of the shower area, you can''t help yourself and place the shower head between your legs, massaging your pussy with powerful jets of warm water and fingers.'
 
-				if pcs_horny >= 90:
-					pcs_horny = 0
-					if pcs_exhibition < 50:
-						exhibition_exp += 1
-						orgasm += 1
-						pcs_mood += 15
-						pcs_willpwr += 15
-						'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you. You quickly look around hoping no one noticed your public masturbation session.'
-						act 'Dry off':gt 'foto', 'showers'
-					else
-						exhibition_exp += 8
-						orgasm += 1
-						pcs_mood += 15
-						pcs_willpwr += 15
-						pcs_horny = 40
-						'You loudly groan as you shudder in orgasm, uncaring if anyone notices what you''re up to. In fact, it kind of turns you on and makes you want to keep going...'
-						act 'Dry off':gt 'foto', 'showers'
-					end
-				else
-					pcs_horny += 5
-					pcs_mood += 10
-					pcs_willpwr += 10
-					'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the public staff showers. You think maybe it''s time to stop.'
-					act 'Dry off':gt 'foto', 'showers'
-				end
 				if hypnoAddict > 0:
+					minut += 10
 					'You unconsciously avoid spraying water into your vagina.'
 				else
-					cumspclnt = 8
-					gs 'cum_cleanup'
+					if pcs_horny >= 70:
+						if exhibitionist_lvl > 0:
+							gs 'exhibitionism', 1
+							pcs_mood += 15
+							pcs_willpwr += 15
+							$orgasm_or = 'yes'
+							$orgasm_txt = 'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you. You quickly look around hoping no one noticed your public masturbation session.'
+							gs 'arousal','masturbate', 10
+							gs 'arousal', 'end'
+							act 'Dry off':gt 'foto', 'showers'
+						else
+							gs 'exhibitionism', 2
+							pcs_mood += 15
+							pcs_willpwr += 15
+							$orgasm_or = 'yes'
+							$orgasm_txt = 'You loudly groan as you shudder in orgasm, uncaring if anyone notices what you''re up to. In fact, it kind of turns you on and makes you want to keep going...'
+							gs 'arousal','masturbate', 10
+							gs 'arousal', 'end'
+							act 'Dry off':gt 'foto', 'showers'
+						end
+					else
+						pcs_horny += 5
+						pcs_mood += 10
+						pcs_willpwr += 10
+						'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the public staff showers. You think maybe it''s time to stop.'
+						gs 'arousal','masturbate', 10
+						gs 'arousal', 'end'
+						act 'Dry off':gt 'foto', 'showers'
+					end
 				end
+				cumspclnt = 8
+				gs 'cum_cleanup'
 			end
 		end
 
@@ -799,7 +809,7 @@ if $ARGS[0] = 'krystalshower':
 		pcs_horny += 15
 		pcs_hairbsh = 0
 		pcs_makeup = 1
-		exhibition_exp += 10
+		gs 'exhibitionism', 1
 		dynamic $showerdin
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/BroShower.mp4"></video></center>'
 		'	You step into a stall and turn on the shower, trying your best to ignore what is going on while Krystal starts getting fucked from behind.'
@@ -807,24 +817,25 @@ if $ARGS[0] = 'krystalshower':
 			act 'Use the shower head on your pussy':
 				cla
 				*clr
-				pcs_horny = 0
-				minut += 10
-				exhibition_exp += 15
+				gs 'exhibitionism', 2
 				'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
 				*nl
 				'	Her boyfriend pushes her against the wall and pulls her leg up to get deep inside her. Krystal''s moans and the sound of cock slamming into her pussy are too much for you and you can''t stop yourself from placing the shower head between your legs, massaging your pussy with powerful jets of warm water and fingers.'
 				'	Your voices start to sync together, echoing out of the stalls in perfect time with each other.'
+				gs 'arousal','masturbate', 5
 				act 'Continue':
 					cla & *clr
 					stat['mast'] += 1
-					if pcs_exhibition < 50:
-					orgasm += 1
-					pcs_mood += 15
-					pcs_willpwr += 15
-					exhibition_exp +=10
-					'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showercum.mp4"></video></center>'
-					'	Her boyfriend pulls out of her and she jacks him off furiously until he spatters her belly with his cum.'
-					'	You feel a warm wave spreading over your entire body and orgasm, biting your lip hard to suppress the scream that wants to come out. You can''t believe that you just masturbated in the studio showers to Krystal having shower sex with her boyfriend...'
+					if exhibitionist_lvl < 2:
+						pcs_mood += 15
+						pcs_willpwr += 15
+						gs 'exhibitionism', 1
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showercum.mp4"></video></center>'
+						'	Her boyfriend pulls out of her and she jacks him off furiously until he spatters her belly with his cum.'
+						$orgasm_or = 'yes'
+						$orgasm_txt = '	You feel a warm wave spreading over your entire body and orgasm, biting your lip hard to suppress the scream that wants to come out. You can''t believe that you just masturbated in the studio showers to Krystal having shower sex with her boyfriend...'
+						gs 'arousal','masturbate', 5
+						gs 'arousal', 'end'
 						act 'Dry off':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_3.jpg"></center>'
@@ -834,13 +845,14 @@ if $ARGS[0] = 'krystalshower':
 							act'Leave':gt 'foto', 'studio'
 						end
 					else
-						orgasm += 1
 						pcs_mood += 15
 						pcs_willpwr += 15
-						pcs_horny = 40
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showercum.mp4"></video></center>'
 						'	Her boyfriend pulls out of her and she jacks him off furiously until he spatters her belly with his cum.'
-						'	You loudly groan as you shudder in orgasm, relishing the beautiful image of Krystal''s boyfriend''s cum all over her.'
+						$orgasm_or = 'yes'
+						$orgasm_txt = '	You loudly groan as you shudder in orgasm, relishing the beautiful image of Krystal''s boyfriend''s cum all over her.'
+						gs 'arousal','masturbate', 5
+						gs 'arousal', 'end'
 						act 'Dry off':
 							cla & *clr
 							'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_2.mp4"></video></center>'
@@ -856,7 +868,7 @@ if $ARGS[0] = 'krystalshower':
 			end
 		end
 
-		if pcs_exhibition > 50:
+		if exhibitionist_lvl > 1:
 			act 'Dry off':
 				cla & *clr
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
@@ -2086,7 +2098,7 @@ if $ARGS[0] = 'nude_shoot':
 				city_modelling += rand(10,20)
 				pav_modelling += rand(0,city_modelling)/4
 				inhib_exp += 5
-				shoot_type rand(1,3)
+				shoot_type = rand(1,3)
 				gs 'stat'
 				if shoot_type = 1:
 					modelfoto_pussy += 1

+ 3 - 3
locations/foto_events.qsrc

@@ -310,7 +310,7 @@ if $ARGS[0] = 'high_fasion':
 			mdlng_exp += rand(1,2)
 			city_modelling += rand(5,25)
 			pav_modelling += rand(0,city_modelling)/6
-			exhibition_exp += rand(0,1)
+			gs 'exhibitionism', 1
 			money += modelpayfin
 			modelfotomoney += modelpayfin
 			'	You spend the duration of the shoot changing in and out of designer bodices, corsets, and other tops, all of which conspicuously lack any kind of bottom, leaving your pussy exposed.'
@@ -578,7 +578,7 @@ if $ARGS[0] = 'modern_art':
 				modelfoto_nude += 1
 				mdlng_exp += rand(9,10)
 				city_modelling += rand(1,21)
-				exhibition_exp += 5
+				gs 'exhibitionism', 3
 				modern_art_projet = 1
 				pcs_horny += 20
 				'	The girl has you and the other model lie down on your sides and then wrap your legs your heads, both of you grabbing the other''s foot with your hand in a way that allows you to perfectly mirror each other''s position. At the client''s insistence, you bury your face between between the other girl''s legs. The aroma of her sex fills your nostrils and you can feel her breath on your own pussy as well.'
@@ -1325,7 +1325,7 @@ if $ARGS[0] = 'wet':
 							mdlng_exp += rand(9,10)
 							city_modelling += rand(18,21)
 							pav_modelling += rand(0,city_modelling)/4
-							exhibition_exp += 5
+							gs 'exhibitionism', 3
 							money += modelpayfin
 							modelfotomoney += modelpayfin
 							'	Eventually, the shoot is over and they leave you cold, shivering, and with really hard nipples. But at least you''ve also got a dry wad of cash that counts out to <<modelpayfin>> <b>₽</b>.'

+ 1 - 1
locations/foto_models.qsrc

@@ -1477,7 +1477,7 @@ if $ARGS[0] = 'krystal_chat':
 						'	Suddenly you realize Krystal is giving you a weird look.'
 						'	"W-What...?" you stammer. "Is there something on my face?"'
 						'	"No..." she says while eyeing you up. "I just wanted you to know that if you ever want to do some uhh... ''fat burning exercises'' with me and Ben... you''re more than welcome to join us." She gives you another smirk as she bites her lip.'
-						if pcs_exhibition < 50:
+						if exhibitionist_lvl < 2:
 							'	You break eye contact with her and look away, blushing furiously and try to mumble some kind of response. "I... uhh... ummm... yeah..."'
 							'	<i>What the hell am I even supposed to say to that?</i> you think to yourself.'
 							act'Keep chatting':gt'foto_models','krystal_chat'

+ 1 - 1
locations/gLakeNude.qsrc

@@ -90,7 +90,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				minut+=5
 				gs 'clothing', 'strip'
 				gs 'underwear', 'remove'
-				if pcs_horny >= 80 and pcs_exhibition >= 50:
+				if pcs_horny >= 80 and exhibitionist_lvl > 1:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
 					'You strip off. A couple of passing men do a double-take and pause a moment to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
 				elseif pcs_inhib >= 60:

+ 29 - 25
locations/gadriver.qsrc

@@ -190,10 +190,11 @@ if $ARGS[0] = 'Gadbitch':
 				cumspclnt = 4
 				gs 'cum_cleanup'
 				minut += 30
-				if $clothingworntype = 'nude': gs 'exercise', 'tier1', 1, 'stren_exp', 'exhibition_exp'
-				if $clothingworntype = 'nude':inhib_exp += rand(1,3)
-				if $clothingworntype ! 'nude': gs 'exercise', 'tier1', 1, 'stren_exp'
-				if $clothingworntype ! 'nude':
+				if $clothingworntype = 'nude':
+					gs 'exercise', 'tier1', 1, 'stren_exp'
+					inhib_exp += rand(1,3)
+				else
+					gs 'exercise', 'tier1', 1, 'stren_exp'
 					if pcs_inhib < 50:inhib_exp += rand(1,3)
 				end
 				pcs_sweat = 10 + rand(0,4)
@@ -384,7 +385,7 @@ if $ARGS[0] = 'Gadbitch':
 					elseif $clothingworntype = 'nude':
 						*clr & cla
 						minut += 60
-						exhibition_exp += rand(0,3)
+						gs 'exhibitionism', 2
 						inhib_exp += rand(1,3)
 						if pcs_sweat < 35 : pcs_sweat += 5
 						pcs_mood += 5
@@ -571,26 +572,29 @@ if $ARGS[0] = 'Gadbitch':
 
 				act'Agree':
 					cla
-					act 'Strip naked':
-						cla
-						minut += 5
-						gs 'underwear', 'remove'
-						gs 'clothing', 'strip', 'VillageRiver'
-						inhib_exp += rand(1,3)
-						'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
-
-						act 'Swim':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
-							'You wade into the river, you have fun with Mira spraying each other with water.'
-							temp_gr = RAND(0,15)
-							cumspclnt = 4 & gs 'cum_cleanup'
-							minut += 30
-							gs 'exercise', 'tier1', 1, 'stren_exp', 'exhibition_exp'
-							pcs_sweat = 10 + rand(0,4)
-							gs'stat'
-
-							act 'Get out of the water':gt'Gadriver', 'Gadbitch'
+					if exhibitionist_lvl > 1:
+						act 'Strip naked':
+							cla
+							minut += 5
+							gs 'underwear', 'remove'
+							gs 'clothing', 'strip', 'VillageRiver'
+							inhib_exp += rand(1,3)
+							'Without hesitation, you take off all your clothes and neatly fold them before putting them down on a pile. Without your clothes holding you back, you can go for a nice swim in the river or just lie down in the sand and do some sunbathing.'
+
+							act 'Swim':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/village/mira/rivertwogirlsnude'+rand(0,5)+'.jpg"></center>'
+								'You wade into the river, you have fun with Mira spraying each other with water.'
+								temp_gr = RAND(0,15)
+								cumspclnt = 4 & gs 'cum_cleanup'
+								minut += 30
+								gs 'exercise', 'tier1', 1, 'stren_exp'
+								gs 'exhibitionism', 2
+								pcs_sweat = 10 + rand(0,4)
+								gs'stat'
+
+								act 'Get out of the water':gt'Gadriver', 'Gadbitch'
+							end
 						end
 					end
 					act 'Get changed':

+ 1 - 1
locations/gdktoilet.qsrc

@@ -357,7 +357,7 @@ if $ARGS[0] = 'mensmast':
 			pcs_mood += 15
 			pcs_willpwr += 15
 			minut += 5
-			if pcs_inhib < 30:exhibition_exp += rand(1,3)
+			if pcs_inhib < 30: inhib_exp += rand(1,3)
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/mens/sex/mensmast1.jpg"></center>'
 			$orgasm_or = 'custom'

+ 2 - 3
locations/gschool_detention.qsrc

@@ -244,7 +244,7 @@ if $ARGS[0] = 'sitting_events':
 			*clr
 			cla
 			pav_sex +=5
-			exhibition_exp +=5
+			gs 'exhibitionism', 1
 			inhib_exp += rand(1,3)
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/detention/detsitflash.mp4"></video></center>'
@@ -504,8 +504,7 @@ if $ARGS[0] = 'strange':
 		end
 		act '"Eat me out"':
 			*clr & cla
-!!I made this one 5 because Sveta is having sex in a place she could get caught. I know you said 1-3 but having sex in public seems like it should add more. But if you want to lower it go ahead.
-			exhibition_exp += 5
+			inhib_exp += rand(3,5)
 			pav_sex +=3
 			pcs_dom += 2
 			npc_rel['A152'] += 5

+ 6 - 6
locations/gschool_events.qsrc

@@ -147,14 +147,14 @@ if $ARGS[0] = 'teacher_greet':
 				act 'Drop some textbooks':
 					*clr & cla
 					if $pantyworntype ! 'none':
-						exhibition_exp += 2
+						gs 'exhibitionism', 1
 						inhib_exp += rand(0,2)
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/bendover.jpg"></center>'
 						npc_rel['A26'] += 1
 						'You drop some books and bend over at the waist to pick up the books, showing off your ass.'
 						'"<<$pcs_nickname>>, you should bend at the knees to squat down instead of bend over like that or one of the boys might take advantage." He says with a smile.'
 					else
-						exhibition_exp += 3
+						gs 'exhibitionism', 2
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/bendoverbare.jpg"></center>'
 						npc_rel['A26'] += 1
 						'You drop some books and bend over at the waist to pick up the books, showing off your ass.'
@@ -171,7 +171,7 @@ if $ARGS[0] = 'teacher_greet':
 						if $pantyworntype = 'none':
 							act 'Show more':
 								*clr & cla
-								exhibition_exp += 3
+								gs 'exhibitionism', 1
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/bendoverbare.jpg"></center>'
 								'You don''t pay attention to the teacher''s words and decide to have fun a little more. Reaching for the next book, you inadvertently pull your skirt up, giving the teacher a full view of your pussy and ass.'
 								'"<<$pcs_lastname>>, cover up." the teacher notices that you are not wearing any panties. He quickly runs up to you and pulls your skirt down, covering up your naked ass.'
@@ -181,7 +181,7 @@ if $ARGS[0] = 'teacher_greet':
 						else
 							act 'Show more':
 								*clr & cla
-								exhibition_exp += 2
+								gs 'exhibitionism', 1
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/bendover.jpg"></center>'
 								'You don''t pay attention to the teacher''s words and decide to have fun a little more. Reaching for the next book, you inadvertently pull your skirt up, giving the teacher a full view of your panty clad ass.'
 								'"<<$pcs_lastname>>, cover up." the teacher rushes to you and pulls your skirt down, covering your ass.'
@@ -460,7 +460,7 @@ if $ARGS[0] = 'rand_scoolboy':
 			end
 			act 'Lift your skirt':
 				*clr & cla
-				exhibition_exp += 5
+				gs 'exhibitionism', 1
 				inhib_exp += 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
 				'You think to yourself, "<<$rand_boy>> is actually kind of cute..."'
@@ -491,7 +491,7 @@ if $ARGS[0] = 'rand_scoolboy':
 				grupvalue[2] -= 10
 				grupvalue[3] -= 10
 				pav_sex +=30
-				exhibition_exp += 10
+				gs 'exhibitionism', 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet1.jpg"></center>'
 				'You give him a sweet smile and take him by the hand, pulling him into the men''s room. Slightly lifting up your skirt, you put his hand between your legs. The other boys all follow the two of you, and now you''re being fondled in front of a crowd.'
 				act 'Take his cock out of his pants': gt 'gschool_sex', 'rand_bj'

+ 40 - 56
locations/gschool_lessonsev1.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'fiz_rand':
 		if fizperand = 1 and $pantyworntype = 'none':
 			*clr & cla
 			pcs_mood -= 10
-			exhibition_exp +=3
+			gs 'exhibitionism', 1
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand1.jpg"></center>'
 			'You''re not wearing panties, and while you''re doing your pullups your shorts slide down a little. Now, the top of your pubes are on display for the whole class to see. It''s met with mixed responses: the guys are whistling and whooping appreciatively, while most of the girls are staring you down in disapproval. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'
@@ -132,11 +132,11 @@ if $ARGS[0] = 'biology':
 			pcs_mood -= 10
 			gs'stat'
 			if $pantyworntype ! 'none':
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. Miss Orlov comes over to help you back up and block their view of your ass as best she can. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			else
-				exhibition_exp += 5
+				gs 'exhibitionism', 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Miss Orlov comes over to help you back up and block the view of your ass, as best she can. Once you are back on your feet she says softly. "This is why you should wear panties to school, I won''t report you over it, but I suggest you wear them in the future."'
 			end
@@ -186,28 +186,24 @@ if $ARGS[0] = 'biology':
 						gs 'arousal', 'foreplay', 10, 'exhibitionism'
 						act 'Enjoy more':
 							cla
-							exhibition_exp += 2
+							gs 'exhibitionism', 2
 							'You spend the rest of class with Dan''s hand coming and going to squeeze your breast and tweak your nipple, still careful to make sure the teacher doesn''t catch on.'
 							if $pantyworntype ! 'none':
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Dan''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it up under your skirt and start prodding and playing with your swollen clit, through your quickly soaking panties. Eventually you decide that the small tip doesn''t provide enough stimulation, so you shift the wet fabric to the side, giving you full access to your now bare pussy. You reach down with one hand, slipping your two middle fingers up your dripping snatch. They easily slide between your wet lips and your breathing hitches slightly, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Dan seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, your pinch your clit right as Dan squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Dan''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurse''s office?" With bright eyes and a confident smile, you reply, "No thank you, Miss Orlov. I''m perfectly alright."'
+								$orgasm_txt = 'Dan seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, your pinch your clit right as Dan squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Dan''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurse''s office?" With bright eyes and a confident smile, you reply, "No thank you, Miss Orlov. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Dan''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							else
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Dan''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it up under your skirt and start prodding and playing with your already exposed clitoris. But your bare pussy is just too tempting to resist and soon you abandon your little pencil in favour of your two middle fingers, quickly shoving them up your already dripping snatch. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Dan seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, your pinch your clit right as Dan squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Dan''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurse''s office?" With bright eyes and a confident smile, you reply, "No thank you, Miss Orlov. I''m perfectly alright."'
+								$orgasm_txt = 'Dan seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, your pinch your clit right as Dan squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Dan''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurse''s office?" With bright eyes and a confident smile, you reply, "No thank you, Miss Orlov. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Dan''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							end
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
@@ -316,7 +312,6 @@ if $ARGS[0] = 'biology':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 13:
-			exhibition_exp +=2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 			'The lesson pauses briefly when one of the other students asks Miss Orlov a question about her assignment. With nothing to do for the moment, you doodle lazily in the margin of your notebook.'
 			'When you look back up, you notice Lazar turning his head away. You don''t think much of it at first, until you catch him a second time. Was he looking at you, or just in your general direction? Even the teacher walks by and pauses next to your desk for a moment before continuing on.'
@@ -330,7 +325,7 @@ if $ARGS[0] = 'biology':
 			act 'You ignore it':
 				*clr & cla
 				npc_rel['A149'] += 3
-				exhibition_exp +=3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 				'You ignore it, letting Lazar continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -372,11 +367,11 @@ if $ARGS[0] = 'science':
 			pcs_mood -= 10
 			gs'stat'
 			if $pantyworntype ! 'none':
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. Miss Orlov comes over to help you back up and block the view of your ass, as best she can. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			else
-				exhibition_exp += 5
+				gs 'exhibitionism', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Miss Orlov comes over to help you back up and block the view of your ass, as best she can. Once you are back on your feet she says softly. "This is why you should wear panties to school, I won''t report you, but I suggest in the future you wear them."'
 			end
@@ -466,7 +461,6 @@ if $ARGS[0] = 'science':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 10:
-			exhibition_exp +=2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 			'The lesson pauses briefly when one of the other students asks Miss Orlov a question about her assignment. With nothing to do for the moment, you doodle lazily in the margin of your notebook.'
 			'When you look back up, you notice Andrey turning his head away. You don''t think much of it at first, until you catch him a second time. Was he looking at you, or just in your general direction? Even the teacher walks by and pauses next to your desk for a moment before continuing on.'
@@ -481,7 +475,7 @@ if $ARGS[0] = 'science':
 				*clr & cla
 				npc_rel['A147'] += 3
 				npc_rel['A139'] -= 3
-				exhibition_exp +=3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 				'You ignore it, letting Andrey continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys. Though by the look on Stasya''s face you are not earning her friendship.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -519,11 +513,11 @@ if $ARGS[0] = 'computer':
 			pcs_mood -= 10
 			gs'stat'
 			if $pantyworntype ! 'none':
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			else
-				exhibition_exp += 5
+				gs 'exhibitionism', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
 			end
@@ -577,28 +571,24 @@ if $ARGS[0] = 'computer':
 						gs 'arousal', 'foreplay', 10, 'exhibitionism'
 						act 'Enjoy more':
 							cla
-							exhibition_exp += 2
+							gs 'exhibitionism', 2
 							'You spend the rest of class with Vasily''s hand coming and going to squeeze your breast and tweak your nipple, still careful to make sure the teacher doesn''t catch on.'
 							if $pantyworntype ! 'none':
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Vasily''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it up under your skirt and start prodding and playing with your swollen clit, through your quickly soaking panties. Eventually you decide that the small tip doesn''t provide enough stimulation, so you shift the wet fabric to the side, giving you full access to your now bare pussy. You reach down with one hand, slipping your two middle fingers up your dripping snatch. They easily slide between your wet lips and your breathing hitches slightly, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Vasily seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, you pinch your clit just as Vasily gives your sensitive nipple a quick squeeze. The combined stimulation is too much, causing your knees to fly together, trapping your hand in between as your legs clench from the sudden orgasm. You bite your lip hard as you ride out the waves and you feel Vasily''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurse''s office?" With bright eyes and a confident smile, you reply, "No thank you, Miss Orlov. I''m perfectly alright."'
+								$orgasm_txt = 'Vasily seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, you pinch your clit just as Vasily gives your sensitive nipple a quick squeeze. The combined stimulation is too much, causing your knees to fly together, trapping your hand in between as your legs clench from the sudden orgasm. You bite your lip hard as you ride out the waves and you feel Vasily''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurse''s office?" With bright eyes and a confident smile, you reply, "No thank you, Miss Orlov. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Vasily''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							else
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Vasily''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it up under your skirt and start prodding and playing with your already exposed clitoris. But your bare pussy is just too tempting to resist and soon you abandon your little pencil in favour of your two middle fingers, quickly shoving them up your already dripping snatch. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Vasily seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, you pinch your clit just as Vasily gives your sensitive nipple a quick squeeze. The combined stimulation is too much, causing your knees to fly together, trapping your hand in between as your legs clench from the sudden orgasm. You bite your lip hard as you ride out the waves and you feel Vasily''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurse''s office?" With bright eyes and a confident smile, you reply, "No thank you, Miss Orlov. I''m perfectly alright."'
+								$orgasm_txt = 'Vasily seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, you pinch your clit just as Vasily gives your sensitive nipple a quick squeeze. The combined stimulation is too much, causing your knees to fly together, trapping your hand in between as your legs clench from the sudden orgasm. You bite your lip hard as you ride out the waves and you feel Vasily''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurse''s office?" With bright eyes and a confident smile, you reply, "No thank you, Miss Orlov. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Vasily''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							end
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
@@ -722,7 +712,6 @@ if $ARGS[0] = 'computer':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 15:
-			exhibition_exp +=2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 			'The lesson pauses briefly when one of the other students asks Mr. Ivanov a question about the lesson. With nothing to do for the moment, you doodle lazily in the margin of your notebook.'
 			'When you look back up, you notice Artem turning his head away. You don''t think much of it at first, until you catch him a second time. Was he looking at you, or just in your general direction? Even the teacher walks by and pauses next to your desk for a moment before continuing on.'
@@ -736,7 +725,7 @@ if $ARGS[0] = 'computer':
 			act 'You ignore it':
 				*clr & cla
 				npc_rel['A2'] += 3
-				exhibition_exp +=3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 				'You ignore it, letting Artem continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -824,11 +813,11 @@ if $ARGS[0] = 'russian':
 			pcs_mood -= 10
 			gs'stat'
 			if $pantyworntype ! 'none':
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			else
-				exhibition_exp += 5
+				gs 'exhibitionism', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
 			end
@@ -886,28 +875,24 @@ if $ARGS[0] = 'russian':
 						gs 'arousal', 'foreplay', 10, 'exhibitionism'
 						act 'Enjoy more':
 							cla
-							exhibition_exp += 2
+							gs 'exhibitionism', 2
 							'You spend the rest of class with Svyatoslav''s hand coming and going to squeeze your breast and tweak your nipple, still careful to make sure the teacher doesn''t catch on.'
 							if $pantyworntype ! 'none':
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Svyatoslav''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it up under your skirt and start prodding and playing with your swollen clit, through your quickly soaking panties. Eventually you decide that the small tip doesn''t provide enough stimulation, so you shift the wet fabric to the side, giving you full access to your now bare pussy. You reach down with one hand, slipping your two middle fingers up your dripping snatch. They easily slide between your wet lips and your breathing hitches slightly, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Svyatoslav seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, your pinch your clit right as Svyatoslav squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Svyatoslav''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurse''s office?" With bright eyes and a confident smile, you reply, "No thank you, Mr. Yenotin. I''m perfectly alright."'
+								$orgasm_txt = 'Svyatoslav seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, your pinch your clit right as Svyatoslav squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Svyatoslav''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurse''s office?" With bright eyes and a confident smile, you reply, "No thank you, Mr. Yenotin. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Svyatoslav''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							else
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Svyatoslav''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. You take the pencil you were using to take notes, push it up under your skirt and start prodding and playing with your already exposed clitoris. But your bare pussy is just too tempting to resist and soon you abandon your little pencil in favour of your two middle fingers, quickly shoving them up your already dripping snatch. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Svyatoslav seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, your pinch your clit right as Svyatoslav squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Svyatoslav''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurse''s office?" With bright eyes and a confident smile, you reply, "No thank you, Mr. Yenotin. I''m perfectly alright."'
+								$orgasm_txt = 'Svyatoslav seems to have caught on to your arousal and starts kneading and pulling harder at your breast. In a moment of perfect coincidence, your pinch your clit right as Svyatoslav squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Svyatoslav''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurse''s office?" With bright eyes and a confident smile, you reply, "No thank you, Mr. Yenotin. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Svyatoslav''s hand playing with your breast as you just sit there in your soaked panties and a small puddle of your own juices, completely satisfied.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							end
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
@@ -1029,7 +1014,6 @@ if $ARGS[0] = 'russian':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 16:
-			exhibition_exp +=2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 			'The lesson pauses briefly when one of the other students asks Mr. Yenotin a question about his lesson. With nothing to do for the moment, you doodle lazily in the margin of your notebook.'
 			'When you look back up, you notice Marcus turning his head away. You don''t think much of it at first, until you catch him a second time. Was he looking at you, or just in your general direction? Even the teacher walks by and pauses next to your desk for a moment before continuing on.'
@@ -1043,7 +1027,7 @@ if $ARGS[0] = 'russian':
 			act 'You ignore it':
 				*clr & cla
 				npc_rel['A146'] += 3
-				exhibition_exp +=3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 				'You ignore it, letting Marcus continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'

+ 41 - 57
locations/gschool_lessonsev2.qsrc

@@ -15,11 +15,11 @@ if $ARGS[0] = 'geography':
 			pcs_mood -= 10
 			gs'stat'
 			if $pantyworntype ! 'none':
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			else
-				exhibition_exp += 5
+				gs 'exhibitionism', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
 			end
@@ -69,28 +69,24 @@ if $ARGS[0] = 'geography':
 						gs 'arousal', 'foreplay', 10, 'exhibitionism'
 						act 'Enjoy more':
 							cla
-							exhibition_exp += 2
+							gs 'exhibitionism', 2
 							'You spend the rest of class with Lazar''s hand coming and going to squeeze your breast and tweak your nipple, still careful to make sure the teacher doesn''t catch on.'
 							if $pantyworntype ! 'none':
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Lazar''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. The pencil you were using to take notes, goes under your skirt and begins to prod and play with your hard clitoris through your quickly soaking panties. Eventually you get bored of it and shift the fabric to the side to get access to your bare pussy and insert your two middle fingers. They easily slide between your wet lips and your breathing hitches slightly, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Lazar seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Lazar squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Lazar''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Mrs Sokoloff. I''m perfectly alright."'
+								$orgasm_txt = 'Lazar seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Lazar squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Lazar''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Mrs Sokoloff. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Lazar''s hand playing with your breast as you sit satisfied in soaked panties and a small puddle of your own juices.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							else
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Lazar''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. The pencil you were using to take notes goes under your skirt and begins to prod and play with your already exposed clitoris. But your bare pussy is too tempting and you abandon your pencil for your two middle fingers to penetrate your already dripping snatch. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Lazar seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Lazar squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Lazar''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Mrs Sokoloff. I''m perfectly alright."'
+								$orgasm_txt = 'Lazar seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Lazar squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Lazar''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Mrs Sokoloff. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Lazar''s hand playing with your breast as you sit satisfied in a small puddle of your own juices.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							end
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
@@ -178,7 +174,6 @@ if $ARGS[0] = 'geography':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 11:
-			exhibition_exp +=2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 			'The lesson takes a brief pause as one of the students asks Mrs Sokoloff a question about her paper. With nothing to do for the moment, you doodle lazily in the margin of your notebook.'
 			'When you look back up, you notice Artem turning his head away. You don''t think much of it at first, until you catch him a second time. Was he looking at you, or just in your direction? Even the teacher walks by and pauses next to your desk for a moment before continuing on.'
@@ -191,7 +186,7 @@ if $ARGS[0] = 'geography':
 			end
 			act 'You ignore it':
 				*clr & cla
-				exhibition_exp +=3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 				'You let Artem continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -290,13 +285,13 @@ if $ARGS[0] = 'math':
 			pcs_mood -= 10
 			gs 'stat'
 			if $pantyworntype ! 'none':
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
 				'Mr. Tsarev calls you up to the blackboard to answer a question. As you are approach the front of the class, you trip and fall, landing on your chest with your skirt on your back, giving the whole class a good view up your skirt. You quickly get up and straighten your clothes while trying to hide how red your face is while the boys begin hollering. It is quite obvious that most of the guys and even a few of the girls, appreciate the show, even if it was involuntarily.'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 			else
-				exhibition_exp += 5
+				gs 'exhibitionism', 2
 				'<center><b><font color=#00BFFF><<"Anatoly E. Tsarev">></font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/26.jpg"></center>'
 				'Mr. Tsarev calls you up to the blackboard to answer a question. As you begin solving the problem, you drop the chalk on the floor. You quickly bend over to pick it up, having forgot that you are not wearing any panties and giving everyone in the class a clear view of both of your holes. The boys begin whistling and hollering while many of the girls begin whispering to each other.'
@@ -367,7 +362,6 @@ if $ARGS[0] = 'math':
 				gs 'gschool_lessonsev1', 'math'
 			end
 		elseif scooltiperand = 8:
-			exhibition_exp +=2
 			'<center><b><font color=#FFC600><<"Igor Kruglov">></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/4.jpg"></center>'
 			'The lesson takes a brief pause as Natasha asks Mr. Tsarev a question about her paper. With nothing to do for the moment, you doodle a few drawing in your notebook. When you look back up, you notice Igor turning his head away. You don''t think much of it at first, until you catch him a second time. Was he looking at you, or just in your direction?'
@@ -388,7 +382,7 @@ if $ARGS[0] = 'math':
 			end
 			act 'Ignore his stares':
 				*clr & cla
-				exhibition_exp +=3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 				'You let Igor continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
 				'<center><b><font color=#FFC600><<"Igor Kruglov">></font></b></center>'
@@ -428,12 +422,12 @@ if $ARGS[0] = 'math':
 				*clr & cla
 				npc_rel['A26'] += 2
 				if $pantyworntype ! 'none':
-					exhibition_exp += 2
+					gs 'exhibitionism', 1
 					pcs_horny += 30
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spread.jpg"></center>'
 					'The thoughts of him checking you out so sneakily causes your heart to beat rapidly in excitement, and knowing how wrong this is, turns you on. You purposely spread your legs whenever Mr. Tsarev looks your way, and you can tell by your teacher''s more frequent stares that he is enjoying your show. Unable to control yourself, you occasionally rub your clitoris through your underwear, preferably when Mr. Tsarev glances your way. By the end of the class your panties have a large damp spot on you panties; large enough for him to see from across the room. The outline of your pussy is clearly visible in the wet fabric.'
 				else
-					exhibition_exp += 5
+					gs 'exhibitionism', 2
 					pcs_horny += 40
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/spreadb.jpg"></center>'
 					'The thoughts of him checking you out so sneakily causes your heart to beat rapidly in excitement, and knowing how wrong this is, turns you on further. You purposely spread your legs whenever Mr. Tsarev looks your way, and you can tell by Mr. Tsarev''s fidgeting that he getting really turned on. Unable to control yourself, you occasionally rub your exposed clitoris, preferably when Mr. Tsarev glances your way. By the end of the class your pussy lips are soaked in your juices, and without realizing, you put your finger into your mouth to taste your own juices.'
@@ -525,11 +519,11 @@ if $ARGS[0] = 'history':
 			pcs_mood -= 10
 			gs'stat'
 			if $pantyworntype ! 'none':
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			else
-				exhibition_exp += 5
+				gs 'exhibitionism', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
 			end
@@ -579,28 +573,24 @@ if $ARGS[0] = 'history':
 						gs 'arousal', 'foreplay', 10, 'exhibitionism'
 						act 'Enjoy more':
 							cla
-							exhibition_exp += 2
+							gs 'exhibitionism', 2
 							'You spend the rest of class with Roman''s hand coming and going to squeeze your breast and tweak your nipple, still careful to make sure the teacher doesn''t catch on.'
 							if $pantyworntype ! 'none':
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Roman''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. The pencil you were using to take notes, goes under your skirt and begins to prod and play with your hard clitoris through your quickly soaking panties. Eventually you get bored of it and shift the fabric to the side to get access to your bare pussy and insert your two middle fingers. They easily slide between your wet lips and your breathing hitches slightly, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Roman seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Roman squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Roman''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Miss Orlov. I''m perfectly alright."'
+								$orgasm_txt = 'Roman seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Roman squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Roman''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Miss Orlov. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Roman''s hand playing with your breast as you sit satisfied in soaked panties and a small puddle of your own juices.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							else
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Roman''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. The pencil you were using to take notes goes under your skirt and begins to prod and play with your already exposed clitoris. But your bare pussy is too tempting and you abandon your pencil for your two middle fingers to penetrate your already dripping snatch. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Roman seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Roman squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Roman''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Miss Orlov. I''m perfectly alright."'
+								$orgasm_txt = 'Roman seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Roman squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Roman''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Miss Orlov. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Roman''s hand playing with your breast as you sit satisfied in a small puddle of your own juices.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							end
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
@@ -709,7 +699,6 @@ if $ARGS[0] = 'history':
 			end
 		elseif scooltiperand = 12:
 			gs 'gschool_events', 'rand_boy_arg', 1, 1, 0, 1, 0, 0
-			exhibition_exp +=2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 			'The lesson takes a brief pause as one of the students asks Mrs Sokoloff a question about her paper. With nothing to do for the moment, you doodle lazily in the margin of your notebook.'
 			'When you look back up, you notice Petka turning his head away. You don''t think much of it at first, until you catch him a second time. Was he looking at you, or just in your direction? Even the teacher walks by and pauses next to your desk for a moment before continuing on.'
@@ -722,7 +711,7 @@ if $ARGS[0] = 'history':
 			end
 			act 'You ignore it':
 				*clr & cla
-				exhibition_exp +=3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 				'You let Petka continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -761,11 +750,11 @@ if $ARGS[0] = 'shop':
 			pcs_mood -= 10
 			gs'stat'
 			if $pantyworntype ! 'none':
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			else
-				exhibition_exp += 5
+				gs 'exhibitionism', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
 			end
@@ -819,28 +808,24 @@ if $ARGS[0] = 'shop':
 						gs 'arousal', 'foreplay', 10, 'exhibitionism'
 						act 'Enjoy more':
 							cla
-							exhibition_exp += 2
+							gs 'exhibitionism', 2
 							'You spend the rest of class with Dan''s hand coming and going to squeeze your breast and tweak your nipple, still careful to make sure the teacher doesn''t catch on.'
 							if $pantyworntype ! 'none':
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Dan''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. The pencil you were using to take notes, goes under your skirt and begins to prod and play with your hard clitoris through your quickly soaking panties. Eventually you get bored of it and shift the fabric to the side to get access to your bare pussy and insert your two middle fingers. They easily slide between your wet lips and your breathing hitches slightly, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Dan seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Dan squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Dan''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Mr. Kuznetsov. I''m perfectly alright."'
+								$orgasm_txt = 'Dan seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Dan squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Dan''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Mr. Kuznetsov. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Dan''s hand playing with your breast as you sit satisfied in soaked panties and a small puddle of your own juices.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							else
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Dan''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. The pencil you were using to take notes goes under your skirt and begins to prod and play with your already exposed clitoris. But your bare pussy is too tempting and you abandon your pencil for your two middle fingers to penetrate your already dripping snatch. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Dan seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Dan squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Dan''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Mr. Kuznetsov. I''m perfectly alright."'
+								$orgasm_txt = 'Dan seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Dan squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Dan''s hand slide away just before you hear your teacher say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Mr. Kuznetsov. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Dan''s hand playing with your breast as you sit satisfied in a small puddle of your own juices.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							end
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
@@ -935,7 +920,6 @@ if $ARGS[0] = 'shop':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 10:
-			exhibition_exp +=2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 			'The lesson takes a brief pause as one of the students asks Mr. Kuznetsov a question about her paper. With nothing to do for the moment, you doodle lazily in the margin of your notebook.'
 			'When you look back up, you notice Marcus turning his head away. You don''t think much of it at first, until you catch him a second time. Was he looking at you, or just in your direction? Even the teacher walks by and pauses next to your desk for a moment before continuing on.'
@@ -948,7 +932,7 @@ if $ARGS[0] = 'shop':
 			end
 			act 'You ignore it':
 				*clr & cla
-				exhibition_exp +=3
+				gs 'exhibitionism', 1
 				npc_rel['A146'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 				'You let Marcus continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'

+ 19 - 25
locations/gschool_lessonsev3.qsrc

@@ -70,13 +70,13 @@ if $ARGS[0] = 'literature':
 			pcs_mood -= 10
 			gs'stat'
 			if $pantyworntype ! 'none':
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				*nl
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else
-				exhibition_exp += 5
+				gs 'exhibitionism', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				*nl
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
@@ -691,7 +691,7 @@ if $ARGS[0] = 'music':
 		scooltiperand = RAND(1,15)
 		if scooltiperand = 1:
 			if Katja_tanga_end = 1 and $pantyworntype ! 'none':	
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_1.jpg"></center>'
 				'As you move into the classroom, Katja runs up to you with a slight blush on her face. Before you know it, she gives you a deep kiss and pulls up your skirt to touch your ass. You return the kiss, not caring about the hooting and hollering in the background from your fellow classmates.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -712,11 +712,11 @@ if $ARGS[0] = 'music':
 			pcs_mood -= 10
 			gs'stat'
 			if $pantyworntype ! 'none':
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			else
-				exhibition_exp += 5
+				gs 'exhibitionism', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
 			end
@@ -777,28 +777,24 @@ if $ARGS[0] = 'music':
 						gs 'arousal', 'foreplay', 10, 'exhibitionism'
 						act 'Enjoy more':
 							cla
-							exhibition_exp += 2
+							gs 'exhibitionism', 2
 							'You spend the rest of class with Radomir''s hand coming and going to squeeze your breast and tweak your nipple, still careful to make sure Mr. Vasilyev doesn''t catch on.'
 							if $pantyworntype ! 'none':
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Radomir''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. The pencil you were using to take notes, goes under your skirt and begins to prod and play with your hard clitoris through your quickly soaking panties. Eventually you get bored of it and shift the fabric to the side to get access to your bare pussy and insert your two middle fingers. They easily slide between your wet lips and your breathing hitches slightly, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Radomir seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Radomir squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Radomir''s hand slide away just before you hear Mr. Vasilyev say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Mr. Vasilyev. I''m perfectly alright."'
+								$orgasm_txt = 'Radomir seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Radomir squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Radomir''s hand slide away just before you hear Mr. Vasilyev say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Mr. Vasilyev. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Radomir''s hand playing with your breast as you sit satisfied in soaked panties and a small puddle of your own juices.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							else
-								stat['mast'] += 1
-								if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-								orgasm += 1
-								pcs_horny = 0
 								'Enjoying the feeling of Radomir''s hand massaging your breast and his fingers tweaking your nipple, you decide to take advantage of the opportunity. The pencil you were using to take notes goes under your skirt and begins to prod and play with your already exposed clitoris. But your bare pussy is too tempting and you abandon your pencil for your two middle fingers to penetrate your already dripping snatch. They easily slide between your wet lips and your breathing hitches, matching the rhythm of your pistoning fingers.'
 								*nl
-								'Radomir seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Radomir squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Radomir''s hand slide away just before you hear Mr. Vasilyev say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Mr. Vasilyev. I''m perfectly alright."'
+								$orgasm_txt = 'Radomir seems to have caught on and starts to knead your breast and pull at your breast harder. In a moment of perfect coincidence, your pinch your clit right as Radomir squeezes your sensitive nipple and your knees fly together, your whole legs clenching hard in orgasm. You bite your lip hard as you ride out the waves and you feel Radomir''s hand slide away just before you hear Mr. Vasilyev say, "Miss <<$pcs_lastname>>? Are you feeling alright? Do you need to go to the nurses office?" With confident eyes and a bright smile, you reply, "No thank you, Mr. Vasilyev. I''m perfectly alright."'
+								$orgasm_or = 'yes'
+								gs 'arousal', 'masturbate', 10, 'exhibitionism'
+								gs 'arousal', 'end'
 								'You spend the rest of class with Radomir''s hand playing with your breast as you sit satisfied in a small puddle of your own juices.'
-								gs 'arousal', 'vaginal_finger', 10, 'exhibitionism'
 							end
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
@@ -914,7 +910,6 @@ if $ARGS[0] = 'music':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 14:
-			exhibition_exp +=2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 			'The lesson takes a brief pause as one of the students asks Mr. Vasilyev a question about her paper. With nothing to do for the moment, you doodle lazily in the margin of your notebook.'
 			'When you look back up, you notice Petia turning his head away. You don''t think much of it at first, until you catch him a second time. Was he looking at you, or just in your direction? Even the teacher walks by and pauses next to your desk for a moment before continuing on.'
@@ -927,7 +922,7 @@ if $ARGS[0] = 'music':
 			end
 			act 'You ignore it':
 				*clr & cla
-				exhibition_exp +=3
+				gs 'exhibitionism', 1
 				npc_rel['A159'] += 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 				'You let Petiacontinue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
@@ -959,7 +954,7 @@ if $ARGS[0] = 'art':
 		scooltiperand = RAND(1,13)
 		if scooltiperand = 1:
 			if Katja_tanga_end = 1 and $pantyworntype ! 'none':
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_1.jpg"></center>'
 				'As you move into the classroom, Katja runs up to you with a slight blush on her face. Before you know it, she gives you a deep kiss and pulls up your skirt to touch your ass. You return the kiss, not caring about the hooting and hollering in the background from your fellow classmates.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -974,11 +969,11 @@ if $ARGS[0] = 'art':
 			pcs_mood -= 10
 			gs'stat'
 			if $pantyworntype ! 'none':
-				exhibition_exp += 3
+				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			else
-				exhibition_exp += 5
+				gs 'exhibitionism', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
 			end
@@ -1111,7 +1106,6 @@ if $ARGS[0] = 'art':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 12:
-			exhibition_exp +=2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 			'The lesson takes a brief pause as one of the students asks Mr. Vasilyev a question about her paper. With nothing to do for the moment, you doodle lazily in the margin of your notebook.'
 			'When you look back up, you notice Feofan turning his head away. You don''t think much of it at first, until you catch him a second time. Was he looking at you, or just in your direction? Even the teacher walks by and pauses next to your desk for a moment before continuing on.'
@@ -1124,7 +1118,7 @@ if $ARGS[0] = 'art':
 			end
 			act 'You ignore it':
 				*clr & cla
-				exhibition_exp +=3
+				gs 'exhibitionism', 1
 				npc_rel['A152'] += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 				'You let Feofan continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'

+ 1 - 1
locations/gschool_office.qsrc

@@ -417,7 +417,7 @@ if $ARGS[0] = 'detPunishment1':
 	minut += 15
 	gs 'underwear', 'remove'
 	gs 'clothing', 'strip'
-	exhibition_exp += 3
+	gs 'exhibitionism', 2
 	gs 'pain', 7, 'asscheeks', 'spank'
 	gs 'stat'
 	'<center><img src="images/locations/pavlovsk/school/detention/ffspank1.jpg"></center>'

+ 6 - 6
locations/gskver.qsrc

@@ -106,7 +106,7 @@ end
 act 'Sit down on the bench': ParkBench = 0 & gt'placer_sex','sleeping_parc_alco'
 
 act 'Go for a walk (0:15)':
-	if pcs_exhibition >= 50 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
+	if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
 	cla
 	*clr
 	minut += 15
@@ -149,9 +149,9 @@ end
 
 if pcs_inhib >= 35:
 	act 'Flash your tits':
-		if pcs_exhibition >= 50 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
 		cls
-		exhibition_exp += rand(5,8)
+		gs 'exhibitionism', 1
 		gs 'events', 'flash_tits', 'outdoors', 5
 		gs 'stat'
 
@@ -161,11 +161,11 @@ end
 
 gs 'kseniyaQW', 'events'
 
-if pcs_exhibition >= 40:
+if exhibitionist_lvl > 1:
 	act 'Flash your pussy':
-		if pcs_exhibition >= 50 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
 		cls
-		exhibition_exp += rand(9,12)
+		gs 'exhibitionism', 3
 		gs 'events', 'flash_pussy', 'outdoors', 5
 		gs 'stat'
 

+ 7 - 7
locations/kiosk.qsrc

@@ -18,11 +18,11 @@ if $ARGS[0] = 'start':
 			gt 'kiosk', 'counter'
 		end
 
-		if pcs_exhibition >= 45 or pcs_inhib >= 55:
+		if exhibitionist_lvl > 1:
 			act 'Flash both your tits and your pussy to jump the queue':
 				cls
 				minut += 1
-				exhibition_exp += rand(12,15)
+				gs 'exhibitionism', 3
 				gs 'events', 'flash_full', 'outdoors', 5
 				gs 'stat'
 				
@@ -30,11 +30,11 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if pcs_exhibition >= 40 or pcs_inhib >= 55:
+		if exhibitionist_lvl > 0:
 			act 'Flash your pussy to jump the queue':
 				cls
 				minut += 1
-				exhibition_exp += rand(9,12)
+				gs 'exhibitionism', 3
 				gs 'events', 'flash_pussy', 'outdoors', 5
 				gs 'stat'
 				
@@ -42,11 +42,11 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if pcs_exhibition >= 35 or pcs_inhib >= 40:
+		if pcs_inhib >= 40:
 			act 'Flash your tits to jump the queue':
 				cls
 				minut += 1
-				exhibition_exp += rand(5,8)
+				gs 'exhibitionism', 1
 				gs 'events', 'flash_tits', 'outdoors', 5
 				gs 'stat'
 				
@@ -62,7 +62,7 @@ if $ARGS[0] = 'start':
 					gs 'npcgeneratec', 0, 'stranger from the post office', rand(19,45)
 					gs 'boyStat', $npclastgenerated
 
-					exhibition_exp += rand(5,8)
+					inhib_exp += rand(3,5)
 					'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/kiosk_blowjob.jpg"></center>'
 					'A man agrees to your suggestion and lets you move in front of him.'
 

+ 3 - 4
locations/klofdomhouse.qsrc

@@ -854,7 +854,7 @@ if $ARGS[0] = 'ev45':
 
 	if sub > 5 or pcs_inhib > 35:act 'Remove hands':gt 'klofdomhouse', 'ev46'
 	gs 'arousal', 'flashlite', 5, 'sub'
-	exhibition_exp += 10
+	gs 'exhibitionism', 1
 	gs 'stat'
 	act 'Get out of here':
 		gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
@@ -893,7 +893,7 @@ if $ARGS[0] = 'ev47':
 
 	if sub > 15 or pcs_inhib > 40:act 'Get out of the water':gt 'klofdomhouse', 'ev48'
 	gs 'arousal', 'flash', 5, 'sub'
-	exhibition_exp += 10
+	gs 'exhibitionism', 1
 	gs 'stat'
 	act 'Get out of here':
 		gs 'arousal', 'end'
@@ -913,7 +913,7 @@ if $ARGS[0] = 'ev48':
 
 	if sub > 20 or pcs_inhib > 50:act 'Spread your legs':gt 'klofdomhouse', 'ev49'
 	gs 'arousal', 'flash', 5, 'sub'
-	exhibition_exp += 15
+	gs 'exhibitionism', 3
 	gs 'stat'
 	act 'Get out of here':
 		gs 'arousal', 'end'
@@ -933,7 +933,6 @@ if $ARGS[0] = 'ev49':
 
 	if sub > 25 or pcs_inhib > 55:act 'Spread your lips':gt 'klofdomhouse', 'ev50'
 	gs 'arousal', 'flash', 5, 'sub'
-	exhibition_exp += 15
 	gs 'stat'
 	act 'Get out of here':
 		gs 'arousal', 'end'

+ 2 - 2
locations/lact_lib.qsrc

@@ -288,7 +288,7 @@ end
 if $ARGS[0] = 'bp_milking':
 	pumptime = 0
 	pumptype = 0
-	if $location_type ! 'bathroom' and pcs_exhibition < 60:
+	if $location_type ! 'bathroom' and exhibitionist_lvl < 1:
 		'You can''t use it here.'
 	else
 		*clr
@@ -309,7 +309,7 @@ end
 if $ARGS[0] = 'man_milking':
 	pumptime = 0
 	pumptype = 1
-	if $location_type ! 'bathroom' and pcs_exhibition < 60:
+	if $location_type ! 'bathroom' and exhibitionist_lvl < 1:
 		'You can''t do this here.'
 	else
 		*clr

+ 1 - 1
locations/lesbidomhouse.qsrc

@@ -1122,7 +1122,7 @@ if $ARGS[0] = 'QW8':
 		cla
 		*clr
 		lesbiQW = 10
-		pcs_exhib += 2
+		gs 'exhibitionism', 2
 		gs'stat'
 		temp = RAND(0,2)
 

+ 4 - 4
locations/lesbimistress.qsrc

@@ -1197,7 +1197,7 @@ if $ARGS[0] = 'neutral_9':
 	act 'Go out with Mistress':
 		cla
 		*clr
-		pcs_exhib += 1
+		gs 'exhibitionism', 1
 		if exhibitionist_lvl < 1: pcs_horny += rand(1,3)
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub226.jpg"></center>'
@@ -1215,7 +1215,7 @@ if $ARGS[0] = 'neutral_9':
 		act 'Scrapbook time?':
 			cla
 			*clr
-			pcs_exhib += 2
+			gs 'exhibitionism', 2
 			if exhibitionist_lvl < 1: pcs_horny += rand(2,5)
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub227.jpg"></center>'
@@ -1231,7 +1231,7 @@ if $ARGS[0] = 'neutral_9':
 			act 'Continue':
 				cla
 				*clr
-				pcs_exhib += 1
+				gs 'exhibitionism', 1
 				if exhibitionist_lvl < 1: pcs_horny += rand(1,3)
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub228.jpg"></center>'
@@ -1246,7 +1246,7 @@ if $ARGS[0] = 'neutral_9':
 				act 'Right...':
 					cla
 					*clr
-					pcs_exhib += 1
+					gs 'exhibitionism', 1
 					if exhibitionist_lvl < 1: pcs_horny += rand(1,3)
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/sub229.jpg"></center>'

+ 8 - 8
locations/lover_change.qsrc

@@ -473,7 +473,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/arms/tatarm<<tatarm>>.jpg"></center>'
 						end
 					elseif randchan = 1 and tatass = 0:
-						randchan = rand(1, 23)
+						randchan = rand(1, 24)
 						!!randchan = 21
 						if tatass = 0 and tattCount < tattPrefTmpMin:
 							tatass = randchan
@@ -482,7 +482,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/ass/tatass<<tatass>>.jpg"></center>'
 						end
 					elseif randchan = 2 and tatback = 0:
-						randchan = rand(1, 53)
+						randchan = rand(1, 56)
 						!!randchan = 2
 						if tatback = 0 and tattCount < tattPrefTmpMin:
 							tatback = randchan
@@ -493,7 +493,7 @@ if $ARGS[0] = 'Tatt':
 					
 					!!
 					elseif randchan = 3 and tatblly = 0:
-						randchan = rand(1, 20)
+						randchan = rand(1, 21)
 						!!randchan = 1
 						if tatblly = 0 and tattCount < tattPrefTmpMin:
 							tatblly = randchan
@@ -538,7 +538,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/foot/tatankle<<tatankle>>.jpg"></center>'
 						end
 					elseif randchan = 8 and tatleg = 0:
-						randchan = rand(1, 36)
+						randchan = rand(1, 37)
 						!!randchan = 2
 						if tatleg = 0 and tattCount < tattPrefTmpMin:
 							tatleg = randchan
@@ -556,7 +556,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/lip/tatlip<<tatlip>>.jpg"></center>'
 						end
 					elseif randchan = 10 and tatneck = 0:
-						randchan = rand(1, 28)
+						randchan = rand(1, 30)
 						!!randchan = 12
 						if tatneck = 0 and tattCount < tattPrefTmpMin:
 							tatneck = randchan
@@ -565,7 +565,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/neck/tatnck<<tatneck>>.jpg"></center>'
 						end
 					elseif randchan = 11 and tatvag = 0:
-						randchan = rand(1, 44)
+						randchan = rand(1, 47)
 						!!randchan = 6
 						if tatvag = 0 and tattCount < tattPrefTmpMin:
 							tatvag = randchan
@@ -583,7 +583,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/shoulder/tatshldr<<tatlech>>.jpg"></center>'
 						end
 					elseif randchan = 13 and tatside = 0:
-						randchan = rand(1, 18)
+						randchan = rand(1, 19)
 						!!randchan = 9
 						if tatside = 0 and tattCount < tattPrefTmpMin:
 							tatside = randchan
@@ -592,7 +592,7 @@ if $ARGS[0] = 'Tatt':
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/side/tatside<<tatside>>.jpg"></center>'
 						end
 					elseif randchan = 14 and tatupb = 0:
-						randchan = rand(1, 30)
+						randchan = rand(1, 32)
 						!!randchan = 16
 						if tatupb = 0 and tattCount < tattPrefTmpMin:
 							tatupb = randchan

+ 6 - 6
locations/lug.qsrc

@@ -41,9 +41,9 @@ if $ARGS[0] = 'start':
 
 	if pcs_inhib >= 35:
 		act 'Flash your tits':
-			if pcs_exhibition >= 50 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
 			cls
-			exhibition_exp += rand(5,8)
+			gs 'exhibitionism', 1
 			inhib_exp += rand(1,3)
 			gs 'events', 'flash_tits', 'outdoors', 5
 			gs 'stat'
@@ -52,11 +52,11 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if pcs_exhibition >= 40:
+	if exhibitionist_lvl > 0:
 		act 'Flash your pussy':
-			if pcs_exhibition >= 50 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
 			cls
-			exhibition_exp += rand(9,12)
+			gs 'exhibitionism', 3
 			gs 'events', 'flash_pussy', 'outdoors', 5
 			gs 'stat'
 
@@ -139,7 +139,7 @@ if $ARGS[0] = 'prut2':
 				pcs_sweat = 10 + rand(0,4)
 				pcs_mood += 5
 				if pcs_stren < 30: stren_exp += 1
-				exhibition_exp += 4
+				gs 'exhibitionism', 3
 				gs 'clothing', 'strip'
 				gs 'underwear', 'remove'
 				if pcs_horny >= 80 and pcs_inhib >= 60:

+ 2 - 2
locations/nastja.qsrc

@@ -393,7 +393,7 @@ if $ARGS[0] = 'pos17':
 	*clr
 	minut += 60
 	pcs_mood += 50
-	if PCloExhibit + 10 > pcs_exhibition:exhibition_exp += rand(1,3)
+	if PCloExhibit + 10 > pcs_inhib: pcs_inhib += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/2bimbos.jpg"></center>'
 	'You have a great time on the beach: You swim and play around in the water, you sunbathe, reading, chatting or snoozing as you do, drink milkshakes that Nastya brought along from home and take a couple of photos with the lake in the background. It is a thoroughly enjoyable, exhausting time and you are starting to wonder if you shouldn''t go home soon when Nastya speaks up.'
@@ -595,7 +595,7 @@ end
 if $ARGS[0] = 'pos28':
 	cla
 	*clr
-	exhibition_exp += 2
+	gs 'exhibitionism', 2
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/towel.jpg"></center>'

+ 10 - 10
locations/park.qsrc

@@ -65,8 +65,8 @@ if $ARGS[0] = 'start':
 			
 			'A man walks past you and notices that you didn''t put on any panties. He whistles at you, "Did you forget to put on your underwear today, honey?"'
 			*nl
-			if pcs_exhibition >= 35:
-				exhibition_exp += 2
+			if pcs_inhib >= 35:
+				gs 'exhibitionism', 2
 				mood += 5
 				'"Nope!" you call back. "Just remembered not to!" You flip up the back of your skirt, flashing your ass at him and keep walking, a bit of a spring in your step.'
 			elseif pcs_inhib > 30:
@@ -181,7 +181,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 
-			if pcs_exhibition >= 35:
+			if pcs_inhib >= 35:
 				act 'Expose your breasts':
 					*clr
 					cla
@@ -218,12 +218,12 @@ if $ARGS[0] = 'start':
 
 	gs 'kseniyaQW', 'events'
 
-	if pcs_inhib >= 40:
+	if pcs_inhib >= 35:
 		act 'Flash your tits':
 			inhib_exp += 2
-			if pcs_exhibition >= 50 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
 			cls
-			exhibition_exp += rand(1,4)
+			gs 'exhibitionism', 1
 			gs 'events', 'flash_tits', 'outdoors', 5
 			gs 'stat'
 
@@ -231,12 +231,12 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if pcs_exhibition >= 40:
+	if exhibitionist_lvl > 1:
 		act 'Flash your pussy':
 			inhib_exp += 2
-			if pcs_exhibition >= 50 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
 			cls
-			exhibition_exp += rand(2,6)
+			gs 'exhibitionism', 3
 			gs 'events', 'flash_pussy', 'outdoors', 5
 			gs 'stat'
 
@@ -495,7 +495,7 @@ if $ARGS[0] = 'whore':
 		act 'Flash breasts':
 			cla
 			*clr
-			exhibition_exp += 2
+			gs 'exhibitionism', 1
 			inhib_exp += 2
 			gs 'events', 'flash_tits', 'outdoors', 5
 			gs 'stat'

+ 4 - 4
locations/parkivent.qsrc

@@ -797,7 +797,7 @@ if $ARGS[0] = 'run':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
 			'You prepare yourself for a nice run in the beautiful park, pacing yourself so you last for a full hour.'
-			if pcs_exhibition >= 35:
+			if pcs_inhib >= 35:
 				act 'Expose your breasts':			
 					*clr
 					cla
@@ -823,19 +823,19 @@ end
 
 if $ARGS[0] = 'run_reactions':
 	if hour >= 20:
-		exhibition_exp += 2
+		gs 'exhibitionism', 1
 		'With it being so late, there isn''t anyone in the park to see you, but it doesn''t matter, the thrill and pleasure is still there. When you''re finished, you make sure to pull your top back down.'
 		gs 'arousal', 10, 'flashlite'
 		gs 'arousal', 'end'
 	else
 		if rand(0,1) = 0:
-			exhibition_exp += 2
+			gs 'exhibitionism', 1
 			'Despite it being daytime, you manage to go unnoticed during your run, but you still find yourself aroused and excited from the thought of being seen by a stranger or someone you know. When you''re finished, you make sure to pull your top back down.'
 			gs 'arousal', 10, 'flashlite'
 			gs 'arousal', 'end'
 		else
 !!I plan to add a chance for one of the guys to follow sveta and corner her, which can end in a consensual blowjob or rape.
-			exhibition_exp += 4
+			gs 'exhibitionism', 2
 			'You come across a group of gopniks loitering in a circle, empty beer bottles scattered around them. They''re loudly talking among themselves, but as you near the group, one of them notices you and quickly interrupts his friends to point you out to everyone.'
 			'You can''t help but smile slightly as you watch them rush to stand and then fight over getting to the front so they can see you better. As you run by, some start to clap and whistle while a few shout at you.'
 			wait 1000

+ 6 - 6
locations/parks.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 	act 'Go to the town center': minut += 10 & gt 'liam'
 
 	act 'Walk around the park (1 hour)':
-		if pcs_exhibition >= 50 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
+		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
 		cla
 		minut += 60
 		pcs_mood += 10
@@ -59,9 +59,9 @@ if $ARGS[0] = 'start':
 
 	if pcs_inhib >= 35:
 		act 'Flash your tits':
-			if pcs_exhibition >= 50 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
 			cls
-			exhibition_exp += rand(1,5)
+			gs 'exhibitionism', 1
 			inhib_exp += rand(1,3)
 			gs 'events', 'flash_tits', 'outdoors', 5
 			gs 'stat'
@@ -70,11 +70,11 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if pcs_exhibition >= 40:
+	if exhibitionist_lvl > 1:
 		act 'Flash your pussy':
-			if pcs_exhibition >= 50 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
 			cls
-			exhibition_exp += rand(9,12)
+			gs 'exhibitionism', 3
 			gs 'events', 'flash_pussy', 'outdoors', 5
 			gs 'stat'
 

+ 1 - 1
locations/pirsingsalon.qsrc

@@ -692,7 +692,7 @@ if $ARGS[0] = 'back':
 		:looptatback
 		*p '<a href="exec:n = <<n>> & gt ''pirsingsalon'', ''back_get''"><img src="images/pc/body/tattoos/back/tatback<<n>>.jpg" height="250" /></a>'
 		n += 1
-		if n <= 55:jump 'looptatback'
+		if n <= 56:jump 'looptatback'
 		*nl
 
 	else

+ 4 - 4
locations/podrsex.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'suck':
 	gs 'arousal', 'bj', 10, 'sub', 'group'
 	gs 'stat'
 	
-	if pcs_horny >= (randhorny - pcs_exhibition):
+	if pcs_horny >= (randhorny - pcs_exhib):
 		'You feel so horny in this situation, you''re very close to having a spontaneous orgasm with the guy''s cock still in your mouth. The other girl notices and gives you a sweet wink while she takes over, giving you some time to rub your clit furiously.'
 	
 		$orgasm_or = 'yes'
@@ -96,7 +96,7 @@ if $ARGS[0] = 'pussy':
 	gs 'arousal', 'vaginal', 10, 'sub', 'group'
 	gs 'stat'
 	
-	if pcs_horny >= (randhorny - pcs_exhibition):
+	if pcs_horny >= (randhorny - pcs_exhib):
 		'You feel so horny in this situation, you''re very close to having a spontaneous orgasm. You close your eyes and surrender yourself to the moment, reaching an explosive orgasm without ever touching yourself.'
 	
 		$orgasm_or = 'yes'
@@ -128,7 +128,7 @@ if $ARGS[0] = 'ass':
 	gs 'arousal', 'anal', 10, 'sub', 'group'
 	gs 'stat'
 	
-	if pcs_horny >= (randhorny - pcs_exhibition):
+	if pcs_horny >= (randhorny - pcs_exhib):
 		'You feel so horny in this situation, you''re very close to having a spontaneous orgasm. You close your eyes and surrender yourself to the moment, reaching an explosive orgasm without ever touching yourself.'
 	
 		$orgasm_or = 'yes'
@@ -149,7 +149,7 @@ if $ARGS[0] = 'voy':
 	sexvar -= 1
 	if sexvar < 0: sexstart = 0
 	gs 'dinsex2', 'stamina_npc'
-	if pcs_horny >= (randhorny - pcs_exhibition):
+	if pcs_horny >= (randhorny - pcs_exhib):
 
 		$orgasm_or = 'custom'
 		$orgasm_txt = 'You have an orgasm.'

+ 5 - 8
locations/postoffice.qsrc

@@ -18,10 +18,9 @@ if $ARGS[0] = 'start':
 			$postloc = 'counter' & gt 'postoffice'
 		end
 	
-		if pcs_exhibition >= 45 or pcs_inhib >= 55:
+		if exhibitionist_lvl > 2:
 			act 'Flash both your tits and your pussy to skip the line':
 				cls
-				exhibition_exp += rand(12,15)
 				gs 'events', 'flash_full', 'indoors', 5
 				gs 'stat'
 
@@ -29,10 +28,9 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if pcs_exhibition >= 40 or pcs_inhib >= 50:
+		if exhibitionist_lvl > 1:
 			act 'Flash your pussy to skip the line':
 				cls
-				exhibition_exp += rand(9,12)
 				gs 'events', 'flash_pussy', 'indoors', 5
 				gs 'stat'
 
@@ -40,10 +38,9 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if pcs_exhibition >= 35 or pcs_inhib >= 45:
+		if exhibitionist_lvl > 0 or pcs_inhib >= 45:
 			act 'Flash your tits to skip the line':
 				cls
-				exhibition_exp += rand(5,8)
 				gs 'events', 'flash_tits', 'indoors', 5
 				gs 'stat'
 
@@ -51,7 +48,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 		
-		if pcs_exhibition > 40:
+		if exhibitionist_lvl > 0:
 			act 'Suggest a blowjob in exchange for jumping the queue':
 				cls
 				if cumloc[12] = 0 and cumloc[11] = 0:
@@ -59,7 +56,7 @@ if $ARGS[0] = 'start':
 					gs 'npcgeneratec', 0, 'stranger', rand(18,45)
 					gs 'boyStat', $npclastgenerated
 
-					exhibition_exp += rand(5,8)
+					inhib_exp += rand(2,5)
 					gs 'arousal', 'bj', 10, 'sub'
 					gs 'stat'
 				

+ 3 - 6
locations/qwBarBilliard.qsrc

@@ -295,11 +295,7 @@ if $ARGS[0] = 'billiard_ev1':
 									act 'Make Martin come':
 										cls
 										'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/poolm2.jpg"></center>'
-										if exhibitionist_lvl > 0:
-											pcs_exhib += rand(0,2)
-										else
-											pcs_exhib += rand(0,1)
-										end
+										gs 'exhibitionism', 1
 										'You are giving Martin the best blowjob you can, working him over with your mouth, tongue and hand to make him shoot his load quickly. And you seem to be doing something right, cause Martin is starting to tense.'
 										'As Martin groans quietly, moments away from climax, you become acutely aware of the heat between your legs. The forbidden nature of what you''re doing apparently isn''t lost on your pussy, regardless of whether your conscious mind is turned on or scared.'
 										*nl
@@ -364,7 +360,8 @@ if $ARGS[0] = 'billiard_ev1':
 end
 
 if $ARGS[0] = 'billiard_ev2':
-	cls
+	cla
+	*clr
 	if bill_rand = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/poolVicArt.jpg"></center>'
 		'You enter the backroom. As soon as you set foot inside, Jaska''s friends immediately turn their heads and give you broad grins.'

+ 4 - 4
locations/qwBarEncounters.qsrc

@@ -171,7 +171,7 @@ if $ARGS[0] = '':
 				act 'Finish your drink': gt 'qwBarPolet'
 			end
 				
-			act 'Challange accepted':
+			act 'Challenge accepted':
 				cls
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/pool1.jpg"></center>'
 				minut += 30
@@ -307,7 +307,7 @@ if $ARGS[0] = '':
 			act 'Grind back against him':
 				cla
 				*clr
-				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/bargrind2.gif"></center>'
+				'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/bargrind2.mp4"></video></center>'
 				gs 'boyStat', $npclastgenerated
 				'Maybe it''s the alcohol, ' + iif(sub>=20,'maybe you are','or maybe you are just') + ' really horny ' + iif(sub>=20,'or maybe you are just too submissive to refuse him ','') + '- whatever the case may be, you don''t really want the stranger to stop. Quite the opposite, in fact.'
 				*nl
@@ -318,7 +318,7 @@ if $ARGS[0] = '':
 				act 'Let him guide you':
 					cla
 					*clr
-					'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/bargrinds1.gif"></center>'
+					'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/bargrinds1.mp4"></video></center>'
 					gs 'boyStat', $npclastgenerated
 					'He works your clit with his fingers for a bit, clearly knowing what he''s doing and getting you hot and bothered before he pulls his hand free. He turns you around so your back is against the bar and then pushes down on your shoulders until you are squatted down in front of him and hidden from most views.' 
 					'The strangers pulls out his cock and shoves it in your open mouth - you already knew what to expect and at this point, you are eager to suck his cock. He leans in close and starts fucking your mouth, and you are reveling in it, masturbating as he shoves his <<dick>>cm <<$dick_girth>> cock down your throat again and again. You don''t know if anybody''s watching and you are too drunk to feel anything but excitement at the prospect.'
@@ -375,7 +375,7 @@ if $ARGS[0] = '':
 						act 'Return the favor':
 							cla
 							*clr
-							'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/bargrinds1.gif"></center>'
+							'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/bargrinds1.mp4"></video></center>'
 							gs 'boyStat', $npclastgenerated
 							'Seeing as he got down on you right then and there, it seems only fair for you to do the same for him, so you get down on your knees, squatted down in front of him with your back against the counter, hidden from most views.'
 							'The strangers pulls out his cock and shoves it in your open mouth - you already knew what to expect and at this point, you are eager to suck his cock. He leans in close and starts fucking your mouth, and you are reveling in it, masturbating as he shoves his <<dick>>cm <<$dick_girth>> cock down your throat again and again. You don''t know if anybody''s watching and you are too drunk to feel anything but excitement at the prospect.'

+ 1 - 1
locations/rinok.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 
 		if nurand >= 80:
 			pcs_mood -= 5
-			exhibition_exp += 2
+			gs 'exhibitionism', 1
 			'You feel someones hand gently touch <a href="exec:gt ''etoexhib'', ''pos15''">your butt</a>.'
 
 			gs 'arousal', 'foreplay', 3

+ 2 - 2
locations/rolanapt.qsrc

@@ -726,7 +726,7 @@ end
 
 
 if $ARGS[0] = 'mypanty':
-    if pcs_exhibition > 35 and pcs_intel > 35 and rolanpantyconfession ! 1:
+    if exhibitionist_lvl > 0 and pcs_intel > 35 and rolanpantyconfession ! 1:
 		cla
 		*clr
 		minut += 1
@@ -1732,7 +1732,7 @@ if $ARGS[0] = 'chef':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/Stroganoff/Stroganoff5.jpg"></center>'
 								'"Also add oil salt paprika and pepper, and a little of water if required.....Uh? Did you say something Rolan"'
 								'You turn to see Rolan staring at your panty...you quickly put your shirt back...'
-								if pcs_exhibition > 50:
+								if exhibitionist_lvl > 1:
 									act 'sexon':
 										cla
 										*clr

+ 20 - 20
locations/street_event.qsrc

@@ -811,11 +811,11 @@ if $ARGS[1] = 'main':
 					'<<$streetev_title>>'
 					'<center><video autoplay loop src="images/locations/shared/street/bottomed1.mp4"></video></center>'
 					'As you walk down the street you are suddenly pushed forward hard. You nearly lose your balance and only barely catch yourself. While you are half bent over and trying to recover you feel someone yank up your dress and yank down your panties, exposing your ass and pussy for everyone to see. You quickly regain your balance, as you do. You pull up your panties and smooth your dress back in place, by that time whoever did it is long gone.'
-					if pcs_exhibition >= 35:
-						exhibition_exp += 3
+					if exhibitionist_lvl = 1:
+						gs 'exhibitionism', 2
 						pcs_mood += 10
 						'You look around and notice several people staring at you, you are sure they''ve seen everything. You can''t help but smile, loving the attention even if it wasn''t your idea, you casually continue on your way, but with an extra bit of sway in your hips.'
-					elseif pcs_inhib >= 50:
+					elseif exhibitionist_lvl > 1:
 						pcs_mood -= 2
 						'You look around and notice several people staring at you, you are sure they''ve seen everything. You''re annoyed with the prankster, worrying that the elastic on your panties might have been stretched in the act but otherwise feel unembarrassed and continue on your way.'
 					else
@@ -831,11 +831,11 @@ if $ARGS[1] = 'main':
 					'<<$streetev_title>>'
 					'<center><video autoplay loop src="images/locations/shared/street/sharkdress.mp4"></video></center>'
 					'As you walk down the street someone comes up behind you and grabs the top of your dress and yanks it down around your ankles. Which leaves you standing stark naked with only your dress around your ankles. You quickly squat down and grab your dress, pulling it back up and into place, by that time who ever did it is long gone.'
-					if pcs_exhibition >= 35:
-						exhibition_exp += 5
+					if exhibitionist_lvl = 1:
+						gs 'exhibitionism', 3
 						pcs_mood += 10
 						'You look around and notice several people staring at you, you are sure they''ve seen seen. You can''t help but smile, loving the attention even if it wasn''t your idea, you casually continue on your way, but with a extra bit of sway in your hips.'
-					elseif pcs_inhib >= 50:
+					elseif exhibitionist_lvl > 1:
 						'You look around and notice several people staring at you, you are sure they''ve seen everything. You swear loudly, worrying less about how you were just exposed in the street and more about whether the prankster might have damaged your clothing. Satisfied that it appears to be unharmed, you continue on your way, albeit a little more annoyed than you were before.'
 					else
 						pcs_mood -= 10
@@ -850,11 +850,11 @@ if $ARGS[1] = 'main':
 					'<<$streetev_title>>'
 					'<center><video autoplay loop src="images/locations/shared/street/bottomeds'+ rand(1,2) +'.mp4"></video></center>'
 					'As you walk down the street someone comes up behind you and grabs your skirt and panties, yanking them down. Your skirt ends up around your ankles and your panties half way down your thighs. Which leaves your ass and pussy on fully display to everyone around. You quickly pull up your panties and then squat down and grab your skirt, pulling it back up and into place, by that time whoever did it is long gone.'
-					if pcs_exhibition >= 35:
-						exhibition_exp += 3
+					if exhibitionist_lvl = 1:
+						gs 'exhibitionism', 2
 						pcs_mood += 10
 						'You look around and notice several people staring at you, you are sure they''ve seen everything. You can''t help but smile, loving the attention even if it wasn''t your idea, you casually continue on your way, but with an extra bit of sway in your hips.'
-					elseif pcs_inhib >= 50:
+					elseif exhibitionist_lvl > 1:
 						pcs_mood -= 2
 						'You look around and notice several people staring at you, you are sure they''ve seen everything. You swear loudly, worrying less about how your pussy was just exposed in the street and more about whether the prankster might have damaged your panties and skirt. Satisfied that they appear to be unharmed, you continue on your way, albeit a little more annoyed than you were before.'
 					else
@@ -870,11 +870,11 @@ if $ARGS[1] = 'main':
 					'<<$streetev_title>>'
 					'<center><video autoplay loop src="images/locations/shared/street/topped'+ rand(1,2) +'.mp4"></video></center>'
 					'As you walk down the street someone comes up behind you and grabs your top, yanking it down. Which leaves your tits on full display to everyone around. You quickly pull up your top backup, by that time whoever did it is long gone.'
-					if pcs_exhibition >= 35:
-						exhibition_exp += 3
+					if exhibitionist_lvl = 1:
+						gs 'exhibitionism', 2
 						pcs_mood += 10
 						'You look around and notice several people staring at you, you are sure they''ve seen everything. You can''t help but smile, loving the attention even if it wasn''t your idea, you casually continue on your way, but with an extra bit of sway in your hips.'
-					elseif pcs_inhib >= 50:
+					elseif exhibitionist_lvl > 1:
 						pcs_mood -= 2
 						'You look around and notice several people staring at you, you are sure they''ve seen everything. You swear loudly, worrying less about how your tits were just flashed to everyone in the street and more about whether the prankster might have damaged your top. Satisfied that it appears to be unharmed, you continue on your way, albeit a little more annoyed than you were before.'
 					else
@@ -896,11 +896,11 @@ if $ARGS[1] = 'main':
 				'<<$streetev_title>>'
 				'<center><video autoplay loop src="images/locations/shared/street/breeze.mp4"></video></center>'
 				'As you walk down the street a strong breeze suddenly blows down the street, which causes your skirt to blow up. Which exposes your panty clad ass to everyone on the street. You quickly push it back down, but as soon as you let go the breeze blows it right back up, you fight against the breeze for almost a minute before it finally stops.'
-				if pcs_exhibition >= 35:
-					exhibition_exp += 1
+				if exhibitionist_lvl = 1:
+					gs 'exhibitionism', 1
 					pcs_mood += 10
 					'You look around and notice several people staring at you, you are sure they''ve seen everything. You can''t help but smile, loving the attention even if it wasn''t your idea, you casually continue on your way, but with an extra bit of sway in your hips.'
-				elseif pcs_inhib >= 40:
+				elseif exhibitionist_lvl > 1:
 					pcs_mood -= 2
 					'You look around and notice several people staring at you. <i>What''re they staring for? It''s just underwear...</i> you think to yourself and continue on your way.'
 				else
@@ -1014,11 +1014,11 @@ if $ARGS[1] = 'main':
 				'As you walk down the street you pass a woman wearing a long coat. All of a sudden she flashes you with a huge grin on her face. She flashes several other people as well, she seems to be enjoying the attention she is getting.'
 				gs 'arousal', 'voyeur', 5
 				act 'Continue':gt $loc
-				if pcs_exhibition >= 35:
+				if exhibitionist_lvl > 0:
 					act 'Flash her back':
 						cla
 						*clr
-						exhibition_exp += 3
+						gs 'exhibitionism', 1
 						'<<$streetev_title>>'
 						if PCloSkirt > 0:
 							'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/tits/' + rand(1,12) + '.jpg"></center>'
@@ -1618,8 +1618,8 @@ if $ARGS[1] = 'main':
 					gt $loc
 				end
 			elseif streetrand > 46 and $pantyworntype = 'none' and PCloSkirt > 2 and hour > 6 and hour <= 20:
-				if pcs_exhibition < 30: pcs_mood -= 2
-				pcs_horny += pcs_exhibition/5
+				if exhibitionist_lvl = 0: pcs_mood -= 2
+				pcs_horny += pcs_exhib/5
 				*clr
 				cla
 				'<<$streetev_title>>'
@@ -1632,7 +1632,7 @@ if $ARGS[1] = 'main':
 				end
 				if pcs_inhib >= 50:
 					'<i>What? So now it''s a crime to prefer going commando now?</i> you think to yourself in annoyance as you continue passing by.'
-				elseif pcs_exhibition < 35:
+				elseif exhibitionist_lvl = 0:
 					'You blush in shame from the old ladies caustic remarks and hurry on your way.'
 				end
 				act 'Continue':gt $loc

+ 1 - 1
locations/ugol.qsrc

@@ -20,7 +20,7 @@ if pcs_horny >= 90 and pcs_inhib > 30:
 			'Feeling desperate for release you hitch up your skirt above your waist.'
 		end
 		if $pantyworntype ! 'none': 'You are distracted by your wet panties sticking to you, your arousal keeping your pussy soaking wet. Looking around once more to make sure you are alone, you pull down your panties a bit to expose your pussy.'
-		pcs_exhib += rand(1,3)
+		gs 'exhibitionism', 1
         pcs_sweat += 20
         'Then you begin to rub your clit, at first in slow soft circles but you quickly feel yourself building up to an orgasm, you bite your lip to keep from crying out as you start rubbing your clit with urgency. A massive shudder runs through your body as you orgasm, your soft cries of ecstasy echoing in the corridor. Getting dressed and blushing slightly you check once more to make sure you are along. You hope no one heard you, as you quickly leave.'
        

+ 1 - 1
locations/ugol1.qsrc

@@ -7,7 +7,7 @@ act 'Masturbate':
 	'You leaned back against the fence, noticing the area was completely deserted.'
 	'You are distracted by your wet panties sticking to you, your arousal keeping your pussy soaking wet. Looking around once more to make sure you are alone, you pull down your panties a bit to expose your pussy.'
 	
-	pcs_exhib += rand(1,3)
+	gs 'exhibitionism', 1
 	gs'stat'
 	'Then you begin to rub your clit, at first in slow soft circles but you quickly feel yourself building up to a orgasm, you bite your lip to keep from crying out as you start rubbing your clit with urgency. A massive shudder runs through your body as you orgasm, your soft cries muffled by your own hand over your mouth. Getting dressed and blushing slightly you check once more to make sure you are alone. You hope no one heard you, as you quickly leave.'
 

+ 26 - 30
locations/zaprFWash.qsrc

@@ -59,22 +59,14 @@ if $ARGS[0] = 'wash':
 					gt 'zaprFWash', 'titsQ'
 				end
 			else
-				! can flash now at the gas station without leading to sex still need to meet inhibition or horny requirements to unlock actions
-				if pcs_inhib >= 10 or pcs_horny >= 10: act 'Flash your tits at passing cars':gt 'zaprFWash', 'titsFlash', 'Free', 'Flash'
-				if pcs_inhib >= 15 or pcs_horny >= 15: act 'Flash your ass at passing cars':gt 'zaprFWash', 'assFlash', 'Free', 'Flash'
-				if pcs_inhib >= 20 or pcs_horny >= 20: act 'Flash your pussy at passing cars':gt 'zaprFWash', 'pussyFlash', 'Free', 'Flash'
-				act 'Continue':gt 'zaprF', 'start'
+				gs 'zaprF', 'flash_passing'
 			end
 		else
 			! slightly more money for wearing bimbo or prostitute clothing but not looking too great
 			'You washed the windows of several cars and earned 80 <b>₽</b>.'
 			money += 80
 			
-			! can flash now at the gas station without leading to sex still need to meet inhibition or horny requirements to unlock actions
-			if pcs_inhib >= 10 or pcs_horny >= 10: act 'Flash your tits at passing cars':gt 'zaprFWash', 'titsFlash', 'Free', 'Flash'
-			if pcs_inhib >= 15 or pcs_horny >= 15: act 'Flash your ass at passing cars':gt 'zaprFWash', 'assFlash', 'Free', 'Flash'
-			if pcs_inhib >= 20 or pcs_horny >= 20: act 'Flash your pussy at passing cars':gt 'zaprFWash', 'pussyFlash', 'Free', 'Flash'
-			act 'Continue':gt 'zaprF', 'start'
+			gs 'zaprF', 'flash_passing'
 		end
 	else
 		minut += 60
@@ -88,23 +80,27 @@ if $ARGS[0] = 'wash':
 		! normal money just for the car washing
 		'You washed the windows of several cars and earned 60 <b>₽</b>.'
 		
-		! can flash now if not wearing bimbo or prostitute clothing; just need to meet inhibition or horny requirements to unlock actions
-		if pcs_inhib >= 10 or pcs_horny >= 10: act 'Flash your tits at passing cars':gt 'zaprFWash', 'titsFlash', 'Free', 'Flash'
-		if pcs_inhib >= 15 or pcs_horny >= 15: act 'Flash your ass at passing cars':gt 'zaprFWash', 'assFlash', 'Free', 'Flash'
-		if pcs_inhib >= 20 or pcs_horny >= 20: act 'Flash your pussy at passing cars':gt 'zaprFWash', 'pussyFlash', 'Free', 'Flash'
-		act 'Continue':gt 'zaprF', 'start'
+		gs 'zaprF', 'flash_passing'
 	end
 end
 
+if $ARGS[0] = 'flash_passing':
+	! can flash now if not wearing bimbo or prostitute clothing; just need to meet inhibition or exhibitionism requirements to unlock actions
+	if pcs_inhib >= 35: act 'Flash your tits at passing cars':gt 'zaprFWash', 'titsFlash', 'Free', 'Flash'
+	if exhibitionist_lvl > 0: act 'Flash your ass at passing cars':gt 'zaprFWash', 'assFlash', 'Free', 'Flash'
+	if exhibitionist_lvl > 1: act 'Flash your pussy at passing cars':gt 'zaprFWash', 'pussyFlash', 'Free', 'Flash'
+	act 'Continue':gt 'zaprF', 'start'
+end
+
 if $ARGS[0] = 'titsQ':
 	i = rand(1, 4)
 	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<i>>.jpg"></center>'
 	
 	'Want to earn some more cash, girl? Show me your tits. I''ll give you 100 <b>₽</b>. It''s easy money.'
 	
-	! inhibition or horny requirements needed to accept the offer or just have fun with him
-	if pcs_inhib >= 10 or pcs_horny >= 10: act 'Agree and show him your tits':gt 'zaprFWash', 'titsFlash', 'Paid', 'Question'
-	if pcs_inhib >= 15 or pcs_horny >= 15: act 'Show him your tits for free instead':gt 'zaprFWash', 'titsFlash', 'Free', 'Question'
+	! inhibition or exhibitionism requirements needed to accept the offer or just have fun with him
+	if pcs_inhib >= 30 or pcs_horny >= 40: act 'Agree and show him your tits':gt 'zaprFWash', 'titsFlash', 'Paid', 'Question'
+	if pcs_inhib >= 35 or pcs_horny >= 50: act 'Show him your tits for free instead':gt 'zaprFWash', 'titsFlash', 'Free', 'Question'
 	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
@@ -114,9 +110,9 @@ if $ARGS[0] = 'assQ':
 	
 	'What a nice ass you have there. Let me see it. Will 100 <b>₽</b> convince you to show it to me?'
 	
-	! inhibition or horny requirements needed to accept the offer or just have fun with him
-	if pcs_inhib >= 15 or pcs_horny >= 15: act 'Agree and show him your ass':gt 'zaprFWash', 'assFlash', 'Paid', 'Question'
-	if pcs_inhib >= 20 or pcs_horny >= 20: act 'Show him your ass for free instead':gt 'zaprFWash', 'assFlash', 'Free', 'Question'
+	! inhibition or exhibitionism requirements needed to accept the offer or just have fun with him
+	if exhibitionist_lvl > 0 or pcs_horny >= 60: act 'Agree and show him your ass':gt 'zaprFWash', 'assFlash', 'Paid', 'Question'
+	if exhibitionist_lvl > 0 or pcs_horny >= 70: act 'Show him your ass for free instead':gt 'zaprFWash', 'assFlash', 'Free', 'Question'
 	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
@@ -126,9 +122,9 @@ if $ARGS[0] = 'pussyQ':
 	
 	'You look like a cool girl. Let me see your pussy. I''ll only look for 100 <b>₽</b>.'
 		
-	! inhibition or horny requirements needed to accept the offer or just have fun with him
-	if pcs_inhib >= 20 or pcs_horny >= 20: act 'Agree and show him your pussy':gt 'zaprFWash', 'pussyFlash', 'Paid', 'Question'
-	if pcs_inhib >= 25 or pcs_horny >= 25: act 'Show him your pussy for free instead':gt 'zaprFWash', 'pussyFlash', 'Free', 'Question'
+	! inhibition or exhibitionism requirements needed to accept the offer or just have fun with him
+	if exhibitionist_lvl > 1 or pcs_horny >= 80: act 'Agree and show him your pussy':gt 'zaprFWash', 'pussyFlash', 'Paid', 'Question'
+	if exhibitionist_lvl > 1 or pcs_horny >= 90: act 'Show him your pussy for free instead':gt 'zaprFWash', 'pussyFlash', 'Free', 'Question'
 	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
@@ -138,9 +134,9 @@ if $ARGS[0] = 'handQ':
 	
 	'Could you help me out girl? It''s getting tight down here in my pants just looking at you. How about you touch it a bit? I''ll pay you 200 <b>₽</b>.'
 	
-	! inhibition or horny requirements needed to accept the offer or just have fun with him
-	if pcs_inhib >= 25 or pcs_horny >= 25: act 'Agree and give him a handjob':gt 'zaprFWash', 'handjob', 'Paid'
-	if pcs_inhib >= 30 or pcs_horny >= 30: act 'Give him a handjob for free instead':gt 'zaprFWash', 'handjob', 'Free'
+	! slut or horny requirements needed to accept the offer or just have fun with him
+	if pav_slut >= 25 or pcs_horny >= 25: act 'Agree and give him a handjob':gt 'zaprFWash', 'handjob', 'Paid'
+	if pav_slut >= 30 or pcs_horny >= 30: act 'Give him a handjob for free instead':gt 'zaprFWash', 'handjob', 'Free'
 	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
@@ -150,9 +146,9 @@ if $ARGS[0] = 'blowQ':
 	
 	'Looking hot today girl! How about you put your mouth to good use? I''ll pay you 200 <b>₽</b>.'
 	
-	! inhibition or horny requirements needed to accept the offer or just have fun with him
-	if pcs_inhib >= 30 or pcs_horny >= 30: act 'Agree and give him a blowjob':gt 'zaprFWash', 'blowjob', 'Paid', 'Question'
-	if pcs_inhib >= 35 or pcs_horny >= 35: act 'Give him a blowjob for free instead':gt 'zaprFWash', 'blowjob', 'Free', 'Question'
+	! slut or horny requirements needed to accept the offer or just have fun with him
+	if pav_slut >= 30 or pcs_horny >= 30: act 'Agree and give him a blowjob':gt 'zaprFWash', 'blowjob', 'Paid', 'Question'
+	if pav_slut >= 35 or pcs_horny >= 35: act 'Give him a blowjob for free instead':gt 'zaprFWash', 'blowjob', 'Free', 'Question'
 	act 'Refuse':gt 'zaprFWash', 'refuse'
 end