Explorar o código

[fixed/changed] the various boy/girlf friends variables should hopefully now be stored correctly!

anjuna krokus hai 5 meses
pai
achega
3c4875f0d4

+ 78 - 51
locations/boy.qsrc

@@ -14,16 +14,35 @@ end
 if $ARGS[0] = 'details':
 	!Select Photos
 
-:boydetailsloop
-	lover_picrand =  RAND(1,30)
-	if lover_picrand = lover_picture[0] or lover_picrand = lover_picture[1] or lover_picrand = lover_picture[2]: jump 'boydetailsloop'
-
-	loverGenderTmp = 0
+	loverGenderTmp = npc_gender[$npclastgenerated]
 	silaVag = npc_sexskill[$npclastgenerated]
 	$npc_usedname[$npclastgenerated] = $npc_firstname[$npclastgenerated]
 	$boydesc = $npc_usedname[$npclastgenerated]
 
+	hairBoy = npc_haircol[$npclastgenerated]
+	titBoy = npc_bust[$npclastgenerated]
+	vneshBoy = npc_apprnc[$npclastgenerated]
+
 	!!appearance
+	gs 'boy', 'set_boybody'
+
+	!!Variables responsible for any features like
+	!!security, is responsible for the money and requirements
+	gs 'boy', 'set_finance'
+
+	gs 'boy', 'set_preferences'
+end
+
+! set_unique_pic is depricated
+if $ARGS[0] = 'set_unique_pic':
+	!! boys 1-30, girlfriends 31-60
+	:boydetailsloop
+		lover_picrand[$npclastgenerated] =  rand(1, 30)
+	if lover_picrand[$npclastgenerated] = lover_picture[0] or lover_picrand[$npclastgenerated] = lover_picture[1] or lover_picrand[$npclastgenerated] = lover_picture[2]: jump 'boydetailsloop'
+end
+
+
+if $ARGS[0] = 'set_boybody':
 	boybodyrand = rand(1, 3)
 
 	if boybodyrand = 1: 
@@ -54,63 +73,71 @@ if $ARGS[0] = 'details':
 	end
 	
 	boyfacerand = rand(1, 3)
+	if boyfacerand = 1: 
+		$boyface = 'black'
+	elseif boyfacerand = 2:
+		$boyface = 'brown'
+	else 
+		$boyface = 'blond'
+	end
+end
 
-	if boyfacerand = 1: $boyface = 'black'
-	if boyfacerand = 2: $boyface = 'brown'
-	if boyfacerand = 3: $boyface = 'blond'
-
-	!!Variables responsible for any features like
-	!!security, is responsible for the money and requirements
+if $ARGS[0] = 'set_finance':
 	harakBoy = rand(0, 2)
-	finance = rand(0, 2)
+	finance = npc_finance[$npclastgenerated]
 
-	if finance = 0:
+	if npc_finance[$npclastgenerated] = 0:
 		!!Gopnik beggar or a hard worker
 		!!check in appearance Primary
-		if harakBoy = 0: npc_apprnc[$npclastgenerated] = rand(0, 8)
-		if harakBoy = 1: npc_apprnc[$npclastgenerated] = rand(0, 16)
-		if harakBoy = 2: npc_apprnc[$npclastgenerated] = rand(0, 32)
+		if harakBoy = 0:
+			npc_apprnc[$npclastgenerated] = rand(0, 8)
+		elseif harakBoy = 1:
+			npc_apprnc[$npclastgenerated] = rand(0, 16)
+		else 
+			npc_apprnc[$npclastgenerated] = rand(0, 32)
+		end
 
 		$boyClo = 'wearing a tracksuit.'
-	elseif finance = 1:
+	elseif npc_finance[$npclastgenerated] = 1:
 		!!middle_peasant
 		!!check in appearance
