1
0
Эх сурвалжийг харах

remove first part of unused npc attributes

rachels 3 жил өмнө
parent
commit
7604cae035

+ 0 - 3
locations/AlbStars.qsrc

@@ -851,7 +851,6 @@ if $ARGS[0] = 'whore4':
 	$AlbinaQW['Cust'] = $npclastgenerated
 	$npc_thdick[$AlbinaQW['Cust']] = 'massive'
 	npc_dick[$AlbinaQW['Cust']] = 24
-	npc_Malen[$AlbinaQW['Cust']] = rand(10,15)
 	npc_spermpot[$AlbinaQW['Cust']] = 20000
 	gs 'boyStat', $AlbinaQW['Cust']
 
@@ -984,7 +983,6 @@ if $ARGS[0] = 'whore5':
 	$AlbinaQW['Cust'] = $npclastgenerated
 	$npc_thdick[$AlbinaQW['Cust']] = 'massive'
 	npc_dick[$AlbinaQW['Cust']] = 24
-	npc_Malen[$AlbinaQW['Cust']] = rand(10,15)
 	npc_spermpot[$AlbinaQW['Cust']] = 20000
 	gs 'boyStat', $AlbinaQW['Cust']
 
@@ -992,7 +990,6 @@ if $ARGS[0] = 'whore5':
 	$AlbinaQW['Cust1'] = $npclastgenerated
 	$npc_thdick[$AlbinaQW['Cust1']] = 'massive'
 	npc_dick[$AlbinaQW['Cust1']] = 24
-	npc_Malen[$AlbinaQW['Cust1']] = rand(10,15)
 	npc_spermpot[$AlbinaQW['Cust1']] = 20000
 	gs 'boyStat', $AlbinaQW['Cust1'], 'a'
 

+ 0 - 1
locations/Palatka.qsrc

@@ -83,7 +83,6 @@ if $ARGS[0] = 'pal1':
 	act 'Repay in full':
 		sexpartkno = 1
 		gs 'npcgeneratec', 0, 'Black Soldier', rand(18,35)
-		npc_Malen[$npclastgenerated] = rand(10,15)
 		gs 'boyStat', $npclastgenerated
 		guy += 1
 		picrand = 43

+ 2 - 2
locations/journal.qsrc

@@ -167,7 +167,7 @@ if $ARGS[0] = 'records':
 			$journal_school_standing = ' You are in good standing with your clique.'
 		elseif grupTipe < 5:
 			$journal_school_standing = '<font color="red"> You have to work on your clique standing. You''re in danger of being cast out.</font>'
-		end		
+		end
 		
 		if grupTipe = 0:
 			'You are not a member of any particular school social group.'+$journal_school_standing
@@ -177,7 +177,7 @@ if $ARGS[0] = 'records':
 			'Your school social group consists of jocks and natural athletes.'+$journal_school_standing
 		elseif grupTipe = 3:
 			'Your school social group consists of nerds, geeks and good students.'+$journal_school_standing
-			if nerd_game['game_day'] > daystart: 'You have been invited to a games night on <<$week[(week + (nerd_game[''game_day'']  - daystart))]>> at 20:00 in the community center library.')
+			if nerd_game['game_day'] > daystart: 'You have been invited to a games night on <<$week[(week + (nerd_game[''game_day'']  - daystart))]>> at 20:00 in the community center library.'
 			if nerd_game['game_day'] = daystart: 'You have been invited to a games night tonight at 20:00 in the community center library.'
 		elseif grupTipe = 4:
 			'Your school social group consists of gopniks, rebels, punks or troublemakers.'+$journal_school_standing

+ 0 - 44
locations/npccleanc.qsrc

@@ -56,10 +56,7 @@ if mid($tempcclean, 1, 1) = 'C' and npc_firstname['$tempcclean'] > 0:
     $tmpIntArr[] = 'npc_bust'
     $tmpIntArr[] = 'npc_nips'
     $tmpIntArr[] = 'npc_fat'
