Browse Source

[added] other brother stuff

hornguy6 6 years ago
parent
commit
6f59a31871
76 changed files with 2377 additions and 1838 deletions
  1. 10 0
      locations/Cheatmenu_din.qsrc
  2. 5 0
      locations/Gadbana.qsrc
  3. 66 45
      locations/MagEncounterFairy.qsrc
  4. 27 27
      locations/MartinSex.qsrc
  5. 17 17
      locations/MartinSex2.qsrc
  6. 1 1
      locations/MartinTalk.qsrc
  7. 6 4
      locations/Nudelake.qsrc
  8. 1 1
      locations/ParChurch.qsrc
  9. 21 22
      locations/WorkHosp.qsrc
  10. 132 132
      locations/_attributes_swimwear.qsrc
  11. 13 7
      locations/abduction.qsrc
  12. 3 4
      locations/anushka.qsrc
  13. 2 2
      locations/balkon2.qsrc
  14. 1 1
      locations/bed1.qsrc
  15. 2 1
      locations/body.qsrc
  16. 53 14
      locations/brother.qsrc
  17. 116 170
      locations/brother_voyeur.qsrc
  18. 80 62
      locations/cikl.qsrc
  19. 3 3
      locations/clothing.qsrc
  20. 1 2
      locations/din_pav.qsrc
  21. 5 2
      locations/down.qsrc
  22. 20 12
      locations/etoexhib.qsrc
  23. 0 208
      locations/events.qsrc
  24. 240 28
      locations/femcyc.qsrc
  25. 54 49
      locations/foto.qsrc
  26. 1 1
      locations/gLakeNude.qsrc
  27. 29 25
      locations/gadriver.qsrc
  28. 1 1
      locations/gdktoilet.qsrc
  29. 2 3
      locations/gschool_detention.qsrc
  30. 16 15
      locations/gschool_events.qsrc
  31. 2 2
      locations/gschool_lessons.qsrc
  32. 40 56
      locations/gschool_lessonsev1.qsrc
  33. 41 57
      locations/gschool_lessonsev2.qsrc
  34. 19 25
      locations/gschool_lessonsev3.qsrc
  35. 1 1
      locations/gschool_office.qsrc
  36. 11 11
      locations/gschool_socialchg.qsrc
  37. 8 8
      locations/gskver.qsrc
  38. 28 22
      locations/husb.qsrc
  39. 44 40
      locations/kafe2.qsrc
  40. 24 22
      locations/kid.qsrc
  41. 10 10
      locations/kiosk.qsrc
  42. 3 4
      locations/klofdomhouse.qsrc
  43. 1 1
      locations/lesbidomhouse.qsrc
  44. 8 4
      locations/lesbimistress.qsrc
  45. 8 8
      locations/lover_change.qsrc
  46. 8 8
      locations/lug.qsrc
  47. 2 2
      locations/nastja.qsrc
  48. 2 2
      locations/nyp_school.qsrc
  49. 1 1
      locations/obj_din.qsrc
  50. 13 13
      locations/park.qsrc
  51. 4 4
      locations/parkivent.qsrc
  52. 8 8
      locations/parks.qsrc
  53. 5 1
      locations/pavShared_gp.qsrc
  54. 1 1
      locations/pirsingsalon.qsrc
  55. 4 4
      locations/podrsex.qsrc
  56. 8 11
      locations/postoffice.qsrc
  57. 2 2
      locations/preSYS2.qsrc
  58. 8 11
      locations/qwBarBilliard.qsrc
  59. 5 5
      locations/qwBarEncounters.qsrc
  60. 6 6
      locations/qwBarPolet.qsrc
  61. 1 1
      locations/rinok.qsrc
  62. 2 2
      locations/rolanapt.qsrc
  63. 181 325
      locations/rolanbath.qsrc
  64. 2 1
      locations/saveupdater.qsrc
  65. 74 85
      locations/stat_display.qsrc
  66. 3 3
      locations/stat_sklattrib.qsrc
  67. 20 20
      locations/street_event.qsrc
  68. 5 0
      locations/swamphouse.qsrc
  69. 2 2
      locations/therapist.qsrc
  70. 61 2
      locations/traits.qsrc
  71. 1 2
      locations/ugol.qsrc
  72. 1 2
      locations/ugol1.qsrc
  73. 1 1
      locations/vanrPar.qsrc
  74. 2 2
      locations/young_shop.qsrc
  75. 6 2
      locations/zaprF.qsrc
  76. 762 179
      locations/zaprFWash.qsrc

+ 10 - 0
locations/Cheatmenu_din.qsrc

@@ -1345,6 +1345,7 @@ $cheatmenu['display'] = {
 
 	pl 'Mod management page: <a href="exec:gt ''mod_setting''">Here</a>'
 
+
 	if Enable_nogameover = 1:
 		pl'Prevent Non-Drama GAMEOVER: Currently ON - <a href="exec:Enable_nogameover = 0 & dynamic $cheatmenu[''display'']">Turn OFF</a>'
 	else
@@ -1383,6 +1384,15 @@ $cheatmenu['display'] = {
 		pl'Editing of the names of the porn movies you stared disabled: Currently OFF - <a href="exec:editpornname = 1 & dynamic $cheatmenu[''display'']">Turn ON</a>'
 	end
 	nl
+
+	pl '<center><B>Difficulty Setting</B></center>'
+
+	pl 'Difficulty: Currenty at <<func(''_difficulty'',''getdifficulty'')>>'
+	pl '<ul><li>set to <a href="exec:FUNC(''_difficulty'',''setdifficulty'',''easy peasy'') & dynamic $cheatmenu[''display'']">easy peasy</a></li>'
+	pl '<li>set to <a href="exec:FUNC(''_difficulty'',''setdifficulty'',''relaxed'') & dynamic $cheatmenu[''display'']">relaxed</a></li>'
+	pl '<li>set to <a href="exec:FUNC(''_difficulty'',''setdifficulty'',''realistic'') & dynamic $cheatmenu[''display'']">realistic</a></li>'
+	pl '<li>set to <a href="exec:FUNC(''_difficulty'',''setdifficulty'',''hardcore'') & dynamic $cheatmenu[''display'']">hardcore</a></li></ul>'
+	nl
 	pl '<center><B>Display Setting</B></center>'
 	if set_imgh > 0: set_imgw = 0
 	if set_imgw > 0: set_imgh = 0

+ 5 - 0
locations/Gadbana.qsrc

@@ -133,6 +133,11 @@ if mira = 0:
 			act 'Finish':gt $loc, $metka
 		end
 	end
+	if breastpump > 0:
+		act 'Use breast pump':
+			gt 'lact_lib', 'bp_milking'
+		end
+	end
 	if analplug = 1 and analplugin = 1:
 		act 'Remove your butt plug (0:05)':
 			cla

+ 66 - 45
locations/MagEncounterFairy.qsrc

@@ -80,7 +80,7 @@ end
 if $ARGS[0] = 'fairy_chat':
 	cls
 	gs 'stat'
-	'You take the few steps over to the glowing orb that apparently only you can recognize as what it truely is: a fairy.'
+	'You take the few steps over to the glowing orb that apparently only you can recognize as what it truly is: a fairy.'
 	act 'Chat with the fairy':
 		cls
 		minut += 30
@@ -93,12 +93,12 @@ if $ARGS[0] = 'fairy_chat':
 		pcs_manna += 25 * pcs_magik
 		pcs_mood += 15
 		gs 'MagEncounterFairy', 'fairychattopic'
-		if pcs_skin < 80 and fairyday < daystart and fairyshoo = 0:
+		if pcs_skin < 80 and fairyday ! daystart and fairyshoo = 0:
 			pcs_skin += 10
 			fairyday = daystart
 			gs 'stat'
 			'The fairy bids you farewell.'
-			''
+			*nl
 			wait 725
 			'Just as she flies off, she returns fluttering in front of your face.'
 			'"You know, you could still look lovelier.", she says. "Don''t move."'
@@ -110,60 +110,81 @@ if $ARGS[0] = 'fairy_chat':
 			fairyday = daystart
 			gs 'stat'
 			'The fairy bids you farewell.'
-			''
+			*nl
 			wait 725
 			'Just as she flies off, she returns fluttering in front of your face.'
 			'"You know, you''re almost a magical creature now.", she says. "Don''t move."'
 			'Remembering the last time you hold your breath and close your eyes. Just a moment later you feel a much more intense tingling, this time seeming to go all the way through you.'
-		elseif fairyday < daystart and (pcs_nips < 80 or clit_size < 80):
+		elseif fairyday ! daystart and (pcs_nips < 80 or clit_size < 80):
 			fairyday = daystart
 			gs 'stat'
-
-			'The fairy takes another quick look at you, rubs her chin, and says "Hmm, since you''ve been a little nice to me, maybe I could be a little nice to you. Nips or Bud?"'
+			'The fairy takes another quick look at you, rubs her chin, and says "Hmm, since you''ve been a little nice to me, maybe I could be a little nice to you."'
 			act 'Huh?':
 				cls
-				' '
+				*nl
 				'You look at her, puzzled, wondering if you heard her right.  She just shrugs her shoulders and says "Okay, if you''re not interested"'
 				act 'Go on your way': gt $loc, $metka
 			end
-
-			act 'Nips?':
+			act 'Sure':
 				cls
-				pcs_nips += 5
-				pcs_horny += 10
-				gs 'stat'
-				if pcs_nips < 20:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples1.jpg"></center>'
-				if pcs_nips >= 20 and pcs_nips < 40:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples2.jpg"></center>'
-				if pcs_nips >= 40 and pcs_nips < 60:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples3.jpg"></center>'
-				if pcs_nips >= 60 and pcs_nips < 80:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples4.jpg"></center>'
-				if pcs_nips >= 80:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples5.jpg"></center>'
-				'She giggles in her little squeaky voice, "Ohh, goodie!", and throws something sparkly at your chest.  Suddenly, your nipples get really firm and pointed, and seem to be a bit larger now.'
-				'You can''t help but rub both breasts, feeling the warm tingling in them, and in your pussy.'
-				'The fairy admires the changes she''s made, and smiles at you.'
-				'You two say your goodbyes and the fairy flies off.'
+				fday_surprise += 1
+				fairy_surprise = RAND(1,9)
+				if fairy_surprise =< 2:
+					pcs_nips += 5
+					pcs_horny += 10
+					gs 'stat'
+					if pcs_nips < 20:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples1.jpg"></center>'
+					if pcs_nips >= 20 and pcs_nips < 40:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples2.jpg"></center>'
+					if pcs_nips >= 40 and pcs_nips < 60:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples3.jpg"></center>'
+					if pcs_nips >= 60 and pcs_nips < 80:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples4.jpg"></center>'
+					if pcs_nips >= 80:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples5.jpg"></center>'
+					'You hear a giggle.  Suddenly, your nipples get really firm and pointed, and seem to be a bit larger now.'
+					'You can''t help but rub both breasts, feeling the warm tingling in them, and in your pussy.'
+				elseif fairy_surprise = 3:
+					pcs_nips -= 5
+					gs 'stat'
+					if pcs_nips < 20:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples1.jpg"></center>'
+					if pcs_nips >= 20 and pcs_nips < 40:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples2.jpg"></center>'
+					if pcs_nips >= 40 and pcs_nips < 60:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples3.jpg"></center>'
+					if pcs_nips >= 60 and pcs_nips < 80:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples4.jpg"></center>'
+					if pcs_nips >= 80:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples5.jpg"></center>'
+					'You hear a giggle.  Suddenly, your nipples get really firm and pointed, yet seem to be smaller then before.'
+					'You can''t help but rub both breasts, feeling the warm tingling in them, and in your pussy.'
+				elseif fairy_surprise <= 4:
+					clit_size += 5
+					pcs_horny += 10
+					gs 'stat'
+					if clit_size < 20:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit1.jpg"></center>'
+					if clit_size >= 20 and clit_size < 40:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit2.jpg"></center>'
+					if clit_size >= 40 and clit_size < 60:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit3.jpg"></center>'
+					if clit_size >= 60 and clit_size < 80:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit4.jpg"></center>'
+					if clit_size >= 80:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit5.jpg"></center>'
+					'You hear a giggle and you feel a warm tingle at the top of your slit, you reach down and part your pussy lips with your fingers.'
+					'Your clitoris has swollen, and seems to stand out even more than before! You can''t help but rub all around it, feeling the warm tingling and the moisture build at the entrance.'
+					'The fairy admires the changes she''s made, and smiles at you, looking again at your puffy pussy and licking her lips.'
+					'You two say your goodbyes and the fairy flies off.'
+				elseif fairy_surprise = 5:
+					clit_size -= 5
+					gs 'stat'
+					if clit_size < 20:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit1.jpg"></center>'
+					if clit_size >= 20 and clit_size < 40:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit2.jpg"></center>'
+					if clit_size >= 40 and clit_size < 60:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit3.jpg"></center>'
+					if clit_size >= 60 and clit_size < 80:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit4.jpg"></center>'
+					if clit_size >= 80:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit5.jpg"></center>'
+					'You hear a giggle and you feel a warm tingle at the top of your slit, you reach down and part your pussy lips with your fingers.'
+					'Your clitoris has shunk, and seems to more demure than before! You can''t help but rub all around it, feeling the warm tingling and the moisture build at the entrance.'
+				elseif fairy_surprise <= 7:
+					min_arousal += rand(1,5)
+					'You hear a giggle, then sparkles surround your body and you get all tingly.'
+					'You suddenly feel flustered and more aroused then before.'
+				else
+					min_arousal -= rand(1,5)
+					'You hear a giggle, then sparkles surround your body and you get all tingly.'
+					'You suddenly feel colder and less aroused then before.'
+				end
 				act 'Go on your way': gt $loc, $metka
 			end
-
-			act 'Bud?':
-				cls
-				clit_size += 5
-				pcs_horny += 10
-				gs 'stat'				
-				if clit_size < 20:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit1.jpg"></center>'
-				if clit_size >= 20 and clit_size < 40:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit2.jpg"></center>'
-				if clit_size >= 40 and clit_size < 60:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit3.jpg"></center>'
-				if clit_size >= 60 and clit_size < 80:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit4.jpg"></center>'
-				if clit_size >= 80:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit5.jpg"></center>'
-				'She giggles in her little squeaky voice, "Ohh, goodie!", and throws something sparkly at your hips.'
-				'Suddenly, you feel a warm tingle at the top of your slit, and, after taking a quick glance around to make sure nobody is looking, you reach down and part your pussy lips with your fingers.'
-				'Your clitoris has swollen, and seems to stand out even more than before! You can''t help but rub all around it, feeling the warm tingling and the moisture build at the entrance.'
-				'The fairy admires the changes she''s made, and smiles at you, looking again at your puffy pussy and licking her lips.'
-				'You two say your goodbyes and the fairy flies off.'
-				act 'Go on your way': gt $loc, $metka						
-			end
-
 		end
-		act 'Go on your way': gt $loc, $metka
 	end
 end
 
@@ -172,7 +193,7 @@ killvar '$din_fairy_chat_no1' & killvar '$din_fairy_shoo' & killvar '$din_fairy_
 if $ARGS[0] = 'fairychattopic':
 !!	These are the random chat texts for the Fairy from UsagiTripleSix
 	frandchat = rand(0,14)
-	
+
 	if frandchat = 1:
 		'You spend a while chatting with the fairy. She openly wonders why human children need to go to school, and brags about how fairies already know everything there is to know.'
 	elseif frandchat = 2:
@@ -204,8 +225,8 @@ if $ARGS[0] = 'fairychattopic':
 	else
 		'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
-	
-	killvar 'frandchat'
+
+	act 'Go on your way': killvar 'frandchat' & gt $loc, $metka
 
 end
 

+ 27 - 27
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)
+		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)
-			exhibition_exp += 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'
-	exhibition_exp += 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

+ 17 - 17
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 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
-			$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?'
+			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 <<$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'
@@ -311,8 +311,8 @@ 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
-			$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?'
+			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 <<$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.'
@@ -348,8 +348,8 @@ 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
-			$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?'
+			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 <<$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.'
@@ -392,8 +392,8 @@ 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
-			$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?'
+			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 <<$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
 	
@@ -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

+ 1 - 1
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.'

+ 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)

+ 1 - 1
locations/ParChurch.qsrc

@@ -430,7 +430,7 @@ if $ARGS[0] = 'fillers':
 	elseif randtext = 8 and soniaPS = 0:
 		$safesub = 'your curfew on weekends'
 	elseif randtext = 9:
-		$safesub = 'your garandparents'
+		$safesub = 'your grandparents'
 	elseif randtext = 0:
 		moral += 1
 		$safesub = 'God and Jesus'

+ 21 - 22
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
+					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.'
+					$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'
@@ -170,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
@@ -178,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)

File diff suppressed because it is too large
+ 132 - 132
locations/_attributes_swimwear.qsrc


+ 13 - 7
locations/abduction.qsrc

@@ -511,7 +511,9 @@ if $ARGS[0] = 'abdEscapeWindow3':
 end
 
 if $ARGS[0] = 'abdFood':
+	$loc = 'abduction'
 	$locM = 'abduction'
+	$metka = 'abdFood'
 	$metkaM = 'abdFood'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/basement2.jpg"></center>'
@@ -598,7 +600,11 @@ if $ARGS[0] = 'abdFood':
 
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
-
+	if breastpump > 0:
+		act 'Use breast pump':
+			gt 'lact_lib', 'bp_milking'
+		end
+	end
 	act 'Take a cold shower (0:15)':
 		cumspclnt = 1
 		gs 'cum_cleanup'
@@ -650,7 +656,7 @@ if $ARGS[0] = 'abdRape':
 	if broken < 10:pcs_mood = 5
 
 	if rapeType = 1:
-		pain['mouth'] += 2
+		pain['mouth'] += 3
 		gs 'cum_call', 'mouth', 'torturer'
 		i = rand(1, 4)
 		gifornot = rand (1, 100)
@@ -722,7 +728,7 @@ if $ARGS[0] = 'abdRape':
 		act 'Continue':gt 'abduction', 'abdRoom'
 	else
 		pcs_throat += 1
-		pain['mouth'] += 2
+		pain['mouth'] += 5
 		gs 'cum_call', 'mouth', 'Torturer'
 
 		i = rand(1, 4)
@@ -793,7 +799,7 @@ end
 
 if $ARGS[0] = 'abdTortureA3':
 	cls
-	pain['asshole'] += 2
+	pain['asshole'] += 5
 	pcs_ass += 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/torturea3.jpg"></center>'
 	'After a while the tormentor comes back and brings a dildo attached to a longer stick.'
@@ -952,8 +958,8 @@ end
 
 if $ARGS[0] = 'abdTortureD5':
 	cls
-	pain['asshole'] += 2
-	pain['vaginal'] += 2
+	pain['asshole'] += 5
+	pain['vaginal'] += 5
 	pcs_vag += 1
 	pcs_ass += 1
 	gs 'cum_call', 'mouth', 'Torturer'
@@ -1663,7 +1669,7 @@ end
 
 if $ARGS[0] = 'abdTrainDildosMouthHorseUse':
 	dick = 40
-	if pcs_throat > dildoHorse:
+	if pcs_throat > 35:
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthhorse.mp4"></video></center>'
 		'You start sucking the dildo with ease, your throat swallows it whole without any problem.'
 		gs 'arousal', 'deepthroat', 60

+ 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 - 1
locations/bed1.qsrc

@@ -162,7 +162,7 @@ if $ARGS[0] = 'sog1':
 									*clr
 									swallow += 1
 									husband -= 40
-									gs 'cum_call', 'mounth', $namesob, 1, 0, -1, 60
+									gs 'cum_call', 'mouth', $namesob, 1, 0, -1, 60
 									'<center><img <<$set_imgh>> src="images/beast/zoo/z7.jpg"></center>'
 									'You lay the dog on the floor and take his cock in my mouth, your husband looks at you with disgust as you suck the dogs cock.'
 									'In a couple of minutes the dog cums in your mouth and you swallow his sperm.'

+ 2 - 1
locations/body.qsrc

@@ -451,6 +451,7 @@ if dounspell = 0:
 	
 !!This sets weight
 !! This variable is actually only used ONCE, when stripping, to see if you fall off the pole from being too heavy. I am reluctant to touch it, since the math is not explained. Maybe later.
