[fixed] more masseuse salon stuff

[changed] some text descriptions
[added] vending machine and drinks to the break room so masseuses don't start working too many shifts

locations/masseuse_break.qsrc

@@ -7,6 +7,8 @@
 !! masseuse['jobtype'] = 5 - will fuck client instead of massage or any of the above
 
 if $ARGS[0] = 'start':
+	$locM = 'masseuse_break'
+	$locM_arg = 'start'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/break.jpg"></center>'
 	if masseuse['break'] = 0:
 		minut += 15
@@ -16,6 +18,8 @@ if $ARGS[0] = 'start':
 	gs'stat'
 	'You''re taking a break.'
 	*nl
+	'There''s a vending machine in the corner you can buy '+iif(money >= 100,'<a href="exec:money -= 100 & gt ''food'', ''snack''">snacks</a>','snacks')+' from and a <a href="exec:gt ''beverage'', ''bev_wat''">fridge</a> stocked with various drinks for masseuses to enjoy.'
+	*nl
 	if rand(0,1) = 1:
 		if masseuse['meet_lei'] = 0:
 			'The only other person in here right now is <a href="exec:gt''masseuse_break'',''lei_talk''">a small asian girl</a> taking duck face selfies on her phone.'
@@ -112,9 +116,9 @@ if $ARGS[0] = 'lei_talk3':
 			'"Wow. So you weren''t kidding that it was a family business."'
 			'"Mhmm. You''ve met one of my sisters actually."'
 			'"Really?'
-			'"Xian, at the front desk. She''s my seventh oldest sister. Used to be a whore here and was pretty popular with the boys if I remember it, but she''s got good people skills so she stepped up to be a manager after a while. It was her idea to start diversifying and bringing in local girls like you join the ranks. Also her idea to start allowing part timers."'
+			'"Xian, at the front desk. She''s my seventh oldest sister. Used to be a whore here and was pretty popular with the boys if I remember it, but she''s got good people skills so she stepped up to be a manager after a while. It was her idea to start diversifying and bringing in local girls like you join the ranks. Also her idea to start allowing part timers and getting male whores for female customers. That last one apparently doubled the store''s profits. This city is really sex crazed for some reason."'
 			'"How many sisters do you have?"'
-			'"Sixteen. I''m the youngest."'
+			'"Fourteen. I''m the youngest."'
 			gs'masseuse_break','lei_talk3'
 		end
 	end

locations/masseuse_work.qsrc

@@ -427,13 +427,16 @@ if $ARGS[0] = '2_pre':
 	'You hear a buzz on the intercom and the receptionist''s voice sound.'
 	'"<<$pcs_firstname>>, you have a customer who has requested a massage with a view, maximum of 30 minutes."'
 	'As soon as she''s done speaking, the door opens and a man walks in.'
-	*nl
-	if pcs_inhib > 40:
-		'"Hello sir, if you''d like to undress and lay on the table we can begin," you say, untying the belt around your robe and pulling it open to reveal your naked body underneath. Shrugging out of the robe completely, you continue. "You can place your clothes in the basket in the corner." He finishes undressing eagerly and lays down on the table. As you step over to him, his gaze roams your body and in return you can see he''s rock hard.'
-	else
-		'"Hello sir, if you''d like to undress and lay on the table we can begin," you say, untying the belt around your robe and pulling it open to reveal your naked body underneath. Your face blazes with heat and embarrassment, but you stay as professional as possible, shrugging out of the robe completely and continuing. "You can place your clothes in the basket in the corner." He finishes undressing eagerly and lays down on the table. As you step over to him, his gaze roams your body and in return you can see he''s rock hard causing your blush to somehow intensify.'
+	act'Continue':
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/undress.mp4"></video></center>'
+		if pcs_inhib > 40:
+			'"Hello sir, if you''d like to undress and lay on the table we can begin," you say, untying the belt around your robe and pulling it open to reveal your naked body underneath. Shrugging out of the robe completely, you continue. "You can place your clothes in the basket in the corner." He finishes undressing eagerly and lays down on the table. As you step over to him, his gaze roams your body and in return you can see he''s rock hard.'
+		else
+			'"Hello sir, if you''d like to undress and lay on the table we can begin," you say, untying the belt around your robe and pulling it open to reveal your naked body underneath. Your face blazes with heat and embarrassment, but you stay as professional as possible, shrugging out of the robe completely and continuing. "You can place your clothes in the basket in the corner." He finishes undressing eagerly and lays down on the table. As you step over to him, his gaze roams your body and in return you can see he''s rock hard causing your blush to somehow intensify.'
+		end
+		act'Begin the massage':gt'masseuse_work','2'
 	end
-	act'Begin the massage':gt'masseuse_work','2'
 end
 
 if $ARGS[0] = '2':
