locations/BDSM_training.qsrc

@@ -521,7 +521,7 @@ if $ARGS[0] = 'd_start':
 				'Elektra helps the sub into a harness and boots then points to the floor. The submissive women kneels down, being careful to position her legs and arms very precisely.'
 				'"This is the "slave" position, it displays your dominance over the sub. A dominant can do anything to a sub, but must not cause lasting harm."'
 				'"You must also stop immediately if they use their safe-word, this is always "red". As soon as they say "red", the session is ended. If their mouth is busy, they can shake their head 3 times and hum "and-and". If they can''t do either they can slam the palm of their hand. Clear?"'
-				gs 'arousal', 'voyeur', 10
+				gs 'arousal', 'erotic', 10
 				gs 'stat'
 				act 'Carry on':
 					*clr & cla

locations/Katja_Tanga.qsrc

@@ -152,7 +152,7 @@ if $ARGS[0] = 'school3':
 	'You give a slightly disappointed frown. "So still wearing panties huh.", Katja blushes and whispers to you. "Yes but I''m not wearing a bra."'
 	act 'Share':
 		*clr & cla
-		gs 'arousal', 'voyeur', -5
+		gs 'arousal', 'erotic', -5
 		gs 'arousal', 'foreplay', -5, 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -182,7 +182,7 @@ if $ARGS[0] = 'school4':
 		'Dejected at her reaction. "Fine, whatever.", You said as you turned to go. Katja afraid that she had offended you, grabs your hand and pulls you into a passionate kiss. "Don''t pout sweetie, I''m sorry. Let me make it up to you." she says.'
 		act 'Watch':
 			*clr & cla
-			gs 'arousal', 'voyeur', -5
+			gs 'arousal', 'erotic', -5
 			if n_tanga = 1:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_2.jpg"></center>'
 				'Katja sits down on the floor and parts her legs as she pulls aside her panties.'
@@ -196,7 +196,7 @@ if $ARGS[0] = 'school4':
 				'Turning away from you and bending over Katja lifts up her skirt and pulls down her panties, showing you her lovely ass and pussy. She starts to pull up her panties as you say pouting. "Is that it?"'
 				act '"What that''s all?"':
 					*clr & cla
-					gs 'arousal', 'voyeur', -5
+					gs 'arousal', 'erotic', -5
 					gs 'arousal', 'end'
 					Katja_tanga = 1 & ! 1 = Katja without panties 0 = in panties
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_5.jpg"></center>'
@@ -212,7 +212,7 @@ end
 
 if $ARGS[0] = 'school5':
 	*clr & cla
-	gs 'arousal', 'voyeur', -5
+	gs 'arousal', 'erotic', -5
 	gs 'arousal', 'end'
 	KatjaSlut += 1
 	Katja_tanga = 1 & ! 1 = Katya without panties 0 = in panties
@@ -239,13 +239,13 @@ if $ARGS[0] = 'dance':
 			'But Katja only blushed in embarrassment, clasping her hands. "I''m not as brave as you to go to a dance without my panties on."'
 			gs 'arousal', 'end'
 		elseif KatjaSlut <= 40:
-			gs 'arousal', 'voyeur', -5
+			gs 'arousal', 'erotic', -5
 			gs 'arousal', 'end'
 			KatjaHorny += 10
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco4.jpg"></center>'
 			'Katja looked around to make sure no one was watch and then turns away and partially bends over lifting her skirt. Showing you she was wearing a thong and giving you a nice view of her ass.'
 		elseif KatjaSlut <= 60:
-			gs 'arousal', 'voyeur', -5
+			gs 'arousal', 'erotic', -5
 			gs 'arousal', 'end'
 			KatjaHorny += 10
 			KatjaSlut += 1
@@ -259,7 +259,7 @@ if $ARGS[0] = 'dance':
 			end
 		elseif KatjaSlut <= 80:
 			if	KatjaHorny > 70:
-				gs 'arousal', 'voyeur', -5
+				gs 'arousal', 'erotic', -5
 				KatjaHorny += 10
 				KatjaSlut += 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco6_1.jpg"></center>'
@@ -288,7 +288,7 @@ if $ARGS[0] = 'dance':
 				'You began to look on with anticipation, but Katja just pulls down her top showing a little extra cleavage before stopping. After seeing your disappointed look,  she sticks out her tongue and turns away. That redheaded bitch you think and nearly say it, but you hold your tongue.'
 			end
 		else
-			gs 'arousal', 'voyeur', -10
+			gs 'arousal', 'erotic', -10
 			gs 'arousal', 'end'
 			KatjaHorny += 10
 			KatjaSlut += 1

locations/Komp.qsrc

@@ -155,7 +155,7 @@ if $ARGS[0] = 'porno':
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/porno.jpg"></center>'
 			'You find a video you think you''d enjoy, and spend some time watching it. Wow, that girl is so lucky...'
 
-			gs 'arousal', 'voyeur_sex', 60
+			gs 'arousal', 'porn', 60
 			gs 'stat'
 
 			act 'The video ends...':gt 'komp', 'porno'

locations/ParkKafe.qsrc

@@ -636,7 +636,7 @@ if $ARGS[0] = 'woman':
 		'You meet her eyes and she subtlety signals with her eyes that you should take a look farther down as she slyly smiles.'
 		'Picking up the hint, your eyes slowly scan down her body, stopping by her legs. All of a sudden, she spreads her legs, and to your surprise she''s not wearing any panties, fully showing you her pussy.'
 		'You automatically turn red out of embarrassment, but she just laughs it off then goes back to playing with her food.'
-		gs 'arousal', 'voyeur', 5, 'lesbian'
+		gs 'arousal', 'erotic_nudity', 5, 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'parkKafe', 'end', 'cafe'

locations/VoltrenerSexShower.qsrc

@@ -87,9 +87,8 @@ if $ARGS[0] = '2':
 				pcs_mood = 100
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower9.mp4"></video></center>'
 				'You look at his cock as if spellbound... At the same time caressing your Clit, and struggling to suppressing a groan. You see his hand stroking his member, the head appearing, and disappearing. Shaking his balls... The coach groans, and his dick squirts straight at you. Sperm splashes on your body, destroying your resolve, you shake in a powerful orgasm. Through the waves of orgasm you hardly hear what the coach is saying, "That was fun, we should do it again sometime."'
-				gs 'arousal', 'voyeur', -10
 				$orgasm_or = 'yes'
-				gs 'arousal', 'masturbate', 10
+				gs 'arousal', 'masturbate', 10, 'exhibitionism'
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Finish shower': gt 'gdksport', 'start'

locations/anushapt.qsrc

@@ -459,47 +459,47 @@ if $ARGS[0] = 'nushshower':
 						'<center><img <<$set_imgh>> src="images/pc/pictures/anushka/2.jpg"></center>'
 						'You move around to get in a better spot. "Don''t be like that. Show me a little skin. Come on, you know you want to," you say in a teasing tone.'
 						'She smiles a bit that quickly turns into a smirk as she turns her back to you. The towel drops to show off her back.'
-						gs 'arousal', 'voyeur', 1
+						gs 'arousal', 'erotic', 1
 						gs 'stat'
 						act 'That''s better':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/pc/pictures/anushka/3.jpg"></center>'
 							'"Oh yeah, that''s it... work it girl. Now show me a little more." You do your best to sound like a professional photographer getting a model to work the camera even if all you have is your smart phone.'
-							gs 'arousal', 'voyeur', 2
+							gs 'arousal', 'erotic_nudity', 2
 							gs 'stat'
 							act 'More':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/pc/pictures/anushka/4.jpg"></center>'
 								'She giggles a bit at that and turns her side to you. The towel is slowly opened to tease you a bit with her nudity while striking a sexy pose.'
 								'"Yeah that''s it. Give me a little more. Let''s see that hot little body of yours"'
-								gs 'arousal', 'voyeur', 2
+								gs 'arousal', 'erotic_nudity', 2
 								gs 'stat'
 								act 'Perfect':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/pc/pictures/anushka/5.jpg"></center>'
 									'She turns towards you and fully opens the towel. Striking another sexy pose she gives you a full frontal view while you keep taking her picture.'
 									'You say to her with a little encouragement, "Woo... that''s it... perfect. Work that camera girl. Now lets see that cute little ass of yours."'
-									gs 'arousal', 'voyeur', 2
+									gs 'arousal', 'erotic_nudity', 2
 									gs 'stat'
 									act 'Cute little ass':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/pc/pictures/anushka/6.jpg"></center>'
 										'She lets the towel complete drop away and turns to put one foot on the edge of the tub. This gives you a nice view of her backside.'
 										'"Yeah, show me that cute little ass," you tell her as you take a couple of more pictures until she throws the towel at you.'
-										gs 'arousal', 'voyeur', 2
+										gs 'arousal', 'erotic_nudity', 2
 										gs 'stat'
 										act 'Continue':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom/selfie1.jpg"></center>'
 											'She steps out of the tub and looks in the mirror. "Damn, I do look hot" She picks up her own phone and takes a nude selfie of herself. She looks over at you and waves for you to come over. "Come on, lets take a selfie together."'
-											gs 'arousal', 'voyeur', 1
+											gs 'arousal', 'erotic_nudity', 1
 											gs 'stat'
 											act 'Selfie':
 												*clr & cla
 												showerphotos = 2
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom/selfie2.jpg"></center>'
 												'You move over to stand next to her, while she holds up her phone and takes a couple of selfies of the two of you together. It has to look a little odd considering that she''s completely naked while you are fully dressed. However, who are you to judge?'
-												gs 'arousal', 'voyeur', 1
+												gs 'arousal', 'erotic_nudity', 1
 												gs 'stat'
 												act 'Go to her room': gt 'anushapt', 'shower_wait'
 											end
@@ -531,7 +531,7 @@ if $ARGS[0] = 'shower_wait':
 	elseif showerphotos = 2:
 		'With the impromptu photo shoot and selfies done the two of you head to her room. She walks from the bathroom to her room, completely naked. Once inside she quickly gets dressed, while you take a seat on her bed as she does. Once she is fully dressed she flops down on the bed next to you.'
 	end
-	gs 'arousal', 'voyeur', 2
+	gs 'arousal', 'erotic_nudity', 2
 	gs 'arousal', 'end'
 	act 'Get out of the bed': gt 'anushapt','anushroom'
 	act 'Chat': gt 'anushkachat', 'chat'
@@ -800,7 +800,7 @@ if $ARGS[0] = 'computer':
 			'You start the computer up. It loads quickly, much faster than what you are used to, so it must be a pretty high end laptop. Once it''s done loading you click on the internet browser and look through her browsing history plus bookmarks.'
 			*nl
 			'You see that there are all kinds of porn sites and videos she''s watched. There are a lot of public exhibitionist porn that recorded a variety of different sex acts. There are some boy-girl stuff, a lot of it rough sex and/or anal, there is a fair bit of interracial porn as well, and a lot of lesbian sex that especially feature with strap-ons. You feel yourself getting aroused as you keep browsing.'
-			gs 'arousal', 'voyeur', 10
+			gs 'arousal', 'porn', 10
 			act 'Turn the computer off':gt 'anushapt','anushroom'
 			if AnushkaLoc = 0:
 				act 'Masturbate':
@@ -808,7 +808,7 @@ if $ARGS[0] = 'computer':
 					'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushcmast.mp4"></video></center>'
 					'While browsing her huge list of pornos you find one that you like and lean back in the chair and start masturbating. Before long you completely forget that you are in Anushka''s bedroom masturbating to her porn on her laptop.'
-					gs 'arousal', 'voyeur', 10
+					gs 'arousal', 'porn', 10
 					act 'Continue':
 						*clr & cla
 						'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
@@ -882,7 +882,7 @@ if $ARGS[0] = 'agreeporn':
 	'She grins then connects the TV to the laptop to start playing some lesbian porn. You can''t help, but notice the porno is about two teenage girls having a sleepover in one of their bedrooms. They talk for a bit then as the conversation continues it quickly leads to them having sex.'
 	*nl
 	'You feel yourself getting really aroused from watching the porno. You glance over and notice Anushka has her hand in her panties, while her pants are around her knees, masturbating with you sitting right next to her. You are stunned at her apparent easiness in the situation, so quickly look away. At first, you try to pretend that she isn''t playing with herself, but you can''t help yourself from sneaking the occasional peek at her. It looks like she''s having fun. If she doesn''t think there is anything wrong with it then it''s probably not a big deal to her.'
-	gs 'arousal', 'voyeur', 10
+	gs 'arousal', 'porn', 10
 	gs 'stat'
 	act 'Leave Anushka''s room': gt 'anushapt','hallway'
 	act 'Just watch':
@@ -890,7 +890,7 @@ if $ARGS[0] = 'agreeporn':
 		'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 		'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/watchporn.jpg"></center>'
 		'You do your best to ignore the fact that Anushka is laying right next to you with her hand between her legs and masturbating for all she''s worth. This happens as the two of you continue to watch the porno. Long before the video is over Anushka''s breathing gets faster and she starts moaning, softly at first, then louder and louder until finally she arches her back to have a shuddering orgasm. After giving herself a few moments to come down from her little pleasure high, she pulls her pants back up to get off the bed then turns the porno off. She turns to look you in your eyes. "I don''t know about you, but I could use a snack. Come on let''s go raid the kitchen." She heads out of her room waving for you to follow her. You''re not sure of what else to do, so you get up to follow along behind her.'
-		gs 'arousal', 'voyeur', 10
+		gs 'arousal', 'porn', 10, 'lesbian'
 		gs 'stat'
 		gs 'arousal', 'end'
 		act 'Follow her': gt 'anushapt','snack'
@@ -907,9 +907,8 @@ if $ARGS[0] = 'agreeporn':
 			'You think, "Well, fuck it." The video has really turned you on and she obviously doesn''t think it''s big deal to masturbate in front of you. With that thought you begin to masturbate as well. Though, you find it a little hard to get into it properly knowing that she is right next to you. After a while, you start to relax and get more comfortable with the situation as you begin to give in to the sensations. Your arousal grows more and more. You glance over at Anushka to see her looking at you with a huge grin on her face. She is clearly enjoying the fact that the two of you are playing with yourselves together. At this point, neither of you is really watching the porno anymore, instead you just lay back on the bed side by side while looking at each other as you both masturbate.'
 			*nl
 			'Some time later you feel Anushka speed up a bit next to you. Her soft moans suddenly get louder then she starts shuddering in orgasm. This is just enough to get you right to the edge and you quicken your own pace as a result. Within moments a huge orgasm rocks your body that complete overwhelms your senses. By the time you have fully recovered, Anushka has already turned off the porno and is standing there with her pants back up smiling at you. She nods towards the door. "I don''t know about you, but I could really use a snack. Come on lets go raid the kitchen." She heads out of her room waving for you to follow. She is acting like everything is completely normal. Who knows, maybe for her, it is. You get up to follow her out.'
-			gs 'arousal', 'voyeur', 10
 			$orgasm_or = 'yes'
-			gs 'arousal', 'masturbate', 10, 'exhibitionism'
+			gs 'arousal', 'masturbate', 10, 'lesbian'
 			gs 'arousal', 'end'
 			gs 'stat'
 			minut -= 15

locations/anushkaev1.qsrc

@@ -326,14 +326,14 @@ if $ARGS[0] = 'watch_nushrad':
 		*clr & cla
 		'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad2.jpg"></center>'
 		'"Fuck I am so hard, come on and suck my dick." He says after giving her bare butt a slap hard enough to leave a red outline of his hand on her ass. She yelps a little and then turns around on the bed. While lying on the bed, she starts sucking his dick, before to long he grabs her by the sides of the head and starts just fucking her mouth with his dick, often gagging her, as he shoves his dick balls deep down her throat. Then he forces his dick balls deep into her mouth and holds her there as she gags for several moments. He finally pulls his dick out of her mouth leaving her choking and gasping for breath.'
-		gs 'arousal', 'voyeur', 5, 'rough'
+		gs 'arousal', 'voyeur_sex', 5, 'rough'
 		gs 'stat'
 		act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
 		act 'Keep watching':
 			*clr & cla
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad3.jpg"></center>'
 			'While she is catching her breath, he reaches past her and grabs her by the leg, then spins her around on the bed, and drags her towards him until her butt is almost hanging off the edge of the bed. He pushes her legs apart just as she seems to have finally caught her breath, and then he just shoves his dick in her pussy. She winces a little biting her lower lip. Obviously not as wet and ready as she would have liked to be before starting sex. He doesn''t seem to notice or doesn''t care, as he just starts hammering away at her pussy, balls deep. Each thrust making her grunt, though her grunts slowly turn into moans of pleasure.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 			act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
 			act 'Walk in and join them': gt 'anushkaev1', 'rad3some'
@@ -344,7 +344,7 @@ if $ARGS[0] = 'watch_nushrad':
 				'Just as she is starting to moan in pleasure even louder than him, he pulls out of her and flips her over, grabbing her butt and giving her butt cheek a hard squeeze, followed by another hard slap that leaves a red outline of his hand on her bare ass, causing her to yelp again. "Fuck you have such a nice ass Nush." He tells her, she apparently knows what that means, as she quickly grabs the bottle of lube out of her night stand. But before she can use it, he grabs it from her. "Give me that, you always use to much." He growls, then he squirts just a little onto the head of his dick, rubbing it down the shaft of his dick. Once done with that he briefly rubs his fingers between her butt cheeks. It doesn''t look like he used much lube to you, nor hardly applied any to her.'
 				*nl
 				'He pushes her down until she is laying on her stomach, as he tosses the bottle aside and then leans forward, pushing his dick between her butt cheeks as she struggles a bit. "Rad you didn''t use enough lube." She says as she winces as he keeps struggling to push his dick between her butt cheeks. "Shut up Nush, this feels better, you feel really tight." He says just as shoves his hips forward hard, which causes her to jump a little and cry out in pain. "Ow fuck Rad, that hurt, you need to use more lube." She says in a obviously pain stressed voice. He pushes her head against the mattress. You can see her wincing in pain and white knuckling her grip on the bed sheets. "See I knew you didn''t need much lube, fuck your ass is tight." He says as he struggles to force his <<dick>>cm <<$dick_girth>> cock balls deep into her ass, moaning in pleasure as he does.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 				act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
 				act 'Keep watching':