+!! Weight = (height in cm x bottom of average weight in kilos for a 170cm female / 170cm + (hip modifier + 2 x overrun fat)/4 + cup size
 	pcs_weight = (pcs_hgt * 62 / 170) + (vhips + (vofat * 2)) / 4 + tits
 end
 
@@ -462,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

+ 53 - 14
locations/brother.qsrc

@@ -59,10 +59,13 @@ if $ARGS[0] = 'start':
 	elseif npc_rel['A34'] >= 60 and npc_rel['A34'] < 80:
 		'You have a good relationship with your brother.'
 	elseif npc_rel['A34'] >= 80:
-		'You have a great relationship with your brother.'
+		'Your brother is practically one of your closest friends.'
 	end
+	
+	act 'Move away':gt $loc, $metka
+	
 	*nl
-	if hour >= 7 and hour < 21:
+	if hour >= 7 and hour < 23:
 		! WD: Fix old nude variable
 		if (cumloc[1] > 0 or cumloc[4] > 0 or cumloc[8] > 0 or cumloc[9] > 0 or cumloc[10] > 0 or cumloc[14] > 0 or cumloc[15] > 0) and $clothingworntype = 'nude':
 			if $pantyworntype = 'none' and cumloc[1] = 1:
@@ -274,6 +277,9 @@ if $ARGS[0] = 'start':
 
 					act 'Move away':gt $loc, $metka
 				end
+				!if brotherSex >= 5:
+				!	act'Ask him if he wants to sneak off to fool around':
+				!end
 			end
 		end
 	end
@@ -282,8 +288,16 @@ if $ARGS[0] = 'start':
 
 		gs 'brother', 'pregreact'
 		gs 'brother', 'brotherSexCount'
+		
+		if hour >= 7 and hour < 23:
+			act'Chat with him':gt'brother2','chat'
+		end
+		
+		!if father_go = 1 and hour >= 7:
+		!	act'Play video games with him':gt'video_games','brother'
+		!end
 
-		if indorf = 0 and $clothingworntype ! 'nude' and brothersawpirsF=0 and father_go = 1 and npc_rel['A34'] > 85 and hour >= 18 and hour < 21 and pirsF > 0:
+		if indorf = 0 and $clothingworntype ! 'nude' and brothersawpirsF=0 and father_go = 1 and npc_rel['A34'] > 85 and hour >= 18 and hour < 23 and pirsF > 0:
 			act 'Show off your nipple piercings ':
 				cls
 				gs 'stat'
@@ -322,14 +336,14 @@ if $ARGS[0] = 'start':
 					exit
 				end
 			else
-				if father_go = 1 and hour >= 18 and hour < 21:
+				if father_go = 1 and hour >= 18 and hour < 23:
 					'"How lovely." Kolka plays with your pierced nipples'
 					npc_rel['A34'] += 3
 					brothersawpirsF = 1
 					pcs_horny += 10
 					act '<B>Move away</B>':gt 'sitrPar'
 					exit
-				elseif father_go = 0 and hour >= 18 and hour < 21:
+				elseif father_go = 0 and hour >= 18 and hour < 23:
 					'"Beautiful." Kolka gently cups your breasts and strokes your pierced nipples.'
 					npc_rel['A34'] += 3
 					brothersawpirsF=1
@@ -348,12 +362,22 @@ if $ARGS[0] = 'start':
 				if brotherRand < 5:'As you look, you can also clearly see the outline of his morning wood pitching a tent under the blanket.'
 				if week < 6 and kanikuli = 0:
 					act'Wake him up for breakfast':gt'brother2','wakeup'
+					if brotherwakeup >= 10:
+						if brotherSex >= 5:
+							act'Wake him up with a handjob':gt'brother2','morninghj'
+						end
+						if brotherSex >= 6:
+							act'Wake him up with a blowjob':gt'brother2','morningbj'
+						end
+					end
 				end
 			elseif hour < 7 and brotherMorningSex = daystart:
-				'Your brother is busying himself getting ready for school.'
+				'Your brother is busy getting ready for school.'
+			elseif hour < 23 and father_go = 1:
+				'Your brother is playing video games.'
 			end
 
-			if hour >= 21 and hour < 24 and brotherSex > 4 and brotherNightSex ! daystart:
+			if hour >= 23 and hour < 24 and brotherSex > 4 and brotherNightSex ! daystart:
 				'When you get close, he suddenly opens his eyes and says,:'
 				if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
 					'"<<$pcs_nickname>>, help me sleep." Then he throws back the blanket, revealing his erection.'
@@ -374,7 +398,7 @@ if $ARGS[0] = 'start':
 						gs 'brother', 'brotherSexStart'
 					end
 					act 'He''s on his own there':
-						'"You''ve got 2 perfectly good hands, I mean eww...", You turn around and leave.'
+						'"You''ve got 2 perfectly good hands to do that yourself. I mean, <i>eww...</i>", You turn around and leave.'
 						cla
 						act '<B>Move away</B>':gt 'sitrPar'
 						exit
@@ -382,7 +406,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 
-			if father_go = 1 and hour >= 18 and hour < 21 and brotherSex > 0 and brotherEvSex ! daystart:
+			if father_go = 1 and hour >= 18 and hour < 23 and brotherSex > 0 and brotherEvSex ! daystart:
 				'When you get close, He turns to you and says,:'
 				if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
 					gs 'boyStat', 'A34'
@@ -434,8 +458,6 @@ if $ARGS[0] = 'start':
 			act'Offer help with homework': gt 'brother_lessons', 'homework'
 		end
 	end
-
-	act 'Move away':gt $loc, $metka
 end
 
 if $ARGS[0] = 'sleepsexcum':
@@ -580,6 +602,7 @@ if $ARGS[0] = 'brotherSexStart':
 		cls
 		minut += 5
 		stat['hj'] += 1
+		npc_rel['A34'] += 2
 		if brotherSex < 5:brotherSex = 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj1.jpg"></center>'
@@ -594,7 +617,8 @@ if $ARGS[0] = 'brotherSexStart':
 			cls
 			minut += 5
 			pcs_horny += 10
-			brotherfuck += 1
+			brotherbj += 1
+			npc_rel['A34'] += 5
 			stat['bj'] += 1
 			if brotherSex < 6:brotherSex = 6
 			gs 'stat'
@@ -629,6 +653,7 @@ if $ARGS[0] = 'brotherSexStart':
 				minut += 5
 				pcs_horny += 10
 				brotherfuck += 1
+				npc_rel['A34'] += 5
 				gs 'boyStat', 'A34'
 				spafinloc = 11
 				sexpartkno = 1
@@ -648,6 +673,7 @@ if $ARGS[0] = 'brotherSexStart':
 					minut += 5
 					pcs_horny += 10
 					brotherfuck += 1
+					npc_rel['A34'] += 5
 					gs 'boyStat', 'A34'
 
 					gs 'stat'
@@ -668,6 +694,7 @@ if $ARGS[0] = 'brotherSexStart':
 					cls
 					minut += 5
 					pcs_horny += 10
+					npc_rel['A34'] += 5
 					brotherfuck += 1
 					if brotherSex < 8:brotherSex = 8
 					gs 'boyStat', 'A34'
@@ -688,6 +715,7 @@ if $ARGS[0] = 'brotherSexStart':
 	if brotherSex >= 6:
 		act 'Give yourself to your brother':
 			brotherfuck += 1
+			npc_rel['A34'] += 5
 			if brotherSex < 7:brotherSex = 7
 			cls
 			minut += 5
@@ -710,6 +738,7 @@ if $ARGS[0] = 'brotherSexStart':
 	if brotherSex >= 7:
 		act 'Offer your ass to your brother':
 			brotherfuck += 1
+			npc_rel['A34'] += 5
 			cls
 			minut += 5
 			pcs_horny += 10
@@ -730,13 +759,18 @@ end
 
 if $ARGS[0] = 'brotherSexEnd':
 	if sub > 0 or (evgenQW >= 4 and pav_slut >= 75):
-		if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 21:
+		if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 23:
 			minut += 15
 
 			gs 'stat'
 
 			'Kolka catches his breath, then says, "Nice one <<$pcs_nickname>>, good job. Just remember this is our little secret!" He continues to go about his business.'
 			act 'Leave': gt 'sitrPar'
+		elseif $loc = 'sitrPar' and npc_rel['A34'] >= 80:
+			minut += 15
+			gs 'stat'
+			'"Thanks <<$pcs_nickname>>," he yawns, tucking his member back into his pants. Mumbling, "You''re the best..." he curls back up underneath his blanket and begins to doze off.'
+			act 'Leave': gt 'sitrPar'
 		elseif $loc = 'sitrPar':
 			minut += 15
 			gs 'stat'
@@ -748,11 +782,16 @@ if $ARGS[0] = 'brotherSexEnd':
 			act 'Continue':gt $loc, $metka
 		end
 	else
-		if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 21:
+		if $loc = 'sitrPar' and father_go = 1 and hour >= 18 and hour < 23:
 			minut += 15
 			gs 'stat'
 			'Kolka catches his breath, then says, "Many thanks, <<$pcs_nickname>>, you helped me a lot." He continues to go about his business.'
 			act 'Leave': gt 'sitrPar'
+		elseif $loc = 'sitrPar' and npc_rel['A34'] >= 80:
+			minut += 15
+			gs 'stat'
+			'"Thanks <<$pcs_nickname>>," he yawns, tucking his member back into his pants. Mumbling, "You''re the best..." he curls back up underneath his blanket and begins to doze off.'
+			act 'Leave': gt 'sitrPar'
 		elseif $loc = 'sitrPar':
 			minut += 15
 			gs 'stat'

+ 116 - 170
locations/brother_voyeur.qsrc

@@ -69,10 +69,8 @@ if $ARGS[0] = 'showertalk1':
 				bro_ass_compliment = rand(1,3)
 				if bro_ass_compliment = 1:
 					act'Continue':gt'brother_voyeur','ass_compliment'
-				elseif pcs_pubes >= 4 or pcs_leghair >= 4:
-					act'Continue':gt'brother_voyeur','shave'
 				else
-					act'Continue':gt'brother_voyeur','dryoff'
+					act'Continue':gt'brother_voyeur','shave'
 				end
 			end
 		end
@@ -82,7 +80,7 @@ if $ARGS[0] = 'showertalk1':
 			'<center><video src="images/shared/home/bathroom/brothershowertalk.mp4"></center>'
 			'	You casually talk to him about his day while you shower. He sits on the toilet seat and faces away from you, awkwardly answering all your questions and queries, but you still see him occasionally stealing glances at your naked body. Not that it bothers you any, as you simply smile to yourself, amused that he thinks he''s still being sneaky.'
 			if pcs_pubes >= 4 or pcs_leghair >= 4:
-				act'Look at your legs':gt'brother_voyeur','shave'
+				act'Continue':gt'brother_voyeur','shave'
 			else
 				act'Finish showering':gt'brother_voyeur','dryoff'
 			end
@@ -93,7 +91,7 @@ if $ARGS[0] = 'showertalk1':
 			'<center><video src="images/shared/home/bathroom/brothershowertalk.mp4"></center>'
 			'	You casually chat with him about how he''s doing in school while you shower. He sits on the toilet seat and faces away from you, awkwardly answering all your questions and queries, but you still see him occasionally stealing glances at your naked body. Not that it bothers you any, as you simply smile to yourself, amused that he thinks he''s still being sneaky.'
 			if pcs_pubes >= 4 or pcs_leghair >= 4:
-				act'Look at your legs':gt'brother_voyeur','shave'
+				act'Continue':gt'brother_voyeur','shave'
 			else
 				act'Finish showering':gt'brother_voyeur','dryoff'
 			end
@@ -104,7 +102,7 @@ if $ARGS[0] = 'showertalk1':
 			'<center><video src="images/shared/home/bathroom/brothershowertalk.mp4"></center>'
 			'	You chat with him about his friends and what he does for fun with them while you shower. He sits on the toilet seat and faces away from you, awkwardly answering all your questions and queries, but you still see him occasionally stealing glances at your naked body. Not that it bothers you any, as you simply smile to yourself, amused that he thinks he''s still being sneaky.'
 			if pcs_pubes >= 4 or pcs_leghair >= 4:
-				act'Look at your legs':gt'brother_voyeur','shave'
+				act'Continue':gt'brother_voyeur','shave'
 			else
 				act'Finish showering':gt'brother_voyeur','dryoff'
 			end
@@ -156,10 +154,8 @@ if $ARGS[0] = 'showertalk2':
 			'	<i>Boys will be boys after all...</i> you muse to yourself, a smile subconsciously turning the corners of your own lips.'
 			if bro_ass_compliment = 1:
 				act'Continue':gt'brother_voyeur','ass_compliment'
-			elseif pcs_pubes >= 4 or pcs_leghair >= 4:
-				act'Continue':gt'brother_voyeur','shave'
 			else
-				act'Continue':gt'brother_voyeur','dryoff'
+				act'Continue':gt'brother_voyeur','shave'
 			end
 		end
 
@@ -168,11 +164,7 @@ if $ARGS[0] = 'showertalk2':
 			'<center><video src="images/shared/home/bathroom/brothershowertalk.mp4"></center>'
 			if brothershowertalk <= 5:
 				'	You casually talk to him about his day while you shower. He sits on the toilet seat and faces away from you, awkwardly answering all your questions and queries, but you still see him occasionally stealing glances at your naked body. Not that it bothers you any, as you simply smile to yourself, amused that he thinks he''s still being sneaky.'
-				if pcs_pubes >= 4 or pcs_leghair >= 4:
-					act'Continue':gt'brother_voyeur','shave'
-				else
-					act'Continue':gt'brother_voyeur','dryoff'
-				end
+				act'Continue':gt'brother_voyeur','shave'
 
 			elseif brothershowertalk > 5:
 				'	He happily talks to you about his day, though he still sits on the toilet facing away. He also still takes a few looks at you now and again but they aren''t as sneaky and they mostly seem to be glances to see your face. <i>Not that his eyes don''t wander downward anyways...</i> you notice with a smile.'
@@ -182,11 +174,7 @@ if $ARGS[0] = 'showertalk2':
 					'	"... but, yeah. It was a pretty good day overall," he finishes, snapping you out of your idle thoughts and bringing you back to the room.'
 					*nl
 					'	"That''s always good to hear!" you reply.'
-					if pcs_pubes >= 4 or pcs_leghair >= 4:
-						act'Continue':gt'brother_voyeur','shave'
-					else
-						act'Continue':gt'brother_voyeur','dryoff'
-					end
+					act'Continue':gt'brother_voyeur','shave'
 
 				elseif brothershowerdaytalk = 2:
 					'	"... so, yeah. Mom wants me to clean up my stuff on the couch, but if I''m going to sleep there anyways, why does it matter?" he asks, snapping you out of your idle thoughts and bringing you back to the room.'
@@ -196,21 +184,13 @@ if $ARGS[0] = 'showertalk2':
 					elseif npc_rel['A29'] < 40:
 						'	"Ugh, I know! Mom is always nagging me about everything! She can be such a pain in the ass sometimes!" you '
 					end
-					if pcs_pubes >= 4 or pcs_leghair >= 4:
-						act'Continue':gt'brother_voyeur','shave'
-					else
-						act'Continue':gt'brother_voyeur','dryoff'
-					end
+					act'Continue':gt'brother_voyeur','shave'
 
 				elseif brothershowerdaytalk = 3:
 					'	"... and dad asked me if I want to help him work on the Gazelle but I don''t know. I''d rather go play football with Zhendos and Mishan," he finishes, snapping you out of your idle thoughts and bringing you back to the room.'
 					*nl
 					'	"It''s good to have fun with your friends but it might also be good to work with dad. It''s a good life skill. Besides, girls love nothing more than a man who knows how to work a car!" you wink at him.'
-					if pcs_pubes >= 4 or pcs_leghair >= 4:
-						act'Continue':gt'brother_voyeur','shave'
-					else
-						act'Continue':gt'brother_voyeur','dryoff'
-					end
+					act'Continue':gt'brother_voyeur','shave'
 				end
 			end
 		end
@@ -220,12 +200,8 @@ if $ARGS[0] = 'showertalk2':
 			'<center><video src="images/shared/home/bathroom/brothershowertalk.mp4"></center>'
 			if brothershowertalk <= 5:
 				'	You casually chat with him about how he''s doing in school while you shower. He sits on the toilet seat and faces away from you, awkwardly answering all your questions and queries, but you still see him occasionally stealing glances at your naked body. Not that it bothers you any, as you simply smile to yourself, amused that he thinks he''s still being sneaky.'
-				if pcs_pubes >= 4 or pcs_leghair >= 4:
-					act'Continue':gt'brother_voyeur','shave'
-				else
-					act'Continue':gt'brother_voyeur','dryoff'
-				end
-
+				act'Continue':gt'brother_voyeur','shave'
+				
 			elseif brothershowertalk > 5:
 				'	He energetically talks to you about school and how it''s going for him, though he still sits on the toilet facing away. He also still takes a few looks at you now and again but they aren''t as sneaky and they mostly seem to be glances to see your face. <i>Not that his eyes don''t wander downward anyways...</i> you notice with a smile.'
 				brothershowerschooltalk = rand(1,3)
@@ -238,42 +214,27 @@ if $ARGS[0] = 'showertalk2':
 					elseif pcs_grades < 50:
 						'	"Blegh! Yeah, you''re right. Math sucks!" you grumble in agreement.'
 					end
-					if pcs_pubes >= 4 or pcs_leghair >= 4:
-						act'Continue':gt'brother_voyeur','shave'
-					else
-						act'Continue':gt'brother_voyeur','dryoff'
-					end
+					
+					act'Continue':gt'brother_voyeur','shave'
 
 				elseif brothershowerschooltalk = 2:
 					'	"... and then he ripped his pants!" he giggles, snapping you out of your idle thoughts and bringing you back to the room. "Isn''t that hilarious?"'
 					*nl
 					'	"Uhh, yeah! That''s pretty funny!" you fake laugh as best you can.'
-					if pcs_pubes >= 4 or pcs_leghair >= 4:
-						act'Continue':gt'brother_voyeur','shave'
-					else
-						act'Continue':gt'brother_voyeur','dryoff'
-					end
+					act'Continue':gt'brother_voyeur','shave'
 
 				elseif brothershowerschooltalk = 3 and brothersexed < 1:
 					'	"... so science class is alright," he says, snapping you out of your idle thoughts and bringing you back to the room. "I''m really having trouble with my anatomy homework though. The diagrams in the book aren''t very good, I don''t understand it."'
 					*nl
 					'	"Hmm. Well maybe I could help you with it sometime? Do something to help you understand it better?"'
 					anatomyhomeworkhelp = 1
-					if pcs_pubes >= 4 or pcs_leghair >= 4:
-						act'Continue':gt'brother_voyeur','shave'
-					else
-						act'Continue':gt'brother_voyeur','dryoff'
-					end
+					act'Continue':gt'brother_voyeur','shave'
 
 				elseif brothershowerschooltalk = 3 and brothersexed >= 1:
 					'	"... so I''m enjoying science a lot more," he says, snapping you out of your idle thoughts and bringing you back to the room. "My grades have gotten better since you started helping me with my homework but I''m still not sure I completely get it..." He hesitates. "Could you maybe... give me another anatomy lesson? Like you did before?" he says, looking at you meaningfully.'
 					*nl
 					'	"I''ll think about it..." you say slyly.'
-					if pcs_pubes >= 4 or pcs_leghair >= 4:
-						act'Continue':gt'brother_voyeur','shave'
-					else
-						act'Continue':gt'brother_voyeur','dryoff'
-					end
+					act'Continue':gt'brother_voyeur','shave'
 				end
 			end
 		end
@@ -283,11 +244,7 @@ if $ARGS[0] = 'showertalk2':
 			'<center><video src="images/shared/home/bathroom/brothershowertalk.mp4"></center>'
 			if brothershowertalk <= 5:
 				'	You chat with him about his friends and what he does for fun with them while you shower. He sits on the toilet seat and faces away from you, awkwardly answering all your questions and queries, but you still see him occasionally stealing glances at your naked body. Not that it bothers you any, as you simply smile to yourself, amused that he thinks he''s still being sneaky.'
-				if pcs_pubes >= 4 or pcs_leghair >= 4:
-					act'Continue':gt'brother_voyeur','shave'
-				else
-					act'Continue':gt'brother_voyeur','dryoff'
-				end
+				act'Continue':gt'brother_voyeur','shave'
 
 			elseif brothershowertalk > 5:
 				'	He cheerfully talks to you about him and his friends and what they get up to together, though he still sits on the toilet facing away. He also still takes a few looks at you now and again but they aren''t as sneaky and they mostly seem to be glances to see your face. <i>Not that his eyes don''t wander downward anyways...</i> you notice with a smile.'
@@ -297,41 +254,25 @@ if $ARGS[0] = 'showertalk2':
 					'	... and then he sprayed milk all over his locker!" he says with a burst of laughter, snapping you out of your idle thoughts and bringing you back to the room. "It was <i>so</i> funny! Hey, are you listening?"'
 					*nl
 					'	"Uhmm, yeah! Of course!" you say, trying to maintain your poker face as best you can while he frowns at you suspiciously.'
-					if pcs_pubes >= 4 or pcs_leghair >= 4:
-						act'Continue':gt'brother_voyeur','shave'
-					else
-						act'Continue':gt'brother_voyeur','dryoff'
-					end
+					act'Continue':gt'brother_voyeur','shave'
 
 				elseif brothershowerfriendtalk = 2:
 					'	"... so the plan is while he''s showering to take his underwear and replace them with girls panties," he says, snapping you out of your idle thoughts and bringing you back into the room. "Zhendos says that I should just steal some of yours out of your drawer but-" he stops dead with wide eyes and the realization of what he just said.'
 					*nl
 					'	"<i>Excuse me?</i> You were planning to do <i>what</i> with my underwear??" you say, sternly staring at him while he twiddles his thumbs and tries to pretend he didn''t say anything.'
-					if pcs_pubes >= 4 or pcs_leghair >= 4:
-						act'Continue':gt'brother_voyeur','shave'
-					else
-						act'Continue':gt'brother_voyeur','dryoff'
-					end
+					act'Continue':gt'brother_voyeur','shave'
 
 				elseif brothershowerfriendtalk = 3:
 					'	"... I wish I had more time to play football with Zhendos and Mishan though," he says, snapping you out of your idle thoughts and bringing you back to the room. "I can''t do anything with them when mom is dragging us to Gadyukino every other weekend."'
 					*nl
 					if seepornofut = 0:
 						'	"It''s okay Kolka," you console him. "Just enjoy the time you have with them. In a couple years mom might not force you to go anymore but you all might end up too busy to hang out."'
-						if pcs_pubes >= 4 or pcs_leghair >= 4:
-							act'Continue':gt'brother_voyeur','shave'
-						else
-							act'Continue':gt'brother_voyeur','dryoff'
-						end
+						act'Continue':gt'brother_voyeur','shave'
 					elseif seepornofut >= 1:
 						'	"Pfft! More like you want more time to watch porn with them!" you laugh scoffingly.'
 						*nl
 						'	"We play football too!" Kolka turns to cry out in protest while you tease him with a silly face and fake jerk off motions. He blushes deeply and quickly turns back to face the wall.'
-						if pcs_pubes >= 4 or pcs_leghair >= 4:
-							act'Continue':gt'brother_voyeur','shave'
-						else
-							act'Continue':gt'brother_voyeur','dryoff'
-						end
+						act'Continue':gt'brother_voyeur','shave'
 					end
 				end
 			end
@@ -374,9 +315,11 @@ if $ARGS[0] = 'brothershowerlook':
 			'	"That''s always good to hear!" you reply.'
 			act'Continue':
 				bro_ass_compliment = rand(1,3)
-				if bro_ass_compliment = 1:gt'brother_voyeur','ass_compliment'
-				if pcs_pubes >= 4 or pcs_leghair >= 4:gt'brother_voyeur','shave'
-				if pcs_pubes < 4 and pcs_leghair < 4:gt'brother_voyeur','dryoff'
+				if bro_ass_compliment = 1:
+					gt'brother_voyeur','ass_compliment'
+				else
+					gt'brother_voyeur','shave'
+				end
 			end
 
 		elseif brothershowerdaytalk = 2:
@@ -386,9 +329,11 @@ if $ARGS[0] = 'brothershowerlook':
 			if npc_rel['A29'] < 40:'	"Ugh, I know! Mom is always nagging me about everything! She can be such a pain in the ass sometimes!" you grumble in agreement.'
 			act'Continue':
 				bro_ass_compliment = rand(1,3)
-				if bro_ass_compliment = 1:gt'brother_voyeur','ass_compliment'
-				if pcs_pubes >= 4 or pcs_leghair >= 4:gt'brother_voyeur','shave'
-				if pcs_pubes < 4 and pcs_leghair < 4:gt'brother_voyeur','dryoff'
+				if bro_ass_compliment = 1:
+					gt'brother_voyeur','ass_compliment'
+				else
+					gt'brother_voyeur','shave'
+				end
 			end
 
 		elseif brothershowerdaytalk = 3:
@@ -397,9 +342,11 @@ if $ARGS[0] = 'brothershowerlook':
 			'	"It''s good to have fun with your friends but it might also be good to work with dad. It''s a good life skill. Besides, girls love nothing more than a man who knows how to work a car!" you wink at him. "It just makes them want to..." you trail off, grabbing your breast with one hand and putting the other between your legs with an open mouth in a silent moan, pretending to masturbate. After a couple seconds of gyrating your hips in the motion, you spread your hands out over your hips and say, "Sploosh." He laughs at your act and gives you a golf clap while you bow in appreciation.'
 			act'Continue':
 				bro_ass_compliment = rand(1,3)
-				if bro_ass_compliment = 1:gt'brother_voyeur','ass_compliment'
-				if pcs_pubes >= 4 or pcs_leghair >= 4:gt'brother_voyeur','shave'
-				if pcs_pubes < 4 and pcs_leghair < 4:gt'brother_voyeur','dryoff'
+				if bro_ass_compliment = 1:
+					gt'brother_voyeur','ass_compliment'
+				else
+					gt'brother_voyeur','shave'
+				end
 			end
 		end
 	end
@@ -421,9 +368,11 @@ if $ARGS[0] = 'brothershowerlook':
 			if pcs_grades < 50:'	"Blegh! Yeah, you''re right. Math sucks!" you grumble in agreement.'
 			act'Continue':
 				bro_ass_compliment = rand(1,3)
-				if bro_ass_compliment = 1:gt'brother_voyeur','ass_compliment'
-				if pcs_pubes >= 4 or pcs_leghair >= 4:gt'brother_voyeur','shave'
-				if pcs_pubes < 4 and pcs_leghair < 4:gt'brother_voyeur','dryoff'
+				if bro_ass_compliment = 1:
+					gt'brother_voyeur','ass_compliment'
+				else
+					gt'brother_voyeur','shave'
+				end
 			end
 
 		elseif brothershowerschooltalk = 2:
@@ -432,9 +381,11 @@ if $ARGS[0] = 'brothershowerlook':
 			'	"Uhh, yeah! That''s pretty funny!" you fake laugh as best you can.'
 			act'Continue':
 				bro_ass_compliment = rand(1,3)
-				if bro_ass_compliment = 1:gt'brother_voyeur','ass_compliment'
-				if pcs_pubes >= 4 or pcs_leghair >= 4:gt'brother_voyeur','shave'
-				if pcs_pubes < 4 and pcs_leghair < 4:gt'brother_voyeur','dryoff'
+				if bro_ass_compliment = 1:
+					gt'brother_voyeur','ass_compliment'
+				else
+					gt'brother_voyeur','shave'
+				end
 			end
 
 		elseif brothershowerschooltalk = 3 and brothersexed = 0:
@@ -444,9 +395,11 @@ if $ARGS[0] = 'brothershowerlook':
 			anatomyhomeworkhelp = 1
 			act'Continue':
 				bro_ass_compliment = rand(1,3)
-				if bro_ass_compliment = 1:gt'brother_voyeur','ass_compliment'
-				if pcs_pubes >= 4 or pcs_leghair >= 4:gt'brother_voyeur','shave'
-				if pcs_pubes < 4 and pcs_leghair < 4:gt'brother_voyeur','dryoff'
+				if bro_ass_compliment = 1:
+					gt'brother_voyeur','ass_compliment'
+				else
+					gt'brother_voyeur','shave'
+				end
 			end
 
 		elseif brothershowerschooltalk = 3 and brothersexed >= 1:
@@ -455,9 +408,11 @@ if $ARGS[0] = 'brothershowerlook':
 			'	"I''ll think about it..." you say slyly.'
 			act'Continue':
 				bro_ass_compliment = rand(1,3)
-				if bro_ass_compliment = 1:gt'brother_voyeur','ass_compliment'
-				if pcs_pubes >= 4 or pcs_leghair >= 4:gt'brother_voyeur','shave'
-				if pcs_pubes < 4 and pcs_leghair < 4:gt'brother_voyeur','dryoff'
+				if bro_ass_compliment = 1:
+					gt'brother_voyeur','ass_compliment'
+				else
+					gt'brother_voyeur','shave'
+				end
 			end
 		end
 	end
@@ -478,9 +433,11 @@ if $ARGS[0] = 'brothershowerlook':
 			'	"Uhmm, yeah! Of course!" you say, trying to maintain your poker face as best you can while he frowns at you suspiciously.'
 			act'Continue':
 				bro_ass_compliment = rand(1,3)
-				if bro_ass_compliment = 1:gt'brother_voyeur','ass_compliment'
-				if pcs_pubes >= 4 or pcs_leghair >= 4:gt'brother_voyeur','shave'
-				if pcs_pubes < 4 and pcs_leghair < 4:gt'brother_voyeur','dryoff'
+				if bro_ass_compliment = 1:
+					gt'brother_voyeur','ass_compliment'
+				else
+					gt'brother_voyeur','shave'
+				end
 			end
 
 		elseif brothershowerfriendtalk = 2:
@@ -489,9 +446,11 @@ if $ARGS[0] = 'brothershowerlook':
 			'	"<i>Excuse me?</i> You were planning to do <i>what</i> with my underwear??" you say, staring at him sternly while he twiddles his thumbs and tries to pretend he didn''t say anything.'
 			act'Continue':
 				bro_ass_compliment = rand(1,3)
-				if bro_ass_compliment = 1:gt'brother_voyeur','ass_compliment'
-				if pcs_pubes >= 4 or pcs_leghair >= 4:gt'brother_voyeur','shave'
-				if pcs_pubes < 4 and pcs_leghair < 4:gt'brother_voyeur','dryoff'
+				if bro_ass_compliment = 1:
+					gt'brother_voyeur','ass_compliment'
+				else
+					gt'brother_voyeur','shave'
+				end
 			end
 
 		elseif brothershowerfriendtalk = 3:
@@ -501,9 +460,11 @@ if $ARGS[0] = 'brothershowerlook':
 				'	"It''s okay Kolka," you console him. "Just enjoy the time you have with them. In a couple years mom might not force you to go anymore but you all might end up too busy to hang out."'
 				act'Continue':
 					bro_ass_compliment = rand(1,3)
-					if bro_ass_compliment = 1:gt'brother_voyeur','ass_compliment'
-					if pcs_pubes >= 4 or pcs_leghair >= 4:gt'brother_voyeur','shave'
-					if pcs_pubes < 4 and pcs_leghair < 4:gt'brother_voyeur','dryoff'
+					if bro_ass_compliment = 1:
+						gt'brother_voyeur','ass_compliment'
+					else
+						gt'brother_voyeur','shave'
+					end
 				end
 
 			elseif seepornofut >= 1:
@@ -513,9 +474,11 @@ if $ARGS[0] = 'brothershowerlook':
 					'	"We play football too!" Kolka protests while you tease him with a silly face and fake jerk off motions.'
 					act'Continue':
 						bro_ass_compliment = rand(1,3)
-						if bro_ass_compliment = 1:gt'brother_voyeur','ass_compliment'
-						if pcs_pubes >= 4 or pcs_leghair >= 4:gt'brother_voyeur','shave'
-						if pcs_pubes < 4 and pcs_leghair < 4:gt'brother_voyeur','dryoff'
+						if bro_ass_compliment = 1:
+							gt'brother_voyeur','ass_compliment'
+						else
+							gt'brother_voyeur','shave'
+						end
 					end
 				elseif pornMagazine > 0:
 					'	"We play football too!" Kolka protests while you tease him with silly face and fake jerk off motions. "Hrmph! You''re one to talk anyways," he grumbles. "I know about that magazine you hide under your bed."'
@@ -527,9 +490,11 @@ if $ARGS[0] = 'brothershowerlook':
 					'	The two of you continue to playfully sling accusations and lewd gestures at each other for the rest of your shower, giggling the whole time.'
 					act'Continue':
 						bro_ass_compliment = rand(1,3)
-						if bro_ass_compliment = 1:gt'brother_voyeur','ass_compliment'
-						if pcs_pubes >= 4 or pcs_leghair >= 4:gt'brother_voyeur','shave'
-						if pcs_pubes < 4 and pcs_leghair < 4:gt'brother_voyeur','dryoff'
+						if bro_ass_compliment = 1:
+							gt'brother_voyeur','ass_compliment'
+						else
+							gt'brother_voyeur','shave'
+						end
 					end
 				end
 			end
@@ -621,6 +586,7 @@ end
 if $ARGS[0] = 'brother_shower_together':
 	brothergrope = rand(0,1)
 	inhib_exp += rand(1,3)
+	brother_shower_times += 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershower.jpg"></center>'
 	'	Kolka clambers into the shower with you, doing his best to get under the water. The bath tub isn''t very big and it''s a tight squeeze for both of you to be in there.'
@@ -734,7 +700,7 @@ if $ARGS[0] = 'brother_shower_together':
 				if brotherbj < 1 and brotherfuck < 1:
 					'	"Hey Kolka, want to see something cool?"'
 					'	"Huh?" He asks, confused. "What is it?"'
-					'	His eyes go wide when you grab him by the cock. Slightly panicked, he looks back at you when you start to kneel.'
+					'	His eyes go wide when as your hand slips up his leg and grips his member. Slightly panicked, he looks back at you when you start to kneel.'
 					'	"It''s my mouth around your cock!"'
 					act'Blow him':gt'brother_voyeur','brother_shower_bj'
 				else
@@ -804,7 +770,7 @@ if $ARGS[0] = 'brother_wash':
 				if brothersex > 0 or brotherfuck > 0 or brotherbj > 0 or brotherwash > 5:
 					act'Have some fun':
 						cla & *clr
-						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/broshowersex2.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 						'	Clean from your shower together, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
 						act'Blow him':gt'brother_voyeur','brother_shower_bj'
 						act'Fuck him':gt'brother_voyeur','brother_shower_fuck'
@@ -823,7 +789,7 @@ if $ARGS[0] = 'brother_wash':
 				if brothersex > 0 or brotherfuck > 0 or brotherbj > 0 or brotherwash > 5:
 					act'Have some fun':
 						cla & *clr
-						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/broshowersex2.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 						'	Clean from your shower together, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
 						act'Blow him':gt'brother_voyeur','brother_shower_bj'
 						act'Fuck him':gt'brother_voyeur','brother_shower_fuck'
@@ -842,7 +808,7 @@ if $ARGS[0] = 'brother_wash':
 				if brothersex > 0 or brotherfuck > 0 or brotherbj > 0 or brotherwash > 5:
 					act'Have some fun':
 						cla & *clr
-						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/broshowersex2.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 						'	Clean from your shower together, you can''t help yourself as you start to get frisky with your brother. His hands slide up your body to caress your breasts. In response, you reach back and start jerking his cock feeling him harden under your touch.'
 						act'Blow him':gt'brother_voyeur','brother_shower_bj'
 						act'Fuck him':gt'brother_voyeur','brother_shower_fuck'
@@ -1926,23 +1892,7 @@ if $ARGS[0] = 'brother_shower_fuck_first':
 			'	"It''s okay Kolka. I''m not mad. Let''s get you into the club. Why don''t I show you the <b>member only</b> entrance?"'
 			'	"Don''t you mean member<b>s</b> only entrance sis?" he asks, confused.'
 			'	"That''s not what I said," you whisper, pushing your hips back and swallowing him straight to the hilt.'
-			act'Continue':
-				guy += 1
-				gs 'arousal', 'vaginal', rand(5,10)
-				gs 'stat'
-				eff_contra = iif(argc > 1,ARGS[1],sexcontra)
-				tmp = func('pregriskeval',eff_contra)
-				cla & *clr
-				'<center><video src="images/characters/pavlovsk/resident/kolka/event/shower/broshower.mp4"></center>'
-				'	Barely giving him any time at all to recover from your sudden start, you immediately break into a hard rhythm, thrusting your hips back and giving it your all. He''s your little brother after all. You should try to make his first time special. Soon enough, you start giving him tips.'
-				'	"Hold my hips so you have more control."'
-				'	"Grab my boobs if you like. Boobs are meant to be grabbed during sex.'
-				'	"Don''t worry if you feel like you''re going to cum. It''s your first time so just let me kn-OW-OW-WOAH!"'
-				'	Kolka''s really getting into it. He pumps in and out you, member slick with your juices. His hands come up to grab your breasts and you gasp when they''re used as leverage to fuck you harder, his cock reaching even deeper inside you. His cock! Oh god! It''s driving you insane! Even though it''s his first time, he''s actually pretty good! Fuck! You should have jumped on his dick ages ago!'
-				'	Several minutes go by with you unable to think about anything except how good fucking your brother feels.'
-				'	Suddenly, you feel him urgently tapping you on the shoulder.'
-				act'Continue':gt'brother_voyeur','brother_fuck_cum'
-			end
+			act'Continue':gt'brother_voyeur','brother_shower_fuck_first3'
 		end
 		act'This doesn''t make you''re special':
 			cla
@@ -1951,24 +1901,8 @@ if $ARGS[0] = 'brother_shower_fuck_first':
 			'	"What do you mean?" he asks, grin disappearing.'
 			'	"There''s been a lot of members in that club." You position his tip at your entrance, lining him up for what you''re about to do next.'
 			'	"A <b>lot.</b> Of <b>members.</b>" On your emphasized words, you thrust your hips backward to take his entire cock inside you in one go, causing your brother to gasp and grab you by the hips to steady himself.'
-			'	"Inside. <b>my ''club.''</b>" you whisper into his ear.'
-			act'Continue':
-				guy += 1
-				gs 'arousal', 'vaginal', rand(5,10)
-				gs 'stat'
-				eff_contra = iif(argc > 1,ARGS[1],sexcontra)
-				tmp = func('pregriskeval',eff_contra)
-				cla & *clr
-				'<center><video src="images/characters/pavlovsk/resident/kolka/event/shower/broshower.mp4"></center>'
-				'	Barely giving him any time at all to recover from your sudden start, you immediately break into a hard rhythm, thrusting your hips back and giving it your all. He''s your little brother after all. You should try to make his first time special. Soon enough, you start giving him tips.'
-				'	"Hold my hips so you have more control."'
-				'	"Grab my boobs if you like. Boobs are meant to be grabbed during sex.'
-				'	"Don''t worry if you feel like you''re going to cum. It''s your first time so just let me kn-OW-OW-WOAH!"'
-				'	Kolka''s really getting into it. He pumps in and out you, member slick with your juices. His hands come up to grab your breasts and you gasp when they''re used as leverage to fuck you harder, his cock reaching even deeper inside you. His cock! Oh god! It''s driving you insane! Even though it''s his first time, he''s actually pretty good! Fuck! You should have jumped on his dick ages ago!'
-				'	Several minutes go by with you unable to think about anything except how good fucking your brother feels.'
-				'	Suddenly, you feel him urgently tapping you on the shoulder.'
-				act'Continue':gt'brother_voyeur','brother_fuck_cum'
-			end
+			'	"Inside. <i>My. <b>''Club.''</i></b>" you whisper into his ear.'
+			act'Continue':gt'brother_voyeur','brother_shower_fuck_first3'
 		end
 	else
 		brotherfuck += 1
@@ -2010,9 +1944,10 @@ if $ARGS[0] = 'brother_shower_fuck_first':
 
 			act'No, I''m a slut':
 				cla
+				brother_knows_not_virgin = 1
 				'	"Nope!" You smile at him. "Sorry to disappoint, but yours is just going to be one more of many different dicks that have been inside my pussy little brother."'
-				'	You''re not really sure why you''re telling him about this, especially with the implication that you''re a huge slut, but there''s no time to think about that as you push your ass towards him and swallow his cock with your pussy.'
-				act'Continue':gt'brother_voyeur','brother_shower_fuck_first2'
+				'	You''re not really sure why you''re telling him about this, especially with the implication that you''re a huge slut, but there''s no time to think about that as you thrust your hips backward to take his entire length inside you in one go. Your brother gasps at the rush of having his cock entirely swallowed by your pussy, grabbing you by the hips to steady himself.'
+				act'Continue':gt'brother_voyeur','brother_shower_fuck_first3'
 			end
 
 			act'Yes, you''re my first time (lie)':
@@ -2079,7 +2014,23 @@ if $ARGS[0] = 'brother_shower_fuck_first2':
 		end
 	end
 end
-
+if $ARGS[0] = 'brother_shower_fuck_first3':
+	guy += 1
+	gs 'arousal', 'vaginal', rand(5,10)
+	gs 'stat'
+	eff_contra = iif(argc > 1,ARGS[1],sexcontra)
+	tmp = func('pregriskeval',eff_contra)
+	cla & *clr
+	'<center><video src="images/characters/pavlovsk/resident/kolka/event/shower/broshower.mp4"></center>'
+	'	Barely giving him any time at all to recover from your sudden start, you immediately break into a hard rhythm, thrusting your hips back and giving it your all. He''s your little brother after all. You should try to make his first time special. Soon enough, you start giving him tips.'
+	'	"Hold my hips so you have more control."'
+	'	"Grab my boobs if you like. Boobs are meant to be grabbed during sex.'
+	'	"Don''t worry if you feel like you''re going to cum. It''s your first time so just let me kn-OW-OW-WOAH!"'
+	'	Kolka''s really getting into it. He pumps in and out you, member slick with your juices. His hands come up to grab your breasts and you gasp when they''re used as leverage to fuck you harder, his cock reaching even deeper inside you. His cock! Oh god! It''s driving you insane! Even though it''s his first time, he''s actually pretty good! Fuck! You should have jumped on his dick ages ago!'
+	'	Several minutes go by with you unable to think about anything except how good fucking your brother feels.'
+	'	Suddenly, you feel him urgently tapping you on the shoulder.'
+	act'Continue':gt'brother_voyeur','brother_fuck_cum'
+end
 
 if $ARGS[0] = 'brother_shower_fuck':
 	broshowerfuck = daystart
@@ -2375,6 +2326,7 @@ end
 if $ARGS[0] = 'brother_shower_fuck_end':
 	cla & *clr
 	dynamic $showerdin
+	brother_shower_times += 1
 	minut += 2
 	gs 'arousal','end'
 	if brotherfuck = 1 and brother_knows_not_virgin >= 1:
@@ -2495,7 +2447,6 @@ if $ARGS[0] = 'brother_shower_fuck_end':
 						'	A sly smile on your face, you step forward to grab him by the cock.'
 						'	"Until next time little brother," you murmur into his ear, giving his dick a hard squeeze. Then, you slap his ass and push him towards the door. "Now, shoo! Before someone catches us in here together."'
 						'	Startled, he does as you say, picking up his clothes and peeking into the hallway to make sure no one is there before slipping out the door.'
-						brotherSex += 1
 						brothervirginlie = 0
 						act'Finish drying off':mirror_steam = hour & gt $loc
 					end
@@ -2531,6 +2482,7 @@ if $ARGS[0] = 'brother_shower_fuck_end':
 				'	"Pfft~! It''s not like I''m gonna marry you or anything like that. You''re still my sister. And I''m still gonna fuck lots of other girls once they start looking my way! But..." he trails off again.'
 				'	"... now we have a bond that other siblings don''t have," you finish. "And no matter what else happens, we''ll carry each other''s virginities for the rest of our lives." He nods.'
 				act'Continue':
+					brotherSex = 9
 					minut += 5
 					gs 'stat'
 					cla & *clr
@@ -2588,7 +2540,6 @@ if $ARGS[0] = 'brother_shower_fuck_end':
 
 				act'Until next time (grab his cock)':
 					cla
-					brotherSex += 1
 					brothervirginlie = 0
 					'	A sly smile on your face, you step forward to grab him by the cock.'
 					'	"Until next time little brother," you murmur into his ear, giving his dick a hard squeeze. Then, you slap his ass and push him towards the door. "Now, shoo! Before someone catches us in here together."'
@@ -2628,16 +2579,11 @@ if $ARGS[0] = 'ass_compliment':
 	'	"Hmm? Sure, what is it Kolka?"'
 	'	"You have a great ass!"'
 	'	Feeling his smile radiating from behind you, you look over your shoulder and give him a grin and a little shake of your ass to show your appreciation for his compliment.'
-	act'Continue':
-		if pcs_pubes >= 4 or pcs_leghair >= 4:
-			gt'brother_voyeur','shave'
-		else
-			gt'brother_voyeur','dryoff'
-		end
-	end
+	act'Continue':gt'brother_voyeur','shave'
 end
 
 if $ARGS[0] = 'shave':
+	if pcs_pubes < 4 or pcs_leghair < 4:gt'brother_voyeur','dryoff'
 	cla & *clr
 	if brothershowerlook = 1:
 		if pcs_leghair > 0 or pcs_pubes > 0:
@@ -2645,7 +2591,7 @@ if $ARGS[0] = 'shave':
 		'	You''re rinsing off when you notice Kolka staring at your legs and what''s between them.'
 		'	"Excuse me?" you ask him pointedly. "Can I help you with something?"'
 		elseif pcs_pubes < 11 and pcs_leghair > 3:
-			'	His lips twisted in thought, he says, "You''re looking kind of stubbly down there." You follow his gaze to look at your legs and pussy. "Aren''t you going to shave?"'
+			'	His lips twisted in thought, he says, "You''re looking kind of stubbly down there." You follow his gaze to Continue and pussy. "Aren''t you going to shave?"'
 		elseif pcs_pubes >= 11 and pcs_pubes < 21 and pcs_leghair > 3:
 			'	His lips twisted in thought, he says, "You''re growing a bit of a bush down there." You follow his gaze to look at your <<$pcdesc_legs>> legs and your trimmed pussy hair. "Looks like your legs are growing grass to match. Aren''t you going to shave?"'
 		elseif pcs_pubes >= 21 and pcs_leghair > 3:
@@ -2811,10 +2757,10 @@ if $ARGS[0] = 'shave':
 					inhib_exp += 1
 					gs 'stat'
 					'<center><video src="images/shared/home/bathroom/shave.mp4"></center>'
-					if pcs_pubes < 11:
+					if pcs_pubes =< 10:
 						'<br>	"Hmm." You think to yourself for a moment. "Maybe you''re right after all," you say and start lathering up your crotch.'
 						'<br>	Kolka stares at you intensely as you carefully remove the bits of stubble from around your pussy.'
-					elseif pcs_pubes > 10:
+					elseif pcs_pubes >= 11:
 						'<br>	"Hmm." You think to yourself for a moment. "Yeah, you''re right. Maybe it''s time to get rid of this bush," you say and start lathering up your crotch.'
 						'<br>	Kolka stares at you intensely as you carefully remove the hair from around your pussy.'
 						'<br>	"Enjoying the show?" you say teasingly. He doesn''t say anything except nod, not looking away for a second. You have to admit, it''s a little bit exciting having someone watch you do this. You might be enjoying this almost as much as your brother is.'

+ 80 - 62
locations/cikl.qsrc

@@ -142,8 +142,6 @@ if coatH[defaultcoat] <= 0: defaultcoat = 0
 !!------------------------------------------------------------------------------------------------------------
 !!	Bimbo
 !!------------------------------------------------------------------------------------------------------------
-!!A Succubus cannot be a Bimbo
-if succubusflag = 1 and bimbo > 0: bimbo -= succublvl * 2
 
 !!Bonus from clothing and shoes
 if succubusflag = 0 and $cheatBimbo ! '<b>ON</b>':
@@ -180,15 +178,89 @@ if bimbolevel = 1: supnatvnesh = 2 & bimbostupidity = (pcs_intel / 6)
 if bimbolevel = 2: supnatvnesh = 4 & bimbostupidity = (pcs_intel / 4)
 if bimbolevel = 3: supnatvnesh = 8 & bimbostupidity = (pcs_intel / 3)
 
+!!A Succubus cannot be a Bimbo
+if succubusflag = 1:
+	if bimbolevel > 0 and bimbo > 0: bimbowithdrawal = 40
+elseif bimbolevel >= 1:
+!!Checks how often sex has occured in the last 24 hours and for drops in bimbo score, for calculating withdrawal
+	bimbo += ((stat['vaginal'] + stat['bj'] + stat['anal']) - snapshotX) - 3
+	if bimbo > snapshotY:
+		bimbowithdrawal = 0
+	else
+		bimbowithdrawal += 1
+	end
+end
+
+if bimbo < 0: bimbo = 0
+snapshotX = (stat['vaginal'] + stat['bj'] + stat['anal'])
+snapshotY = bimbo
+
+!!------------------------------------------------------------------------------------------------------------
+!!	Exhibitionism
+!!------------------------------------------------------------------------------------------------------------
+
+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
+    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
+!!------------------------------------------------------------------------------------------------------------
+
 !!Succubus Level & hunger calcs
 if succubusflag = 1:
 
 	cheatHealth = 1
 	dynamic $cheatmenu['std_cure']
 
-!!	A Succubus cannot be a Bimbo
-	if bimbolevel > 0 and bimbo > 0: bimbowithdrawal = 40
-
 !!	Hunger handling
 	if sucxpsnapshot >= succubxp: succhungry += 1
 	sucxpsnapshot = succubxp
@@ -274,21 +346,6 @@ if succubusflag = 1:
 	end
 end
 
-!!Bimbo second half, after Succubus so changes there can be reflected here if still bimbo and Succubus
-!!Checks how often sex has occured in the last 24 hours and for drops in bimbo score, for calculating withdrawal
-if bimbolevel >= 1:
-	bimbo += ((stat['vaginal'] + stat['bj'] + stat['anal']) - snapshotX) - 3
-	if bimbo > snapshotY:
-		bimbowithdrawal = 0
-	else
-		bimbowithdrawal += 1
-	end
-end
-
-if bimbo < 0: bimbo = 0
-snapshotX = (stat['vaginal'] + stat['bj'] + stat['anal'])
-snapshotY = bimbo
-
 !!------------------------------------------------------------------------------------------------------------
 
 if defcurly = 0 and curly > 0:curly -= 1
@@ -656,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
@@ -876,6 +893,9 @@ if GspravkaT = 1:Gspravka -= 1
 if IvanPodstavaQW = 2 and PodpiskaNeviezd = 30:IvanPodstavaQW = 3
 if IvanPodstavaQW = 2 and PodpiskaNeviezd > 0 and PodpiskaNeviezd < 30:PodpiskaNeviezd += 1
 
+!!remove degradation for inhibition
+inhib_flr = inhib_lvl
+
 gs 'stat_sklattrib', 'daycall'
 
 if dounspell = 1:
@@ -1367,8 +1387,6 @@ elseif mentats_dose > 1:
     pain['head'] += 20 * mentats_dose
     mentats_dose = 0
 end
-if breastpumped = 0 and breastcount > 0: breastcount -= 1
-if breastpumped = 1: breastpumped = 0
 
 !!Appearance base calculation call
 gs 'body_shape', 'basebeautycalc'

+ 3 - 3
locations/clothing.qsrc

@@ -200,10 +200,10 @@ if $ARGS[0] = 'view_clothing_list':
 
 		if $ARGS[1] = 'store':
 			cloc = 1
-		end
-
-		if $ARGS[1] = 'unwanted':
+		elseif $ARGS[1] = 'unwanted':
 			cloc = 2
+		else
+			cloc = 0
 		end
 
 		if $ARGS[2] = 'gm':

+ 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'

+ 5 - 2
locations/down.qsrc

@@ -130,11 +130,14 @@ else
 end
 'The neon green sign of a <<$desc_txt1>> catches your eye. It''s open 8-10 selling magazines and cigarettes for cheap.'
 *nl
-if hour >= 9 and hour <= 20:
+if hour = 8 and minut >= 30:
+	$desc_txt1 = '<a href="exec: minut += 5 & gt ''torgcentr''">The Galeria mall</a>'
+	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 9:00''">Havana Fitness Center</a>'
+elseif hour >= 9 and hour <= 20:
 	$desc_txt1 = '<a href="exec: minut += 5 & gt ''torgcentr''">The Galeria mall</a>'
 	$desc_txt2 = '<a href="exec:gt ''fit'', ''start''">Havana Fitness Center</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''The Galeria mall is closed and will reopen at 9:00''">The Galeria mall</a>'
+	$desc_txt1 = '<a href="exec:msg ''The Galeria mall is closed and will reopen at 8:30''">The Galeria mall</a>'
 	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 9:00''">Havana Fitness Center</a>'
 end
 '<<$desc_txt1>> is front and center in the commercial area. Nearby is a <<$desc_txt2>> which has a swimming pool that can be used for a small fee.'

+ 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)
+			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>'

