add boyfriends parameters and finalize changes in the npc routines

locations/npccleanc.qsrc

@@ -3,102 +3,61 @@
 !! {This code should be called to purge a specific NPC. It expects an ARGS[0] of the code of the C array.}
 $tempcclean = $ARGS[0]
 
-if mid($tempcclean, 1, 1) = 'C' and npc_firstname['$tempcclean'] > 0:
-    !! {create arrays to loop through}
-    ! {array for strings}
-    $tmpStrArr[0] = 'npc_firstname'
-    $tmpStrArr[] = 'npc_nickname'
-    $tmpStrArr[] = 'npc_lastname'
-    $tmpStrArr[] = 'npc_usedname'
-    $tmpStrArr[] = 'npc_notes'
-    $tmpStrArr[] = 'npc_thdick'
-    $tmpStrArr[] = 'npc_pic'
-    $tmpStrArr[] = 'npc_PersType'
-    $tmpStrArr[] = 'npc_dna'
-    $tmpStrArr[] = 'npc_occupation'
-    ! {array for ints}
-    $tmpIntArr[0] = 'npc_dob'
-    $tmpIntArr[] = 'npc_intel'
-    $tmpIntArr[] = 'npc_drunk'
-    $tmpIntArr[] = 'npc_gender'
-    $tmpIntArr[] = 'npc_dick'
-    $tmpIntArr[] = 'npc_sexskill'
-    $tmpIntArr[] = 'npc_spermpot'
-    $tmpIntArr[] = 'npc_horny'
-    $tmpIntArr[] = 'npc_apprnc'
-    $tmpIntArr[] = 'npc_height'
-    $tmpIntArr[] = 'npc_bust'
-    $tmpIntArr[] = 'npc_haircol'
-    $tmpIntArr[] = 'npc_QW'
-    $tmpIntArr[] = 'npc_rel'
-    $tmpIntArr[] = 'npc_love'
-    $tmpIntArr[] = 'npc_outfit'
-    $tmpIntArr[] = 'npc_herpes'
-    $tmpIntArr[] = 'npc_syth'
-    $tmpIntArr[] = 'npc_gon'
-    $tmpIntArr[] = 'npc_thrush'
-    $tmpIntArr[] = 'npc_style'
+if (mid($tempcclean, 1, 1) = 'B' or mid($tempcclean, 1, 1) = 'C'):
+	
+	gs 'shortgs', 'remove_array_element', 'npc_firstname',$tempcclean
 
