locations/booty_call_cowgirl.qsrc

@@ -74,8 +74,6 @@ if $ARGS[0] = 'cowgirl_start':
 			elseif $booty_call['position'] = 'cowgirl':
 				'You crawl forward back into position, throwing your legs over his.'
 				'"I''m not done riding you."'
-			else
-				'You push him back onto the bed and throw your legs over his.'
 			elseif $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl':
 				'"I want to be on top this time," you say, giving <<$npc_firstname[$boy]>> a smouldering look as you mount his cock.'
 			else

locations/booty_call_doggy.qsrc

@@ -112,8 +112,6 @@ if $ARGS[0] = 'doggy_start':
 				'"Fuck me from behind."'
 			elseif $booty_call['position'] = 'doggy':
 				'You get back on your knees, waggling your ass enticingly at him.'
-			else
-				'You turn around and get on your knees, presenting your ass towards him.'
 			elseif $booty_call['position'] = 'miss' or $booty_call['position'] = 'cowgirl':
 				'"I want you to fuck me from behind this time," you say, giving him a sultry look over your shoulder.'
 			else

locations/booty_call_pillow_talk2.qsrc

@@ -308,7 +308,7 @@ if $ARGS[0] = 'made_me_late1':
 	if schoolprogul > 0 and npc_school_absences[$boy] < schoolprogul and npc_school_absences[$boy] > 0:
 		act'Made me late for school again':
 			cla
-			act'Annoyed'
+			act'Annoyed':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 				if npc_last_sex[$boy] = daystart:
@@ -328,7 +328,7 @@ if $ARGS[0] = 'made_me_late1':
 	elseif schoolprogul > 0:
 		act'Made me late for school':
 			cla
-			act'Annoyed'
+			act'Annoyed':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 				if npc_last_sex[$boy] = daystart:

locations/brother_shower_sex.qsrc

@@ -408,8 +408,7 @@ if $ARGS[0] = 'brother_shower_anal_vagv_analv':
 end
 
 if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
-	*clr
-	cla
+	cla & *clr
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 	'You chew your lip, debating with yourself internally before just spitting it out.'
 	*nl
@@ -425,8 +424,7 @@ if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
 	*nl
 	'While you''re not sure if you like the label ''pussy juice'', it''s the only plan you''ve got.'
 	act '"Okay, let''s do that."':
-		*clr
-		cla
+		cla & *clr
 		'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/showeranal2.mp4"></center>'
 		'Moving in behind you, Kolka lines up with your pussy before thrusting in. Feeling this, you consider hitting the abort button and returning to what you''re more familiar with, but you want that new experience and still feel the need to try it.'
 		'You widen your stance and push your ass towards Kolka. He grips your hip and his cock slowly pushes at your virgin hole. As the head of Kolka''s cock enters you, he pauses and lets out an annoyed grunt.'
@@ -437,8 +435,7 @@ if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
 		gs 'arousal', 'vaginal', 2
 		gs 'stat'
 		act 'This is nice':
-			*clr
-			cla
+			cla & *clr
 			'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/showeranal3.mp4"></center>'
 			'You briefly think about switching back to ''normal'' shower sex, but you still want to try this and want to see it though.'  
 			'"Keep going," you say, and Kolka pushes deeper, stopping every few seconds to let you breathe before continuing.'  
@@ -446,6 +443,7 @@ if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
 			'"Sorry, I''ll try to stop..."' 
 			'"No, it''s not a complaint, it was just unexpected," he replies.'
 			act 'Try to relax':
+				cla & *clr
 				'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/showeranal6.mp4"></center>'
 				'After another minute, Kolka asks "Can I start to move now?"'  
 				'You take a deep breath. "Yes, but go slow."'  
@@ -453,8 +451,7 @@ if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
 				gs 'arousal', 'anal', 2
 				gs 'stat'
 				act 'Enjoy':
-					*clr
-					cla
+					cla & *clr
 					'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/showeranal6.mp4"></center>'
 					'You find yourself needing to brace yourself on the wall with your hands. You didn''t even notice, but you''ve bent forward, allowing Kolka better access as his speed increases.'
 					'You''re really getting into it now, and are surprised by how good you feel.'
