Merge remote-tracking branch 'Anjuna/master'

locations/din_van.qsrc

@@ -213,7 +213,7 @@ if $ARGS[0] = 'shower':
 
 		if vanr_lock = 0 and $loc = 'vanrPar':
 			*nl
-			'In your absentmindedness, you have forgotton to close the door.'
+			'In your absentmindedness, you have forgotten to close the door.'
 			'The idea that the door is open occupies your mind while you are showering. It would be very embarrassing if your brother or stepfather looked in at the wrong time.'
 			if locat['Fam_inGad'] = 0: gs 'vanrPar', 'peek'
 		end

locations/foto.qsrc

@@ -1,17 +1,12 @@
 # foto
 !!2021/04/15
 if $ARGS[0] = 'start':
-	$loc = 'foto'
-	$loc_arg = 'start'
-
+	*clr & cla
 	close all
+	menu_off = 0
+	gs 'shortgs', 'setloc', 'foto', 'start'
 	$location_type = 'indoors'
 	if model['status'] = 0:gt 'foto', 'studio'
-	*clr & cla
-
-	$menu_loc = 'foto'
-	$menu_arg = 'start'
-	menu_off = 0
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	if studio_strip = 0:
@@ -24,7 +19,7 @@ if $ARGS[0] = 'start':
 	foto['documentary'] = rand(1,100)
 	act 'Leave': gt'city_center'
 	act'Strip down':
-		cla & *clr
+		*clr & cla
 		menu_off = 1
 		'<center><video autoplay loop src="images/locations/city/citycenter/photo/fullstrip.mp4"></video></center>'
 		studio_strip += 1
@@ -94,7 +89,7 @@ if $ARGS[0] = 'start':
 				lastwornpantynumber['foto'] = pantywornnumber
 				$lastwornbratype['foto'] = $braworntype
 				lastwornbranumber['foto'] = brawornnumber
-				cla & *clr
+				*clr & cla
 				menu_off = 1
 				inhib_exp += 2
 				if studio_strip_talk = 0:
@@ -129,7 +124,7 @@ if $ARGS[0] = 'start':
 					lastwornbranumber['foto'] = brawornnumber
 				end
 				gs 'stat'
-				cla & *clr
+				*clr & cla
 				menu_off = 1
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip3.mp4"></video></center>'
 				inhib_exp += 1
@@ -170,14 +165,14 @@ end
 if $ARGS[0] = 'studio':
 	if hour < 3:gt 'foto', 'studio_closing'
 
-	$loc_arg = 'studio'
-	$menu_loc = 'foto'
-	$menu_arg = 'studio'
+	*clr & cla
 	menu_off = 0
+	gs 'shortgs', 'setloc', 'foto', 'studio'
+	$location_type = 'indoors'
 	practice_session = 0
-	*clr & cla
 	killvar '$modelopt'
 
+
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
@@ -313,14 +308,11 @@ if $ARGS[0] = 'studio':
 end
 
 if $ARGS[0] = 'bathroom':
-	$loc_arg = 'bathroom'
-	$menu_loc = 'foto'
-	$menu_arg = 'bathroom'
-	$locM = 'foto'
-	$locM_arg = 'bathroom'
+	*clr & cla
 	menu_off = 0
-	gs'stat'
-	cla & *clr
+	gs 'shortgs', 'setloc', 'foto', 'bathroom'
+	$location_type = 'bathroom'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models<<rand(1,2)>>.jpg"></center>'
 	'A gaggle of models crowd the <a href="exec:gt ''mirror'',''start''">mirrors</a> and sinks, loudly chatting, giggling, and generally gossiping about life in the city and the studio.'
 	*nl
@@ -341,34 +333,36 @@ if $ARGS[0] = 'bathroom':
 		end
 	end
 	if AlexandriaQW = 1:
-	    act'Listen to the gossip':
-	        *clr & cla
+		act'Listen to the gossip':
+			*clr & cla
 			AlexandriaQW = 2
 			gs 'stat'
-           	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models.jpg"></center>'
-            'You are trying to find the "McGuffin" that Tatiana told you was somewhere in the agency and that was cursing the place, but you haven''t had much luck... until now. You feel a magic tingle and snoop on an interesting titbit.'
-            '"Oh my god! You need to meet this girl! She is an incredible mass... massa... masse... Damn! She is good with her hands!"'
-            '"Sorry, I don''t swing that way. Well... except on my boyfriend''s birthday."'
-            '"Huh?! No! Well... maybe? I mean that she can help you with your boob pains!"'
-            '"You mean my BACK pains? Are you feeling alright? You sound a little off today."'
-            '"What? Yes! I''m feeling great! You <i>must</i> meet her! She''s a redhead named Tatiana! She hangs out back there, in the room where we store the... umm... the things that we use for the shoots!"'
-            '"You mean the props room?"'
-            'Okay, that''s a clue! Maybe you should search the props room?'
-            act 'Continue': gt 'foto', 'bathroom'
-        end
-    else
-	    act 'Listen to the gossip': gt 'foto_models', 'model_chatter'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models.jpg"></center>'
+			'You are trying to find the "McGuffin" that Tatiana told you was somewhere in the agency and that was cursing the place, but you haven''t had much luck... until now. You feel a magic tingle and snoop on an interesting titbit.'
+			'"Oh my god! You need to meet this girl! She is an incredible mass... massa... masse... Damn! She is good with her hands!"'
+			'"Sorry, I don''t swing that way. Well... except on my boyfriend''s birthday."'
+			'"Huh?! No! Well... maybe? I mean that she can help you with your boob pains!"'
+			'"You mean my BACK pains? Are you feeling alright? You sound a little off today."'
+			'"What? Yes! I''m feeling great! You <i>must</i> meet her! She''s a redhead named Tatiana! She hangs out back there, in the room where we store the... umm... the things that we use for the shoots!"'
+			'"You mean the props room?"'
+			'Okay, that''s a clue! Maybe you should search the props room?'
+			act 'Continue': gt 'foto', 'bathroom'
+		end
+	else
+		act 'Listen to the gossip': gt 'foto_models', 'model_chatter'
 	end
 	if AlexandriaQW = 2:
-	    act'Search the props'' room':gt 'tatiana_missions', 'mission2A'
+		act'Search the props'' room':gt 'tatiana_missions', 'mission2A'
 	end
 end
 
 if $ARGS[0] = 'showers':
-	$loc_arg = 'showers'
-	gs'stat'
-	cla & *clr
+	*clr & cla
 	menu_off = 1
+	gs 'shortgs', 'setloc', 'foto', 'showers'
+	$location_type = 'bathroom'
+	gs 'stat'
+
 	krystal['shower_sex'] = rand(1,7)
 	if krystal['shower_sex'] = 7 and krystal['status'] >= 3:gt 'model_krystal','krystalshower'
 
@@ -380,10 +374,11 @@ if $ARGS[0] = 'showers':
 
 	act 'Go to the studio floor':pcs_shave['free_razor'] = 0 & gt 'foto', 'studio'
 
-	if mc_inventory['shampoo'] > 0:
+	if mc_inventory['shampoo'] <= 0:
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	else
 		act 'Take a shower (0:15)':
-			cla
-			*clr
+			*clr & cla
 			minut += 15
 			pcs_horny += 1
 			pcs_hairbsh = 0
@@ -395,8 +390,7 @@ if $ARGS[0] = 'showers':
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 			if pcs_horny >= 40:
 				act 'Use the showerhead on your pussy':
-					cla
-					*clr
+					*clr & cla
 					$orgasm_or = 'no'
 					gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
 					$orgasm_or = 'no'