-    ! {loop through the arrays to kill entries}
-    tmpArrIndex = 0
-    :cleanupstrloop
-    if tmpArrIndex < arrsize('$tmpStrArr'):
-        tmpNpcIndex = arrpos(('<<$tmpStrArr[tmpArrIndex]>>'), val('<<mid($tempcclean, 2)>>'))
-        if tmpNpcIndex >= 0:
-            killvar '<<$tmpStrArr[tmpArrIndex]>>', tmpNpcIndex
-        end
-        tmpArrIndex += 1
-        jump 'cleanupstrloop'
-    end
-    tmpArrIndex = 0
-    :cleanupintloop
-    if tmpArrIndex < arrsize('$tmpIntArr'):
-        tmpNpcIndex = arrpos(('$<<$tmpIntArr[tmpArrIndex]>>'), '<<mid($tempcclean, 2)>>')
-        if tmpNpcIndex >= 0:
-            killvar ('$<<$tmpIntArr[tmpArrIndex]>>'), tmpNpcIndex
-        end
-        tmpArrIndex += 1
-        jump 'cleanupintloop'
-    end
+    gs 'shortgs', 'remove_array_element', '$npc_nickname',$tempcclean
+    gs 'shortgs', 'remove_array_element', '$npc_lastname',$tempcclean
+    gs 'shortgs', 'remove_array_element', '$npc_usedname',$tempcclean
+    gs 'shortgs', 'remove_array_element', '$npc_notes',$tempcclean
+    gs 'shortgs', 'remove_array_element', '$npc_pic',$tempcclean
+    gs 'shortgs', 'remove_array_element', '$npc_thdick',$tempcclean
+    gs 'shortgs', 'remove_array_element', '$npc_perstype',$tempcclean
+    gs 'shortgs', 'remove_array_element', '$npc_dna',$tempcclean
+    gs 'shortgs', 'remove_array_element', '$npc_occupation',$tempcclean
+
+
+    gs 'shortgs', 'remove_array_element', 'npc_dob',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_gender',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_height',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_haircol',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_apprnc',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_dick',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_spermpot',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_sexskill',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_drunk',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_horny',$tempcclean
+
+!    gs 'shortgs', 'remove_array_element', 'npc_bust',$tempcclean
+
+    gs 'shortgs', 'remove_array_element', 'npc_rel',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_love',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_sex',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_QW',$tempcclean
+
+    gs 'shortgs', 'remove_array_element', 'npc_herpes',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_syth',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_gon',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_thrush',$tempcclean
+
+	gs 'shortgs', 'remove_array_element', 'npc_apt_type',$tempcclean
+	gs 'shortgs', 'remove_array_element', 'npc_perv',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_outfit',$tempcclean
+	gs 'shortgs', 'remove_array_element', 'npc_finance',$tempcclean
+    gs 'shortgs', 'remove_array_element', 'npc_intel',$tempcclean
+	gs 'shortgs', 'remove_array_element', 'npc_humor',$tempcclean
+	gs 'shortgs', 'remove_array_element', 'npc_fav_pos',$tempcclean
+	gs 'shortgs', 'remove_array_element', 'npc_tit_pref',$tempcclean
+ 			   
+    gs 'shortgs', 'remove_array_element', 'npc_style',$tempcclean
+	gs 'shortgs', 'remove_array_element', 'npc_addit',$tempcclean
+	gs 'shortgs', 'remove_array_element', 'npc_doors',$tempcclean
+	gs 'shortgs', 'remove_array_element', 'npc_goal',$tempcclean
+	gs 'shortgs', 'remove_array_element', 'npc_fidelity',$tempcclean
+	gs 'shortgs', 'remove_array_element', 'npc_lover_days',$tempcclean
+	gs 'shortgs', 'remove_array_element', 'npc_lover_keys',$tempcclean
 
-    ! {cleanup}
-    killvar 'tmpArrIndex'
-    killvar 'tmpNpcIndex'
-    killvar 'tmpStrArr'
-    killvar 'tmpIntArr'
-else
-	! {legacy code in case there is no corresponding index: just sets values to default}
-	$npc_firstname[$tempcclean] = ''
-	$npc_nickname[$tempcclean] = ''
-	$npc_lastname[$tempcclean] = ''
-	$npc_usedname[$tempcclean] = ''
-	$npc_notes[$tempcclean] = ''
-	npc_dob[$tempcclean] = 0
-	npc_intel[$tempcclean] = 0
-	npc_drunk[$tempcclean] = 0
-	npc_gender[$tempcclean] = 0
-	$npc_thdick[$tempcclean] = ''
-	npc_dick[$tempcclean] = 0
-	npc_sexskill[$tempcclean] = 0
-	npc_spermpot[$tempcclean] = 0
-	npc_horny[$tempcclean] = 0
-	npc_apprnc[$tempcclean] = 0
-	npc_height[$tempcclean] = 0
-	npc_bust[$tempcclean] = 0
-	npc_haircol[$tempcclean] = 0
-	npc_QW[$tempcclean] = 0
-	npc_rel[$tempcclean] = 0
-	npc_love[$tempcclean] = 0
-	$npc_occupation[$tempcclean] = ''
-	npc_outfit[$tempcclean] = 0
-	$npc_pic[$tempcclean] = ''
-	npc_herpes[$tempcclean] = 0
-	npc_syth[$tempcclean] = 0
-	npc_gon[$tempcclean] = 0
-	npc_thrush[$tempcclean] = 0
-	npc_style[$tempcclean] = 0
-	$npc_PersType[$tempcclean] = ''
-	$npc_dna[$tempcclean] = ''    
 end
 
 i = arrsize('$cemptyarray')

locations/npcgeneratec.qsrc