@@ -464,14 +461,13 @@ if $ARGS[0] = 'brother_shower_anal_vagnv_analv':
 					gs 'cum_call', 'anal', 'A34', 1
 					gs 'stat'
 					act 'Wash yourselves':
-						gs 'arousal', 'end'
-						gs 'stat'
-						*clr
-						cla
+						cla & *clr
 						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brotherwash.jpg"></center>'
 						'As you both quickly rewash yourselves, Kolka asks "So, was it good? More importantly, will you want to do it again?"'  
 						'You''re slightly annoyed by the ''more importantly'' part, but can''t deny that you''ve enjoyed your first butt fucking.'  
 						'"It was..." you say, letting it hang for a moment before finishing with "Good. Will it happen again? I''ll think about it."'
+						gs 'arousal', 'end'
+						gs 'stat'
 						act'Finish':mirror_steam = hour & gt $loc
 					end
 				end

locations/clothing_QV.qsrc

@@ -1359,7 +1359,7 @@ if $ARGS[0] = 'change':
 					end
 				end
 			else
-				if CloThinness < 6:		
+				if CloThinness < 6 or $clothingworntype = 'salacious_outfits' or $clothingworntype = 'salacious_dress':	
 					act 'Wear this outfit':
 						cla
 						*clr		

locations/ender.qsrc

@@ -130,7 +130,7 @@ if $ARGS[0] = 'loss':
 		Loss += 1
 		if rikudo > 10:rikudo -= 10
 		if $loc = 'pav_park' or $loc = 'city_park':
-			gt'rape_events','park_fight_rape'
+			gt'rape_events','park_rape_solo'
 		elseif $region = 'pav' or $region = 'city':
 			gt'rape_events','urban_fight_rape'
 		end
@@ -812,7 +812,7 @@ if $ARGS[0] = 'surrender':
 		Loss += 1
 		if rikudo > 10:rikudo -= 10
 		if $loc = 'pav_park' or $loc = 'city_park':
-			gt'rape_events','park_fight_rape'
+			gt'rape_events','park_rape_solo'
 		elseif $region = 'pav' or $region = 'city':
 			gt'rape_events','urban_fight_rape'
 		end

locations/foto_events.qsrc

@@ -940,7 +940,7 @@ if $ARGS[0] = 'nude_persuasion':
 			'"The special bonus doesn''t hurt either," you smile back shyly.'
 			'The manager laughs showing you his clipboard. "Go to this set here and everything is already set up for you."'
 			foto_persuade = 5
-			act'Do the nude shoot':gt'foto_shoot','nude'
+			gs'foto_nude_debut', 'nude_debut_shave_start'
 		end
 	elseif foto_persuade = 1:
 		act'Yes, I''m ready':
@@ -949,7 +949,7 @@ if $ARGS[0] = 'nude_persuasion':
 			'"You know what? I think I''m ready to do it today! I''ll do the nude shoot," you say, smiling. "And I''ll take the bonus."'
 			'The manager laughs showing you his clipboard. "Go to this set here and everything is already set up for you."'
 			foto_persuade = 5
-			act'Do the nude shoot':gt'foto_shoot','nude'
+			gs'foto_nude_debut', 'nude_debut_shave_start'
 		end
 	end
 	act'Wow! Yes!':

locations/foto_nude_debut.qsrc

@@ -11,10 +11,14 @@ if $ARGS[0] = 'nude_debut_memory':
 end
 
 if $ARGS[0] = 'nude_debut_pre':
-	if pcs_leghair > 3:$temp['model_shave'] = '"And your legs too."'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'"You want to do a nude shoot? This would be your first one, won''t it?" the manager asks.'
 	'"Yes," you nod back.'
+	gs'foto_nude_debut', 'nude_debut_shave_start'
+end
+
+if $ARGS[0] = 'nude_debut_shave_start':
+	if pcs_leghair > 3:$temp['model_shave'] = '"And your legs too."'
 	if modelfoto['nude_shave_no'] = 1:
 		if pcs_pubes <= 3:
 			modelfoto['nude_shave_yes'] = 1
@@ -32,19 +36,28 @@ if $ARGS[0] = 'nude_debut_pre':
 		if pcs_pubes > 3:
 			gs'foto_nude_debut', 'nude_debut_shave_options'
 			if pcs_pubes < 10:
-				'"You''ll have to shave that stubble off," he says, eyeing the fuzzy patch between your legs. <<$temp[''model_shave'']>>'
+				if foto_persuade = 5:
+					'"Just one thing. You need to shave that stubble off," he says, eyeing the fuzzy patch between your legs. <<$temp[''model_shave'']>>'
+				else
+					'"You''ll have to shave that stubble off," he says, eyeing the fuzzy patch between your legs. <<$temp[''model_shave'']>>'
+				end
 				act'But I''m growing it out':
 					cla & *nl
 					'"But I''m growing it out," you protest.'
-					'"Start again tomorrow," he shrugs. "It''s your debut. Stubble looks bad. Besides, we have a policy here that all model''s nude debut has to be cleanshaven. Even if I wanted to, it''s not up to me. If you don''t like it, do something else."'
+					'"Start again tomorrow," he shrugs. "It''s your debut. All models must be clean shaven for their nude debut. Even if I wanted to give you a pass, it''s not up to me. Besides, stubble looks bad."'
 					gs'foto_nude_debut', 'nude_debut_shave_options'
 				end
 			elseif pcs_pubes > 3:
-				'"You''ll have to shave," he says, eyeing your pubic hair. <<$temp[''model_shave'']>>'
+				if foto_persuade = 5:
+					'"Just one thing. You need to shave that off first," he says, eyeing your pubic hair. <<$temp[''model_shave'']>>'
+				else
+					'"You need to shave that off first," he says, eyeing your pubic hair. <<$temp[''model_shave'']>>'
+				end
+				
 				act'But I like it this way':
 					cla & *nl
 					'"But I like it this way," you protest.'
-					'"Sorry," he shrugs. "It''s your debut. We have a policy here that all model''s nude debut has to be cleanshaven. Even if I wanted to, it''s not up to me. You can start growing it out again tomorrow."'
+					'"Policy," he shrugs. "It''s your debut. All models must be clean shaven for their nude debut. Even if I wanted to give you a pass, it''s not up to me. You can start growing it out again tomorrow."'
 					gs'foto_nude_debut', 'nude_debut_shave_options'
 				end
 			end

locations/pav_lake.qsrc

@@ -136,7 +136,7 @@ if $ARGS[0] = '':
 				act 'Strip naked (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif $clothingworntype = 'nude' and sauna_stripped = 0:
-			gt'pav_lake', 'lost_clothing'
+			gs'pav_lake', 'lost_clothing'
 		end
 	end
 

locations/rape_events.qsrc

@@ -509,134 +509,132 @@ if $ARGS[0] = 'park_rape_struggle_start':
 end
 
 if $ARGS[0] = 'park_rape_solo':
-	act'Continue':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape8.jpg"></center>'
-		if $pantyworntype ! 'none':
-			if PCloSkirt > 0:
-				'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. Below your skirt, you feel your panties get pulled aside.'
-			else
-				'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. At the same time, you feel your pants violently yanked down over your ass. You think you hear the sound of the elastic in your panties snapping.'
-			end
-			'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!"'
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/shared/street/sex/rape8.jpg"></center>'
+	if $pantyworntype ! 'none':
+		if PCloSkirt > 0:
+			'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. Below your skirt, you feel your panties get pulled aside.'
 		else
-			if PCloSkirt > 0:
-				'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth.'
-				'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!"  You feel your skirt pulled up and something between your legs. "No panties! You fucking <i>whore!</i>"'
+			'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. At the same time, you feel your pants violently yanked down over your ass. You think you hear the sound of the elastic in your panties snapping.'
+		end
+		'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!"'
+	else
+		if PCloSkirt > 0:
+			'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth.'
+			'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!"  You feel your skirt pulled up and something between your legs. "No panties! You fucking <i>whore!</i>"'
+		else
+			'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. '
+			'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!" You feel your pants violently yanked down over your ass. "No panties! You fucking <i>whore!</i>"'
+		end
+	end
+	
+	if rand(0,1) = 1:
+		!! vaginal rape
+		act'<i><b>MMMMMRRMMPH-!!!</b></i>':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/shared/street/sex/rape.mp4"></video></center>'
+			'<i><b>"MMMMMRRMMPH-!!!"</b></i>'
+			if pcs_vag = 0:
+				'You try to scream again when something stabs into your vagina, tearing straight through your hymen, but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut and your insides feel like they''re on fire as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, while your virginity is violently robbed from you by a stranger.'
 			else
