1
0
Переглянути джерело

Fixed some stupid errors tested the negotiation

netuttki 1 рік тому
батько
коміт
4e3d3ebd02
1 змінених файлів з 29 додано та 29 видалено
  1. 29 29
      locations/prostitution_integ_negotiation.qsrc

+ 29 - 29
locations/prostitution_integ_negotiation.qsrc

@@ -4,10 +4,10 @@ if $ARGS[0] = 'general_description':
 
 	if prostitute['customer_total'] > 9:
 		*nl
-		'A blowjob, anal oder vaginal scene can consist of up to three or only one small scene. Currently there can be '+iif(prostitute['scene_reduction'] = 0, 'up to <a href="exec: prostitute[''scene_reduction''] = 1 & gt '+$ARGS[1]+', ''work''">three</a>', 'only <a href="exec: prostitute[''scene_reduction''] = 0 & gt '+$ARGS[1]+', ''work''">one</a>')+' small scene'+iif(prostitute['scene_reduction'] = 0, 's.', '.')
+		'A blowjob, anal oder vaginal scene can consist of up to three or only one small scene. Currently there can be '+iif(prostitute['scene_reduction'] = 0, 'up to <a href="exec: prostitute[''scene_reduction''] = 1 & gt ''<<$loc>>'', ''work''">three</a>', 'only <a href="exec: prostitute[''scene_reduction''] = 0 & gt ''<<$loc>>'', ''work''">one</a>')+' small scene'+iif(prostitute['scene_reduction'] = 0, 's.', '.')
 		'The start and end scene (getting your money, leaving the car, talking to a regular, ...) can either be shown or skipped automatically.'
-		' - End scene will be '+iif(prostitute['skip_end'] = 0, '<a href="exec: prostitute[''skip_end''] = 1 & gt '+$ARGS[1]+', ''work''">shown</a>.', '<a href="exec: prostitute[''skip_end''] = 0 & gt '+$ARGS[1]+', ''work''">skipped</a>.')
-		' - Start scene will be '+iif(prostitute['skip_start'] = 0, '<a href="exec: prostitute[''skip_start''] = 1 & gt '+$ARGS[1]+', ''work''">shown</a>.', '<a href="exec: prostitute[''skip_start''] = 0 & gt '+$ARGS[1]+', ''work''">skipped</a>.')
+		' - End scene will be '+iif(prostitute['skip_end'] = 0, '<a href="exec: prostitute[''skip_end''] = 1 & gt ''<<$loc>>'', ''work''">shown</a>.', '<a href="exec: prostitute[''skip_end''] = 0 & gt ''<<$loc>>'', ''work''">skipped</a>.')
+		' - Start scene will be '+iif(prostitute['skip_start'] = 0, '<a href="exec: prostitute[''skip_start''] = 1 & gt ''<<$loc>>'', ''work''">shown</a>.', '<a href="exec: prostitute[''skip_start''] = 0 & gt ''<<$loc>>'', ''work''">skipped</a>.')
 		*nl
 
 		if prezikcount = 0 and (prostitute_auto['norm_bj_condom'] + prostitute_auto['norm_vag_condom'] + prostitute_auto['norm_anal_condom'] + prostitute_auto['reg_vag_condom'] + prostitute_auto['reg_anal_condom']):
@@ -17,42 +17,42 @@ if $ARGS[0] = 'general_description':
 
 		*nl
 		'<table><tr><td valign="top"><b>Behavior towards normal clients:</b>'
-		'Negotiation: '+iif(prostitute_auto['normal'] = 1, '<a href="exec: prostitute_auto[''normal''] = 0 & gt '+$ARGS[1]+', ''work''">Automatic</a>', '<a href="exec: prostitute_auto[''normal''] = 1 & gt '+$ARGS[1]+', ''work''">Manual</a>')
+		'Negotiation: '+iif(prostitute_auto['normal'] = 1, '<a href="exec: prostitute_auto[''normal''] = 0 & gt ''<<$loc>>'', ''work''">Automatic</a>', '<a href="exec: prostitute_auto[''normal''] = 1 & gt ''<<$loc>>'', ''work''">Manual</a>')
 		if prostitute_auto['normal'] = 1:
 			*nl
 			'Which acts do you automatically accept/decline?'