@@ -488,16 +491,19 @@ if $ARGS[0] = '3_pre':
 	'You hear a buzz on the intercom and the receptionist''s voice sound.'
 	'"<<$pcs_firstname>>, you have a customer who has requested an ''old fashioned'' massage, maximum of 30 minutes."'
 	'As soon as she''s done speaking, the door opens and a man walks in.'
-	*nl
-	'"Hello sir, if you''d like to undress and lay on the table we can begin. You can place your clothes in the basket in the corner." You undo the belt on your robe and pull it open to reveal your naked body underneath. "We can also begin with a body massage or just skip straight to the handjob if you would prefer that instead."'
-	if masseuse['client_type'] = 0:
-		'"Yeah, let''s do that," the client grins as he drops his pants, revealing an impressive erection."'
-		'"Whatever you like sir," you say, shrugging out of the robe completely and waiting by the table while he removes the rest of his clothing.'
-		act'Jerk him off':gt'masseuse_work','3.1'
-	else
-		'"I think I''d like to start by relaxing with the massage."'
-		'"Whatever you like sir," you say, shrugging out of the robe completely and waiting by the table while he removes the rest of his clothing.'
-		act'Begin the massage':gt'masseuse_work','3'
+	act'Continue':
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/undress.mp4"></video></center>'
+		'"Hello sir, if you''d like to undress and lay on the table we can begin. You can place your clothes in the basket in the corner." You undo the belt on your robe and pull it open to reveal your naked body underneath. "We can also begin with a body massage or just skip straight to the handjob if you would prefer that instead."'
+		if masseuse['client_type'] = 0:
+			'"Yeah, let''s do that," the client grins as he drops his pants, revealing an impressive erection."'
+			'"Whatever you like sir," you say, shrugging out of the robe completely and waiting by the table while he removes the rest of his clothing.'
+			act'Jerk him off':gt'masseuse_work','3.1'
+		else
+			'"I think I''d like to start by relaxing with the massage."'
+			'"Whatever you like sir," you say, shrugging out of the robe completely and waiting by the table while he removes the rest of his clothing.'
+			act'Begin the massage':gt'masseuse_work','3'
+		end
 	end
 end
 
@@ -652,21 +658,24 @@ if $ARGS[0] = '4_pre':
 	'You hear a buzz on the intercom and the receptionist''s voice sound.'
 	'"<<$pcs_firstname>>, you have a customer who has requested a ''head'' massage, maximum of 30 minutes."'
 	'As soon as she''s done speaking, the door opens and a man walks in.'
-	*nl
-	'"Hello sir, if you''d like to undress and lay on the table we can begin. You can place your clothes in the basket in the corner." You undo the belt on your robe and pull it open to reveal your naked body underneath. "We can also begin with a body massage or I can start using my mouth right away if you would prefer that instead."'
-	if masseuse['client_type'] = 0:
-		'"I think I''d like to start by relaxing with the massage."'
-		'"Whatever you like sir," you say, shrugging out of the robe completely and waiting by the table while he removes the rest of his clothing.'
-		act'Begin the massage':gt'masseuse_work','4'
-	elseif masseuse['client_type'] = 1:
-		'"Yeah, let''s do that," the client grins as he drops his pants, revealing an impressive erection."'
-		'"Whatever you like sir," you say, shrugging out of the robe completely and waiting by the table while he removes the rest of his clothing.'
-		act'Blow him':gt'masseuse_work','4.1'
-	else
-		'"Yeah, let''s do that," the client grins as he drops his pants, revealing an impressive erection."'
-		'"Whatever you like sir," you say, shrugging out of the robe completely and waiting by the table while he removes the rest of his clothing.'
-		'"Great. Now get on the table."'
-		act'Get on the table':gt'masseuse_work','4.2'
+	act'Continue':
+		cla & *clr
+		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/undress.mp4"></video></center>'
+		'"Hello sir, if you''d like to undress and lay on the table we can begin. You can place your clothes in the basket in the corner." You undo the belt on your robe and pull it open to reveal your naked body underneath. "We can also begin with a body massage or I can start using my mouth right away if you would prefer that instead."'
+		if masseuse['client_type'] = 0:
+			'"I think I''d like to start by relaxing with the massage."'
+			'"Whatever you like sir," you say, shrugging out of the robe completely and waiting by the table while he removes the rest of his clothing.'
+			act'Begin the massage':gt'masseuse_work','4'
+		elseif masseuse['client_type'] = 1:
+			'"Yeah, let''s do that," the client grins as he drops his pants, revealing an impressive erection."'
+			'"Whatever you like sir," you say, shrugging out of the robe completely and waiting by the table while he removes the rest of his clothing.'
+			act'Blow him':gt'masseuse_work','4.1'
+		else
+			'"Yeah, let''s do that," the client grins as he drops his pants, revealing an impressive erection."'
+			'"Whatever you like sir," you say, shrugging out of the robe completely and waiting by the table while he removes the rest of his clothing.'
+			'"Great. Now get on the table."'
+			act'Get on the table':gt'masseuse_work','4.2'
+		end
 	end
 end
 