-				'A weight from behind crushes you back down onto the ground. Before you can even grunt in pain, a hand clamps over your mouth. '
-				'"Made me work for it you cunt. Now I''m going to <i>really</i> enjoy this!" You feel your pants violently yanked down over your ass. "No panties! You fucking <i>whore!</i>"'
+				'You try to scream again when you feel something stab into your vagina but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, your most intimate place being thoroughly violated by a stranger.'
 			end
-		end
-		
-		if rand(0,1) = 1:
-			!! vaginal rape
-			act'<i><b>MMMMMRRMMPH-!!!</b></i>':
+			gs 'arousal', 'vaginal', rand(5,10), 'rough', 'rape'
+			gs 'stat'
+			act'The end...':
 				cla & *clr
-				'<center><video autoplay loop src="images/locations/shared/street/sex/rape.mp4"></video></center>'
-				'<i><b>"MMMMMRRMMPH-!!!"</b></i>'
-				if pcs_vag = 0:
-					'You try to scream again when something stabs into your vagina, tearing straight through your hymen, but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut and your insides feel like they''re on fire as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, while your virginity is violently robbed from you by a stranger.'
-				else
-					'You try to scream again when you feel something stab into your vagina but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, your most intimate place being thoroughly violated by a stranger.'
-				end
-				gs 'arousal', 'vaginal', rand(5,10), 'rough', 'rape'
-				gs 'stat'
-				act'The end...':
+				gs 'cum_call','', 'rapist'
+				gs'stat'
+				'<center><video autoplay loop src="images/locations/shared/street/sex/rape_cum.mp4"></video></center>'
+				'After what feels like an eternity, the man thrusts into you several times, much harder than before before completely burying his cock inside you.'
+				'"Mmmmph-!" You feel him pulsing inside you and you groan uselessly into his hand. The stranger climbs off of you and his cock withdraws from inside you, eliciting a whimper from your lips. With that final act, you''re left shivering on the ground, completely spent, not even enough strength left to belatedly cry out for help. You hear the clinking of metal behind you again and you feel something leak from your pussy.'
+				'"You''re a pretty good fuck girlie. Maybe we can have another ''date'' like this again some time." Even though you can''t see his face, you can hear the smile in his voice. Moments later, you hear footsteps sound in the alley, slowly fading away until you''re left in silence.'
+				act'Cry':
 					cla & *clr
-					gs 'cum_call','', 'rapist'
 					gs'stat'
-					'<center><video autoplay loop src="images/locations/shared/street/sex/rape_cum.mp4"></video></center>'
-					'After what feels like an eternity, the man thrusts into you several times, much harder than before before completely burying his cock inside you.'
-					'"Mmmmph-!" You feel him pulsing inside you and you groan uselessly into his hand. The stranger climbs off of you and his cock withdraws from inside you, eliciting a whimper from your lips. With that final act, you''re left shivering on the ground, completely spent, not even enough strength left to belatedly cry out for help. You hear the clinking of metal behind you again and you feel something leak from your pussy.'
-					'"You''re a pretty good fuck girlie. Maybe we can have another ''date'' like this again some time." Even though you can''t see his face, you can hear the smile in his voice. Moments later, you hear footsteps sound in the alley, slowly fading away until you''re left in silence.'
-					act'Cry':
-						cla & *clr
-						gs'stat'
-						minut += 3
-						'<center><video autoplay loop src="images/locations/shared/street/sex/rape_after1.mp4"></video></center>'
-						if $pantyworntype ! 'none':
-							'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel soaking through your panties.'
+					minut += 3
+					'<center><video autoplay loop src="images/locations/shared/street/sex/rape_after1.mp4"></video></center>'
+					if $pantyworntype ! 'none':
+						'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel soaking through your panties.'
+					else
+						if PCloSkirt > 0:
+							'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the thick liquid you feel dribbling down your leg.'
 						else
-							if PCloSkirt > 0:
-								'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the thick liquid you feel dribbling down your leg.'
-							else
-								'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel spreading through your pants.'
-							end
-						end
-						act'Go to the police station':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
-							if $loc = 'pav_commercial' or $loc = 'pav_residential':
-								'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the train depot and the police station that resides next to it.'
-							else
-								'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the city center and the police station that resides in it.'
-							end
-							act'Continue':gt'rape_events', 'rape_report'
+							'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel spreading through your pants.'
 						end
-						
-						act'Don''t go':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
-							'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
-							*nl
-							'You slowly limp away, clutching your arms around your belly, trying your best to leave the events of tonight in the alley behind you...'
-							act'Leave':gt $loc, $loc_arg
+					end
+					act'Go to the police station':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+						if $loc = 'pav_commercial' or $loc = 'pav_residential':
+							'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the train depot and the police station that resides next to it.'
+						else
+							'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the city center and the police station that resides in it.'
 						end
+						act'Continue':gt'rape_events', 'rape_report'
+					end
+					
+					act'Don''t go':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+						'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
+						*nl
+						'You slowly limp away, clutching your arms around your belly, trying your best to leave the events of tonight in the alley behind you...'
+						act'Leave':gt $loc, $loc_arg
 					end
 				end
 			end
-		else
-			!! anal rape
-			act'<i><b>MMMMMRRMMPH-!!!</b></i>':
+		end
+	else
+		!! anal rape
+		act'<i><b>MMMMMRRMMPH-!!!</b></i>':
+			cla & *clr
+			'<center><video autoplay loop src="images/locations/shared/street/sex/rape.mp4"></video></center>'
+			gs 'arousal', 'anal', rand(5,10), 'rough', 'rape'
+			gs 'stat'
+			'<i><b>"MMMMMRRMMPH-!!!"</b></i>'
+			'You try to scream again when you feel something stab into your anus but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, your ass being violently stretched out by a stranger.'
+			act'The end...':
+				gs'arousal','end'
 				cla & *clr
-				'<center><video autoplay loop src="images/locations/shared/street/sex/rape.mp4"></video></center>'
-				gs 'arousal', 'anal', rand(5,10), 'rough', 'rape'
-				gs 'stat'
-				'<i><b>"MMMMMRRMMPH-!!!"</b></i>'
-				'You try to scream again when you feel something stab into your anus but the hand clamped firmly over your mouth prevents anything more than a muffled groan. Your muscles go taut as your attacker thrusts into you again and again and again with great self indulgence. All you can do is endure, tears streaming down your face, your ass being violently stretched out by a stranger.'
-				act'The end...':
-					gs'arousal','end'
+				gs 'cum_call','anus', 'rapist'
+				gs'stat'
+				'<center><video autoplay loop src="images/locations/shared/street/sex/rape_cum.mp4"></video></center>'
+				'After what feels like an eternity, the man thrusts into you several times, much harder than before before completely burying his cock inside you.'
+				'"Mmmmph-!" You feel him pulsing inside you and you groan uselessly into his hand. The stranger climbs off of you and his cock withdraws from your ass, eliciting a whimper from your lips. With that final act, you''re left shivering on the ground, completely spent, not even enough strength left to belatedly cry out for help. You hear the clinking of metal behind you again and you feel something trickle out of your ruined asshole.'
+				'"You''re a real buttslut, girlie. Maybe we can have another ''date'' like this again some time." Even though you can''t see his face, you can hear the smile in his voice. Moments later, you hear footsteps sound in the alley, slowly fading away until you''re left in silence.'
+				act'Cry':
 					cla & *clr
-					gs 'cum_call','anus', 'rapist'
 					gs'stat'
-					'<center><video autoplay loop src="images/locations/shared/street/sex/rape_cum.mp4"></video></center>'
-					'After what feels like an eternity, the man thrusts into you several times, much harder than before before completely burying his cock inside you.'
-					'"Mmmmph-!" You feel him pulsing inside you and you groan uselessly into his hand. The stranger climbs off of you and his cock withdraws from your ass, eliciting a whimper from your lips. With that final act, you''re left shivering on the ground, completely spent, not even enough strength left to belatedly cry out for help. You hear the clinking of metal behind you again and you feel something trickle out of your ruined asshole.'
-					'"You''re a real buttslut, girlie. Maybe we can have another ''date'' like this again some time." Even though you can''t see his face, you can hear the smile in his voice. Moments later, you hear footsteps sound in the alley, slowly fading away until you''re left in silence.'
-					act'Cry':
-						cla & *clr
-						gs'stat'
-						minut += 3
-						'<center><video autoplay loop src="images/locations/shared/street/sex/rape_after1.mp4"></video></center>'
-						if $pantyworntype ! 'none':
-							'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel soaking through the back of your panties.'
+					minut += 3
+					'<center><video autoplay loop src="images/locations/shared/street/sex/rape_after1.mp4"></video></center>'
+					if $pantyworntype ! 'none':
+						'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel soaking through the back of your panties.'
+					else
+						if PCloSkirt > 0:
+							'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the thick liquid you feel leaking from between your cheeks and dribbling down your leg.'
 						else