@@ -1,11 +1,13 @@
 # npcgeneratec
 
 ! {This file expects npctempgsex which is the desired sex of the NPC to be generated, $npctempgn[0], which is the used name of the generated NPC. Rapist or Red Headed Stranger, for example. And npctempgage, which is the approximate age of the NPC in years. Everything is then randomly generated, and you are expected to fix the generated NPC yourself with any special items you need from it after it completes running. So sex, what you call them until they introduce themselves, and age.}
+! The fourth parameters indicates where the encounters occured so we could estimate rank of the npc for boyfriend parameters
 !! {A example to use this would be gs 'npcgeneratec', 0, 'stranger', rand(18,45) which would generate a male with a used name of stranger between 18 and 45.}
 
 npctempgsex = ARGS[0]
 $npctempgn[0] = $ARGS[1]
 npctempgage = ARGS[2]
+npclocation = ARGS[3]
 
 
 !! {First we set the newly generated index number or overwrite the first blank number}
@@ -18,10 +20,10 @@ else
 	i = 0
 	$npclastgenerated = 'C' + '<<carraynumber>>'
 	$npctemparrc = 'C' + '<<(carraynumber)-(1)>>'
-	if $npc_persType[$npctemparrc] = '' and carraynumber > 0:
+	if $npc_perstype[$npctemparrc] = '' and carraynumber > 0:
 		carraynumber -= 1
 		i = 1
-	elseif $npc_persType[$npclastgenerated] = '':
+	elseif $npc_perstype[$npclastgenerated] = '':
 		i = 0
 	else
 		carraynumber += 1
@@ -50,7 +52,6 @@ npc_dob[$npclastgenerated] = npctempc1[1] * 10000
 npc_dob[$npclastgenerated] += (npctempc1[2] * 100)
 npc_dob[$npclastgenerated] += npctempc1[3]
 ! {we save the unique number of the npc, to be able to get the index of the array via arrpos}
-$npc_dob[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Now, we set the variable for the stat randomization as well as calculate chance of virginity.}
 if npctempgage < 18:
@@ -64,8 +65,6 @@ end
 if npctempc2[1] < 20:
 	npc_sexskill[$npclastgenerated] = 0
 end
