[Fixed] DNA not being set for Sveta to be linked to her parents due to incorrect order of gosubs. Fix from Malen

locations/preSYS.qsrc

@@ -33,8 +33,7 @@ if $ARGS[0] = 'TGStart':
 end
 
 if $ARGS[0] = 'CSBStart':
-	*clr & cla	
-	$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
+	*clr & cla
 
 	StoryLine = 1
 	ml_update_1 = 1
@@ -44,19 +43,21 @@ if $ARGS[0] = 'CSBStart':
 	gs 'npcstatic3'
 	gs 'npcstatic4'
 	gs 'npcstatic5'
-	
+
+	$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
+
 	!! Set all schoolkids to 30 rel except for outcasts
 	gs 'npc_relationship', 'defaultfriendship'
-	
+
 	!! Set defaults for family and friends
 	gs 'npc_relationship', 'default_family_friends', 'cursedschoolboy'
-	
+
 	!! Sveta was an outcast (good girl start)
 	gs 'preSYS', 'outcast'
 	gs 'npc_relationship', 'socialgroup_setting', -5, -5, 0, -20, 0, 0
-	
+
 	npc_rel['A25'] -= 5
-	
+
 	home_owned[2] = 1
 	gs 'set_home', 2
 
@@ -68,13 +69,13 @@ if $ARGS[0] = 'CSBStart':
 		pcs_eyecol = 3
 		pcs_hairlng = 300
 	end
-	
+
 	if birthmonth = 0: birthmonth = 4
 	if birthday = 0: birthday = 1
-	
+
 	birthyear = 1999
 	yearlefttemp = 1
-	
+
 	!!Looks
 	pcs_hgt = 170
 	salo = 80
@@ -84,8 +85,8 @@ if $ARGS[0] = 'CSBStart':
 	pcs_makeup = 1
 	pcs_skin = 40
 	dick = 0
-	
-	!!Basic	
+
+	!!Basic
 	pcs_energy = 60
 	pcs_hydra = 60
 	pcs_sleep = 70
@@ -103,23 +104,23 @@ if $ARGS[0] = 'CSBStart':
 	pcs_sprt = 20
 	pcs_chrsm = 35
 	pcs_prcptn = 40
-	
+
 	!!Skills
 	pcs_def = 20
 	pcs_run = 20
 	pcs_gaming = 20
 	pcs_humint = 20
 	pcs_observ = 20
-	
+
 	!!Money, School, ...
 	money = 2000
 	pcs_grades = 40
 	prezikProver = 3
 	brothersawpirsF = 0
-	
+
 	'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/16.jpg"></center>'
 	'Your name is Peter Ivanov. You''ve got blond hair and blue eyes. Your parents died shortly after you were born and your great uncle Ivan took you in. He works at a construction company out of one of the suburbs of St. Petersburg. He''s a man''s man and has never been very close to you, choosing to let you make your own way as long as it does not embarrass him publicly. You''ve grown to be quite independent, but lack any real defining qualities.'
-	
+
 	!date_toggle = args[1]
 	if birthday < 10 and birthmonth < 10:
 		$startdob = 'Your birthday: <B>0<<birthmonth>>/0<<birthday>>/<<birthyear>></B> (MM/DD/YYYY)'
@@ -138,7 +139,7 @@ if $ARGS[0] = 'CSBStart':
 		*nl
 		'<<$startdob>>'
 	end
-	
+
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/16.jpg"></center>'
@@ -146,18 +147,18 @@ if $ARGS[0] = 'CSBStart':
 		'You have two options when it comes to beginning your game:'
 		*nl
 		'Starting in August, at the end of the summer holiday, very close to the new school year <i>(recommended for new players)</i>, or starting in June, at the beginning of the summer holiday.'
-		
+
 		!if date_toggle ! 1:
 		!	if birthmonth >= 7: birthyear -= 1
 		!	if birthmonth = 6 and birthday > 1: birthyear -= 1
 		!end
-		
+
 		killvar '$startdob'
 		!killvar 'date_toggle'
-		
+
 		kanikuli = 5
 		$holyday = '<b>Summer holidays</b>'
-		
+
 		act 'Start at the end of August':
 			month = 8
 			$month = 'August'
@@ -186,13 +187,11 @@ end
 !!******************** SG Start Background Options ******************************
 if $ARGS[0] = 'SGStart':
 