-			'Blowjob: '+iif(prostitute_auto['norm_bj'] = 1, '<a href="exec: prostitute_auto[''norm_bj''] = 0 & gt '+$ARGS[1]+', ''work''">Accept</a>', '<a href="exec: prostitute_auto[''norm_bj''] = 1 & gt '+$ARGS[1]+', ''work''">Decline</a>')
-			'Vaginal: '+iif(prostitute_auto['norm_vag'] = 1, '<a href="exec: prostitute_auto[''norm_vag''] = 0 & gt '+$ARGS[1]+', ''work''">Accept</a>', '<a href="exec: prostitute_auto[''norm_vag''] = 1 & gt '+$ARGS[1]+', ''work''">Decline</a>')
-			'Anal: '+iif(prostitute_auto['norm_anal'] = 1, '<a href="exec: prostitute_auto[''norm_anal''] = 0 & gt '+$ARGS[1]+', ''work''">Accept</a>', '<a href="exec: prostitute_auto[''norm_anal''] = 1 & gt '+$ARGS[1]+', ''work''">Decline</a>')
+			'Blowjob: '+iif(prostitute_auto['norm_bj'] = 1, '<a href="exec: prostitute_auto[''norm_bj''] = 0 & gt ''<<$loc>>'', ''work''">Accept</a>', '<a href="exec: prostitute_auto[''norm_bj''] = 1 & gt ''<<$loc>>'', ''work''">Decline</a>')
+			'Vaginal: '+iif(prostitute_auto['norm_vag'] = 1, '<a href="exec: prostitute_auto[''norm_vag''] = 0 & gt ''<<$loc>>'', ''work''">Accept</a>', '<a href="exec: prostitute_auto[''norm_vag''] = 1 & gt ''<<$loc>>'', ''work''">Decline</a>')
+			'Anal: '+iif(prostitute_auto['norm_anal'] = 1, '<a href="exec: prostitute_auto[''norm_anal''] = 0 & gt ''<<$loc>>'', ''work''">Accept</a>', '<a href="exec: prostitute_auto[''norm_anal''] = 1 & gt ''<<$loc>>'', ''work''">Decline</a>')
 
 			if prostitute_auto['norm_bj'] + prostitute_auto['norm_vag'] + prostitute_auto['norm_anal'] > 0:
 				*nl
 				'Do you insist on a condom?'
-				if prostitute_auto['norm_bj'] = 1: '- Blowjob: '+iif(prostitute_auto['norm_bj_condom'] = 1, '<a href="exec: prostitute_auto[''norm_bj_condom''] = 0 & gt '+$ARGS[1]+', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''norm_bj_condom''] = 1 & gt '+$ARGS[1]+', ''work''">No</a>')
-				if prostitute_auto['norm_vag'] = 1: '- Vaginal: '+iif(prostitute_auto['norm_vag_condom'] = 1, '<a href="exec: prostitute_auto[''norm_vag_condom''] = 0 & gt '+$ARGS[1]+', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''norm_vag_condom''] = 1 & gt '+$ARGS[1]+', ''work''">No</a>')
-				if prostitute_auto['norm_anal'] = 1: '- Anal: '+iif(prostitute_auto['norm_anal_condom'] = 1, '<a href="exec: prostitute_auto[''norm_anal_condom''] = 0 & gt '+$ARGS[1]+', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''norm_anal_condom''] = 1 & gt '+$ARGS[1]+', ''work''">No</a>')
+				if prostitute_auto['norm_bj'] = 1: '- Blowjob: '+iif(prostitute_auto['norm_bj_condom'] = 1, '<a href="exec: prostitute_auto[''norm_bj_condom''] = 0 & gt ''<<$loc>>'', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''norm_bj_condom''] = 1 & gt ''<<$loc>>'', ''work''">No</a>')
+				if prostitute_auto['norm_vag'] = 1: '- Vaginal: '+iif(prostitute_auto['norm_vag_condom'] = 1, '<a href="exec: prostitute_auto[''norm_vag_condom''] = 0 & gt ''<<$loc>>'', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''norm_vag_condom''] = 1 & gt ''<<$loc>>'', ''work''">No</a>')
+				if prostitute_auto['norm_anal'] = 1: '- Anal: '+iif(prostitute_auto['norm_anal_condom'] = 1, '<a href="exec: prostitute_auto[''norm_anal_condom''] = 0 & gt ''<<$loc>>'', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''norm_anal_condom''] = 1 & gt ''<<$loc>>'', ''work''">No</a>')
 
 				if prostitute_auto['norm_bj_condom'] = 0 or prostitute_auto['norm_vag_condom'] = 0 or prostitute_auto['norm_anal_condom'] = 0:
 					*nl
 					'Do you allow him to cum inside you?'
