[changes] some variables changed to the new exhibitionist trait system and a comment in body to explain why something is set the way it is

locations/MartinSex.qsrc

@@ -119,23 +119,23 @@ if $ARGS[0] = '':
 				'You get closer to him, an inch away from touching him, and lower your voice to a whisper. "If I''m that smart, why don''t you let me decide what I want?"'
 				'He looks at you, longing but self-possessed. "Some decisions are better made for you."'
 				*nl
-				if exhibitionism > 20 and pcs_dom > 30 and cycle ! 0:
+				if exhibitionist_lvl > 0 and pcs_dom > 30 and cycle ! 0:
 					'You are half-tempted to go on the offensive, show him what he''s missing out on by acting like a knight in shining armor and see if that won''t change his mind.'
-				elseif exhibitionism > 20 and pcs_dom > 30 and cycle = 0:
+				elseif exhibitionist_lvl > 0 and pcs_dom > 30 and cycle = 0:
 					'You are half-tempted to go on the offensive, show him what he''s missing out on by acting like a knight in shining armor and see if that won''t change his mind, but then you remember that you are on your period, so stripping isn''t really a sexy option right now.'
 				end
 
-				if exhibitionism > 20 and pcs_dom > 50 and count['bj'] > 20 and cycle ! 0:
+				if exhibitionist_lvl > 0 and pcs_dom > 50 and count['bj'] > 20 and cycle ! 0:
 					'Or you could just pull his pants off and blow him - you''ve done it enough times to know how convincing that can be.'
-				elseif exhibitionism > 20 and pcs_dom > 50 and cycle = 0:
+				elseif exhibitionist_lvl > 0 and pcs_dom > 50 and cycle = 0:
 					'Or you could just pull his pants off and blow him - you''ve done it enough times to know how convincing that can be, and your period certainly isn''t going to stand in the way of <i>that</i>.'
 				end
 
-				if exhibitionism > 20 and pcs_dom > 30 and cycle ! 0:
+				if exhibitionist_lvl > 0 and pcs_dom > 30 and cycle ! 0:
 					act 'Go on the offensive - Strip':MartinStripVar = 1 & gt'MartinSex','MartinTease'
 				end
 
-				if exhibitionism > 20 and pcs_dom > 50 and count['bj'] > 20:
+				if exhibitionist_lvl > 0 and pcs_dom > 50 and count['bj'] > 20:
 					act 'Be even more aggressive - Give Martin a blowjob': MartinConvinceBJ = 1 & gt'MartinSex3','MartinBlowTease'
 				end
 
@@ -186,12 +186,12 @@ if $ARGS[0] = '':
 		'You approach Martin from behind, but you aren''t sure he has noticed you yet. He said you were too young to know better, that you were seeing something in him that wasn''t there - he was basically saying that you were stupid, wasn''t he?'
 		*nl
 		'But instead of forgetting about him or wallowing in self-pity, you are now standing here, and feeling indecisive at that. What are you gonna do, apologize to him for not letting yourself be patronized? It''s not like he was right... right?'
-		if exhibitionism > 15 and pcs_dom > 20:
+		if exhibitionist_lvl > 0 and pcs_dom > 20:
 			*nl
 			'Maybe he just needs a little push. Maybe, all you have to do is show him that you aren''t too young, show him what he is missing out on.'
 			if cycle = 0: 'But, damn, since you are currently on your period, that isn''t an option today. You will have to think of something else or come back some other time.'
 
-			if exhibitionism > 20 and pcs_dom > 50 and count['bj'] > 20:
+			if exhibitionist_lvl > 0 and pcs_dom > 50 and count['bj'] > 20:
 				if cycle = 0:
 					'A good blowjob would probably set him straight right quick, no matter what time of the month it is.'
 				else
@@ -243,11 +243,11 @@ if $ARGS[0] = '':
 			act 'Leave': gt 'nord'
 		end
 
-		if exhibitionism > 15 and pcs_dom > 20 and cycle ! 0:
+		if exhibitionist_lvl > 0 and pcs_dom > 20 and cycle ! 0:
 			act 'Go on the offensive - Strip':MartinStripVar = 1 & gt'MartinSex','MartinTease'
 		end
 
