brothel.qsrc startet fusing player/npc choice to one function

locations/brothel.qsrc

@@ -655,11 +655,11 @@ if $ARGS[0] = 'section1_start':
 	'The only thing that connects you with the outside are cameras in each corner of the room, watchfully recording all that happens here.'
 	if rageMeter <= 100:
 		'<font color=#'+$mas_font+'>"So what will we do today, my little painslut?"</font>'
-		act 'Be quiet and await what''s next': gt 'brothel', 'section1_master_chooses'
+		act 'Be quiet and await what''s next': gt 'brothel', 'section1_pick', '0', '0'
 		act 'Suggest an action': gt 'brothel', 'section1_slave_chooses'
 	else
 		'Without a word Master leads you to a device...'
-		act 'Continue': gt 'brothel', 'section1_master_chooses'
+		act 'Continue': gt 'brothel', 'section1_pick', '0', '0'
 	end
 end
 
@@ -669,60 +669,56 @@ if $ARGS[0] = 'section1_slave_chooses':
 	'<h5>You decide to suggest what your Master should do with you...</h5>'
 	'You ask him: <font color=#<<$pcs_font>>>"Master, please..."</font>'
 	!!act '..let''s just have sex and see where it leads':
-	act '..just bind me and use my holes': gt 'brothel', 'section1_slave_pick', '2'
-	act '..I''ve been a bad girl, I should be punished': gt 'brothel', 'section1_slave_pick', '3'
-	act '..I need to recharge my batteries': gt 'brothel', 'section1_slave_pick', '1'
+	act '..just bind me and use my holes': gt 'brothel', 'section1_pick', '3', '1'
+	act '..I''ve been a bad girl, I should be punished': gt 'brothel', 'section1_pick', '2', '1'
+	act '..I need to recharge my batteries': gt 'brothel', 'section1_pick', '1', '1'
 	!!act '..I''m so thirsty, I could use something to drink':
 	!!act '..I am so tight, I need some exercise':
-	act 'Reconsider and be quiet': gt 'brothel', 'section1_master_chooses'
+	act 'Reconsider and be quiet': gt 'brothel', 'section1_pick', '0', '0'
 end
 
-!!ToDo Fix these
-if $ARGS[0] = 'section1_master_chooses':
-	menu_off = 1
-	stage = 1
-	mas_dec = rand(1, 3)
-	if mas_dec = 1:
-		$actType = 'electricity'
-	elseif mas_dec = 2:
-		$actType = 'titTorture'
-	elseif mas_dec = 3:
-		$actType = 'boundPlay'
-	end
-	$subloc = 'section1_play'
-	gt 'brothel', $subloc
-end
-
-if $ARGS[0] = 'section1_slave_pick':
+                       
+!!Fix in case of refusal after player pick
+if $ARGS[0] = 'section1_pick':
 	menu_off = 1
 	stage = 1
 	$subloc = 'section1_play'
-	if rageMeter <= 25:
+    mas_accept = $ARGS[2]
+	if (rageMeter <= 25 and mas_accept = 1):
 		'<font color=#'+$mas_font+'>As you wish, slut. We''ll do it your way.</font>'
-		mas_accept = 1
-	elseif rageMeter <= 50:
+	elseif (rageMeter <= 50 and mas_accept = 1):
 		mas_accept = rand(0, 1)
 		if mas_accept = 0:
 			'<center><video autoplay loop src="images/locations/shared/brothel/slapface1.mp4"></video></center>'
+            rageMeter += 10           
 			'<font color=#'+$mas_font+'>You think you can order me around, slut? It''ll do with you what I *I* want.</font>'
 		elseif mas_accept = 1:
 			'<font color=#'+$mas_font+'>So, that''s how you like to play, slut? Sure, we will do that. I''ll make your cries only sweeter.</font>'
 		end
-	elseif rageMeter >= 75:
+	elseif (rageMeter >= 75 and mas_accept = 1):
 		'<center><video autoplay loop src="images/locations/shared/brothel/slapface1.mp4"></video></center>'
+      	rageMeter += 10
 		'<font color=#'+$mas_font+'>You think you can order me around, slut? I''ll do with you what *I* want.</font>'
 		mas_accept = 0
 	end
+	
+	
+	if mas_accept = 1:
+		mas_dec = $ARGS[1]
+	elseif mas_accept = 0:
+		mas_dec = rand(1, 3)
+	end
+
+	if mas_dec = 1:
+		$actType = 'electricity'
+	elseif mas_dec = 2:
+		$actType = 'titTorture'
+	elseif mas_dec = 3:
+		$actType = 'boundPlay'
+	end
+		
 	if mas_accept = 0:
-		act 'Begin the session': gt 'brothel', 'section1_master_chooses'
-	elseif mas_accept = 1:
-		if $ARGS[1] = 1:
-			$actType = 'electricity'
-		elseif $ARGS[1] = 2:
-			$actType = 'titTorture'
-		elseif $ARGS[1] = 3:
-			$actType = 'boundPlay'
-		end
+		gt 'brothel', $subloc
 	end
 	
 	act 'Begin the session': gt 'brothel', $subloc