-							if PCloSkirt > 0:
-								'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the thick liquid you feel leaking from between your cheeks and dribbling down your leg.'
-							else
-								'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel spreading through your pants.'
-							end
+							'Once you realize you''re alone, your emotions completely break through. Sobs rack your body and you writhe on the ground, shuddering as you grit your teeth. Slowly... very slowly... you pull yourself together, tugging your clothes back into place and stumbling to your feet, trying not to think about the wet spot you feel spreading through your pants.'
 						end
-						act'Go to the police station':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
-							if $loc = 'pav_commercial' or $loc = 'pav_residential':
-								'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the train depot and the police station that resides next to it.'
-							else
-								'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the city center and the police station that resides in it.'
-							end
-							act'Continue':gt'rape_events', 'rape_report'
-						end
-						
-						act'Don''t go':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
-							'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
-							*nl
-							'You slowly limp away, clutching your arms around your belly, trying your best to leave the events of tonight in the alley behind you...'
-							act'Leave':gt $loc, $loc_arg
+					end
+					act'Go to the police station':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+						if $loc = 'pav_commercial' or $loc = 'pav_residential':
+							'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the train depot and the police station that resides next to it.'
+						else
+							'You decide you need to file a report, in hopes that someone will catch the monster that did this to you. You slowly limp your way towards the city center and the police station that resides in it.'
 						end
+						act'Continue':gt'rape_events', 'rape_report'
+					end
+					
+					act'Don''t go':
+						cla & *clr
+						'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
+						'For a brief moment you consider telling the police what happened, but emotion wells up inside you and you''re immediately filled with thoughts of disgust and shame. It doesn''t make sense. It''s not like you wanted this to happen. But still. The idea of sharing what happened to you, even to the police... You already feel filthy from what happened tonight. You don''t want to feel even worse. The only thing you want is to go home.'
+						*nl
+						'You slowly limp away, clutching your arms around your belly, trying your best to leave the events of tonight in the alley behind you...'
+						act'Leave':gt $loc, $loc_arg
 					end
 				end
 			end

locations/salon.qsrc

@@ -112,7 +112,7 @@ end
 if $ARGS[0] = 'discount':
 		!! Set staff discount
 		if masseuse['jobtype'] > 0: 
-			salon_rate = ARGS[1] /2
+			salon_rate = ARGS[1] / 2
 		else
 			salon_rate = ARGS[1]
 		end
@@ -131,14 +131,14 @@ if $ARGS[0] = 'services':
 	$epayments['banner']  = 'locations/city/citycenter/mall/salon/xian.jpg'
 
 	act 'Move away':gs 'salon', 'cleanvar' & gt 'salon', 'start'
-	
 	gs 'salon', 'discount', 1000
 	if money >= salon_rate or karta + bankDebtLimit >= salon_rate:
 		act 'Tanning booth <<salon_rate>> <b>₽</b>':
+			gs 'salon', 'discount', 1000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 1000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'tanning_booth'
 			$epayments['description'] = 'tanning session'
@@ -155,12 +155,13 @@ if $ARGS[0] = 'services':
 	act 'See the eyelash specialist':gt'salon','eyelashes'
 	
 	gs 'salon', 'discount', 5000
-	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and salon['skin_care_day'] < max(daystart - 7,1):
+	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and salon['skin_care_day'] < max(daystart - 7,1):	
 		act 'Skin care <<salon_rate>> <b>₽</b>':
+			gs 'salon', 'discount', 5000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 2500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 5000
+				epayments['value'] = salon_rate
 			end
 			epayments['value'] = salon_rate
 			$epayments['loc_arg'] = 'skin_care'
@@ -177,13 +178,14 @@ if $ARGS[0] = 'services':
 		end
 	end
 	