-    $tmpIntArr[] = 'npc_pubes'
-    $tmpIntArr[] = 'npc_hairlng'
     $tmpIntArr[] = 'npc_haircol'
-    $tmpIntArr[] = 'npc_haircurl'
     $tmpIntArr[] = 'npc_tan'
     $tmpIntArr[] = 'npc_lip'
     $tmpIntArr[] = 'npc_lashes'
@@ -67,22 +64,6 @@ if mid($tempcclean, 1, 1) = 'C' and npc_firstname['$tempcclean'] > 0:
     $tmpIntArr[] = 'npc_eyecol'
     $tmpIntArr[] = 'npc_dom'
     $tmpIntArr[] = 'npc_sub'
-    $tmpIntArr[] = 'npc_glasses'
-    $tmpIntArr[] = 'npc_grades'
-    $tmpIntArr[] = 'npc_run'
-    $tmpIntArr[] = 'npc_vball'
-    $tmpIntArr[] = 'npc_shoot'
-    $tmpIntArr[] = 'npc_sewing'
-    $tmpIntArr[] = 'npc_serving'
-    $tmpIntArr[] = 'npc_chess'
-    $tmpIntArr[] = 'npc_dance'
-    $tmpIntArr[] = 'npc_danceero'
-    $tmpIntArr[] = 'npc_jab'
-    $tmpIntArr[] = 'npc_punch'
-    $tmpIntArr[] = 'npc_kick'
-    $tmpIntArr[] = 'npc_def'
-    $tmpIntArr[] = 'npc_vokal'
-    $tmpIntArr[] = 'npc_teach'
     $tmpIntArr[] = 'npc_QW'
     $tmpIntArr[] = 'npc_rel'
     $tmpIntArr[] = 'npc_love'
@@ -91,10 +72,7 @@ if mid($tempcclean, 1, 1) = 'C' and npc_firstname['$tempcclean'] > 0:
     $tmpIntArr[] = 'npc_herpes'
     $tmpIntArr[] = 'npc_syth'
     $tmpIntArr[] = 'npc_gon'
-    $tmpIntArr[] = 'npc_chlam'
-    $tmpIntArr[] = 'npc_genwart'
     $tmpIntArr[] = 'npc_thrush'
-    $tmpIntArr[] = 'npc_malen'
     $tmpIntArr[] = 'npc_chem'
     $tmpIntArr[] = 'npc_clothpref'
 
@@ -171,10 +149,7 @@ else
 	npc_bust[$tempcclean] = 0
 	npc_nips[$tempcclean] = 0
 	npc_fat[$tempcclean] = 0
-	npc_pubes[$tempcclean] = 0
-	npc_hairlng[$tempcclean] = 0
 	npc_haircol[$tempcclean] = 0
-	npc_haircurl[$tempcclean] = 0
 	npc_tan[$tempcclean] = 0
 	npc_lip[$tempcclean] = 0
 	npc_lashes[$tempcclean] = 0
@@ -182,22 +157,6 @@ else
 	npc_eyecol[$tempcclean] = 0
 	npc_dom[$tempcclean] = 0
 	npc_sub[$tempcclean] = 0
-	npc_glasses[$tempcclean] = 0
-	npc_grades[$tempcclean] = 0
-	npc_run[$tempcclean] = 0
-	npc_vball[$tempcclean] = 0
-	npc_shoot[$tempcclean] = 0
-	npc_sewing[$tempcclean] = 0
-	npc_serving[$tempcclean] = 0
-	npc_chess[$tempcclean] = 0
-	npc_dance[$tempcclean] = 0
-	npc_danceero[$tempcclean] = 0
-	npc_jab[$tempcclean] = 0
-	npc_punch[$tempcclean] = 0
-	npc_kick[$tempcclean] = 0
-	npc_def[$tempcclean] = 0
-	npc_vokal[$tempcclean] = 0
-	npc_teach[$tempcclean] = 0
 	npc_QW[$tempcclean] = 0
 	npc_rel[$tempcclean] = 0
 	npc_love[$tempcclean] = 0
@@ -209,10 +168,7 @@ else
 	npc_herpes[$tempcclean] = 0
 	npc_syth[$tempcclean] = 0
 	npc_gon[$tempcclean] = 0
-	npc_chlam[$tempcclean] = 0
-	npc_genwart[$tempcclean] = 0
 	npc_thrush[$tempcclean] = 0
-	npc_malen[$tempcclean] = 0
 	npc_chem[$tempcclean] = 0
 	npc_clothpref[$tempcclean] = 0
 	$npc_PersType[$tempcclean] = ''

+ 2 - 49
locations/npcgeneratec.qsrc

@@ -241,10 +241,7 @@ $npc_hgt[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_fat[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Random pubic hair}
-npc_pubes[$npclastgenerated] = rand(0,1)
-npc_hairlng[$npclastgenerated] = 0
 npc_haircol[$npclastgenerated] = 0
-npc_haircurl[$npclastgenerated] = 0
 npc_tan[$npclastgenerated] = 0
 npc_lip[$npclastgenerated] = 0
 npc_lashes[$npclastgenerated] = 0
@@ -253,10 +250,7 @@ npc_eyecol[$npclastgenerated] = 0
 npc_dom[$npclastgenerated] = 0
 npc_sub[$npclastgenerated] = 0
 ! {index}
-$npc_pubes[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_hairlng[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_haircol[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_haircurl[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_tan[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_lip[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_lashes[$npclastgenerated] = '<<npclastgeneratedn>>'
@@ -265,41 +259,6 @@ $npc_eyecol[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_dom[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_sub[$npclastgenerated] = '<<npclastgeneratedn>>'
 
-! {Random glasses, grades, and other skills, based on age established above.}
-npc_glasses[$npclastgenerated] = rand(0,1)
-npc_grades[$npclastgenerated] = rand(40,100)
-npc_run[$npclastgenerated] = rand(0,(npctempc2 + 10))
-npc_vball[$npclastgenerated] = rand(0,(npctempc2 + 10))
-npc_shoot[$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_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_vokal[$npclastgenerated] = rand(0,(npctempc2 + 10))
-npc_teach[$npclastgenerated] = rand(0,(npctempc2 + 10))
-! {index}
-$npc_glasses[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_grades[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_run[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_vball[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_shoot[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_sewing[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_serving[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_chess[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_dance[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_danceero[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_jab[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_punch[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_kick[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_def[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_vokal[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_teach[$npclastgenerated] = '<<npclastgeneratedn>>'
-
 ! {Starting at 0 quest state and love for the character, and slightly disliked.}
 npc_QW[$npclastgenerated]= 0
 npc_rel[$npclastgenerated] = 40
@@ -329,18 +288,12 @@ npc_pic[$npclastgenerated] = npclastgeneratedn
 npc_herpes[$npclastgenerated] = 0
 npc_syth[$npclastgenerated] = 0
 npc_gon[$npclastgenerated] = 0
-npc_chlam[$npclastgenerated] = 0
-npc_genwart[$npclastgenerated] = 0
-npc_Thrush[$npclastgenerated] = 0
-npc_Malen[$npclastgenerated] = 0
+npc_thrush[$npclastgenerated] = 0
 ! {index}
 $npc_herpes[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_syth[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_gon[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_chlam[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_genwart[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_Thrush[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_Malen[$npclastgenerated] = '<<npclastgeneratedn>>'
+$npc_thrush[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Chemestry and clothing preference are unspecified}
 npc_Chem[$npclastgenerated] = 0

+ 6 - 4
locations/npcgenext.qsrc

@@ -125,13 +125,15 @@ if $args[0] = 'rstd':
 		$tempvan1 = $ARGS[1]
 	end
 	if rand(0,100) = 100:
-		tempvenerial = rand(1,7)
+		tempvenerial = rand(1,4)
+!! Herpes simplex virus 1 and 2 (HSV-1 and HSV-2) are common and contagious. About 67% of the world population under the age of 50 has HSV-1
 		if tempvenerial = 1: npc_herpes[$tempvan1] = 1
+!! Syphilis is a sexually transmitted infection caused by the bacterium
 		if tempvenerial = 2: npc_syth[$tempvan1] = 1
+!! Gonorrhea, colloquially known as the clap, is a sexually transmitted infection (STI) caused by the bacterium
 		if tempvenerial = 3: npc_gon[$tempvan1] = 1
-		if tempvenerial = 4: npc_chlam[$tempvan1] = 1
-		if tempvenerial = 6: npc_genwart[$tempvan1] = 1
-		if tempvenerial = 7: npc_thrush[$tempvan1] = 1
+!! Candidiasis is a fungal infection due to any type of Candida. When it affects the mouth, in some countries it is commonly called thrush.
+		if tempvenerial = 4: npc_thrush[$tempvan1] = 1
 	end
 	killvar 'tempvenerial'
 	killvar '$tempvan1'

+ 0 - 26
locations/npcpreservec.qsrc

@@ -65,10 +65,7 @@ if mid($npctemp,1,1) = 'C':
 	npc_bust[$npclastsaved] = npc_bust[$npctemp]
 	npc_nips[$npclastsaved] = npc_nips[$npctemp]
 	npc_fat[$npclastsaved] = npc_fat[$npctemp]
-	npc_pubes[$npclastsaved] = npc_pubes[$npctemp]
-	npc_hairlng[$npclastsaved] = npc_hairlng[$npctemp]
 	npc_haircol[$npclastsaved] = npc_haircol[$npctemp]
-	npc_haircurl[$npclastsaved] = npc_haircurl[$npctemp]
 	npc_tan[$npclastsaved] = npc_tan[$npctemp]
 	npc_lip[$npclastsaved] = npc_lip[$npctemp]
 	npc_lashes[$npclastsaved] = npc_lashes[$npctemp]
@@ -76,22 +73,6 @@ if mid($npctemp,1,1) = 'C':
 	npc_eyecol[$npclastsaved] = npc_eyecol[$npctemp]
 	npc_dom[$npclastsaved] = npc_dom[$npctemp]
 	npc_sub[$npclastsaved] = npc_sub[$npctemp]
-	npc_glasses[$npclastsaved] = npc_glasses[$npctemp]
-	npc_grades[$npclastsaved] = npc_grades[$npctemp]
-	npc_run[$npclastsaved] = npc_run[$npctemp]
-	npc_vball[$npclastsaved] = npc_vball[$npctemp]
-	npc_shoot[$npclastsaved] = npc_shoot[$npctemp]
-	npc_sewing[$npclastsaved] = npc_sewing[$npctemp]
-	npc_serving[$npclastsaved] = npc_serving[$npctemp]
-	npc_chess[$npclastsaved] = npc_chess[$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_vokal[$npclastsaved] = npc_vokal[$npctemp]
-	npc_teach[$npclastsaved] = npc_teach[$npctemp]
 	npc_QW[$npclastsaved] = npc_QW[$npctemp]
 	npc_rel[$npclastsaved] = npc_rel[$npctemp]
 	npc_love[$npclastsaved] = npc_love[$npctemp]
@@ -100,13 +81,6 @@ if mid($npctemp,1,1) = 'C':
 	$npc_dad[$npclastsaved] = $npc_dad[$npctemp]
 	$npc_mom[$npclastsaved] = $npc_mom[$npctemp]
 	$npc_pic[$npclastsaved] = $npc_pic[$npctemp]
-	npc_herpes[$npclastsaved] = npc_herpes[$npctemp]
-	npc_syth[$npclastsaved] = npc_syth[$npctemp]
-	npc_gon[$npclastsaved] = npc_gon[$npctemp]
-	npc_chlam[$npclastsaved] = npc_chlam[$npctemp]
-	npc_genwart[$npclastsaved] = npc_genwart[$npctemp]
-	npc_Thrush[$npclastsaved] = npc_Thrush[$npctemp]
-	npc_Malen[$npclastsaved] = npc_Malen[$npctemp]
 	npc_Chem[$npclastsaved] = npc_Chem[$npctemp]
 	npc_Clothpref[$npclastsaved] = npc_Clothpref[$npctemp]
 	$npc_PersType[$npclastsaved] = $npc_PersType[$npctemp]

+ 0 - 26
locations/npcstatic1.qsrc

@@ -49,10 +49,7 @@ npc_hgt['A<<npctemp>>'] = 0
 npc_bust['A<<npctemp>>'] = 0
 npc_nips['A<<npctemp>>'] = 1
 npc_fat['A<<npctemp>>'] = 0
-npc_pubes['A<<npctemp>>'] = 0
-npc_hairlng['A<<npctemp>>'] = 0
 npc_haircol['A<<npctemp>>'] = 0
-npc_haircurl['A<<npctemp>>'] = 0
 npc_tan['A<<npctemp>>'] = 0
 npc_lip['A<<npctemp>>'] = 0
 npc_lashes['A<<npctemp>>'] = 0
@@ -61,22 +58,6 @@ npc_eyecol['A<<npctemp>>'] = 0
 !! create and use dom/sub in the npcs story, if needed, not in npcstatic
 npc_dom['A<<npctemp>>'] = 0
 npc_sub['A<<npctemp>>'] = 0
-npc_glasses['A<<npctemp>>'] = 0
-npc_grades['A<<npctemp>>'] = 0
-npc_run['A<<npctemp>>'] = rand(1,10)
-npc_vball['A<<npctemp>>'] = rand(1,10)
-npc_shoot['A<<npctemp>>'] = rand(1,10)
-npc_sewing['A<<npctemp>>'] = rand(1,10)
-npc_serving['A<<npctemp>>'] = rand(1,10)
-npc_chess['A<<npctemp>>'] = rand(1,10)
-npc_dance['A<<npctemp>>'] = rand(1,10)
-npc_danceero['A<<npctemp>>'] = rand(1,10)
-npc_jab['A<<npctemp>>'] = rand(1,10)
-npc_punch['A<<npctemp>>'] = rand(1,10)
-npc_kick['A<<npctemp>>'] = rand(1,10)
-npc_def['A<<npctemp>>'] = rand(1,10)
-npc_vokal['A<<npctemp>>'] = rand(1,10)
-npc_teach['A<<npctemp>>'] = rand(1,10)
 npc_QW['A<<npctemp>>'] = 0
 npc_rel['A<<npctemp>>'] = 0
 npc_love['A<<npctemp>>'] = 0
@@ -85,13 +66,6 @@ npc_cloc['A<<npctemp>>'] = 0
 $npc_dad['A<<npctemp>>'] = 'A160'
 $npc_mom['A<<npctemp>>'] = 'U'
 $npc_pic['A<<npctemp>>'] = 'xPICx'
-npc_herpes['A<<npctemp>>'] = 0
-npc_syth['A<<npctemp>>'] = 0
-npc_gon['A<<npctemp>>'] = 0
-npc_chlam['A<<npctemp>>'] = 0
-npc_genwart['A<<npctemp>>'] = 0
-npc_thrush['A<<npctemp>>'] = 0
-npc_malen['A<<npctemp>>'] = 0
 npc_chem['A<<npctemp>>'] = 0
 npc_clothpref['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'

+ 0 - 20
locations/npcstatic4.qsrc

@@ -510,7 +510,6 @@ $npc_notes['A<<npctemp>>'] = 'Erotic model'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 npc_bust['A<<npctemp>>'] = 9
-npc_danceero['A<<npctemp>>'] = rand(20,40)
 
 
 npctemp = 188
@@ -598,7 +597,6 @@ $npc_thdick['A<<npctemp>>'] = 'monstrous'
 npc_dick['A<<npctemp>>'] = 26
 npc_sexskill['A<<npctemp>>'] = 2
 npc_spermpot['A<<npctemp>>'] = 12000
-npc_hairlng['A<<npctemp>>'] = 200
 npc_haircol['A<<npctemp>>'] = 3
 npc_eyecol['A<<npctemp>>'] = 1
 
@@ -616,11 +614,8 @@ gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 16
 npc_sexskill['A<<npctemp>>'] = 2
-npc_hairlng['A<<npctemp>>'] = 20
 npc_haircol['A<<npctemp>>'] = 1
-npc_haircurl['A<<npctemp>>'] = 1
 npc_eyecol['A<<npctemp>>'] = 1
-npc_dance['A<<npctemp>>'] = 25
 
 
 npctemp = 195
@@ -637,9 +632,7 @@ $npc_thdick['A<<npctemp>>'] = 'slim'
 npc_dick['A<<npctemp>>'] = 18
 npc_sexskill['A<<npctemp>>'] = 1
 npc_spermpot['A<<npctemp>>'] = 8000
-npc_hairlng['A<<npctemp>>'] = 20
 npc_haircol['A<<npctemp>>'] = 1
-npc_haircurl['A<<npctemp>>'] = 1
 npc_eyecol['A<<npctemp>>'] = 1
 
 
@@ -662,12 +655,9 @@ $npc_thdick['A<<npctemp>>'] = 'thick'
 npc_dick['A<<npctemp>>'] = 17
 npc_sexskill['A<<npctemp>>'] = 1
 npc_spermpot['A<<npctemp>>'] = 11000
-npc_hairlng['A<<npctemp>>'] = 60
 npc_haircol['A<<npctemp>>'] = 2
 npc_tan['A<<npctemp>>'] = 1
 npc_eyecol['A<<npctemp>>'] = 2
-npc_glasses['A<<npctemp>>'] = 1
-npc_run['A<<npctemp>>'] = 30
 
 
 npctemp = 197
@@ -684,11 +674,9 @@ $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 18
 npc_sexskill['A<<npctemp>>'] = 2
 npc_spermpot['A<<npctemp>>'] = 18000
-npc_hairlng['A<<npctemp>>'] = 100
 npc_haircol['A<<npctemp>>'] = 2
 npc_tan['A<<npctemp>>'] = 1
 npc_eyecol['A<<npctemp>>'] = 2
-npc_glasses['A<<npctemp>>'] = 1
 
 
 npctemp = 198
@@ -704,12 +692,9 @@ gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 17
 npc_sexskill['A<<npctemp>>'] = 1
-npc_hairlng['A<<npctemp>>'] = 40
 npc_haircol['A<<npctemp>>'] = 3
 npc_tan['A<<npctemp>>'] = 1
 npc_eyecol['A<<npctemp>>'] = 2
-npc_run['A<<npctemp>>'] = 10
-npc_dance['A<<npctemp>>'] = 30
 
 
 npctemp = 199
@@ -728,11 +713,6 @@ npc_dick['A<<npctemp>>'] = 15
 npc_sexskill['A<<npctemp>>'] = 1
 npc_spermpot['A<<npctemp>>'] = 10500
 npc_hgt['A<<npctemp>>'] = 182
-npc_hairlng['A<<npctemp>>'] = 60
-npc_run['A<<npctemp>>'] = 30
-npc_dance['A<<npctemp>>'] = 30
-npc_vokal['A<<npctemp>>'] = 30
-
 
 --- npcstatic4 ---------------------------------
 

+ 0 - 4
locations/npcstatic5.qsrc

@@ -17,8 +17,6 @@ npc_dick['A<<npctemp>>'] = 19
 npc_sexskill['A<<npctemp>>'] = 1
 npc_spermpot['A<<npctemp>>'] = 9000
 npc_hgt['A<<npctemp>>'] = 172
-npc_hairlng['A<<npctemp>>'] = 50
-
 
 npctemp = 201
 $npc_dna['A<<npctemp>>'] = '7997566748 7105919378 7895527285 1850847152 1168395089 1748895937 1871858376'
@@ -459,7 +457,6 @@ npc_dick['A<<npctemp>>'] = 19
 npc_sexskill['A<<npctemp>>'] = 1
 npc_spermpot['A<<npctemp>>'] = 9000
 npc_hgt['A<<npctemp>>'] = 172
-npc_hairlng['A<<npctemp>>'] = 50
 
 
 npctemp = 228
@@ -543,7 +540,6 @@ npc_hymen['A<<npctemp>>'] = -1
 npc_hgt['A<<npctemp>>'] = 170
 npc_bust['A<<npctemp>>'] = 9
 npc_nips['A<<npctemp>>'] = 4
-npc_hairlng['A<<npctemp>>'] = 300
 npc_haircol['A<<npctemp>>'] = 1
 npc_tan['A<<npctemp>>'] = 1
 npc_lip['A<<npctemp>>'] = 1

+ 0 - 36
locations/npcstaticdefaults.qsrc

@@ -48,40 +48,6 @@ if $ARGS[0] = 'defaults':
 elseif $ARGS[0] = 'attribs':
 	! standard attribute values
 }
-elseif $ARGS[0] = 'skills':
-	if Enable_Android = 1:
-		if arrpos('$ARGS', 'combat', 1) > 0:
-			npc_jab['A<<npctemp>>'] = 20
-			npc_punch['A<<npctemp>>'] = 20
-			npc_kick['A<<npctemp>>'] = 20
-			npc_def['A<<npctemp>>'] = 30
-		end
-		if arrpos('$ARGS', 'dance', 1) > 0:
-			npc_dance['A<<npctemp>>'] = 30
-			npc_danceero['A<<npctemp>>'] = 10
-		end
-		if arrpos('$ARGS', 'sport', 1) > 0:
-			npc_run['A<<npctemp>>'] = 30
-			npc_vball['A<<npctemp>>'] = 30
-			npc_chess['A<<npctemp>>'] = 30
-		end
-	else
-		if arrpos(1, '$ARGS', 'combat') > 0:
-			npc_jab['A<<npctemp>>'] = 20
-			npc_punch['A<<npctemp>>'] = 20
-			npc_kick['A<<npctemp>>'] = 20
-			npc_def['A<<npctemp>>'] = 30
-		end
-		if arrpos(1, '$ARGS', 'dance') > 0:
-			npc_dance['A<<npctemp>>'] = 30
-			npc_danceero['A<<npctemp>>'] = 10
-		end
-		if arrpos(1, '$ARGS', 'sport') > 0:
-			npc_run['A<<npctemp>>'] = 30
-			npc_vball['A<<npctemp>>'] = 30
-			npc_chess['A<<npctemp>>'] = 30
-		end
-	end
 elseif $ARGS[0] = 'body':
 	if $ARGS[1] = 'model':
 		npc_vag['A<<npctemp>>'] = 30
@@ -92,7 +58,6 @@ elseif $ARGS[0] = 'body':
 		npc_skin['A<<npctemp>>'] = 100
 		npc_hgt['A<<npctemp>>'] = 165
 		npc_bust['A<<npctemp>>'] = 40
-		npc_hairlng['A<<npctemp>>'] = 100
 		npc_haircol['A<<npctemp>>'] = 2
 		npc_lip['A<<npctemp>>'] = 2
 		npc_lashes['A<<npctemp>>'] = 2
@@ -100,7 +65,6 @@ elseif $ARGS[0] = 'body':
 		npc_eyecol['A<<npctemp>>'] = 3
 	elseif $ARGS[1] = 'actor':
 		npc_hgt['A<<npctemp>>'] = 188
-		npc_hairlng['A<<npctemp>>'] = 20
 		npc_tan['A<<npctemp>>'] = 1
 		npc_lip['A<<npctemp>>'] = 1
 		npc_eyecol['A<<npctemp>>'] = 1

+ 19 - 37
locations/saveupdater.qsrc

@@ -321,37 +321,26 @@ gs 'spellList'
 if array_updater = 0:
 	array_updater = 1
 	$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'
+	$oldnpcvars[1] = 'npc_hair'
+	$oldnpcvars[2] = 'npc_int'
+	$oldnpcvars[3] = 'npc_lipstick'
+	$oldnpcvars[4] = 'npc_mag'
+	$oldnpcvars[5] = 'npc_undies'
+	$oldnpcvars[6] = 'npc_Qstlvl'
+	$oldnpcvars[7] = 'npc_spirit'
+	$oldnpcvars[8] = 'npc_str'
+	$oldnpcvars[9] = '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'
+	$newnpcvars[1] = 'npc_hairbsh'
+	$newnpcvars[2] = 'npc_intel'
+	$newnpcvars[3] = 'npc_lipbalm'
+	$newnpcvars[4] = 'npc_magik'
+	$newnpcvars[5] = 'npc_pantys'
+	$newnpcvars[6] = 'npc_QW'
+	$newnpcvars[7] = 'npc_sprt'
+	$newnpcvars[8] = 'npc_stren'
+	$newnpcvars[9] = 'npc_vital'
 
 	i = 0
 	:npcvarloop
@@ -364,21 +353,14 @@ if array_updater = 0:
 		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'

+ 0 - 26
locations/shortgs.qsrc

@@ -538,9 +538,6 @@ if $ARGS[0] = 'testsize':
 	arrsize('npc_cloc')
 	arrsize('npc_clothpref')
 	arrsize('npc_cyc')
-	arrsize('npc_dance')
-	arrsize('npc_danceero')
-	arrsize('npc_def')
 	arrsize('npc_dick')
 	arrsize('npc_dnc')
 	arrsize('npc_dob')
@@ -553,61 +550,38 @@ if $ARGS[0] = 'testsize':
 	arrsize('npc_fat')
 	arrsize('npc_fert')
 	arrsize('npc_gender')
-	arrsize('npc_genwart')
-	arrsize('npc_glasses')
 	arrsize('npc_Godrep')
-	arrsize('npc_gon')
-	arrsize('npc_grades')
 	arrsize('npc_hairbsh')
 	arrsize('npc_haircol')
-	arrsize('npc_haircurl')
-	arrsize('npc_hairlng')
-	arrsize('npc_herpes')
 	arrsize('npc_hgt')
 	arrsize('npc_hipcurv')
 	arrsize('npc_horny')
 	arrsize('npc_hymen')
 	arrsize('npc_chem')
-	arrsize('npc_chess')
-	arrsize('npc_chlam')
 	arrsize('npc_intel')
-	arrsize('npc_jab')
 	arrsize('npc_job')
-	arrsize('npc_kick')
 	arrsize('npc_lashes')
 	arrsize('npc_lip')
 	arrsize('npc_lipbalm')
 	arrsize('npc_love')
 	arrsize('npc_magik')
 	arrsize('npc_makeup')
-	arrsize('npc_malen')
 	arrsize('npc_nips')
 	arrsize('npc_pantys')
 	arrsize('npc_Pavrep')
-	arrsize('npc_pubes')
-	arrsize('npc_punch')
 	arrsize('npc_QW')
 	arrsize('npc_rel')
-	arrsize('npc_run')
-	arrsize('npc_serving')
-	arrsize('npc_sewing')
 	arrsize('npc_sex')
 	arrsize('npc_sexskill')
-	arrsize('npc_shoot')
 	arrsize('npc_skin')
 	arrsize('npc_spermpot')
 	arrsize('npc_sprt')
 	arrsize('npc_stren')
 	arrsize('npc_sub')
 	arrsize('npc_sweat')
-	arrsize('npc_syth')
 	arrsize('npc_tan')
-	arrsize('npc_teach')
-	arrsize('npc_thrush')
 	arrsize('npc_vag')
-	arrsize('npc_vball')
 	arrsize('npc_vital')
-	arrsize('npc_vokal')
 end
 
 if $ARGS[0] = 'replace header':