@@ -352,21 +352,21 @@ if $ARGS[0] = 'watch_nushrad':
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad5.jpg"></center>'
 					'He pulls his dick almost all the way out of her asshole and then slams it back in balls deep, moaning with pleasure as he does. Meanwhile she cries out a little, wincing in pain, she tries to pull away a little, but he just pulls her back. "Oh fuck! Not so hard Rad."'
 					'"Oh please all you bitches love being roughly fucked by a man, like the sluts you are. So just shut up and enjoy it." He says as he starts hammering her ass, with long full length hard strokes. She grunts in pain a lot more than she moans in pleasure, but you don''t think Rad can tell the difference or maybe he just doesn''t care.'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 					act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
 					act 'Keep watching':
 						*clr & cla
 						'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad6.jpg"></center>'
 						'He grabs ahold of her hips and pulls her hips up until she is on her knees. Then he shoves her face back into the mattress, before he goes back to hammering away at her ass. She places a hand on his hip in a effort to slow him down a little and keep him from going balls deep in her butthole, he just roughly shoves her hand away and slaps her hard on the ass. She tries several more times to reach back and slow him down and keep him from going so deep, each time he roughly shoves her hands away. "Please Rad not so rough or use more lube." She pleads with him. "Fucking take it bitch, take it!" He growls, as redoubles his efforts and just seems to fuck her ass even harder'
-						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'voyeur_sex', 5
 						gs 'stat'
 						act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
 						act 'Keep watching':
 							*clr & cla
 							'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad7.jpg"></center>'
 							'She starts pulling away, even the hand on her hip doesn''t completely stop her from pulling away. He leans forward as she does, putting more weight on her, slowly her hips move down more than away until she is laying flat on her stomach again. He clamps his hands on hips, pinning her in place between him and the mattress, to keep her from pulling away more. Her bed sheets are tightly balled up in her clenched fists as she white knuckle grips the sheets. "Please Rad just slow down a little, please!" She pleads with him. He ignores her pleas and continues to hammer her ass with full hard strokes. He starts moaning louder, "Fuck yes, god damn your ass is so fucking tight, I''m about to bust a nut." If you had to guess she is more than ready for him to finish.'
-							gs 'arousal', 'voyeur', 5
+							gs 'arousal', 'voyeur_sex', 5
 							gs 'stat'
 							act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
 							act 'The cum prize':
@@ -375,7 +375,7 @@ if $ARGS[0] = 'watch_nushrad':
 								'He suddenly pulls his dick out of her asshole and starts cumming all over her butt cheeks, moaning loudly as he does. While she lets out a relieved sigh, as a relieved look washes over her face, obviously glad he is finally finished. When he finishes cumming on her ass, he lets go of her and steps away. "Fuck Nush you are the best fucking slut, I have ever fucked. I''ll never get tired of fucking your tight little ass."'
 								*nl
 								'Despite how he treated her, she looks back to him with a smile and seems to be basking in the praise he is now giving her. He barely even looks back at her as he starts getting dressed, as she start to wipe the cum from her ass and get dressed as well. "Well I got to go, got things to do." He pauses a moment when he notices how gingerly she is moving. "You good Nush?" She gives him are you kidding me look, followed by a fairly dirty look. "No my fucking asshole feels like it''s on fire now!" He laughs loudly at that, apparently finding it pretty funny. "What can I say? Sucks to be a hoe! Aching holes is your lot in life." Then with out another glance or word he strides for the door, she flips him off behind his back and mutters. "Asshole."'
-								gs 'arousal', 'voyeur', 5
+								gs 'arousal', 'voyeur_sex', 5
 								gs 'stat'
 								gs 'arousal', 'end'
 								act 'Leave apartment': gt 'pav_complex','start'

locations/arousal.qsrc

@@ -7,8 +7,9 @@ All acts are from Sveta''s perspective and in cases of both giving and receiving
 It can be when receiving any of the following
 'masturbate' - self stimulation
 'porn' - viewing pornographic material
-'voyeur_sex' - watching people have sex
-'voyeur' - observing erotic acts or nudity
+'voyeur_sex' - watching other people have sex
+'voyeur' - watching or spying on erotic acts of others (not involving PC)
+'erotic' - being aroused by eroticism
 'trib' - rubbing pussy against another pussy
 'massage' - rubbing your body, back, feet, etc. with their hands/arms
 'cuni' - stimulation of your pussy by someones toungue
@@ -134,6 +135,11 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 	elseif $ARGS[0] = 'voyeur_sex':
 		count['voyeur_sex'] = 1
 		stim['act'] = 35
+	elseif $ARGS[0] = 'erotic':
+	    stim['act'] = 5
+	elseif $ARGS[0] = 'erotic_nudity':
+        stim['act'] = 5
+        count['erotic_nudity'] = 1
 	elseif $ARGS[0] = 'kiss':
 		count['kiss'] = 1
 		stim['act'] = 10
@@ -482,7 +488,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		stim['feet'] = 1
 	end
 
-	if $ARGS[1] ! 'porn' and $ARGS[1] ! 'voyeur':
+	if $ARGS[1] ! 'porn' and $ARGS[1] ! 'voyeur' and $ARGS[1] ! 'erotic':
 		i = 2
 		:stimloop
 		if $ARGS[i] ! '':
@@ -809,6 +815,7 @@ if $ARGS[0] = 'end':
 	gs 'arousal', 'count2', 'flash'
 	gs 'arousal', 'count2', 'voyeur'
 	gs 'arousal', 'count2', 'voyeur_sex'
+	gs 'arousal', 'count2', 'erotic_nudity'
 	
 	!! Thats here because there is currently a variable zoo.
 		if zoo > beast['exp']: beast['exp'] = zoo

locations/city_kafeend.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'end':
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'erotic_nudity', 5
 	gs 'stat'
 
 	act 'Leave':gt 'city_residential'

locations/dinfather.qsrc

@@ -36,7 +36,7 @@ if $ARGS[0] =  'father act 2':
     if pcs_horny >= 60 or TouchedByFather=1:
         act 'Stare at his groin as you talk':
             cls
-            gs 'arousal', 'voyeur', 5, 'incest'
+            gs 'arousal', 'erotic', 5, 'incest'
             gs 'arousal', 'end'
             gs 'stat'
             
@@ -203,7 +203,7 @@ if $ARGS[0] =  'gar_act2':
     if pcs_horny >= 90 or TouchedByFather=1:
         act 'Stare at his groin as you talk':
             cls
-            gs 'arousal', 'voyeur', 5, 'incest'
+            gs 'arousal', 'erotic', 5, 'incest'
             gs 'arousal', 'end'
             gs 'stat'
             '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim28.jpg"></center>'
@@ -331,7 +331,7 @@ end
 if $ARGS[0] =  'watchtv_act2':
     act 'Stare at his groin':
         cls
-        gs 'arousal', 'voyeur', 5, 'incest'
+        gs 'arousal', 'erotic', 5, 'incest'
         gs 'arousal', 'end'
         gs 'stat'
         '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim28.jpg"></center>'

locations/gadbana.qsrc

@@ -296,7 +296,7 @@ else
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/miraban.jpg"></center>'
 			'While you undress, through the corner of your eye you notice Mira removing her panties.'
 
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic_nudity', 5
 			gs 'stat'
 
 			act 'Watch Mira clean herself':
@@ -304,7 +304,7 @@ else
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/village/mira/miraban1.jpg"></center>'
 			'You feel the hot steam penetrate into your pores while you blissfully watch Mira lather up. She sometimes throws at you short glances and smiles hesitantly in response...'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic_nudity', 5
 			gs 'stat'
 			act 'Steam':
 				cls
@@ -322,7 +322,7 @@ else
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/miraban2.jpg"></center>'
 				'Mira finally finishes lathering herself, you take the loofah and lather yourself from head to toe. You enjoy yourselves in the warm bath, relaxing in each other''s company, occasionally exchanging meaningless anecdotes...'
 				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-				gs 'arousal', 'voyeur', 25
+				gs 'arousal', 'erotic_nudity', 25
 				gs 'arousal', 'end'
 				gs 'stat'
 

locations/gadprostitutes.qsrc

@@ -132,7 +132,7 @@ if $ARGS[0] = 'just_mira':
 					temp_gadpro = rand(0,1)
 					if temp_gadpro = 0:
 						*clr & cla
-						gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+						gs 'arousal', 'voyeur_sex', 10
 						gs 'stat'
 
 						'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1.mp4"></video></center>'
@@ -141,7 +141,7 @@ if $ARGS[0] = 'just_mira':
 
 						act 'Hide':
 							*clr & cla
-							gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+							gs 'arousal', 'voyeur_sex', 10
 							gs 'stat'
 
 							'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_1.mp4"></video></center>'
@@ -150,7 +150,7 @@ if $ARGS[0] = 'just_mira':
 
 							act 'Keep watching':
 								*clr & cla
-								gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+								gs 'arousal', 'voyeur_sex', 10
 								gs 'stat'
 
 								'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_2.mp4"></video></center>'
@@ -170,7 +170,7 @@ if $ARGS[0] = 'just_mira':
 						end
 					elseif temp_gadpro = 1:
 						*clr & cla
-						gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+						gs 'arousal', 'voyeur_sex', 10
 						gs 'stat'
 
 						'<center><video autoplay loop src="images/characters/village/mira/miraprost2.mp4"></video></center>'
@@ -178,7 +178,7 @@ if $ARGS[0] = 'just_mira':
 
 						act 'Keep watching':
 							*clr & cla
-							gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+							gs 'arousal', 'voyeur_sex', 10
 							gs 'stat'
 
 							'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_1.mp4"></video></center>'
@@ -187,7 +187,7 @@ if $ARGS[0] = 'just_mira':
 
 							act 'Hide':
 								*clr & cla
-								gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+								gs 'arousal', 'voyeur_sex', 10
 								gs 'stat'
 
 								'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_2.mp4"></video></center>'

locations/gadukino.qsrc

@@ -347,7 +347,7 @@ if $ARGS[0] = 'mira_events':
 						act 'Lead her to the road':
 							*clr & cla
 							minut += 45
-							gs 'arousal', 'voyeur', 2, 'exhibitionism', 'lesbian', 'dom'
+							gs 'arousal', 'erotic', 2, 'lesbian', 'dom'
 							gs 'stat'
 
 							'<center><img <<$set_imgh>> src="images/characters/village/mira/mirawish2_1.jpg"></center>'
@@ -370,14 +370,14 @@ if $ARGS[0] = 'mira_events':
 										*clr & cla
 										'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1.mp4"></video></center>'
 										'You walk up and look into the car. You see Mira giving one hell of a blowjob to her first customer. Her head is bobbing up and down on his 17cm cock.'
-										gs 'arousal', 'voyeur_sex', 5, 'exhibitionism'
+										gs 'arousal', 'voyeur_sex', 5
 										gs 'stat'
 
 										act 'Hide':
 											*clr & cla
 											'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_1.mp4"></video></center>'
 											'You duck for cover as the guy suddenly gets out of the car and opens the passenger door, grabs Mira''s head and starts forcing his cock deep into her throat.'
-											gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+											gs 'arousal', 'voyeur_sex', 10
 											gs 'stat'
 
 											act 'Keep watching':
@@ -385,7 +385,7 @@ if $ARGS[0] = 'mira_events':
 												'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1_2.mp4"></video></center>'
 												'Eventually, the guy grunts and cums all over Mira''s face and into her mouth. The nicely dressed man pulls Mira out of the car, hands her a few bills and then drives off.'
 												'Mira walks back towards town counting the money he gave her as she absentmindedly licks the cum as it drips down her face. She smiles at you and shows you the money as you join her.'
-												gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+												gs 'arousal', 'voyeur_sex', 10
 												gs 'stat'
 
 												act 'Walk back to the village together':
@@ -403,14 +403,14 @@ if $ARGS[0] = 'mira_events':
 										*clr & cla
 										'<center><video autoplay loop src="images/characters/village/mira/miraprost2.mp4"></video></center>'
 										'You walk up and look into the van. You see Mira showing her first customer her tits and rubbing her pussy. You see a hungry gleam in the guy''s eyes, which Mira returns right back.'
-										gs 'arousal', 'voyeur_sex', 20, 'exhibitionism'
+										gs 'arousal', 'voyeur_sex', 20
 										gs 'stat'
 
 										act 'Keep watching':
 											*clr & cla
 											'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_1.mp4"></video></center>'
 											'Mira and the guy jump into the back of the van and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy pounds his 20cm cock deep into her pussy. From Mira''s grunts of partial ecstasy, partial pain, you know the guy is hitting or entering her cervix.'
-											gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+											gs 'arousal', 'voyeur_sex', 10
 											gs 'stat'
 
 											act 'Hide':
@@ -418,7 +418,7 @@ if $ARGS[0] = 'mira_events':
 												'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_2.mp4"></video></center>'
 												'You have to duck behind some bushes as they move outside the van. The guy continues to pound into Mira''s pussy until he cums...and cums...and cums. '
 												'After the wild sex, Mira and the guy sit in the van and talk for a bit. He gives her a nice wad of cash and she starts walking to the village. Seeing you, she smiles and says thanks.'
-												gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+												gs 'arousal', 'voyeur_sex', 10
 												gs 'stat'
 
 												act 'Walk back to the village together':
@@ -478,7 +478,7 @@ if $ARGS[0] = 'mira_events':
 							npc_rel['A60'] += 1
 							gs 'willpower', 'exhib', 'force'
 							gs 'willpower', 'pay', 'force'
-							gs 'arousal', 'voyeur', 5
+							gs 'arousal', 'erotic', 5, 'lesbian', 'dom'
 							gs 'arousal', 'end'
 							gs 'stat'
 
@@ -499,7 +499,7 @@ if $ARGS[0] = 'mira_events':
 							npc_rel['A60'] += 1
 							gs 'willpower', 'exhib', 'force'
 							gs 'willpower', 'pay', 'force'
-							gs 'arousal', 'voyeur', 10
+							gs 'arousal', 'erotic_nudity', 10, 'erotic', 5, 'lesbian', 'dom'
 							gs 'arousal', 'end'
 							gs 'stat'
 
@@ -539,7 +539,13 @@ if $ARGS[0] = 'mira_events':
 					'<center><img <<$set_imgh>> src="images/characters/village/mira/mirasexgad11.jpg"></center>'
 					'Walking through the village, you meet Mira. You notice she is not wearing panties and the white thread of a tampon is sticking out of her pussy...'
 				end
-				gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+				if temp = 4:
+				     gs 'arousal', 'voyeur', 10
+				elseif temp = 7:
+				    gs 'arousal', 'erotic', 10
+				else
+				    gs 'arousal', 'voyeur_sex', 10, 'exhibitionism'
+				end
 				gs 'arousal', 'end'
 				gs 'stat'
 

locations/gschool_break.qsrc

@@ -188,14 +188,14 @@ if $ARGS[0] = 'girls_restroom_events':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seemypanties.jpg"></center>'
 		'As you enter the restroom, you see Anushka on her way out. She pauses long enough to pull up her skirt and show off her panties. "Do you think these are cute panties?"'
 		'Not all that phased by her anymore, you just nod yes. "Yes very cute." With that she drops her skirt and leaves the restroom, while you go about your business.'
-		gs 'arousal', 'voyeur', 2
+		gs 'arousal', 'erotic', 2
 		gs 'arousal', 'end'
 		gs 'stat'
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 14:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/showass'+rand(1,2)+'.jpg"></center>'
 		'As you enter the restroom, there are three girls, one of them taking the picture of the other two. After a couple of pictures the two having their pictures taken, turn and raise their skirts to show their panty clad asses to the third girl, who laughs and keeps taking their picture. They keep this up as you go about your business.'
-		gs 'arousal', 'voyeur', 2
+		gs 'arousal', 'erotic', 2
 		gs 'arousal', 'end'
 		gs 'stat'
 		gs 'gschool_break', 'restroom_actions'
@@ -632,14 +632,14 @@ if $ARGS[0] = 'boys_restroom_events':
 		else
 			'As you enter the boys room, you see Andrey standing at the urinal taking a piss. He glances back and sees you entering the bathroom. "What are you doing in here? Or did you come hoping to catch a glimpse of my dick?" As he shakes it and turns around to give you a nice view of his dangling cock.'
 			'You can''t help but look and it is pretty impressive in size. He interrupts your thoughts of looking when he says: "Why don''t you come over here and suck it."'
-			gs 'arousal', 'voyeur', 2, 'unknown'
+			gs 'arousal', 'erotic_nudity', 2, 'unknown'
 			gs 'stat'
 			act 'What about Stasya':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/dickout.jpg"></center>'
 				'You glance to him. "What about your girlfriend Stasya?"'
 				'He shrugs a little. "What about her? She is ok with me getting something on the side. So you going to come over here and suck it or just stare at it all day?" Blushing a little at his comment, you are unsure. Should you suck his dick or maybe you should just leave.'
-				gs 'arousal', 'voyeur', 2, 'unknown'
+				gs 'arousal', 'erotic_nudity', 2, 'unknown'
 				gs 'stat'
 				gs 'willpower', 'bj', 'resist'
 				if will_cost < pcs_willpwr:

locations/gschool_detention.qsrc