-	$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
-
 	StoryLine = 1
 	ml_update_1 = 1
 	birthyear = 1999
 	yearlefttemp = 1
-	
+
 	if player_avatar = 0:
 		birthmonth = 4
 		birthday = 1
@@ -255,13 +254,15 @@ if $ARGS[0] = 'SGStart':
 	$pcs_nickname = input("What is your nickname? (Leave blank for Sveta)")
 	if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
 	killvar '$temp_nickname'
-	
+
 	gs 'npcstatic1'
 	gs 'npcstatic2'
 	gs 'npcstatic3'
 	gs 'npcstatic4'
 	gs 'npcstatic5'
 
+	$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
+
 	home_owned[2] = 1
 	gs 'set_home', 2
 
@@ -307,11 +308,11 @@ if $ARGS[0] = 'SGStart2':
 		!end
 		killvar '$startdob'
 		!killvar 'date_toggle'
-		
+
 		$holyday = '<b>Summer holidays</b>'
-		
+
 		kanikuli = 5
-		
+
 		!!This is the default start
 		act 'Start at the end of August':
 			month = 8
@@ -348,12 +349,12 @@ if $ARGS[0] = 'SGStart3':
 
 	!! default friendship is 30 for all students
 	gs 'npc_relationship', 'defaultfriendship'
-	
+
 	!! Sets family and friends relationship values and overwrites the npcstatic data for them
 	!! Vasily Shulgin starts at 60, Mitka at 40, Kolyamba and Vasyan at 20
 	gs 'npc_relationship', 'default_family_friends'
-	
-	act 'Pavlovsk Start': 
+
+	act 'Pavlovsk Start':
 		gt 'preSYS', 'pav_start'
 	end
 	act 'Gadukino Start':
@@ -407,7 +408,7 @@ if $ARGS[0] = 'charselect':
 		act 'I am a good student': gt 'preSYS', 'goodstudent'
 		act 'I am a computer geek': gt 'preSYS', 'computergeek'
 		act 'I am an avid chess player': gt 'preSYS', 'chessplayer'
-			
+
 	end
 
 	act 'Athlete, Jock':
@@ -447,7 +448,7 @@ if $ARGS[0] = 'charselect':
 		act 'I am a slut': gt 'preSYS', 'slut'
 		act 'I am the resident goth': gt 'preSYS', 'goth'
 	end
-	
+
 	act 'Random personality':
 !! This allows the player to select a random personality.
 		*clr & cla
@@ -804,7 +805,7 @@ end
 if $ARGS[0] = 'dancer':
 	'<center><h4><font color="maroon">Avid dancer</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/jock_2.jpg"></center>'
-	'You fell in love with dancing at an early age and never looked back. You spent a lot of your free time trying to improve your skills, and it paid off; you''re actually quite good now! <<$npc_firstname[''A11'']>> helpfully pointed out that an added benefit of dance was a greater increase in your flexibility (that is, of course, typical of <<$npc_firstname[''A11'']>>). Your obsession with dancing, however, has had some repercussions on your school performance. You''re a sub-par student, and you haven''t made many friends other than your fellow jocks.' 
+	'You fell in love with dancing at an early age and never looked back. You spent a lot of your free time trying to improve your skills, and it paid off; you''re actually quite good now! <<$npc_firstname[''A11'']>> helpfully pointed out that an added benefit of dance was a greater increase in your flexibility (that is, of course, typical of <<$npc_firstname[''A11'']>>). Your obsession with dancing, however, has had some repercussions on your school performance. You''re a sub-par student, and you haven''t made many friends other than your fellow jocks.'
 	*nl
 	'You are particularly close with <<$npc_firstname[''A23'']>>, who is just as passionate about dancing as you are. You trained a lot together as children and have a mutual respect for each other''s abilities.'
 	act 'Select another': gt 'preSYS', 'charselect'
@@ -1278,7 +1279,7 @@ if $ARGS[0] = 'alternative':
 		gt 'preCUST', 'SGStart'
 	end
 end
-		
+
 if $ARGS[0] = 'outcast':
 	pcs_prcptn = 35
 	pcs_grades = 40
@@ -1497,7 +1498,7 @@ if $ARGS[0] = 'goth':
 		npc_rel['A154'] += 10
 	    npc_rel['A156'] += 10
 		npc_rel['A158'] += 10
-        npc_rel['A12'] += 10		
+        npc_rel['A12'] += 10
         alterstrtimg = 28
 		genbsize = 17
 		salo = 45