-					if prostitute_auto['norm_bj_condom'] = 0 and prostitute_auto['norm_bj'] = 1: '- Blowjob: '+iif(prostitute_auto['norm_bj_creampie'] = 1, '<a href="exec: prostitute_auto[''norm_bj_creampie''] = 0 & gt '+$ARGS[1]+', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''norm_bj_creampie''] = 1 & gt '+$ARGS[1]+', ''work''">No</a>')
-					if prostitute_auto['norm_vag_condom'] = 0 and prostitute_auto['norm_vag'] = 1: '- Vaginal: '+iif(prostitute_auto['norm_vag_creampie'] = 1, '<a href="exec: prostitute_auto[''norm_vag_creampie''] = 0 & gt '+$ARGS[1]+', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''norm_vag_creampie''] = 1 & gt '+$ARGS[1]+', ''work''">No</a>')
-					if prostitute_auto['norm_anal_condom'] = 0 and prostitute_auto['norm_anal'] = 1: '- Anal: '+iif(prostitute_auto['norm_anal_creampie'] = 1, '<a href="exec: prostitute_auto[''norm_anal_creampie''] = 0 & gt '+$ARGS[1]+', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''norm_anal_creampie''] = 1 & gt '+$ARGS[1]+', ''work''">No</a>')
+					if prostitute_auto['norm_bj_condom'] = 0 and prostitute_auto['norm_bj'] = 1: '- Blowjob: '+iif(prostitute_auto['norm_bj_creampie'] = 1, '<a href="exec: prostitute_auto[''norm_bj_creampie''] = 0 & gt ''<<$loc>>'', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''norm_bj_creampie''] = 1 & gt ''<<$loc>>'', ''work''">No</a>')
+					if prostitute_auto['norm_vag_condom'] = 0 and prostitute_auto['norm_vag'] = 1: '- Vaginal: '+iif(prostitute_auto['norm_vag_creampie'] = 1, '<a href="exec: prostitute_auto[''norm_vag_creampie''] = 0 & gt ''<<$loc>>'', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''norm_vag_creampie''] = 1 & gt ''<<$loc>>'', ''work''">No</a>')
+					if prostitute_auto['norm_anal_condom'] = 0 and prostitute_auto['norm_anal'] = 1: '- Anal: '+iif(prostitute_auto['norm_anal_creampie'] = 1, '<a href="exec: prostitute_auto[''norm_anal_creampie''] = 0 & gt ''<<$loc>>'', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''norm_anal_creampie''] = 1 & gt ''<<$loc>>'', ''work''">No</a>')
 				end
 			end
 		end
 		'</td><td></td><td valign="top"><b>Behavior towards regular clients:</b>'
-		'Negotiation: '+iif(prostitute_auto['regular'] = 1, '<a href="exec: prostitute_auto[''regular''] = 0 & gt '+$ARGS[1]+', ''work''">Automatic</a>', '<a href="exec: prostitute_auto[''regular''] = 1 & gt '+$ARGS[1]+', ''work''">Manual</a>')
+		'Negotiation: '+iif(prostitute_auto['regular'] = 1, '<a href="exec: prostitute_auto[''regular''] = 0 & gt ''<<$loc>>'', ''work''">Automatic</a>', '<a href="exec: prostitute_auto[''regular''] = 1 & gt ''<<$loc>>'', ''work''">Manual</a>')
 		if prostitute_auto['regular'] = 1:
 			*nl
 			'Do you insist on a condom?'