+ 0 - 208
locations/events.qsrc

@@ -323,213 +323,5 @@ if $ARGS[0] = 'snkayf1':
 	end
 end
 
-!!Centralised flashing location
-!!For flashing events only, do not use for exposure leading to sex
-!!To be used in the following format
-!!gs 'flash_[type]', '[location]', [time]
-!![time] in minutes, default is 5
-!!Available options as follows
-!![type] - bra, butt, full, panties, pussy, tits
-!![location] - indoors, outdoors
-!!eg. gs 'flash_tits', 'outdoors', 15
-!!There is no continue action so you must add this as required
-!!You should add checks for underwear before allowing the player to flash them but a non-event contingency is included
-
-if $ARGS[0] = 'flash_bra':
-	*clr
-	gs 'arousal', 'flashlite', ARGS[2]
-	gs 'arousal', 'end'
-	if PCloSkirt > 0:
-		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/bra/' + rand(1,3) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up your top and expose your bra clad breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/bra/' + rand(1,3) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up your top and expose your bra clad breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
-		end
-	else
-		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/bra/' + rand(1,6) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up your top and expose your bra clad breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/bra/' + rand(1,4) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up your top and expose your bra clad breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
-		end
-	end
-end
-
-if $ARGS[0] = 'flash_butt':
-	*clr
-	gs 'arousal', 'flashlite', ARGS[2]
-	gs 'arousal', 'end'
-	if PCloSkirt > 0:
-		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/butt/' + rand(1,7) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up the back of your skirt to show off your butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back in place, feeling the thrill of excitement running down your spine.'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/butt/' + rand(1,9) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up the back of your skirt to show off your butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back in place, feeling the thrill of excitement running down your spine.'
-		end
-	else
-		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/butt/' + rand(1,6) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull down the back of your pants to show off your butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/butt/' + rand(1,16) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull down the back of your pants to show off your butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
-		end
-	end
-end
-
-if $ARGS[0] = 'flash_full':
-	*clr
-	gs 'arousal', 'flash', ARGS[2]
-	gs 'arousal', 'end'
-	if PCloSkirt > 0:
-		if $ARGS[1] = 'inside':
-			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/full/' + rand(1,5) + '.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/full/hairy' + rand(1,6) + '.jpg"></center>'
-			end
-			'Making sure there are no children around and its not too busy you lift your skirt and top to expose both your pussy and breasts. Most people who see you are shocked but some look at you admiringly. You quickly cover up again enjoying a buzz of excitement.'
-		else
-			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/full/' + rand(1,11) + '.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/full/hairy' + rand(1,10) + '.jpg"></center>'
-			end
-			'Making sure there are no children around and its not too busy you lift your skirt and top to expose both your pussy and breasts. Most people who see you are shocked but some look at you admiringly. You quickly cover up again enjoying a buzz of excitement.'
-		end
-	else
-		if $ARGS[1] = 'inside':
-			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/full/1.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/full/hairy1.jpg"></center>'
-			end
-			'Making sure there are no children around and its not too busy you lower your pants and lift your top to expose both your pussy and breasts. Most people who see you are shocked but some look at you admiringly. You quickly cover up again enjoying a buzz of excitement.'
-		else
-			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/full/' + rand(1,7) + '.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/full/hairy' + rand(1,6) + '.jpg"></center>'
-			end
-			'Making sure there are no children around and its not too busy you lower your pants and lift your top to expose both your pussy and breasts. Most people who see you are shocked but some look at you admiringly. You quickly cover up again enjoying a buzz of excitement.'
-		end
-	end
-end
-
-if $ARGS[0] = 'flash_panties':
-	*clr
-	gs 'arousal', 'flashlite', ARGS[2]
-	gs 'arousal', 'end'
-	if PCloSkirt > 0:
-		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/panty/' + rand(1,4) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you lift the front of your skirt to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/panty/' + rand(1,16) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you lift the front of your skirt to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
-		end
-	else
-		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/panty/1.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull down the front of your pants to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/panty/' + rand(1,6) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull down the front of your pants to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
-		end
-	end
-end
-
-if $ARGS[0] = 'flash_panties_rear':
-	*clr
-	gs 'arousal', 'flashlite', ARGS[2]
-	gs 'arousal', 'end'
-	if PCloSkirt > 0:
-		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/pantyrear/' + rand(1,4) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up your skirt to show off your pantied butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/pantyrear/' + rand(1,16) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up your skirt to show off your pantied. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
-		end
-	else
-		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/pantyrear/1.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull down the back of your pants to show off your panty clad butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/pantyrear/' + rand(1,6) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull down the back of your pants to show off your panty clad butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
-		end
-	end
-end
-
-if $ARGS[0] = 'flash_pussy':
-	*clr
-	gs 'arousal', 'flash', ARGS[2]
-	gs 'arousal', 'end'
-	if PCloSkirt > 0:
-		if $ARGS[1] = 'inside':
-			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/pussy/' + rand(1,7) + '.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/pussy/hairy' + rand(1,7) + '.jpg"></center>'
-			end
-			'You glance around to see who all is in the area, then you pull up the front of your skirt to show off your pussy. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
-		else
-			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/pussy/' + rand(1,13) + '.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/pussy/hairy' + rand(1,6) + '.jpg"></center>'
-			end
-			'You glance around to see who all is in the area, then you pull up the front of your skirt to show off your pussy. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You lower the skirt back and place, feeling the thrill of excitement running down your spine.'
-		end
-	else
-		if $ARGS[1] = 'inside':
-			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/pussy/' + rand(1,4) + '.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/pussy/hairy' + rand(1,3) + '.jpg"></center>'
-			end
-			'You glance around to see who all is in the area, then you pull down the front of your pants to show off your pussy. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
-		else
-			if pcs_pubes <= 20:
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/pussy/' + rand(1,9) + '.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/pussy/hairy' + rand(1,7) + '.jpg"></center>'
-			end
-			'You glance around to see who all is in the area, then you pull down the front of your pants to show off your pussy. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your pants back up, feeling the thrill of excitement running down your spine.'
-		end
-	end
-end
-
-if $ARGS[0] = 'flash_tits':
-	*clr
-	gs 'arousal', 'flash', ARGS[2]
-	gs 'arousal', 'end'
-	if PCloSkirt > 0:
-		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/inside/tits/' + rand(1,8) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up your top and expose your bare breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/tits/' + rand(1,12) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up your top and expose your bare breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
-		end
-	else
-		if $ARGS[1] = 'inside':
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/inside/tits/' + rand(1,8) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up your top and expose your bare breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/tits/' + rand(1,14) + '.jpg"></center>'
-			'You glance around to see who all is in the area, then you pull up your top and expose your bare breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust. You pull your top back down, feeling the thrill of excitement running down your spine.'
-		end
-	end
-end
-
-	
-
-
 --- events ---------------------------------
 

