Browse Source

add a new npc attribute - npc_residence

rachels 3 years ago
parent
commit
ed3375a45c
3 changed files with 67 additions and 64 deletions
  1. 38 37
      locations/npccleanc.qsrc
  2. 25 24
      locations/npcgeneratec.qsrc
  3. 4 3
      locations/npcpreservec.qsrc

+ 38 - 37
locations/npccleanc.qsrc

@@ -4,59 +4,60 @@
 $tempcclean = $ARGS[0]
 
 if (mid($tempcclean, 1, 1) = 'B' or mid($tempcclean, 1, 1) = 'C'):
-	
+
 	gs 'shortgs', 'remove_array_element', 'npc_firstname',$tempcclean
 
-    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_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_outfit',$tempcclean
 	gs 'shortgs', 'remove_array_element', 'npc_finance',$tempcclean
-    gs 'shortgs', 'remove_array_element', 'npc_intel',$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_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
+	gs 'shortgs', 'remove_array_element', 'npc_residence',$tempcclean
 
 end
 

+ 25 - 24
locations/npcgeneratec.qsrc

@@ -7,7 +7,7 @@
 npctempgsex = ARGS[0]
 $npctempgn[0] = $ARGS[1]
 npctempgage = ARGS[2]
-npclocation = ARGS[3]
+temp_location = ARGS[3]
 
 
 !! {First we set the newly generated index number or overwrite the first blank number}
@@ -177,10 +177,10 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 ! boyfriend attributes
 
 	
-	npc_finance[$npclastgenerated] = iif(npclocation = 0, 0,rand(0,2)) 
+	npc_finance[$npclastgenerated] = iif(temp_location = 0, 0,rand(0,2)) 
 	
 	if npc_finance[$npclastgenerated] = 0:
-		if npclocation ! 0 and npctempgage < 22:
+		if temp_location ! 0 and npctempgage < 22:
 			npc_student = rand(0,1)
 			npc_apt_type[$npclastgenerated] = rand(1,4)
 		else
@@ -218,31 +218,31 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 !	if npc_occupation = 18: $npc_occupation = investment banker
 
 
- npc_humor[$npclastgenerated] = rand(0,3)
+	npc_humor[$npclastgenerated] = rand(0,3)
  
- npc_fav_pos[$npclastgenerated] = rand(1,7)
+	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_tit_pref[$npclastgenerated] = rand(0,3)
 
- npc_goal[$npclastgenerated] = rand(1,3)
- 
- npc_fidelity[$npclastgenerated] = rand(1,10)
- 
- npc_lover_days[$npclastgenerated] = 0
- 
- npc_lover_keys[$npclastgenerated] = 0
- 
+	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
 
+	npc_residence[$npclastgenerated] = temp_location
 
 ! {Variables are cleaned up.}
 killvar '$npctempgn'
@@ -252,6 +252,7 @@ killvar 'npctempgsex'
 killvar '$npctempgn'
 killvar 'npctempgage'
 killvar '$npctemparrc'
+killvar 'temp_location'
 
 --- npcgeneratec ---------------------------------
 

+ 4 - 3
locations/npcpreservec.qsrc

@@ -72,7 +72,7 @@ if mid($npctemp,1,1) = 'C':
 	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]
@@ -80,9 +80,10 @@ if mid($npctemp,1,1) = 'C':
 	npc_fidelity[$npclastsaved]		= npc_fidelity[$npctemp]
 	npc_lover_days[$npclastsaved]	= 0
 	npc_lover_keys[$npclastsaved]	= 0
+	npc_residence[$npclastsaved]	= npc_residence[$npctemp]
+
+
 
-	
-	
 
 	! {This checks the miscellanious arrays for the Entry and changes it to the new Array B.}
 	:npctempmloop