@@ -455,8 +449,6 @@ if $ARGS[0] = 'showers':
 			dynamic $brit
 			act 'Get out of the shower':gt 'foto', 'showers'
 		end
-	else
-		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 	'<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	if mesec > 0 and isprok = 0:
@@ -493,14 +485,11 @@ if $ARGS[0] = 'showers':
 end
 
 if $ARGS[0] = 'makeup':
-	gs'stat'
 	*clr & cla
-	$locM = 'foto'
-	$locM_arg = 'makeup'
-	$loc_arg = 'makeup'
-	$menu_loc = 'foto'
-	$menu_arg = 'makeup'
 	menu_off = 0
+	gs 'shortgs', 'setloc', 'foto', 'makeup'
+	$location_type = 'indoors'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 	'The backstage area where you and the other girls put on your makeup.'
 	act 'Back to the studio': gt 'foto', 'studio'
@@ -521,7 +510,7 @@ if $ARGS[0] = 'makeup':
 		act'Do your own makeup': menu_off = 1 & gt 'mirror', 'start'
 
 		act'Go to the makeup artists (0:30)':
-			cla & *clr
+			*clr & cla
 			menu_off = 1
 			minut += 30
 			pcs_hairbsh = 1
@@ -552,7 +541,10 @@ end
 
 
 if $ARGS[0] = 'manager_talk':
+	*clr & cla
+	menu_off = 1
 	minut += 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'You approach the manager''s desk.'
 	'"Something I can help you with <<$model[''firstname'']>>?"'
@@ -627,7 +619,7 @@ end
 
 if $ARGS[0] = 'hiring_ask':
 	act 'Ask about working as a glamor model':
-		cla & *clr
+		*clr & cla
 		menu_off = 1
 		minut += 1
 		gs 'stat'
@@ -713,7 +705,7 @@ if $ARGS[0] = 'hiring_ask':
 end
 
 if $ARGS[0] = 'interview':
-	cla & *clr
+	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	if anushkaQW['model_referral'] = 1:	'You walk up to the front desk and say Anushka sent you. You only have to wait a few minutes before somebody arrives to interview you.'
@@ -739,7 +731,7 @@ if $ARGS[0] = 'interview':
 end
 
 if $ARGS[0] = 'interview2':
-	cla & *clr
+	*clr & cla
 	menu_off = 1
 	if pcs_inhib > 40:
 		gs 'willpower', 'skill', 'pcs_inhib', 'easy'
@@ -889,7 +881,7 @@ if $ARGS[0] = 'job_decline':
 	if foto_weight >= 25:
 		'"I''m sorry," he says shaking his head. "You did lose weight, I''ll give you that, but it''s not quite enough for our requirements. But you''ve made progress. Give it a few more weeks of effort and come back again. We can still use you if you''re within the limit."'
 		act'Sigh':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'You sigh in disappointment as you pick your clothes back up and start to get dressed again. Still more weight to lose? Now what are you going to do? Keep trying or give up?'
 			gs 'clothing', 'wear_last_worn'
@@ -902,7 +894,7 @@ if $ARGS[0] = 'job_decline':
 		'The man''s words sting heavily at your confidence and you cover yourself in shame by instinct. He still continues to eye you up and down and you squirm as his gaze roams your breasts, stomach, and pussy.'
 		'"That being said, I can still see that you have some potential. So go running, start working out. If you lose some weight, I could see you getting another shot at working here in the future."'
 		act'React solemnly':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'You glumly pick your clothes up off the floor and get dressed before leaving. As you do, you stop at the door and look back in.'
 			'<i>Is this it for me? Am I ever going to be able to lose enough weight to work here?</i>'
@@ -915,7 +907,7 @@ if $ARGS[0] = 'job_decline':
 		end
 
 		act'React determinedly':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'You nod at him, feeling a bit dejected but more determined than ever. You get dressed with purpose and head to the door. As you do, you think to yourself...'
 			'<i>I will be able to do this! I''ll get in shape and I''ll work here one day! I''m not going to lose my shot at this!</i>'