@@ -782,7 +791,11 @@ if $ARGS[0] = '5_pre':
 	'"<<$pcs_firstname>>, you have a customer who has requested a ''full body'' massage, maximum of 30 minutes."'
 	'As soon as she''s done speaking, the door opens and a man walks in.'
 	*nl
-	'"Hello sir, if you''d like to undress and we can begin as soon as you''re ready," you say, pulling off your robe to stand nude before him. "I''m sure you''re eager."'
+	if pcs_inhib < 40:
+		'"Hello sir, if you''d like to undress and we can begin as soon as you''re ready," you say, pulling off your robe with a furious blush to stand nude before him. "I''m sure you''re eager."'
+	else
+		'"Hello sir, if you''d like to undress and we can begin as soon as you''re ready," you say, pulling off your robe to stand nude before him. "I''m sure you''re eager."'
+	end
 	act'Fuck the client':
 		gs'cum_call','precum','massage client'
 		gs'arousal','vaginal',(masseuse_time_temp+15),'','prostitution','rough'
@@ -795,7 +808,7 @@ end
 if $ARGS[0] = '5':
 	cla & *clr
 	'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/fuck<<rand(1,20)>>.mp4"></video></center>'
-	'You spend the entire session being thoroughly enjoyed by your client, fucking in any and every position he could possibly want you in. The sound of flesh slapping against flesh is deafening, the only other thing being able to be heard is the groan of your voice as you are pounded relentlessly.'
+	'You spend the entire session being thoroughly enjoyed by your client, fucking in any and every position he could possibly want you in. The sound of flesh slapping against flesh is deafening, the only other thing being able to be heard is the groan of your voice as you are pounded relentlessly until he cums.'
 	act'Cum':gt'masseuse_work','5.1'
 	act'Next position':gt'masseuse_work','5'
 end
@@ -806,7 +819,7 @@ if $ARGS[0] = '5.1':
 		gs'cum_call','','massage client'
 		gs'stat'
 		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/creampie<<rand(1,3)>>.mp4"></video></center>'
-		'After an indeterminable amount of time, the client thrusts himself balls deep into you and grunts hard and you can fill his sperm filling you up. Breathing hard, you whimper when the dick you''ve been getting to know so well for the last half hour slips out of you, the empty feeling inside you exacerbated when you feel his cum dribble from your pussy.'
+		'After an indeterminable amount of time, the client thrusts himself balls deep into you and grunts hard and you can feel liquid splashing against your insides up. After a few moments of staying together, he slips out of you and you feel his cum dribble from your pussy.'
 		act'Get up':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
@@ -874,7 +887,7 @@ if $ARGS[0] = '5.1':
 	else
 		gs'cum_call','face','massage client'
 		gs'cum_call','hair','massage client'
-		gs'cum_call','mouth_swallow','massage client'
+		gs'cum_call','mouth','massage client'
 		gs'stat'
 		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/work/sex/facial<<rand(1,2)>>.mp4"></video></center>'
 		'After an indeterminable amount of time, you hear the client shouting at you.'

locations/salon.qsrc

@@ -1248,9 +1248,9 @@ if $ARGS[0] = 'massage':
 		end
 		
 		if money >= 2000:
-			act'Magic hands massage 2,000 <b>₽</b>':gt'salon','magic_massage'
+			act'Magic finger massage 2,000 <b>₽</b>':gt'salon','magic_massage'
 		else
-			act'Magic hands massage (<font color="red">2,000 <b>₽</b> </font>)':
+			act'Magic finger massage (<font color="red">2,000 <b>₽</b> </font>)':
 				msg'You don''t have enough money for this!'
 			end
 		end
@@ -1305,9 +1305,9 @@ if $ARGS[0] = 'massage':
 		end
 		
 		if money >= 1000:
-			act'Magic hands massage 1,000 <b>₽</b>':gt'salon','magic_massage'
+			act'Magic finger massage 1,000 <b>₽</b>':gt'salon','magic_massage'
 		else
-			act'Magic hands massage (<font color="red">1,000 <b>₽</b> </font>)':
+			act'Magic finger massage (<font color="red">1,000 <b>₽</b> </font>)':
 				msg'You don''t have enough money for this!'
 			end
 		end
@@ -1353,7 +1353,7 @@ if $ARGS[0] = 'massage_explain':
 	*nl
 	'Then we also have a special wellness massage. Very relaxing as well and with the use of special oils will leave you feeling younger and delay the aging process of your skin.'
 	*nl
