Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/begin.qsrc

@@ -94,29 +94,21 @@ if $ARGS[0] = 'start':
 	'</table></center>'
 	
 	if $start_type = 'sg' or $start_type = 'sg_m':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_sg', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_sg', 'start'
 	elseif $start_type = 'sg_tg':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_sg_tg', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_sg_tg', 'start'
 	elseif $start_type = 'city':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_city', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_city', 'start'
 	elseif $start_type = 'city_m':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_city_m', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_city_m', 'start'
 	elseif $start_type = 'city_tg':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_city_tg', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_city_tg', 'start'
 	elseif $start_type = 'uni':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_uni', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_uni', 'start'
 	elseif $start_type = 'uni_m':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_uni_m', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_uni_m', 'start'
 	elseif $start_type = 'uni_tg':
-		act '<center><b>Start</b></center>': gs 'npc_relationship', 'defaultnotschool'
-& gt 'intro_uni_tg', 'start'
+		act '<center><b>Start</b></center>': gt 'intro_uni_tg', 'start'
 	end
 	
 	act '<center><b>Change game settings</b></center>': settingmode = 1 & gs '$menu_setting'

locations/intro_city_select.qsrc

@@ -96,6 +96,8 @@ if $ARGS[0] = 'start':
 	gs 'npcstatic5'
 	gs 'npcstatic6'
 
+	gs 'npc_relationship', 'defaultnotschool'
+
 	!!Default Names
 	$pcs_firstname = 'Svetlana'
 	$pcs_lastname = 'Lebedev'

locations/intro_sg_select.qsrc

@@ -44,6 +44,8 @@ if $ARGS[0] = 'start':
 	brothersawpirsF = 0
 	dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
 
+	gs 'npc_relationship', 'defaultnotschool'
+
 	gs 'npcstatic1'
 	gs 'npcstatic2'
 	gs 'npcstatic3'

locations/intro_sg_tg.qsrc

@@ -161,6 +161,15 @@ if $ARGS[0] = 'settings':
 
 	$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
 
+	gs 'npcstatic1'
+	gs 'npcstatic2'
+	gs 'npcstatic3'
+	gs 'npcstatic4'
+	gs 'npcstatic5'
+	gs 'npcstatic6'
+
+	gs 'npc_relationship', 'defaultnotschool'
+
 	!! Set all schoolkids to 30 rel except for outcasts
 	gs 'npc_relationship', 'defaultfriendship'