[changed] cleaned up the masseuse_work file to be more consistent

locations/masseuse_work.qsrc

@@ -46,21 +46,111 @@ if $ARGS[0] = 'last_client':
 	salon['work_minutes'] = 0
 	masseuse['<<week>>_shift_<<masseuse_shift>>'] = 0
 	*nl
-	if minut < 10:
-		if (masseuse['<<week>>_shift_2'] = 1 and hour = 13) or (masseuse['<<week>>_shift_3'] = 1 and hour = 17):
-			masseuse['multiple_shifts'] = 1
-			'<b><<hour>>:0<<minut>>.</b> Looks like this shift is just about over, but you scheduled yourself for the next shift too. Better prepare for that then.'
+	if (masseuse['<<week>>_shift_2'] = 1 and hour = 13) or (masseuse['<<week>>_shift_3'] = 1 and hour = 17):
+		masseuse['multiple_shifts'] = 1
+		'<b><<hour>>:0<<minut>>.</b> Looks like this shift is just about over, but you scheduled yourself for the next shift too. Better prepare for that then.'
+		if cumloc[11] > 0:
+			*nl
+			'And that includes cleaning your face off.'
+			act'Wipe your face':
+				cumspclnt = 12
+				gs'cum_cleanup'
+				gs'stat'
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/cum/clean_mouth.mp4"></video></center>'
+				'You wipe your face off with a towel and throw it into the cum laundry bin.'
+				act'Get ready for the next shift':gt'masseuse_work','shift_start'
+			end
+			if cumloc[0] > 0:
+				*nl
+				'Though shouldn''t you clean your out pussy too?'
+				act'Just your face':
+					cumspclnt = 12
+					gs'cum_cleanup'
+					gs'stat'
+					cla & *clr
+					'<center><video autoplay loop src="images/shared/sex/cum/clean_mouth.mp4"></video></center>'
+					'Eh, who cares. The first guy of the next shift can get sloppy seconds. He''ll probably just think it''s lube. You wipe your face off with a towel and throw it into the cum laundry bin. Then you reset the room for your next client.'
+					act'Get ready for the next shift':gt'masseuse_work','shift_start'
+				end
+				act'Wipe your face and pussy':
+					cumspclnt = 10
+					gs'cum_cleanup'
+					gs'stat'
+					cla & *clr
+					'<center><video autoplay loop src="images/shared/sex/cum/clean_mouth.mp4"></video> <video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
+					'You clean your face off with a towel before wiping your pussy with it as well before throwing it into the cum laundry bin. Then you reset the room for your next client.'
+					act'Get ready for the next shift':gt'masseuse_work','shift_start'
+				end
+			end
+		elseif cumloc[0] > 0 and cumloc[11] = 0:
+			*nl
+			'But shouldn''t you clean your out pussy too?'
+			act'Don''t bother':
+				cla & *nl
+				'Eh, who cares. The first guy of the next shift can get sloppy seconds. He''ll probably just think it''s lube. Your breather over, you slip on your robe and reset the room.'
+				act'Get ready for the next shift':gt'masseuse_work','shift_start'
+			end
+			act'Wipe your pussy':
+				cumspclnt = 12
+				gs'cum_cleanup'
+				gs'stat'
+				cla & *clr
+				'<center><video autoplay loop src="images/shared/sex/cum/clean_mouth.mp4"></video></center>'
+				'You wipe your pussy with a towel until no more cum is apparent and toss it into the cum laundry bin. Then you reset the room for your next client.'
+				act'Get ready for the next shift':gt'masseuse_work','shift_start'
+			end
+		elseif cumloc[0] = 0 and cumloc[11] = 0:
 			act'Get ready for the next shift':gt'masseuse_work','shift_start'
-		else
-			'<b><<hour>>:0<<minut>>.</b> Looks like your shift is just about over. Time to wrap up for the day. You clean up your station and prepare to leave.'
 		end