-	'There is also the magic hands massage, which relaxes you in a different way. Designed to release tension from your body, it will have you moaning for the entire session we''re sure of it. It has very <i>climactic</i> results.'
+	'There is also the magic finger massage, which relaxes you in a different way. Designed to release tension from your body, it will have you moaning for the entire session we''re sure of it. It has very <i>climactic</i> results.'
 	*nl
 	'We also have a throat massage for those who have a bit of an oral fixation. Helps to satisfy the need to suck on something. Comes with a complimentary cocktail or facial, whichever you choose.'
 	*nl
@@ -1413,33 +1413,42 @@ end
 
 if $ARGS[0] = 'magic_massage':
 	cla & *clr
+	money -= iif(masseuse['jobtype'] > 0, 1000, 2000)
 	gs 'clothing', 'strip'
 	gs 'underwear', 'remove'
 	gs 'arousal', 'massage', 5
 	gs 'arousal', 'foreplay', 5
-	gs 'arousal', 'vaginal_finger', 20
-	gs 'stat'
-	pcs_sleep -= 20
-	money -= iif(masseuse['jobtype'] > 0, 1000, 2000)
-	orgasm += 10
 	gs 'stat'
-	'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/magic.mp4"></video></center>'
-	'You undress and lay on the table before an attendant comes in. He begins by kneading your back, rubbing oil across your body. Then he reaches lower and begins to massage your ass. Reaching around he kneads your breasts and spreads the oil across your nipples too. And then he really gets to work.'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/magic.jpg"></center>'
+	'You undress and lay on the table before an attendant comes in. He begins by rubbing oil across your body and massaging your shoulders, before reaching for your breasts. He massages those too, groping you in such a perfect way that your nipples are already stiff before he ever touches them. When he does, your breath hitches and you feel a growing wetness between your legs.'
 	*nl
-	'The next 30 minutes pass by in a blur of pleasure and orgasms. This guy''s hands know your pussy better than you do. They massage every spot that sets you off, playing with your clit in just the right ways and snaking fingers inside you to rub G-spots you didn''t know existed. Your entire body becomes stuck in a repetitive cycle of tension while your orgasm builds followed by mind-numbing release when your climax winds down. After the first 3 orgasms was when you started drooling into the table. Everything after that the only thing you could do was quiver in ecstasy.'
-	*nl
-	'<i>Ohhhhhh myyyyy godddddd...</i>'
-	act'Next':
-		pcs_mood += 40
-		gs 'stat'
+	'After a few minutes of teasing you and building your arousal, he turns you over to lay on your stomach.'
+	act'Turn over':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
-		'Eventually the massage comes to an end and you are left on your own to recover from the experience. Your entire body is flushed, your nipples are rock hard, your thighs are slick with your own juices, and you are on a post orgasmic high feel fucking incredible. And what do you know? You actually do feel quite relaxed too. You could fall asleep right there.'
-		act 'Leave':
-			gs 'clothing', 'wear_last_worn'
-			gs 'underwear', 'wear'
-			gs 'arousal', 'end'
-			gt 'salon', 'start'
+		gs 'arousal', 'vaginal_finger', -40
+		minut += 20
+		gs 'stat'
+		'<center><video autoplay loop src="images/locations/city/citycenter/mall/salon/magic.mp4"></video></center>'
+		*nl
+		'The next part passes by in a blur of pleasure and orgasms. He starts by reaching for your ass and massaging that, but very quickly moved between you legs and starts showing you why they call it a "magic finger" massage. He digs into your snatch, leaving you writhing under his touch. He does something weird with his fingers causing you gasp and immediately clench down on them. Holy shit you just came. And then he makes you cum again. And again. And then after the next time you start drooling into the table. And then you start to lose track of what''s happening altogether.'
+		*nl
+		'This guy''s hands know your pussy better than you do. They massage every spot that sets you off, playing with your clit in just the right ways and snaking fingers inside you to rub G-spots you didn''t know existed. Your entire body becomes stuck in a repetitive cycle of tension while your orgasm builds followed by mind-numbing release after your climax winds down before it starts building up again. Under his touch the only thing you know how to do is cum and drool from both sets of lips.'
+		*nl
+		'<i>Ohhhhhh myyyyy godddddd...</i>'
+		act'Next':
+			pcs_mood += 40
+			orgasm += 10
+			pcs_sleep -= 20
+			gs 'stat'
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
+			'Eventually the massage comes to an end and you are left on your own to recover from the experience. Your entire body is flushed, your nipples are rock hard, your thighs are slick with your own juices, and your post orgasmic high makes you feel like you''re floating in space. And what do you know? You actually do feel pretty relaxed too. You could fall asleep right there.'
+			act 'Leave':
+				gs 'clothing', 'wear_last_worn'
+				gs 'underwear', 'wear'
+				gs 'arousal', 'end'
+				gt 'salon', 'start'
+			end
 		end
 	end
 end