-	gs 'salon', 'discount', 25000
+	gs 'salon', 'discount', 25000	
 	if money >= salon_rate or karta + bankDebtLimit >= salon_rate:
-		act 'Full body rejuvination <<salon_rate>> <b>₽</b>':				
+		act 'Full body rejuvination <<salon_rate>> <b>₽</b>':
+			gs 'salon', 'discount', 25000			
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 12500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 25000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'rejuvination'
 			$epayments['description'] = 'full body rejuvination'
@@ -197,7 +199,10 @@ if $ARGS[0] = 'services':
 	
 	gs 'salon', 'discount', 1000
 	if (pcs_pubes > 9 or pcs_leghair > 9) and money >= salon_rate or karta + bankDebtLimit >= salon_rate:
-		act 'Partial or full body hair removal up to <<salon_rate>> <b>₽</b>':gt'salon','hair_removal'
+		act 'Partial or full body hair removal up to <<salon_rate>> <b>₽</b>':
+			gs 'salon', 'discount', 1000
+			gt'salon','hair_removal'
+		end
 	elseif (pcs_pubes > 9 or pcs_leghair > 9)  and (money < salon_rate and karta + bankDebtLimit  < salon_rate):
 		act 'Body hair removal <font color="red"><<salon_rate>> <b>₽</b> </font>':
 			msg'You don''t have enough money for this!'
@@ -208,13 +213,14 @@ if $ARGS[0] = 'services':
 		end
 	end
 
-	gs 'salon', 'discount', 500
+	gs 'salon', 'discount', 500	
 	if pcs_pubes > 20 and money >= salon_rate or karta + bankDebtLimit >= salon_rate:
-		act 'Dye your pubic hair <<salon_rate>> <b>₽</b>':				
+		act 'Dye your pubic hair <<salon_rate>> <b>₽</b>':
+			gs 'salon', 'discount', 500			
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 250
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 500
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'pubes'
 			$epayments['description'] = 'dye your pubic hair'
@@ -1109,10 +1115,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 5000
 	if ( money >= salon_rate or karta + bankDebtLimit >= salon_rate) and pcs_naturallashes < 2:
 		act 'Eyelash growth treatment</a> - <<salon_rate>><b> ₽</b>': 
+			gs 'salon', 'discount', 5000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 2500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 5000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashTreatment'
 			$epayments['description'] = 'eyelash growth treatment'
@@ -1127,10 +1134,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 500
 	if ( money >= salon_rate or karta + bankDebtLimit >= salon_rate) and pcs_lashes < 3 and false_lashes <= 0:
 		act 'Simple false lashes':
+			gs 'salon', 'discount', 500
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 250
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 500
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashFalsies'
 			$epayments['description'] = 'simple false eyelashes'
@@ -1146,10 +1154,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 1000
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and pcs_lashes < 4 and false_lashes <= 0:
 		act 'Dramatic false lashes':
+			gs 'salon', 'discount', 1000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 1000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashFalsies'
 			$epayments['description'] = 'Dramatic false lashes'
@@ -1165,10 +1174,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 2000
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and lashextensionduration <= 0:
 		act '2D volume eyelash extensions':
+			gs 'salon', 'discount', 2000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 1000
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 2000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			$epayments['description'] = '2D volume eyelash extensions'
@@ -1186,10 +1196,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 5000
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and lashextensionduration <= 0:
 		act '4D volume eyelash extensions':
+			gs 'salon', 'discount', 5000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 2500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 5000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			$epayments['description'] = '4D volume eyelash extensions'
@@ -1206,10 +1217,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 10000
 	if ( money >= salon_rate or karta + bankDebtLimit >= salon_rate) and lashextensionduration <= 0:
 		act '6D volume eyelash extensions':
+			gs 'salon', 'discount', 10000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 5000
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 10000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			$epayments['description'] = '6D volume eyelash extensions'
@@ -1226,10 +1238,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 1000
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and lashextensionduration >= 1 and lashextensionduration <= 4 and lashextensionstyle = 2:
 		act 'Refill your 2D lash extension':
+			gs 'salon', 'discount', 1000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 1000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			$epayments['description'] = 'refill your 2D lash extensions'
@@ -1245,10 +1258,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 2500
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate)and lashextensionduration >= 1 and lashextensionduration <= 4 and lashextensionstyle = 4:
 		act 'Refill your 4D lash extension':
