Browse Source

[fixed] npcstatic calls before last name was set lead to empty last names for family. Reported by Myles

anjuna krokus 2 weeks ago
parent
commit
f53f97689b

+ 14 - 14
locations/intro_city_select.qsrc

@@ -39,20 +39,6 @@ if $ARGS[0] = 'start':
 	killvar 'class_list_institution'
 	killvar 'class_list_name'
 
-	gs 'npcstatic1'
-	gs 'npcstatic2'
-	gs 'npcstatic3'
-	gs 'npcstatic4'
-	gs 'npcstatic5'
-	gs 'npcstatic6'
-
-	!! default friendship is 30 for all  npcs
-	gs 'npc_relationship', 'default'
-	!! changes the values for family members and old friends
-	gs 'npc_relationship', 'default_family_friends'
-	!! Makes sure Christina hates the player character
-	npc_rel['A18'] = 1
-
 	!!Default Names
 	$pcs_firstname = 'Svetlana'
 	$pcs_lastname = 'Lebedev'
@@ -74,6 +60,20 @@ if $ARGS[0] = 'start':
 	if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
 	killvar '$temp_nickname'
 
+	gs 'npcstatic1'
+	gs 'npcstatic2'
+	gs 'npcstatic3'
+	gs 'npcstatic4'
+	gs 'npcstatic5'
+	gs 'npcstatic6'
+
+	!! default friendship is 30 for all  npcs
+	gs 'npc_relationship', 'default'
+	!! changes the values for family members and old friends
+	gs 'npc_relationship', 'default_family_friends'
+	!! Makes sure Christina hates the player character
+	npc_rel['A18'] = 1
+
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/pre_1.jpg"></center>'
 	'You are <<$pcs_firstname>> <<$pcs_lastname>>, nicknamed <<$pcs_nickname>> for short.'
 	'Your mother''s name is <<$npc_firstname[''A29'']>> and your biological father left when you were a baby, your mother marrying your stepfather, <<$npc_firstname[''A28'']>>, shortly afterwards.'

+ 1 - 1
locations/intro_initialization.qsrc

@@ -163,5 +163,5 @@ gs 'body', 'Update_Body'
 gs 'body', 'DailyUpdate'
 pcs_stam = stammax
 
---- intro_initialization ---------------------------------
 
+--- intro_initialization ---------------------------------

+ 14 - 14
locations/intro_sg_select.qsrc

@@ -12,20 +12,6 @@ if $ARGS[0] = 'start':
 
 	dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
 
-	gs 'npcstatic1'
-	gs 'npcstatic2'
-	gs 'npcstatic3'
-	gs 'npcstatic4'
-	gs 'npcstatic5'
-	gs 'npcstatic6'
-
-	!! default friendship is 30 for all npcs
-	gs 'npc_relationship', 'default'
-	!! changes the values for family members and old friends
-	gs 'npc_relationship', 'default_family_friends'
-	!! Makes sure Christina hates the player character
-	npc_rel['A18'] = 1
-
 	if $start_type['magic'] ! 'tg':
 		!!Default Names
 		$pcs_firstname = 'Svetlana'
@@ -49,6 +35,20 @@ if $ARGS[0] = 'start':
 		killvar '$temp_nickname'
 	end
 
+	gs 'npcstatic1'
+	gs 'npcstatic2'
+	gs 'npcstatic3'
+	gs 'npcstatic4'
+	gs 'npcstatic5'
+	gs 'npcstatic6'
+
+	!! default friendship is 30 for all npcs
+	gs 'npc_relationship', 'default'
+	!! changes the values for family members and old friends
+	gs 'npc_relationship', 'default_family_friends'
+	!! Makes sure Christina hates the player character
+	npc_rel['A18'] = 1
+
 	$pcs_dna = func('dna','generate', $npc_dna['A29'], $npc_dna['A35'])
 	gs 'homes_properties', 'give_access', 'parents_home'
 	gs 'homes_properties', 'set_home', 'parents_home'

+ 2 - 2
locations/intro_sg_tg.qsrc

@@ -167,8 +167,6 @@ if $ARGS[0] = 'settings':
 
 	ml_update_1 = 1
 
-	$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
-
 	gs 'npcstatic1'
 	gs 'npcstatic2'
 	gs 'npcstatic3'
@@ -188,6 +186,8 @@ if $ARGS[0] = 'settings':
 
 	npc_rel['A25'] -= 5
 
+	$pcs_dna = func('dna', 'generate', $npc_dna['A29'], $npc_dna['A35'])
+
 	gs 'homes_properties', 'give_access', 'parents_home'
 	gs 'homes_properties', 'set_home', 'parents_home'