-		if exhibitionism > 20 and pcs_dom > 50 and count['bj'] > 20:
+		if exhibitionist_lvl > 0 and pcs_dom > 50 and count['bj'] > 20:
 			act 'Be even more aggressive - Give Martin a blowjob': MartinConvinceBJ = 1 & gt'MartinSex3','MartinBlowTease'
 		end
 
@@ -261,15 +261,15 @@ if $ARGS[0] = '':
 		'Martin rejected you, but you can tell that he is attracted to you, no matter what he said about age. You told him that you understand, but that doesn''t mean it has to be the final word in the matter...'
 		*nl
 
-		if exhibitionism > 20 and pcs_dom > 30 and cycle ! 0:
+		if exhibitionist_lvl > 0 and pcs_dom > 30 and cycle ! 0:
 			'You are half-tempted to go on the offensive, show him what he''s missing out on by acting like a knight in shining armor and see if that won''t change his mind.'
-		elseif exhibitionism > 20 and pcs_dom > 30 and cycle = 0:
+		elseif exhibitionist_lvl > 0 and pcs_dom > 30 and cycle = 0:
 			'You are half-tempted to go on the offensive, show him what he''s missing out on by acting like a knight in shining armor and see if that won''t change his mind, but then you remember that you are on your period, so stripping isn''t really a sexy option right now.'
 		end
 
-		if exhibitionism > 20 and pcs_dom > 50 and count['bj'] > 20 and cycle ! 0:
+		if exhibitionist_lvl > 0 and pcs_dom > 50 and count['bj'] > 20 and cycle ! 0:
 			'Or you could just pull his pants off and blow him - you''ve done it enough times to know how convincing that can be.'
-		elseif exhibitionism > 20 and pcs_dom > 50 and cycle = 0:
+		elseif exhibitionist_lvl > 0 and pcs_dom > 50 and cycle = 0:
 			'Or you could just pull his pants off and blow him - you''ve done it enough times to know how convincing that can be, and your period certainly isn''t going to stand in the way of <i>that</i>.'
 		end
 
@@ -393,11 +393,11 @@ if $ARGS[0] = '':
 			end
 		end
 
-		if exhibitionism > 20 and pcs_dom > 30 and cycle ! 0:
+		if exhibitionist_lvl > 0 and pcs_dom > 30 and cycle ! 0:
 			act 'Go on the offensive - Strip':MartinStripVar = 1 & gt'MartinSex','MartinTease'
 		end
 
-		if exhibitionism > 20 and pcs_dom > 50 and count['bj'] > 20:
+		if exhibitionist_lvl > 0 and pcs_dom > 50 and count['bj'] > 20:
 			act 'Be even more aggressive - Give Martin a blowjob': MartinConvinceBJ = 1 & gt'MartinSex3','MartinBlowTease'
 		end
 
@@ -461,7 +461,7 @@ if $ARGS[0] = 'MartinTease':
 		MartinSex = 1
 		MartinSexTalk = 2
 		if pcs_dancero <= 50:dancero_exp += rand(2,5)
-		exhibition_exp += rand(0,2)
+		pcs_exhib += rand(0,2)
 
 		if $pantyworntype ! 'none':
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/tease1.jpg"></center>'
@@ -639,7 +639,7 @@ if $ARGS[0] = 'MartinTease':
 	else
 		if $pantyworntype ! 'none':
 			if pcs_dancero <= 50:dancero_exp += rand(2,5)
-			exhibition_exp += rand(0,2)
+			pcs_exhib += rand(0,2)
 			'<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.'
@@ -911,7 +911,7 @@ end
 if $ARGS[0] = 'MartinTeaseDildo':
 	cls
 	gs 'boyStat', 'A216'
-	exhibition_exp += rand(0,2)
+	pcs_exhib += rand(0,2)
 	'<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

locations/MartinSex2.qsrc

@@ -274,7 +274,7 @@ if $ARGS[0] = 'MartinSexDyn':
 			*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 exhibitionism > 50 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