+			gs 'salon', 'discount', 2500
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 1250
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 2500
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			lashextensionnew = 0
@@ -1260,13 +1274,15 @@ if $ARGS[0] = 'eyelashes':
 	else
 		act 'Refill your 4D lash extension <font color="red"><<salon_rate>> <b>₽</b> </font>': msg 'You don''t need this service!'
 	end
+
 	gs 'salon', 'discount', 5000
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate)and lashextensionduration >= 1 and lashextensionduration <= 4 and lashextensionstyle = 6:
 		act 'Refill your 6D lash extension':
+			gs 'salon', 'discount', 5000
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 2500
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 5000
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			$epayments['description'] = 'refill your 6D lash extensions'
@@ -1281,10 +1297,11 @@ if $ARGS[0] = 'eyelashes':
 	gs 'salon', 'discount', 500
 	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and lashextensionduration > 0:
 		act 'Remove your eyelash extensions':
+			gs 'salon', 'discount', 500
 			if masseuse['jobtype'] > 0:  
-				epayments['value'] = 250
+				epayments['value'] = salon_rate
 			else
-				epayments['value'] = 500
+				epayments['value'] = salon_rate
 			end
 			$epayments['loc_arg'] = 'lashExtension'
 			$epayments['description'] = 'remove your eyelash extensions'
@@ -2396,9 +2413,10 @@ end
 
 if $ARGS[0] = 'cosmetic_tattoo_start':
 	cla & *clr
-	gs 'salon', 'discount', 2000
+	
 	'<br>We currently offer five levels of cosmetic tattoos: light, vibrant, sultry, professional and celebrity.<br>Please keep in mind that these procedures are permanent.<br>Also, be aware that after procedure using regular cosmetics will be difficult.<br>Price is set at <<salon_rate>><b>₽</b>'
 	if money >= salon_rate or karta + bankDebtLimit >= salon_rate:
+		gs 'salon', 'discount', 2000
 		if masseuse['jobtype'] > 0:  
 			epayments['value'] = 1000
 		else
@@ -2480,6 +2498,7 @@ if $ARGS[0] = 'cleanvar':
 	killvar 'partialservice'
 	killvar 'fullservice'
 	killvar 'epayments'
+	killvar 'salon_rate'
 end
 
 --- salon ---------------------------------

locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 8
 version_revision = 9
-version_patch = 1
+version_patch = 2
 --- saveg ---------------------------------
 

locations/street_event.qsrc

@@ -985,7 +985,7 @@ if $ARGS[1] = 'main':
 				gs 'stat'
 				'<<$streetev_title>>'
 				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra1.mp4"></video></center>'
-				'As you walk down the street you feel wobbling your breasts freely under your outfit, which can probably be seen by people walking by too.'
+				'As you walk down the street you feel your breasts wobbling freely under your outfit, which can probably be seen by people walking by too.'
 				if exhibitionist_lvl = 1:
 					gs 'arousal', 'flash', -5
 					gs 'arousal', 'end'
@@ -1006,7 +1006,7 @@ if $ARGS[1] = 'main':
 				gs 'stat'
 				'<<$streetev_title>>'
 				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra'+ rand(2,4) +'.mp4"></video></center>'
-				'As you walk down the street you feel wobbling your breasts freely under your thin outfit, stretching it, emphasizing the outline of your tits, which can definitely be seen by people walking by too. As you look closely both men and women are staring at your jiggling tits.'
+				'As you walk down the street you feel your breasts wobbling freely under your thin outfit, stretching it, emphasizing the outline of your tits, which can definitely be seen by people walking by too. As you look closely both men and women are staring at your jiggling tits.'
 				if exhibitionist_lvl = 1:
 					gs 'arousal', 'flash', -5
 					gs 'arousal', 'end'

locations/version.qsrc

@@ -2,6 +2,9 @@
 
 act 'Return': gt 'start'
 
+'0.8.9.2'
+'- Bug fixes'
+
 '0.8.9.1'
 '- Photography shop - started migration over to new event system and preparing for new content'
 '- Mira''s 3 wishes Added to the Quest Journal by Derryth_Love and Anya'