-	else
-		if (masseuse['<<week>>_shift_2'] = 1 and hour = 13) or (masseuse['<<week>>_shift_3'] = 1 and hour = 17):
-			masseuse['multiple_shifts'] = 1
-			'<b><<hour>>:<<minut>>.</b> Looks like this shift is just about over, but you scheduled yourself for the next shift too. Better prepare for that then.'
-			act'Get ready for the next shift':gt'masseuse_work','shift_start'
+	else		
+		'<b><<hour>>:<<minut>>.</b> Looks like your shift is just about over. Time to wrap up for the day.'
+		*nl
+		if cumloc[0] > 0 or cumloc[11] > 0:
+			'The only question left is if you''re going to clean yourself up first.'
+			act'Don''t bother':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
+				'Doesn''t really matter to you that much, you''ll just leave it where it is for now. You spend the next couple minutes resetting the room, slipping on your robe, and leaving the room, finishing your shift.'
+				act'Finish your shift':gt'masseuse_work','shift_end'
+			end
+			
+			if cumloc[0] > 0 and cumloc[11] > 0:
+				act'Clean everything':
+					cumspclnt = 10
+					gs'cum_cleanup'
+					gs'stat'
+					cla & *clr
+					'<center><video autoplay loop src="images/shared/sex/cum/clean_mouth.mp4"></video><video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
+					'Well, no reason to walk around dripping cum. Grabbing a soft towel, you carefully wipe the cum from your face and pussy before tossing it into the cum laundry bin. Afterwards, you reset the room, slip on your robe, and leave the room, finishing your shift.'
+					act'Finish your shift':gt'masseuse_work','shift_end'
+				end
+			end
+			if cumloc[11] > 0:
+				act'Wipe your face':
+					cumspclnt = 12
+					gs'cum_cleanup'
+					gs'stat'
+					cla & *clr
+					'<center><video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
+					'Well, no reason to walk around  with cum dripping from your face. Grabbing a soft towel, you wipe the cum from your face before tossing it into the cum laundry bin. Afterwards, you reset the room, slip on your robe, and leave the room, finishing your shift.'
+					act'Finish your shift':gt'masseuse_work','shift_end'
+				end
+			end
+			if cumloc[0] > 0:
+				act'Wipe your pussy':
+					cumspclnt = 15
+					gs'cum_cleanup'
+					gs'stat'
+					cla & *clr
+					'<center><video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
+					'Well, no reason to walk around with cum leaking from your pussy. Grabbing a soft towel, you carefully wipe the cum from your pussy before tossing it into the cum laundry bin. Afterwards, you reset the room, slip on your robe, and leave the room, finishing your shift.'
+					act'Finish your shift':gt'masseuse_work','shift_end'
+				end
+			end
 		else
-			'<b><<hour>>:<<minut>>.</b> Looks like your shift is just about over. Time to wrap up for the day. You clean up your station and prepare to leave.'
+			'You make sure all the dirty laundry is in the correct bins and then change the sheets on the table and put all the lube and oil back in their order on the table. With the room reset for the next girl, your shift is over.'
+			act'Finish your shift':gt'masseuse_work','shift_end'
 		end
 	end
 end
@@ -132,9 +222,8 @@ if $ARGS[0] = 'normal_end':
 	gs'arousal','massage_give',15
 	salon['work_minutes'] += 15
 	gs'stat'
-	if salon['work_minutes'] >= 240:
+	if salon['work_minutes'] >= 235:
 		gs'masseuse_work','last_client'
-		act'Finish your shift':gt'masseuse_work','shift_end'
 	else
 		act'Wait for your next client':gt'masseuse_work','begin'
 		if masseuse['break'] = 0:act'Take a break':gt'masseuse_break','start'
@@ -278,9 +367,9 @@ if $ARGS[0] = '1.handjob1':
 			*nl
 			'"That was a great massage, you''ve got talented hands," he smirks.'
 			'"Here''s a little something extra," he says, handing you 300 <b>₽</b>. "Maybe I''ll stop by again sometime for your services. Maybe you''ll even offer something a little more."'
-			if salon['work_minutes'] >= 240:
-				'With a wink, he leaves. Looking at the clock on the wall, you see your shift is just about over and so begin restting the room for the next girl.'
-				act'Finish your shift':gt'masseuse_work','shift_end'
+			if salon['work_minutes'] >= 235:
+				'With a wink, he leaves. Before doing anything else, you take a look at the clock to see if you have time for another client.'
+				gs'masseuse_work','last_client'
 			else
 				'With a wink, he leaves. Slipping your well earned tip into your pocket, you begin changing the sheets to prepare for your next client.'
 				act'Wait for your next client':gt'masseuse_work','begin'
@@ -316,9 +405,9 @@ if $ARGS[0] = '1.handjob2':
 			*nl
 			'"That was a great massage, you''ve got talented hands," he smirks.'
 			'"Your tip, as promised," he says, handing you 300 <b>₽</b>. "Maybe I''ll stop by again sometime for your services. Maybe even get a <i>full body</i> service from you."'