@@ -282,7 +282,7 @@ if $ARGS[0] = 'upskirt1':
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
 	'As you are sitting at a table bored out of your mind waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting at a table across from you, after a few minutes she leans back in her chair and relaxes. Spreading her legs slightly as she does, the movement draws your eyes and you are given an eye full. Apparently she forgot her panties today because her pussy is now on full display for any to see, well any from the right vantage point, like yourself.'
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'erotic', 5
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Ignore it':

locations/gschool_events.qsrc

@@ -935,7 +935,7 @@ if $ARGS[0] = 'break_events':
 	elseif break_rand = 15:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/irinaphone.jpg"></center>'
 		'You notice Irina sitting by herself with her phone out. She seems to be completely engrossed in her phone; she has one of her knees up and legs slightly spread. This position causes her skirt to ride way up and provide a perfect panty shot up her uniform. You briefly wonder if she is aware, and figure she most likely is since she knows how to work the boys. With a quick glance, you notice a lot of the guys staring at her. Yep, she is most definitely aware.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 16 and hotcat > 5:
@@ -1017,31 +1017,31 @@ if $ARGS[0] = 'break_events':
 	elseif break_rand = 17:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/bendover.jpg"></center>'
 		'As you walk down the hallway, you see Veronika writing something in her notebook as she walks. Not looking where she''s going, she bumps into one of the other students and ends up dropping her pencil. Without thinking, she bends over and picks it up, giving everyone in the hallway a nice view of her panty clad ass, which elicits hoots, hollers and whistles from the other students, especially the boys. She quickly stands up, blushing a bit as she smooths her skirt back in place. She gives some of the more vocal boys a dirty look as she hurries on her way.'
-		gs 'arousal', 'voyeur', 1
+		gs 'arousal', 'erotic', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 18:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girldryhump.jpg"></center>'
 		'As you walk down the hallway, you see a commotion ahead. Several students are clustered together looking at something. As you get closer, you see Anushka bent over with Alyona standing behind her, pulling her hair as she pretends to fuck her from behind, much to the delight of the boys watching. Suddenly, a teacher starts loudly asking what''s going on and everyone quickly disperses.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 19:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girlsbj.jpg"></center>'
 		'As you walk down the hallway, you see two girls from your brother''s class. One of them bends over and starts pretending to suck the other girl''s imaginary dick. The first girl just stands there proudly for a moment, then grabs the second girl''s head to force her to deepthroat the imaginary dick. As the boys hoot and holler, they carry on for a few moments until a teacher starts coming down the hallway, obviously attracted by all the noise the boys are making.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 20:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girlskiss.jpg"></center>'
 		'As you stop at your locker, you see a few of the cool kids hanging out. Andrey starts trying to get his girlfriend Stasya and Lizaveta to kiss, with several other boys and some of the girls joining in with the encouragement. Lizaveta is shaking her head while Stasya looks over at Andrey, who nods and winks to her. Stasya rolls her eyes but then grabs Lizaveta, says something to her then starts to kiss her. Lizaveta resists for a moment but as the kids all keep up the encouragement, she gives in and returns the kiss. They quickly break the kiss and Andrey hugs and kisses Stasya, while Lizaveta blushes a bit at the attention. Before long, a teacher hollers down the hallway asking what''s going on, which causes everyone to break up.'
-		gs 'arousal', 'voyeur', 2
+		gs 'arousal', 'erotic', 2
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 21:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girlsskirtup.jpg"></center>'
 		'As you stop at your locker, a group of girls are teasing some of the boys about how they aren''t wearing panties under their skirt. The boys ask, beg, plead, demand the girls prove it. Finally, several of them lift up their skirts to show off some boy shorts, which annoys the boys to no end and makes the girls laugh at them. Well they weren''t lying, they were wearing boy shorts instead of panties.'
-		gs 'arousal', 'voyeur', 1
+		gs 'arousal', 'erotic', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 22:
@@ -1049,19 +1049,19 @@ if $ARGS[0] = 'break_events':
 		'As you stop at your locker, you overhear Christina berating Lariska and Lina for yesterday''s practice. Something about how worthless they are and how it will make them lose their first game if they play that badly. They try to appologise and promise to do better but Christina is having none of it. She tells the girls to do hand stands in the hallway until the next class. When Lariska points out their skirts will fall up and everyone will see, Christina tells them they should have thought of that and played better.'
 		*nl
 		'After a few minutes, when it is obvious Christina isn''t going to relent, both Lariska and Lina do as they are commanded and, with predictable results, their skirts fall down around their stomachs, showing off their panties. They blush as the boys and some of the girls whistle and comment about their choice in panties, but do as Christina demands. Christina stands there smugly, obviously enjoying bullying the other girls.'
-		gs 'arousal', 'voyeur', 1
+		gs 'arousal', 'erotic', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 23:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/hellokitty.jpg"></center>'
 		'As you walk down the hallway, you overhear a girl asking one of the boys if he would like to see her kitty. He does a double take and grins while nodding to her. She smiles and pulls up her skirt to show off a pair of boyshorts with Hello Kitty on them. The boy looks disappointed whle the girl laughs.'
-		gs 'arousal', 'voyeur', 1
+		gs 'arousal', 'erotic', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 24:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/legsup.jpg"></center>'
 		'As you stop at your locker, a girl starts to taking pictures of her two friends, who start posing at once in funny, seductive or teasing stances. They seem to be really enjoying playing around.'
-		gs 'arousal', 'voyeur', 2
+		gs 'arousal', 'erotic', 2
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 25:
@@ -1073,7 +1073,7 @@ if $ARGS[0] = 'break_events':
 	elseif break_rand = 27:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties.jpg"></center>'
 		'As you pass the stairwell, you see a cluster of boys, including your brother, around a girl. You stop for a moment to see what they are doing. The boys quickly give the girl some money and then she lifts up her skirt, showing them her lack of panties and her pussy. She quickly pulls it back down, only giving them the briefest of looks. You wonder if you should say something when a teacher starts coming down the stairs and they all scatter.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 28:
@@ -1085,25 +1085,25 @@ if $ARGS[0] = 'break_events':
 	elseif break_rand = 29:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtpulledup.jpg"></center>'
 		'As you pass by some of the nerds talking, Dan walks by them as well. He reaches out and grabs the back of Natasha''s skirt and pulls it up, showing off her panty clad ass to everyone. She fights to pull her skirt out of his hand to no avail. Feofan tells him to let go and gets shoved into a locker for his trouble, but it does make Dan let go of Natasha''s skirt. Before you can say anything, a teacher looks out from one of the classrooms and asks what''s going on. Everyone says nothing and they go about their way, but the look Dan gives Feofan promises it might not be over.'
-		gs 'arousal', 'voyeur', 1
+		gs 'arousal', 'erotic', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 30:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtupback.jpg"></center>'
 		'You see Christina walk past Mr Nikolaevich and as she does, she briefly flips up the back of her skirt to show off her panty clad ass. Mr Nikolaevich gives her a stern look but otherwise doesn''t say anything. It does make you wonder what kind of relationship they have with each other.'
-		gs 'arousal', 'voyeur', 1
+		gs 'arousal', 'erotic', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 31:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/teaseteacher.jpg"></center>'
 		'You notice Paulina, Lena, Lera and Ekaterina sitting by one of the windows, talking and occasinally hassling the other students. When Mr Yenotin comes over to ask them what they are doing, Lena, Lera and Paulina occasionally open their legs wide to show off their panties while faking innocence. When Mr Yenotin demands they stop opening their legs, they act shocked like they don''t know what he is talking about and then turn it around on him, asking him if he is trying to look up their skirts. Flustered and not making progress, he tells them to behave and hurries away while the girls all burst out laughing.'
-		gs 'arousal', 'voyeur', 1, 'unknown'
+		gs 'arousal', 'erotic', 1, 'unknown'
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 32:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/tieshoe.jpg"></center>'
 		'As you walk down the hallway, you see Irina has stopped. She lifts her foot up to place it on the window ledge as she bends over to tie her shoe. Her skirt rides way up showing off her ass. It is only for a moment, but you are almost certain she wasn''t wearing panties. You briefly wonder if she was even aware of how much the others could see.'
-		gs 'arousal', 'voyeur', 1
+		gs 'arousal', 'erotic_nudity', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 33:
@@ -1492,20 +1492,20 @@ if $ARGS[0] = 'afterschool_events':
 	elseif break_rand = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/braflash.jpg"></center>'
 		'As you walk down the hallway, you see several of the gopnik boys giving Paulina a bit of a hard time. She flips them off and shoves the closer ones away. Before she walks off, she flips up her shirt to flash them her bra and laughs at their reaction before walking away, the boys calling her a tease as she does.'
-		gs 'arousal', 'voyeur', 1
+		gs 'arousal', 'erotic', 1
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/nakedgirl' + rand(1,2) + '.jpg"></center>'
 		'As you walk down the hallway, you are greeted by an unusual sight. A girl from your brother''s class naked, walking the school hallway. When she sees you, she lets out a squeal and runs off before you can ask her what she is doing. Not feeling like trying to chase a naked girl around school and since it''s really not your business anyways, you continue on your way.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 5:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/nushflash1.jpg"></center>'
 		'As you walk down the hallway you are greeted by an unusual sight. Anushka naked. Well maybe it''s not that unusual, but you don''t typically see her naked in the school hallway.'
-		gs 'arousal', 'voyeur', 5, 'unknown'
+		gs 'arousal', 'erotic_nudity', 5, 'unknown'
 		gs 'stat'
 		act 'Ignore her and leave': gt 'gschool_grounds', 'main'
 		act 'Ask her whats going on':
@@ -1515,7 +1515,7 @@ if $ARGS[0] = 'afterschool_events':
 			'You smile at how casual she is about everything. "You tell me! I was about to ask you the same thing."'
 			'She smiles, obviously knowing what you mean and replies. "Oh you know, same old same old." she says as she gets dressed.'
 			'You just nod. What else are you suppose to say? Once fully dressed, she adds "Well I need to go, see you around." and she turns and heads out.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic_nudity', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave': gt 'gschool_grounds', 'main'
@@ -1524,7 +1524,7 @@ if $ARGS[0] = 'afterschool_events':
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/onlypanties.jpg"></center>'
 		'As you walk down the hallway you are greeted by an unusual sight. Natasha frantically trying to open her locker while only wearing panties.'
-		gs 'arousal', 'voyeur', 5, 'unknown'
+		gs 'arousal', 'erotic_nudity', 5, 'unknown'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Ignore her and leave': gt 'gschool_grounds', 'main'
@@ -1544,7 +1544,7 @@ if $ARGS[0] = 'afterschool_events':
 	elseif break_rand = 8:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/streakers.jpg"></center>'
 		'The hallways are almost completely empty as you leave school, but then you hear giggling. You look up just in time to see two naked girls run by and up the stairs to the second floor of the school. You are fairly certain it was Anushka and Alyona, because who else would it be? With the little show over, you head out.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 	elseif break_rand = 9:
@@ -1595,7 +1595,7 @@ if $ARGS[0] = 'afterschool_events':
 				'Again she hesitates, obviously a bit unsure but the boys keep encouraging her, pointing out that no one is around and it is just her underwear and that it covers as much as the bikini they have seen her in anyways. After a few more glances around, she unbuttons her shirt and takes it off, then her skirt, leaving her standing in front of them in her underwear, blushing as the boys really compliment her. You can''t tell if she is blushing from the embarrassment or because she likes the attention.'
 				*nl
 				'Next, the boys start encouraging her to take off her bra. She now looks a bit less confident, looking around and partially using her hands to cover herself up from time to time, but the guys keep complimenting and encouraging her to take off her bra. She resists at first, but she slowly seems to be giving in under the peer pressure.'
-				gs 'arousal', 'voyeur', 5, 'unknown'
+				gs 'arousal', 'erotic', 5, 'unknown'
 				gs 'stat'
 				act 'Ignore what''s happening and leave': gs 'arousal', 'end' & gt 'gschool_grounds', 'main'
 				gs 'willpower', 'misc', 'self', 'medium'
@@ -1620,7 +1620,7 @@ if $ARGS[0] = 'afterschool_events':
 					'After a couple of minutes of encouragement, she finally relents and takes off her bra, showing off her perky breasts to the boys, who now really hoot, whistle and show their appreciation for the little show they are getting. She really seems torn on loving it and being ashamed of herself.'
 					*nl
 					'But the boys aren''t done and now they encourage her to take her panties off as well, pointing out she is already practically naked, so what''s a little more going to matter? Again, you can tell she seems to be on the verge of giving in.'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'erotic_nudity', 5
 					gs 'stat'
 					act 'Ignore what''s happening and leave': gs 'arousal', 'end' & gt 'gschool_grounds', 'main'
 					gs 'willpower', 'misc', 'self', 'medium'
@@ -1643,7 +1643,7 @@ if $ARGS[0] = 'afterschool_events':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip5.jpg"></center>'
 						'Finally, she gives in and pulls her panties down and steps out of them. She is now completely naked in front of the boys, who seem to be loving the show. She seems torn between enjoying the approval of the boys and the embarrassment of being naked. She lets the boys look at her naked body for a couple more minutes before she seems to change her mind and starts to quickly get dressed. The boys try to get her to stay naked, but she gets dressed. The boys take it in their stride and comment about how great she looks and how cool she is. Once she is dressed, they all leave together, leaving you to go on your way as well.'
-						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'erotic_nudity', 5
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Leave': gt 'gschool_grounds', 'main'

locations/gschool_lessonsev1.qsrc

@@ -87,7 +87,7 @@ if $ARGS[0] = 'fiz_rand':
 	elseif fizperand = 9:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/hanging.jpg"></center>'
 		'During class, Albina gives you a tap on the shoulder, giggling and pointing at Vitek. You look over and see the tip of his dick hanging out the one leg of his shorts. You giggle as well, but you are also quite impressed and maybe just a little turned on at the sight... he is certainly very well endowed. It takes him a bit to notice the girls giggling at him and even longer to figure out why. Once he does, he makes a big show of tucking his dick back away by adjusting and pulling down on his shorts a bit, all the while standing there with a huge smile on his face.'
-		gs 'arousal', 'voyeur', 2
+		gs 'arousal', 'erotic_nudity', 2
 		gs 'arousal', 'end'
 	elseif fizperand = 10:
 		cla
@@ -329,7 +329,7 @@ if $ARGS[0] = 'biology':
 		elseif scooltiperand = 6:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/biology/juliabra.jpg"></center>'
 			'Near the end of class, Miss Orlov tells the class to study quietly as she starts grading papers from yesterday''s assignment. Most of your fellow students don''t study but do a variety of things. Julia catches your eye and as you look over, she opens her shirt to show off her bra, then blushes bright red, closes her shirt and pretends to be busy for the rest of the class.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 		elseif scooltiperand = 7:
@@ -342,7 +342,7 @@ if $ARGS[0] = 'biology':
 		elseif scooltiperand = 9:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
 			'You get an alert on your phone. After quickly checking that Miss Orlov is busy, you sneakily pull it out of your purse and rest it in your lap. You lean back a bit, glancing down to see that someone has sent you an image. You open it up, expecting something innocent - only to be confronted by a photo of someone''s dick. You hear snickering from one side and look up to investigate, but you can''t tell who it was or exactly where it came from. Unsure what to do about it, you decide that you don''t want to be caught looking at it, so you delete the image.'
-			gs 'arousal', 'voyeur', 2, 'unknown'
+			gs 'arousal', 'erotic', 2, 'unknown'
 		elseif scooltiperand = 10:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flick.jpg"></center>'
 			'You notice Dan keeps flicking Artem''s ear whenever Miss Orlov looks away. Poor Artem''s ear is already bright red from all the flicking and he looks like he is on the verge of tears.'
@@ -361,7 +361,7 @@ if $ARGS[0] = 'biology':
 		elseif scooltiperand = 14:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/biology/natpanties.jpg"></center>'
 			'Near the end of class, Miss Orlov assigns your homework and then gives you the last bit of class to work on your homework. She starts grading papers from yesterday''s assignment, and most of the class turns their attention to working on their homework assignment while they can. After a few moments, you glance around and notice Natasha is sitting with her legs slightly apart, showing off her panties to anyone that looks. You doubt she is aware of it, as she seems completely engrossed in working on her homework.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 		elseif scooltiperand = 15:
@@ -371,7 +371,7 @@ if $ARGS[0] = 'biology':
 		elseif scooltiperand = 16:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/biology/natskirt.jpg"></center>'
 			'Near the end of class, Miss Orlov calls Natasha up to the blackboard to write out the assignment. Once done Natasha returns to her seat and sits down, unaware that the back of her skirt has caught on the seat, which shows off her panty clad ass as she sits through the last of class. Several other students notice as well.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 		elseif scooltiperand = 17:
@@ -538,7 +538,7 @@ if $ARGS[0] = 'science':
 		elseif scooltiperand = 6:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
 			'You get an alert on your phone. After quickly checking that Miss Orlov is busy, you sneakily pull it out of your purse and rest it in your lap. You lean back a bit, glancing down to see that someone has sent you an image. You open it up, expecting something innocent - only to be confronted by a photo of someone''s dick. You hear snickering from one side and look up to investigate, but you can''t tell who it was or exactly where it came from. Unsure what to do about it, you decide that you don''t want to be caught looking at it, so you delete the image.'
-			gs 'arousal', 'voyeur', 2, 'unknown'
+			gs 'arousal', 'erotic', 2, 'unknown'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 7:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
@@ -657,7 +657,7 @@ if $ARGS[0] = 'science':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/science/staoverdesk.jpg"></center>'
 			'As class ends, Stasya starts to get up and knocks her book off the front of her desk. While still in her desk, she stands up and bends over to grab the book off the floor, inadvertently giving everyone in class behind her a look at her panty clad ass until she straightens up. A few snickers and giggles causes her to look back as she seems to understand what happened. She quickly smooths out her skirt and leaves class with Andrey.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave class': gt 'gschool_lessons', 'short_break'