@@ -1029,7 +1021,7 @@ if $ARGS[0] = 'job_offer':
 	elseif age_truth = 1:
 		if fotofit ! 1:
 			act '"Oh. Okay..."':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 				'You put your clothes back on, slightly annoyed as you get ready to leave. If he knew you were underage, why did he have you strip in the first place?!'
 				gs 'clothing', 'wear_last_worn'
@@ -1040,7 +1032,7 @@ if $ARGS[0] = 'job_offer':
 		end
 
 		act 'Plead':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			fakepassport = 2
 			fotofakepassport = 2
@@ -1150,7 +1142,7 @@ end
 
 
 if $ARGS[0] = 'model_name1':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'"A few more things to fill out your profile. Did you want to have a model name or a pseudonym? Or would you prefer to use your real name?"'
 	gs 'foto', 'model_name2'
@@ -1171,7 +1163,7 @@ if $ARGS[0] = 'model_name2':
 
 	if model['ask_model_name'] = 0:
 		act'Why would I?':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'"Why would I want to use a fake name?" you ask. "Is there a reason I should?"'
 			'"Not <i>should</i>," he explains. "But some girls like to have a little distance from their personal lives. Or they use it to sound more professional or to stand out more. A name like ''Elena Ivanova'' isn''t exactly uncommon."'
@@ -1184,7 +1176,7 @@ if $ARGS[0] = 'model_name3':
 	$model['firstname'] = input("What is the first name of your model persona?")
 	$model['nickname'] = input("What is the shortened version or nickname of your model persona?")
 	$model['lastname'] = input("What is the last name of your model persona?")
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'"<<$model[''firstname'']>>..." he mutters, slowly typing. "<<$model[''lastname'']>>... Okay, there. Is this correct?"'
 	'He turns the screen around so you can see what he wrote.'
@@ -1224,7 +1216,7 @@ if $ARGS[0] = 'model_profile':
 end
 
 if $ARGS[0] = 'pay_type':
-	cla & *clr
+	*clr & cla
 	'<center><b><font color="maroon">Photographer</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'"One last question. How do you want to be paid? Cash on the spot or direct deposit into your bank account?"'
@@ -1349,8 +1341,7 @@ if $ARGS[0] = 'microcamera_ask':
 end
 
 if $ARGS[0] = 'blackm':
-	*clr
-	cla
+	*clr & cla
 	menu_off = 1
 	gs 'stat'
 
@@ -1494,19 +1485,19 @@ if $ARGS[0] = 'underwear':
 end
 
 if $ARGS[0] = 'cikl':
-	if modelfoto['erotic']  >= 10 or (modelfoto['erotic'] > modelfoto['fashion']  and modelfoto['erotic']  > modelfoto['fitness']  and modelfoto['erotic']  > modelfoto['glamour']  and modelfoto['erotic']  > modelfoto['lingerie']  and modelfoto['erotic']  > modelfoto['catalog'] and modelfoto['erotic'] > modelfoto['nude']):
+	if modelfoto['erotic'] >= 10 or (modelfoto['erotic'] > modelfoto['fashion'] and modelfoto['erotic'] > modelfoto['fitness'] and modelfoto['erotic'] > modelfoto['glamour'] and modelfoto['erotic'] > modelfoto['lingerie'] and modelfoto['erotic'] > modelfoto['catalog'] and modelfoto['erotic'] > modelfoto['nude']):
 		$model['type'] = 'erotic'