+ 240 - 28
locations/femcyc.qsrc

@@ -3,7 +3,7 @@
 !! I have to initialize the variables somewhere, maybe in preCUST?
 if Luth_Max = 0: LutH_Max = rand(312,360) & !! 13-15 days including ovulation
 if Foch_Max = 0: FocH_Max = rand(312,360) & !! 13-15 days including menstruation
-		
+
 if $ARGS[0] = '':
 	!{Hourly reduction in semen potency}
 	!{First it sets the array index to the first index, then it checks to be sure the array tracking the age is less than 144 hours. If it is 144 hours old, it kills that index, which should shift the index up. If it is less than 144 hours old, it sets a current potency drop. The drop is 2x or 3x regularly, but during ovulation it is only 1x, to represent the better environment from fertile cervical mucus.}
@@ -205,28 +205,231 @@ if $ARGS[0] = '':
 		KILLVAR 'ctemp'
 	end
 
-	if lactate > 0:
-		if lactatemv <= 0:
-			lactatemv = 0
-			if lactatemm < pcs_cupsize*40 and milkgrowday < daystart:
-				lactatemm += 10
-				lactatemv += 10
+
+	!! new milkgrowday function.
+	!! Not lactating yet, but there was milkdemand, meaning someone worked your nipples and breasts.
+	if lactate = 0 and milkoverdemand >= 0 and prolactinlvl >= 0:
+		if milkgrowday < daystart:
+			prolactinlvl += milkoverdemand/200
+			!! as long as your tits are not over 11 growth will happen to them. If you do not pump or no pregnancy happens, no growth will happen.
+			if milkoverdemand = 0 and pregchem = 0 and tits < 11:
+				temp_var = prolactinlvl - 10
+				if temp_var < 0:
+					prolactinlvl = 0
+				end
+				!! if prolactinlvl is sinking too much, the aveoli will deflate and thus the breasts growth is reverted. This only counts for induced lactation. If natural lactation occurs breasts will shrink a bit too, but stay bigger in total.
+				if prolactinlvl < 75 and total_milkinduce_growth > 0:
+					nbsize -= total_milkinduce_growth
+					prolactinlvl -= 10
+					total_milkinduce_growth = 0
+				else
+					prolactinlvl -= 10
+				end
+				milkoverdemand = 0
+				milkgrowday = daystart
+			elseif milkoverdemand > 0 and pregchem = 0 and tits < 11:
+				!! inducing without ever being pregnant
+				if prolactinlvl > 75 and kid <= 0:
+					if total_milkinduce_growth < 8:
+						total_milkinduce_growth += 1 + pumpinggrowth
+						nbsize += 1 + pumpinggrowth
+						pumpinggrowth = 0
+					else
+						pumpinggrowth = 0
+					end
+				!! inducing after being pregnant
+				elseif prolactinlvl > 75 and kid > 0:
+					if total_milkinduce_growth < (total_preg_growth/2):
+						total_milkinduce_growth += 1 + pumpinggrowth
+						nbsize += 1 + pumpinggrowth
+						pumpinggrowth = 0
+					end
+				end
+				milkoverdemand = 0
+			elseif milkoverdemand >= 0 and pregchem > 0 and tits < 11:
+				if prolactinlvl > 75 and pregchem < 3000 and kid <= 0:
+					if total_milkinduce_growth < 8:
+						total_milkinduce_growth += 1 + pumpinggrowth
+						nbsize += 1 + pumpinggrowth
+						pumpinggrowth = 0
+					else
+						pumpinggrowth = 0
+					end
+				!! first breast growth with first pregnancy
+				elseif prolactinlvl >= 75 and pregchem >= 2000 and pregchem < 3000 and kid <= 0:
+					if rand(0,100) > 55:
+						first_preg_growth += 1
+						total_preg_growth += 1
+						if total_preg_growth > total_milkinduce_growth: nbsize += 1
+					end
+				!! there is little chance your breast grow additional sizes if you have more kids.
+				elseif prolactinlvl >= 75 and pregchem >= 2000 and pregchem < 3000 and kid > 0:
+					if first_preg_growth > total_preg_growth:
+						total_preg_growth += 1
+						if total_preg_growth > total_milkinduce_growth: nbsize += 1
+					else
+						if rand(0,100) > 95:
+							total_preg_growth += 1
+							if total_preg_growth > total_milkinduce_growth: nbsize += 1
+						end
+					end
+				!! inducing after being pregnant
+				elseif prolactinlvl > 75 and pregchem =< 3000 and kid > 0:
+					if total_milkinduce_growth < (total_preg_growth/2):
+						total_milkinduce_growth += 1 + pumpinggrowth
+						nbsize += 1 + pumpinggrowth
+						pumpinggrowth = 0
+					end
+				end
+				milkoverdemand = 0
+				milkgrowday = daystart
+			end
+			milkgrowday = daystart
+		else
+			milkgrowday = daystart
+		end
+	elseif lactate > 0 and milkoverdemand => 0 and prolactinlvl >= 0:
+		lactatemm = func('lact_lib','$calc_lactatemm')
+		!! checking if induced or not and if girl went through pregnancy already.
+		if lactateinduced > 0 and kid <= 0:
+			if milkgrowday < daystart:
+				!! first breast growth with first pregnancy
+				if prolactinlvl >= 75 and pregchem >= 2000 and pregchem < 3000 and kid <= 0:
+					if rand(0,100) > 55:
+						first_preg_growth += 1
+						total_preg_growth += 1
+						if total_preg_growth > total_milkinduce_growth: nbsize += 1
+					end
+				end
+				if lactatemm > lactatemv:
+					lactatemv += lactaterate
+					temp_var = lactaterate/100
+					if temp_var <= 0: temp_var = 1
+					pcs_energy -= temp_var
+					if lactatemv > lactatemm: lactatemv = lactatemm
+				end
+				if milkoverdemand > 0 and breastpumped > 0:
+					!! lactationrate growing, so you make more milk the more demand there was in the day before.
+					temp_var = prolactinlvl + milkoverdemand/20
+					if  temp_var > 120:
+						prolactinlvl += milkoverdemand/20
+						!! uppon reaching a specific limit, the lactationrate will grow slower. Human body limits etc... you know
+						if lactaterate > 3500:
+							lactaterate += 5*(prolactinlvl/200)
+						elseif lactaterate > 6000:
+							lactaterate += prolactinlvl/200
+						else
+							lactaterate += 10*(prolactinlvl/200)
+						end
+						prolactinlvl = 100
+					else
+						prolactinlvl = 100
+					end
+					'Your breasts tingle a bit more from milkproduction.'
+				elseif milkoverdemand = 0 and breastpumped > 0:
+					prolactinlvl = 100
+				elseif milkoverdemand = 0 and breastpumped = 0:
+					if lactaterate > 0 and pregchem >=0:
+						temp_var = lactaterate/4
+						if temp_var < 1:temp_var = 0
+						lactaterate = temp_var
+						'Your breasts tingle a little less from milkproduction.'
+					elseif lactaterate = 0 and pregchem < 1000:
+						lactate = 0
+						lactateinduced = 0
+						nbsize -= total_milkinduce_growth
+						'You notice that you stopped lactating.'
+					elseif lactaterate = 0 and pregchem >= 1000:
+						lactaterate = 1
+					else
+						lactaterate = 0
+					end
+				end
+				milkgrowday = daystart
+				milkoverdemand = 0
+				breastpumped = 0
+			else
+				milkgrowday = daystart
+				if lactatemm >= lactatemv:
+					lactatemv += lactaterate
+					if lactatemv > lactatemm:
+						lactatemv = lactatemm
+						lact_engorgement += 1
+						if lact_engorgement > 2: lactatemess += 1
+					end
+				end
+			end
+			milkgrowday = daystart
+		else
+			if milkgrowday < daystart:
+				if lactatemm > lactatemv:
+					lactatemv += lactaterate
+					temp_var = lactaterate/100
+					if temp_var <= 0: temp_var = 1
+					pcs_energy -= temp_var
+					if lactatemv > lactatemm: lactatemv = lactatemm
+				end
+				if milkoverdemand > 0 and breastpumped > 0:
+					!! lactationrate growing, so you make more milk the more demand there was in the day before.
+					temp_var = prolactinlvl + milkoverdemand/10
+					if  temp_var > rand(150,200):
+						prolactinlvl += milkoverdemand/20
+						!! uppon reaching a specific limit, the lactationrate will grow slower. Human body limits etc... you know :D
+						if lactaterate > 3500:
+							lactaterate += 5*(prolactinlvl/200)
+						elseif lactaterate > 6000:
+							lactaterate += prolactinlvl/200
+						else
+							lactaterate += 10*(prolactinlvl/200)
+						end
+						prolactinlvl = 100
+					else
+						prolactinlvl = 100
+					end
+					'Your breasts tingle a bit more from milkproduction.'
+				elseif milkoverdemand = 0 and breastpumped > 0:
+					prolactinlvl = 100
+				else
+					if lactaterate > 0 and pregchem >= 0:
+						temp_var = lactaterate/8
+						if temp_var < 1:temp_var = 0
+						lactaterate = temp_var
+						milkoverdemand = 0
+						'Your breasts tingle a little less from milkproduction.'
+					elseif lactaterate = 0 and pregchem < 1000:
+						lactate = 0
+						lactateinduced = 0
+						if total_milkinduce_growth > 0: nbsize -= total_milkinduce_growth
+						if total_preg_growth > 0:
+							nbsize -= total_preg_growth
+							nbsize += first_preg_growth/2
+						end
+						total_milkinduce_growth = 0
+						milkoverdemand = 0
+						'You stopped lactating.'
+					elseif lactaterate = 0 and pregchem >= 1000:
+						lactaterate = 1
+					else
+						lactaterate = 0
+					end
+				end
 				milkgrowday = daystart
-			elseif milkgrowday < daystart:
-				if rand(0,30) = 0: pcs_cupsize += 1
+				milkoverdemand = 0
+				breastpumped = 0
+			else
 				milkgrowday = daystart
-				lactatemv += 10
+				if lactatemm >= lactatemv:
+					lactatemv += lactaterate
+					if lactatemv > lactatemm:
+						lactatemv = lactatemm
+						lact_engorgement += 1
+						if lact_engorgement > 2: lactatemess += 1
+					end
+				end
 			end
-		elseif lactatemv < lactatemm:
-			lactatemv += lactatemm/20
-		elseif lactatemv = lactatemm and milkgrowday < daystart:
 			milkgrowday = daystart
-			lactatemm -= 10
-			lactatemv -= 10
-			if rand(0,90) = 0: pcs_cupsize -= 1
-		elseif lactatemv > lactatemm:
-			lactatemv = lactatemm
 		end
+		milkgrowday = daystart
 	end
 
 	if cycle <= 0:
@@ -276,9 +479,9 @@ if $ARGS[0] = 'cyc1':
 		if rand(0,9) = 0: EggRH += 1
 		FocH += 1
 		temprand = rand(0,9) - sterileov + tempovbonus
-		if temprand < 0: 
+		if temprand < 0:
 			EggRH -= 1
-		elseif temprand > 9: 
+		elseif temprand > 9:
 			EggRH += 1
 		end
 	else
@@ -316,9 +519,9 @@ if $ARGS[0] = 'cyc2':
 		cum_total = 0
 !!{Compute array of unique fathers known to PC and another two arrays of unique total fathers and their individual sperm totals from all entries in cumarrcpt for that father. Also tally all cum present.}
 		:FatherCumAnalyze
-			!! If the current DNA is new (no occurence in the womb array), it is added to the end of $wombDNA array, and added the amount of cum to the end of cumamount array. 
+			!! If the current DNA is new (no occurence in the womb array), it is added to the end of $wombDNA array, and added the amount of cum to the end of cumamount array.
 			!! If exists, just increase the amount of cum in the womb.
-			
+
 			!! $wombDNA: sperm in womb potent enough to cause pregnancy
 			!! wombAmount: how potent is the sperm of a guy
 			!! $wombName: the name of the NPC
@@ -328,7 +531,7 @@ if $ARGS[0] = 'cyc2':
 				$wombDNA[y] = $npc_dna[$cumarrnam[can_idx]]
 				wombAmount[y] = cumarrcpt[can_idx]
 				$wombName[y] = $cumarrnam[can_idx]
-				
+
 			else
 				!! This DNA is in the womb, but does it belong to the same guy?
 				x = 0
@@ -346,9 +549,9 @@ if $ARGS[0] = 'cyc2':
 				killvar 'z'
 			end
 			killvar 'y'
-			
+
 			if cumarrkno[can_idx] = 1 and arrpos('$wombpotfath', $cumarrnam[can_idx]) < 0:$wombpotfath[arrsize('$wombpotfath')] = $cumarrnam[can_idx]
-			
+
 			!! If the guy is a known/possible element (PC know about the sex, it was actual sex, condom/pill was not used or condom was broken, etc.), he can be considered as father.
 			if instr('14570',str(cumarrcon[can_idx])) > 0 and cumarrdel[can_idx] = 0 and cumarrkno[can_idx] >= 0:
 				!! If guy is recorded already, increase his cumtime, else record him for the first time.
@@ -359,9 +562,9 @@ if $ARGS[0] = 'cyc2':
 					cumtime[arrpos('$cumfthname', $cumarrnam[can_idx])] += 1
 				end
 			end
-			
+
 			cum_total += cumarrcpt[can_idx]
-			
+
 		if can_idx < can_sz:can_idx += 1 & jump 'FatherCumAnalyze'
 
 		!! setting the default believed father if there is no difficult choice or there is no choice
@@ -716,11 +919,20 @@ if $ARGS[0] = 'preg':
 			'You begin lactating'
 			lactate = 1
 			lactatemv = 0
-			lactatemm = 100
+			lactatemm = func('lact_lib','$calc_lactatemm')
+			lacaterate = 10
+			prolactinlvl = 150
 		else
 			if lactate < 1: lactate = 1
 		end
 	end
+	if PregChem > 1000:
+		if prolactinlvl < 100 and lactate <= 0:
+			if rand(0,100) > 50:
+				prolactinlvl +=1
+			end
+		end
+	end
 	if PregChem > 2203:
 		if pregchem > 2853 or kid > 0:
 			if rand(0,7) = 0: dynamic $d_pregmovement

+ 54 - 49
locations/foto.qsrc

@@ -572,7 +572,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
@@ -723,44 +723,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.'
+				'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
 
@@ -801,7 +804,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.'
@@ -809,24 +812,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>'
@@ -836,13 +840,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>'
@@ -858,7 +863,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>'
@@ -959,7 +964,7 @@ if $ARGS[0] = 'practicemodel':
 					mdlng_exp += rand(3,5)
 					fashionshoot = rand(1,4)
 					gs 'stat'
-					if fashionshoot <= 2:'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion<<rand(1,2>>.mp4"></video></center>'
+					if fashionshoot <= 2:'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion<<rand(1,2)>>.mp4"></video></center>'
 					if fashionshoot >= 3 and fashionshoot < 5:'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fashion<<rand(1,3)>>.jpg"></center>'
 					if fashionshoot < 5:'	You dress up in the latest in fashion wear and spend the next two hours sexily posing for the photographer.'
 					if fashionshoot = 5:

+ 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

+ 16 - 15
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.'
@@ -167,24 +167,25 @@ if $ARGS[0] = 'teacher_greet':
 						pcs_horny += 3
 						act 'Continue': gt 'gschool_lessons', 'morning'
 					end
-					if $pantyworntype = 'none':
-						if pcs_inhib > 35:
+					if pcs_inhib > 35:
+						if $pantyworntype = 'none':
 							act 'Show more':
 								*clr & cla
-								exhibition_exp += 2
-								'<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.'
-								'"Anatoly Evgenievich, but it''s just us. I always feel safe when you are around." you reply, standing up.'
+								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.'
 								'The teacher gives you a lecture on how to properly pick up books from the floor, then you both leave, not saying a word more to each other.'
 								act 'Continue': gt 'gschool_lessons', 'morning'
 							end
 						else
 							act 'Show more':
-								exhibition_exp += 3
-								'<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.'
+								*clr & cla
+								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.'
+								'"Anatoly Evgenievich, but it''s just us. I always feel safe when you are around." you reply, standing up.'
 								'The teacher gives you a lecture on how to properly pick up books from the floor, then you both leave, not saying a word more to each other.'
 								act 'Continue': gt 'gschool_lessons', 'morning'
 							end
@@ -459,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..."'
@@ -490,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'

+ 2 - 2
locations/gschool_lessons.qsrc

@@ -2711,7 +2711,7 @@ if $ARGS[0] = 'postphys':
 					zverevaQW = 3
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/sex/school/chcoachbj.jpg"></center>'
-					'You open the door and enter Mr. Pavlovich''s room. Christine is startled, jumping up from her kneeling position and desperately wiping her mouth while your teacher quickly stuffs his erection back into his shorts. "Miss <<$pcs_lastname>>, has no one taught you you should knock!? Me and Christina were just discussing some important matters!" he exclaims, pretending to be insulted by your sudden intrusion.'
+					'You open the door and enter Mr. Pavlovich''s room. Christina is startled, jumping up from her kneeling position and desperately wiping her mouth while your teacher quickly stuffs his erection back into his shorts. "Miss <<$pcs_lastname>>, has no one taught you you should knock!? Me and Christina were just discussing some important matters!" he exclaims, pretending to be insulted by your sudden intrusion.'
 					*nl
 					'You can''t believe he''s even trying! You tell him just that, "Christina was using her mouth, but it certainly wasn''t for talking! You''re letting her suck you off so she can go to the regional competition instead of me!"'
 					*nl
@@ -2943,7 +2943,7 @@ if $ARGS[0] = 'dress':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic<<rand(1,3)>>.jpg"></center>'
-		'While you are still naked, you hear a couple of girls giggling. You turn to look at them, but they are not looking at you. Confused, you follow their collective gaze and see Christina standing their with her phone out. Glancing back at them, you see them looking at you and giggling again - obviously, something happened that you missed; something that they thought was funny. You wonder what it was.'
+		'While you are still naked, you hear a couple of girls giggling. You turn to look at them, but they are not looking at you. Confused, you follow their collective gaze and see Christina standing there with her phone out. Glancing back at them, you see them looking at you and giggling again - obviously, something happened that you missed; something that they thought was funny. You wonder what it was.'
 		'You can choose another outfit while you''re here.'
 	else
 		*clr & cla

+ 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>'

+ 11 - 11
locations/gschool_socialchg.qsrc

@@ -153,7 +153,7 @@ if $ARGS[0] = 'nerd':
 	cla & *clr
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinnerd.jpg"></center>'
-	'As you walk down the school hallway, you stop at your locker. You sense someone standing next to you and you turn to see Artem, Feofan, Petka, Gerasim, Zinadia, and Julia there. They give you friendly smiles. Artem speaks "Hey <<$pcs_nickname>>, we have been talking and we like you. We were wondering if you would like to come hang out with us at our game night?" They seem to be waiting on your response.'
+	'As you walk down the school hallway, you stop at your locker. You sense someone standing next to you and you turn to see Artem, Feofan, Petka, Gerasim, Zinaida, and Julia there. They give you friendly smiles. Artem speaks "Hey <<$pcs_nickname>>, we have been talking and we like you. We were wondering if you would like to come hang out with us at our game night?" They seem to be waiting on your response.'
 	act 'Yes':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinnerd.jpg"></center>'
@@ -302,23 +302,23 @@ if $ARGS[0] = 'nerd game night':
 	'As you take your seat Feofan tells you this incredible background story as he builds up the game world so you can be fully immersed. You''re handed a handbook and a pencil as he continues on explaining what the game is all about.'
 	'You hear a couple of sighs as Feofan passionately continues on. "Why does it always end up like this? Let''s get on with the game already!" Petka exclaims.'
 
-	grupvalue[3] + 2
+	grupvalue[3] += 2
 	gs 'gschool_socialchg', 'group_rel_change','nerds', 1
 	gs 'stat'
 
 	act 'Pick a character':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/character.jpg"></center>'
-		'It seems that Feofan has created two different characters for you to pick. One is a rouge which uses her beautiful looks, charm, and agility to get what she wants, while the other one is a wizard character that uses her intelligence and mystical abilities to rain down death and destruction with magic.'
+		'It seems that Feofan has created two different characters for you to pick. One is a rogue which uses her beautiful looks, charm, and agility to get what she wants, while the other one is a wizard character that uses her intelligence and mystical abilities to rain down death and destruction with magic.'
 		'"Before we begin you need to pick out a character you want to use <<$pcs_nickname>>." Feofan tells you.'
-		'It doesn''t take long before the boys begin to argue for you to pick the rouge, "We''re currently missing a character that has lots of social skills so please pick her."'
+		'It doesn''t take long before the boys begin to argue for you to pick the rogue, "We''re currently missing a character that has lots of social skills so please pick her."'
 		'The girls sigh loudly, "Don''t listen to them, they just want a sexy character in their party. Pick the wizard instead and you''ll be of more help to the group."'
 		gs 'stat'
 
-		act 'Pick the rouge':
+		act 'Pick the rogue':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/rogue.jpg"></center>'
-			'You fall under the guys pressure and decide on the rouge. "Great choice, <<$pcs_nickname>>!" Petka says. "If we''re ever short on gold we can use your character to earn us some money while in the town." Petka continues on while the other boys start to laugh.'
+			'You fall under the guys pressure and decide on the rogue. "Great choice, <<$pcs_nickname>>!" Petka says. "If we''re ever short on gold we can use your character to earn us some money while in the town." Petka continues on while the other boys start to laugh.'
 			gs 'stat'
 			npc_rel['A2'] += 1
 			npc_rel['A6'] += 1
@@ -329,7 +329,7 @@ if $ARGS[0] = 'nerd game night':
 		act 'Pick the wizard':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/wizard.jpg"></center>'
-			'You decide to follow the girls advice and pick the wizard. "I''m glad you decided to listen to us." Julia happily says. "We can build your character to be a wreck stuff." she continues on while Zinadia nods approvingly.'
+			'You decide to follow the girls advice and pick the wizard. "I''m glad you decided to listen to us." Julia happily says. "We can build your character to be a wreck stuff." she continues on while Zinaida nods approvingly.'
 			minut += 30
 			gs 'stat'
 			npc_rel['A142'] += 1
@@ -345,7 +345,7 @@ if $ARGS[0] = 'nerd game night':
 		killvar '$Game_on'
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/playing.jpg"></center>'
-		'Feofan clears his throat, "Now then, the last time we stopped at the event where Zinadia was supposed to make her move."'
+		'Feofan clears his throat, "Now then, the last time we stopped at the event where Zinaida was supposed to make her move."'
 		'Artem sighs deeply, "Do we need to have this discussion again? It''s obvious that we should attack the dragon. After all she is the mighty warrior and our tank."'
 		'Gerasim looks a bit irritated, "We should buff the warrior first before taking on the dragon. It''s a more sound strategy."'
 		'The whole room erupts in a frenzy, everyone is talking over each other to get their point across... Feofan tries to calm everyone down but it''s futile, the situation is out of control. After a while they decide that they should vote on what to do next.'
@@ -378,7 +378,7 @@ if $ARGS[0] = 'nerd game night':
 		act 'Side with no one':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/gamenight.jpg"></center>'
-			'You excuse yourself as you explain that it wouldn''t be fair for you to take this kind of decision as you''re new at this and don''t even know how tought a dragon is, though it sounds dangerous.'
+			'You excuse yourself as you explain that it wouldn''t be fair for you to take this kind of decision as you''re new at this and don''t even know how tough a dragon is, though it sounds dangerous.'
 			'The rest of the group seem to accept that as they go back to bickering about what to do next.'
 			minut += 30
 			gs 'stat'
@@ -1700,8 +1700,8 @@ if $ARGS[0] = 'gopnik slut':
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/oldschool/gophangout/slut/4.jpg"></center>'
 						'With that taken care of Vitek lets go of you and walks away. The music starts back up, plastic cups are passed around and the vodka and other drinks are shared. You stay just as you are as the party happens around you, with your ass and pussy on full display. Yet it seems most people are not paying a lot of attention to you, at least not yet. Occasionally someone takes a look or slaps your ass, but mostly they ignore you and just have a party. Maybe this won''t be so bad after all.'
-						gs 'arousal', 'flash_ass', 5, 'group', 'sub', 'humiliation', 'exhibitionism'
-						gs 'arousal', 'flash_pussy', -5, 'group', 'sub', 'humiliation'
+						gs 'arousal', 'flash', 5, 'group', 'sub', 'humiliation', 'exhibitionism'
+						gs 'arousal', 'flash', -5, 'group', 'sub', 'humiliation'
 						gs 'stat'
 
 						act 'Learning your place':

+ 8 - 8
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,10 +149,10 @@ 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 'events', 'flash_tits', 'outdoors', 5
+		gs 'exhibitionism', 1
+		gs 'flash', 'tits', 'outdoors', 5
 		gs 'stat'
 
 		act 'Continue': gt 'gskver'
@@ -161,12 +161,12 @@ 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 'events', 'flash_pussy', 'outdoors', 5
+		gs 'exhibitionism', 3
+		gs 'flash', 'pussy', 'outdoors', 5
 		gs 'stat'
 
 		act 'Continue': gt 'gskver'