-			'- Vaginal: '+iif(prostitute_auto['reg_vag_condom'] = 1, '<a href="exec: prostitute_auto[''reg_vag_condom''] = 0 & gt '+$ARGS[1]+', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''reg_vag_condom''] = 1 & gt '+$ARGS[1]+', ''work''">No</a>')
-			'- Anal: '+iif(prostitute_auto['reg_anal_condom'] = 1, '<a href="exec: prostitute_auto[''reg_anal_condom''] = 0 & gt '+$ARGS[1]+', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''reg_anal_condom''] = 1 & gt '+$ARGS[1]+', ''work''">No</a>')
+			'- Vaginal: '+iif(prostitute_auto['reg_vag_condom'] = 1, '<a href="exec: prostitute_auto[''reg_vag_condom''] = 0 & gt ''<<$loc>>'', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''reg_vag_condom''] = 1 & gt ''<<$loc>>'', ''work''">No</a>')
+			'- Anal: '+iif(prostitute_auto['reg_anal_condom'] = 1, '<a href="exec: prostitute_auto[''reg_anal_condom''] = 0 & gt ''<<$loc>>'', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''reg_anal_condom''] = 1 & gt ''<<$loc>>'', ''work''">No</a>')
 			*nl
 			if prostitute_auto['reg_anal_condom'] = 0 or prostitute_auto['reg_vag_condom'] = 0:
 				'Do you allow him to cum inside you?'
-				if prostitute_auto['reg_vag_condom'] = 0: '- Vaginal: '+iif(prostitute_auto['reg_vag_creampie'] = 1, '<a href="exec: prostitute_auto[''reg_vag_creampie''] = 0 & gt '+$ARGS[1]+', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''reg_vag_creampie''] = 1 & gt '+$ARGS[1]+', ''work''">No</a>')
-				if prostitute_auto['reg_anal_condom'] = 0: '- Anal: '+iif(prostitute_auto['reg_anal_creampie'] = 1, '<a href="exec: prostitute_auto[''reg_anal_creampie''] = 0 & gt '+$ARGS[1]+', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''reg_anal_creampie''] = 1 & gt '+$ARGS[1]+', ''work''">No</a>')
+				if prostitute_auto['reg_vag_condom'] = 0: '- Vaginal: '+iif(prostitute_auto['reg_vag_creampie'] = 1, '<a href="exec: prostitute_auto[''reg_vag_creampie''] = 0 & gt ''<<$loc>>'', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''reg_vag_creampie''] = 1 & gt ''<<$loc>>'', ''work''">No</a>')
+				if prostitute_auto['reg_anal_condom'] = 0: '- Anal: '+iif(prostitute_auto['reg_anal_creampie'] = 1, '<a href="exec: prostitute_auto[''reg_anal_creampie''] = 0 & gt ''<<$loc>>'', ''work''">Yes</a>', '<a href="exec: prostitute_auto[''reg_anal_creampie''] = 1 & gt ''<<$loc>>'', ''work''">No</a>')
 			end
 		end
 		'</td></tr></table>'
@@ -71,7 +71,7 @@ if $ARGS[0] = 'look_client':
 	if pcs_inhib < 60: inhib_exp += rand(1,2)
 
 	if prostitute['regular'] = 1:
-		gt ''prostitution_integ_negotiation', 'client_regular'', 'look_client'
+		gt 'prostitution_integ_negotiation', 'client_regular', 'look_client'
 	elseif prostitute['client_chance'] > 100 and prostitute['regular'] = 0:
 		prostitute['pity_counter'] = 0
 		'<center><video autoplay loop src="mod/wlife/images/prostitution/normal/negotiation/chat'+rand(0,1)+'.mp4"></video></center>'
@@ -121,7 +121,7 @@ if $ARGS[0] = 'look_client':
 		prostitute['pity_counter'] += rand(4,8)
 		'<center><video autoplay loop src="mod/wlife/images/prostitution/normal/negotiation/search.mp4"></video></center>'
 		'<br>Some cars drive by, but nobody stops.'
