Replace voyeur or exhibitionism calls to fix stats about watching others

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/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/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,8 @@ 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] = 'kiss':
 		count['kiss'] = 1
 		stim['act'] = 10
@@ -482,7 +485,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] ! '':

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', 'voyeur', 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_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_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'

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/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

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/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