locations/gschool_lessonsev2.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'geography':
 		elseif scooltiperand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
 			'You get a alert on your phone, you pull it out of your purse and put it in your lap. You glance down and see someone has sent you an image, opening the image you see a picture of someones dick. You hear some snickering and look up to see who it was, but you can''t tell where it came from. Unsure what to do, you don''t want to be caught looking at it, so you delete the image.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -321,13 +321,13 @@ if $ARGS[0] = 'math':
 			elseif VK = 2 and soniaPS = 1:
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/classflash.mp4"></video></center>'
 				'As Mr Tsarev has everyone work on solving math problems, Sonia raises her hand then asks for assistance. As Mr Tsarev shows begins tutoring Sonia, she begins openly flirting and dropping not to subtle innuendos while he does his best to dismiss her advances, but you notice a bulge forming in his pants. At this point, Sonia pulls open her shirt and flashes her breasts at Mr. Tsarev and the whole class. Mr Tsarev pauses in shock for a moment before saying, "That is very inappropriate behavior." He then does his best to silence the class before rushing back to his desk. You occasionally catch him staring back at Sonia when he believes that no one is looking.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 			elseif VK = 3 and soniaPS = 1:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/soniaflash.jpg"></center>'
 				'You hear some whispers and see some of the other students looking towards the back of the room every time Mr Tsarev is not looking. You curiously glance back to see Sonia flashing her breasts at the boys every time Mr Tsarev looks away, while the boys take pictures of her while encouraging her to show more.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 			else
@@ -339,7 +339,7 @@ if $ARGS[0] = 'math':
 		elseif scooltiperand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
 			'As the lesson goes on, you receive a message on your phone. You open the message to see that someone has sent you an image of someone''s penis. You can hear some snickering and you quickly look around to see who it was, but you can''t tell where it came from. Unsure what to do and not wanting to be caught looking at it, you delete the image.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -459,14 +459,14 @@ if $ARGS[0] = 'math':
 		elseif scooltiperand = 10:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/chrissoniabully.jpg"></center>'
 			'Sonia and Christina are called to the front to both work on the same problem to see who can get it done faster. Christina stops in the middle of it and grabs the back of Sonia''s skirt and pulls it up, showing off her butt cheeks as she is only wearing thong panties. This gets a lot of hoots and hollars from the rest of the class. Mr Tsarev tries several times to get the class back in order and sends both girls to sit back down.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 11:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/larskirtup.jpg"></center>'
 			'During class, Lariska leans forward in her seat to talk to Christina sitting in front of her today. As she does Arkadi, who is sitting behind her, grabs her skirt and pulls it up, showing off her panty clad ass. It takes her a while to wrestle the hem of her skirt out of his hands and get it back in place, blushing as most of the class laughs.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -791,7 +791,7 @@ if $ARGS[0] = 'history':
 		elseif scooltiperand = 7:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
 			'You get a alert on your phone. You pull it out of your purse and put it in your lap. You glance down and see someone has sent you an image, opening the image you see a picture of someones dick. You hear some snickering and look up to see who it was, but you can''t tell where it came from. Unsure what to do, you don''t want to be caught looking at it, so you delete the image.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -912,7 +912,7 @@ if $ARGS[0] = 'history':
 		elseif scooltiperand = 15:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/history/lenlerupskirt.jpg"></center>'
 			'As Mrs Sokoloff lectures the class on some dull moment in history no one cares about anymore, you notice Petka keeps looking back past you at the back of class. You turn your head to follow his gaze and see Lena and Lera sitting side by side with their legs slightly spread apart, just enough to show off their panties. They seem amused by all the looks they are getting.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -923,7 +923,7 @@ if $ARGS[0] = 'history':
 		elseif scooltiperand = 17:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/history/linaskirt.jpg"></center>'
 			'During class, Mrs Sokoloff calls Lina up to the front of class to write an answer on the chalkboard. As she does, you and everyone else in class notice the back of her skirt is pulled up, held up by what looks like her pantyhose. You don''t think she is aware of the view she is giving the class as several students whistle or laugh. Lina seems confused and when Mrs Sokoloff tells the class to quieten down, she see''s what is causing the ruckus, grabs the back of Lina''s skirt and pulls it down. Only then does Lina realize what happened and blushes a bright red and turns back to the chalkboard to write out the answer. She sits back down, where she looks sheepish for the rest of the class.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1147,7 +1147,7 @@ if $ARGS[0] = 'shop':
 		elseif scooltiperand = 8:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
 			'You get a alert on your phone. You pull it out of your purse and put it in your lap. You glance down and see someone has sent you an image, opening the image you see a picture of someone''s dick. You hear some snickering and look up to see who it was, but you can''t tell where it came from. Unsure what to do, you don''t want to be caught looking at it, so you delete the image.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1247,7 +1247,7 @@ if $ARGS[0] = 'shop':
 		elseif scooltiperand = 12 and hotcat => 6:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shop/nushpussy.jpg"></center>'
 			'As you sit in class waiting for the lesson to end, you glance around bored. You notice Anushka looking back at you, but you think nothing of it. When you meet her eyes again, she grins and reaches down between her legs as she spreads them apart and she turns to face you. She pulls her panties aside to reveal her pussy and gives you a amused smirk as your eyes drift down to her hand movements. You hear Mr Kuznetsov clear his throat and you look back to the front of class. When you glance back later, she is sitting normally again and either doesn''t notice your glance or is ignoring it.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic_nudity', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1256,7 +1256,7 @@ if $ARGS[0] = 'shop':
 			'Near the end of class, Mr Kuznetsov tells the class to study quietly as he leaves class a few minutes early. Of course, once he is gone no one listens and everyone starts wandering around messing with the tools. Meanwhile, Anushka starts to tease Fedor, asking him if he wants to fuck her until she makes him blush. When he finally admits he is attracted to her, Paulina swoops in behind Anushka, pushes into her and pulls up the back of her skirt.'
 			*nl
 			'She starts pounding her hips against Anushka''s ass. "Oh Anushka you''re so hot, I have always wanted to fuck you." Paulina says, obviously trying to sound like Fedor, Anushka plays along. "Oh Fedor, you have such an almost average sized dick, it almost feels good." This gets the rest of class laughing and Fedor blushing even more. His humiliation ends when the bell rings.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave class': gt 'gschool_lessons', 'short_break'
@@ -1267,7 +1267,7 @@ if $ARGS[0] = 'shop':
 		elseif scooltiperand = 15 and npc_rel['A15'] => 60:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shop/vicpanties.jpg"></center>'
 			'During class, Vicky is sitting across from you and you can faintly hear the music from her phone, as she is wearing ear buds, with one of them in her ear and the other dangling down. When she notices you looking in her direction, she turns towards you and makes a ''grrr'' sound and curls her fingers like claws and playfully claws at you, as if warning you not to tell on her listening to music. When she does that, she also exposes her pink panties for you to see as well. You smile in amusement and let her know her secret is safe.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'

locations/gschool_lessonsev3.qsrc

@@ -212,21 +212,21 @@ if $ARGS[0] = 'literature':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/lizupskirt.jpg"></center>'
 			'Ms Braakman announces a pop quiz and everyone groans. You finish your quiz and get up to turn it in, but as you walk back to your desk, you can''t help be notice Lizaveta still working on her''s. She seems so intent on it that she doesn''t realize she has her legs slightly apart, giving an up the skirt shot of her panties.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 13:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/nushliftskirt.jpg"></center>'
 			'As the bell rings and class ends, everyone gets up and starts to leave class when Radomir says "God damn I need a pick me up." Anushka, who is a little ways in front of him, apparently heard him and lifts her skirt up, showing off her panty clad ass. Radomir laughs. "I can always count on you to make school fun Nush." Seveal other students check out Anushka''s ass as well as everyone leaves.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave class': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 14:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/romliz.jpg"></center>'
 			'Ms Braakman drones on about some obscure book that no one cares about, but she swears should be considered one of the great works of art, and you find yourself getting bored. You notice you are not the only one, almost everyone in class has a glazed over look in their eyes. Radomir takes it upon himself to liven things up though. He grabs Lizaveta''s skirt and lifts it up, showing off a nice, expensive looking lacy thong. This gets the attention of several students while Lizaveta fights with him to get her skirt pulled back down. When Ms Braakman asks what''s going on, Radomir lets go of her skirt and leans back, trying to be all innocent looking. Lizaveta, still blushing, says nothing is wrong and Ms Braakman continues on with her lecture.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -609,14 +609,14 @@ if $ARGS[0] = 'english':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/lenaselfie1.jpg"></center>'
 			'For the entire class, you see Lena recieving and sending texts on her phone, the whole time looking as pleased as you have seen her. Lera seems to be sulking as Lena pays attention to her phone. Near the end of class, Lena sticks the phone between her legs and looks like she is taking a picture of her panties. She pulls the phone back up and sends something to whoever she is texting.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/lenaselfie2.jpg"></center>'
 				'She gets a reply almost at once and grins, then exchanges a few texts more before she turns around in her seat so most can''t see what she is doing, although you still can. She pulls open her shirt and her bra and then takes a picture of her tits. You don''t know who she is texting since it isn''t Lera, but she seems to be sexting whoever it is. You wonder if her brother Vitek knows about this.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -631,7 +631,7 @@ if $ARGS[0] = 'english':
 		elseif scooltiperand = 9:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/lenlerbras.jpg"></center>'
 			'Near the end of class Lena, Lera and Radomir are talking. He is bragging about some girl he banged recently, Lena and Lera exchange looks and then pull their shirts open to show off their bra''s. This causes Radomir to stammer in mid sentence as he gets distracted by the boobs neatly on display in front of him. After he stops talking, they laugh and pull their shirts closed, which causes him to grumble.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -640,7 +640,7 @@ if $ARGS[0] = 'english':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/leraeatme.jpg"></center>'
 			'You notice Lera squirming around in her seat during class and decide to see what''s wrong. "What''s up" you ask.'
 			'She glances at you and seems like she is about to have a sharp retort, but then closes her mouth and seems to really look at you and then says "Nothing you couldn''t fix for me." She sticks her tongue out between two of her fingers in the universal ''eat me'' sign. You can''t help but blush a little as it caught you a little off guard, as Lera seems to only pays attention to Lena. Before you can reply though, Ms Braakman clears her throat and gets you both looking forward again. She spends the rest the class keeping an eye on both of you.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -649,7 +649,7 @@ if $ARGS[0] = 'english':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/lerapussy.jpg"></center>'
 			'You notice Lera squirming around in her seat during class and decide to see what''s wrong. "What''s up?" you ask.'
 			'She glances at you and seems like she is about to have a sharp retort, but then closes her mouth and seems to really look at you, but the bell rings to end class. As everyone gets up and heads out of class she says. "Nothing you couldn''t fix for me, if you put that tongue to good use for a change." She pulls up her skirt and pulls her panties aside to show you her clean shaven pussy. Before you can respond though, Lena comes over and steps between the two of you, blocking your view. They exchange a few whispers and then leave class together.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic_nudity', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave class': gt 'gschool_lessons', 'short_break'
@@ -898,7 +898,7 @@ if $ARGS[0] = 'music':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_6_2.jpg"></center>'
 				end
 				'Katja is trying to draw your attention for some reason. When she notices you''re watching, she quickly makes sure no one else is paying attention and then puts one leg on her desk, revealing her bare pussy to you. You bite your lip and give her an appreciative nod as you think to yourself, "Damn, I''ll have to take a closer look into that after classes are over!"'
-				gs 'arousal', 'voyeur', 2
+				gs 'arousal', 'erotic_nudity', 2
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1069,7 +1069,7 @@ if $ARGS[0] = 'music':
 		elseif scooltiperand = 9:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
 			'You get a alert on your phone. You pull it out of your purse and put it in your lap. You glance down and see someone has sent you an image. Opening the image, you see a picture of someone''s dick. You hear some snickering and look up to see who it was, but you can''t tell where it came from. Unsure what to do, you don''t want to be caught looking at it, so you delete the image.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1187,14 +1187,14 @@ if $ARGS[0] = 'music':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/music/katjapanties.jpg"></center>'
 			'During class, you hear Katja say "Psstt." When you glance in her direction, she is turned in her seat so she is facing you, with her legs slightly spread. When she sees you looking, she pulls up her skirt to show off her panties to you with a grin, then quickly puts her skirt back in place and ignores you for the rest of class.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 17:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/music/larflute.jpg"></center>'
 			'As Mr Vasilyev is helping Petka, Lina and Lariska are talking about how to give a blowjob and they seem to disagree. After a few moments of heated but quiet debate, Lariska decides to show what she means on her flute. After showing how she means to give a blowjob on the flute, Lina comes around to her point of view. Several of the guys watchin also seem to agree with Lariska about how to give a blowjob.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1271,7 +1271,7 @@ if $ARGS[0] = 'art':
 				else
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_6_2.jpg"></center>'
 					'Katja is trying to draw your attention for some reason. When she notices you''re watching, she quickly makes sure no one else is paying attention and then puts one leg on her desk, revealing her bare pussy to you. You bite your lip and give her an appreciative nod as you think to yourself, "Damn, I''ll have to take a closer look into that after classes are over!"'
-					gs 'arousal', 'voyeur', 2
+					gs 'arousal', 'erotic_nudity', 2
 				end
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			else
@@ -1292,14 +1292,14 @@ if $ARGS[0] = 'art':
 		elseif scooltiperand = 7:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/soniaflash.jpg"></center>'
 			'You hear some whispers and see some other students looking towards the back every time Mr Vasilyev is not looking. You glance back and see Anushka flashing her boobs at Erast every time Mr Vasilyev looks away, while the boys take pictures of her each time and keep encouraging her to show more.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic_nudity', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 8 and bag = 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
 			'You get an alert on your phone. You pull it out of your purse and put it in your lap. You glance down and see someone has sent you an image. Opening the image you see a picture of someone''s dick. You hear some snickering and look up to see who it was, but you can''t tell where it came from. Unsure what to do, you don''t want to be caught looking at it, so you delete the image.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1422,7 +1422,7 @@ if $ARGS[0] = 'art':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/art/natpanties.jpg"></center>'
 			'Natasha asks Anushka if she can borrow a pencil as she seems to have lost hers. Anushka agrees and offers her one, but keeps pulling it slightly out of reach of Natasha, who keeps stretching to reach it. When she is half standing up in her desk to reach forward to grab it, By the time Natasha grabs the pencil from Anushka, she has given everyone behind her a nice look at her panty clad ass.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1431,7 +1431,7 @@ if $ARGS[0] = 'art':
 			'Near the end of class, Mr Vasilyev lets the class practice their own thing. Feofan pulls a fairly nice camera from his bag and starts taking pictures of his fellow students, which quickly gets the girls to pose in groups. At one point, he gets Julia, Anushka, Albina and Vicky to all pose together, but when he tries to take their picture Anushka sticks her tongue out between her fingers in the universal ''eat me'' sign.'
 			*nl
 			'Feofan laughs it off but then says "Very funny Anushka, but I want to take a serious picture of you. So can you not stick your tongue out this time?" Anushka''s only reply is to roll her eyes at him.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'stat'
 			act 'Next picture':
 				*clr & cla
@@ -1446,7 +1446,7 @@ if $ARGS[0] = 'art':
 				*nl
 				'She then smiles, as if she expected that responce. "Yes, but doesn''t some of their work show nudity? I only showed my panties, so why is their work OK and this isn''t?"'
 				'Mr Vasilyev gives a bone weary sigh and starts trying to explain why art can show many things, but not everything is appropriate for school. It seems to be a losing discussion and you are sure Anushka is just yanking his chain for the fun of it. The rest of the class quickly loses interest in the discussion and goes back to doing their own thing.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1454,7 +1454,7 @@ if $ARGS[0] = 'art':
 		elseif scooltiperand = 15:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/art/vickypanties.jpg"></center>'
 			'You notice Erast paying special attention to Vicky today and it seems she has noticed as well. At one point, she turns to sit sideways in her desk and spreads her legs, causing her skirt to ride up until it gives Erast a very nice view of her panties. His eyes get big as she giggles, straightens her skirt back in place and turns back to the front of class.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1462,7 +1462,7 @@ if $ARGS[0] = 'art':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/art/nushvic.jpg"></center>'
 			'Near the end of class, when Mr Vasilyev lets the class have some free time to experiment with their own artwork, some of the girls get together to gossip about boys. Vicky starts talking about a date her and Vanya recently went on, she even goes so far as to act out a little bit of it. At one point, she bends over and talks about how she was rubbing her butt against Vanya''s crotch while dancing, but before she can say what Vanya did, Anushka steps up behind her, grabs her hips and starts dry humping her. "This is what he was wanting to do to you." She gets all the girls to crack up, most agreeing that is all any boy talks about.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -1470,7 +1470,7 @@ if $ARGS[0] = 'art':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/art/nushpanties1.jpg"></center>'
 			'During one of Mr Vasilyev''s lectures about art history, you get a little bored and glace around. You notice Anushka sitting in her desk with one of her knees pulled up almost to her chest, with her foot on the chair. This gives gives anyone looking a very clear view of her panties.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Look away':
@@ -1490,7 +1490,7 @@ if $ARGS[0] = 'art':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/art/nushpanties1.jpg"></center>'
 					'When she notices you looking, she gives you a little smirk but then turns her attention away from you. She apparently doesn''t care if you look up her skirt at her panties.'
 				end
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'

locations/gschool_lunch.qsrc