+			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?'
 			gs 'arousal', 'vaginal', 3, 'exhibitionism'
 			*nl
@@ -311,7 +311,7 @@ if $ARGS[0] = 'MartinSexDyn':
 			*nl
 			'It only adds to the excitement of it all to know that this is a public place, even if nobody''s here now.'
 			
-			if exhibitionism > 50 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
+			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?'
 			gs 'arousal', 'vaginal', 3, 'exhibitionism'
 			*nl
@@ -348,7 +348,7 @@ if $ARGS[0] = 'MartinSexDyn':
 			*nl
 			'It only adds to the excitement of it all to know that this is a public place, even if nobody''s here now.'
 			
-			if exhibitionism > 50 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
+			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?'
 			gs 'arousal', 'vaginal', 3, 'exhibitionism'
 			*nl
@@ -392,7 +392,7 @@ if $ARGS[0] = 'MartinSexDyn':
 			*nl
 			'It only adds to the excitement of it all to know that this is a public place, even if nobody''s here now.'
 			
-			if exhibitionism > 50 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
+			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?'
 			gs 'arousal', 'vaginal', 3, 'exhibitionism'
 			*nl
@@ -756,7 +756,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 		
 		act 'Continue':
 			cls
-			$orgasm_txt = iif(dominance > 20,'Wresting control from','Submitting to') + ' Martin and the intense feeling of him filling your ass drive you ever closer to the edge until you can no longer take it. You cum loudly, shivering all over' + iif(exhibitionism>50 or exhibitionism['pref']>50,' as your mind basks in your exhibitionist fantasy','') + ', your ass clenching around and massaging Martin''s cock with its contractions as if it wanted to squeeze the cum out of him as' + iif($martinpos='doggystyle',' he fucks you',' you fuck him') + '. Your anal orgasm lasts for what feels like an eternity, but when it has passed and you look back at him, Martin gives you a smug, self-satisfied look that makes you chuckle. You''re not done with each other yet, though, and before long, you''ve resumed your fast, hard rhythm.'
+			$orgasm_txt = iif(dominance > 20,'Wresting control from','Submitting to') + ' Martin and the intense feeling of him filling your ass drive you ever closer to the edge until you can no longer take it. You cum loudly, shivering all over' + iif(exhibitionist_lvl > 1 or exhibitionism['pref']>50,' as your mind basks in your exhibitionist fantasy','') + ', your ass clenching around and massaging Martin''s cock with its contractions as if it wanted to squeeze the cum out of him as' + iif($martinpos='doggystyle',' he fucks you',' you fuck him') + '. Your anal orgasm lasts for what feels like an eternity, but when it has passed and you look back at him, Martin gives you a smug, self-satisfied look that makes you chuckle. You''re not done with each other yet, though, and before long, you''ve resumed your fast, hard rhythm.'
 			
 			if $martinpos = 'rev_cowgirl':
 				'<center><video src="images/locations/city/industrial/bar/sex/bar/martin/anal/anal_rev.mp4"></center>'
@@ -778,7 +778,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 					'Being fucked from below, your lover proving that he is still the man of the house turns you on, plain and simple, and the fact that you are doing it in the middle of an empty bar, <b>his</b> empty bar, just makes it more exciting.'
 				end
 				*nl
-				if exhibitionism > 50 or exhibitionism['pref'] > 50: 'This final thought, 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 take the bartender''s cock up your ass right here in the center, with all of their eyes on you...' & pcs_horny += 10
+				if exhibitionist_lvl > 1 or exhibitionism['pref'] > 50: 'This final thought, 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 take the bartender''s cock up your ass right here in the center, with all of their eyes on you...' & pcs_horny += 10
 				*nl
 				if pcs_dom > 20:
 					gs 'arousal', 'anal', 10, 'dom'
@@ -807,7 +807,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 					'"You''re fucking me," you moan, aroused by the power he has over you. "You''re fucking my ass in the middle of your bar." As you say it, you are reminded of how public of a place this really is, despite being empty, and that alone is almost enough to make you cum.'
 				end
 				*nl