-		act 'Continue': gt $ARGS[1], 'work'
+		act 'Continue': gt $loc, 'work'
 	end
 end
 
@@ -178,7 +178,7 @@ if $ARGS[0] = 'client_regular':
 					if prostitute['std_mod'] = 0 and prostitute_auto['regular'] = 0:
 						act 'Always use a condom':
 							cla & *nl
-							'... always use a condom.'+iif( = 0, ' But you don''t have any with you', '')
+							'... always use a condom.'+iif(prezikcount = 0, ' But you don''t have any with you', '')
 
 							act 'Don''t make an exception':
 								cla & *nl
@@ -211,7 +211,7 @@ if $ARGS[0] = 'client_regular':
 									else
 										'He sighs and after a second he shrugs. "Fine," he looks at you and reassures you. "Don''t worry about it <<$prostitute_names[''street'']>>, you''re always worth waiting for."'
 
-										act 'Leave': gt $ARGS[1], 'work'
+										act 'Leave': gt $loc, 'work'
 									end
 								end
 							end
@@ -321,7 +321,7 @@ if $ARGS[0] = 'client_regular_fail':
 	*nl
 	'"Thanks," you say and step away from the car.'+iif(prostitute['std_mod'] = 1 and prezikcount = 0, ' As you walk away you think about your decision for a moment. In the end it was the right choice, he was always nice to you and without a condom he surely would catch your STD.', '')
 
-	act 'Continue': gt $ARGS[1], 'work'
+	act 'Continue': gt $loc, 'work'
 end
 
 ! [x] First check over
@@ -332,7 +332,7 @@ if $ARGS[0] = 'client_regular_success':
 	*clr & cla
 	minut += 5
 	prostitute['regular_timer'] = daystart
-	gs 'prostitution_integ_functions', 'acceptance_check', 'regular'
+	!!gs 'prostitution_integ_functions', 'acceptance_check', 'regular'
 	gs 'stat'
 	'<center><video autoplay loop src="mod/wlife/images/prostitution/regular/negotiation/drive.mp4"></video></center>'
 	'You get into his car and he takes you to your regular spot at the end of the parking lot.'
@@ -426,7 +426,7 @@ if $ARGS[0] = 'negotiation_start':
 		if will_cost <= pcs_willpwr:
 			act 'Decline and move away (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
-				gt $ARGS[1], 'work'
+				gt $loc, 'work'
 			end
 		else
 			act 'Decline and move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -437,7 +437,7 @@ if $ARGS[0] = 'negotiation_start':
 			act 'Decline and move away (<<will_cost>> Willpower)':
 				gs 'willpower', 'prostitution', 'resist'
 				gs 'willpower', 'pay', 'resist'
-				gt $ARGS[1], 'work'
+				gt $loc, 'work'
 			end
 		else
 			act 'Decline and move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -486,7 +486,7 @@ if $ARGS[0] = 'negotiation_start':
 				if will_cost <= pcs_willpwr:
 					act 'Decline and move away (<<will_cost>> Willpower)':
 						gs 'willpower', 'pay', 'resist'
-						gt $ARGS[1], 'work'
+						gt $loc, 'work'
 					end
 				else
 					act 'Decline and move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -691,7 +691,7 @@ if $ARGS[0] = 'negotiation_fail':
 	act 'Step back from the car':
 		prostitute['fail_pay'] = 0
 		prostitute['client_satisfaction'] = 0
-		gt $ARGS[1], 'work'
+		gt $loc, 'work'
 	end
 	if prostitute['fail_condom'] = 1:
 		prostitute['fail_condom'] = 0
@@ -782,7 +782,7 @@ if $ARGS[0] = 'money':
 	prostitute['earnings_day'] += prostitute['payment']
 	if prostitute['payment_method'] = 1: money += prostitute['payment']
 	prostitute['payment'] = 0
-	gs 'prostitution_integ_functions', 'acceptance_check', 'normal'
+	!!gs 'prostitution_integ_functions', 'acceptance_check', 'normal'
 	gs 'stat'
 
 	'<br>The moment you have put your money away his hands move to your body starting to undress you.'