@@ -488,13 +488,13 @@ if $ARGS[0] = 'events':
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunchdhump.jpg"></center>'
 		'While in the cafeteria you see a couple of the gopnik girls hanging out by one of the tables. One of them is slightly bent over with her skirt hiked almost all the way up to her breasts, her panties and tight ass exposed to anyone who cares to look. The second girl stands behind her with her hands on her hips. She thrusts her hips forward hard, bouncing off the panty clad ass of the first girl, pretending like she is giving her a pounding fuck. Both girls let out loud fake moans with each slap of their bodies. The quite public fake fucking gets laughs from all the other gopniks, while most of the other boys and more than one teacher watch with a gleam of lust in their eyes at their antics. The raunchy display has an obvious effect and many of the boys in the audience do their best to inconspicuously cover their groins with whatever happens to be available. Even a couple of the girls seem to be lightly rubbing their legs together, faces slightly flushed, possibly even unaware of how they are affected. But knowing many of the girls of this school, they are probably quite aware.'
-		gs 'arousal', 'voyeur', 10
+		gs 'arousal', 'erotic', 10
 		act 'Continue your break': gt 'gschool_lunch', 'break'
 	elseif rand(1,100) < 3:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/bust.jpg"></center>'
 		'You walk into the bathroom and find two other girls in there. One of them has her shirt half unbuttoned with her hands on either side of her breasts, looking at them in the mirror. "Do my tits look bigger? I don''t think they''re bigger," she says as she turns from side to side, then leans forward a bit, her lips slightly pursed as she evaluates her melons from every angle. She has a fairly impressive bust already, you don''t know why she is so worried about it. Her friend replies as you wash your hands. "They look bigger to me, I think they are still growing, unlike mine." True, her breasts are a lot smaller than her friend''s, you think as you walk out.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic', 5
 		act 'Continue your break': gt 'gschool_lunch', 'break'
 	else
 		gt 'gschool_lunch', 'break'

locations/gschool_sex.qsrc

@@ -971,7 +971,7 @@ if $ARGS[0] = 'petka_lockerroom':
 	'When you pull the locker open, you see Petka inside, naked and stroking an erection. For a moment, you are both staring at each other in surprise. "Please don''t report me! I''ll do anything you want!"'
 	'You pause for a moment. You could have a bit of fun at his expense or you could just make him do all your homework from now on. "Anything? Anything I desire, not matter what?" you ask him.'
 	'He visable swallows and nods. "Yes, please?"'
-	gs 'arousal', 'voyeur', 3
+	gs 'arousal', 'erotic_nudity', 3
 	gs 'stat'
 	act 'Tell him to get lost': gt 'gschool_sex', 'petka_home'
 	gs 'willpower', 'misc', 'force', 'easy'
@@ -998,7 +998,7 @@ if $ARGS[0] = 'petka_lockerroom':
 			grupvalue[4] += 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/petka4.jpg"></center>'
 			'You see his clothes at the bottom of the locker and reach down and quickly snatch them up. He grabs for them, but one look from you and he lets go and stands meekly in place.'
-			gs 'arousal', 'voyeur', 3
+			gs 'arousal', 'erotic_nudity', 3, 'dom'
 			gs 'stat'
 			act 'Tell him to get lost': gt 'gschool_sex', 'petka_homenaked'
 		end
@@ -1079,7 +1079,7 @@ if $ARGS[0] = 'petka_lockerroom':
 								'You push him away. "Stand against the locker and watch." He does as you say and he watches, his eyes wide, as you start strapping the harness on and making sure the dildo is firmly attached. Albina helps you get the harness nice and firm. "Look at this bitch boy! His dick is hard knowing he is about to get fucked! I think he might be gay." Albina says.'
 								'Petka blushes. "I''m not gay, I can''t help it." he stammers. You don''t know if he is gay, turned on by the idea of getting fucked by a girl or just because you are still naked. Either way, it doesn''t really matter.'
 								'You smile to her. "No I don''t mind he spied on all of us."'
-								gs 'arousal', 'voyeur', 2, 'dom', 'group'
+								gs 'arousal', 'erotic', 2, 'dom', 'group'
 								gs 'stat'
 								act 'Turn around':
 									*clr & cla

locations/kafesvid.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = '1':
 	'The cafe is pretty empty, and you are in the far corner, where it is kind of dark. <<$telsob>> uses this little bit of privacy to slowly hike up her shirt. When she notices you staring, she puts a leg up right between your thighs. It gives you an excellent view of her already wet panties.'
 	'"Like what you see, <<$pcs_nickname>>?" she says, with a wicked grin.'
 
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'erotic', 5
 	gs 'stat'
 	gs 'willpower', 'foreplay', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:

locations/lesbisubhouse.qsrc

@@ -1152,7 +1152,7 @@ if $ARGS[0] = 'ev1':
 		'<center><img <<$set_imgh>> src="images/characters/city/natalya/dom.jpg"></center>'
 		'To your surprise, Natalya stands before you only in a negligee and a pair of panty that reveal her supple yet toned body. Although you cannot tell from her carefully schooled features, her excitement is evident from the trembling of her lower lip and the unmistakable wet spot on her panty.'
 
-		gs 'arousal', 'voyeur', 5, 'dom', 'lesbian', 'exhibitionism'
+		gs 'arousal', 'erotic', 5, 'dom', 'lesbian', 'exhibitionism'
 		gs 'stat'
 
 		act 'Check how submissive she is':
@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'ev1':
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/dom2.jpg"></center>'
 			'You understand that, to be accepted by her as her Mistress, you have to act with absolute authority and certainty. Without a second thought, you order her to get down on all fours, right here in the living room, and to present her butt to you so you can "inspect the goods".'
 			'The woman, after a moment''s hesitation, obediently drops to her knees in front of you, then turns around and spreads her buttcheeks for you, awaiting further instructions. You take your time, examining all of her charms and feeling pleased with yourself. As tempting as it is to continue, though, you know better than to push your luck. Therefore, you end the inspection with a slap on her ass and, without a word, leave.'
-			gs 'arousal', 'voyeur', 15, 'dom', 'lesbian', 'exhibitionism'
+			gs 'arousal', 'erotic_nudity', 15, 'dom', 'lesbian', 'exhibitionism'
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Enough of this for now - Leave':gt'city_residential'
@@ -1182,7 +1182,7 @@ if $ARGS[0] = 'ev1':
 			'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/dom3.jpg"></center>'
 			'You, saying nothing, pass into the kitchen, sit down on a chair and unceremoniously order her to pose for you and stick out her ass. The woman timidly follows your order and within seconds, you are admiring her lean ass.'
 
-			gs 'arousal', 'voyeur', 5, 'dom', 'lesbian', 'exhibitionism'
+			gs 'arousal', 'erotic_nudity', 5, 'dom', 'lesbian', 'exhibitionism'
 			gs 'stat'
 
 			act 'Order her to take off her panties':
@@ -1193,7 +1193,7 @@ if $ARGS[0] = 'ev1':
 				'<center><img <<$set_imgh>> src="images/characters/city/natalya/sex/dom4.jpg"></center>'
 				'The sight of the thin strips of fabric that belong to her underwear spoil the whole picture, though, so you need to have them removed. The woman, saying nothing, immediately moves her hands to her hips and takes them off. You nod approvingly and tell her to return to her previous position, which she does without hesitation. Satisfied, you have her come closer to you and you begin explaining several things to her: Who she is now, what her place is and how she should behave in your presence. She listens in obedient silence and twenty minutes later, you decide to check if she has internalized what you just told her.'
 
-				gs 'arousal', 'voyeur', 20, 'dom', 'lesbian', 'exhibitionism'
+				gs 'arousal', 'erotic_nudity', 20, 'dom', 'lesbian', 'exhibitionism'
 				gs 'stat'
 
 				act 'Test her':

locations/metro_events.qsrc

@@ -392,7 +392,7 @@ if $ARGS[0] = 'station':
 	if metrorand = 1:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/aflash1.jpg"></center>'
 		'After your ride on the metro, you leave the station, following several people up the stairs, towards the street. The backside of a women''s skirt keeps lifting up; from the draft of air. Each time it lifts up, it shows off her firm tightly ass, which draws the attention of several men and even a few of the women.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave':minut += 5 & gt $loc, $loc_arg
@@ -444,7 +444,7 @@ if $ARGS[0] = 'station':
 	elseif metrorand <= 6:
 		'<center><video autoplay loop src="images/locations/city/shared/metro/station/flashd1.mp4"></video></center>'
 		'As you leave the metro car, you, and nearly everyone else, notice two African men walking. One of them has a huge bulge in the front of his pants. When he catches you eyeing them, he stops, pulling his pants down. As he does that a massive black cock springs free, which causes a lot more people to look in shock.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic', 3
 		gs 'stat'
 		act 'Hurry away':
 			minut += 5
@@ -486,7 +486,7 @@ if $ARGS[0] = 'station':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/pc/shock.jpg"></center>'
 			'It is just so big, you can''t help but stare at it, you briefly wonder if his friend is as big as he is. Then you notice them smiling and staring at you, as he puts his dick back away they wave you over.'
-			gs 'arousal', 'voyeur', 3
+			gs 'arousal', 'erotic', 3
 			gs 'stat'
 			act 'Hurry away':minut += 5 & gt $loc, $loc_arg
 			act 'Go over': gt 'metro_events', 'twobbc'
@@ -495,7 +495,7 @@ if $ARGS[0] = 'station':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/pc/shock.jpg"></center>'
 			'You can''t help yourself, seeing that big dick, you lick your lip. They see that and both grin wide and wave you over as the one puts his dick away.'
-			gs 'arousal', 'voyeur', 3
+			gs 'arousal', 'erotic', 3
 			gs 'stat'
 			act 'Hurry away':minut += 5 & gt $loc, $loc_arg
 			act 'Go over': gt 'metro_events', 'twobbc'
@@ -503,7 +503,7 @@ if $ARGS[0] = 'station':
 	elseif metrorand = 7:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/flashus'+ rand(1,5) +'.jpg"></center>'
 		'As you head through the metro station, you notice a pretty young woman, she keeps lifting her skirt; flashing her pussy at various strangers. As you get closer she smiles at you and then flashes you.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Hurry away':
@@ -544,14 +544,14 @@ if $ARGS[0] = 'station':
 	elseif metrorand = 8:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/nakedg1.jpg"></center>'
 		'As you head through the metro station, you see a naked woman, only wearing a pair of boots boarding another metro train. She is actually walking around casually, like there is nothing; even remotely, out of the ordinary. She is garnering a lot of attention from everyone around her, but she seems completely oblivious to it. Within moments, she boards the other train, and is gone.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': minut += 5 & gt $loc, $loc_arg
 	elseif metrorand = 9:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/nakedg2.jpg"></center>'
 		'As you head through the metro station, you see a naked woman, she is huddled down on her knees; against one of the pillars. She is using her arms to cover up her body, as best she can; clearly ashamed.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Ignore Her':minut += 5 & gt $loc, $loc_arg
@@ -560,28 +560,28 @@ if $ARGS[0] = 'station':
 	elseif metrorand = 10:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/nakedm1.jpg"></center>'
 		'As you head through the metro station, you see a naked man, the only thing he is wearing is a huge grin. He seems rather proud at the attention he is getting, though you have no idea why. After a quick check you notice he packs nothing special in the manhood department. He continues on his way, just as you do.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': minut += 5 & gt $loc, $loc_arg
 	elseif metrorand = 11:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/nakedp1.jpg"></center>'
 		'As you head through the metro station, you see two couples looking a bit strange... All four of them are naked, only wearing shoes, carrying bags with them. They act normal, as if walking through the metro completely naked is a perfectly normal thing to do. They garner a lot of attention from the other people in the station, but they just head towards one of the metro trains.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': minut += 5 & gt $loc, $loc_arg
 	elseif metrorand = 12:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/seethru1.jpg"></center>'
 		'As you leave the metro station, you find yourself walking up the stairs behind a woman wearing a sheer dress. It is completely see through, it is obvious that she is not wearing any underwear at all. Which gives you a very nice view of her ass, once you reach the street, she heads off down the sidewalk.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': minut += 5 & gt $loc, $loc_arg
 	elseif metrorand = 13:
 		'<center><video autoplay loop src="images/locations/city/shared/metro/station/sex/jerkoff1.mp4"></video></center>'
 		'As you walk past one of the pillars, you see a man with his pants around his knees jerking off, just as you walk past, he starts cumming. He starts shooting his sperm out onto the floor, barely missing a woman that happens to go by at the wrong moment. Once he stops cumming, he pulls his pants up, and goes about his business.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': minut += 5 & gt $loc, $loc_arg
@@ -589,7 +589,7 @@ if $ARGS[0] = 'station':
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/sex/les1.jpg"></center>'
 		'As you head through the metro station, you see a woman sitting on one of the benches in the station. Her skirt is pulled up, wearing no panties, with her legs stretched out, leaving plenty of room for the girl down on all fours in front of her to eat her pussy, who''s skirt is also pulled up, not wearing panties, giving everyone that are walking by a perfect vision of her pussy.'
 		'The one sitting fends off anyone trying to join in while her friend eats her out. Many people stop to watch the pair, several people pull out their smart phones, recording the show.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'voyeur_sex', 3
 		gs 'stat'
 		act 'Leave':
 			minut += 5
@@ -601,7 +601,7 @@ if $ARGS[0] = 'station':
 			*clr & cla
 			photoskl_exp += 2
 			'You pull out your phone as well then start recording them. The one on all fours is going at it, and has her friend quickly moaning loudly, clutching at her hair. Moments later, she gasps loudly, and withers against her friends face, obviously having an orgasm. Once she recovers from her orgasm, they passionately kiss, then get up and straighten their clothes, before heading out.'
-			gs 'arousal', 'voyeur', 3
+			gs 'arousal', 'voyeur_sex', 3
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave': minut += 5 & gt $loc, $loc_arg
@@ -609,7 +609,7 @@ if $ARGS[0] = 'station':
 	elseif metrorand = 15:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/sex/fuck'+ rand(1,2) +'.jpg"></center>'
 		'As you head through the metro station, you see a couple leaning against one of the walls, you see the woman struggling to keep her moans as quiet as possible as she''s bent over at the waist while the man behind her is hammering her for all he is worth. Several people gather around the couple to watch them fuck, many of them pulling out their smart phones to record the couple fucking. A couple of men are trying to join in, but are quickly shooed away.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'voyeur_sex', 3
 		gs 'stat'
 		act 'Hurry away':
 			minut += 5
@@ -621,7 +621,7 @@ if $ARGS[0] = 'station':
 			*clr & cla
 			photoskl_exp += 2
 			'You pull out your phone as well then start recording them. He pounds her without mercy, but by the sounds of her moans, she is loving every moment of it. They fuck for several more minutes until he starts to grunt, and then buries himself; balls deep in her for a moment, as he is obviously cumming. Once he pulls out of her, they both quickly get dressed then move to catch a train.'
-			gs 'arousal', 'voyeur', 3
+			gs 'arousal', 'voyeur_sex', 3
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave': minut += 5 & gt $loc, $loc_arg
@@ -734,28 +734,28 @@ if $ARGS[0] = 'train':
 	elseif metrorand = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/flasha'+ rand(1,2) +'.jpg"></center>'
 		'As you ride the metro, you notice a young woman. She seems to have almost everyone''s attention, and you soon learn why. She repeatedly lifts her skirt up, flashing her ass to the other passengers in the car. She seems to love the attention that she is getting, as she maintains a very please smile.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 4:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/flashb'+ rand(1,2) +'.jpg"></center>'
 		'As you ride the metro, you notice a young woman. She seems to have almost everyone''s attention, and you soon learn why. She repeatedly lifts her shirt up, flashing her boobs to the other passengers in the car. She seems to love the attention she is getting, as she maintains a very pleased smile.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 5:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/flashd1.jpg"></center>'
 		'As you ride the metro, you notice a young man. As you are watching in his direction, he reaches into his pants then pulls out his cock, and stares at it. Occasionally he''s bouncing it in place as if he''s playing with it.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 6:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/flashg'+ rand(1,3) +'.jpg"></center>'
 		'As you ride the metro, you notice a young woman. She seems to have almost everyone''s attention and you soon learn why. She is repeatedly pulling her clothes away, flashing her naked body to the other passengers in the car. She seems to love the attention she is getting, as she maintains a very pleased smile.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
@@ -763,7 +763,7 @@ if $ARGS[0] = 'train':
 		if hotcat < 7: gt 'metro', 'vagon'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/flashus'+ rand(1,5) +'.jpg"></center>'
 		'As you ride the metro, you notice a young woman. When she sees you looking at her, she gives you a wicked grin, and winks. She then spreads her legs, showing off her pussy from under her skirt. She sticks out her tongue, and flicks it at you, as if mimicking eating pussy.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'stat'
 		act 'Ignore her':
 			gs 'arousal', 'end'
@@ -814,28 +814,28 @@ if $ARGS[0] = 'train':
 	elseif metrorand = 11:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/nakedg'+ rand(1,5) +'.jpg"></center>'
 		'As you find a seat, you notice a woman, she is wearing shoes, but other than that she is naked. She is sitting in one of the seats, as if riding the metro naked was the most normal thing in the world. At the very next stop she gets off, leaving you wondering why she was naked, and where she was going.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 12:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/nakedm'+ rand(1,2) +'.jpg"></center>'
 		'As you find a seat, you notice a naked man. He acts as if, walking around naked; is the most normal thing in the world to do. At the very next stop he gets off, leaving you wondering why he was naked, and where he was going.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 13:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/nakedgm1.jpg"></center>'
 		'As you find a seat, you notice several naked men. They are laughing, and talking, they appear to be a little drunk. They seem to be aware of all the looks that they are getting, finding it amusing, than anything. They often wink at any of the women looking their way. At the very next stop, they get off, leaving you wondering why they were naked, and where they were going.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 14:
 		'<center><video autoplay loop src="images/locations/city/shared/metro/sex/3some1.mp4"></video></center>'
 		'As you find a seat, you notice a woman half naked kneeling in one of the seats. A man behind her is fucking her roughly, while she sucks the cock of another man. This goes on for some time until both of the men cum inside of her in each of the hole they were using. Once done, they get dressed, and sit together then start talking among themselves. They remain on the train, as you get off at your stop.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
