Merge remote-tracking branch 'Anjuna/master'

locations/gad_prostitutes.qsrc

@@ -267,22 +267,23 @@ if $ARGS[0] = 'work_alone':
 
 	gs 'shortgs', 'setloc', 'gad_prostitutes', 'work'
 	menu_off = 0
+	$used_name = 'gadukino'
 	gs 'stat'
 
 	gs 'prostitution_functions', 'parameters'
 
-	if $prostitute_names['gadukino'] = '':
+	if $prostitute_names[$used_name] = '':
 		'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[$used_name] = input("What name do you want to tell your clients? (Leave blank for <<$pcs_nickname>>)")
+		if $prostitute_names[$used_name] = '': $prostitute_names[$used_name] = $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/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: