Prechádzať zdrojové kódy

Make the index ot the npcs' parameters better accessible.

rachels 2 rokov pred
rodič
commit
3b7aa00048

+ 4 - 5
locations/npccleanc.qsrc

@@ -17,20 +17,18 @@ if (mid($tempcclean, 1, 1) = 'B' or mid($tempcclean, 1, 1) = 'C'):
 	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_bust',$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
@@ -47,7 +45,7 @@ if (mid($tempcclean, 1, 1) = 'B' or mid($tempcclean, 1, 1) = 'C'):
 	gs 'shortgs', 'remove_array_element', '$npc_apt_kitchen',$tempcclean
 	gs 'shortgs', 'remove_array_element', '$npc_apt_livingroom',$tempcclean
 	gs 'shortgs', 'remove_array_element', '$npc_apt_bathroom',$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
@@ -55,7 +53,7 @@ if (mid($tempcclean, 1, 1) = 'B' or mid($tempcclean, 1, 1) = 'C'):
 	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
@@ -65,6 +63,7 @@ if (mid($tempcclean, 1, 1) = 'B' or mid($tempcclean, 1, 1) = 'C'):
 	gs 'shortgs', 'remove_array_element', 'npc_lover_keys',$tempcclean
 	gs 'shortgs', 'remove_array_element', 'npc_residence',$tempcclean
 
+	gs 'shortgs', 'remove_array_element', '$npc_index',$tempcclean
 end
 
 i = arrsize('$cemptyarray')

+ 2 - 3
locations/npcgeneratec.qsrc

@@ -45,8 +45,7 @@ else
 end
 carraynumber += 1
 
-! {moved up to here}
-npclastgeneratedn = mid($npclastgenerated, 2)
+$npc_index[$npclastgenerated] = $npclastgenerated
 
 ! {Now we need a random birthday based on the rough age given.}
 npctempc1[1] = year - npctempgage
@@ -158,7 +157,7 @@ npc_outfit[$npclastgenerated] = 0
 ! {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'
 
-! {STDs are not randomly given here. For characters with a STD, you need to gs npcgenext rstd. It will be expecting an npclastgeneratedn variable.}
+! {STDs are not randomly given here. For characters with a STD, you need to gs npcgenext rstd }
 npc_herpes[$npclastgenerated] = 0
 npc_syth[$npclastgenerated] = 0
 npc_gon[$npclastgenerated] = 0

+ 6 - 8
locations/npcpreservec.qsrc

@@ -38,6 +38,7 @@ if mid($npctemp,1,1) = 'C':
 
 	npc_dick[$npclastsaved]			= npc_dick[$npctemp]
 	$npc_thdick[$npclastsaved]		= $npc_thdick[$npctemp]
+	npc_bust[$npclastsaved]			= npc_bust[$npctemp]
 
 	npc_spermpot[$npclastsaved]		= npc_spermpot[$npctemp]
 	npc_sexskill[$npclastsaved]		= npc_sexskill[$npctemp]
@@ -47,7 +48,7 @@ if mid($npctemp,1,1) = 'C':
 
 	npc_rel[$npclastsaved]			= npc_rel[$npctemp]
 	npc_love[$npclastsaved]			= npc_love[$npctemp]
-    npc_sex[$npclastsaved]			= npc_sex[$npctemp]
+	npc_sex[$npclastsaved]			= npc_sex[$npctemp]
 	npc_QW[$npclastsaved]			= npc_QW[$npctemp]
 
 	$npc_perstype[$npclastsaved]	= $npc_perstype[$npctemp]
@@ -58,10 +59,6 @@ if mid($npctemp,1,1) = 'C':
 	npc_gon[$npclastsaved]			= npc_gon[$npctemp]
 	npc_thrush[$npclastsaved]		= npc_thrush[$npctemp]
 
-
-
-!	npc_bust[$npclastsaved]			= npc_bust[$npctemp]
-
 	npc_residence[$npclastsaved]	= npc_residence[$npctemp]
 	npc_apt_type[$npclastsaved]		= npc_apt_type[$npctemp]
 	npc_apt_number[$npclastsaved]	= npc_apt_number[$npctemp]
@@ -110,6 +107,7 @@ if mid($npctemp,1,1) = 'C':
 	npc_pussyeater[$npclastsaved] = npc_pussyeater[$npctemp]
 	npc_cum_cannon[$npclastsaved] = npc_cum_cannon[$npctemp]
 
+	$npc_index[$npclastsaved] = $npclastsaved
 
 	! {This checks the miscellanious arrays for the Entry and changes it to the new Array B.}
 	:npctempmloop
@@ -119,10 +117,10 @@ if mid($npctemp,1,1) = 'C':
 	if npctemp2 >= 0: $sparrnam[npctemp2] = $npclastsaved & jump 'npctempmloop'
 	npctemp2 = arrpos('$cumfthname', $npctemp)
 	if npctemp2 >= 0: $cumfthname[npctemp2] = $npclastsaved & jump 'npctempmloop'
-	npctemp2 = arrpos('$cumfthnames', $npctemp)
-	if npctemp2 >= 0: $cumfthnames[npctemp2] = $npclastsaved & jump 'npctempmloop'
 	npctemp2 = arrpos('$wombpotfath', $npctemp)
 	if npctemp2 >= 0: $wombpotfath[npctemp2] = $npclastsaved & jump 'npctempmloop'
+	npctemp2 = arrpos('$wombName', $npctemp)
+	if npctemp2 >= 0: $wombName[npctemp2] = $npclastsaved & jump 'npctempmloop'
 	npctemp2 = arrpos('$cumfathlotto', $npctemp)
 	if npctemp2 >= 0: $cumfathlotto[npctemp2] = $npclastsaved & jump 'npctempmloop'
 	npctemp2 = arrpos('$ChildFath', $npctemp)
@@ -133,7 +131,7 @@ if mid($npctemp,1,1) = 'C':
 	! {Thic checks Array A for the Entry and changes it to the new Array B. The parts commented out don''t work and need to be replaced with something that does.}
 	if $pcs_firstpart = $npctemp: $pcs_firstpart = $npclastsaved
 	if $pcs_lastpart = $npctemp: $pcs_lastpart = $npclastsaved
-	
+
 	! {This clears the Entry in Array C}
 	gs 'npccleanc', $npctemp
 end