+ 28 - 22
locations/husb.qsrc

@@ -16,7 +16,32 @@ CLOSE ALL
 	end
 	'<<$husb_loc>>'
 !! {end}
-$d_husb_discription = {
+
+if $ARGS[0] = 'start':
+	cls
+	cla
+	gs'stat'
+	'<center><B><font color = maroon><<$husName>></font></B></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/<<HusbPic>>.jpg"></center>'
+	gs 'husb', 'husb_discription'
+	gs 'husb', 'husb_action'
+
+	if $clothingworntype = 'nude':
+		if $braworntype = 'none' and $pantyworntype = 'none':
+			'Your husband, seeing you naked, says - "You are very beautiful."'
+		else
+			'Your husband smiles, "It''s always nice to see you in your underwear honey."'
+		end
+	end
+
+	act '<B>Move away</B>':gt $loc, $metka
+
+	if husbandsexday < 4:
+		act 'Sex with your husband':gt'husbsex','room'
+	end
+end
+
+if $ARGS[0] = 'husb_discription':
 	if birthyear < husb_birth_year:
 		age_diff = husbAge - age
 		$h_age = '<<$husName>> was born in <<husb_birth_year>>, he is <<husbAge>> years old. He is <<age_diff>> years older than you.'
@@ -33,9 +58,9 @@ $d_husb_discription = {
 	if husband>=60 and husband<80:'You have a good relationship with your husband.'
 	if husband>=80:'You have a great relationship with your husband.'
 	''
-}
+end
 
-$d_husb_action = {
+if $ARGS[0] = 'husb_action':
 	if $loc = 'korr':$husb_action = ''
 	if $loc = 'bedr':
 		if hour > 22 or hour < 7: $husb_action = 'Your husband <<$husName>> is lying in bed, eyes open. "What do you want? It is late, go to sleep."'
@@ -49,26 +74,7 @@ $d_husb_action = {
 		if hour = 17 or hour = 7:$husb_action = '<<$husName>> is sitting at the kitchen table.'
 	end
 	'<<$husb_action>>'
-}
-
-if $ARGS[0] = 'start':
-	cls
-	cla
-	gs'stat'
-	'<center><B><font color = maroon><<$husName>></font></B></center>'
-	'<center><img <<$set_imgh>> src="images/characters/shared/<<HusbPic>>.jpg"></center>'
-	dynamic $d_husb_discription
-	dynamic $d_husb_action
-
-	if nude = 1:'Your husband, seeing you naked, says - "You are very beautiful."'
-
-	act '<B>Move away</B>':gt $loc, $metka
-
-	if husbandsexday < 4:
-		act 'Sex with your husband':gt'husbsex','room'
-	end
 end
 
-
 --- husb ---------------------------------
 

+ 44 - 40
locations/kafe2.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'toilet':
 	end
 
 	act 'Leave':gt 'kafe', 'workPred'
-	
+
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 
@@ -122,7 +122,7 @@ if $ARGS[0] = 'givi':
 						'You bend down behind the bar, out of view of the customers, kneel before Givi and take out his member.'
 						gs 'bdsex', 'autobj'
 						'Givi grabs you hard by the hair and pulls your mouth deeper onto his cock.'
-						
+
 						gs 'arousal', 'bj', 10, 'sub'
 						gs 'stat'
 
@@ -140,7 +140,7 @@ if $ARGS[0] = 'givi':
 
 							gs 'arousal', 'end'
 							gs 'stat'
-							
+
 							act 'Move away':gt 'kafe', 'workPred'
 						end
 					end
@@ -213,7 +213,7 @@ if $ARGS[0] = 'ashot':
 
 				if Ashotrand > 20:
 					'"You''re a cool bitch" says Ashot grabbing your ass.'
-					
+
 					gs 'arousal', 'foreplay', 10, 'sub'
 					gs 'stat'
 
@@ -242,7 +242,7 @@ if $ARGS[0] = 'ashot':
 
 								gs 'arousal', 'anal', 10, 'sub'
 								gs 'stat'
-						
+
 								act 'Moan':
 									*clr
 									cla
@@ -258,7 +258,7 @@ if $ARGS[0] = 'ashot':
 
 									'<center><img <<$set_imgh>> src="images/shared/sex/cum/analcreampie/kafeanpie.jpg"></center>'
 									'Ashot leans forward thrusting his cock as deeply as possible.'
-									
+
 									gs 'arousal', 'anal', 10, 'sub'
 									gs 'stat'
 
@@ -281,7 +281,7 @@ if $ARGS[0] = 'ashot':
 
 							gs 'arousal', 'anal', 10, 'sub'
 							gs 'stat'
-									
+
 							act 'Moan':
 								*clr
 								cla
@@ -294,7 +294,7 @@ if $ARGS[0] = 'ashot':
 
 								'<center><img <<$set_imgh>> src="images/shared/sex/cum/analcreampie/kafeanpie.jpg"></center>'
 								'Ashot leans forward thrusting his cock as deeply as possible.'
-								
+
 								gs 'arousal', 'anal', 10, 'sub'
 								gs 'stat'
 
@@ -313,20 +313,20 @@ if $ARGS[0] = 'ashot':
 				end
 			elseif giviSex = 0 and Ashotsex > 0:
 				'"Sexy girl, with your lovely juicy ass, my dick still remembers skewering it." Says Ashot grabbing your ass.'
-				
+
 				gs 'arousal', 'foreplay', 10, 'sub'
 				gs 'stat'
-									
+
 			end
 		end
 	else
 		'Ashot is putting away his cooking equipment, getting ready to go.'
-		
+
 	end
 
 	gs 'arousal', 'end'
 	gs 'stat'
-		
+
 	act 'Move away':gt 'kafe', 'workPred'
 end
 
@@ -626,7 +626,7 @@ if $ARGS[0] = 'margoroom2':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/beast/zoo/margo6.jpg"></center>'
 		'Margot leans towards the male and shifts to an excellent position to start sucking him. Finally the member of the dog is alert.'
-		
+
 		gs 'arousal', 'voyeur', 15, 'beast'
 		gs 'stat'
 
@@ -647,7 +647,7 @@ if $ARGS[0] = 'margoroom2':
 			gs 'arousal', 'voyeur', 15, 'beast'
 			gs 'arousal', 'end'
 			gs 'stat'
-		
+
 			act 'Walk into the shower with Margaret':gt 'kafe2', 'margoshower'
 		end
 	end
@@ -662,7 +662,7 @@ if $ARGS[0] = 'margoshower':
 
 	gs 'arousal', 'kiss', 15, 'lesbian'
 	gs 'stat'
-		
+
 	act '<font color="magenta">Have her lick your nipples</font>':
 		cls
 
@@ -671,19 +671,21 @@ if $ARGS[0] = 'margoshower':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/beast/zoo/margo2.jpg"></center>'
 		'Margaret takes your swollen nipples into her mouth. She begins to lick them and their sharp little edges'
-		
+
 		gs 'arousal', 'foreplay', 15, 'lesbian', 'dom'
 		gs 'stat'
-	
+
 		if lactate = 1:
 			'You feel your breasts let down, as Margaret continues to suck on your nipples'
-			minut += (lactatemv/100)
-			if lactatemv > 800:
+			temp_var = lactatemv + lactaterate
+			if tempvar > 8000:
+				milkedvolume = breastmilkvolume = func('lact_lib','$get_breastmilk', 0, 60)
 				'She sucks for a long while, drinking a full belly of your ample milk.'
-				lactatemv = 0
+
 			else
+				milkedvolume = breastmilkvolume = func('lact_lib','$get_breastmilk', 0, 20)
 				'She empties your breasts, and then smiles at you.'
-				lactatemv = 0
+
 			end
 		end
 		act 'Carry her out':gt 'korr'
@@ -697,7 +699,7 @@ if $ARGS[0] = 'margoshower':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/beast/zoo/margo3.jpg"></center>'
 		'Margaret kneels down and starts to lick your pussy. Her tongue makes your body tingle with a wave of pleasure.'
-		
+
 		gs 'arousal', 'cuni', 15, 'lesbian', 'dom'
 		gs 'stat'
 
@@ -717,9 +719,9 @@ if $ARGS[0] = 'margoshower':
 		gs 'arousal', 'anal_finger', 15, 'lesbian', 'dom'
 		minut -= 15
 		gs 'stat'
-	
+
 		if pcs_horny >= 99:pcs_horny = 0 & orgasm += 1 & 'You covered orgasm.'
-		
+
 		$orgasm_or = 'yes'
 		gs 'stat'
 
@@ -735,13 +737,13 @@ if $ARGS[0] = 'margoshower':
 
 				gs 'arousal', 'anal_fist', 15, 'lesbian'
 				gs 'stat'
-	
+
 				if pcs_horny >= 90:pcs_horny = 0 & analorgasm += 1 & 'You covered orgasm.'
 
 				$orgasm_or = 'yes'
 				gs 'arousal', 'end'
 				gs 'stat'
-				
+
 				act 'Carry her out':gt 'korr'
 			end
 		end
@@ -755,7 +757,7 @@ if $ARGS[0] = 'margoroom3':
 
 	gs 'arousal', 'kiss', 15, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Have her lick your nipples':
 		cls
 		if MargoSex = 0:MargoSex = 1 & girl += 1
@@ -763,19 +765,21 @@ if $ARGS[0] = 'margoroom3':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/beast/zoo/margo2.jpg"></center>'
 		'Margaret takes your swollen nipples into her mouth. She begins to lick and nibble on them with her sharp little teeth'
-		
+
 		gs 'arousal', 'foreplay', 15, 'lesbian', 'dom'
 		gs 'stat'
-		
+
 		if lactate = 1:
 			'You feel your breasts let down, as Margaret continues to suck on your nipples'
-			minut += (lactatemv/100)
-			if lactatemv > 800:
+			temp_var = lactatemv + lactaterate
+			if tempvar > 8000:
+				milkedvolume = breastmilkvolume = func('lact_lib','$get_breastmilk', 0, 60)
 				'She sucks for a long while, drinking a full belly of your ample milk.'
-				lactatemv = 0
+
 			else
+				milkedvolume = breastmilkvolume = func('lact_lib','$get_breastmilk', 0, 20)
 				'She empties your breasts, and then smiles at you.'
-				lactatemv = 0
+
 			end
 		end
 		act 'Walk into the room':gt 'kafe2', 'margoroom2'
@@ -789,12 +793,12 @@ if $ARGS[0] = 'margoroom3':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/beast/zoo/margo3.jpg"></center>'
 		'Margaret kneels down and starts to lick your pussy. Her tongue makes your body tingle with a wave of pleasure.'
-		
+
 		gs 'arousal', 'cuni', 15, 'lesbian', 'dom'
 		gs 'stat'
 
 		if pcs_horny >= 90:pcs_horny = 0 & orgasm += 1 & 'You have an orgasm.'
-		
+
 		$orgasm_or = 'yes'
 		gs 'stat'
 
@@ -811,12 +815,12 @@ if $ARGS[0] = 'margoroom3':
 
 		gs 'arousal', 'cuni', 15, 'lesbian', 'dom'
 		gs 'stat'
-		
+
 		if pcs_horny >= 99:pcs_horny = 0 & orgasm += 1 & 'You have an orgasm.'
 
 		$orgasm_or = 'yes'
 		gs 'stat'
-		
+
 		act 'Walk into the room':gt 'kafe2', 'margoroom2'
 
 		if pcs_ass > 15 and pcs_horny > 0:
@@ -828,12 +832,12 @@ if $ARGS[0] = 'margoroom3':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/beast/zoo/margo5.jpg"></center>'
 				'First she inserts one finger, then two, three and so on, until eventually she shoves her hand in completely. She quickly found herself in the depths of your ass. It feels unbelievable. Margaret penetrated deeper and deeper and you felt like you were in seventh heaven. It feels impossibly good. Your ass accepted her flexible hand. She starts massaging inside you like a real mistress, causing you to moan loudly and wagging your ass with pleasure.'
-				
+
 				gs 'arousal', 'anal_fist', 15, 'lesbian', 'dom'
 				gs 'stat'
-		
+
 				if pcs_horny >= 90:pcs_horny = 0 & orgasm += 1 & 'You covered orgasm.'
-				
+
 				$orgasm_or = 'yes'
 				gs 'arousal', 'end'
 				gs 'stat'

+ 24 - 22
locations/kid.qsrc

@@ -13,15 +13,17 @@ $breastfeed = {
 		minut += 5
 	else
 		minut += 15
-		'You lift <<$kidname[ks]>> to your breast and feed your baby <<$polreb[ks]>>. <<$kidPosProPN[ks]>> drinks <<lactatemv>>ml of your milk.'
+
 		breastcounter += 1
-		lactatemv = 0
-		if pain['nipples'] < 10:
-			pain['nipples'] += 20
+		milkedvolume = func('lact_lib','$get_breastmilk', 2, 15)
+		if milkedvolume < 800:
+			'You lift <<$kidname[ks]>> to your breast and feed your baby <<$polreb[ks]>>. Your baby doesn''t seem to be satisfied with the amount of milk.'
+		else
+			'You lift <<$kidname[ks]>> to your breast and feed your baby <<$polreb[ks]>>. Your baby seems satisfied with the amount of your milk.'
 		end
 	end
 	'You gently lay <<$kidname[ks]>> back <<$babyloc>>.'
-	act 'Done': 
+	act 'Done':
 		gt 'kid', 'start'
 	end
 }
@@ -49,13 +51,13 @@ $totplay = {
 	'<center><b><font color="maroon"><<$kidname[ks]>> <<$pcs_lastname>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/pc/activities/tot_play.jpg"></center>'
 	'"Mom! Mom! Mom! Mom!" Yells <<$kidname[ks]>>, "Come play with me!"'
-	'"Ok <<$kidname[ks]>>!" You reply.' 
+	'"Ok <<$kidname[ks]>>!" You reply.'
 	'You pull out a bin of blocks and spend a period of time playing and building with your child.'
 	'After a short time, <<$kidname[ks]>> pushes over the small tower you have built, snickers and runs off'
 	'You get up, straighten up your clothes, laugh, and move on with your day'
 	pcs_mood += 20
 	minut += 20
-	act 'Done': 
+	act 'Done':
 		gt 'kid', 'start'
 	end
 }
@@ -69,7 +71,7 @@ $tottv = {
 	'You watch a cartoon featuring a Rabbit, a Duck, and a Pig that is quite silly'
 	mood += 10
 	minut += 60
-	act 'Done': 
+	act 'Done':
 		gt 'kid', 'start'
 	end
 }
@@ -84,7 +86,7 @@ $kidtv = {
 	'"Well I am gonna watch with you." You reply, followed by tickling <<$kidname[ks]>> to open up a spot on the couch for you to sit.'
 	'You watch a kids TV show about two American teenagers that barely catches your interest.'
 	minut += 60
-	act 'Done': 
+	act 'Done':
 		gt 'kid', 'start'
 	end
 }
@@ -112,7 +114,7 @@ $homework = {
 	end
 	homework[ks] = daystart
 	minut += rand(30,80)
-	act 'Done': 
+	act 'Done':
 		gt 'kid', 'start'
 	end
 }
@@ -122,8 +124,8 @@ if $ARGS[0] = 'start':
 	if kid > 0:
 		k = 0
 		end
-		if lactate > 0 and lactatemv <= 1:
-			'You cannot breast feed right now.'
+		if lactate > 0 and pain['nipples'] > 60:
+			'You cannot breast feed right now. Your nipples are too sore.'
 		end
 		:loop
 		if k < kid:
@@ -132,9 +134,9 @@ if $ARGS[0] = 'start':
 			jump 'loop'
 		end
 		'Child Selected: <<$kidname[ks]>>'
-		if ks > 0:'<a href="exec:ks -= 1& gt ''kid'', ''start'' ">Select Previous Child</a>' 
+		if ks > 0:'<a href="exec:ks -= 1& gt ''kid'', ''start'' ">Select Previous Child</a>'
 		if ks < (kid - 1):'<a href="exec:ks += 1& gt ''kid'', ''start'' ">Select Next Child</a>'
-		
+
 	act 'Leave':
 		cla
 		killvar 'ks'
@@ -145,7 +147,7 @@ end
 if $ARGS[0] = 'kidlist':
 		if kidage[k] < 1:
 			if (month - monthkid[k]) < 1 and (day-daykid[k]) < 7:
-				kiddaycalc[k] = day - daykid[k]	
+				kiddaycalc[k] = day - daykid[k]
 				if kiddaycalc[k] = 1:
 					$kidagetext[k] = '<<kiddaycalc[k]>> day old'
 				else
@@ -196,18 +198,18 @@ if $ARGS[0] = 'kidlist':
 		if ks = k:
 		'<font color= #06992D>Your <<$sdtext[k]>> <<$kidname[k]>> is <<$kidagetext[k]>>. <<$kidposproC[k]>> date of birth is <<monthkid[k]>>/<<daykid[k]>>/<<yearkid[k]>>.</font>'
 		else:
-		'Your <<$sdtext[k]>> <<$kidname[k]>> is <<$kidagetext[k]>>. <<$kidposproC[k]>> date of birth is <<monthkid[k]>>/<<daykid[k]>>/<<yearkid[k]>>.' 
+		'Your <<$sdtext[k]>> <<$kidname[k]>> is <<$kidagetext[k]>>. <<$kidposproC[k]>> date of birth is <<monthkid[k]>>/<<daykid[k]>>/<<yearkid[k]>>.'
 		end
-		
+
 		if kidage[k] < 1:
-			if hour >= 12 and hour < 18: 
+			if hour >= 12 and hour < 18:
 			$babyloc = 'onto the blanket'
 			'<<$kidname[k]>></a> is laying on a blanket'
 			else:
 			$babyloc = 'into the crib'
 			'<<$kidname[k]>> is asleep, lying in <<$kidPosPro[k]>> crib.'
 			end
-			
+
 		elseif kidage[k] >= 1 and kidage[k] < 7:
 			if hour >= 9 and hour < 21 and rkidloc < 8:
 			$totloc = 'playing with toys on the floor'
@@ -234,13 +236,13 @@ if $ARGS[0] = 'kidlist':
 			end
 		end
 		if kid > 0 and kidage[ks] < 1:
-			
-			if lactate > 0 and lactatemv > 1:
+
+			if lactate > 0:
 				act 'Breast Feed <<$kidname[ks]>>':dyneval($breastfeed)
 			end
 			if $babyloc = 'onto the blanket':
 				act 'Play with <<$kidname[ks]>> (0:20)': dyneval($play)
-			end				
+			end
 		end
 		if kid > 0 and kidage[ks] >=1 and kidage[ks] <7:
 			if $totloc = 'playing with toys on the floor':

+ 10 - 10
locations/kiosk.qsrc

@@ -18,36 +18,36 @@ 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 'events', 'flash_full', 'outdoors', 5
+				gs 'exhibitionism', 3
+				gs 'flash', 'full', 'outdoors', 5
 				gs 'stat'
 				
 				act 'Go to the counter': gt 'kiosk', 'counter'
 			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 'events', 'flash_pussy', 'outdoors', 5
+				gs 'exhibitionism', 3
+				gs 'flash', 'pussy', 'outdoors', 5
 				gs 'stat'
 				
 				act 'Go to the counter': gt 'kiosk', 'counter'
 			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 'events', 'flash_tits', 'outdoors', 5
+				gs 'exhibitionism', 1
+				gs 'flash', 'tits', 'outdoors', 5
 				gs 'stat'
 				
 				act 'Go to the counter': gt 'kiosk', 'counter'
@@ -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'

+ 1 - 1
locations/lesbidomhouse.qsrc

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

+ 8 - 4
locations/lesbimistress.qsrc

@@ -1197,7 +1197,8 @@ if $ARGS[0] = 'neutral_9':
 	act 'Go out with Mistress':
 		cla
 		*clr
-		exhibition_exp += 3
+		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>'
 		'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
+			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>'
 			'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
+				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>'
 				'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
+					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>'
 					'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.'

+ 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

+ 8 - 8
locations/lug.qsrc

@@ -41,23 +41,23 @@ 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 'flash', 'tits', 'outdoors', 5
 			gs 'stat'
 
 			act 'Continue': gt 'lug', '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 'events', 'flash_pussy', 'outdoors', 5
+			gs 'exhibitionism', 3
+			gs 'flash', 'pussy', 'outdoors', 5
 			gs 'stat'
 
 			act 'Continue': gt 'lug', 'start'
@@ -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>'

+ 2 - 2
locations/nyp_school.qsrc

@@ -348,7 +348,7 @@ if $ARGS[0] = 'nerds':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/nerds.jpg"></center>'
 			'You stop and begin thinking about the right strategy, "I feel that we should approach this fight very carefully. The undead king seems kind of strong and should not be underestimated."'
-			'Zinadia nods, "I agree, remember the last time we went heads on with that dragon and almost got wiped out? That was such a bad decision by us... The game master nearly got us all killed there."'
+			'Zinaida nods, "I agree, remember the last time we went heads on with that dragon and almost got wiped out? That was such a bad decision by us... The game master nearly got us all killed there."'
 			'Feofan grins, "It''s not fault you decided to run into that fight without any plan. The blame is completely on you all. But I have to admit it was fun seeing you all sweat for a while."'
 			'"Well if you put that way then we really need to be careful." you reply. You continue on discussing the game, immersing yourself into the game world. All while Natasha shakes her head, "You guys are really the worst kind of nerds..."'
 			minut += 5
@@ -434,7 +434,7 @@ if $ARGS[0] = 'nerds':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/nerds.jpg"></center>'
 		'As you pass by the nerds table you hear Natasha sighing deeply, "All you guys always talk about is that damn game. Do we really have to talk about it all the fricking time? It''s so annoying."'
-		'Julia and Zinadia look at her confused, "But it''s really fun. You have an immersive world where there is lots of stuff happening. You can fight dragons, undead. You get to make decisions that in the end can affect the whole party. And the best of all you get to hang out with your friends in peace."'
+		'Julia and Zinaida look at her confused, "But it''s really fun. You have an immersive world where there is lots of stuff happening. You can fight dragons, undead. You get to make decisions that in the end can affect the whole party. And the best of all you get to hang out with your friends in peace."'
 		minut += 10
 		gs 'stat'
 

+ 1 - 1
locations/obj_din.qsrc

@@ -209,7 +209,7 @@ if $ARGS[0] = 'sex_skills':
 	nl
 	pl '<b>Sexual characteristics</b>'
 	nl
-	pl 'Exhibitionism <<pcs_exhibition>>'
+	pl 'Inhibition <<pcs_inhib>>'
 	pl 'Exhibitionist sex preference: <<exhibitionism[''pref'']>>'
 	pl 'Exhibitionist sex: <<exhibitionism[''exp'']>>'
 	if SUB > 0:pl 'Submissiveness <<SUB>>'

+ 13 - 13
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,26 +218,26 @@ 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 'events', 'flash_tits', 'outdoors', 5
+			gs 'exhibitionism', 1
+			gs 'flash', 'tits', 'outdoors', 5
 			gs 'stat'
 
 			act 'Continue': gt 'park', '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 'events', 'flash_pussy', 'outdoors', 5
+			gs 'exhibitionism', 3
+			gs 'flash', 'pussy', 'outdoors', 5
 			gs 'stat'
 
 			act 'Continue': gt 'park', 'start'
@@ -495,9 +495,9 @@ 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 'flash', 'tits', 'outdoors', 5
 			gs 'stat'
 			act 'Go back to the park':gt 'park', 'start'
 		end

+ 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

+ 8 - 8
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,23 +59,23 @@ 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 'flash', 'tits', 'outdoors', 5
 			gs 'stat'
 
 			act 'Continue': gt 'parks', '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 'events', 'flash_pussy', 'outdoors', 5
+			gs 'exhibitionism', 3
+			gs 'flash', 'pussy', 'outdoors', 5
 			gs 'stat'
 
 			act 'Continue': gt 'parks', 'start'

+ 5 - 1
locations/pavShared_gp.qsrc

@@ -315,7 +315,11 @@ if $ARGS[0] = 'gpHandjob':
 	
 	!slow strokes
 	elseif step = 1:
-		orgB += rand(0, 10) / gp_mood
+		if gp_mood = 0:
+			orgB += rand(0, 10)
+		else
+			orgB += rand(0, 10) / gp_mood
+		end
 		'<center><video autoplay loop src="images/shared/sex/handjob/HandJob2.mp4"></video></center>'
 		''
 		'You grab <<$gp_name>>''s cock in your hand, jerking it slowly, changing the pressure from time to time.'

+ 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.'

+ 8 - 11
locations/postoffice.qsrc

@@ -18,40 +18,37 @@ 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 'flash', 'full', 'indoors', 5
 				gs 'stat'
 
 				act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
 			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 'flash', 'pussy', 'indoors', 5
 				gs 'stat'
 
 				act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
 			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 'flash', 'tits', 'indoors', 5
 				gs 'stat'
 
 				act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
 			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'
 				

+ 2 - 2
locations/preSYS2.qsrc

@@ -735,7 +735,7 @@ end
 
 if $ARGS[0] = 'modrel_out':
 	$metka = 'modrel_out'
-	'<center><b>Popular kids relationship levels</b></center>'
+	'<center><b>Outcast kids relationship levels</b></center>'
 	*nl
 	*nl
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'
@@ -749,7 +749,7 @@ end
 
 if $ARGS[0] = 'modrel_tea':
 	$metka = 'modrel_tea'
-	'<center><b>Popular kids relationship levels</b></center>'
+	'<center><b>Teacher relationship levels</b></center>'
 	*nl
 	*nl
 	'<center><table border=0 cellspacing=0 cellpadding=25  bgcolor=#808080><TH></TH><TH>Set to zero</TH><TH>Minus 10</TH><TH>Minus 5</TH><TH>Plus 5</TH><TH>Plus 10</TH><TH>Set to 100</TH>'

+ 8 - 11
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,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 pcs_exhibition <= 30:
-											pcs_exhibition += rand(0,2)
-										else
-											pcs_exhibition += 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
@@ -333,7 +329,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.'
@@ -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.'
@@ -504,7 +501,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.
 
 

+ 5 - 5
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
@@ -303,11 +303,11 @@ 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
-				'<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.'

+ 6 - 6
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

+ 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

File diff suppressed because it is too large
+ 181 - 325
locations/rolanbath.qsrc


+ 2 - 1
locations/saveupdater.qsrc

@@ -343,13 +343,14 @@ if $home_town = '':
 end
 
 !! exhibition to inhib
-if pcs_exhibition > 0 or exhibition_exp > 0:
+if exhibition_to_inhib = 0:
 	pcs_inhib = pcs_exhibition
 	inhib_exp = exhibition_exp
 	inhib_lvlst = pcs_exhibition
 	inhib_lvl = pcs_exhibition
 	killvar 'pcs_exhibition'
 	killvar 'exhibition_exp'
+	exhibition_to_inhib = 1
 end
 
 --- saveupdater ---------------------------------

+ 74 - 85
locations/stat_display.qsrc

@@ -84,7 +84,7 @@ if pcs_sleep > 100: pcs_sleep = 100
 !!----------------image Extra messages, start--------------------------
 $stat_imgtool_msg=''
 $stat_imgextra_msg=''
-	
+
 if Enable_showstatimg = 1 or Enable_statimg_loc > 0:
 	!There are 3 display mode, with toobar / top / bottom, controlled by Enable_statimg_loc
 	if Enable_statimg_face = 0:
@@ -101,7 +101,7 @@ if Enable_showstatimg = 1 or Enable_statimg_loc > 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_body = 0 & gs ''$menu_obnovit''">◆Body</a>'
 		$img_temp = FUNC('$body_image','body')
 		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
-	end	
+	end
 
 	if Enable_statimg_coat = 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_coat = 1 & gs ''$menu_obnovit''">◇Coat</a>'
@@ -109,7 +109,7 @@ if Enable_showstatimg = 1 or Enable_statimg_loc > 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_coat = 0 & gs ''$menu_obnovit''">◆Coat</a>'
 		$img_temp = FUNC('$body_image','coat')
 		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
-	end	
+	end
 
 	if Enable_statimg_cloth = 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_cloth = 1 & gs ''$menu_obnovit''">◇Clothes</a>'
@@ -117,7 +117,7 @@ if Enable_showstatimg = 1 or Enable_statimg_loc > 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_cloth = 0 & gs ''$menu_obnovit''">◆Clothes</a>'
 		$img_temp = FUNC('$body_image','clothes')
 		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
-	end	
+	end
 
 	if Enable_statimg_bra = 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_bra = 1 & gs ''$menu_obnovit''">◇Bra</a>'
@@ -133,7 +133,7 @@ if Enable_showstatimg = 1 or Enable_statimg_loc > 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_panties = 0 & gs ''$menu_obnovit''">◆Panties</a>'
 		$img_temp = FUNC('$body_image','panties')
 		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
-	end	
+	end
 
 	if Enable_statimg_shoes = 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_shoes = 1 & gs ''$menu_obnovit''">◇Shoes</a>'
@@ -141,9 +141,9 @@ if Enable_showstatimg = 1 or Enable_statimg_loc > 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_shoes = 0 & gs ''$menu_obnovit''">◆Shoes</a>'
 		$img_temp = FUNC('$body_image','shoes')
 		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
-	end	
+	end
 	$stat_imgtool_msg += ' <a href="exec:gs ''Cheatmenu_din'' & Enable_settingmode = 1 & dynamic $cheatmenu[''display'']">◎Setting</a>'
-	
+
 end
 !!----------------image Extra messages, end --------------------------
 
@@ -171,7 +171,7 @@ if bankAccount = 0 and stolmoney = 0:
 else
 	!combine money status to single line
 	$stat_msg += '<BR><<$pockets>>: <b><<money>> ₽</b>'
-	if stolmoney > 0: $stat_msg += ', Drawer <b><<stolmoney>> ₽</b>'	
+	if stolmoney > 0: $stat_msg += ', Drawer <b><<stolmoney>> ₽</b>'
 	if bankAccount = 1:
 		if karta >= 0:
 			$stat_msg += ', Bank: <b><<karta>> ₽</b>'
@@ -315,7 +315,7 @@ else
 		end
 		gs 'indik', '1', pcs_apprnc / 2, pcs_apprnc
 		$stat_extra_msg += '<BR><<$ind>> Attractiveness'
-	
+
 		if SchoolAtestat = 0 and StoryLine > 0:
 			gs 'indik', '1', pcs_grades, pcs_grades
 			$stat_extra_msg += '<BR><<$ind>> School Grades'
@@ -328,7 +328,7 @@ else
 			gs 'indik', '1', pcs_heels, pcs_heels
 			$stat_extra_msg += '<BR><<$ind>> Heels skill'
 		end
-		$stat_extra_msg += '<BR>' 
+		$stat_extra_msg += '<BR>'
 	end
 end
 killvar '$st_temp'
@@ -370,7 +370,7 @@ else
 		if pcs_shoot > 0: gs 'show_table', '<<pcs_shoot>> Marksmanship', '2'
 		if pcs_chess > 0: gs 'show_table', '<<pcs_chess>> Chess', '2'
 		if pcs_icesktng > 0: gs 'show_table', '<<pcs_icesktng>> Ice Skating', '2'
-		if pcs_gaming > 0: gs 'show_table', '<<pcs_gaming>> Gaming', '2'
+		if pcs_ttgmng > 0: gs 'show_table', '<<pcs_ttgmng>> Gaming', '2'
 		if pcs_pool > 0: gs 'show_table', '<<pcs_pool>> Pool', '2'
 	end
 
@@ -409,16 +409,16 @@ else
 		if pcs_servng > 0: gs 'show_table', '<<pcs_servng>> Serving', '2'
 		if pcs_medcn > 0: gs 'show_table', '<<pcs_medcn>> Medicine', '2'
 		if workPTU > 1: gs 'show_table','<<teachlevel>> Teacher credibility','2'
-	end	
+	end
 	!skip if this is first message
-	if $stat_extra_msg ! null: 
+	if $stat_extra_msg ! null:
 		$stat_extra_msg += '<br><a href="exec:Enable_showskill = 0 & gs ''$menu_obnovit''">▲Skills:</a> <<$stat_sktool_msg>>'
 	else
 		$stat_extra_msg += '<br><<$stat_sktool_msg>>'
 	end
 	if st_count > 0 :
 		$stat_extra_msg += '<BR><TABLE BORDER=1><<$show_table>></TR></TABLE>'
-	end	
+	end
 end
 
 killvar 'stat_sktool_msg'
@@ -472,9 +472,9 @@ if Enable_statimg_loc = 0:
 	if Enable_showstatimg = 0:
 		$stat_tool_msg += ' <a href="exec:Enable_showstatimg = 1 & gs ''$menu_obnovit''">▽Image</a>'
 	else
-		$stat_tool_msg += ' <a href="exec:Enable_showstatimg = 0 & gs ''$menu_obnovit''">▲Image</a>'	
+		$stat_tool_msg += ' <a href="exec:Enable_showstatimg = 0 & gs ''$menu_obnovit''">▲Image</a>'
 		!skip if this is first message
-		if $stat_extra_msg ! null: 
+		if $stat_extra_msg ! null:
 			$stat_extra_msg += '<br><a href="exec:Enable_showstatimg = 0 & gs ''$menu_obnovit''">▲Image:</a> <<$stat_imgtool_msg>>'
 		else
 			$stat_extra_msg += '<br><<$stat_imgtool_msg>>'
@@ -668,35 +668,42 @@ end
 
 if lactate = 1 and night_mode = 0:
 	if lactatemv >= lactatemm-1:
-			$stat_msg += '<BR><font color = black>Your breasts are so full they hurt and a little milk is constantly dribbling out.</font><BR>'
-		elseif lactatemv > lactatemm*9/10:
-			$stat_msg += '<BR><font color = black>Your breasts are firm and full, and starting to hurt from all the milk they contain.</font><BR>'
-		elseif lactatemv > lactatemm*3/4:
-			$stat_msg += '<BR><font color = black>Your breasts feel firm and heavy, full of milk.</font><BR>'
-		elseif lactatemv > lactatemm/2:
-			$stat_msg += '<BR><font color = black>Your breasts are heavy, a cargo of milk inside.</font><BR>'
-		elseif lactatemv > lactatemm/4:
-			$stat_msg += '<BR><font color = black>Your breasts feel a little heavy.</font><BR>'
-		elseif lactatemv > 0:
-			$stat_msg += '<BR><font color = black>Your breasts tingle a little from the feeling of milk production.</font><BR>'
-		else
-			$stat_msg += '<BR><font color = black>Your breasts feel soft and empty.</font><BR>'
-	end
-elseif lactate = 1 and night_mode = 1:
-	if lactatemv >= lactatemm-1:
-			$stat_msg += '<BR><font color = white>Your breasts are so full they hurt and a little milk is constantly dribbling out.</font><BR>'
-		elseif lactatemv > lactatemm*9/10:
-			$stat_msg += '<BR><font color = white>Your breasts are firm and full, and starting to hurt from all the milk they contain.</font><BR>'
-		elseif lactatemv > lactatemm*3/4:
-			$stat_msg += '<BR><font color = white>Your breasts feel firm and heavy, full of milk.</font><BR>'
-		elseif lactatemv > lactatemm/2:
-			$stat_msg += '<BR><font color = white>Your breasts are heavy, a cargo of milk inside.</font><BR>'
-		elseif lactatemv > lactatemm/4:
-			$stat_msg += '<BR><font color = white>Your breasts feel a little heavy.</font><BR>'
-		elseif lactatemv > 0:
-			$stat_msg += '<BR><font color = white>Your breasts tingle a little from the feeling of milk production.</font><BR>'
+		if lact_engorgement > 3 and lact_engorgement <= 6:
+			$stat_msg += '<BR><font color = red>Your breasts are so full they hurt and you can feel milk seeping out.</font><BR>'
+		elseif lact_engorgement > 6:
+			$stat_msg += '<BR><font color = red>Your breasts are so full they hurt and you can feel your milk spraying out.</font><BR>'
 		else
-			$stat_msg += '<BR><font color = white>Your breasts feel soft and empty.</font><BR>'
+			$stat_msg += '<BR><font color = orange>Your breasts are so full they hurt.</font><BR>'
+		end
+		if $clothingworntype = 'nude' and lactatemess > 0:
+			if lactatemess < 3:
+				$stat_msg += ''+iif(night_mode = 1,'<font color = white>','<font color = black>')+'You have a little milk residue around your nipples.</font>'
+			elseif lactatemess < 7:
+				$stat_msg += '<font color = orange>You have a lot of milk residue around your nipples.</font>'
+			else
+				$stat_msg += '<font color = red>Your breasts are drenched with milk residue.</font>'
+			end
+		elseif lactatemess > 0:
+			if lactatemess < 3:
+				$stat_msg += '<font color = orange>You have tiny wet spots on your clothes above your nipples.</font>'
+			elseif lactatemess < 7:
+				$stat_msg += '<font color = red>Milk has soaked through your clothes and made visible circles on your breasts.</font>'
+			else
+				$stat_msg += '<font color = red>Your shirt is drenched with milk from your breasts.</font>'
+			end
+		end
+	elseif lactatemv > lactatemm*9/10:
+		$stat_msg += '<BR>'+iif(night_mode = 1,'<font color = white>','<font color = black>')+'Your breasts are firm and full, and starting to hurt from all the milk they contain.</font><BR>'
+	elseif lactatemv > lactatemm*3/4:
+		$stat_msg += '<BR>'+iif(night_mode = 1,'<font color = white>','<font color = black>')+'Your breasts feel firm and heavy, full of milk.</font><BR>'
+	elseif lactatemv > lactatemm/2:
+		$stat_msg += '<BR>'+iif(night_mode = 1,'<font color = white>','<font color = black>')+'Your breasts are heavy, a cargo of milk inside.</font><BR>'
+	elseif lactatemv > lactatemm/4:
+		$stat_msg += '<BR>'+iif(night_mode = 1,'<font color = white>','<font color = black>')+'Your breasts feel a little heavy.</font><BR>'
+	elseif lactatemv > 0:
+		$stat_msg += '<BR>'+iif(night_mode = 1,'<font color = white>','<font color = black>')+'Your breasts tingle a little from the feeling of milk production.</font><BR>'
+	else
+		$stat_msg += '<BR>'+iif(night_mode = 1,'<font color = white>','<font color = black>')+'Your breasts feel soft and empty.</font><BR>'
 	end
 end
 
@@ -773,7 +780,7 @@ if arrsize('sparrvol') > 0:
 						j = 3
 					end
 				end
-				
+
 				cumvolume['<<i>>:<<j>>'] += sparrvol[idx]
 				if sparrvol[idx] > 0:
 					if sparridt[idx] = 0:
@@ -811,29 +818,29 @@ killvar 'cumloc'
 
 i = 0
 :cumlocloop
-	if i = 0: 
+	if i = 0:
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/creampie/cumpussy'+rand(1,14)+'.jpg''">pussy</a>'
-	elseif i = 1: 
+	elseif i = 1:
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumpussy/cumpus'+rand(1,4)+'.jpg''">labia</a>'
-	elseif i = 2: 
+	elseif i = 2:
 		$txtloc = 'the front of your panties'
-	elseif i = 3: 
+	elseif i = 3:
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumanal/cumanal'+rand(1,11)+'.jpg''">ass</a>'
-	elseif i = 4: 
+	elseif i = 4:
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumass/cumass'+rand(1,6)+'.jpg''">butt</a>'
-	elseif i = 5: 
+	elseif i = 5:
 		$txtloc = 'the back of your panties'
-	elseif i = 6: 
+	elseif i = 6:
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumclothes/'+rand(1,3)+'.jpg''">clothes near your groin</a>'
-	elseif i = 7: 
+	elseif i = 7:
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumclothes/cumclothes'+rand(1,21)+'.jpg''">clothes</a>'
-	elseif i = 8: 
+	elseif i = 8:
 		$txtloc = 'your back'
-	elseif i = 9: 
+	elseif i = 9:
 		$txtloc = 'your legs'
-	elseif i = 10: 
+	elseif i = 10:
 		$txtloc = 'your arms'
-	elseif i = 11: 
+	elseif i = 11:
 		if pcs_haircol = 0:
 			$cum_face_image = 'brown/'
 			$cum_face_image += rand(1, 31)
@@ -852,20 +859,20 @@ i = 0
 		end
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumface/<<$cum_face_image>>.jpg''">face</a>'
 		killvar 'cum_face_image'
-	elseif i = 13: 
+	elseif i = 13:
 		$txtloc = 'your hands'
-	elseif i = 14: 
+	elseif i = 14:
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumbelly/cumbelly'+rand(1,12)+'.jpg''">stomach</a>'
-	elseif i = 15: 
+	elseif i = 15:
 		$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumtits/cumtits'+rand(1,19)+'.jpg''">breasts</a>'
-	elseif i = 16: 
+	elseif i = 16:
 		$txtloc = 'your hair</a>'
-	elseif i = 17: 
+	elseif i = 17:
 		$txtloc = 'in your vagina in a slipped condom'
 	else
 		$txtloc = 'the gusset of your panties</a>'
 	end
-	
+
 	j = 0
 	:ageloop
 		if cumvolume['<<i>>:<<j>>'] > 0:
@@ -885,7 +892,7 @@ i = 0
 				!! residue amount, no leakage
 				$txtamount = 'Small '
 			end
-			
+
 			!! if sperm age stage is 4, it means inside the body
 			if j = 4:
 				if (vibratorIN = 1 and i = 0) or (analplugin = 1 and i = 3):
@@ -903,7 +910,7 @@ i = 0
 						$txtproxy = 'seeping out of '
 					else
 						$txtproxy = 'staying inside of '
-					end	
+					end
 				end
 			elseif j >= 5:
 			!! if sperm age stage is over 4, meaning in condom
@@ -935,7 +942,7 @@ i = 0
 					$txtproxy += 'powderly '
 				end
 			end
-			
+
 			$txtperson = ''
 			if cumcount['<<i>>:<<j>>'] = 0:
 				$txtiscum = 'some whitish substance '
@@ -1019,25 +1026,6 @@ killvar 'cumcount'
 killvar 'knownguy'
 killvar 'cumowner'
 
-
-if $clothingworntype = 'nude' and lactatemess > 0:
-	if lactatemess < 3:
-		$stat_msg += '<BR><font color = black>You have a little milk residue around your nipples.</font>'
-	elseif lactatemess < 7:
-		$stat_msg += '<BR><font color = black>You have a lot of milk residue around your nipples.</font>'
-	else
-		$stat_msg += '<BR><font color = black>Your breasts are drenched with milk residue.</font>'
-	end
-elseif lactatemess > 0:
-	if lactatemess < 3:
-		$stat_msg += '<BR><font color = black>You have tiny wet spots on your clothes above your nipples.</font>'
-	elseif lactatemess < 7:
-		$stat_msg += '<BR><font color = black>Milk has soaked through your clothes and made visible circles on your breasts.</font>'
-	else
-		$stat_msg += '<BR><font color = black>Your shirt is drenched with milk from your breasts.</font>'
-	end
-end
-
 if Gerpes >= 10 and GenHerpes = 1:
 	$stat_msg += '<BR><b><font color="red">On your pussy sores have appeared. This is genital herpes.</font></b>'
 elseif Gerpes >= 5 and GenHerpes =1:
@@ -1341,3 +1329,4 @@ end
 
 --- stat_display ---------------------------------
 
+>>>>>>> 48c11b415a2f0467c4e8bcf088acba01ca5cc362

+ 3 - 3
locations/stat_sklattrib.qsrc

@@ -114,7 +114,7 @@ $traitattskl[2] = 'schlrly'
 if attsklupdate = 0:
 	i = 0 & x = 1
 	:rstloop
-	expadj = 60
+	expadj = func('_difficulty','getexpadj')
 	tl = 0
 	:trtrstloop
 	tltp = 0
@@ -176,7 +176,7 @@ if $ARGS[0] = 'daycall':
 	:degloop
 	degadj = 60
 	if x = 2: degadj += 30
-	expadj = 60
+	expadj = func('_difficulty','getexpadj')
 	tl = 0
 	:trtdegloop
 	tltp = 0
@@ -241,7 +241,7 @@ end
 !!Advancement Loop
 i = 0 & x = 1
 :advloop
-expadj = 60
+expadj = func('_difficulty','getexpadj')
 tl = 0
 :trtadvloop
 tltp = 0

+ 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

+ 5 - 0
locations/swamphouse.qsrc

@@ -176,6 +176,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			end
 		end
 	end
+	if breastpump > 0:
+		act 'Use breast pump':
+			gt 'lact_lib', 'bp_milking'
+		end
+	end
 	if klismaday ! daystart and swamp_enema = 1 and analplugin = 0 and hour >= 8 and hour < 20 and hanters = 1 or klismaday ! daystart and swamp_enema = 1 and analplugin = 0 and hanters = 0:
 		act 'Perform an enema':
 			cla

+ 2 - 2
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

+ 61 - 2
locations/traits.qsrc

@@ -5,8 +5,67 @@ if $ARGS[0] = 'menu':
 	pl '<center>Traits Menu</center>'
 	pl'<a href="exec:gs ''stat''">Leave</a>'
 	nl
-!!	pl '<b>Bimbo</b>'
-
+	pl '<b>Bimbo</b>'
+	if bimbolevel = 0:
+		pl 'You do not have this trait.'
+		pl 'To gain this trait you must wear bimbo clothing / shoes for a few days.'
+		pl 'You have <<bimbo>> out of 10 points towards level 1.'
+	elseif bimbolevel = 1:
+		pl 'You have this trait at level 1.'
+		pl 'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
+		pl 'Due to this trait you gain a very small bonus to appearance and a very small penalty to intelligence.'
+		pl 'You have <<bimbo>> out of 20 points towards level 2.'
+		if bimbowithdrawal = 0:
+			pl 'You are not in withdrawal.'
+		else
+			pl 'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
+		end
+	elseif bimbolevel = 2:
+		pl 'You have this trait at level 2.'
+		pl 'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
+		pl 'Due to this trait you gain a small bonus to appearance and a small penalty to intelligence.'
+		pl 'You have <<bimbo>> out of 30 points towards level 3.'
+		if bimbowithdrawal = 0:
+			pl 'You are not in withdrawal.'
+		else
+			pl 'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
+		end
+	else
+		pl 'You have this trait at level 3.'
+		pl 'To maintain this trait you must wear bimbo clothing / shoes and/or have regular sex.'
+		pl 'Due to this trait you gain a moderate bonus to appearance and a moderate penalty to intelligence.'
+		if bimbowithdrawal = 0:
+			pl 'You are not in withdrawal.'
+		else
+			pl 'You have <<bimbowithdrawal>> out of 30 points towards losing this trait.'
+		end
+	end
+	nl
+	pl '<b>Exhibitionist</b>'
+	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 <<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 <<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.'
+		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.'
+		pl 'This trait grants you a large amount or excitement from exposing yourself.'
+    end
+	nl
 	pl '<b>Cumeater</b>'
 	if trt_cumeater = 0:
 		pl 'You do not have this trait.'

+ 1 - 2
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)
+		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 - 2
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)
+	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.'
 

