locations/gad_prostitutes.qsrc

@@ -267,22 +267,23 @@ if $ARGS[0] = 'work_alone':
 
 	gs 'shortgs', 'setloc', 'gad_prostitutes', 'work'
 	menu_off = 0
+	$prostitution_location = 'gadukino'
 	gs 'stat'
 
 	gs 'prostitution_functions', 'parameters'
 
-	if $prostitute_names['gadukino'] = '':
+	if $prostitute_names[$prostitution_location] = '':
 		'If you want, you can tell your clients a different name.'
 
-		$prostitute_names['gadukino'] = input("What name do you want to tell your clients? (Leave blank for <<$pcs_nickname>>)")
-		if $prostitute_names['gadukino'] = '': $prostitute_names['gadukino'] = $pcs_nickname
+		$prostitute_names[$prostitution_location] = input("What name do you want to tell your clients? (Leave blank for <<$pcs_nickname>>)")
+		if $prostitute_names[$prostitution_location] = '': $prostitute_names[$prostitution_location] = $pcs_nickname
 	end
 
 	!! TODO: Should find some video that is more roadside - evening, morning, different weather, etc.
 	'<center><video autoplay src="images/shared/prostitution/car/normal/negotiation/search.mp4"></video></center>'
 
 	!! TODO: Need to rewrite this to reflect the Gadukino location
-	!!'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<pcs_hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pirsA > 0 and pirsA < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'eroto' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
+	!!'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<pcs_hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pcs_piercings['tongue'] > 0, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'eroto' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
 
 	!! TODO: The enema thing should be aligned with the rest of the game.
 	if klismaday ! daystart: '<br>Almost no men will like dirty anal sex, even with a condom, and it''s probably a safe bet that they won''t pay a lot for it. So you should start giving yourself an enema before going to work.'

locations/gas_station_gp_117.qsrc

@@ -377,18 +377,18 @@ if $ARGS[0] = 'work':
 
 	*clr & cla
 	$loc_arg = 'work'
-	$used_name = 'street'
+	$prostitution_location = 'gas_station'
 	$menu_arg = 'work'
 	menu_off = 0
 	gs 'stat'
 
 	gs 'prostitution_functions', 'parameters'
-
-	if $prostitute_names['street'] = '':
+	
+	if $prostitute_names[$prostitution_location] = '':
 		'If you want, you can tell your clients a different name.'
 
-		$prostitute_names['street'] = input("What name do you want to tell your clients? (Leave blank for <<$pcs_nickname>>)")
-		if $prostitute_names['street'] = '': $prostitute_names['street'] = $pcs_nickname
+		$prostitute_names[$prostitution_location] = input("What name do you want to tell your clients? (Leave blank for <<$pcs_nickname>>)")
+		if $prostitute_names[$prostitution_location] = '': $prostitute_names[$prostitution_location] = $pcs_nickname
 	end
 
 	'<center><video autoplay src="images/shared/prostitution/car/normal/negotiation/search.mp4"></video></center>'

locations/piercing_management.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'add':
 	if pcs_piercings[$ARGS[1]] <= 0: pcs_piercings['wearing'] += 1
 	pcs_piercings['any'] = 1
 	pcs_piercings[$ARGS[1]] = ARGS[2]
-	psc_piercings['<<$ARGS[1]>>_<<ARGS[2]>>_owned'] = 1
+	pcs_piercings['<<$ARGS[1]>>_<<ARGS[2]>>_owned'] = 1
 	exit
 end
 

locations/pirsingsalon.qsrc

@@ -655,7 +655,7 @@ if $ARGS[0] = 'piercing_navel2':
 
 	if pcs_piercings['navel_<<ARGS[1]>>_owned'] = 1:
 		'You already own this piercing.'
-		act 'Return': gt 'pirsingsalon', 'piercing_brow'
+		act 'Return': gt 'pirsingsalon', 'piercing_navel'
 
 	elseif pcs_piercings['navel'] = 0:
 		if max(money, karta) < 8000:

locations/prostitution_car_negotiation.qsrc

@@ -145,7 +145,7 @@ if $ARGS[0] = 'client_regular':
 		minut += 1
 		gs 'stat'
 		'<center><video autoplay loop src="images/shared/prostitution/car/regular/negotiation/approach.mp4"></video></center>'
-		'"Hi <<$prostitute_names[$used_name]>>. I was looking for you." He says in a good mood clearly happy to see you.'
+		'"Hi <<$prostitute_names[$prostitution_location]>>. I was looking for you." He says in a good mood clearly happy to see you.'
 		*nl
 		'"Hey sweetie, good to see you again." You say to him with a smile on your lips.'
 
@@ -193,7 +193,7 @@ if $ARGS[0] = 'client_regular':
 								gs 'prostitution_functions', 'payment', 'condom_yes', 'inside_no'
 
 								if mc_inventory['normal_condoms'] > 0 or mc_inventory['equipped_condoms'] > 0:
-									'You pull out a condom out of your '+iif(bag = 1, 'purse', 'pocket')+' and he nods. "No problem <<$prostitute_names[$used_name]>>, better safe than sorry."'
+									'You pull out a condom out of your '+iif(bag = 1, 'purse', 'pocket')+' and he nods. "No problem <<$prostitute_names[$prostitution_location]>>, better safe than sorry."'
 
 									act 'Continue': gt 'prostitution_car_negotiation', 'client_regular_success'
 								else
@@ -215,7 +215,7 @@ if $ARGS[0] = 'client_regular':
 
 										act 'Continue': gt 'prostitution_car_negotiation', 'client_regular_success'
 									else
-										'He sighs and after a second he shrugs. "Fine," he looks at you and reassures you. "Don''t worry about it <<$prostitute_names[$used_name]>>, you''re always worth waiting for."'
+										'He sighs and after a second he shrugs. "Fine," he looks at you and reassures you. "Don''t worry about it <<$prostitute_names[$prostitution_location]>>, you''re always worth waiting for."'
 
 										act 'Leave': gt $loc, 'work'
 									end
@@ -245,7 +245,7 @@ if $ARGS[0] = 'client_regular':
 									$prostitute_client_cumshot = 'Inside'
 									gs 'prostitution_functions', 'payment', 'condom_no', 'inside_yes'
 									'... can cum inside you. "And don''t be afraid to cum inside me if you want and pay for it."'
-									'"Of course I''ll pay for it. You''re the best, <<$prostitute_names[$used_name]>>."'
+									'"Of course I''ll pay for it. You''re the best, <<$prostitute_names[$prostitution_location]>>."'
 
 									act 'Continue': gt 'prostitution_car_negotiation', 'client_regular_success'
 								end
@@ -256,7 +256,7 @@ if $ARGS[0] = 'client_regular':
 							cla & *nl
 							$prostitute_client_condom = 'No'
 							'... never use a condom. "You want to fuck me raw as always?"'
-							'He nods. "Of course, it just isn''t the same with a condom. It''s really great that you do that, <<$prostitute_names[$used_name]>>. You know that, right? There aren''t many girls your age that do it raw."'
+							'He nods. "Of course, it just isn''t the same with a condom. It''s really great that you do that, <<$prostitute_names[$prostitution_location]>>. You know that, right? There aren''t many girls your age that do it raw."'
 							*nl
 							'You smile and tell him that he...'
 
@@ -275,7 +275,7 @@ if $ARGS[0] = 'client_regular':
 								$prostitute_client_cumshot = 'Inside'
 								gs 'prostitution_functions', 'payment', 'condom_no', 'inside_yes'
 								'... can cum inside you. "Yeah, raw is the best way to fuck and remember don''t be afraid to cum anywhere you want."'