-		if harakBoy = 0: npc_apprnc[$npclastgenerated] = rand(0, 16)
-		if harakBoy = 1: npc_apprnc[$npclastgenerated] = rand(0, 24)
-		if harakBoy = 2: npc_apprnc[$npclastgenerated] = rand(0, 32)
+		if harakBoy = 0:
+			npc_apprnc[$npclastgenerated] = rand(0, 16)
+		elseif harakBoy = 1:
+			npc_apprnc[$npclastgenerated] = rand(0, 24)
+		else
+			npc_apprnc[$npclastgenerated] = rand(0, 32)
+		end
 
 		$boyClo = 'wearing jeans and a sweater.'
-	elseif finance = 2:
+	elseif npc_finance[$npclastgenerated] = 2:
 		!!middle_peasant
 		!!check in appearance
-		if harakBoy = 0: npc_apprnc[$npclastgenerated] = rand(16, 32)
-		if harakBoy = 1: npc_apprnc[$npclastgenerated] = rand(24, 32)
-		if harakBoy = 2: npc_apprnc[$npclastgenerated] = rand(32, 40)
+		if harakBoy = 0:
+			npc_apprnc[$npclastgenerated] = rand(16, 32)
+		elseif harakBoy = 1:
+			npc_apprnc[$npclastgenerated] = rand(24, 32)
+		else
+			npc_apprnc[$npclastgenerated] = rand(32, 40)
+		end
 
 		$boyClo = 'wearing an expensive suit.'
 	end
+end
 
+
+if $ARGS[0] = 'set_preferences':
 	!!requirements of the figure, chest size, hair color.
 	!!0 - ass less 80, 1 back from 80 prior_to 100, 2 ass over 100
 	figurBoy = rand(0, 2)
-	!!0 set here as they are boys
-	npc_bust[$npclastgenerated] = 0
-	!!0 - black, 1 - brown, 2 - Redhead, 3 - blonde
-	npc_haircol[$npclastgenerated] = rand(0, 3)
-	!!character 0 - soft, 1 -norm 2 - aggressor
+
+	!character 0 - soft, 1 - norm,  2 - aggressor
 	if rand(0, 100) < 80:
 		izvrat = 0
 	else
 		izvrat = 1
 	end
 
-
-
-	hairBoy = npc_haircol[$npclastgenerated]
-	titBoy = npc_bust[$npclastgenerated]
-	vneshBoy = npc_apprnc[$npclastgenerated]
-
-
 	!! trying to make the preference section 
 	!! Variables here are clotTypePrefTmp, clotQualPrefTmp, clotTopPrefTmp, bottShorPrefTmp, clotThinPrefTmp, bimbPrefTmp, pierPrefTmp, tattPrefTmp, lipsPrefTmp, bodyPrefTmp, makePrefTmp, IQPrefTmp.
 
@@ -120,15 +147,15 @@ if $ARGS[0] = 'details':
 	!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - fetish.
 	clotTypePrefTmp = 0
 	if rand(0, 4) = 4:
-		if finance = 0:
+		if npc_finance[$npclastgenerated] = 0:
 			clotTypePrefTmp = rand(1,2)
-			if rand(0, 1) = 1 and izvrat = 1:clotTypePrefTmp = 4
-		elseif finance = 1:
+			if rand(0, 1) = 1 and izvrat = 1: clotTypePrefTmp = 4
+		elseif npc_finance[$npclastgenerated] = 1:
 			clotTypePrefTmp = rand(1,3)
-			if rand(0, 2) = 2 and izvrat = 1:clotTypePrefTmp = 4
-		elseif finance = 2:
+			if rand(0, 2) = 2 and izvrat = 1: clotTypePrefTmp = 4
+		elseif npc_finance[$npclastgenerated] = 2:
 			clotTypePrefTmp = rand(2,3)
-			if rand(0, 1) = 1 and izvrat = 1:clotTypePrefTmp = 4
+			if rand(0, 1) = 1 and izvrat = 1: clotTypePrefTmp = 4
 		end
 	end
 