+ 1 - 1
locations/vanrPar.qsrc

@@ -64,7 +64,7 @@ if $ARGS[0] = 'peek':
 				end
 			end
 		end
-	elseif hour >= 18 and hour <= 21 and brother_ev1 ! daystart and rand(0,2) = 1:
+	elseif hour >= 18 and hour <= 23 and brother_ev1 ! daystart and rand(0,4) < 2:
 		cla
 		*clr
 		brother_ev1 = daystart

+ 2 - 2
locations/young_shop.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'start':
 			'You spend 4 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
 			gs 'young_shop', 'events'
 		end
-	elseif ((hour = 9 and minut <= 5) or (hour = 8 and minut >= 30)) and young_shop_work1 = 1 and week = 6:
+	elseif ((hour = 9 and minut <= 5) or (hour = 8 and minut >= 30)) and young_shop_work1 = 1 and week > 5:
 		act '<b>Work</b>':
 			cla
 			inWorkYoungShop = 1
@@ -61,7 +61,7 @@ if $ARGS[0] = 'start':
 			'You spend 6 hours cleaning the department, folding and rehanging clothes and serving customers. The store now looks clean and pretty organized.'
 			gs 'young_shop', 'events'
 		end
-!!	elseif ((hour = 9 and minut <= 5) or (hour = 8 and minut >= 30)) and young_shop_work2 = 1 and week > 6:
+!!	elseif ((hour = 9 and minut <= 5) or (hour = 8 and minut >= 30)) and young_shop_work2 = 1 and week < 6:
 !!		act '<b>Work</b>':
 !!			cla
 !!			inWorkYoungShop = 1

+ 6 - 2
locations/zaprF.qsrc

@@ -15,8 +15,12 @@ if $ARGS[0] = 'start':
 	'When the weather is nice sometimes girls will offer a car washing service for some tips, there''s no structure to it so you could always try it.'
 	'The petrol price is 30 <b>₽</b> per liter.'
 	*nl
-
-	if hour < 9:
+	
+	if temper < 10:
+		'It''s too cold outside to wash cars. You''re more likely to get ill than make money. Maybe try again when the weather is warmer?'
+	elseif sunWeather = 0:
+		'You can''t wash cars if it''s raining outside! Maybe try again on a sunny day?'
+	elseif hour < 9:
 		'It''s too early to wash cars.'
 	elseif hour > 19:
 		'It''s too late to wash cars.'

+ 762 - 179
locations/zaprFWash.qsrc

@@ -1,4 +1,6 @@
 # zaprFWash
+! most complete comments for how the code works can be found in 'wash', 'titsFlash', 'runback', and 'punishSpank'
+! most other code in here are just variations of those sections
 
 if $ARGS[0] = 'start':
 	$metka = 'start'
@@ -6,138 +8,493 @@ if $ARGS[0] = 'start':
 	cla
 	clr
 