-				if exhibitionism > 50 or exhibitionism['pref'] > 50: 'That final thought, 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 take the bartender''s cock up your ass right here in the center, with all of their eyes on you...' & pcs_horny += 10
+				if exhibitionist_lvl > 1 or exhibitionism['pref'] > 50: 'That final thought, 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 take the bartender''s cock up your ass right here in the center, with all of their eyes on you...' & pcs_horny += 10
 				*nl
 				if pcs_dom > 20:
 					gs 'arousal', 'anal', 10

locations/MartinTalk.qsrc

@@ -803,7 +803,7 @@ if $ARGS[0] = '':
 		*nl
 		'"How could I possibly forget that?" He speaks and looks at you with a sudden intensity that almost makes you blush. "I just wanted to know how you feel about it."'
 		*nl
-		'You give him a hint of a smile. "Trust me, if I didn''t like what we''re doing, you''d know. But for the record: I like sex.' + iif(pcs_dom>0,' I like being on top.',' I like being dominated.') + iif(stat['bj']>30,' I like giving blowjobs.','') + iif(stat['anal']>30,' I like anal.','') + iif(rough['pref']>30,' I like it rough.','') + iif(pcs_exhibition>30,' I like exposing myself.','') + iif(lesbian>10,' And I kinda like women, too.','') + ' But most importantly, I like having sex with you."'
+		'You give him a hint of a smile. "Trust me, if I didn''t like what we''re doing, you''d know. But for the record: I like sex.' + iif(pcs_dom>0,' I like being on top.',' I like being dominated.') + iif(stat['bj']>30,' I like giving blowjobs.','') + iif(stat['anal']>30,' I like anal.','') + iif(rough['pref']>30,' I like it rough.','') + iif(exhibitionist_lvl > 0,' I like exposing myself.','') + iif(lesbian>10,' And I kinda like women, too.','') + ' But most importantly, I like having sex with you."'
 		'You lean forward, so close to Martin now that he can smell the alcohol on your breath. "Does that answer your questions?"'
 		*nl
 		'Baffled by your directness, Martin nods silently.'

locations/WorkHosp.qsrc

@@ -41,25 +41,27 @@ if $ARGS[0] = 'start':
 		gs 'stat'
 		'You relax a little while pretending to be busy.'
 
-		act 'Masturbate (0:15)':
-			mastrrand = rand(0, 2)
-
-			if mastrrand = 0:
-				gt 'WorkHosp', '1'
-			else
-				cla
-				*clr
-				if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-				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.'
-				$orgasm_or = 'custom'
-				$orgasm_txt = 'Gradually a pleasant warmth and sensation radiates from your needy sex, culminating in a powerful orgasm that sends waves of pleasure through your entire body.'
-				gs 'arousal', 'masturbate', 15
-				gs 'stat'
+		if pcs_inhib > 20:
+			act 'Masturbate (0:15)':
+				mastrrand = rand(0, 2)
+
+				if mastrrand = 0:
+					gt 'WorkHosp', '1'
+				else
+					cla
+					*clr
+					pcs_exhib += rand(1,3)
+					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.'
+					$orgasm_or = 'custom'
+					$orgasm_txt = 'Gradually a pleasant warmth and sensation radiates from your needy sex, culminating in a powerful orgasm that sends waves of pleasure through your entire body.'
+					gs 'arousal', 'masturbate', 15
+					gs 'stat'
+				end
+
+				act 'Leave':gt 'WorkHosp', 'start'
 			end
-
-			act 'Leave':gt 'WorkHosp', 'start'
 		end
 
 		act 'Move away':gt 'WorkHosp', 'start'

locations/body.qsrc

@@ -463,7 +463,7 @@ if pcs_hairlng <= 80:
 	if defcurly = 0:
 		curly = 0
 	else
-		!! ...Wat?
+		!! This sets curly hair to as high a number as possible to prevent it straightening in error
 		curly = 2147483647
 	end
 	hbraids = 0

locations/cikl.qsrc

@@ -196,21 +196,61 @@ snapshotX = (stat['vaginal'] + stat['bj'] + stat['anal'])
 snapshotY = bimbo
 
 !!------------------------------------------------------------------------------------------------------------
-!!	Exhibitionist
+!!	Exhibitionism
 !!------------------------------------------------------------------------------------------------------------
 
-if Exhibitionist > 0 or Exhibitionist_lvl > 0:
-    if Exhibitionist < 10:
-        Exhibitionist -= 1
-    elseif Exhibitionist < 20:
-    	Exhibitionist_lvl = 1
-    elseif Exhibitionist < 30:
-    	Exhibitionist_lvl = 2
+if pcs_exhib > 0 or exhibitionist_lvl > 0:
+    if pcs_exhib < 10:
+        pcs_exhib -= 1
+    elseif pcs_exhib < 20:
+    	exhibitionist_lvl = 1
+    elseif pcs_exhib < 30:
+    	exhibitionist_lvl = 2
     else
-        Exhibitionist_lvl = 3
+        exhibitionist_lvl = 3
     end
 end
 
+!!Inhibition increases from wearing revealing clothing
+
+if exhibition_outdoors > 0:
+	if pcs_inhib > 90:
+		exhibition_outdoors = exhibition_outdoors * 3
+	elseif pcs_inhib > 75:
+		exhibition_outdoors = exhibition_outdoors * 5 / 2
+	elseif pcs_inhib > 60:
+		exhibition_outdoors = exhibition_outdoors * 2
+	elseif pcs_inhib > 30:
+		exhibition_outdoors = exhibition_outdoors * 3 / 2
+	end
+
+	if exhibition_outdoors <= 5:
+		inhib_exp += rand(3,6)
+	elseif exhibition_outdoors <= 10:
+		inhib_exp += rand(5,9)
+	elseif exhibition_outdoors <= 15:
+		inhib_exp += rand(7,12)
+	elseif exhibition_outdoors <= 20:
+		inhib_exp += rand(9,15)
+	elseif exhibition_outdoors <= 25:
+		inhib_exp += rand(12,20)
+	elseif exhibition_outdoors <= 30:
+		inhib_exp += rand(16,25)
+	elseif exhibition_outdoors <= 35:
+		inhib_exp += rand(20,30)
+	elseif exhibition_outdoors <= 40:
+		inhib_exp += rand(25,40)
+	elseif exhibition_outdoors <= 50:
+		inhib_exp += rand(35,50)
+	elseif exhibition_outdoors <= 65:
+		inhib_exp += rand(50,75)
+	else
+		inhib_exp += rand(70,100)
+	end
+end
+
+exhibition_outdoors = 0
+
 !!------------------------------------------------------------------------------------------------------------
 !!	Succubus
 !!------------------------------------------------------------------------------------------------------------
@@ -673,46 +713,6 @@ if pcs_horny < 0:pcs_horny = 0
 
 !!------------------------------------------------------------------------------------------------------------
 
-!!Exhibitionism
-
-if exhibition_outdoors > 0:
-	if pcs_inhib > 90:
-		exhibition_outdoors = exhibition_outdoors * 3
-	elseif pcs_inhib > 75:
-		exhibition_outdoors = exhibition_outdoors * 5 / 2
-	elseif pcs_inhib > 60:
-		exhibition_outdoors = exhibition_outdoors * 2
-	elseif pcs_inhib > 30:
-		exhibition_outdoors = exhibition_outdoors * 3 / 2
-	end
-
-	if exhibition_outdoors <= 5:
-		inhib_exp += rand(3,6)
-	elseif exhibition_outdoors <= 10:
-		inhib_exp += rand(5,9)
-	elseif exhibition_outdoors <= 15:
-		inhib_exp += rand(7,12)
-	elseif exhibition_outdoors <= 20:
-		inhib_exp += rand(9,15)
-	elseif exhibition_outdoors <= 25:
-		inhib_exp += rand(12,20)
-	elseif exhibition_outdoors <= 30:
-		inhib_exp += rand(16,25)
-	elseif exhibition_outdoors <= 35:
-		inhib_exp += rand(20,30)
-	elseif exhibition_outdoors <= 40:
-		inhib_exp += rand(25,40)
-	elseif exhibition_outdoors <= 50:
-		inhib_exp += rand(35,50)
-	elseif exhibition_outdoors <= 65:
-		inhib_exp += rand(50,75)
-	else
-		inhib_exp += rand(70,100)
-	end
-end
-
-exhibition_outdoors = 0
-
 !counter for Dimka avoidance
 if dimaFilm = 1 and dimaRudeBlock = 0:
 	nodimkaK += 1