@@ -137,9 +164,9 @@ if $ARGS[0] = 'details':
 	!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if fetish is chosen)
 	clotQualPrefTmp = 0
 	if rand(0, 5) = 5:
-		if finance = 0:
+		if npc_finance[$npclastgenerated] = 0:
 			clotQualPrefTmp = 1
-		elseif finance = 1:
+		elseif npc_finance[$npclastgenerated] = 1:
 			clotQualPrefTmp = rand(1, 2)
 			randchan = rand(0, 1)
 			if randchan = 0 and clotTypePrefTmp ! 3:
@@ -147,7 +174,7 @@ if $ARGS[0] = 'details':
 			elseif randchan = 1 and clotTypePrefTmp ! 1:
 				clotQualPrefTmp = 2
 			end
-		elseif finance = 2:
+		elseif npc_finance[$npclastgenerated] = 2:
 			randchan = rand(0, 2)
 			if randchan = 2 and clotTypePrefTmp ! 1:
 				clotQualPrefTmp = 2
@@ -160,14 +187,14 @@ if $ARGS[0] = 'details':
 
 	!!Need to add modifiers based on breast size, where larger breasts end up forcing the player to show more cleavage than those with smaller breasts.
 	!! 0 - no preference, 1 - 1 to 2 or neckline to moderate, 2 - 3 to 4 or heavy to severe, 3 - 5 to 7 or buldging to outpouring 
-	!! The breast size must be adjusted either when the action is being calculeted or we can base it on their ideal breast size :titBoy + 0/3 depending on the players breast size
+	!! The breast size must be adjusted either when the action is being calculeted or we can base it on their ideal breast size :npc_bust[$npclastgenerated] + 0/3 depending on the players breast size
 
 
 	!!0 - no preference, 1 - 1 neckline , 2 - 2 or moderate, 3 - 3 to 4 or heavy to severe
 	!! It doesn''t matter if your poor or rich, everyone loves tits.
 
 	slutConstant = 0
-	if rand(0, 1) = 1 and izvrat = 1:slutConstant = 1
+	if rand(0, 1) = 1 and izvrat = 1: slutConstant = 1
 
 
 	clotTopPrefTmp = 0
@@ -180,7 +207,7 @@ if $ARGS[0] = 'details':
 		elseif randchan = 2 and clotTypePrefTmp ! 3:
 			clotTopPrefTmp = 3
 		end
-		if clotTopPrefTmp ! 0 and titBoy = 2:
+		if clotTopPrefTmp ! 0 and titnpc_bust[$npclastgenerated] = 2:
 			if clotPref ! 3:
 				clotTopPrefTmp += 1
 			end
@@ -200,8 +227,7 @@ if $ARGS[0] = 'details':
 		elseif randchan = 2:
 			bottShorPrefTmp = 3
 		end
-		randchan = rand(0, 1)
-		if slutConstant = 1 and randchan = 1 and clotTypePrefTmp = 4:
+		if slutConstant = 1 and rand(0, 1) = 1 and clotTypePrefTmp = 4:
 			bottShorPrefTmp = 3
 		end
 	end
@@ -292,10 +318,11 @@ if $ARGS[0] = 'details':
 	!!0 - no preference, 1 - 1 to 30 intelligence, 2 - 30 to 85 intelligence, 3 - 85 + intelligence. 
 
 	IQPrefTmp = 0
-	if rand(0, 4) = 4:IQPrefTmp = rand(1, 3) 
+	if rand(0, 4) = 4: IQPrefTmp = rand(1, 3)
 
 	killvar 'randchan'
 end
 
+
 --- boy ---------------------------------
 

+ 9 - 1
locations/dateF.qsrc

@@ -16,8 +16,16 @@ if $ARGS[0] = 'start':
 	!! generate a girlfriend
 	menu_off = 1
 	$location_type = 'event_outdoors'