-	elseif modelfoto['nude']  > modelfoto['fashion']  and modelfoto['nude']  > modelfoto['fitness']  and modelfoto['nude']  > modelfoto['glamour']  and modelfoto['nude']  > modelfoto['lingerie']  and modelfoto['nude']  > modelfoto['catalog'] :
+	elseif modelfoto['nude'] > modelfoto['fashion'] and modelfoto['nude'] > modelfoto['fitness'] and modelfoto['nude'] > modelfoto['glamour'] and modelfoto['nude'] > modelfoto['lingerie'] and modelfoto['nude'] > modelfoto['catalog'] :
 		$model['type'] = 'artistic nude'
-	elseif modelfoto['fitness']  > modelfoto['fashion']  and modelfoto['fitness']  > modelfoto['nude']  and modelfoto['fitness']  > modelfoto['glamour']  and modelfoto['fitness']  > modelfoto['lingerie']  and modelfoto['fitness']  > modelfoto['catalog'] :
+	elseif modelfoto['fitness'] > modelfoto['fashion'] and modelfoto['fitness'] > modelfoto['nude'] and modelfoto['fitness'] > modelfoto['glamour'] and modelfoto['fitness'] > modelfoto['lingerie'] and modelfoto['fitness'] > modelfoto['catalog'] :
 		$model['type'] = 'fitness'
-	elseif modelfoto['glamour']  > modelfoto['fashion']  and modelfoto['glamour']  > modelfoto['nude']  and modelfoto['glamour']  > modelfoto['fitness']  and modelfoto['glamour']  > modelfoto['lingerie']  and modelfoto['glamour']  > modelfoto['catalog'] :
+	elseif modelfoto['glamour'] > modelfoto['fashion'] and modelfoto['glamour'] > modelfoto['nude'] and modelfoto['glamour'] > modelfoto['fitness'] and modelfoto['glamour'] > modelfoto['lingerie'] and modelfoto['glamour'] > modelfoto['catalog'] :
 		$model['type'] = 'glamour'
-	elseif modelfoto['lingerie']  > modelfoto['fashion']  and modelfoto['lingerie']  > modelfoto['nude']  and modelfoto['lingerie']  > modelfoto['fitness']  and modelfoto['lingerie']  > modelfoto['glamour']  and modelfoto['lingerie']  > modelfoto['catalog'] :
+	elseif modelfoto['lingerie'] > modelfoto['fashion'] and modelfoto['lingerie'] > modelfoto['nude'] and modelfoto['lingerie'] > modelfoto['fitness'] and modelfoto['lingerie'] > modelfoto['glamour'] and modelfoto['lingerie'] > modelfoto['catalog'] :
 		$model['type'] = 'lingerie'
-	elseif modelfoto['fashion']  > modelfoto['lingerie']  and modelfoto['fashion']  > modelfoto['nude']  and modelfoto['fashion']  > modelfoto['fitness']  and modelfoto['fashion']  > modelfoto['glamour']  and modelfoto['fashion']  > modelfoto['catalog'] :
+	elseif modelfoto['fashion'] > modelfoto['lingerie'] and modelfoto['fashion'] > modelfoto['nude'] and modelfoto['fashion'] > modelfoto['fitness'] and modelfoto['fashion'] > modelfoto['glamour'] and modelfoto['fashion'] > modelfoto['catalog'] :
 		$model['type'] = 'fashion'
-	elseif modelfoto['catalog']  > 0:
+	elseif modelfoto['catalog'] > 0:
 		$model['type'] = 'catalog'
 	end
 !!	if model = 1 and week = 1 and model['job_reset'] ! daystart: model_job_week = 0 & model['job_reset'] = daystart

locations/gschool_detention.qsrc

@@ -279,7 +279,7 @@ if $ARGS[0] = 'upskirt1':
 	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
-	'You are sitting at a table, bored out of your mind and waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting at a table across from you. After a few minutes she leans back in her chair and relaxes, spreading her legs slightly as she does. The movement draws your eyes and you are given an eye full. She seems to have forgotton her panties today because her pussy is now on full display for anyone to see.'
+	'You are sitting at a table, bored out of your mind and waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting at a table across from you. After a few minutes she leans back in her chair and relaxes, spreading her legs slightly as she does. The movement draws your eyes and you are given an eye full. She seems to have forgotten her panties today because her pussy is now on full display for anyone to see.'
 	gs 'arousal', 'erotic', 5
 	gs 'arousal', 'end'
 	gs 'stat'