locations/lesbidomhouse.qsrc

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

locations/lesbimistress.qsrc

@@ -1197,7 +1197,8 @@ if $ARGS[0] = 'neutral_9':
 	act 'Go out with Mistress':
 		cla
 		*clr
-		exhibition_exp += 3
+		pcs_exhib += 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>'
 		'You get in Mistress'' car, and just look out the window where she drives you to where she wants to take you.'
@@ -1214,7 +1215,8 @@ if $ARGS[0] = 'neutral_9':
 		act 'Scrapbook time?':
 			cla
 			*clr
-			exhibition_exp += 7
+			pcs_exhib += 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>'
 			'You get back in the car once you get dressed, and let Mistress take you where she wants to go. She parks somewhere in the city center, and then guides you to a back alley. She taps a door several times with her knuckles in an irregular pattern, and it swings open almost immediately. Must''ve been a code.'
@@ -1229,7 +1231,8 @@ if $ARGS[0] = 'neutral_9':
 			act 'Continue':
 				cla
 				*clr
-				exhibition_exp += 5
+				pcs_exhib += 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>'
 				'Once Mistress leaves, you can tell that several of the patrons are looking at you very intently.'
@@ -1243,7 +1246,8 @@ if $ARGS[0] = 'neutral_9':
 				act 'Right...':
 					cla
 					*clr
-					exhibition_exp += 5
+					pcs_exhib += 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>'
 					'Just when you were starting to feel at ease, a man walks up to you. His eyes are scanning your body intently, greedily consuming every square inch of you.'

locations/qwBarBilliard.qsrc

@@ -262,20 +262,20 @@ if $ARGS[0] = 'billiard_ev1':
 								act 'Return to the bar': gt 'qwBarPolet'
 							end
 
-							if pcs_dom >= 30 and pcs_exhibition >= 50:
+							if pcs_dom >= 30 and exhibitionist_lvl > 1:
 								$martinpos = 'But I want to'
 							elseif pcs_horny >= 80 and pcs_inhib >= 30:
 								$martinpos = 'I''ll do it if you want me to'
 							end
 
-							if (pcs_horny >= 80 and pcs_exhibition >= 30) or (pcs_dom >= 30 and pcs_exhibition >= 50):
+							if (pcs_horny >= 80 and exhibitionist_lvl > 0) or (pcs_dom >= 30 and exhibitionist_lvl > 1):
 								act '<<$martinpos>>':
 									cls
 									'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/poolm1.jpg"></center>'
 									gs 'boyStat', 'A216'
 									npc_rel['A216'] += 1
 
-									if pcs_horny >= 80 and pcs_exhibition >= 30:
+									if pcs_horny >= 80 and exhibitionist_lvl > 0:
 										'"Oh, I think you <b>do</b> want it here and now," you say coyly as you unbutton Martin''s pants, "and I want to, too." You can see him tense, see that he is torn between his own rules and his lust for you, but in that moment your hand reaches into his underpants and your fingers close around his impressive length, the battle is over.'
 									else
 										'"Are you sure? I would do it if you asked me to."'
@@ -295,10 +295,10 @@ 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 pcs_exhibition <= 30:
-											pcs_exhibition += rand(0,2)
+										if exhibitionist_lvl > 0:
+											pcs_exhib += rand(0,2)
 										else
-											pcs_exhibition += rand(0,1)
+											pcs_exhib += rand(0,1)
 										end
 										'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.'
@@ -333,7 +333,7 @@ if $ARGS[0] = 'billiard_ev1':
 					'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/pool/poold1.jpg"></center>'
 					gs 'npcgeneratec', 0, 'stranger', rand(18,35)
 					gs 'boyStat', $npclastgenerated