-	gs 'girl'
 	*clr & cla
+	!! generate a girl
+	if $region = 'pav':
+		gs 'npcgeneratec', 1, '', rand(18,45), 1
+	elseif $region = 'city':
+		gs 'npcgeneratec', 1, '', rand(18,45), rand(3,4)
+	end
+	gs 'boyStat', $npclastgenerated
+	gs 'girl', 'details'
+
 	act 'Ignore her and hurry away':gt $loc, $loc_arg
 	!!1) Sveta in a school uniform
 	if PCloStyle2 = 4:

+ 2 - 0
locations/dateM.qsrc

@@ -23,6 +23,8 @@ if $ARGS[0] = 'start':
 		gs 'npcgeneratec', 0, '', rand(18,45), rand(3,4)
 	end
 	gs 'boyStat', $npclastgenerated
+	gs 'boy', 'details'
+
 	act 'Ignore him and hurry away':gt $loc, $loc_arg
 !!1) Sveta in a school uniform
 	if PCloStyle2 = 4:

+ 97 - 53
locations/girl.qsrc

@@ -18,76 +18,125 @@ end
 if $ARGS[0] = 'details':
 	!Select Photos
 
-:girldetailsloop
-	!! boys 1-30, girlfriends 31-60
-	lover_picrand =  RAND(31,60)
-	if lover_picrand = lover_picture[0] or lover_picrand = lover_picture[1] or lover_picrand = lover_picture[2]: jump 'girldetailsloop'
-
-	loverGenderTmp = 1
-	npc_gender[$npclastgenerated] = 1
+	loverGenderTmp = npc_gender[$npclastgenerated]
 	silaVag = npc_sexskill[$npclastgenerated]
 	$npc_usedname[$npclastgenerated] = $npc_firstname[$npclastgenerated]
 	$boydesc = $npc_usedname[$npclastgenerated]
 
+	hairboy = npc_haircol[$npclastgenerated]
+	titboy = npc_bust[$npclastgenerated]
+	vneshboy = npc_apprnc[$npclastgenerated]
+
 	!!appearance
+	gs 'girl', 'set_boybody'
+
+	!!Variables responsible for any features like
+	!!security, is responsible for the money and requirements
+	gs 'girl', 'set_finance'
+
+	gs 'girl', 'set_preferences'
+end
+
+! set_unique_pic is depricated
+if $ARGS[0] = 'set_unique_pic':
+	!! boys 1-30, girlfriends 31-60
+	:girldetailsloop
+		lover_picrand[$npclastgenerated] =  rand(31,60)
+	if lover_picrand[$npclastgenerated] = lover_picture[0] or lover_picrand[$npclastgenerated] = lover_picture[1] or lover_picrand[$npclastgenerated] = lover_picture[2]: jump 'girldetailsloop'
+end
+
+if $ARGS[0] = 'set_boybody':
 	boybodyrand = rand(1, 3)
 
-	if boybodyrand = 1: $boybody = 'short'
-	if boybodyrand = 2: $boybody = 'average'
-	if boybodyrand = 3: $boybody = 'tall'
+	if boybodyrand = 1: 
+		$boybody = 'short'
+		$boybody_pref = 'a short'
+	elseif boybodyrand = 2: 
+		$boybody = 'average'
+		$boybody_pref = 'an average'
+	elseif boybodyrand = 3: 
+		$boybody = 'tall'
+		$boybody_pref = 'a tall'
+	end
 
 	boybodrand = rand(1, 4)
 