-			if salon['work_minutes'] >= 240:
-				'With a wink, he leaves. Looking at the clock on the wall, you see your shift is just about over and so begin restting the room for the next girl.'
-				act'Finish your shift':gt'masseuse_work','shift_end'
+			if salon['work_minutes'] >= 235:
+				'With a wink, he leaves. Before doing anything else, you take a look at the clock to see if you have time for another client.'
+				gs'masseuse_work','last_client'
 			else
 				'With a wink, he leaves. Slipping your well earned tip into your pocket, you begin changing the sheets to prepare for your next client.'
 				act'Wait for your next client':gt'masseuse_work','begin'
@@ -353,9 +442,9 @@ if $ARGS[0] = '1.handjob3':
 				'"My pleasure," you murmur. "A good <b>job</b> done is it''s own reward."'
 				'You smile innocently at your added emphasis.'
 				'"Damn..." he breathes. "I gotta come back for you..."'
-				if salon['work_minutes'] >= 240:
-					'With that, he leaves. Looking at the clock on the wall, you see your shift is just about over and so begin restting the room for the next girl.'
-					act'Finish your shift':gt'masseuse_work','shift_end'
+				if salon['work_minutes'] >= 235:
+					'With that, he leaves. Before doing anything else, you take a look at the clock to see if you have time for another client.'
+					gs'masseuse_work','last_client'
 				else
 					'With that, he leaves and you begin changing the sheets to prepare for your next client.'
 					act'Wait for your next client':gt'masseuse_work','begin'
@@ -368,9 +457,9 @@ if $ARGS[0] = '1.handjob3':
 				'"My pleasure," you murmur. "A good <b>job</b> done is it''s own reward."'
 				'You smile innocently at your added emphasis.'
 				'"Damn..." he breathes. "I gotta come back for you..."'
-				if salon['work_minutes'] >= 240:
-					'With that, he leaves. Looking at the clock on the wall, you see your shift is just about over and so begin restting the room for the next girl.'
-					act'Finish your shift':gt'masseuse_work','shift_end'
+				if salon['work_minutes'] >= 235:
+					'With that, he leaves. Before doing anything else, you take a look at the clock to see if you have time for another client.'
+				gs'masseuse_work','last_client'
 				else
 					'With that, he leaves. Slipping your well earned tip into your pocket, you begin changing the sheets to prepare for your next client.'
 					act'Wait for your next client':gt'masseuse_work','begin'
@@ -385,11 +474,9 @@ if $ARGS[0] = '1.handjob3':
 			'Still watching the client, you raise your hand to your lips and shove your fingers inside your mouth. You taste the bitter flavor of semen mixed with the massage oils and suck every drop of the former off each of your digits and gulp it all down. Smiling at him, you take a towel and begin to wipe him down, cleaning his body of his own cum and the rest of the oil before allowing him to get dressed.'
 			if salon['work_minutes'] >= 235:
 				gs'masseuse_work','last_client'
-				if masseuse['multiple_shifts'] ! 1:act'Finish your shift':gt'masseuse_work','shift_end'
 			else
 				if masseuse['break'] = 0:
 					gs'masseuse_work','break_question'
-					
 				else
 					gs'masseuse_work','prepare_next'
 				end
@@ -417,11 +504,9 @@ if $ARGS[0] = '1.naked':
 	massage['sex_tips'] += 200
 	if salon['work_minutes'] >= 235:
 		gs'masseuse_work','last_client'
-		act'Finish your shift':gt'masseuse_work','shift_end'
 	else
 		if masseuse['break'] = 0:
 			gs'masseuse_work','break_question'
-			
 		else
 			gs'masseuse_work','prepare_next'
 		end
@@ -481,7 +566,6 @@ if $ARGS[0] = '2':
 		'Only once he''s left do you reach for your robe and take a look at the clock.'
 		if salon['work_minutes'] >= 235:
 			gs'masseuse_work','last_client'
-			act'Finish your shift':gt'masseuse_work','shift_end'
 		else
 			if masseuse['break'] = 0:
 				gs'masseuse_work','break_question'
@@ -593,23 +677,8 @@ if $ARGS[0] = '3.1':
 				end
 				'Only once he''s left do you look down at the cum on your body. You ought to clean up for your next customer. If you have one that is, you think before taking a look at the clock.'
 				*nl
-				if salon['work_minutes'] >= 230:
+				if salon['work_minutes'] >= 235:
 					 gs'masseuse_work','last_client'
-					  act'Don''t bother':
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
-						'Well, they can''t tell you how to accessorise on your own time. You leave the cum where it is and clean up your station, preparing to leave.'
-						act'Finish your shift':gt'masseuse_work','shift_end'
-					end
-					 act'Wipe off the cum':
-						cumspclnt = 4
-						gs 'cum_cleanup'
-						gs 'stat'
-						cla & *clr
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
-						'Well, no reason to walk around wearing cum regardless. You grab another towel and wipe yourself off, tossing it into the laundry bin before cleaning up your station and prepare to leave.'
-						act'Finish your shift':gt'masseuse_work','shift_end'
-					 end
 				else
 					cumspclnt = 4
 					gs 'cum_cleanup'
