[fixes] A few more fixes and tweaks. Should all be working now

glife.qproj

@@ -234,7 +234,7 @@
 		<Location name="intro_uni_m"/>
 		<Location name="intro_uni_tg"/>
 		<Location name="intro_initialization"/>
-		<Location name="intro_initialization_uni"/>
+		<Location name="intro_initialization_city"/>
 		<Location name="intro_customization"/>
 		<Location name="intro_sg_select"/>
 		<Location name="intro_sg_select_custom"/>

locations/intro_city.qsrc

@@ -75,27 +75,6 @@ if $ARGS[0] = 'city_intro':
 	!! Intro to starting city
 	!!variables for apartment living
 	pcs_hairlng = 100
-	!!Default Names
-	$pcs_firstname = 'Svetlana'
-	$pcs_lastname = 'Lebedev'
-	$pcs_nickname = 'Sveta'
-
-	!!Player names are set here
-	$temp_firstname = '<<$pcs_firstname>>'
-	$pcs_firstname = input("What is your first name? (Leave blank for Svetlana)")
-	if $pcs_firstname = '':$pcs_firstname = '<<$temp_firstname>>'
-	killvar '$temp_firstname'
-
-	$temp_lastname = '<<$pcs_lastname>>'
-	$pcs_lastname = input("What is your family name? (Leave blank for Lebedev)")
-	if $pcs_lastname = '':$pcs_lastname = '<<$temp_lastname>>'
-	killvar '$temp_lastname'
-
-	$temp_nickname = '<<$pcs_nickname>>'
-	$pcs_nickname = input("What is your nickname? (Leave blank for Sveta)")
-	if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
-	killvar '$temp_nickname'
-
 	*clr & cla
 	!!pic of apartment or Gazelle?
 	'The big day has finally arrived! Your family piled into your stepfather''s Gazelle pickup and you all traveled from your hometown, Pavlovsk, to the big city of St. Petersburg. Today is the day you move into your own apartment and start this new phase of your life.'

locations/intro_city_select.qsrc

@@ -60,14 +60,35 @@ if $ARGS[0] = 'start':
 	killvar 'class_list_institution'
 	killvar 'class_list_name'
 
+	!!Default Names
+	$pcs_firstname = 'Svetlana'
+	$pcs_lastname = 'Lebedev'
+	$pcs_nickname = 'Sveta'
+
+	!!Player names are set here
+	$temp_firstname = '<<$pcs_firstname>>'
+	$pcs_firstname = input("What is your first name? (Leave blank for Svetlana)")
+	if $pcs_firstname = '':$pcs_firstname = '<<$temp_firstname>>'
+	killvar '$temp_firstname'
+
+	$temp_lastname = '<<$pcs_lastname>>'
+	$pcs_lastname = input("What is your family name? (Leave blank for Lebedev)")
+	if $pcs_lastname = '':$pcs_lastname = '<<$temp_lastname>>'
+	killvar '$temp_lastname'
+
+	$temp_nickname = '<<$pcs_nickname>>'
+	$pcs_nickname = input("What is your nickname? (Leave blank for Sveta)")
+	if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
+	killvar '$temp_nickname'
+
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/pre_1.jpg"></center>'
 	'Your name is <<$pcs_firstname>> <<$pcs_lastname>>, friends and family often calling you <<$pcs_nickname>>. Your mother''s name is <<$npc_firstname[''A29'']>> and your biological father left when you were a baby. Your mother married your stepfather, <<$npc_firstname[''A28'']>>, shortly afterwards. <<$npc_firstname[''A33'']>> is your older sister. She is two years older than you and is still living at home while working at the local grocery store. She chose not to attend university and instead spends most of her free time drinking with her friends and going to parties, much to your mother''s dismay. You also have a younger half-brother, <<$npc_firstname[''A34'']>>, who is really into sports, especially football, and is shaping up to be a fine athlete. He is a year younger than you and his father is your stepfather.'
 
-	act 'Re-enter name/s': gt 'intro_city_select', 'SGStart'
-	act 'Continue':	gt 'intro_city_select', 'SGStart2'
+	act 'Re-enter name/s': gt 'intro_city_select', 'start'
+	act 'Continue':	gt 'intro_city_select', 'start2'
 end
 
-if $ARGS[0] = 'SGStart2':
+if $ARGS[0] = 'start2':
 	$locM = 'intro_city_select'
 	$loc_argM = 'SGStart2'
 !!make sure this image shows up above the text that shows your birthday

locations/intro_city_tg.qsrc

@@ -387,12 +387,15 @@ if $ARGS[0] = 'tatianaPRE':
 								*nl
 								'"As for your family, not to worry. I''ll arrange everything. We will fabricate your death to get Reinhold off your back. To make your transition easier I''ll cover your memory of the family, they will only be ghostly memories, you won''t even remember where you lived. Don''t worry, I won''t erase your entire memory and leave you a useless vegetable."'
 								act 'There must be another way!':
+									$loc = 'intro_city_tg'
+									$loc_arg = 'custom'
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
 									'"There must be another way!" you panic. You tug at the restraints on the bed.'
 									*nl
-									'Tatiana''s face becomes serious. "Do not argue. It is the only way available to me. You will need a to use a new name, think it over in your dreams and tell me when you wake up, otherwise I will give you a pretty name. Now go to sleep." Says Tatiana as she puts her hand on your chest. Your vision immediately fades.'
-									act 'Sleep': gt 'intro_city_tg', 'custom'
+									'Tatiana''s face becomes serious. "Do not argue. It is the only way available to me. You will need a to use a new name, think it over in your dreams and tell me when you wake up, otherwise I will give you a pretty name. Now go to sleep." Says Tatiana as she puts her hand on your chest. Your vision immediately fades and you dream about a girl you never knew and what she did at school...'
+									
+									act 'Dream': gt 'intro_city_select', 'start'
 								end
 							end
 						end
@@ -440,40 +443,6 @@ if $ARGS[0] = 'sleepPRE':
 		*nl
 		'"Well, yes. I won''t argue about that." Tatiana agrees. "It''s your life and you decide what you do with it, but for the time being, you cannot go back to your old life, so deal with it. On a side note, I already took care of an alibi. Today Mikhail crashed his car into the pit and died, it''s on the news." With these words, Tatiana picked up the remote and turned on the TV.'
 
-		!!Default Names
-		$pcs_firstname = 'Svetlana'
-		$pcs_lastname = 'Lebedev'
-		$pcs_nickname = 'Sveta'
-
-		!!Player names are set here
-		if $temp_firstname = '':
-			$temp_firstname = 'Svetlana'
-		else
-			$temp_firstname = '<<$pcs_firstname>>'
-		end
-		$pcs_firstname = input("What is your first name? (Leave blank for Svetlana)")
-		if $pcs_firstname = '':$pcs_firstname = '<<$temp_firstname>>'
-		killvar '$temp_firstname'
-
-		
-		if $temp_lastname = '':
-			$temp_lastname = 'Lebedev'
-		else
-			$temp_lastname = '<<$pcs_lastname>>'
-		end
-		$pcs_lastname = input("What is your family name? (Leave blank for Lebedev)")
-		if $pcs_lastname = '':$pcs_lastname = '<<$temp_lastname>>'
-		killvar '$temp_lastname'
-
-		if $temp_nickname = '':
-			$temp_nickname = 'Sveta'
-		else
-			$temp_nickname = '<<$pcs_nickname>>'
-		end
-		$pcs_nickname = input("What is your nickname? (Leave blank for Sveta)")
-		if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
-		killvar '$temp_nickname'
-
 		act 'Watch TV':
 			cla
 			*clr
@@ -506,6 +475,7 @@ if $ARGS[0] = 'sleepPRE':
 				'Also, you might want to steer clear of those Gopnik, they might just look like petty criminals having a drink, but they have connections and you''re just a pretty young girl now.'
 
 				act 'Out of the car':
+					gs 'intro_initialization_city'
 					cla
 					showstat 1
 					showobjs 1

locations/intro_initialization_city.qsrc

@@ -374,6 +374,7 @@ else
 	sportsclothingnumber = 15
 	gs 'clothing', 'wear', 'scandalicious_dress', 46
 end
+
 if swim_start = 99:
 	allure_swimsuit[99] = 1
 	allure_swimsuit_h[99] = 60

locations/intro_uni.qsrc

@@ -25,28 +25,7 @@ end
 if $ARGS[0] = 'custom':
 	$loc = 'intro_uni'
 	$loc_arg = 'custom'
-	pcs_hairlng = 100
-	!!Default Names
-	$pcs_firstname = 'Svetlana'
-	$pcs_lastname = 'Lebedev'
-	$pcs_nickname = 'Sveta'
-
-	!!Player names are set here
-	$temp_firstname = '<<$pcs_firstname>>'
-	$pcs_firstname = input("What is your first name? (Leave blank for Svetlana)")
-	if $pcs_firstname = '':$pcs_firstname = '<<$temp_firstname>>'
-	killvar '$temp_firstname'
-
-	$temp_lastname = '<<$pcs_lastname>>'
-	$pcs_lastname = input("What is your family name? (Leave blank for Lebedev)")
-	if $pcs_lastname = '':$pcs_lastname = '<<$temp_lastname>>'
-	killvar '$temp_lastname'
-
-	$temp_nickname = '<<$pcs_nickname>>'
-	$pcs_nickname = input("What is your nickname? (Leave blank for Sveta)")
-	if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
-	killvar '$temp_nickname'
-
+	*clr & cla
 !!	Just hair and eye color here for now; the dialog will be update as more options are added
 	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
 	'<center><b>Allows you to alter hair and eyes, use to match fixed profile picture if in use.</b></center>'
@@ -245,7 +224,11 @@ if $ARGS[0] = 'family_goodbye':
 end
 
 if $ARGS[0] = 'welcome_intro':
+	gs 'intro_initialization_city'
 	!! Welcome to Girl Life speech
+	showstat 1
+	showobjs 1
+	gs 'obj_din', 'old'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/system/1_openings/6_uni/uni_start.jpg"></center>'
 	'Welcome to Girl Life. Guide <<$pcs_nickname>> through the many challenges of University life. Manage schoolwork, a job, and relationships with the people you meet on your journey.'