-	if boybodrand = 1 and boybodyrand = 1: $boybod = 'petite'
-	if boybodrand = 1 and boybodyrand > 1: $boybod = 'slender'
-	if boybodrand = 2: $boybod = 'toned'
-	if boybodrand = 3: $boybod = 'average'
-	if boybodrand = 4: $boybod = 'chubby'
-
+	if boybodrand = 1 and boyboyrand = 1: 
+		$boybod = 'petite'
+		$boybod_pref = 'a petite'
+	elseif boybodrand = 1 and boybodyrand = 1: 
+		$boybod = 'slender'
+		$boybod_pref = 'a slender'
+	elseif boybodrand = 2: 
+		$boybod = 'toned'
+		$boybod_pref = 'a toned'
+	elseif boybodrand = 3: 
+		$boybod = 'average'
+		$boybod_pref = 'an average'
+	else
+		$boybod = 'chubby'
+		$boybod_pref = 'a chubby'
+	end
+	
 	boyfacerand = rand(1, 3)
+	if boyfacerand = 1: 
+		$boyface = 'black'
+	elseif boyfacerand = 2:
+		$boyface = 'brunette'
+	else 
+		$boyface = 'blond'
+	end
+end
 
-	if boyfacerand = 1: $boyface = 'black'
-	if boyfacerand = 2: $boyface = 'brunette'
-	if boyfacerand = 3: $boyface = 'blond'
-
-	!!Variables responsible for any features like
-	!!security, is responsible for the money and requirements
-	harakboy = rand(0, 2)
-	finance = rand(0, 2)
+if $ARGS[0] = 'set_finance':
+	harakBoy = rand(0, 2)
+	finance = npc_finance[$npclastgenerated]
 
-	if finance = 0:
+	if npc_finance[$npclastgenerated] = 0:
 		!!Gopnik beggar or a hard worker
 		!!check in appearance Primary
-		if harakboy = 0: npc_apprnc[$npclastgenerated] = rand(0, 8)
-		if harakboy = 1: npc_apprnc[$npclastgenerated] = rand(0, 16)
-		if harakboy = 2: npc_apprnc[$npclastgenerated] = rand(0, 32)
+		if harakBoy = 0:
+			npc_apprnc[$npclastgenerated] = rand(0, 8)
+		elseif harakBoy = 1:
+			npc_apprnc[$npclastgenerated] = rand(0, 16)
+		else 
+			npc_apprnc[$npclastgenerated] = rand(0, 32)
+		end
 
 		$boyClo = 'wearing a tracksuit.'
-	elseif finance = 1:
+	elseif npc_finance[$npclastgenerated] = 1:
 		!!middle_peasant
 		!!check in appearance
-		if harakboy = 0: npc_apprnc[$npclastgenerated] = rand(0, 16)
-		if harakboy = 1: npc_apprnc[$npclastgenerated] = rand(0, 24)
-		if harakboy = 2: npc_apprnc[$npclastgenerated] = rand(0, 32)
+		if harakBoy = 0:
+			npc_apprnc[$npclastgenerated] = rand(0, 16)
+		elseif harakBoy = 1:
+			npc_apprnc[$npclastgenerated] = rand(0, 24)
+		else
+			npc_apprnc[$npclastgenerated] = rand(0, 32)
+		end
 
 		$boyClo = 'wearing jeans and a blouse.'
-	elseif finance = 2:
+	elseif npc_finance[$npclastgenerated] = 2:
 		!!middle_peasant
 		!!check in appearance
-		if harakboy = 0: npc_apprnc[$npclastgenerated] = rand(16, 32)
-		if harakboy = 1: npc_apprnc[$npclastgenerated] = rand(24, 32)
-		if harakboy = 2: npc_apprnc[$npclastgenerated] = rand(32, 40)
+		if harakBoy = 0:
+			npc_apprnc[$npclastgenerated] = rand(16, 32)
+		elseif harakBoy = 1:
+			npc_apprnc[$npclastgenerated] = rand(24, 32)
+		else
+			npc_apprnc[$npclastgenerated] = rand(32, 40)
+		end
 
 		$boyClo = 'wearing an expensive dress.'
 	end
+end
 