@@ -650,7 +719,6 @@ if $ARGS[0] = '3.2':
 		end
 		if salon['work_minutes'] >= 235:
 			gs'masseuse_work','last_client'
-			act'Finish your shift':gt'masseuse_work','shift_end'
 		else
 			if masseuse['break'] = 0:
 				gs'masseuse_work','break_question'
@@ -743,7 +811,6 @@ if $ARGS[0] = '4.1':
 			end
 			if salon['work_minutes'] >= 235:
 				gs'masseuse_work','last_client'
-				act'Finish your shift':gt'masseuse_work','shift_end'
 			else
 				if masseuse['break'] = 0:
 					gs'masseuse_work','break_question'
@@ -791,7 +858,6 @@ if $ARGS[0] = '4.2':
 			end
 			if salon['work_minutes'] >= 235:
 				gs'masseuse_work','last_client'
-				act'Finish your shift':gt'masseuse_work','shift_end'
 			else
 				if masseuse['break'] = 0:
 					gs'masseuse_work','break_question'
@@ -867,28 +933,11 @@ if $ARGS[0] = '5.1':
 			*nl
 			if salon['work_minutes'] >= 235:
 				 gs'masseuse_work','last_client'
-				 *nl
-				 'Now the only real question is if you''re going to clean yourself up or just the room.'
-				 act'Don''t bother':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
-					'Doesn''t really matter to you that much, you''ll just leave it where it is for now. You spend the next couple minutes reseting the room and slip on your robe before finishing your shift.'
-					act'Finish your shift':gt'masseuse_work','shift_end'
-				end
-				 act'Wipe your pussy':
-					cumspclnt = 15
-					gs 'cum_cleanup'
-					gs 'stat'
-					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
-					'Well, no reason to walk around dripping cum or staining your panties. Grabbing a soft towel, you carefully wipe the cum from your pussy before tossing it into the laundry bin. Afterwards, you reset the room and slip on your robe before finishing your shift.'
-					act'Finish your shift':gt'masseuse_work','shift_end'
-				 end
 			else
 				gs'masseuse_work','prepare_next'
 				*nl
 				'Looking down at your cum dripping pussy, you think to yourself if you care enough to clean it off. Company policy says you should be completely clean for each new customer but...'
-				 act'Don''t bother':
+				act'Don''t bother':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
 					'Eh, who cares. The next guy can get sloppy seconds. He''ll probably just think it''s lube. Your breather over, you slip on your robe and reset the room.'
@@ -907,7 +956,7 @@ if $ARGS[0] = '5.1':
 					gs 'stat'
 					cla & *clr
 					'<center><video autoplay loop src="images/shared/sex/cum/clean_pussy.mp4"></video></center>'
-					'Best to just stick to the policy. Grabbing a soft towel, you carefully wipe the cum from your pussy before tossing it into the laundry bin. Afterwards, you slip on your robe and reset the room.'
+					'Best to just stick to the policy. Grabbing a soft towel, you carefully wipe the cum from your pussy before tossing it into the cum laundry bin. Afterwards, you slip on your robe and reset the room.'
 					if masseuse['break'] = 0:
 						'Now the only question left is if you should you take a break or just wait for the next client?'
 					else
@@ -940,23 +989,6 @@ if $ARGS[0] = '5.1':
 			end
 			if salon['work_minutes'] >= 235:
 				 gs'masseuse_work','last_client'
-				 *nl
-				 'Now the only real question is if you''re going to clean yourself up or just the room.'
-				  act'Don''t bother':
-					cla & *clr
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/work/room.jpg"></center>'
-					'Well, they can''t tell you how to accessorise on your own time. You leave the cum where it is and spend the next couple minutes reseting the room before finishing your shift.'
-					act'Finish your shift':gt'masseuse_work','shift_end'
-				end
-				act'Clean your face':
-					cumspclnt = 12
-					gs 'cum_cleanup'
-					gs 'stat'
-					cla & *clr
-					'<center><video autoplay loop src="images/shared/sex/cum/clean_mouth.mp4"></video></center>'
-					'Well, no reason to walk around wearing cum regardless. Grabbing a towel, you carefully wipe your face and hair, tossing it into the laundry bin before cleaning up your station and prepare to leave.'
-					act'Finish your shift':gt'masseuse_work','shift_end'
-				 end
 			else
 				cumspclnt = 12
 				gs 'cum_cleanup'