[fix] transferred 'B/C-set-only' npc arrays to use same arrays as 'A-set' and 'A/B/C-clean'

locations/boy.qsrc

@@ -51,25 +51,25 @@ if $ARGS[0] = 'details':
 	if finance = 0:
 		!!Gopnik beggar or a hard worker
 		!!check in appearance Primary
-		if harakBoy = 0: npc_app[$npclastgenerated] = rand(0, 8)
-		if harakBoy = 1: npc_app[$npclastgenerated] = rand(0, 16)
-		if harakBoy = 2: npc_app[$npclastgenerated] = rand(0, 32)
+		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)
 
 		$boyClo = 'wearing a tracksuit.'
 	elseif finance = 1:
 		!!middle_peasant
 		!!check in appearance
-		if harakBoy = 0: npc_app[$npclastgenerated] = rand(0, 16)
-		if harakBoy = 1: npc_app[$npclastgenerated] = rand(0, 24)
-		if harakBoy = 2: npc_app[$npclastgenerated] = rand(0, 32)
+		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)
 
 		$boyClo = 'wearing jeans and a sweater.'
 	elseif finance = 2:
 		!!middle_peasant
 		!!check in appearance
-		if harakBoy = 0: npc_app[$npclastgenerated] = rand(16, 32)
-		if harakBoy = 1: npc_app[$npclastgenerated] = rand(24, 32)
-		if harakBoy = 2: npc_app[$npclastgenerated] = rand(32, 40)
+		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)
 
 		$boyClo = 'wearing an expensive suit.'
 	end
@@ -91,7 +91,7 @@ if $ARGS[0] = 'details':
 
 	hairBoy = npc_haircol[$npclastgenerated]
 	titBoy = npc_bust[$npclastgenerated]
-	vneshBoy = npc_app[$npclastgenerated]
+	vneshBoy = npc_apprnc[$npclastgenerated]
 
 
 	!! trying to make the preference section 

locations/girl.qsrc

@@ -57,25 +57,25 @@ if $ARGS[0] = 'details':
 	if finance = 0:
 		!!Gopnik beggar or a hard worker
 		!!check in appearance Primary
-		if harakboy = 0: npc_app[$npclastgenerated] = rand(0, 8)
-		if harakboy = 1: npc_app[$npclastgenerated] = rand(0, 16)
-		if harakboy = 2: npc_app[$npclastgenerated] = rand(0, 32)
+		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)
 
 		$boyClo = 'wearing a tracksuit.'
 	elseif finance = 1:
 		!!middle_peasant
 		!!check in appearance
-		if harakboy = 0: npc_app[$npclastgenerated] = rand(0, 16)
-		if harakboy = 1: npc_app[$npclastgenerated] = rand(0, 24)
-		if harakboy = 2: npc_app[$npclastgenerated] = rand(0, 32)
+		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)
 
 		$boyClo = 'wearing jeans and a blouse.'
 	elseif finance = 2:
 		!!middle_peasant
 		!!check in appearance
-		if harakboy = 0: npc_app[$npclastgenerated] = rand(16, 32)
-		if harakboy = 1: npc_app[$npclastgenerated] = rand(24, 32)
-		if harakboy = 2: npc_app[$npclastgenerated] = rand(32, 40)
+		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)
 
 		$boyClo = 'wearing an expensive dress.'
 	end
@@ -97,7 +97,7 @@ if $ARGS[0] = 'details':
 
 	hairboy = npc_haircol[$npclastgenerated]
 	titboy = npc_bust[$npclastgenerated]
-	vneshboy = npc_app[$npclastgenerated]
+	vneshboy = npc_apprnc[$npclastgenerated]
 
 
 	!! trying to make the preference section 

locations/lakecafe.qsrc

@@ -21,11 +21,11 @@ if $ARGS[0] = 'main':
 	act 'Leave the cafe':minut += 2 & gt 'nord'
 
 	if hour >= 14 or hour < 4:
-		if npc_Qstlvl['A89'] = 0:
+		if npc_QW['A89'] = 0:
 			if barrnd = 1:'Behind the bar you see a smiling <a href="exec:gt ''lakecafe'', ''barmensha''">barmaid</a>, who is currently polishing some glasses.'
 			if barrnd = 2:'Inside the diner you see a smiling <a href="exec:gt ''lakecafe'', ''barmensha''">barmaid</a>, who is currently picking up some dirty dishes and cleaning a table.'
 			if barrnd = 3:'Behind the bar you see a smiling <a href="exec:gt ''lakecafe'', ''barmensha''">barmaid</a>, who is currently making some mixed drinks skilfully.'
-		elseif npc_Qstlvl['A89'] = 1:
+		elseif npc_QW['A89'] = 1:
 			if barrnd = 1:'Behind the bar you see <a href="exec:gt ''lakecafe'', ''barmensha''">Eugene</a>, with that perpetual smile on her face. She''s currently polishing some glasses, it must be a slow period.'
 			if barrnd = 2:'Inside the diner you see <a href="exec:gt ''lakecafe'', ''barmensha''">Eugene</a>, with that perpetual smile on her face. She''s collecting dirty dishes from tables.'
 			if barrnd = 3:'Behind the bar you see <a href="exec:gt ''lakecafe'', ''barmensha''">Eugene</a>, with that perpetual smile on her face. She''s skilfully mixing some drinks for customers, making a show out of it.'
@@ -78,7 +78,7 @@ if $ARGS[0] = 'barmensha':
 	$location_type = 'event'
 	cls
 	gs 'stat'
-	if npc_Qstlvl['A89'] > 0:
+	if npc_QW['A89'] > 0:
 		'<center><B><font color=maroon>Barmaid Eugene</font></B></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bbq/lakebarmensha.jpg"></center>'
 		if npc_rel['A89'] < 20:
@@ -98,20 +98,20 @@ if $ARGS[0] = 'barmensha':
 	end
 
 
-	if npc_Qstlvl['A89'] = 0:
+	if npc_QW['A89'] = 0:
 		'The barmaid gives you a warm smile, and looks you straight in the eyes as she says: "Hi there! Can I get you anything?"'
-	elseif npc_Qstlvl['A89'] = 1:
+	elseif npc_QW['A89'] = 1:
 		'Eugene smiles as she sees you approach the bar, and says cheerfully: "Hi, <<$pcs_nickname>>! What''s up?"'
 	end
 
 	act 'Leave Eugene so she can work':gt 'lakecafe', 'main'
 
 	if hour >= 14 or hour < 4:
-		if npc_Qstlvl['A89'] = 0:
+		if npc_QW['A89'] = 0:
 			act 'Chat with the barmaid (0:30)':
 				cla
 				*clr
-				npc_Qstlvl['A89'] = 1
+				npc_QW['A89'] = 1
 				npc_rel['A89'] = 10
 				minut += 30
 				gs 'stat'
@@ -123,7 +123,7 @@ if $ARGS[0] = 'barmensha':
 			end
 		end
 
-		if npc_Qstlvl['A89'] => 1:
+		if npc_QW['A89'] => 1:
 			act 'Chat with Eugene (0:30)':
 				cla
 				*clr

locations/npcgeneratec.qsrc

@@ -148,16 +148,16 @@ $npc_firstname[$npclastgenerated] = $npctempgn[1]
 $npc_nickname[$npclastgenerated] = $npctempgn[2]
 $npc_lastname[$npclastgenerated] = $npctempgn[3]
 $npc_usedname[$npclastgenerated] = $npctempgn[0]
-npc_vit[$npclastgenerated] = rand(1,npctempc2)
-npc_str[$npclastgenerated] = rand(1,npctempc2)
-npc_int[$npclastgenerated] = rand(1,npctempc2)
+npc_vital[$npclastgenerated] = rand(1,npctempc2)
+npc_stren[$npclastgenerated] = rand(1,npctempc2)
+npc_intel[$npclastgenerated] = rand(1,npctempc2)
 npc_agil[$npclastgenerated] = rand(1,npctempc2)
-npc_spirit[$npclastgenerated] = rand(1,npctempc2)
+npc_sprt[$npclastgenerated] = rand(1,npctempc2)
 
 ! {Then we call out other stats}
-npc_mag[$npclastgenerated] = 0
+npc_magik[$npclastgenerated] = 0
 npc_drunk[$npclastgenerated] = 0
-npc_undies[$npclastgenerated] = 0
+npc_pantys[$npclastgenerated] = 0
 npc_vag[$npclastgenerated] = 0
 npc_ass[$npclastgenerated] = 0
 
@@ -167,12 +167,12 @@ npc_Pavrep[$npclastgenerated] = 0
 npc_Godrep[$npclastgenerated] = 0
 
 ! {Random attractiveness}
-npc_app[$npclastgenerated] = rand(30,60)
-npc_lipstick[$npclastgenerated] = 0
+npc_apprnc[$npclastgenerated] = rand(30,60)
+npc_lipbalm[$npclastgenerated] = 0
 npc_makeup[$npclastgenerated] = 0
 npc_sweat[$npclastgenerated] = 0
 npc_dye[$npclastgenerated] = 0
-npc_hair[$npclastgenerated] = 0
+npc_hairbsh[$npclastgenerated] = 0
 
 ! {Random skin quality and body hair}
 npc_skin[$npclastgenerated] = rand(30,70)
@@ -202,20 +202,20 @@ npc_run[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_vball[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_nerd[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_shoot[$npclastgenerated] = rand(0,(npctempc2 + 10))
-npc_sew[$npclastgenerated] = rand(0,(npctempc2 + 10))
-npc_serve[$npclastgenerated] = rand(0,(npctempc2 + 10))
+npc_sewing[$npclastgenerated] = rand(0,(npctempc2 + 10))
+npc_serving[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_chess[$npclastgenerated] = rand(0,(npctempc2 + 10))
-npc_dnc[$npclastgenerated] = rand(0,(npctempc2 + 10))
-npc_erodnc[$npclastgenerated] = rand(0,(npctempc2 + 10))
+npc_dance[$npclastgenerated] = rand(0,(npctempc2 + 10))
+npc_danceero[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_jab[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_punch[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_kick[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_def[$npclastgenerated] = rand(0,(npctempc2 + 10))
-npc_sing[$npclastgenerated] = rand(0,(npctempc2 + 10))
+npc_vokal[$npclastgenerated] = rand(0,(npctempc2 + 10))
 npc_teach[$npclastgenerated] = rand(0,(npctempc2 + 10))
 
 ! {Starting at 0 quest state and love for the character, and slightly disliked.}
-npc_Qstlvl[$npclastgenerated]= 0
+npc_QW[$npclastgenerated]= 0
 npc_rel[$npclastgenerated] = 40
 npc_love[$npclastgenerated] = 0
 
@@ -230,7 +230,7 @@ $npc_pic[$npclastgenerated] = 'xPICx'
 
 ! {STDs are not randomly given here. For characters with a STD, you need to gs npcgenext rstd. It will be expecting an npclastgeneratedn variable.}
 npc_herpes[$npclastgenerated] = 0
-npc_syph[$npclastgenerated] = 0
+npc_syth[$npclastgenerated] = 0
 npc_gon[$npclastgenerated] = 0
 npc_chlam[$npclastgenerated] = 0
 npc_Hiv[$npclastgenerated] = 0

locations/npcpreservec.qsrc

@@ -27,14 +27,14 @@ if mid($npctemp,1,1) = 'C':
 	$npc_usedname[$npclastsaved] = $npc_usedname[$npctemp]
 	$npc_notes[$npclastsaved] = $npc_notes[$npctemp]
 	npc_dob[$npclastsaved] = npc_dob[$npctemp]
-	npc_vit[$npclastsaved] = npc_vit[$npctemp]
-	npc_str[$npclastsaved] = npc_str[$npctemp]
-	npc_int[$npclastsaved] = npc_int[$npctemp]
+	npc_vital[$npclastsaved] = npc_vital[$npctemp]
+	npc_stren[$npclastsaved] = npc_stren[$npctemp]
+	npc_intel[$npclastsaved] = npc_intel[$npctemp]
 	npc_agil[$npclastsaved] = npc_agil[$npctemp]
-	npc_spirit[$npclastsaved] = npc_spirit[$npctemp]
-	npc_mag[$npclastsaved] = npc_mag[$npctemp]
+	npc_sprt[$npclastsaved] = npc_sprt[$npctemp]
+	npc_magik[$npclastsaved] = npc_magik[$npctemp]
 	npc_drunk[$npclastsaved] = npc_drunk[$npctemp]
-	npc_undies[$npclastsaved] = npc_undies[$npctemp]
+	npc_pantys[$npclastsaved] = npc_pantys[$npctemp]
 	npc_cyc[$npclastsaved] = npc_cyc[$npctemp]
 	npc_fert[$npclastsaved] = npc_fert[$npctemp]
 	$npc_firstpart[$npclastsaved] = $npc_firstpart[$npctemp]
@@ -51,12 +51,12 @@ if mid($npctemp,1,1) = 'C':
 	npc_horny[$npclastsaved] = npc_horny[$npctemp]
 	npc_Pavrep[$npclastsaved] = npc_Pavrep[$npctemp]
 	npc_Godrep[$npclastsaved] = npc_Godrep[$npctemp]
-	npc_app[$npclastsaved] = npc_app[$npctemp]
-	npc_lipstick[$npclastsaved] = npc_lipstick[$npctemp]
+	npc_apprnc[$npclastsaved] = npc_apprnc[$npctemp]
+	npc_lipbalm[$npclastsaved] = npc_lipbalm[$npctemp]
 	npc_makeup[$npclastsaved] = npc_makeup[$npctemp]
 	npc_sweat[$npclastsaved] = npc_sweat[$npctemp]
 	npc_dye[$npclastsaved] = npc_dye[$npctemp]
-	npc_hair[$npclastsaved] = npc_hair[$npctemp]
+	npc_hairbsh[$npclastsaved] = npc_hairbsh[$npctemp]
 	npc_skin[$npclastsaved] = npc_skin[$npctemp]
 	npc_bodyhair[$npclastsaved] = npc_bodyhair[$npctemp]
 	npc_breath[$npclastsaved] = npc_breath[$npctemp]
@@ -82,18 +82,18 @@ if mid($npctemp,1,1) = 'C':
 	npc_vball[$npclastsaved] = npc_vball[$npctemp]
 	npc_nerd[$npclastsaved] = npc_nerd[$npctemp]
 	npc_shoot[$npclastsaved] = npc_shoot[$npctemp]
-	npc_sew[$npclastsaved] = npc_sew[$npctemp]
-	npc_serve[$npclastsaved] = npc_serve[$npctemp]
+	npc_sewing[$npclastsaved] = npc_sewing[$npctemp]
+	npc_serving[$npclastsaved] = npc_serving[$npctemp]
 	npc_chess[$npclastsaved] = npc_chess[$npctemp]
-	npc_dnc[$npclastsaved] = npc_dnc[$npctemp]
-	npc_erodnc[$npclastsaved] = npc_erodnc[$npctemp]
+	npc_dance[$npclastsaved] = npc_dance[$npctemp]
+	npc_danceero[$npclastsaved] = npc_danceero[$npctemp]
 	npc_jab[$npclastsaved] = npc_jab[$npctemp]
 	npc_punch[$npclastsaved] = npc_punch[$npctemp]
 	npc_kick[$npclastsaved] = npc_kick[$npctemp]
 	npc_def[$npclastsaved] = npc_def[$npctemp]
-	npc_sing[$npclastsaved] = npc_sing[$npctemp]
+	npc_vokal[$npclastsaved] = npc_vokal[$npctemp]
 	npc_teach[$npclastsaved] = npc_teach[$npctemp]
-	npc_Qstlvl[$npclastsaved] = npc_Qstlvl[$npctemp]
+	npc_QW[$npclastsaved] = npc_QW[$npctemp]
 	npc_rel[$npclastsaved] = npc_rel[$npctemp]
 	npc_love[$npclastsaved] = npc_love[$npctemp]
 	npc_job[$npclastsaved] = npc_job[$npctemp]
@@ -102,7 +102,7 @@ if mid($npctemp,1,1) = 'C':
 	$npc_mom[$npclastsaved] = $npc_mom[$npctemp]
 	$npc_pic[$npclastsaved] = $npc_pic[$npctemp]
 	npc_herpes[$npclastsaved] = npc_herpes[$npctemp]
-	npc_syph[$npclastsaved] = npc_syph[$npctemp]
+	npc_syth[$npclastsaved] = npc_syth[$npctemp]
 	npc_gon[$npclastsaved] = npc_gon[$npctemp]
 	npc_chlam[$npclastsaved] = npc_chlam[$npctemp]
 	npc_Hiv[$npclastsaved] = npc_Hiv[$npctemp]

locations/saveupdater.qsrc

@@ -482,5 +482,70 @@ if mannareset ! 0:
 	killvar 'mannareset'
 end
 
+$oldnpcvars[0] = 'npc_app'
+$oldnpcvars[1] = 'npc_dnce'
+$oldnpcvars[2] = 'npc_erodnce'
+$oldnpcvars[3] = 'npc_hair'
+$oldnpcvars[4] = 'npc_int'
+$oldnpcvars[5] = 'npc_lipstick'
+$oldnpcvars[6] = 'npc_mag'
+$oldnpcvars[7] = 'npc_undies'
+$oldnpcvars[8] = 'npc_Qstlvl'
+$oldnpcvars[9] = 'npc_serve'
+$oldnpcvars[10] = 'npc_sew'
+$oldnpcvars[11] = 'npc_sing'
+$oldnpcvars[12] = 'npc_spirit'
+$oldnpcvars[13] = 'npc_str'
+$oldnpcvars[14] = 'npc_syph'
+$oldnpcvars[15] = 'npc_vit'
+$newnpcvars[0] = 'npc_apprnc'
+$newnpcvars[1] = 'npc_dance'
+$newnpcvars[2] = 'npc_danceero'
+$newnpcvars[3] = 'npc_hairbsh'
+$newnpcvars[4] = 'npc_intel'
+$newnpcvars[5] = 'npc_lipbalm'
+$newnpcvars[6] = 'npc_magik'
+$newnpcvars[7] = 'npc_pantys'
+$newnpcvars[8] = 'npc_QW'
+$newnpcvars[9] = 'npc_serving'
+$newnpcvars[10] = 'npc_sewing'
+$newnpcvars[11] = 'npc_vokal'
+$newnpcvars[12] = 'npc_sprt'
+$newnpcvars[13] = 'npc_stren'
+$newnpcvars[14] = 'npc_syth'
+$newnpcvars[15] = 'npc_vital'
+
+i = 0
+:npcvarloop
+oldnpcvar = $oldnpcvars[i]
+if i < ARRSIZE($oldnpcvars):
+	if 1 > ARRSIZE('oldnpcvar'):i += 1 & jump 'npcvarloop'
+	newnpcvar = $newnpcvars[i]
+	COPYARR 'newnpcvar', 'oldnpcvar'
+	i += 1
+	jump 'npcvarloop'
+end
+killvar 'npc_app'
+killvar 'npc_dnce'
+killvar 'npc_erodnce'
+killvar 'npc_hair'
+killvar 'npc_int'
+killvar 'npc_int'
+killvar 'npc_lipstick'
+killvar 'npc_mag'
+killvar 'npc_undies'
+killvar 'npc_Qstlvl'
+killvar 'npc_serve'
+killvar 'npc_sew'
+killvar 'npc_sing'
+killvar 'npc_spirit'
+killvar 'npc_str'
+killvar 'npc_syph'
+killvar 'npc_vit'
+killvar 'oldnpcvar'
+killvar 'newnpcvar'
+killvar '$oldnpcsvars'
+killvar '$newnpcvars'
+
 --- saveupdater ---------------------------------
 

locations/shortgs.qsrc

@@ -522,7 +522,6 @@ if $ARGS[0] = 'testsize':
 	arrsize('$npc_thdick')
 	arrsize('$npc_usedname')
 	arrsize('npc_agil')
-	arrsize('npc_app')
 	arrsize('npc_apprnc')
 	arrsize('npc_ass')
 	arrsize('npc_bodyhair')
@@ -551,7 +550,6 @@ if $ARGS[0] = 'testsize':
 	arrsize('npc_Godrep')
 	arrsize('npc_gon')
 	arrsize('npc_grades')
-	arrsize('npc_hair')
 	arrsize('npc_hairbsh')
 	arrsize('npc_haircol')
 	arrsize('npc_haircurl')
@@ -565,7 +563,6 @@ if $ARGS[0] = 'testsize':
 	arrsize('npc_chem')
 	arrsize('npc_chess')
 	arrsize('npc_chlam')
-	arrsize('npc_int')
 	arrsize('npc_intel')
 	arrsize('npc_jab')
 	arrsize('npc_job')
@@ -573,9 +570,7 @@ if $ARGS[0] = 'testsize':
 	arrsize('npc_lashes')
 	arrsize('npc_lip')
 	arrsize('npc_lipbalm')
-	arrsize('npc_lipstick')
 	arrsize('npc_love')
-	arrsize('npc_mag')
 	arrsize('npc_magik')
 	arrsize('npc_makeup')
 	arrsize('npc_malen')
@@ -590,31 +585,23 @@ if $ARGS[0] = 'testsize':
 	arrsize('npc_QW')
 	arrsize('npc_rel')
 	arrsize('npc_run')
-	arrsize('npc_serve')
 	arrsize('npc_serving')
-	arrsize('npc_sew')
 	arrsize('npc_sewing')
 	arrsize('npc_sex')
 	arrsize('npc_sexskill')
 	arrsize('npc_shoot')
-	arrsize('npc_sing')
 	arrsize('npc_skin')
 	arrsize('npc_spermpot')
-	arrsize('npc_spirit')
 	arrsize('npc_sprt')
-	arrsize('npc_str')
 	arrsize('npc_stren')
 	arrsize('npc_sub')
 	arrsize('npc_sweat')
-	arrsize('npc_syph')
 	arrsize('npc_syth')
 	arrsize('npc_tan')
 	arrsize('npc_teach')
 	arrsize('npc_thrush')
-	arrsize('npc_undies')
 	arrsize('npc_vag')
 	arrsize('npc_vball')
-	arrsize('npc_vit')
 	arrsize('npc_vital')
 	arrsize('npc_vokal')
 	arrsize('npcbrokehymen')