-								'"You''re the best whore in the whole area, <<$prostitute_names[$used_name]>>."'
+								'"You''re the best whore in the whole area, <<$prostitute_names[$prostitution_location]>>."'
 
 								act 'Continue': gt 'prostitution_car_negotiation', 'client_regular_success'
 							end
@@ -323,7 +323,7 @@ if $ARGS[0] = 'client_regular_fail':
 	'<center><video autoplay loop src="images/shared/prostitution/car/regular/negotiation/chat'+rand(0,1)+'.mp4"></video></center>'
 	'"I''m sorry sweetie, I know you really like to fuck my '+iif($prostitute['client_scene'] = 'Vaginal', 'pussy', 'ass')+' but I''m not up for that today."'
 	*nl
-	'"Shit? Really?" You nod and he looks disheartened. After a moment he shrugs and throws you a grin. "Don''t worry about it <<$prostitute_names[$used_name]>>, it''s fine, you''re always worth the wait."'
+	'"Shit? Really?" You nod and he looks disheartened. After a moment he shrugs and throws you a grin. "Don''t worry about it <<$prostitute_names[$prostitution_location]>>, it''s fine, you''re always worth the wait."'
 	*nl
 	'"Thanks," you say and step away from the car.'+iif(prostitute['std_mod'] = 1 and mc_inventory['normal_condoms'] < 1 and mc_inventory['equipped_condoms'] < 1, ' 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.', '')
 

locations/prostitution_car_sex.qsrc

@@ -530,7 +530,7 @@ if $ARGS[0] = 'end':
 	else
 		'"Sure, why not, sweetie. I work here several times a week except on Sunday," you say.'
 		'"What''s your name?" He calls after you.'
-		'"<<$prostitute_names[$used_name]>>," you say before you ...'
+		'"<<$prostitute_names[$prostitution_location]>>," you say before you ...'
 	end
 
 	if prostitute['skip_end'] = 0:
@@ -582,7 +582,7 @@ if $ARGS[0] = 'regular_start':
 	cumnostd = 1
 	'<center><video autoplay loop src="images/shared/prostitution/car/regular/sex/start.mp4"></video></center>'
 	'You rub your hand over the hard bulge in his pants and smile seductively at him. "Let''s take care of this."'
-	'He groans and watches you opening his pants. "Yes, <<$prostitute_names[$used_name]>>. I have waited the whole week for this," he tells you while you take his semi-hard cock and rub it slowly with your hand.'
+	'He groans and watches you opening his pants. "Yes, <<$prostitute_names[$prostitution_location]>>. I have waited the whole week for this," he tells you while you take his semi-hard cock and rub it slowly with your hand.'
 	*nl
 	if $prostitute_client_condom = 'Yes':
 		gs 'prostitution_functions', 'remove_condom'
@@ -746,7 +746,7 @@ if $ARGS[0] = 'regular_anal':
 		*nl
 		prostitute_scene_rand = rand(1,10)
 		if prostitute_scene_rand < 5:
-			'"My wife never let me fuck her like this," he tells you clearly '+iif(prostitute_scene_rand < 3, 'annoyed by this. "I should have married a whore like you <<$prostitute_names[$used_name]>>."', 'proud about his wife. "She is a good woman, not a whore like you <<$prostitute_names[$used_name]>>."')
+			'"My wife never let me fuck her like this," he tells you clearly '+iif(prostitute_scene_rand < 3, 'annoyed by this. "I should have married a whore like you <<$prostitute_names[$prostitution_location]>>."', 'proud about his wife. "She is a good woman, not a whore like you <<$prostitute_names[$prostitution_location]>>."')
 		else
 			'"You''re a special one, you know that, right?" He asks you, but you are to busy '+iif(prostitute_scene_rand > 8, 'fucking him', 'getting fucked by him')+' to answer. "Most of those other bitches don''t do anal.'+iif(prostitute_scene_rand > 8, ' If you''re a whore, you''re a whore. They should learn their place in the world, just like you did."', '"')
 		end