+if $ARGS[0] = 'set_preferences':
 	!!requirements of the figure, chest size, hair color.
 	!!0 - ass less 80, 1 back from 80 prior_to 100, 2 ass over 100
 	figurboy = rand(0, 2)
-	!!0 - 60  curve around 22,5 (C/D cups)
-	npc_bust[$npclastgenerated] = rand(0,15) + rand(0,15) + rand(0,15) & if rand(1,10) = 1: npc_bust[$npclastgenerated] += rand(0,15)
-	!!0 - black, 1 - brown, 2 - Redhead, 3 - blonde
-	npc_haircol[$npclastgenerated] = rand(0, 3)
+
+
 	!!character 0 - soft, 1 -norm 2 - aggressor
 	if rand(0, 100) < 90:
 		izvrat = 0
@@ -95,13 +144,6 @@ if $ARGS[0] = 'details':
 		izvrat = 1
 	end
 
-
-
-	hairboy = npc_haircol[$npclastgenerated]
-	titboy = npc_bust[$npclastgenerated]
-	vneshboy = npc_apprnc[$npclastgenerated]
-
-
 	!! trying to make the preference section 
 	!! Variables here are clotTypePrefTmp, clotQualPrefTmp, clotTopPrefTmp, bottShorPrefTmp, clotThinPrefTmp, bimbPrefTmp, pierPrefTmp, tattPrefTmp, lipsPrefTmp, bodyPrefTmp, makePrefTmp, IQPrefTmp.
 
@@ -111,13 +153,13 @@ if $ARGS[0] = 'details':
 	!!0 - none, 1 - cheap, 2 - average, 3 - formal, 4 - fetish.
 	clotTypePrefTmp = 0
 	if rand(0, 4) = 4:
-		if finance = 0:
+		if npc_finance[$npclastgenerated] = 0:
 			clotTypePrefTmp = rand(1,2)
 			if rand(0, 1) = 1 and izvrat = 1:clotTypePrefTmp = 4
-		elseif finance = 1:
+		elseif npc_finance[$npclastgenerated] = 1:
 			clotTypePrefTmp = rand(1,3)
 			if rand(0, 2) = 2 and izvrat = 1:clotTypePrefTmp = 4
-		elseif finance = 2:
+		elseif npc_finance[$npclastgenerated] = 2:
 			clotTypePrefTmp = rand(2,3)
 			if rand(0, 1) = 1 and izvrat = 1:clotTypePrefTmp = 4
 		end
@@ -128,9 +170,9 @@ if $ARGS[0] = 'details':
 	!! 0 - no preference, 1 - 1 to 4 units cheap to average (Locked if formal chosen), 2 - 5 to 7 units expensive to ballroom quality (Locked if fetish is chosen)
 	clotQualPrefTmp = 0
 	if rand(0, 5) = 5:
-		if finance = 0:
+		if npc_finance[$npclastgenerated] = 0:
 			clotQualPrefTmp = 1
-		elseif finance = 1:
+		elseif npc_finance[$npclastgenerated] = 1:
 			clotQualPrefTmp = rand(1, 2)
 			randchan = rand(0, 1)
 			if randchan = 0 and clotTypePrefTmp ! 3:
@@ -138,7 +180,7 @@ if $ARGS[0] = 'details':
 			elseif randchan = 1 and clotTypePrefTmp ! 1:
 				clotQualPrefTmp = 2
 			end
-		elseif finance = 2:
+		elseif npc_finance[$npclastgenerated] = 2:
 			randchan = rand(0, 2)
 			if randchan = 2 and clotTypePrefTmp ! 1:
 				clotQualPrefTmp = 2
@@ -289,5 +331,7 @@ if $ARGS[0] = 'details':
 	killvar 'randchan'
 end
 
+
+
 --- girl ---------------------------------
 

+ 32 - 32
locations/lover.qsrc

@@ -3,51 +3,51 @@
 if $ARGS[0] = 'add':
 	if mid($boy,1,1) = 'C': gs 'npcpreservec', $boy & gs 'boyStat', $npclastsaved
 	i = arrsize('pcs_lovers')
-	$lover[i] = $boy
-	$loverdesc[i] = $boydesc
-	loverbodyrand[i] = boybodyrand
-	$loverbody[i] = $boybody
-	loverbodrand[i] = boybodrand
-	$loverbod[i] = $boybod
-	loverfacerand[i] = boyfacerand
-	$loverface[i] = $boyface
-	loverdick[i] = dick
-	$loverdick_girth[i] = $dick_girth
-	loversilaVag[i] = silaVag
-	loverfinance[i] = finance
-	vneshlover[i] = vneshBoy
-	$loverClo[i] = $boyClo
-	figurlover[i] = figurBoy
-	titlover[i] = titBoy
-	hairlover[i] = hairBoy
-	haraklover[i] = harakBoy
+	$lover[i] = $boy									& !boyStat: = $npclastcalled
+	$loverdesc[i] = $boydesc							& !boystat (new)
+	loverbodyrand[i] = boybodyrand						& !boy/girl
+	$loverbody[i] = $boybody							& !boy/girl
+	loverbodrand[i] = boybodrand						& !boy/girl
+	$loverbod[i] = $boybod								& !boy/girl
+	loverfacerand[i] = boyfacerand						& !boy/girl
+	$loverface[i] = $boyface							& !boy/girl
+	loverdick[i] = npc_dick[$boy]
+	$loverdick_girth[i] = $npc_thdick[$npclastsaved]
+	loversilaVag[i] = npc_sexskill[$npclastsaved]
+	loverfinance[i] = npc_finance[$npclastsaved]
+	vneshlover[i] = npc_apprnc[$npclastsaved]
+	$loverClo[i] = $boyClo								& !boy/girl
+	figurlover[i] = figurBoy							& !boy/girl
+	titlover[i] = npc_bust[$npclastsaved]
+	hairlover[i] = npc_haircol[$npclastsaved]
+	haraklover[i] = harakBoy							& !boy/girl
 	loverday[i] = daystart
 	loverrelation[i] = 3
 	loverdays[i] = 0
 	boyonce[i] = 0
-	loverizvrat[i] = izvrat
+	loverizvrat[i] = izvrat								& !boy/girl
 	giftDay[i] = 0
 	giftNum[i] = 0
 	loverlove[i] = 0
 	loverscompliance[i] = 0
-	lover_picture[i] = lover_picrand
+	lover_picture[i] = lover_picrand[$npclastsaved]
 	meethour[i] = 0
 	svidanie[i] = 0
 	meetday[i] = 0
 
 	!!new preferences
-	clotTypePref[i] = clotTypePrefTmp
-	clotQualPref[i] = clotQualPrefTmp
-	clotTopPref[i] = clotTopPrefTmp
-	bottShorPref[i] = bottShorPrefTmp
-	clotThinPref[i] = clotThinPrefTmp
-	bimbPref[i] = bimbPrefTmp
-	pierPref[i] = pierPrefTmp
-	tattPref[i] = tattPrefTmp
-	lipsPref[i] = lipsPrefTmp
-	bodyPref[i] = bodyPrefTmp
-	makePref[i] = makePrefTmp
-	IQPref[i] = IQPrefTmp
+	clotTypePref[i] = clotTypePrefTmp					& !boy/girl
+	clotQualPref[i] = clotQualPrefTmp					& !boy/girl
+	clotTopPref[i] = clotTopPrefTmp						& !boy/girl
+	bottShorPref[i] = bottShorPrefTmp					& !boy/girl
+	clotThinPref[i] = clotThinPrefTmp					& !boy/girl
+	bimbPref[i] = bimbPrefTmp							& !boy/girl
+	pierPref[i] = pierPrefTmp							& !boy/girl
+	tattPref[i] = tattPrefTmp							& !boy/girl
+	lipsPref[i] = lipsPrefTmp							& !boy/girl
+	bodyPref[i] = bodyPrefTmp							& !boy/girl
+	makePref[i] = makePrefTmp							& !boy/girl
+	IQPref[i] = IQPrefTmp								& !boy/girl
 	loverGender[i] = npc_gender[$npclastsaved]
 
 	!! making sure lover has pronouns

+ 14 - 6
locations/npcgeneratec.qsrc

@@ -109,7 +109,6 @@ if npctempgsex = 0:
 	npc_dick[$npclastgenerated] = npctempgn[5]
 	$npc_notes[$npclastgenerated] = 'A male.'
 	npc_bust[$npclastgenerated] = 0
-	lover_picrand[$npclastgenerated] = rand(1,30)
 elseif npctempgsex = 1:
 	! {Female}
 	gs 'npcrnamefile', 'rusFemale'
@@ -119,7 +118,8 @@ elseif npctempgsex = 1:
 	npc_dick[$npclastgenerated] = rand(0,1)
 	$npc_notes[$npclastgenerated] = 'A female.'
 	!!0 - 60  curve around 22,5 (C/D cups)
-	npc_bust[$npclastgenerated] = rand(0,15) + rand(0,15) + rand(0,15) & if rand(1,10) = 1: npc_bust[$npclastgenerated] += rand(0,15)
+	npc_bust[$npclastgenerated] = rand(0, 15) + rand(0, 15) + rand(0, 15)
+	if rand(1, 10) = 1: npc_bust[$npclastgenerated] += rand(0, 15)
 elseif npctempgsex = 2:
 	! {HermFemale}
 	gs 'npcrnamefile', 'rusFemale'
@@ -256,11 +256,19 @@ npc_outfit[$npclastgenerated] = 0
 
 !! Unspecified dad and <<$npc_nickname[''A29'']>>.
 if npctempgsex = 1 or npctempgsex = 2:
-   !! A female face
-   $npc_pic[$npclastgenerated] = 'icon_bf' + rand(31, 60) + '.png'
+	!! A female face
+	:girldetailsloop
+		lover_picrand[$npclastgenerated] =  rand(31, 60)
+	if lover_picrand[$npclastgenerated] = lover_picture[0] or lover_picrand[$npclastgenerated] = lover_picture[1] or lover_picrand[$npclastgenerated] = lover_picture[2]: jump 'girldetailsloop'
+
+	$npc_pic[$npclastgenerated] = 'icon_bf' + lover_picrand[$npclastgenerated] + '.png'
 else
-   !! A male face
-   $npc_pic[$npclastgenerated] = 'icon_bf' + rand(1, 30) + '.png'
+	!! A male face
+	:boydetailsloop
+		lover_picrand[$npclastgenerated] =  rand(1, 30)
+	if lover_picrand[$npclastgenerated] = lover_picture[0] or lover_picrand[$npclastgenerated] = lover_picture[1] or lover_picrand[$npclastgenerated] = lover_picture[2]: jump 'boydetailsloop'
+
+	$npc_pic[$npclastgenerated] = 'icon_bf' + lover_picrand[$npclastgenerated] + '.png'
 end
 
 !! STDs set to 0. For characters with a STD, you need to gs npcgenext rstd

+ 1 - 0
locations/npcpreservec.qsrc

@@ -32,6 +32,7 @@ if mid($npctemp,1,1) = 'C':
 	$npc_usedname[$npclastsaved]	= $npc_usedname[$npctemp]
 	$npc_notes[$npclastsaved]		= $npc_notes[$npctemp]
 	$npc_pic[$npclastsaved]			= $npc_pic[$npctemp]
+	lover_picrand[$npclastsaved]	= lover_picrand[$npctemp]
 	
 	npc_age[$npclastsaved]			= npc_age[$npctemp]
 	npc_dob[$npclastsaved]			= npc_dob[$npctemp]