@@ -843,28 +843,28 @@ if $ARGS[0] = 'train':
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/anal1.jpg"></center>'
 		'As you find a seat, you notice a woman naked from the waist down, on all fours in the middle of the car. She seems to have a collar around her neck with a leash attached. Another woman is squatting in front of her, reaching back, pulling her butt checks apart. All while a man behind the kneeling woman grabs his cock and begins pounding her ass, the sounds of her cries makes it hard to tell, if she is enjoying the experience or not.'
 		'Once he finishes, the squatting woman reaches down, and grabs the leash then tightly pulls on it, almost choking the other girl. She and the man, talk for a bit, while the leashed girl stays on her knees, still naked from the waist down, but with cum running down her thighs. After their talk the man goes to take a seat, while the woman holding the leash, walks over to another spot to sit. Tugging on the leash to pull the other girl along, after a few more minutes, she leans over and whispers something to the leashed girl, who then gets dressed again, but remains kneeling at the feet, of what can only be, her dominatrix.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 16:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/fingering1.jpg"></center>'
 		'As you find a seat, you notice a woman with her skirt pulled up and panties pushed aside being finger banged by a man in a suit. Her cries of ecstasy get louder, and louder, as he keeps it up until she finally climaxes, leaving her legs to buckle, forcing the man to catch her before she crumples to the floor. She leans against him, as he holds her tight, pulling her clothes back in place. You can hear them laughing at the attention they got, she is blushing, and they quickly exit at the next stop.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 17:
 		'<center><video autoplay loop src="images/locations/city/shared/metro/sex/fuck'+ rand(1,3) +'.mp4"></video></center>'
 		'As you find a seat, you notice a couple having intercourse in the car. They are going at each other like animals. Many people are watching them, some even pull out their smart phones, recording them. They switch between several sex positions during the ride, getting more and more turned on. The man seems to have a lot of stamina, as they are still going at it hard, as you leave the car at your end station.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 18:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/les1.jpg"></center>'
 		'As you find a seat, you notice a girl kneeling in her seat; facing the wrong way. Her skirt is pulled up, and her panties are down around her knees. Another girl is squatting behind her eating her pussy. This goes on for several minutes until the first girl finally has an orgasm, once she’’s finished, she gets dressed, and sits by her friend. For the rest of the ride, they keep making out, leaving the car at the next stop.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
@@ -892,7 +892,7 @@ if $ARGS[0] = 'train':
 	elseif metrorand = 24:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sleepexf1.jpg"></center>'
 		'As you find a seat, you notice a woman across from you. She seems to be passed out, you can smell the alcohol from here. Her jacket is open is open and her shirt pulled down, leaving one of her breasts exposed for everyone to see. Several passengers give her a glance now and a again. A few even take her pictures, a group of young guys are whispering to each other and laughing while watching her.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'

locations/mitkabuh.qsrc

@@ -1143,7 +1143,7 @@ if $ARGS[0] = 'mira_7':
 		
 	act 'Watch her':
 		*clr & cla
-		gs 'arousal', 'voyeur', 15, 'sub'
+		gs 'arousal', 'erotic_nudity', 15, 'sub'
 		gs 'stat'
 		
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/miraqw15_1.jpg"></center>'

locations/moncheri.qsrc

@@ -185,7 +185,7 @@ if $ARGS[0] = 'rima':
 		'"May I call you Rimma?" You ask."I''m <<$pcs_nickname>>".'
 		'"Yes, of course, if you''d like.", responds Rima, smiling shyly.'
 		
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic', 5
 		gs 'stat'
 
 		act 'Choose a dress with Rimma':

locations/music_buskingevents.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'busking':
 	ml_rand_event = rand(0,100)
 	if ml_rand_event <= 10 and $ARGS[1] = 'pav' and npc_rel['A144'] > 40: 
 		gs 'music_buskingevents', 'anushka'