@@ -851,7 +851,7 @@ if $ARGS[0] = 'regular_end_0':
 		'You chat with him for some time and he tells you a little bit about himself, his life and his problems. Listening, asking some questions and faking interest in their troubles has become an important part of your job, at least with your regulars. They come to you to reduce stress and that does sometimes mean more than fucking you.'
 		*nl
 		'He suddenly moves his head back to your tits and he plants several kisses on them. "What are you doing?" You laugh. "You can''t get enough of those? Do you?"'
-		'"No never, they are perfect," he grins and suddenly looks a bit more serious as he moves back. "<<$prostitute_names[$used_name]>>, can I kiss you?"'
+		'"No never, they are perfect," he grins and suddenly looks a bit more serious as he moves back. "<<$prostitute_names[$prostitution_location]>>, can I kiss you?"'
 		*nl
 		'You...'
 
@@ -880,7 +880,7 @@ if $ARGS[0] = 'regular_end_0':
 			if $prostitute['kiss'] ! 'yes': $prostitute['kiss'] = 'yes'
 			'<center><video autoplay loop src="images/shared/prostitution/car/regular/negotiation/end_p2.mp4"></video></center>'
 			'... kiss him. It''s a strangely sweet moment in a car next to a gas station after he has solicited you for sex.'
-			'"Thanks <<$prostitute_names[$used_name]>>," he says and he looks happy not sexually satisfied but truly happy.'
+			'"Thanks <<$prostitute_names[$prostitution_location]>>," he says and he looks happy not sexually satisfied but truly happy.'
 
 			gs 'arousal', 'kiss', 3, 'unknown'
 			gs 'arousal', 'end'
@@ -941,7 +941,7 @@ if $ARGS[0] = 'regular_end_1':
 	gs 'fame', 'city', 'prostitute', 2
 	gs 'stat'
 	'<center><video autoplay loop src="images/shared/prostitution/car/regular/negotiation/end_p3.mp4"></video></center>'
-	'"Bye <<$prostitute_names[$used_name]>>, I hope I''ll seeing you again," is the last thing he says to you as you step out of the car. You close the door behind you and step back onto the parking lot of the gas station.'+iif(hour < 23, ' Your shift still isn''t over.', '')
+	'"Bye <<$prostitute_names[$prostitution_location]>>, I hope I''ll seeing you again," is the last thing he says to you as you step out of the car. You close the door behind you and step back onto the parking lot of the gas station.'+iif(hour < 23, ' Your shift still isn''t over.', '')
 
 	killvar 'prostitute_scene_clit'
 	killvar 'prostitute_scene_lick'

locations/road_prostitution.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'work':
 
 	*clr & cla
 	$loc = 'road_prostitution'
-	$used_name = 'road'
+	$prostitution_location = 'road'
 	$loc_arg = 'work'
 	$menu_arg = 'work'
 	menu_off = 1
@@ -16,10 +16,10 @@ if $ARGS[0] = 'work':
 	gs 'prostitution_functions', 'parameters'
 
 	!! TODO: Make it a bit smarter, if Sveta has fake names set up for other locations, give her a reminder of those.
-	if $prostitute_names['road'] = '':
+	if $prostitute_names[$prostitution_location] = '':
 		'If you want, you can tell your clients a different name.'
-		$prostitute_names['road'] = input("What name do you want to tell your clients?  (Leave blank for  <<$pcs_nickname>>)")
-		if $prostitute_names['road'] = '': $prostitute_names['road'] = $pcs_nickname
+		$prostitute_names[$prostitution_location] = input("What name do you want to tell your clients?  (Leave blank for  <<$pcs_nickname>>)")
+		if $prostitute_names[$prostitution_location] = '': $prostitute_names[$prostitution_location] = $pcs_nickname
 	end
 
 	!! TODO: Should find some video that is more roadside - evening, morning, different weather, etc.