Merge remote-tracking branch 'Netuttki/master'

locations/boy.qsrc

@@ -26,21 +26,37 @@ if $ARGS[0] = 'details':
 	!!appearance
 	boybodyrand = rand(1, 3)
 
-	if boybodyrand = 1: $boybody = 'tall'
-	if boybodyrand = 2: $boybody = 'average'
-	if boybodyrand = 3: $boybody = 'short'
+	if boybodyrand = 1: 
+		$boybody = 'tall'
+		$boybody_pref = 'a tall'
+	elseif boybodyrand = 2: 
+		$boybody = 'average'
+		$boybody_pref = 'an average'
+	elseif boybodyrand = 3: 
+		$boybody = 'short'
+		$boybody_pref = 'a short'
+	end
 
 	boybodrand = rand(1, 4)
 
-	if boybodrand = 1: $boybod = 'thin'
-	if boybodrand = 2: $boybod = 'athletic'
-	if boybodrand = 3: $boybod = 'chunky'
-	if boybodrand = 4: $boybod = 'fat'
-
+	if boybodrand = 1: 
+		$boybod = 'thin'
+		$boybod_pref = 'a thin'
+	elseif boybodrand = 2: 
+		$boybod = 'athletic'
+		$boybod_pref = 'an athletic'
+	elseif boybodrand = 3: 
+		$boybod = 'chunky'
+		$boybod_pref = 'a chunky'
+	elseif boybodrand = 4: 
+		$boybod = 'fat'
+		$boybod_pref = 'a fat'
+	end
+	
 	boyfacerand = rand(1, 3)
 
 	if boyfacerand = 1: $boyface = 'black'
-	if boyfacerand = 2: $boyface = 'brunette'
+	if boyfacerand = 2: $boyface = 'brown'
 	if boyfacerand = 3: $boyface = 'blond'
 
 	!!Variables responsible for any features like

locations/city_nightclub.qsrc

@@ -218,7 +218,7 @@ if $ARGS[0] = 'dance':
 					gs 'npcgeneratec', 0, '', rand(18,55), rand(3,4)
 					gs 'boystat', $npclastgenerated
 
-					'While you''re dancing, you feel someone groping your ass. You turn around and see a <<$boybod>>, <<$boyface>> haired guy of <<$boybody>> height. He''s <<$boyClo>>'
+					'While you''re dancing, you feel someone groping your ass. You turn around and see <<$boybody_pref>>, <<$boybod>> guy with <<$boyface>> hair. He''s <<$boyClo>>'
 
 					act 'Stop dancing':gt 'city_nightclub', 'inside'
 

locations/crossfit_north_girlmeet.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'start':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
-	'As you enter the crossfit box, you notice a girl of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair. 
+	'As you enter the crossfit box, you notice <<$boybody_pref>> girl with <<$boybod_pref>> body and <<$boyface>> hair. 
 	She is <<$boyClo>>'
 	'As she notices you, she greets you "Hi. My name is <<$boydesc>>. I heard you beat my old record, very impressive!"'
 	act 'Thank her':

locations/dateF.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 	!!1) Sveta in a school uniform
 	if PCloStyle2 = 4:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
-		'You notice a girl of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
+		'You notice <<$boybody_pref>> girl with <<$boybod_pref>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
 		'As she nears you, she presents herself; "Hi. My name is <<$boydesc>>. What are you doing here all by yourself?"'
 		act 'Greet her':
 			*clr & cla
@@ -94,7 +94,7 @@ if $ARGS[0] = 'start':
 	!!2) Gopnik Sveta
 	elseif gruptipe = 4:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
-		'You notice a girl of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
+		'You notice <<$boybody_pref>> girl with <<$boybod_pref>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
 		'As she nears you, you hear her say, "Hey baby, you seem like a girl that likes to have fun. What do you say, wanna hang out?"'
 		act 'Look at her':
 			*clr & cla
@@ -152,7 +152,7 @@ if $ARGS[0] = 'start':
 	!!3 - unattractive or average Sveta
 	elseif hotcat < 6:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
-		'You notice a girl of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
+		'You notice <<$boybody_pref>> girl with <<$boybod_pref>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
 		'As she nears you, she reaches out her hand for a handshake. "Hi. My name is <<$boydesc>>."'
 		act 'Refuse and walk away':
 			*clr & cla
@@ -199,7 +199,7 @@ if $ARGS[0] = 'start':
 		end 
 	else
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_generic/'+lover_picrand+'.jpg"></center>'
-		'You notice a girl of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
+		'You notice <<$boybody_pref>> girl with <<$boybod_pref>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
 		'She walks up to full of confidence, "Damn, baby, on a scale from 1 to 10, you''re an 11. How about a date?"'
 		act 'Excuse me?':
 			*clr & cla

locations/lug.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 		vnerand = RAND(0,300)
 		if vnerand <= pcs_apprnc:
 			gs'boy'
-			'<<$boybody>> <<$boybod>> <<$boyface>> comes up to you. He is wearing <<$boyClo>>'
+			'<<$REPLACE($boybody_pref, "a", "A")>>, <<$boybod>>, <<$boyface>> haired guy comes up to you. He is wearing <<$boyClo>>'
 			'The guy introduces himself as <<$boydesc>> and asks for your telephone number.'
 
 			act 'Tell him your number':

locations/park_walkevents.qsrc

@@ -786,7 +786,7 @@ if $ARGS[0] = '8':
 	if pcs_lover < 3 and vnerand <= pcs_apprnc:
 		*clr & cla
 		gs 'boy'
-		'A guy with <<$boybody>> <<$boybod>> <<$boyface>> approaches you. He''s wearing <<$boyClo>>.'
+		'A guy with <<$boybody_pref>>, <<$boybod>> body and <<$boyface>> hair approaches you. He''s wearing <<$boyClo>>.'
 		'The guy introduces himself as <<$boydesc>> and asks for your number.'
 
 		act 'Give him your number':

locations/pushkin_sq.qsrc

@@ -87,7 +87,7 @@ end
 
 if rand(0,100) >= 60 and pcs_lover < 3 and rand(0,1200) <= pcs_apprnc:
 	gs 'boy'
-	'To you came <<$boybody>> <<$boybod>> <<$boyface>>. It <<$boyClo>>'
+	'You are approached by <<$boybody_pref>>, <<$boybod>> guy with <<$boyface>> hair. He is <<$boyClo>>'
 	'The guy introduced himself as <<$boydesc>> and asks you for your telephone number.'
 
 	act 'Walk away': gt 'pushkin_sq'