-					'Well, a bet is a bet. If you weren''t willing to do it, you shouldn''t have made the bet. At least that''s what''s going through your head as you get down on your knees in front of him. Even being in a separate room and hidden from sight, the fact that everything that''s between you and a whole bar full of people is a fluttering curtain ' + iif(pcs_exhibition<30,'terrifies','excites') + ' you.'
+					'Well, a bet is a bet. If you weren''t willing to do it, you shouldn''t have made the bet. At least that''s what''s going through your head as you get down on your knees in front of him. Even being in a separate room and hidden from sight, the fact that everything that''s between you and a whole bar full of people is a fluttering curtain ' + iif(exhibitionist_lvl < 1,'terrifies','excites') + ' you.'
 					'He has his pants unbuttoned in about two seconds and out comes his cock, standing at attention already and revealing his eagerness and anticipation.'
 					*nl
 					'You quickly take it into your mouth and start sucking it for all you are worth, looking to get this over with as quickly as you can. You use your hands to caress his shaft and fondle his balls as you suck his dick, and while could imagine yourself doing more pleasant things, the fact that you are blowing a stranger in public does have a slight effect on you.'
@@ -504,7 +504,7 @@ if $ARGS[0] = 'billiard_ev2':
 			!Erick Lewis as Victor, dark-skinned, charming, composed - https://de.pornhub.com/pornstar/erick-lewis http://wtfpass.com/models/eric-cfst30/2/
 			!Maxim (or anybody else - Edik?) as Artyom, fair-skinned, a little more brutish and lecherous - http://wtfpass.com/models/maxim-2/
 
-			!Sex progression? first strip teases, masturbation, then handjobs/blowjobs, sex, anal, DP - dependent on pcs_exhibition - caught in a specific act (blowjob? sex?) - each act is worth more
+			!Sex progression? first strip teases, masturbation, then handjobs/blowjobs, sex, anal, DP - dependent on pcs_exhib - caught in a specific act (blowjob? sex?) - each act is worth more
 			!Small scene variants where she only blows one of them, only has sex with one of them etc.
 
 

locations/qwBarEncounters.qsrc

@@ -303,7 +303,7 @@ if $ARGS[0] = '':
 			act 'He might have a point - Finish your drink': gt 'qwBarPolet'
 		end
 		
-		if pcs_horny >= 70 or sub >= 20 or alko >= 5 or pcs_exhibition >= 40:
+		if pcs_horny >= 70 or sub >= 20 or alko >= 5 or exhibitionist_lvl > 1:
 			act 'Grind back against him':
 				cla
 				*clr

locations/qwBarPolet.qsrc

@@ -113,7 +113,7 @@ if $ARGS[0] = '':
 
 		act 'Order a snack':
 			if cumloc[7] > 0 or cumloc[10] > 0 or cumloc[11] > 0 or cumloc[13] > 0 or cumloc[16] > 0:
-				if pcs_exhibition < 60:
+				if exhibitionist_lvl < 2:
 					mood -= rand(2,5)
 				else
 					pcs_horny += 5
@@ -121,11 +121,11 @@ if $ARGS[0] = '':
 				npc_rel['A216'] -= 2
 				'Martin gives a stern look. "Don''t you think you should clean yourself up first?"'
 				*nl
-				if pcs_exhibition < 60 and pcs_inhib < 70:
+				if exhibitionist_lvl < 2 and pcs_inhib < 70:
 					'You are visibly covered in cum and Martin noticed it!'
 					*nl
 					'How embarrassing...'
-				elseif pcs_inhib >= 70 and pcs_exhibition < 60:
+				elseif pcs_inhib >= 70 and exhibitionist_lvl < 2:
 					'"Huh?" You look over to the mirror behind the bar and realize that you still have cum on your face.'
 					'"Oh! Didn''t notice that. Yeah you''re right, I should go wash that off," you say before excusing yourself.'
 				else
@@ -298,7 +298,7 @@ if $ARGS[0] = 'Ordering':
 	!Different Picture/s?!
 	'You go to the counter, sit down on one of the stools and, when the bartender notices you, ask: "Hey, could you bring me something to drink?"'
 	if cumloc[7] > 0 or cumloc[10] > 0 or cumloc[11] > 0 or cumloc[13] > 0 or cumloc[16] > 0:
-		if pcs_exhibition < 60:
+		if exhibitionist_lvl < 2:
 			mood -= rand(2,5)
 		else
 			pcs_horny += 5
@@ -306,11 +306,11 @@ if $ARGS[0] = 'Ordering':
 		npc_rel['A216'] -= 2
 		'Martin gives a stern look. "Don''t you think you should clean yourself up first?"'
 		*nl
-		if pcs_exhibition < 60 and pcs_inhib < 70:
+		if exhibitionist_lvl < 2 and pcs_inhib < 70:
 			'You are visibly covered in cum and Martin noticed it!'
 			*nl
 			'How embarrassing...'
-		elseif pcs_inhib >= 70 and pcs_exhibition < 60:
+		elseif pcs_inhib >= 70 and exhibitionist_lvl < 2:
 			'"Huh?" You look over to the mirror behind the bar and realize that you still have cum on your face.'
 			'"Oh! Didn''t notice that. Yeah you''re right, I should go wash that off," you say before excusing yourself.'
 		else

locations/therapist.qsrc

@@ -452,7 +452,7 @@ if $ARGS[0] = 'hypnoEnd':
 	elseif hypnoTime < 10:
 		hypnoAddict = 1
 		hypnoDay = daystart
-		exhibition_exp += (100+sub-pcs_dom)/25+1
+		pcs_exhib += (100+sub-pcs_dom)/25+1
 		inhib_exp += (100+sub-pcs_dom)/25+1
 		pain['vaginal'] -= 5
 		pain['asshole'] -= 5
@@ -464,7 +464,7 @@ if $ARGS[0] = 'hypnoEnd':
 	else
 		hypnoAddict = 2
 		hypnoDay = daystart
-		exhibition_exp += (100+sub-pcs_dom)/25+2
+		pcs_exhib += (100+sub-pcs_dom)/25+2
 		inhib_exp += (100+sub-pcs_dom)/25+1
 		pain['vaginal'] -= 5
 		pain['asshole'] -= 5

locations/traits.qsrc

@@ -45,17 +45,21 @@ if $ARGS[0] = 'menu':
 	if Exhibitionist_lvl = 0:
 		pl 'You do not have this trait.'
 		pl 'To gain this trait you must have low enough inhibition and choose to expose your breasts in public.'
-		pl 'You have <<Exhibitionist>> out of 10 points towards level 1.'
+		pl 'You have <<pcs_exhib>> out of 10 points towards level 1. This will slowly decrease each day unless you expose yourself.'
     elseif Exhibitionist_lvl = 1:
 		pl 'You have this trait at level 1.'
 		pl 'To increase this trait you must choose to expose your breasts and/or bare bottom in public.'
 		pl 'This trait grants you a small amount or excitement from exposing yourself.'
-		pl 'You have <<Exhibitionist>> out of 20 points towards level 2.'
+		pl 'You have <<pcs_exhib>> out of 50 points towards level 2.'
     elseif Exhibitionist_lvl = 2:
 		pl 'You have this trait at level 2.'
 		pl 'To increase this trait you must choose to expose your breasts, bare bottom and/or pussy in public.'
 		pl 'This trait grants you a moderate amount or excitement from exposing yourself.'
-		pl 'You have <<Exhibitionist>> out of 30 points towards level 3.'
+		if pcs_exhib < 100:
+			pl 'You have <<pcs_exhib>> out of 100 points towards level 3.'
+		else
+			pl 'You must trigger an event in the park to gain level 3.'
+		end
     else
 		pl 'You have this trait at level 3.'
 		pl 'This is the highest level of this trait.'

locations/ugol.qsrc

@@ -20,8 +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.'
-		exhibition_exp += rand(1,3)
-		inhib_exp += rand(1,3)
+		pcs_exhib += rand(1,3)
         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.'
        

locations/ugol1.qsrc

@@ -7,8 +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.'
 	
-	if pcs_exhibition < 30:exhibition_exp += rand(1,3)
-	inhib_exp += rand(1,3)
+	pcs_exhib += rand(1,3)
 	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.'