-	elseif ml_rand_event < 15 and $ARGS[1] = 'pav' and ((npc_rel['A20'] < 20 or npc_rel['A21'] < 20):
+	elseif ml_rand_event < 15 and $ARGS[1] = 'pav' and (npc_rel['A20'] < 20 or npc_rel['A21'] < 20):
 !! TODO: if the gopniks don''t like the PC and/or her music is awful, there is a chance that Lena and Lera harasses her.
 !!		gs 'music_buskingevents', 'lena_and_lera', 1
 !!	elseif ml_rand_event < 15 and $ARGS[1] = 'pav' and ( (npc_rel['A20'] < 40 or npc_rel['A21'] < 40) and (pcs_instrmusic < 30 or pcs_perform < 30 or pcs_vokal < 30) ):
@@ -73,7 +73,7 @@ if $ARGS[0] = 'anushka':
 !!TODO: A few scenarios: Friends, besties, neutral. Player is an awful, bad, ok, good musician. Anushka has seen PC play music before (either busking or they played together).	
 	npc_rel['A144'] += 2
 	*nl	
-	'As you stop playing and get ready to pack up you spot <<$npc_firstname['A144']>> standing not far from you, watching you quietly.'
+	'As you stop playing and get ready to pack up you spot <<$npc_firstname[''A144'']>> standing not far from you, watching you quietly.'
 
 	if npc_rel['A144'] > 60:
 		'As she notices that you saw her she grins and starts to walk up to you "I didn''t know you turned into a wandering minstrel, <<$pcs_nickname>>."'

locations/nastja.qsrc

@@ -139,7 +139,7 @@ if $ARGS[0] = 'pos8':
 		'After a few more loops around it, she jumps off the bar, pats the boy''s cheek and, giggling, takes you by the hand and pulls you into the taxi that just happened to pass by.'
 		'If you needed any more clarification, you now know the center of what kind of attention she likes to be!'
 
-		gs 'arousal', 'voyeur', 60, 'exhibitionism'
+		gs 'arousal', 'erotic', 60, 'exhibitionism'
 		gs 'stat'
 		
 		act 'Say goodbye and go home':gt 'city_residential'
@@ -239,7 +239,7 @@ if $ARGS[0] = 'pos10':
 		'If you needed any more clarification, you now know the center of what kind of attention she likes to be!'
 		'Only a short while later, a taxi comes by and you both take a seat inside, giggling in your secret knowledge of what happened minutes earlier.'
 
-		gs 'arousal', 'voyeur', 60, 'exhibitionism'
+		gs 'arousal', 'erotic_nudity', 60, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
 		
@@ -388,7 +388,7 @@ if $ARGS[0] = 'pos16':
 	'You''re shaken out of your reverie when you hear Nastya come up behind you. "I''m ready! Hey, what are you staring at?" Blushing a little, you don''t turn towards Anastasia but simply point out the naked girl. At first Nastya looks surprised. Then, a sly smile curls her lips and you see a twinkle in her eyes. You''re sure that your friend''s thoughts would make you blush even more than your own.'
 	'You: "Come, let''s find a place where we can sunbathe."'
 
-	gs 'arousal', 'voyeur', 10, 'exhibitionism'
+	gs 'arousal', 'erotic_nudity', 10, 'exhibitionism'
 	gs 'arousal', 'end'
 	gs 'stat'
 		
@@ -626,7 +626,7 @@ if $ARGS[0] = 'pos29':
 	'Nastya responds in her sultriest voice: "Finally something to fill me up..." You can''t see it but you imagine that she licked her lips as she spoke and it takes all of your resolve to not burst out into laughter at the face the delivery guy makes'
 	'Between her gathering the money to pay him and him taking his time counting it, about two minutes pass in almost complete silence. By the end, it seems like he wanted to speak up but nothing came out. Nastya gave him one last good look at her cleavage, thanked him and then slammed the door shut, almost hitting his nose.'
 
-	gs 'arousal', 'voyeur', 10, 'exhibitionism'
+	gs 'arousal', 'erotic', 10, 'exhibitionism'
 	gs 'stat'
 	
 	act 'Slam!':gt 'nastja', 'pos30'

locations/natbelEv.qsrc

@@ -254,7 +254,7 @@ if $ARGS[0] = 'showerspy':
 				'"Making yourself presentable I see." You say with a grin, which breaks Natasha out of her concentration, making her look up at you with an embarassed look on her face.'
 				'She then shrugs and gets back to her shaving. "I-It just feels nice... You know..." She lets out.'
 				'"Yeah, I understand. Freshly shaven skin is really nice to touch." You let her know as you keep watching while she finishes shaving.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				if NatbelQW['QWstage'] >= 9:
 					act 'Keep chatting while she rinses off':
 						*clr & cla
@@ -264,7 +264,7 @@ if $ARGS[0] = 'showerspy':
 						'"Someone''s in a great mood today." You praise her as you feel your own pussy getting wet at the sight of Natasha playing with herself in the shower. "I think we should continue this in your room."'
 						'Natasha quickly gets up and rinses off her entire body and you hand her a towel as she steps out of the shower.'
 						'"Don''t take too long. I''ll be in your room." You tell her and leave the bathroom.'
-						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'erotic_nudity', 5
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Leave': gt 'natbelapt','natroom'

locations/natbelapt.qsrc

@@ -370,7 +370,7 @@ if $ARGS[0] = 'showerevent1':
 			'"<<$pcs_nickname>>, there''s nothing wrong with the size of your breasts."'
 			'You get back to showering making sure to pay special attention to your breasts. <<$npc_nickname[''A191'']>> sits down on the toilet, and you can hear the sound of her peeing. You get turned on a bit, taking glances at her. Finally, she gets up, flushes and washes her hands before leaving you alone again in the bathroom.'
 			gs 'arousal', 'flash', 2
-			gs 'arousal', 'voyeur', 3
+			gs 'arousal', 'erotic_nudity', 3
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Get out of the shower': gt 'natbelapt', 'bathroom'
@@ -404,8 +404,6 @@ if $ARGS[0] = 'natroom':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/natsleep<<rand(1,4)>>.jpg"></center>'
 			'You look into the room and see that Natasha is sleeping soundly on her bed. Not wanting to disturb her you close the door and leave.'
 		end
-		gs 'arousal', 'voyeur', 2
-		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave':gt 'natbelapt','hallway'
 	elseif NatbelQW['seethroughwearing'] = 1 and natstayroom = 0:
@@ -413,8 +411,6 @@ if $ARGS[0] = 'natroom':
 		if NatbelQW['seethroughworn'] < 5:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/seethrough01.jpg"></center>'
 			'When you get back to Natasha''s room, you see she''s under her blankets reading a book.'
-			gs 'arousal', 'voyeur', 3
-			gs 'arousal', 'end'
 			gs 'stat'
 		else
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/seethrough02.jpg"></center>'
@@ -426,7 +422,7 @@ if $ARGS[0] = 'natroom':
 				'The moment your hand touches her skin she lets out a yelp and rolls over to see who it is.'
 				'"Jesus <<$pcs_nickname>> you nearly gave me a heart attack. For a second I thought my mom walked in."'
 				'You enjoy looking at her breasts through the thin fabric as she needs a moment to calm down.'
-				gs 'arousal', 'voyeur', 3
+				gs 'arousal', 'erotic', 3
 				gs 'arousal', 'end'
 				gs 'stat'
 				natstayroom = 1
@@ -613,7 +609,7 @@ if $ARGS[0] = 'natroom':
 					'Natasha drops the towel and heads over to the closet to grab some clothes. "What to wear?" She sighs as she rummages through her closet. Which gives you a good view of her naked ass the entire time.'
 					'When she''s decided on what to wear she gets dressed seeming not to care about you seeing her naked.'
 				end
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				act 'Let her dress':
 					gs 'arousal', 'end'
 					gt 'natbelapt', 'natroom'
@@ -809,7 +805,7 @@ if $ARGS[0] = 'hwundress':
 				NatbelQW['nakedHW'] += 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/nakedhomework1.jpg"></center>'
 				'"Fine, you can keep your bra and panties on, but the rest comes off." You say, clearly letting your disappointment show in your voice.'
-				gs 'arousal', 'voyeur', 10
+				gs 'arousal', 'erotic', 10
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Continue': gt 'natbelapt', 'undressedhw'
@@ -823,7 +819,7 @@ if $ARGS[0] = 'hwundress':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/nakedhomework2.jpg"></center>'
 					'"Then your mom will see you naked, this is what happens when you borrow money from people and can''t pay them back. You pay it back in other ways. Now do as you''re told and take off your clothes, all of your clothes."'
 					'Natasha looks as if she wants to object but then hangs her head and begins to remove her clothing. Once she''s completely naked, she shyly walks over to her desk and sits down as she starts in on your homework. Though after a while you think she''s actually enjoying it.'
-					gs 'arousal', 'voyeur', 10
+					gs 'arousal', 'erotic_nudity', 10
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Continue': gt 'natbelapt', 'undressedhw'
@@ -853,7 +849,7 @@ if $ARGS[0] = 'undressedhw':
 			'"It can''t be very comfortable for her, but I sure don''t mind the show." You think to yourself as you start to play with your pussy while you watch her work.'
 		end
 		'After a while, Natasha gets up saying: "It''s done <<$pcs_nickname>>, can I please get dressed now?"'
-		gs 'arousal', 'voyeur', 10
+		gs 'arousal', 'erotic', 10
 		gs 'arousal', 'foreplay', 10, 'lesbian'
 		minut -= 10
 		gs 'arousal', 'end'
@@ -866,6 +862,7 @@ if $ARGS[0] = 'undressedhw':
 		minut += 20
 		if NatbelQW['underwear'] = 1:
 			*clr & cla
+			gs 'arousal', 'erotic', 10
 			if NatbelQW['nakedHW'] < 5:
 				'"You should really buy yourself some nicer underwear, Natasha. If you ever somehow manage to get a boy interested in you do you think they will be turned on by those ugly things? How are the boys ever going to want to fuck you if you don''t wear something sexy for them? That is if you''ll ever manage to get a boy interested in you in the first place." You tell her, laughing at the way she squirms when you draw her attention to the fact that her bra and panties are some of the cheapest plainest ones, money can buy.'
 			else
@@ -875,6 +872,7 @@ if $ARGS[0] = 'undressedhw':
 			'As she continues working on your homework, you occasionally break Natasha''s concentration with more comments on her underwear and body. Each time you do so, she visibly loses her concentration.'
 		else
 			*clr & cla
+			gs 'arousal', 'erotic_nudity', 10
 			if NatbelQW['nakedHW'] < 5:
 				'"You should really take better care of yourself, I mean look at that bush. Do you really think guys will be thrilled by to see your hairy pussy? You should shave it smooth or at least keep it better trimmed." You say to her, laughing at the way she squirms when you draw her attention back to the fact that she''s completely naked in front of you.'
 			else
@@ -884,7 +882,6 @@ if $ARGS[0] = 'undressedhw':
 			'As she keeps working on your homework, you occasionally break Natasha''s concentration with more comments on her body. Each time you do so, she visibly loses her concentration.'
 		end
 		'After a while, Natasha gets up saying: "It''s done <<$pcs_nickname>>, can I please get dressed now?"'
-		gs 'arousal', 'voyeur', 10
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Continue': gt 'natbelapt', 'afterhomework'
@@ -937,7 +934,7 @@ if $ARGS[0] = 'afterhomework':
 					end
 					'"There. Are you happy now? I''m wearing it."'
 					'"Good." You tell her. "Remember, you''re going to wear it until you go to bed. If I catch you wearing your own clothes again, I''ll have to get more creative."'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'erotic', 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Continue':
@@ -954,7 +951,7 @@ if $ARGS[0] = 'afterhomework':
 					end
 					'"There. Are you happy now? I''m wearing it again."'
 					'"It looks so good on you." You tell her. "Remember, you''re going to wear it until you go to bed. If I catch you wearing your own clothes again, I''ll have to get more creative."'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'erotic', 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Continue':
@@ -970,7 +967,7 @@ if $ARGS[0] = 'afterhomework':
 						'"Ok." She says a bit too eagerly as she makes a show of walking over to her underwear drawer. She bends over and sticks her naked ass out, wiggling it sexily before pulling the lingerie from her drawer and putting it on.'
 					end
 					'"It looks so good on you. I love making you wear it for me."'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'erotic_nudity', 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Continue':

locations/natpimp.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'go_see_olu':
 				'She squeaks a reply. "You want him to fuck me in the ass with that thing?" she asks in disbelief.'
 				'"Yes I do, my ass could use a break and you owe me..."'
 				'After a moment she lowers her gaze and then nods her head. You pat her shoulder. "Good girl and it won''t be too bad, we have plenty of lube."'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic', 5
 				gs 'stat'
 				act 'Let the fun begin':
 					*clr & cla

locations/obj_din.qsrc

@@ -633,8 +633,9 @@ if $ARGS[0] = 'stats':
 	if stat['porn'] > 0: 'Times you have watched porn: <<stat[''porn'']>>'
 	if stat['flashlite'] > 0 or stat['flash'] > 0: 'Times you have flashed: <<stat[''flashlite''] + stat[''flash'']>>'
 	! This is my suggestion, change it however you see fit, Sicaa
-	if stat['voyeur'] > 0: 'Times you have watched people''s erotic displays: <<stat[''voyeur'']>>'
+	if stat['voyeur'] > 0: 'Times you have spied on erotic displays of others: <<stat[''voyeur'']>>'
 	if stat['voyeur_sex'] > 0: 'Times you have watched other people fuck: <<stat[''voyeur_sex'']>>'
+	if stat['erotic_nudity'] > 0: 'Times you were exposed to others'' nudity: <<stat[''erotic_nudity'']>>'
 	if spank > 0: 'You have had your ass spanked <<spank>> times'
 	! This is my suggestion, change it however you see fit, Sicaa
 	if stat['BDSM'] > 0 or stat['BDSM_give'] > 0: 'Times you have participated in BDSM (sub/dom): <<stat[''BDSM'']>>/<<stat[''BDSM_give'']>>'

locations/olu.qsrc

@@ -127,7 +127,7 @@ if $ARGS[0] = 'seduction':
 	minut += 10
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/seduction1.jpg"></center>'
 	'About fifteen minutes later he comes back just wearing a towel around his waist, with the split in the towel at the front as a he walks you get glimpses of his massive cock swinging from time to time. Then he sits down on the couch next to you and shows you his phone. "I love my new phone, the camera on it is very good, look at this pictures I have taken."'
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'erotic_nudity', 5
 	gs 'stat'
 	act 'Tell him you have to go':
 		*clr & cla
@@ -142,14 +142,14 @@ if $ARGS[0] = 'seduction':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/seduction2.jpg"></center>'
 		'You look over at his phone and he leans over to give you a better view, as he does his towel opens slightly and you can''t help but look at his massive cock peeking out. You try to pay attention to the images, most of them are just images of the park or other things he found pretty enough to take a picture of.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'stat'
 		act 'Look at more pictures':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/seduction3.jpg"></center>'
 			'He keeps showing you some more pictures he took even some of young attractive girls. "Yes they are very pretty." You tell him.'
 			'He smiles. "You are very pretty let me take your picture."'
-			gs 'arousal', 'voyeur', 3
+			gs 'arousal', 'erotic', 3
 			gs 'stat'
 			act 'Tell him you have to go':
 				*clr & cla

locations/pav_aptcourtev.qsrc

@@ -142,7 +142,7 @@ if $ARGS[0] = 'events1':
 		minut += 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/evbg.jpg"></center>'
 		'You notice a boy and a girl are intertwined and making out, she has her legs warped around his waist with her back against a tree, while they kiss and he fondles her breasts. They seem completely oblivious to the rest of the world and just enjoying each other. You don''t know either of them.'
-		gs 'arousal', 'voyeur', -10
+		gs 'arousal', 'voyeur_sex', -10
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Move away':gt 'pav_complex', 'start'

locations/pav_train_market.qsrc

@@ -374,7 +374,7 @@ if ARGS[0] = 4:
 	else
 		act 'Browse the porn magazines':
 			*clr & cla
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'

locations/pod_ezd.qsrc

@@ -417,7 +417,7 @@ if $ARGS[0] = 'floor2_events':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/nakedstairs.jpg"></center>'
 		'You hear someone coming up the stairs, as you turn and look you see some naked woman walking up the stairs, carrying her clothes in her hand. When she see''s you, she blushes and ducks her head down, not meeting your gaze. She continues on up to the next floor, before you hear a door open and close above. You have no idea why she was naked carrying her clothes.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Continue': gt 'pod_ezd', 'etaj_2'
@@ -427,7 +427,7 @@ if $ARGS[0] = 'floor2_events':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/openrobe.jpg"></center>'
 		'You see a woman standing outside of her open apartment door leaning on the stair railing wearing only a robe, which is untied and open. Allowing you or anyone else to see her naked body, when she see''s you she smiles at you. "Hello." She says as if everything was normal. You say hi back and try not to stare. After a couple of more drags off the cigarette she crushes it out and goes back into her apartment.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Continue': gt 'pod_ezd', 'etaj_2'
@@ -437,7 +437,7 @@ if $ARGS[0] = 'floor2_events':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev1_1.jpg"></center>'
 		'As you walk around a corner in the stairwell, you''re suddenly looking straight at a woman''s bare pussy! She''s sitting on some stairs and is casually smoking a cigarette. Her partner chats her up, while he has a great look at her naked pussy and her widely spread legs.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_2'
 		gs 'willpower', 'voyeur', 'self', 'medium'
@@ -449,7 +449,7 @@ if $ARGS[0] = 'floor2_events':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev1_2.jpg"></center>'
 				'The girl notices you, and gives you a cute wink. She keeps talking with her partner, and pulls her boobs out of her shirt while spreading her legs even further. You''re confused is she doing this for you, or for him?'
 				'You know you really should not be staring, especially when she knows, but at the same time you can''t take your eyes off her. After a few minutes, the guy helps her up and they head upstairs, towards one of the apartments there. The girl flashes you a conspiratory smile as her face disappears around the corner.'
-				gs 'arousal', 'voyeur', 3
+				gs 'arousal', 'erotic_nudity', 3
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Leave': gt 'pod_ezd', 'etaj_2'
@@ -545,7 +545,7 @@ if $ARGS[0] = 'floor3_events':
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/titsmoke.jpg"></center>'
 		'You see a topless girl wearing a skirt in the stairwell, standing next to a open window smoking a cigarette. She nods and smiles to you but doesn''t say anything. You decided to mind your own business.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_3'
@@ -578,7 +578,7 @@ if $ARGS[0] = 'floor4_events':
 	if floor4 = 1:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/luda/event/ev2.jpg"></center>'
 		'You hear someone coming up the stairs. They sound like they''re in a hurry. You turn around just in time to see aunt Luda in the stairwell, she''s not even wearing any pants or underwear! She can be so slutty sometimes. She''s on her way back up after "throwing away some garbage", she tells you, adding that she has no time to chat as she rushes past you and into her apartment.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_4'
@@ -592,7 +592,7 @@ if $ARGS[0] = 'floor4_events':
 	elseif floor4 = 6:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_1.jpg"></center>'
 		'As you walk around a corner in the stairwell, you see Yelena Kotov, a girl from your class. She''s taking off her panties in front of several guys. If her brother Vitek could see this, he''d probably be beating the crap out of them right now. He''s extremely protective of his sister.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_4'
@@ -610,35 +610,35 @@ if $ARGS[0] = 'floor4_events':
 	elseif floor4 = 7:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/opendoor.jpg"></center>'
 		'You glance down the stairs and see that the apartment at the bottom has it''s door open. You can see inside the apartment, all the way to the bathroom, which also has it''s door wide open. Apparently the girl inside didn''t notice or maybe she did it on purpose. As she stands there naked applying facial cream to her face in the mirror.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_4'
 	elseif floor4 = 8 or floor4 = 9:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/flashp' + rand(1,2) + '.jpg"></center>'
 		'As you walk around a corner in the stairwell, you see some girl hanging out with the boys that smoke. They are encouraging her to lift her dress and show them her pussy. After a bit she finally relents and lifts her dress showing off her pussy. This only seems to encourage them as they crowd her a bit and encourage her to get naked. When you catch one of them boys looking at you, you decided it is best to be on your way.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_4'
 	elseif floor4 = 10 or floor4 = 11:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/flasht.jpg"></center>'
 		'As you walk around a corner in the stairwell, you see some girl hanging out with the boys that smoke. They are encouraging her to show her tits. After a bit she finally relents and pulls down her top, exposing her tits. This only seems to encourage them as they crowd her a bit and encourage her to get naked. When you catch one of them boys looking at you, you decided it is best to be on your way.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_4'
 	elseif floor4 = 12 or floor4 = 13:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/nakeddoor.jpg"></center>'
 		'You hear some knocking and a girls voice. "Open up, come on please let me in before someone comes along." As you round the corner you see a naked girl standing at a door, frantically twisting and pulling on the doorknob. When she finally notices you, she blushes and you hear her say to who ever is in the apartment. "There is some girl here watching me, let me in!" When there is no reply she turns to face you. "My boyfriend is just being a asshole." Before you can reply the door opens behind her and she quickly darts inside, you see some guy just inside before the door closes laughing.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_4'
 	elseif floor4 = 14 or floor4 = 15:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/passedoutm.jpg"></center>'
 		'You run across a naked passed out fat guy on the stairs. You recognize he lives in the building with his wife, and realize you''ve never seen him sober. You have heard when he gets to drunk and passes out, his wife strips him and drags him out into the hall to teach him a lesson, but it doesn''t appear he has learned the lesson yet. A couple of kids, who you think are from your brother''s class, are around him laughing and taking pictures.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_4'
@@ -655,7 +655,7 @@ if $ARGS[0] = 'floor5_events':
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/sex/ev4_1.jpg"></center>'
 		'When you walk up the stairs to the fifth floor, you see an unfamiliar girl showing off her boobs to two guys. One of them is holding a camera. You''re fairly sure you have never seen any of them before.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_5'
@@ -749,7 +749,7 @@ if $ARGS[0] = 'floor5_events':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/passedoutsf.jpg"></center>'
 		'When you walk up the stairs to the fifth floor, you see a girl laying on the ground passed out, she reeks of alcohol. Her pants are only half on, leaving most of her bare ass exposed. Her purse and panties are lying nearby, by the look of it, it looks like someone started to put her pants back on her but never finished the job and just left her there.'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Ignore her': gt 'pod_ezd', 'etaj_5'
@@ -1589,35 +1589,35 @@ if $ARGS[0] = 'lena_show':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_1.jpg"></center>'
 	'As you walk around a corner in the stairwell, you see Yelena Kotov, a girl from your class. She''s taking off her panties in front of several guys. If her brother Vitek could see this, he''d probably be beating the crap out of them right now he''s really protective of his sister.'
-	gs 'arousal', 'voyeur', 3
+	gs 'arousal', 'erotic_nudity', 3
 	gs 'stat'
 	act 'Leave': gt 'pod_ezd', 'etaj_4'
 	act 'Hide and watch them':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_2.jpg"></center>'
 		'Lena turns her back to the guys next, and pulls up her skirt slightly. She shows off her well-toned ass, slowly wagging it as she asks seductively over her shoulder: "Do you like what you see, boys?"'
-		gs 'arousal', 'voyeur', 3
+		gs 'arousal', 'erotic', 3
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_4'
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_3.jpg"></center>'
 			'One of the guys has a lewd grin on his face as he gets an idea, and tells Lena to strike a pose as he pulls his phone out of his pocket. He begins to take photos of Lena, while the other guys encourage her to show more.'
-			gs 'arousal', 'voyeur', 3
+			gs 'arousal', 'erotic', 3
 			gs 'stat'
 			act 'Leave': gt 'pod_ezd', 'etaj_4'
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_4.jpg"></center>'
 				'Lena really gets into it, posing seductively for the camera now while she lets her skirt ride up a little more. You can tell the stares of the guys turn her on a lot, and you realize Vitek''s little sister is not as innocent as she looks.'
-				gs 'arousal', 'voyeur', 3
+				gs 'arousal', 'erotic', 3
 				gs 'stat'
 				act 'Leave': gt 'pod_ezd', 'etaj_4'
 				act 'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/ev4_5.jpg"></center>'
 					'Lena spreads her legs further, really showing off her pussy to the camera now. The guys are getting quite aroused now, and a few of them are rubbing their groins uncomfortably.'
-					gs 'arousal', 'voyeur', 3
+					gs 'arousal', 'erotic_nudity', 3
 					gs 'stat'
 					act 'Leave': gs 'arousal', 'end' & gt 'pod_ezd', 'etaj_4'
 					act 'Continue':
@@ -1626,7 +1626,7 @@ if $ARGS[0] = 'lena_show':
 						'Lena turns her back to the guys again, her skirt pulled up so far now that she''s showing off all her holes to the camera.'
 						'Then she decides the photo shoot is over, and asks them: "So boys, who wants to go first?"'
 						'While the guys enthusiastically gather around her you realize you should probably go, before someone notices you.'
-						gs 'arousal', 'voyeur', 3
+						gs 'arousal', 'erotic', 3
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Leave': gt 'pod_ezd', 'etaj_4'

locations/rolanbath.qsrc

@@ -428,7 +428,7 @@ if $ARGS[0] = 'sexev':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/caught0.jpg"></center>'
 		'...oops... better leave him be.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave him alone': gt 'rolanapt','hallway'

locations/sexdvanadva.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'var':
 		'<center><img <<$set_imgh>> src="images/locations/shared/sex/sexdvanadva/vag<<picrand>>.jpg"></center>'
 		'While she enjoys a stiff cock in her pussy, you are not left wanting for attention.'
 		
-		gs 'arousal', 'voyeur_sex', 10, 'sub'
+		gs 'arousal', 'erotic', 10, 'sub'
 		gs 'stat'
 
 		if sexvar < 3:act 'More':xgt 'sexdvanadva', 'var'

locations/sister_party.qsrc

@@ -388,7 +388,7 @@ if $ARGS[0] = 'anna_kit':
 		*nl
 		'Turning you find Anya completely naked, drinking from a bottle with tears running down her face, looking at Roma. "Well it''s over between us, go to hell, dog."'
 		'Roma didn''t say anything in response. Anya turned and ran away. You glare at him few moments for making your sister cry and then you rush after her.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5, 'incest'
 		gs 'stat'
 		act 'Chase Anya':
 			*clr & cla

locations/sistersleep.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'sister_sleep':
 	'Anya is sleeping face down on her bed, with her covers tossed aside, exposing her panty clad ass. You admit she has a really nice ass, you never see her workout, you wonder how she keeps so fit.'
 	if sisterLesb >= 7 or sisterLesb = -1:
 		'You want to touch her again but you keep from doing it, you agreed to not wake her up like this anymore. You sigh and then move away.'
-		gs 'arousal', 'voyeur', -2
+		gs 'arousal', 'erotic', -2
 		gs 'stat'
 		act 'Move away': gt 'bedrPar'
 	else

locations/soniadisco.qsrc

@@ -275,14 +275,14 @@ if $ARGS[0] = 'soniadrinkmore1':
 		'She looks at him a little confused. "What?"'
 		'"You were going to show us what color your panties are." Dan says as if it were a fact.'
 		'Sonia blinks. "I was?" Which gets all the guys agreeing, she glances to you and you nod. While Paulina offers more helpful advice. "Go on don''t be a tease." With the encouragement Sonia stands up and turns around and pulls up her dress showing off the back of her panties.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic', 5
 		gs 'stat'
 		act 'Continue':
 			*clr & cla
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/panties2.jpg"></center>'
 			'The boys hoot and hollar and Vasily adds in. "Now show us the front of your panties." With a huge grin she turns facing everyone and pulls up her dress to show off her panties for all to see. Then she blushes and seems to realize maybe she is going to far and with a slight slur in her voice and a cheeky grin on her face she says: "I want to go dancing! Let''s go back to the disco!"'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Go back to the disco': gt 'soniadisco', 'dance'
@@ -294,7 +294,7 @@ if $ARGS[0] = 'dance':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/1.jpg"></center>'
 	'You go back to the disco with the rest of the group, where Sonia immediately runs to the dance floor. Her drunken stumbling doesn''t look too much like dancing, but she looks like she''s having fun. In her enthusiasm to pull off some experimental dance moves, she doesn''t notice that one of her shirt straps slid down. Because she''s not wearing a bra, one of her boobs is fully exposed and it merrily bounces up and down whenever Sonia jumps.'
-	gs 'arousal', 'voyeur', 5
+	gs 'arousal', 'erotic_nudity', 5
 	gs 'stat'
 	act 'Just watch':
 		*clr & cla
@@ -338,7 +338,7 @@ if $ARGS[0] = 'dance':
 			'You tell her: "You have a nice set of boobs, Sonia. I can see why you''d be so willing to show them off to the world."'
 			'She looks at you with a slightly puzzled look on her face but never stops dancing as she asks: "Wha- what are you talking about?"'
 			'With a grin, you put your hand on her other shoulder and slide that strap down too, fully exposing her breasts to everyone who happens to be looking her way. She barely notices, and doesn''t understand why you are staring at her so intently. Once you walk away, she dances with both her breasts bouncing freely for several minutes before some guys pawing at her exposed breasts finally makes her notice. She blushes but also laughs about it, pulling her top back in place.' 
-			gs 'arousal', 'voyeur', 10
+			gs 'arousal', 'erotic_nudity', 10
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Continue': gt 'gdkin'
@@ -393,13 +393,13 @@ if $ARGS[0] = 'disco2':
 				'She looks at him a little confused. "What?"'
 				'"You were going to show us what color your panties are." Dan says as if it were a fact.'
 				'Sonia blinks. "I was?" Which gets all the guys agreeing, she glances to you and you nod. While Paulina offers more helpful advice. "Go on don''t be a tease." With the encouragement Sonia stands up and turns around and pulls up her dress showing off the back of her panties.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic', 5
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/panties2.jpg"></center>'
 					'The boys hoot and hollar and Vasily adds in. "Now show us the front of your panties." With a huge grin she turns facing everyone and pulls up her dress to show off her panties for all to see. Then she blushes and seems to realize maybe she is going to far and with a slight slur in her voice and a cheeky grin on her face she says: "I want to go dancing! Let''s go back to the disco!"'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'erotic', 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Encourage her': gt 'soniadisco', 'soniadrinkmore2'
@@ -419,13 +419,13 @@ if $ARGS[0] = 'disco2':
 			'She looks at him a little confused. "What?"'
 			'"You was going to show us what color your panties are." Dan says as if it was a fact.'
 			'Sonia blinks. "I was?" Which gets all the guys agreeing, she glances to you and you nod. While Paulina offers more helpful advice. "Go on don''t be a tease." With the encouragement Sonia stands up and turns around and pulls up her dress showing off the back of her panties.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/panties2.jpg"></center>'
 				'The boys hoot and hollar and Vasily adds in. "Now show us the front of your panties." With a huge grin she turns facing everyone and pulls up her dress to show off her panties for all to see. Then she blushes and seems to realize maybe she is going to far and with a slight slur in her voice and a cheeky grin on her face she says: "I want to go dancing! Let''s go back to the disco!"'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Encourage her': gt 'soniadisco', 'soniadrinkmore2'
@@ -447,13 +447,13 @@ if $ARGS[0] = 'disco2':
 			'She looks at him a little confused. "What?"'
 			'"You were going to show us what color your panties are." Dan says as if it were a fact.'
 			'Sonia blinks. "I was?" Which gets all the guys agreeing, she glances to you and you nod. While Paulina offers more helpful advice. "Go on don''t be a tease." With the encouragement Sonia stands up and turns around and pulls up her dress showing off the back of her panties.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/panties2.jpg"></center>'
 				'The boys hoot and hollar and Vasily adds in. "Now show us the front of your panties." With a huge grin she turns facing everyone and pulls up her dress to show off her panties for all to see. Then she blushes and seems to realize maybe she is going to far and with a slight slur in her voice and a cheeky grin on her face she says: "I want to go dancing! Let''s go back to the disco!"'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Go back to the disco': gt 'soniadisco', 'dance'
@@ -486,13 +486,13 @@ if $ARGS[0] = 'soniadrinkmore2':
 		'"You were going to show us your tits." Dan says as if it were a fact.'
 		'Sonia blinks. "I was?" Which gets all the guys agreeing, she glances to you and you nod. While Paulina offers more helpful advice. "Yeah you said you had really perky ones, so go on and prove it."'
 		'With the encouragement Sonia pulls down her top showing off her perky boobs. Then she stands up a little unsteady on her feet. "Show us your butt now." Vasily says.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'stat'
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/butt.jpg"></center>'
 			'With a huge grin Sonia stands up and turns around, she pulls up the back of her dress and pulls down her panties showing off her bare ass for everyone to see. Then she blushes and seems to realize maybe she is going to far and with a slight slur in her voice and a cheeky grin on her face she says: "I want to go dancing! Let''s go back to the disco!"'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic_nudity', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Go back to the disco': gt 'soniadisco', 'dance'
@@ -549,13 +549,13 @@ if $ARGS[0] = 'disco3':
 				'"You were going to show us your tits." Dan says as if it were a fact.'
 				'Sonia blinks. "I was?" Which gets all the guys agreeing, she glances to you and you nod. While Paulina offers more helpful advice. "Yeah you said you had really perky ones, so go on and prove it."'
 				'With the encouragement Sonia pulls down her top showing off her perky boobs. Then she stands up a little unsteady on her feet. "Show us your butt now." Vasily says.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/butt.jpg"></center>'
 					'With a huge grin Sonia stands up and turns around, she pulls up the back of her dress and pulls down her panties showing off her bare ass for everyone to see. Then she blushes and seems to realize maybe she is going to far and with a slight slur in her voice and a cheeky grin on her face she says: "I want to go dancing! Let''s go back to the disco!"'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'erotic_nudity', 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Encourage her': gt 'soniadisco', 'soniadrinkmore3'
@@ -576,13 +576,13 @@ if $ARGS[0] = 'disco3':
 			'"You were going to show us your tits." Dan says as if it were a fact.'
 			'Sonia blinks. "I was?" Which gets all the guys agreeing, she glances to you and you nod. While Paulina offers more helpful advice. "Yeah you said you had really perky ones, so go on and prove it."'
 			'With the encouragement Sonia pulls down her top showing off her perky boobs. Then she stands up a little unsteady on her feet. "Show us your butt now." Vasily says.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic_nudity', 5
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/butt.jpg"></center>'
 				'With a huge grin Sonia stands up and turns around, she pulls up the back of her dress and pulls down her panties showing off her bare ass for everyone to see. Then she blushes and seems to realize maybe she is going to far and with a slight slur in her voice and a cheeky grin on her face she says: "I want to go dancing! Let''s go back to the disco!"'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Encourage her': gt 'soniadisco', 'soniadrinkmore3'
@@ -605,14 +605,14 @@ if $ARGS[0] = 'disco3':
 			'"You were going to show us your tits." Dan says as if it were a fact.'
 			'Sonia blinks. "I was?" Which gets all the guys agreeing, she glances to you and you nod. While Paulina offers more helpful advice. "Yeah you said you had really perky ones, so go on and prove it."'
 			'With the encouragement Sonia pulls down her top showing off her perky boobs. Then she stands up a little unsteady on her feet. "Show us your butt now." Vasily says.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic_nudity', 5
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/butt.jpg"></center>'
 				'With a huge grin Sonia stands up and turns around, she pulls up the back of her dress and pulls down her panties showing off her bare ass for everyone to see. Then she blushes and seems to realize maybe she is going to far and with a slight slur in her voice and a cheeky grin on her face she says: "I want to go dancing! Let''s go back to the disco!"'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Go back to the disco': gt 'soniadisco', 'dance'
@@ -646,13 +646,13 @@ if $ARGS[0] = 'soniadrinkmore3':
 		'"You were going to show us your pussy." Dan says as if it were a fact.'
 		'Sonia blinks. "I was?" Which gets all the guys agreeing, she glances to you and you nod. While Paulina offers more helpful advice. "Yeah you said you had pretty pussy, so go on and prove it."'
 		'With the encouragement Sonia pulls her dress up and pulls her panties aside showing off her pussy. She has a huge grin on her face at all the attention she is getting. "Show us everything." Vasily says.'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic_nudity', 5
 		gs 'stat'
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/fullfront.jpg"></center>'
 			'With a huge grin Sonia stands up and turns around, she pulls up the back of her dress and pulls down her panties showing off her bare ass for everyone to see. Then she blushes and seems to realize maybe she is going to far and with a slight slur in her voice and a cheeky grin on her face she says: "I want to go dancing! Let''s go back to the disco!"'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic_nudity', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Go back to the disco': gt 'soniadisco', 'dance'
@@ -708,14 +708,14 @@ if $ARGS[0] = 'disco4':
 				'"You were going to show us your pussy." Dan says as if it were a fact.'
 				'Sonia blinks. "I was?" Which gets all the guys agreeing, she glances to you and you nod. While Paulina offers more helpful advice. "Yeah you said you had pretty pussy, so go on and prove it."'
 				'With the encouragement Sonia pulls her dress up and pulls her panties aside showing off her pussy. She has a huge grin on her face at all the attention she is getting. "Show us everything." Vasily says.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
 					soniarushout = 1
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/fullfront.jpg"></center>'
 					'With a huge grin Sonia pulls her panties aside with one hand showing off her pussy, while with the other she pulls down her dress to expose her tits, putting everything on full display for all to see. Then she blushes and seems to realize maybe she is going to far and with a panic in her eyes, she looks around at everybody that is focused on her, she quickly covers up her bare pussy and holds her dress over her tits in dismay, as if she just realized what she has done and stammers. "I... I need to go!" She quickly pulls her dress back into place and then takes off, before anyone can stop her.'
-       				gs 'arousal', 'voyeur', 5
+       				gs 'arousal', 'erotic_nudity', 5
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Go after her': gt 'soniadisco', 'chasesonia'
@@ -736,7 +736,7 @@ if $ARGS[0] = 'disco4':
 			'"You were going to show us your pussy." Dan says as if it were a fact.'
 			'Sonia blinks. "I was?" Which gets all the guys agreeing, she glances to you and you nod. While Paulina offers more helpful advice. "Yeah you said you had pretty pussy, so go on and prove it."'
 			'With the encouragement Sonia pulls her dress up and pulls her panties aside showing off her pussy. She has a huge grin on her face at all the attention she is getting. "Show us everything." Vasily says.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic_nudity', 5
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
@@ -744,7 +744,7 @@ if $ARGS[0] = 'disco4':
 				soniarushout = 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/fullfront.jpg"></center>'
 				'With a huge grin Sonia pulls her panties aside with one hand showing off her pussy, while with the other she pulls down her dress to expose her tits, putting everything on full display for all to see. Then she blushes and seems to realize maybe she is going to far and with a panic in her eyes, she gazes around at everybody that is focused on her, she quickly covers up her bare pussy and holds her dress over her tits in dismay, as if she just realized what she has done and stammers. "I... I need to go!" She quickly pulls her dress back in place and then takes off, before anyone can stop her.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Go after her': gt 'soniadisco', 'chasesonia'
@@ -768,14 +768,14 @@ if $ARGS[0] = 'disco4':
 			'"You were going to show us your pussy." Dan says as if it were a fact.'
 			'Sonia blinks. "I was?" Which gets all the guys agreeing, she glances to you and you nod. While Paulina offers more helpful advice. "Yeah you said you had pretty pussy, so go on and prove it."'
 			'With the encouragement Sonia pulls her dress up and pulls her panties aside showing off her pussy. She has a huge grin on her face at all the attention she is getting. "Show us everything." Vasily says.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic_nudity', 5
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
 				soniarushout = 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/disco/fullfront.jpg"></center>'
 				'With a huge grin Sonia pulls her panties aside with one hand showing off her pussy, while with the other she pulls down her dress to expose her tits, putting everything on full display for all to see. Then she blushes and seems to realize maybe she is going to far and with a panic in her eyes, she looks around at everybody that is focused on her, she quickly covers up her bare pussy and holds the dress over her tits in dismay, as if she just realized what she has done and stammers. "I... I need to go!" She quickly pulls her clothes back in place and then takes off, before anyone can stop her.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Go after her': gt 'soniadisco', 'chasesonia'
@@ -812,7 +812,7 @@ if $ARGS[0] = 'soniadrinkmore4':
 		'"Oh, really?" Vitek smirks. "If I did, would you suck it?"'
 		'Sonia smiles at him and confesses: "Of course! I love popsicles! Bu-"'
 		'Vitek reaches for his pocket, and actually pulls out a popsicle. Sonia looks at him in awe for a moment, as if he is a magician that just made a bunny appear out of thin air. Then she tries to reach out for it, but Vitek pulls it away from her and says: "No, no hands. I''ll hold it, you only use your mouth."'
-		gs 'arousal', 'voyeur', 5
+		gs 'arousal', 'erotic', 5
 		gs 'stat'
 		act 'Watch':
 			*clr & cla
@@ -820,7 +820,7 @@ if $ARGS[0] = 'soniadrinkmore4':
 			'Sonia obediently pulls her hands away and opens her mouth, and Vitek slowly puts the popsicle against her lips and tongue. Then she closes her lips around it and sucks on it, while looking at Vitek seductively.'
 			'Vitek grins and lowers the popsicle further and further, until it is at the same level as his groin. All this time, Sonia has never taken her mouth off it, and eventually she gets down on her knees after bending over awkwardly and nearly falling over once or twice. The way she''s sucking and licking the popsicle definitely gets Vitek aroused, and you see his cock straining against the fabric of his pants. Meanwhile, Dan and Vasily are looking at the two of them with their mouths open, somewhat awkwardly hiding their erections.'
 			'Once the popsicle is mostly gone, Dan clears his throat and suggests: "Open your mouth and shows us your tongue." She opens her mouth showing off her red stained tongue.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'stat'
 			act 'Keep watching':
 				*clr & cla
@@ -919,7 +919,7 @@ if $ARGS[0] = 'disco5':
 				'"Oh, really?" Vitek smirks. "If I did, would you suck it?"'
 				'Sonia smiles at him and confesses: "Of course! I love popsicles! Bu-"'
 				'Vitek reaches for his pocket, and actually pulls out a popsicle. Sonia looks at him in awe for a moment, as if he is a magician that just made a bunny appear out of thin air. Then she tries to reach out for it, but Vitek pulls it away from her and says: "No, no hands. I''ll hold it, you only use your mouth."'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic', 5
 				gs 'stat'
 				act 'Watch':
 					*clr & cla
@@ -927,7 +927,7 @@ if $ARGS[0] = 'disco5':
 					'Sonia obediently pulls her hands away and opens her mouth, and Vitek slowly puts the popsicle against her lips and tongue. Then she closes her lips around it and sucks on it, while looking at Vitek seductively.'
 					'Vitek grins and lowers the popsicle further and further, until it is at the same level as his groin. All this time, Sonia has never taken her mouth off it, and eventually she gets down on her knees after bending over awkwardly and nearly falling over once or twice. The way she''s sucking and licking the popsicle definitely gets Vitek aroused, and you see his cock straining against the fabric of his pants. Meanwhile, Dan and Vasily are looking at the two of them with their mouths open, somewhat awkwardly hiding their erections.'
 					'Once the popsicle is mostly gone, Dan clears his throat and suggests: "Open your mouth and shows us your tongue." She opens her mouth showing off her red stained tongue.'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'erotic', 5
 					gs 'stat'
 					act 'Keep watching':
 						*clr & cla
@@ -985,7 +985,7 @@ if $ARGS[0] = 'disco5':
 			'"Oh, really?" Vitek smirks. "If I did, would you suck it?"'
 			'Sonia smiles at him and confesses: "Of course! I love popsicles! Bu-"'
 			'Vitek reaches for his pocket, and actually pulls out a popsicle. Sonia looks at him in awe for a moment, as if he is a magician that just made a bunny appear out of thin air. Then she tries to reach out for it, but Vitek pulls it away from her and says: "No, no hands. I''ll hold it, you only use your mouth."'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'stat'
 			act 'Watch':
 				*clr & cla
@@ -993,7 +993,7 @@ if $ARGS[0] = 'disco5':
 				'Sonia obediently pulls her hands away and opens her mouth, and Vitek slowly puts the popsicle against her lips and tongue. Then she closes her lips around it and sucks on it, while looking at Vitek seductively.'
 				'Vitek grins and lowers the popsicle further and further, until it is at the same level as his groin. All this time, Sonia has never taken her mouth off it, and eventually she gets down on her knees after bending over awkwardly and nearly falling over once or twice. The way she''s sucking and licking the popsicle definitely gets Vitek aroused, and you see his cock straining against the fabric of his pants. Meanwhile, Dan and Vasily are looking at the two of them with their mouths open, somewhat awkwardly hiding their erections.'
 				'Once the popsicle is mostly gone, Dan clears his throat and suggests: "Open your mouth and shows us your tongue." She opens her mouth showing off her red stained tongue.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic', 5
 				gs 'stat'
 				act 'Keep watching':
 					*clr & cla
@@ -1054,7 +1054,7 @@ if $ARGS[0] = 'disco5':
 			'"Oh, really?" Vitek smirks. "If I did, would you suck it?"'
 			'Sonia smiles at him and confesses: "Of course! I love popsicles! Bu-"'
 			'Vitek reaches for his pocket, and actually pulls out a popsicle. Sonia looks at him in awe for a moment, as if he is a magician that just made a bunny appear out of thin air. Then she tries to reach out for it, but Vitek pulls it away from her and says: "No, no hands. I''ll hold it, you only use your mouth."'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'erotic', 5
 			gs 'stat'
 			act 'Watch':
 				*clr & cla
@@ -1062,7 +1062,7 @@ if $ARGS[0] = 'disco5':
 				'Sonia obediently pulls her hands away and opens her mouth, and Vitek slowly puts the popsicle against her lips and tongue. Then she closes her lips around it and sucks on it, while looking at Vitek seductively.'
 				'Vitek grins and lowers the popsicle further and further, until it is at the same level as his groin. All this time, Sonia has never taken her mouth off it, and eventually she gets down on her knees after bending over awkwardly and nearly falling over once or twice. The way she''s sucking and licking the popsicle definitely gets Vitek aroused, and you see his cock straining against the fabric of his pants. Meanwhile, Dan and Vasily are looking at the two of them with their mouths open, somewhat awkwardly hiding their erections.'
 				'Once the popsicle is mostly gone, Dan clears his throat and suggests: "Open your mouth and shows us your tongue." She opens her mouth showing off her red stained tongue.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic', 5
 				gs 'stat'
 				act 'Keep watching':
 					*clr & cla

locations/street_event.qsrc

@@ -948,7 +948,7 @@ if $ARGS[1] = 'main':
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/girlfash1.jpg"></center>'
 				end
 				'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
+				gs 'arousal', 'erotic_nudity', 5
 				act 'Continue':gt $loc
 				if exhibitionist_lvl > 0:
 					act 'Flash her back':
@@ -1133,7 +1133,7 @@ if $ARGS[1] = 'main':
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/nakedg'+ rand(1,3) +'.jpg"></center>'
 				end
 				'As you walk down the street you pass a naked young woman, she seems to be loving the attention she is getting. Otherwise she is acting like any other person on the street.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Leave':gt $loc
@@ -1149,7 +1149,7 @@ if $ARGS[1] = 'main':
 				'<<$streetev_title>>'
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/nakedgmbike.jpg"></center>'
 				'As you walk down the street a motorcycle drives by slowly, several people are taking pictures. The man driving waves at them, while behind him sits a naked girl only wearing a motorcycle helmet. A few moments later the traffic clears up a bit and they zoom off.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				gs 'arousal', 'end'
 				act 'Leave':gt $loc
 			else
@@ -1164,7 +1164,7 @@ if $ARGS[1] = 'main':
 				'<<$streetev_title>>'
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/nopanties.jpg"></center>'
 				'As you walk down the street you pass a young girl sitting on the sidewalk with some friends next to her. You throw a glance at her and surprisingly see her spread the legs revealing her bare pussy to you, all while smiling.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'erotic_nudity', 5
 				gs 'arousal', 'end'
 				act 'Leave':gt $loc
 			else

locations/swamphouse.qsrc

@@ -670,7 +670,7 @@ if $ARGS[0] = 'stackmagazines':
 		if $clothingworntype = 'nude' and $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/readpornomag_nude.jpg"></center>'
 		*nl
 		'You''re flipping through a porn magazine, reading the stories and looking at pictures, when all of a sudden you realize you''ve started touching yourself.'
-		gs 'arousal', 'voyeur', 60
+		gs 'arousal', 'porn', 60
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Continue': gs 'swamphouse', 'stackmagazines'