locations/intro_sg_tg.qsrc

@@ -119,12 +119,16 @@ if $ARGS[0] = 'intro_4':
 	'You did the best you could to repress any resentment towards <<$pcs_nickname>> about how little she appreciated what she had.'
 
 	act 'When she talks about her mother, she calls her ...':
-
-		$npc_nickname['A29'] = '<<$npc_nickname[''A29'']>>'
-		$temp_nickname = $npc_nickname['A29']
-
-		$npc_nickname['A29'] = input('<center>What name does she use to address her mother?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
-		if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
+		gs 'npcstatic1'
+		gs 'npcstatic2'
+		gs 'npcstatic3'
+		gs 'npcstatic4'
+		gs 'npcstatic5'
+		gs 'npcstatic6'
+
+		$temp_nickname = input('<center>What name does she use to address her mother?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
+		if $temp_nickname = '': $temp_nickname = $npc_nickname['A29']
+		$npc_nickname['A29'] = $temp_nickname
 		killvar '$temp_nickname'
 
 		gt 'intro_sg_tg', 'intro_5'
@@ -167,13 +171,6 @@ if $ARGS[0] = 'settings':
 
 	ml_update_1 = 1
 
-	gs 'npcstatic1'
-	gs 'npcstatic2'
-	gs 'npcstatic3'
-	gs 'npcstatic4'
-	gs 'npcstatic5'
-	gs 'npcstatic6'
-
 	!! default friendship is 30 for all  npcs
 	gs 'npc_relationship', 'default'
 	!! changes the values for family members and old friends

locations/npcgeneratec.qsrc

@@ -4,8 +4,9 @@
 !! You can also set their approx. home location
 !! All data produced is random so if you need a specific value you will have to overwrite it
 
+if $ARGS[0] = '' or isnum($ARGS[0]):
+	if $ARGS[0] ! '': ARGS[0] = val($ARGS[0])
 
-if $ARGS[0] = '':
 	!! npcgen_lastrun is a flag to help track whether npcgeneratec or npcpreservec has been run last
 	!! npcgeneratec is 1
 	!! npcpreservec is 2

locations/pav_hotelReception.qsrc

@@ -586,9 +586,10 @@ if $ARGS[0] = 'pavgenprosmf':
 	pavproscount += 1
 	guy += 1
 	gs 'fame', 'pav', 'prostitute', rand(2,4)
-	gs'stat'
-	gs 'npcgeneratec', '0', '', rand(18,40)
+	gs 'stat'
+	gs 'npcgeneratec', 0, '', rand(18,40)
 	gs 'boyStat', $npclastgenerated
+
 	'The customer introduces himself as <<$boydesc>>.'
 	'Then you both get undressed and you start doing your job.'
 	picrand = rand(0, 14)

locations/phone_selfies.qsrc

@@ -238,7 +238,7 @@ if $ARGS[0] = 'open_camera':
 	!! Flashing selfie
 	if $clothingworntype ! 'nude' and $phone_loc <> '':
 		if Enable_Android = 1:
-			locIndex = arrpos('$selfieLoc', $phone_loc,1)
+			locIndex = arrpos('$selfieLoc', $phone_loc, 1)
 		else
 			locIndex = arrpos(1, '$selfieLoc', $phone_loc)
 		end

locations/zoomagazine.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'start':
 				gt 'city_mall'
 			end
 			act 'Show your body':
-				gs 'npcgeneratec', '0'
+				gs 'npcgeneratec', 0
 				gs 'boyStat', $npclastgenerated
 				cla & *clr
 				minut += 5