-! {index}
-$npc_sexskill[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 
 ! {Then we need to give them a name, and establish their official gender}
@@ -111,14 +110,6 @@ else
 	$npc_notes[$npclastgenerated] = 'A male Hermaphrodite.'
 	npc_bust[$npclastgenerated]= rand(0,10)
 end
-! {index}
-$npc_gender[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_spermpot[$npclastgenerated] = '<<npclastgeneratedn>>'
-npc_thdick[$npclastgenerated] = npclastgeneratedn
-$npc_dick[$npclastgenerated] = '<<npclastgeneratedn>>'
-npc_notes[$npclastgenerated] = npclastgeneratedn
-$npc_bust[$npclastgenerated] = '<<npclastgeneratedn>>'
-
 
 ! {Then we set the names, and the stat high ends as determined earlier.}
 gs 'npcrnamefile', 'rusSur'
@@ -127,85 +118,131 @@ $npc_nickname[$npclastgenerated] = $npctempgn[2]
 $npc_lastname[$npclastgenerated] = $npctempgn[3]
 $npc_usedname[$npclastgenerated] = $npctempgn[0]
 npc_intel[$npclastgenerated] = rand(1,npctempc2)
-! {index}
-npc_firstname[$npclastgenerated] = npclastgeneratedn
-npc_nickname[$npclastgenerated] = npclastgeneratedn
-npc_lastname[$npclastgenerated] = npclastgeneratedn
-npc_usedname[$npclastgenerated] = npclastgeneratedn
-$npc_intel[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Then we call out other stats}
 npc_drunk[$npclastgenerated] = 0
-! {index}
-$npc_drunk[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {NPCs start with random horniness}
 npc_horny[$npclastgenerated] = rand(0,60)
-! {index}
-$npc_horny[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Random attractiveness}
 npc_apprnc[$npclastgenerated] = rand(30,60)
-! {index}
-$npc_apprnc[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Random skin quality and body hair}
 npc_height[$npclastgenerated] = 0
-! {index}
-$npc_height[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Random pubic hair}
 npc_haircol[$npclastgenerated] = 0
-! {index}
-$npc_haircol[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Starting at 0 quest state and love for the character, and slightly disliked.}
 npc_QW[$npclastgenerated]= 0
 npc_rel[$npclastgenerated] = 40
 npc_love[$npclastgenerated] = 0
-! {index}
-$npc_QW[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_rel[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_love[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Start unemployed and unspecified location}
 npc_occupation[$npclastgenerated] = 0
 npc_outfit[$npclastgenerated] = 0
-! {index}
-$npc_occupation[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_outfit[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Unspecified dad and <<$npc_nickname[''A29'']>>, and picture. We could have a stock group of pictures and have it pick based on certain attribute types, but...}
 $npc_pic[$npclastgenerated] = 'xPICx'
-! {index}
-npc_pic[$npclastgenerated] = npclastgeneratedn
 
 ! {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_syth[$npclastgenerated] = 0
 npc_gon[$npclastgenerated] = 0
 npc_thrush[$npclastgenerated] = 0
-! {index}
-$npc_herpes[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_syth[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_gon[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_thrush[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Chemestry and clothing preference are unspecified}
 npc_style[$npclastgenerated] = 0
-! {index}
-$npc_style[$npclastgenerated] = '<<npclastgeneratedn>>'
+
+npc_sex[$npclastgenerated] = 0
+npc_perv[$npclastgenerated] = 0
 
 ! {Personality is called up}
 gs 'npcgenext', 'pers'
-$npc_PersType[$npclastgenerated] = $npctempgn[6]
-! {index}
-npc_PersType[$npclastgenerated] = npclastgeneratedn
+$npc_perstype[$npclastgenerated] = $npctempgn[6]
 
 ! {Creating the DNA of the character. If it is someone specific, like father, mother, daughter, sone, etc. then should be overwritten.}
 $npc_dna[$npclastgenerated] = func('DNA','create')
-! {index}
-npc_dna[$npclastgenerated] = npclastgeneratedn
+
+
+
+
+! npc_apt_type = 1: student dorm (only available in the city for obvious reasons)
+! npc_apt_type = 2: studio apartment
+! npc_apt_type = 3: one bedroom apartment (or 2 bedroom by UK/european definition, an apartment that has a separate bedroom unlike a studio)
+! npc_apt_type = 4: multi-bedroom apartment with roommates
+! npc_apt_type = 5: multi-bedroom apartment living alone
+! npc_apt_type = 6: high rise apartment (for rich people only)
+! boyfriend attributes
+
+	
+	npc_finance[$npclastgenerated] = iif(npclocation = 0, 0,rand(0,2)) 
+	
+	if npc_finance[$npclastgenerated] = 0:
+		if npclocation ! 0 and npctempgage < 22:
+			npc_student = rand(0,1)
+			npc_apt_type[$npclastgenerated] = rand(1,4)
+		else
+			npc_apt_type[$npclastgenerated] = rand(2,4)
+		end
+		npc_occupation[$npclastgenerated] = rand(1,7)
+		
+	elseif npc_finance[$npclastgenerated] = 1:
+		npc_apt_type[$npclastgenerated] = rand(2,5)
+		npc_occupation[$npclastgenerated] = rand(7,15)
+	elseif npc_finance[$npclastgenerated] = 2:
+		npc_apt_type[$npclastgenerated] = rand(5,6)
+		npc_occupation[$npclastgenerated] = rand(14,18)
+	end
+	
+!	if npc_occupation = 1: $npc_occupation = cashier at supermarket
+!	if npc_occupation = 2: $npc_occupation = cashier at liquor store
+!	if npc_occupation = 3: $npc_occupation = cashier at coffee shop
+!	if npc_occupation = 4: $npc_occupation = barista
+!	if npc_occupation = 5: $npc_occupation = cheap restaurant job
+!	if npc_occupation = 6: $npc_occupation = taxi driver
+!	if npc_occupation = 7: $npc_occupation = masseuse
+	
+!	if npc_occupation = 8: $npc_occupation = sexual masseuse
+!	if npc_occupation = 9: $npc_occupation = factory job
+!	if npc_occupation = 10: $npc_occupation = bartender
+!	if npc_occupation = 11: $npc_occupation = mechanic
+!	if npc_occupation = 12: $npc_occupation = line cook
+!	if npc_occupation = 13: $npc_occupation = waiter
+!	if npc_occupation = 14: $npc_occupation = personal trainer
+!	if npc_occupation = 15: $npc_occupation = programmer
+
+!	if npc_occupation = 16: $npc_occupation = businessman
+!	if npc_occupation = 17: $npc_occupation = lawyer
+!	if npc_occupation = 18: $npc_occupation = investment banker
+
+
+ npc_humor[$npclastgenerated] = rand(0,3)
+ 
+ npc_fav_pos[$npclastgenerated] = rand(1,7)
+ 
+ npc_tit_pref[$npclastgenerated] = rand(0,3)
+      
+ npc_style[$npclastgenerated] = rand(1,6)
+ 
+ npc_smoker[$npclastgenerated] = rand(0,2)
+ 
+ ! we will skip addit for now, have a variable just for smoking
+ 
+ npc_addit[$npclastgenerated] = rand(0,1)
+ 
+ npc_doors[$npclastgenerated] = rand(0,2)
+
+ npc_goal[$npclastgenerated] = rand(1,3)
+ 
+ npc_fidelity[$npclastgenerated] = rand(1,10)
+ 
+ npc_lover_days[$npclastgenerated] = 0
+ 
+ npc_lover_keys[$npclastgenerated] = 0
+ 
+
 
 ! {Variables are cleaned up.}
 killvar '$npctempgn'

locations/npcpreservec.qsrc

@@ -21,33 +21,68 @@ if mid($npctemp,1,1) = 'C':
 	barraynumber += 1
 	
 	! {This copies the array from Array C to Array B}
-	$npc_firstname[$npclastsaved] = $npc_firstname[$npctemp]
-	$npc_nickname[$npclastsaved] = $npc_nickname[$npctemp]
-	$npc_lastname[$npclastsaved] = $npc_lastname[$npctemp]
-	$npc_usedname[$npclastsaved] = $npc_usedname[$npctemp]
-	$npc_notes[$npclastsaved] = $npc_notes[$npctemp]
-	npc_dob[$npclastsaved] = npc_dob[$npctemp]
-	npc_intel[$npclastsaved] = npc_intel[$npctemp]
-	npc_drunk[$npclastsaved] = npc_drunk[$npctemp]
-	npc_gender[$npclastsaved] = npc_gender[$npctemp]
-	$npc_thdick[$npclastsaved] = $npc_thdick[$npctemp]
-	npc_dick[$npclastsaved] = npc_dick[$npctemp]
-	npc_sexskill[$npclastsaved] = npc_sexskill[$npctemp]
-	npc_spermpot[$npclastsaved] = npc_spermpot[$npctemp]
-	npc_horny[$npclastsaved] = npc_horny[$npctemp]
-	npc_apprnc[$npclastsaved] = npc_apprnc[$npctemp]
-	npc_height[$npclastsaved] = npc_height[$npctemp]
-	npc_bust[$npclastsaved] = npc_bust[$npctemp]
-	npc_haircol[$npclastsaved] = npc_haircol[$npctemp]
-	npc_QW[$npclastsaved] = npc_QW[$npctemp]
-	npc_rel[$npclastsaved] = npc_rel[$npctemp]
-	npc_love[$npclastsaved] = npc_love[$npctemp]
-	$npc_occupation[$npclastsaved] = $npc_occupation[$npctemp]
-	npc_outfit[$npclastsaved] = npc_outfit[$npctemp]
-	$npc_pic[$npclastsaved] = $npc_pic[$npctemp]
-	npc_style[$npclastsaved] = npc_style[$npctemp]
-	$npc_PersType[$npclastsaved] = $npc_PersType[$npctemp]
-	$npc_dna[$npclastsaved] = $npc_dna[$npctemp]
+	$npc_firstname[$npclastsaved]	= $npc_firstname[$npctemp]
+	$npc_nickname[$npclastsaved]	= $npc_nickname[$npctemp]
+	$npc_lastname[$npclastsaved]	= $npc_lastname[$npctemp]
+	$npc_usedname[$npclastsaved]	= $npc_usedname[$npctemp]
+	$npc_notes[$npclastsaved]		= $npc_notes[$npctemp]
+	$npc_pic[$npclastsaved]			= $npc_pic[$npctemp]
+	
+	npc_dob[$npclastsaved]			= npc_dob[$npctemp]
+	npc_gender[$npclastsaved]		= npc_gender[$npctemp]
+
+	npc_height[$npclastsaved]		= npc_height[$npctemp]
+! npc_body
+	npc_haircol[$npclastsaved]		= npc_haircol[$npctemp]
+	npc_apprnc[$npclastsaved]		= npc_apprnc[$npctemp]
+
+	npc_dick[$npclastsaved]			= npc_dick[$npctemp]
+	$npc_thdick[$npclastsaved]		= $npc_thdick[$npctemp]
+
+	npc_spermpot[$npclastsaved]		= npc_spermpot[$npctemp]
+	npc_sexskill[$npclastsaved]		= npc_sexskill[$npctemp]
+
+	npc_drunk[$npclastsaved]		= npc_drunk[$npctemp]
+	npc_horny[$npclastsaved]		= npc_horny[$npctemp]
+
+	npc_rel[$npclastsaved]			= npc_rel[$npctemp]
+	npc_love[$npclastsaved]			= npc_love[$npctemp]
+    npc_sex[$npclastsaved]			= npc_sex[$npctemp]
+	npc_QW[$npclastsaved]			= npc_QW[$npctemp]
+
+	$npc_perstype[$npclastsaved]	= $npc_perstype[$npctemp]
+	$npc_dna[$npclastsaved]			= $npc_dna[$npctemp]
+
+	npc_herpes[$npclastsaved]		= npc_herpes[$npctemp]
+	npc_syth[$npclastsaved]			= npc_syth[$npctemp]
+	npc_gon[$npclastsaved]			= npc_gon[$npctemp]
+	npc_thrush[$npclastsaved]		= npc_thrush[$npctemp]
+
+
+
+!	npc_bust[$npclastsaved]			= npc_bust[$npctemp]
+
+
+	npc_apt_type[$npclastsaved]		= npc_apt_type[$npctemp]
+	npc_perv[$npclastsaved]			= npc_perv[$npctemp]
+	npc_outfit[$npclastsaved]		= npc_outfit[$npctemp]
+	npc_finance[$npclastsaved]		= npc_finance[$npctemp]
+	$npc_occupation[$npclastsaved]	= $npc_occupation[$npctemp]
+	npc_intel[$npclastsaved]		= npc_intel[$npctemp]
+	npc_humor[$npclastsaved]		= npc_humor[$npctemp]
+	npc_fav_pos[$npclastsaved]		= npc_fav_pos[$npctemp]
+	npc_tit_pref[$npclastsaved]		= npc_tit_pref[$npctemp]
+ 			   
+	npc_style[$npclastsaved]		= npc_style[$npctemp]
+	npc_addit[$npclastsaved]		= npc_addit[$npctemp]
+	npc_doors[$npclastsaved]		= npc_doors[$npctemp]
+	npc_goal[$npclastsaved]			= npc_goal[$npctemp]
+	npc_fidelity[$npclastsaved]		= npc_fidelity[$npctemp]
+	npc_lover_days[$npclastsaved]	= 0
+	npc_lover_keys[$npclastsaved]	= 0
+
+	
+	
 
 	! {This checks the miscellanious arrays for the Entry and changes it to the new Array B.}
 	:npctempmloop

locations/shortgs.qsrc

@@ -513,38 +513,75 @@ end
 
 if $ARGS[0] = 'testsize':
 
-	arrsize('$npc_dna')
-	arrsize('$npc_firstname')
-	arrsize('$npc_lastname')
-	arrsize('$npc_nickname')
-	arrsize('$npc_notes')
-	arrsize('$npc_occupation')
-	arrsize('$npc_PersType')
-	arrsize('$npc_pic')
-	arrsize('$npc_rel')
-	arrsize('$npc_thdick')
-	arrsize('$npc_usedname')
-
-	arrsize('npc_apprnc')
-	arrsize('npc_bust')
-	arrsize('npc_outfit')
-	arrsize('npc_style')
-	arrsize('npc_dick')
-	arrsize('npc_dnc')
-	arrsize('npc_dob')
-	arrsize('npc_drunk')
-	arrsize('npc_erodnc')
-	arrsize('npc_gender')
-	arrsize('npc_haircol')
-	arrsize('npc_height')
-	arrsize('npc_horny')
-	arrsize('npc_intel')
-	arrsize('npc_love')
-	arrsize('npc_QW')
-	arrsize('npc_rel')
-	arrsize('npc_sex')
-	arrsize('npc_sexskill')
-	arrsize('npc_spermpot')
+	'$npc_dna = ' + arrsize('$npc_dna')
+	'npc_firstname = ' + arrsize('$npc_firstname')
+	'$npc_lastname = ' + arrsize('$npc_lastname')
+	'npc_nickname = ' + arrsize('$npc_nickname')
+	'$npc_notes = ' + arrsize('$npc_notes')
+	'$npc_occupation = ' + arrsize('$npc_occupation')
+	'$npc_perstype = ' + arrsize('$npc_perstype')
+	'$npc_pic = ' + arrsize('$npc_pic')
+	'$npc_thdick = ' + arrsize('$npc_thdick')
+	'$npc_usedname = ' + arrsize('$npc_usedname')
+
+	'npc_apprnc = ' + arrsize('npc_apprnc')
+	'npc_bust = ' + arrsize('npc_bust')
+	'npc_outfit = ' + arrsize('npc_outfit')
+	'npc_style = ' + arrsize('npc_style')
+	'npc_dick = ' + arrsize('npc_dick')
+	'npc_dob = ' + arrsize('npc_dob')
+	'npc_drunk = ' + arrsize('npc_drunk')
+	'npc_gender = ' + arrsize('npc_gender')
+	'npc_haircol = ' + arrsize('npc_haircol')
+	'npc_height = ' + arrsize('npc_height')
+	'npc_horny = ' + arrsize('npc_horny')
+	'npc_intel = ' + arrsize('npc_intel')
+	'npc_love = ' + arrsize('npc_love')
+	'npc_QW = ' + arrsize('npc_QW')
+	'npc_rel = ' + arrsize('npc_rel')
+	'npc_sex = ' + arrsize('npc_sex')
+	'npc_sexskill = ' + arrsize('npc_sexskill')
+	'npc_spermpot = ' + arrsize('npc_spermpot')
+	
+	'npc_herpes = ' + arrsize('npc_herpes')
+	'npc_syth = ' + arrsize('npc_syth')
+	'npc_gon = ' + arrsize('npc_gon')
+	'npc_thrush = ' + arrsize('npc_thrush')
+	
+	
+	'npc_apt_type = ' + arrsize('npc_apt_type')
+	'npc_perv = ' + arrsize('npc_perv')
+	'npc_finance = ' + arrsize('npc_finance')
+	'npc_humor = ' + arrsize('npc_humor')
+	'npc_fav_pos = ' + arrsize('npc_fav_pos')
+	'npc_tit_pref = ' + arrsize('npc_tit_pref')
+	'npc_addit = ' + arrsize('npc_addit')
+	'npc_doors = ' + arrsize('npc_doors')
+
+	'npc_goal = ' + arrsize('npc_goal')
+	'npc_fidelity = ' + arrsize('npc_fidelity')
+
+	'npc_lover_days = ' + arrsize('npc_lover_days')
+	'npc_lover_keys = ' + arrsize('npc_lover_keys')
+
+end
+
+if $ARGS[0] = 'npctest':
+	' --- init --- '
+	gs 'shortgs', 'testsize'
+	gs 'npcgeneratec', 0, 'stranger', rand(18,45),1
+	$npc_notes[$npclastgenerated]
+	$npclastgenerated
+	' --- gen npc C --- '
+	gs 'shortgs', 'testsize'
+	gs 'npcpreservec', $npclastgenerated
+	$npc_notes[$npclastsaved]
+	$npclastsaved
+	' --- sav npc C to npc B --- '
+	gs 'shortgs', 'testsize'
+	gs 'npccleanc',$npclastsaved
+	' --- delete npc B --- '
+	gs 'shortgs', 'testsize'
 end
 
 if $ARGS[0] = 'replace header':