-	if temper < 10:
-		'It''s too cold you''re more likely to get ill than make money, maybe try when the weather is a bit nicer?'
-		act 'Return':gt 'zaprF', 'start'
-	elseif (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1:
+	! can''t wash cars if have visible cum already
+	if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1:
 		minut += 5
-		'The gas station worker chases you away: "Go wash yourself off first at least, whore!"'
+		mood -= 5
+		pav_sex += rand(0,2)
+		
+		'The gas station worker chases you away: "At least go wash yourself off first, whore!"'
+		
+		act 'Go to the toilet':gt 'zaprF', 'toilet'
 		act 'Leave':gt 'zaprF', 'start'
 	else
-		if (PCloBimbo = 1 or PCloStyle = 4) and pcs_apprnc >= 60:
-			minut += 60
-			pcs_sweat += 2
-			money += 100
-			skimpyCustomerChance = rand(1, 100)
-
-			if skimpyCustomerChance > 30:
-				gt 'zaprFWash', 'titsQ'
-			else
-				gt 'zaprFWash', 'wash'
-			end
-
-		else
-			minut += 60
-			pcs_sweat += 2
-			money += 80
-			gt 'zaprFWash', 'wash'
-		end
+		gt 'zaprFWash', 'wash'
 	end
 end
 
 if $ARGS[0] = 'wash':
+	! only wearing bimbo or prostitute clothing and looking good can get propositioned by a customer
 	if PCloBimbo = 1 or PCloStyle = 4:
 		i = rand(1, 4)
 		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<i>>.jpg"></center>'
-		'You washed the windows of several cars and earned 100 <b>₽</b>.'
+		
+		minut += 60
+		mood -= 5
+		pcs_sweat += 2
+		
+		if pcs_apprnc >= 60:
+			! slightly more money for wearing bimbo or prostitute clothing and looking good too
+			'You washed the windows of several cars and earned 100 <b>₽</b>.'
+			money += 100
+			
+			! min chance of 20 percent; max chance of 80 percent; percent chance scales with pav_prostitute and/or pav_sex
+			! as your repuation increases you will be asked more often
+			! reputation effects are delayed by 30 because thats the delay in fame as well
+			skimpyCustomerChance = rand(1, 100)
+			if skimpyCustomerChance <= min(max(20,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),80):
+				'As you finish washing another car, the driver walks up to you to give you a tip. From the way he''s looking at you, it''s obvious he''s interested in something more as well.'
+				! starts off with always doing titsQ when rep is low, as rep increases they may skip a question since they know you will do it anyway
+				! also different people have different tastes so you wont be asked the same thing in the same order every time by every customer that walks up to you
+				carwashscene = rand(1, 100)
+				if carwashscene <= min(max(25,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),50) and carwashscene >= 25:
+					gt 'zaprFWash', 'assQ'
+				elseif carwashscene <= min(max(50,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),65) and carwashscene >= 50:
+					gt 'zaprFWash', 'pussyQ'	
+				elseif carwashscene <= min(max(65,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),85) and carwashscene >= 65:	
+					gt 'zaprFWash', 'handQ'
+				elseif carwashscene <= min(max(85,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),100) and carwashscene >= 85:	
+					gt 'zaprFWash', 'blowQ'
+				else
+					gt 'zaprFWash', 'titsQ'
+				end
+			else
+				gs 'zaprFWash', '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
+			
+			gs 'zaprFWash', 'flash_passing'
+		end
 	else
+		minut += 60
+		mood -= 5
+		pcs_sweat += 2
+		money += 60
+		
 		i = rand(1, 4)
 		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/regular<<i>>.jpg"></center>'
-		'You washed the windows of several cars and earned 80 <b>₽</b>.'
+		
+		! normal money just for the car washing
+		'You washed the windows of several cars and earned 60 <b>₽</b>.'
+		
+		gs 'zaprFWash', '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>'
-	'You wash another car. The driver finishes filling his tank and walks up to you giving you some tips. It''s obvious he''s looking for something more.'
-	'Want to earn more? Show me your tits, girl. Theres 100 in it, easy money.'
-	act 'Agree and show him your tits':gt 'zaprFWash', 'titsFlash'
-	act 'Refuse':gt 'zaprF', 'start'
+	
+	'Want to earn some more cash, girl? Show me your tits. I''ll give you 100 <b>₽</b>. It''s easy money.'
+	
+	! 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'
+	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
 if $ARGS[0] = 'assQ':
 	i = rand(1, 4)
 	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<i>>.jpg"></center>'
-	'That was cool, girl. How about your ass, will another 100 convince you to show it to me?'
-	act 'Agree and show him your ass':gt 'zaprFWash', 'assFlash'
-	act 'Refuse':gt 'zaprF', 'start'
+	
+	'What a nice ass you have there. Let me see it. Will 100 <b>₽</b> convince you to show it to me?'
+	
+	! 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'
+	act 'Refuse':gt 'zaprFWash', 'refuse'
+end
+
+if $ARGS[0] = 'pussyQ':
+	i = rand(1, 4)
+	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<i>>.jpg"></center>'
+	
+	'You look like a cool girl. Let me see your pussy. I''ll only look for 100 <b>₽</b>.'
+		
+	! 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'
+	act 'Refuse':gt 'zaprFWash', 'refuse'
+end
+
+if $ARGS[0] = 'handQ':
+	i = rand(1, 4)
+	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<i>>.jpg"></center>'
+	
+	'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>.'
+	
+	! 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'
+	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
 if $ARGS[0] = 'blowQ':
 	i = rand(1, 4)
 	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<i>>.jpg"></center>'
-	'What a wonderful ass! I have a new problem now, girl. It''s getting tight down here, in my pants. How about you put your mouth to a good use? There is another 300 in it.'
-	act 'Agree and give him blowjob':gt 'zaprFWash', 'blowjob'
-	act 'Refuse':gt 'zaprF', 'start'
+	
+	'Looking hot today girl! How about you put your mouth to good use? I''ll pay you 200 <b>₽</b>.'
+	
+	! 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'
+	act 'Refuse':gt 'zaprFWash', 'refuse'
 end
 
+if $ARGS[0] = 'refuse':
+	! just being asked can slowly change your inhibitions which will enable a player to eventually agree to the questions above
+	if pcs_inhib < 35: inhib_exp += rand(1,2)
+	pcs_dom += 1
+	mood += 5
+	gs 'stat'
+	
+	'<center><video autoplay loop src="images/pc/no.mp4"></video></center>'
+	
+	'You begin to consider his offer but decide turn him down and walk away.'
+	
+	act 'Go back to washing cars':gt 'zaprF', 'start'
+end
+
+! $ARGS[1] = whether you got paid for this
+! $ARGS[2] = whether this act came from a customer question or just flashing for passing cars
 if $ARGS[0] = 'titsFlash':
-	money += 50
+	! reputation and money will depend on whether you were paid
+	if $ARGS[1] = 'Paid':
+		money += 50
+		pav_prostitute += rand(0,1)
+	elseif $ARGS[1] = 'Free':
+		gs 'exhibitionism', 1
+	end
+	if pcs_inhib < 30: inhib_exp += rand(2,4)
+	mood += 5
+	gs 'stat'
+	
 	gifornot = rand (1, 100)
-	if gifornot < 30:
-		i = rand(1, 3)
-		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/titsflash<<i>>.jpg"></center>'
+	! chance for using photos or videos
+	if gifornot < 50:
+		i = rand(1, 100)
+		! chance of using old pics since there are so many newer pics to choose from
+		if i < 15:
+			if PCloPants > 0:
+				! loop to sort through old pics since they are jumbled together in the folder but we want to display pics based on clothing
+				! will keep looping until it gets a photo with shorts/pants in it
+				:loop_tits_old_pics1
+				i = rand(1, 3)
+				if i = 2: jump 'loop_tits_old_pics1'
+				'<center><img <<$set_imgh>> src="images/locations/shared/carwash/titsflash<<i>>.jpg"></center>'
+			elseif PCloSkirt > 0:
+				! loop to sort through old pics since they are jumbled together in the folder but we want to display pics based on clothing
+				! will keep looping until it gets a photo with a skirt/dress in it
+				:loop_tits_old_pics2
+				i = rand(1, 3)
+				if i = 1 or i = 3: jump 'loop_tits_old_pics2'
+				'<center><img <<$set_imgh>> src="images/locations/shared/carwash/titsflash<<i>>.jpg"></center>'
+			end
+		else
+			! newer photos are more neatly organized into different folders so no looping needed
+			if PCloPants > 0:
+				i = rand(1, 14)
+				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/tits/<<i>>.jpg"></center>'
+			elseif PCloSkirt > 0:
+				i = rand(1, 12)
+				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/tits/<<i>>.jpg"></center>'
+			end
+		end
 	else
-		i = rand(1, 7)
-		'<center><video autoplay loop src="images/locations/shared/carwash/titsflash<<i>>.mp4"></video></center>'
+		if PCloPants > 0:
+			! loop to sort through old vids since they are jumbled together in the folder but we want to display vids based on clothing
+			! will keep looping until it gets a video with shorts/pants in it
+			:loop_tits_old_vids1
+			i = rand(1, 7)
+			if i = 4 or i = 6 or i = 7: jump 'loop_tits_old_vids1'
+			'<center><video autoplay loop src="images/locations/shared/carwash/titsflash<<i>>.mp4"></video></center>'
+		elseif PCloSkirt > 0:
+			! loop to sort through old vids since they are jumbled together in the folder but we want to display vids based on clothing
+			! will keep looping until it gets a video with a skirt/dress in it
+			:loop_tits_old_vids2
+			i = rand(1, 7)
+			if i = 1 or i = 2 or i = 3 or i = 5: jump 'loop_tits_old_vids2'
+			'<center><video autoplay loop src="images/locations/shared/carwash/titsflash<<i>>.mp4"></video></center>'
+		end
+	end
+	
+	! text differences depending on whether you were paid, whether you are flashing for a customer or for the cars on the road, and what type of clothing you are wearing
+	if $ARGS[1] = 'Paid':
+		if PCloPants > 0:'You lift up your top up and show him your breasts for a few seconds. Then you quickly cover up and take your money.'
+		if PCloSkirt > 0:'You pull down your top and show him your breasts for a few seconds. Then you quickly cover up and take your money.'
+	elseif $ARGS[1] = 'Free':
+		if $ARGS[2] = 'Question':
+			if PCloPants > 0:'You lift up your top up and show him your breasts for a few seconds. You give your breasts a little shake for him before you cover up.'
+			if PCloSkirt > 0:'You pull down your top and show him your breasts for a few seconds. You give your breasts a little shake for him before you cover up.'
+		elseif $ARGS[2] = 'Flash':
+			if PCloPants > 0:'You lift up your top up and expose your breasts to the road for a few seconds. A couple cars pass by and honk in appreciation. You give your breasts a little shake before you cover up.'
+			if PCloSkirt > 0:'You pull down your top and expose your breasts to the road for a few seconds. A couple cars pass by and honk in appreciation. You give your breasts a little shake before you cover up.'
+		end
 	end
-
-	'You quickly pull up your top up and show him your naked breasts for a few seconds. You then quickly cover up and take your money.'
 	gs 'arousal', 'flashlite', 5
 	gs 'stat'
-	if sub >= 30 or bimbolevel >= 1 or pcs_horny > 4:
-		act 'Continue':gt 'zaprFWash', 'assQ'
+	
+	! can only continue with more questions if flashing for a customer
+	! also more questions will require either sub or dom or bimbo or horny as well as bimbo or prostitute clothing
+	! this has a wide range of requirements so that many different types of characters can still play this content
+	if (sub >= 10 or pcs_dom >= 10 or bimbolevel >= 1 or pcs_horny >= 5) and (PCloBimbo = 1 or PCloStyle = 4) and $ARGS[2] = 'Question':
+		! once again dynamically choosing the next scene to play based on reputation
+		carwashscene = rand(1, 100)
+		if carwashscene <= min(max(30,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),60) and carwashscene >= 50:
+			act 'Continue':gt 'zaprFWash', 'pussyQ'	
+		elseif carwashscene <= min(max(60,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),80) and carwashscene >= 60:	
+			act 'Continue':gt 'zaprFWash', 'handQ'
+		elseif carwashscene <= min(max(80,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),100) and carwashscene >= 80:	
+			act 'Continue':gt 'zaprFWash', 'blowQ'
+		else
+			act 'Continue':gt 'zaprFWash', 'assQ'
+		end
+	! flashing for cars just allows you to return to the gas station
 	else
-		act 'Run away':gt 'zaprF', 'start'
+		act 'Go back to the gas station':gt 'zaprF', 'start'
 	end
 end
 
+! $ARGS[1] = whether you got paid for this
+! $ARGS[2] = whether this act came from a customer question or just flashing for passing cars
 if $ARGS[0] = 'assFlash':
-	money += 50
+	if $ARGS[1] = 'Paid':
+		money += 50
+		pav_prostitute += rand(0,1)
+	elseif $ARGS[1] = 'Free':
+		gs 'exhibitionism', 2
+	end
+	if pcs_inhib < 30: inhib_exp += rand(2,4)
+	mood += 5
+	gs 'stat'
+	
 	gifornot = rand (1, 100)
-	if gifornot < 30:
-		i = rand(1, 2)
-		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/assflash<<i>>.jpg"></center>'
+	if gifornot < 50:
+		i = rand(1, 100)
+		if i < 10:
+			if PCloPants > 0:
+				:loop_ass_old_pics1
+				i = rand(1, 2)
+				if i = 1: jump 'loop_ass_old_pics1'
+				'<center><img <<$set_imgh>> src="images/locations/shared/carwash/assflash<<i>>.jpg"></center>'
+			elseif PCloSkirt > 0:
+				:loop_ass_old_pics2
+				i = rand(1, 2)
+				if i = 2: jump 'loop_ass_old_pics2'
+				'<center><img <<$set_imgh>> src="images/locations/shared/carwash/assflash<<i>>.jpg"></center>'
+			end
+		else
+			if PCloPants > 0:
+				i = rand(1, 16)
+				'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/butt/<<i>>.jpg"></center>'
+			elseif PCloSkirt > 0:
+				i = rand(1, 9)
+				'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/butt/<<i>>.jpg"></center>'
+			end
+		end
+	else
+		if PCloPants > 0:
+			:loop_ass_old_vids1
+			i = rand(1, 5)
+			if i = 2 or i = 3: jump 'loop_ass_old_vids1'
+			'<center><video autoplay loop src="images/locations/shared/carwash/assflash<<i>>.mp4"></video></center>'
+		elseif PCloSkirt > 0:
+			:loop_ass_old_vids2
+			i = rand(1, 5)
+			if i = 1 or i = 4 or i = 5: jump 'loop_ass_old_vids2'
+			'<center><video autoplay loop src="images/locations/shared/carwash/assflash<<i>>.mp4"></video></center>'
+		end
+	end
+	
+	if $ARGS[1] = 'Paid':
+		if PCloPants > 0:'You pull your pants down and show him your ass for a few seconds. Then you quickly cover up and take your money.'
+		if PCloSkirt > 0:'You lift your skirt up and show him your ass for a few seconds. Then you quickly cover up and take your money.'
+	elseif $ARGS[1] = 'Free':
+		if $ARGS[2] = 'Question':
+			if PCloPants > 0:'You pull your pants down and show him your ass for a few seconds. You give your ass a little shake for him before you cover up.'
+			if PCloSkirt > 0:'You lift your skirt up and show him your ass for a few seconds. You give your ass a little shake for him before you cover up.'
+		elseif $ARGS[2] = 'Flash':
+			if PCloPants > 0:'You pull your pants down and expose your ass to the road for a few seconds. A couple cars pass by and honk in appreciation. You give your ass a little shake before you cover up.'
+			if PCloSkirt > 0:'You lift your skirt up and expose your ass to the road for a few seconds. A couple cars pass by and honk in appreciation. You give your ass a little shake before you cover up.'
+		end
+	end
+	gs 'arousal', 'flashlite', 5
+	gs 'stat'
+	
+	if (sub >= 10 or pcs_dom >= 10 or bimbolevel >= 1 or pcs_horny >= 10) and (PCloBimbo = 1 or PCloStyle = 4) and $ARGS[2] = 'Question':
+		carwashscene = rand(1, 100)
+		if carwashscene <= min(max(50,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),75) and carwashscene >= 50:	
+			act 'Continue':gt 'zaprFWash', 'handQ'
+		elseif carwashscene <= min(max(75,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),100) and carwashscene >= 75:	
+			act 'Continue':gt 'zaprFWash', 'blowQ'
+		else
+			act 'Continue':gt 'zaprFWash', 'pussyQ'
+		end
 	else
-		i = rand(1, 5)
-		'<center><video autoplay loop src="images/locations/shared/carwash/assflash<<i>>.mp4"></video></center>'
+		act 'Go back to the gas station':gt 'zaprF', 'start'
+	end
+end
+
+! $ARGS[1] = whether you got paid for this
+! $ARGS[2] = whether this act came from a customer question or just flashing for passing cars
+if $ARGS[0] = 'pussyFlash':
+	if $ARGS[1] = 'Paid':
+		money += 50
+		pav_prostitute += 1
+	elseif $ARGS[1] = 'Free':
+		gs 'exhibitionism', 3
+	end
+	if pcs_inhib < 40: inhib_exp += rand(4,6)
+	mood += 5
+	gs 'stat'
+	
+	if PCloPants > 0:
+		i = rand(1, 9)
+		'<center><img <<$set_imgh>> src="images/pc/flashing/pants/outside/pussy/<<i>>.jpg"></center>'
+	elseif PCloSkirt > 0:
+		i = rand(1, 13)
+		'<center><img <<$set_imgh>> src="images/pc/flashing/dress/outside/pussy/<<i>>.jpg"></center>'
+	end
+	
+	if $ARGS[1] = 'Paid':
+		if PCloPants > 0:'You pull your pants down and show him your pussy for a few seconds. Then you quickly cover up and take your money.'
+		if PCloSkirt > 0:'You lift your skirt up and show him your pussy for a few seconds. Then you quickly cover up and take your money.'
+	elseif $ARGS[1] = 'Free':
+		if $ARGS[2] = 'Question':
+			if PCloPants > 0:'You pull your pants down and show him your pussy for a few seconds. You rub your clit a little for him before you cover up.'
+			if PCloSkirt > 0:'You lift your skirt up and show him your pussy for a few seconds. You rub your clit a little for him before you cover up.'
+		elseif $ARGS[2] = 'Flash':
+			if PCloPants > 0:'You pull your pants down and expose your pussy to the road for a few seconds. A couple cars pass by and honk in appreciation. You rub your clit a little before you cover up.'
+			if PCloSkirt > 0:'You lift your skirt up and expose your pussy to the road for a few seconds. A couple cars pass by and honk in appreciation. You rub your clit a little before you cover up.'
+		end
 	end
-	'You quickly pull down your pants and show him your ass for a few seconds. You then quickly cover up and take your money.'
 	gs 'arousal', 'flashlite', 5
 	gs 'stat'
-	if sub >= 30 or bimbolevel >= 1 or pcs_horny > 6:
-		act 'Continue':gt 'zaprFWash', 'blowQ'
+	
+	if (sub >= 10 or pcs_dom >= 10 or bimbolevel >= 1 or pcs_horny >= 15) and (PCloBimbo = 1 or PCloStyle = 4) and $ARGS[2] = 'Question':
+		carwashscene = rand(1, 100)
+		if carwashscene <= min(max(60,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),100) and carwashscene >= 60:	
+			act 'Continue':gt 'zaprFWash', 'blowQ'
+		else
+			act 'Continue':gt 'zaprFWash', 'handQ'
+		end
 	else
-		act 'Run away':gt 'zaprF', 'start'
+		act 'Go back to the gas station':gt 'zaprF', 'start'
 	end
 end
 
-if $ARGS[0] = 'blowjob':
+! $ARGS[1] = whether you got paid for this
+if $ARGS[0] = 'handjob':
+	! generate random npc for sex
 	gs 'npcgeneratec', 0, 'gas station customer', rand(18,40)
 	gs 'boyStat', $npclastgenerated
+	
+	if $ARGS[1] = 'Paid':
+		money += 200
+		pav_prostitute += 2
+	elseif $ARGS[1] = 'Free':
+		pav_sex += 2
+	end
+	if pcs_inhib < 50: inhib_exp += rand(6,8)
+	mood += 5
+	gs 'stat'
+	
+	gifornot = rand (1, 100)
+	if gifornot < 50:
+		i = rand(1, 2)
+		if i = 1:
+			'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hand.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj.jpg"></center>'
+		end
+	else
+		i = rand(0, 2)
+		if i = 0:
+			'<center><video autoplay loop src="images/shared/sex/handjob/hj<<i>>.mp4"></video></center>'
+		else
+			'<center><video autoplay loop src="images/shared/sex/handjob/HandJob<<i>>.mp4"></video></center>'
+		end
+	end
+	
+	if $ARGS[1] = 'Paid':
+		'You follow him behind the gas station, where you get the promised money, kneel down, unzip his pants and start working his shaft with your hands.'
+		gs 'arousal', 'hj', 15, 'sub', 'prostitute', 'unknown'
+	elseif $ARGS[1] = 'Free':
+		'You lead him behind the gas station, kneel down, unzip his pants and start working his shaft with your hands.'
+		gs 'arousal', 'hj', 15, 'dom', 'unknown'
+	end
+	gs 'stat'
+	
+	'After a while, the man starts pulling your head closer and closer to him. He asks you to blow him: "I''ll give you 200 <b>₽</b> if you open that mouth for me.'
+	
+	if sub >= 10 or pcs_dom >= 10 or bimbolevel >= 1 or pcs_horny >= 30:
+		if pcs_inhib >= 30 or pcs_horny >= 30:act 'Open your mouth for him':gt 'zaprFWash', 'blowjob', 'Paid', 'handjob'
+		act 'Rub harder to make him cum':gt 'zaprFWash', 'handjobEndQ'
+	else
+		act 'Rub harder to make him cum':gt 'zaprFWash', 'handjobEndQ'
+	end
+end
 
-	money += 300
-
+! $ARGS[1] = whether you got paid for this
+! $ARGS[2] = whether this act came from a customer question or already giving a customer a handjob
+if $ARGS[0] = 'blowjob':
+	if $ARGS[2] = 'Question':
+		gs 'npcgeneratec', 0, 'gas station customer', rand(18,40)
+		gs 'boyStat', $npclastgenerated
+	end
+	
+	if $ARGS[1] = 'Paid':
+		money += 200
+		pav_prostitute += 2
+	elseif $ARGS[1] = 'Free':
+		pav_sex = 2
+	end
+	if pcs_inhib < 50: inhib_exp += rand(6,8)
+	mood += 5
+	gs 'stat'
+	
 	gifornot = rand (1, 100)
-	if gifornot < 30:
+	if gifornot < 50:
 		i = rand(1, 4)
 		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/blowjob<<i>>.jpg"></center>'
 	else
 		i = rand(1, 3)
 		'<center><video autoplay loop src="images/locations/shared/carwash/sex/blowjob<<i>>.mp4"></video></center>'
 	end
-	'You follow him behind the gas station, where you get the promised money, kneel down, unzip his pants and start working his shaft with your mouth.'
-	'After a while, the man starts trying to remove your clothes. He asks you to let him fuck your pussy: "I''ll give you another 300 if you let me take your pussy! C''mon!'
-	gs 'arousal', 'bj', 15, 'sub', 'prostitute'
+	
+	if $ARGS[2] = 'Question': 
+		if $ARGS[1] = 'Paid':
+			'You follow him behind the gas station, where you get the promised money, kneel down, unzip his pants and start working his shaft with your mouth.'
+			gs 'arousal', 'bj', 15, 'sub', 'prostitute', 'unknown'
+		elseif $ARGS[1] = 'Free':
+			'You lead him behind the gas station, kneel down, unzip his pants and start working his shaft with your mouth.'
+			gs 'arousal', 'bj', 15, 'dom', 'unknown'
+		end
+	elseif $ARGS[2] = 'handjob':
+		if $ARGS[1] = 'Paid':
+			'You grab the money he tosses at you and switch to working his shaft with your mouth.'
+			gs 'arousal', 'bj', 15, 'sub', 'prostitute', 'unknown'
+		elseif $ARGS[1] = 'Free':
+			'You switch to working his shaft with your mouth.'
+			gs 'arousal', 'bj', 15, 'dom', 'unknown'
+		end
+	end
 	gs 'stat'
-	if sub >= 30 or bimbolevel >= 1 or pcs_horny > 6:
+	
+	'After a while, the man starts trying to remove your clothes. He asks you to let him fuck your pussy: "I''ll give you 400 <b>₽</b> if you let me take your pussy! C''mon!'
+	
+	if sub >= 10 or pcs_dom >= 10 or bimbolevel >= 1 or pcs_horny >= 40:
 		if pcs_vag = 0:
-			act 'Offer your ass instead (you don''t want to lose your virginity to this stranger...)':gt 'zaprFWash', 'fuckAnal'
+			if pcs_inhib >= 40 or pcs_horny >= 40: act 'Offer your ass instead (you don''t want to lose your virginity to this stranger...)':gt 'zaprFWash', 'fuckAnal', 'Paid'
 		else
-			act 'Offer your pussy':gt 'zaprFWash', 'fuckPussy'
-			act 'Offer your ass':gt 'zaprFWash', 'fuckAnal'
+			if pcs_inhib >= 40 or pcs_horny >= 40: act 'Offer your pussy':gt 'zaprFWash', 'fuckPussy', 'Paid'
+			if pcs_inhib >= 40 or pcs_horny >= 40: act 'Offer your ass':gt 'zaprFWash', 'fuckAnal', 'Paid'
 		end
 		act 'Suck harder to make him cum':gt 'zaprFWash', 'blowjobEndQ'
 	else
@@ -145,39 +502,71 @@ if $ARGS[0] = 'blowjob':
 	end
 end
 
+! $ARGS[1] = whether you got paid for this
 if $ARGS[0] = 'fuckPussy':
-	money += 300
-
+	if $ARGS[1] = 'Paid':
+		money += 400
+		pav_prostitute += 4
+	elseif $ARGS[1] = 'Free':
+		pav_sex += 4
+	end
+	if pcs_inhib < 60: inhib_exp += rand(14,16)
+	mood += 10
+	gs 'stat'
+	
 	gifornot = rand (1, 100)
-	if gifornot < 40:
+	if gifornot < 50:
 		i = rand(1, 4)
 		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/fuckpussy<<i>>.jpg"></center>'
 	else
 		i = rand(1, 4)
 		'<center><video autoplay loop src="images/locations/shared/carwash/sex/fuckpussy<<i>>.mp4"></video></center>'
 	end
-	'You bend over and let the man start fucking your pussy.'
-	gs 'arousal', 'vaginal', 30, 'sub', 'prostitute'
+	
+	if $ARGS[1] = 'Paid':
+		'You bend over and let the man start fucking your pussy after collecting your money.'
+		gs 'arousal', 'vaginal', 30, 'sub', 'prostitute', 'unknown'
+	elseif $ARGS[1] = 'Free':
+		'You bend over and let the man start fucking your pussy.'
+		gs 'arousal', 'vaginal', 30, 'dom', 'unknown'
+	end
 	gs 'stat'
+	
 	act 'Continue':gt 'zaprFWash', 'pussyEndQ'
 end
 
+! $ARGS[1] = whether you got paid for this
 if $ARGS[0] = 'fuckAnal':
-	money += 300
-
+	if $ARGS[1] = 'Paid':
+		money += 400
+		pav_prostitute += 4
+	elseif $ARGS[1] = 'Free':
+		pav_sex += 4
+	end
+	if pcs_inhib < 60: inhib_exp += rand(14,16)
+	mood += 10
+	gs 'stat'
+	
 	gifornot = rand (1, 100)
-	if gifornot < 40:
+	if gifornot < 50:
 		i = rand(1, 4)
 		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/fuckanal<<i>>.jpg"></center>'
 	else
 		i = rand(1, 4)
 		'<center><video autoplay loop src="images/locations/shared/carwash/sex/fuckanal<<i>>.mp4"></video></center>'
 	end
-	'You bend over and let the man start fucking your ass, his cock wet with your saliva.'
-	gs 'arousal', 'anal', 30, 'sub', 'prostitute'
+	
+	if $ARGS[1] = 'Paid':
+		'You bend over and let the man start fucking your ass after you collect your money. His cock is still wet with your saliva as it slides inside you.'
+		gs 'arousal', 'vaginal', 30, 'sub', 'prostitute', 'unknown'
+	elseif $ARGS[1] = 'Free':
+		'You bend over and let the man start fucking your ass. His cock is still wet with your saliva as it slides inside you.'
+		gs 'arousal', 'vaginal', 30, 'dom', 'unknown'
+	end
 	gs 'stat'
+	
 	rapePussyChance = rand(1, 100)
-	if rapePussyChance < 10:
+	if rapePussyChance <= min(max(1,pav_prostitute-60,pav_sex-60,pav_prostitute+pav_sex-120),20):
 		act 'Continue':gt 'zaprFWash', 'rapePussy'
 	else
 		act 'Continue':gt 'zaprFWash', 'analEndQ'
@@ -187,85 +576,155 @@ end
 if $ARGS[0] = 'rapePussy':
 	i = rand(1, 5)
 	'<center><video autoplay loop src="images/locations/shared/carwash/sex/hardanal<<i>>.mp4"></video></center>'
+	
 	'The man fucks your ass furiously, taking no heed to your painful moans. As you try to move away a bit to limit the depth he can reach in your ass, he slaps your buttcheeks hard and shouts:'
 	'"Stop moving bitch! Who do you think you are, that you can tell me what to do?"'
+	
 	if pcs_vag = 0:
 		'He gropes your ass, lifts it up and suddenly spots your hymen.'
 		'"What, you are a virgin? Such a tease and still a virgin, really?"'
 		rapeAnyway = rand(1, 100)
-		if rapeAnyway < 50:
-			'"It would have happened sooner or later anyway, virgin slut. Now enjoy and remember this moment!"'
-			act 'Continue':gt 'zaprFWash', 'rapePussyYes'
+		if rapeAnyway <= min(max(1,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),50):
+			'"It would have happened sooner or later anyway, virgin slut. Now enjoy and remember this moment; I know I will!"'
+			act 'Continue':gt 'zaprFWash', 'rapePussyYes', 'virgin'
 		else
-			'"Girls like you should not be acting like this! Someone should have taught you a hard lesson a long time ago."'
+			'"Girls like you should not be acting like this! Someone should have taught you a lesson a long time ago."'
 			act 'Continue':gt 'zaprFWash', 'punishSpank'
 		end
 	else
-		act 'Continue':gt 'zaprFWash', 'rapePussyYes'
+		act 'Continue':gt 'zaprFWash', 'rapePussyYes', 'normal'
 	end
-	pcs_mood = 5
-	gs 'stat'
 end
 
+! $ARGS[1] = whether you were a virgin before this or not
 if $ARGS[0] = 'rapePussyYes':
-	'He gropes your ass, lifts it up and pushes his dick inside your pussy in one thrust, all the way to the hilt!'
+	inhib_exp += rand(10,20)
+
 	i = rand(1, 3)
 	'<center><video autoplay loop src="images/locations/shared/carwash/sex/pussytoanal<<i>>.mp4"></video></center>'
-	gs 'arousal', 'vaginal', 15, 'sub', 'prostitute', 'rough'
+	
+	if $ARGS[1] = 'virgin':
+		sub += 10
+		mood -= 30
+		'He gropes your ass, lifts it up and pushes his dick inside your pussy in one thrust! You feel your hymen break and know your virginity is gone forever. What will your friends and family think of you now if they find out?'
+	elseif $ARGS[1] = 'normal':
+		sub += 6
+		mood -= 20
+		'He gropes your ass, lifts it up and pushes his dick inside your pussy in one thrust, all the way to the hilt!'
+	end
+	gs 'arousal', 'vaginal', 30, 'sub', 'prostitute', 'rough', 'rape', 'unknown'
 	gs 'stat'
-	act 'Continue':gt 'zaprFWash', 'vaginaCum'
+	
+	act 'Continue':gt 'zaprFWash', 'vaginaCum', 'rape'
+end
+
+if $ARGS[0] = 'pussyEndQ':
+	'You can feel that the man is about to orgasm. You decide to...:'
+	
+	act 'Let him cum inside your vagina':gt 'zaprFWash', 'vaginaCum', 'consensual'
+	act 'Take his cum on your face':gt 'zaprFWash', 'blowjobEndFace', 'inside'
+	act 'Let him cum inside your mouth':gt 'zaprFWash', 'blowjobEndMouth', 'inside'
 end
 
 if $ARGS[0] = 'analEndQ':
 	'You can feel that the man is about to ejaculate. You decide to...:'
+	
 	act 'Let him cum inside your ass':gt 'zaprFWash', 'assCum'
-	act 'Take his cum on your face':gt 'zaprFWash', 'blowjobEndFace'
-	act 'Let him cum inside your mouth':gt 'zaprFWash', 'blowjobEndMouth'
+	act 'Take his cum on your face':gt 'zaprFWash', 'blowjobEndFace', 'inside'
+	act 'Let him cum inside your mouth':gt 'zaprFWash', 'blowjobEndMouth', 'inside'
 end
 
-if $ARGS[0] = 'pussyEndQ':
-	'You can feel that the man is about to orgasm. You decide to...:'
-	act 'Let him cum inside your vagina':gt 'zaprFWash', 'vaginaCum'
-	act 'Take his cum on your face':gt 'zaprFWash', 'blowjobEndFace'
-	act 'Let him cum inside your mouth':gt 'zaprFWash', 'blowjobEndMouth'
+! $ARGS[1] = whether this was rape or not
+if $ARGS[0] = 'vaginaCum':
+	if pcs_inhib < 40: inhib_exp += rand(4,6)
+	pcs_vag += 1
+	pain['vaginal'] += 4
+	gs 'cum_call', ''
+	gs 'stat'
+	
+	i = rand(1, 5)
+	'<center><video autoplay loop src="images/locations/shared/carwash/sex/cumpussy<<i>>.mp4"></video></center>'
+	
+	if $ARGS[1] = 'consensual':
+		mood += 20
+		'You let him cum deep inside your vagina. A pleasant warmth fills your insides as he shoots his load deep inside you. When he pulls out, a bit of sperm leaks out of your hole.'
+	elseif $ARGS[1] = 'rape':
+		mood -= 20
+		'The pounding suddenly stops as he cums deep inside your vagina. You can feel his cum inside of you as he continues to shoot his load inside your vagina. When he pulls out, a bit of sperm leaks out of your hole.'
+	end
+	
+	gs 'arousal', 'end'
+	gs 'stat'
+	
+	act 'Go back to the gas station':gt 'zaprF', 'start'
 end
 
 if $ARGS[0] = 'assCum':
+	if pcs_inhib < 40: inhib_exp += rand(4,6)
 	minut += 5
-	pain['asshole'] += 1
+	mood += 10
 	pcs_ass += 1
+	pain['asshole'] += 1
 	gs 'cum_call', 'anus'
 	gs 'stat'
+	
 	i = rand(1, 2)
+	
 	'<center><video autoplay loop src="images/locations/shared/carwash/sex/cumanal<<i>>.mp4"></video></center>'
+	
 	'You let him cum deep inside your ass. A pleasant warmth fills your insides as he shoots his load deep inside you. When he pulls out, a bit of sperm leaks out of your hole before you can tighten your worn out anus.'
+	
 	gs 'arousal', 'end'
 	gs 'stat'
+	
 	act 'Go back to gas station':gt 'zaprF', 'start'
 end
 
-if $ARGS[0] = 'vaginaCum':
-	minut += 5
-	pcs_vag += 1
-	pain['vaginal'] += 4
-	gs 'cum_call', ''
+if $ARGS[0] = 'handjobEndQ':
+	'You can feel that the man is about to orgasm. You decide to take it...:'
+	
+	act 'On your face':gt 'zaprFWash', 'blowjobEndFace', 'outside'
+	act 'On your hands':gt 'zaprFWash', 'handjobEndHands'
+end
+
+if $ARGS[0] = 'handjobEndHands':	
+	if pcs_inhib < 30: inhib_exp += rand(2,4)
+	mood += 5
+	gs 'cum_call', 'hands'
 	gs 'stat'
-	i = rand(1, 5)
-	'<center><video autoplay loop src="images/locations/shared/carwash/sex/cumpussy<<i>>.mp4"></video></center>'
-	'You let him cum deep inside your vagina. A pleasant warmth fills your insides as he shoots his load deep inside you. When he pulls out, a bit of sperm leaks out of your hole.'
+	
+	gifornot = rand (1, 100)
+	if gifornot < 30:
+		i = rand(0, 1)
+		'<center><video autoplay loop src="images/shared/sex/cum/handjob/hand0,<<i>>.mp4"></video></center>'
+	else
+		i = rand(1, 2)
+		'<center><img <<$set_imgh>> src="images/shared/sex/cum/handjob/hand<<i>>.jpg"></center>'
+	end
+	
+	'When the man starts to ejaculate, you quickly point his cock away from your face. Your hands are covered in cum by the time he is done ejaculating. His sack was full, you can say that for sure.'
+	
 	gs 'arousal', 'end'
 	gs 'stat'
+	
 	act 'Go back to the gas station':gt 'zaprF', 'start'
 end
 
 if $ARGS[0] = 'blowjobEndQ':
 	'You can feel that the man is about to orgasm. You decide to take it...:'
-	act 'On your face':gt 'zaprFWash', 'blowjobEndFace'
-	act 'In your mouth':gt 'zaprFWash', 'blowjobEndMouth'
+	
+	act 'On your face':gt 'zaprFWash', 'blowjobEndFace', 'outside'
+	act 'In your mouth':gt 'zaprFWash', 'blowjobEndMouth', 'outside'
 end
 
+! $ARGS[1] = whether his cock was inside or outside of you before he cums on your face
 if $ARGS[0] = 'blowjobEndFace':
-	minut += 5
+	if pcs_inhib < 30: inhib_exp += rand(2,4)
+	mood += 5
+	gs 'cum_call', 'face'
+	gs 'stat'
+	
+	gifornot = rand (1, 100)
 	if gifornot < 30:
 		i = rand(1, 2)
 		'<center><video autoplay loop src="images/locations/shared/carwash/sex/cumface<<i>>.mp4"></video></center>'
@@ -273,26 +732,41 @@ if $ARGS[0] = 'blowjobEndFace':
 		i = rand(1, 4)
 		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/cumface<<i>>.jpg"></center>'
 	end
-	'When the man starts to ejaculate, you quickly take his cock out and point it towards your face. His sack was full, you can say that for sure.'
-	gs 'cum_call', 'face'
+	
+	if $ARGS[1] = 'outside':
+		'When the man starts to ejaculate, you quickly point point his cock towards your face. Your face is covered in cum by the time he is done ejaculating. His sack was full, you can say that for sure.'
+	elseif $ARGS[1] = 'inside':
+		'When the man starts to ejaculate, you quickly take his cock out of you and point it towards your face. Your face is covered in cum by the time he is done ejaculating. His sack was full, you can say that for sure.'
+	end
+	
 	gs 'arousal', 'end'
 	gs 'stat'
+	
 	act 'Go back to the gas station':gt 'zaprF', 'start'
 end
 
+! $ARGS[1] = whether his cock was inside or outside of you before he cums in your mouth
 if $ARGS[0] = 'blowjobEndMouth':
-	minut += 5
+	gs 'cum_call', 'mouth'
+	gs 'stat'
+	
 	gifornot = rand (1, 100)
-	if gifornot < 30:
+	if gifornot < 60:
 		i = rand(1, 4)
 		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/cummouth<<i>>.jpg"></center>'
 	else
 		'<center><video autoplay loop src="images/locations/shared/carwash/sex/cummouth1.mp4"></video></center>'
 	end
-	'When the man starts to ejaculate, you quickly take his cock out of your mouth while keeping it aimed straight at your tongue, giving him a good view of the cum as it flies inside your gaping mouth. His sack was full, you can say that for sure.'
-	gs 'cum_call', 'mouth'
+	
+	if $ARGS[1] = 'outside':
+		'When the man starts to ejaculate, you quickly open your mouth while keeping his cock aimed straight at your tongue, giving him a good view of the cum as it flies inside your mouth. His sack was full, you can say that for sure.'
+	elseif $ARGS[1] = 'inside':
+		'When the man starts to ejaculate, you quickly take his cock out of you and aim it straight at your tongue, giving him a good view of the cum as it flies inside your mouth. His sack was full, you can say that for sure.'
+	end
+	
 	gs 'arousal', 'end'
 	gs 'stat'
+	
 	act 'Continue':gt 'zaprFWash', 'blowjobEndMouthQ'
 end
 
@@ -304,143 +778,252 @@ end
 
 
 if $ARGS[0] = 'blowjobEndMouthSwallow':
+	if pcs_inhib < 40: inhib_exp += rand(4,6)
 	swallow += 1
-	'You gulp down the mouthful of sperm and then present your tongue as a proof that all of his seed is now in your belly.'
+	sub += 1
+	mood += 10
+	gs 'stat'
+	
 	i = rand(1, 4)
 	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/swallow<<i>>.jpg"></center>'
+	
+	'You gulp down the mouthful of sperm and then present your tongue as a proof that all of his seed is now in your belly.'
 	'The man smiles, slaps you mildly on your face and says: "What a nice young slut you are. Next time I need a refill, I''ll be sure to stop by."'
+	
+	gs 'arousal', 'end'
+	gs 'stat'
+	
 	act 'Go back to the gas station':gt 'zaprF', 'start'
 end
 
 if $ARGS[0] = 'blowjobEndMouthSpit':
-	'You spit the load of sperm down between the legs of your customer. He doesn''t seem happy about it...'
-	i = rand(1, 3)
+	if pcs_inhib < 30: inhib_exp += rand(2,4)
+	pcs_dom += 3
+	gs 'stat'
+	
 	gifornot = rand (1, 100)
-	if gifornot > 30:
-	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/spit<<i>>.jpg"></center>'
+	if gifornot > 50:
+		i = rand(1, 3)
+		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/spit<<i>>.jpg"></center>'
 	else
-	'<center><video autoplay loop src="images/locations/shared/carwash/sex/spit1.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/shared/carwash/sex/spit1.mp4"></video></center>'
 	end
+	
+	'You spit the load of sperm down between the legs of your customer. He doesn''t seem happy about it...'
 	'His face darkens and he says: "What, my cum isn''t good enough for you to swallow? I''ll teach you bitch!"'
 	'He moves closer to you with an angry look!'
+	
 	act 'Run back to the gas station':gt 'zaprFWash', 'runback'
 end
 
 if $ARGS[0] = 'runback':
+	minut += 5
+	! runSuccess uses a simpler version of the formula used with carwashscene
+	! just based on strength and agility; uses whichever is higher to try and run away
+	! min 25 percent chance; max 75 percent chance for this initial getaway
 	runSuccess = rand(1, 100)
-	if runSuccess > 50:
-		'You managed to escape his grasp!'
-		act 'Continue':gt 'zaprF', 'start'
+	if runSuccess <= min(max(25,pcs_stren,pcs_agil),75):
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/turn_back.jpg"></center>'
+		
+		'You managed to escape his grasp! You take a quick look behind you to make sure he''s not following you before heading back to the gas station.'
+		
+		gs 'arousal', 'end'
+		gs 'stat'
+		act 'Escape':gt 'zaprF', 'start'
 	else
 		pain['cheeks'] += 2
 		pain['head'] += 2
 		pain['mouth'] += 2
 		pain['neck'] += 4
+		
 		'<center><video autoplay loop src="images/locations/shared/carwash/sex/punishbeatface.mp4"></video></center>'
+		
 		'You weren''t quick enough and he caught you. He pushes you down and starts to slap your face!'
+		
 		gs 'arousal', 'end'
 		gs 'stat'
+		
 		act 'Endure his punishment':gt 'zaprFWash', 'punish'
+		! gave doms the choice to fight back as long as they have some energy related stat with something left even if they lost the roll for runSuccess
+		! these values are based off of the cheat menu values for players who turn off these stats as they can never go below 35
+		if dom > 0 and (pcs_energy > 35 or pcs_hydra > 35 or pcs_sleep > 35):
+			act 'Push him off of you and escape':gt 'zaprFWash', 'fight'
+		end
+	end
+end
+
+if $ARGS[0] = 'fight':
+	! maybe at some point this could be an actual fight but with the state of the combat logic is in this will just be left to drain a stat to escape
+	! these values are based off of the cheat menu values for players who turn off these stats as they can never go below 35
+	if pcs_energy >= 35: 
+		pcs_energy -= 35
+	elseif pcs_hydra >= 35: 
+		pcs_hydra -= 35
+	elseif pcs_sleep >= 35: 
+		pcs_sleep -= 35
 	end
+	
+	gs 'arousal', 'end'
+	gs 'stat'
+	
+	gt 'zaprF', 'start'
 end
 
 if $ARGS[0] = 'punish':
+	! once again punishType uses the same logic as carwashscene for dynamic choices
 	punishType = rand(1, 100)
-	if punishType < 33:
-		gt 'zaprFWash', 'punishSpank'
-	elseif punishType < 66:
+	if punishType <= min(max(50,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),75) and punishType >= 50:	
+		gt 'zaprFWash', 'punishAnal'
+	elseif punishType <= min(max(75,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),100) and punishType >= 75:	
 		gt 'zaprFWash', 'punishPussyQ'
 	else
-		gt 'zaprFWash', 'punishAnal'
+		gt 'zaprFWash', 'punishSpank'
 	end
 end
 
 if $ARGS[0] = 'punishSpank':
-	minut += 20
 	pcs_horny = 0
+	pcs_mood -= 10
+	sub += 2
+	inhib_exp += rand(2,4)
 	pain['asscheeks'] += 5
+	gs 'stat'
+	
 	'<center><video autoplay loop src="images/locations/shared/carwash/sex/punishspank.mp4"></video></center>'
-	'The angry man bends you over an old chair and starts to spank your ass, hard.'
+	
+	'The angry man drags you to a more secluded area, bends you over and starts to spank your ass very hard.'
 	'After twenty minutes of ruthless punishment, you can finally crawl away with your burning ass.'
-	abductionChance = rand(1, 100)
-	if abductionChance <= 10 or sub > 90 and leonidSlave = 0:
-		act 'Continue':gt 'zaprFWash', 'getAbducted'
-	else
-		act 'Get back to the gas station':gt 'zaprF', 'start'
+	
+	gs 'arousal', 'foreplay', 15, 'sub', 'rough', 'unknown'
+	gs 'arousal', 'end'
+	gs 'stat'
+	
+	! reputationScalar has a min of 1 and a max of 180; the more well known you are the higher the chance of being abducted
+	reputationScalar = min(max(1,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),180)
+	! fitnessScalar has a min of 1 and a max of 90; the more fit you are the lower the chance of being abducted
+	fitnessScalar = min(max(1,pcs_stren,pcs_agil),90)
+	! abductionChance is calculated using a combination of these 2 values
+	! in the beginning of the game fitness will usually outweigh your reputation and keep your abductionChance very low (min is 0)
+	! once reputation begins to rise it will even out with the fitness and abductionChance will stabilize at an average value (around 45)
+	! but fitness caps at 100 and reputation does not so eventually if your reputation grows to be very large the abductionChance will continue to rise (max of 90)
+	abductionChance = reputationScalar-fitnessScalar
+	if (abductionChance > 0 and abductionChance <= rand(1,100)) or sub > 99:
+		'But your perpetrator isn''t done with you.'
+		'He catches you again, drags you to his car and pushes you into the trunk...'
+		'You have a feeling this probably will not go well for you...'
+		
+		act 'Cry for help':gt 'abduction', 'start'
+	else		
+		'Your perpetrator stands up and just watches as you crawl away in pain.'
+		'He turns around and calmly walks away, leaving you alone.'
+		
+		act 'Escape':gt 'zaprF', 'start'
 	end
-	pcs_mood = 5
+end
+
+if $ARGS[0] = 'punishAnal':
+	pcs_horny = 0
+	pcs_mood -= 20
+	sub += 4
+	pain['asshole'] += 6
+	inhib_exp += rand(5,10)
+	gs 'cum_call', 'anus'
 	gs 'stat'
+	
+	i = rand(1, 3)
+	'<center><video autoplay loop src="images/locations/shared/carwash/sex/punishanal<<i>>.mp4"></video></center>'
+	
+	'The angry man drags you to a more secluded area, bends you over, and sticks a finger in your ass.'
+	'Your anus fully exposed, he starts fucking it ruthlessly.'
+	'After half an hour of rough assfucking he releases his grip on you so you can finally crawl away; your aching ass sore from the brutal penetration.'
+	
+	gs 'arousal', 'anal', 30, 'sub', 'rough', 'rape', 'unknown'
 	gs 'arousal', 'end'
 	gs 'stat'
+	
+	reputationScalar = min(max(1,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),180)
+	fitnessScalar = min(max(1,pcs_stren,pcs_agil),90)
+	abductionChance = reputationScalar-fitnessScalar
+	if (abductionChance > 0 and abductionChance <= rand(1,100)) or sub > 99:
+		'But your perpetrator isn''t done with you.'
+		'He catches you again, drags you to his car and pushes you into the trunk...'
+		'You have a feeling this probably will not go well for you...'
+		
+		act 'Cry for help':gt 'abduction', 'start'
+	else		
+		'Your perpetrator stands up and just watches as you crawl away in pain.'
+		'He turns around and calmly walks away, leaving you alone.'
+		
+		act 'Escape':gt 'zaprF', 'start'
+	end
 end
 
 if $ARGS[0] = 'punishPussyQ':
-	'The angry man drags you to an old house. He bends you over and starts to rub your pussy.'
+	'The angry man drags you to a more secluded area. He bends you over and starts to rub your pussy.'
+	
 	if pcs_vag = 0:
 		'Suddenly he remarks: "What? You''re a virgin? Such slutty tease and still a virgin?'
+		
 		penetrate = rand (1, 100)
-		if penetrate <= 100 and penetrate > 66:
-			'Someone should have done this long time ago!'
-			act 'Endure':gt 'zaprFWash', 'punishSpank'
-		elseif penetrate <= 66 and penetrate > 33:
+		if penetrate <= min(max(50,pav_prostitute-30,pav_sex-30),75) and penetrate >= 50:	
 			'I''ll spare your virginity but you''ll get fucked anyway. Sluts have more than one hole for a reason, right?'
+			
 			act 'Endure':gt 'zaprFWash', 'punishAnal'
+		elseif penetrate <= min(max(75,pav_prostitute-30,pav_sex-30),100) and penetrate >= 75:	
+			'This makes it even better! I''ll enjoy your tears even more! I haven''t had a virgin in forever!'
+			
+			act 'Endure':gt 'zaprFWash', 'punishPussy', 'virgin'
 		else
-			'This makes it even better! I''ll enjoy your tears even more!'
-			act 'Endure':gt 'zaprFWash', 'punishPussy'
+			'Someone should have done this a long time ago, but I''ll spare you penetration this time!'
+			
+			act 'Endure':gt 'zaprFWash', 'punishSpank'
 		end
 	else
-		'Let''s try this teenie snatch!'
-		act 'Endure':gt 'zaprFWash', 'punishPussy'
+		'Let''s try what you''ve been teasing, you ungrateful whore!'
+		act 'Endure':gt 'zaprFWash', 'punishPussy', 'normal'
 	end
 end
 
+! $ARGS[1] = whether you were a virgin before this or not
 if $ARGS[0] = 'punishPussy':
+	pcs_horny = 0
 	pain['vaginal'] += 4
+	inhib_exp += rand(5,10)
 	gs 'cum_call', ''
+	gs 'stat'
+	
 	i = rand(1, 5)
 	'<center><video autoplay loop src="images/locations/shared/carwash/sex/punishpussy<<i>>.mp4"></video></center>'
-	'Your pussy fully exposed, he starts fucking it ruthlessly.'
-	'After half an hour of destroying your cunt he releases his grip on you so you can finally crawl away; your aching pussy sore from the brutal penetration.'
-	gs 'arousal', 'vaginal', 30, 'sub', 'rough'
-	gs 'arousal', 'end'
-	gs 'stat'
-	abductionChance = rand(1, 100)
-	if abductionChance <= 10 or sub > 90:
-		act 'Continue':gt 'zaprFWash', 'getAbducted'
-	else
-		act 'Get back to the gas station':gt 'zaprF', 'start'
+	
+	if $ARGS[1] = 'virgin':
+		sub += 10
+		'Your pussy fully exposed, he slowly inserts his cock inside of you. He pushes right up against your hymen, savoring the moment. Suddenly, you feel your hymen break and know your virginity is gone forever. What will your friends and family think of you now if they find out?'
+		pcs_mood -= 40
+	elseif $ARGS[1] = 'normal':
+		sub += 6
+		'Your pussy fully exposed, he starts fucking it ruthlessly.'
+		pcs_mood -= 20
 	end
-	pcs_mood = 5
-	gs 'stat'
-end
-
-if $ARGS[0] = 'punishAnal':
-	pain['asshole'] += 6
-	gs 'cum_call', 'anus'
-	pcs_mood = - 15
-
-	i = rand(1, 3)
-	'<center><video autoplay loop src="images/locations/shared/carwash/sex/punishanal<<i>>.mp4"></video></center>'
-	'Your anus fully exposed, he starts fucking it ruthlessly.'
-	'After half an hour of rough assfucking he releases his grip on you so you can finally crawl away; your aching ass sore from the brutal penetration.'
-	gs 'arousal', 'anal', 30, 'sub', 'rough'
+	'After half an hour of destroying your cunt he releases his grip on you so you can finally crawl away; your aching pussy sore from the brutal penetration.'
+	
+	gs 'arousal', 'vaginal', 30, 'sub', 'rough', 'rape', 'unknown'
 	gs 'arousal', 'end'
 	gs 'stat'
-	abductionChance = rand(1, 100)
-	if abductionChance <= 10 or sub > 90:
-		act 'Continue':gt 'zaprFWash', 'getAbducted'
-	else
-		act 'Get back to the gas station':gt 'zaprF', 'start'
+	
+	reputationScalar = min(max(1,pav_prostitute-30,pav_sex-30,pav_prostitute+pav_sex-60),180)
+	fitnessScalar = min(max(1,pcs_stren,pcs_agil),90)
+	abductionChance = reputationScalar-fitnessScalar
+	if (abductionChance > 0 and rand(1,100) <= abductionChance) or sub > 99:
+		'But your perpetrator isn''t done with you.'
+		'He catches you again, drags you to his car and pushes you into the trunk...'
+		'You have a feeling this probably will not go well for you...'
+		act 'Cry for help':gt 'abduction', 'start'
+	else		
+		'Your perpetrator stands up and just watches as you crawl away in pain.'
+		'He turns around and calmly walks away, leaving you alone.'
+		act 'Escape':gt 'zaprF', 'start'
 	end
 end
 
-if $ARGS[0] = 'getAbducted':
-	'But your perpetrator isn''t done with you.'
-	'He catches you again, drags you to his car and pushes you into the trunk...'
-	'You probably made a terrible mistake...'
-	act 'Cry for help':gt 'abduction', 'start'
-end
-
 --- zaprFWash ---------------------------------
 

Some files were not shown because too many files changed in this diff