Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife.git

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/begin.qsrc

@@ -12,78 +12,104 @@ if $ARGS[0] = 'start':
 	showstat 1
 	'<center><b><font color="maroon">CHOOSE GAME START</font></b></center>'
 	*nl
-	'<b>Transformation Start:</b>'
-	'You are Mikhail Kuznetsov, a fairly average 35 year old businessman who finds an artifact that changes everything about him and his life. Features magic.'
-	'(magic is still a WIP)'
+	'<center>There are three main start types:'
+	'Last year of school (before or after summer holidays);'
+	'In the city post graduation from school;'
+	'First year of university.'
 	*nl
-	'<b>Schoolgirl Start:</b>'
-	'You are a schoolgirl in the most lustful town in Russia. Will you study hard and keep your purity for that special someone, become a sex addicted whore or anything in between? The possibilities are endless. No magic.'
-	'(currently has most content for non-magic playthrough)'
+	'For each start type there are 3 options:'
+	'Standard;'
+	'Magical (Your character will gain magic abilities and learn about a secret magical world);'
+	'M2F (As per magic but your character will magically be turned into a girl in the intro).</center>'
 	*nl
-	'<b>Cursed Schoolgirl Start:</b>'
-	'Marvel as we recklessly squish both of the above into one start. You are a schoolgirl who finds the amulet and not much changes, except for the magic used.'
-	'(currently has most content but magic is still a WIP)'
 	*nl
-	'<b>Cursed Schoolboy Start:</b>'
-	'You are Peter Ivanov, a fairly average teenage boy who, while trying to escape a bad situation, ends up in the body of a schoolgirl. Now you have to deal with a new body, new desires and your new life in the most lustful town in Russia. Features magic.'
-	'(currently has most content but magic is still a WIP)'
 	*nl
-	'<b>New in Town Start:</b>'
-	'You''re controlled by your overbearing mother and can''t take it any more. It is time to find a new life in the city away from her influence. For the first time, you can make your own decisions and mistakes. No magic.'
-	'(currently has the least content - not recommended for your first playthrough)'
-	
-	act '<center><b>Transformation Start</b></center>':
-		settingmode = 0
-		showstat 0
-		cla
-		act '<center>Show intro (recommended)</center>':
-			gt 'preSYS', 'TGStart'
-		end
-		act '<center>Skip intro (seen it before)</center>':
-			tgs_skipinto = 1
-			gt 'preSYS', 'TGStart'
-		end
+	*nl
+
+	'<center><table><TH>Start Type</TH><TH>Standard</TH><TH>Magical</TH><TH>M2F</TH><TR>'
+
+	$start_text = '<TD>School</TD>'
+
+	if $start_type = 'sg':
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:$start_type = ''sg'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
 	end
 
-	act '<center><b>Schoolgirl Start</b></center>':
-		cla
-		settingmode = 0
-		showstat 0
-		MagikDostup = 1
-		!!blocks the save update for group standings
-		gruptipe[9000] = 1
-		gt 'preSYS', 'SGStart'
-		
+	if $start_type = 'sg_m':
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:$start_type = ''sg_m'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
 	end
 
-	act '<center><b>Cursed Schoolgirl Start</b></center>':
-		cla
-		settingmode = 0
-		showstat 0
-		altQS = 1
-		!!blocks the save update for group standings
-		gruptipe[9000] = 1
-		gt 'preSYS', 'SGStart'
+	if $start_type = 'sg_tg':
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD><TR>'
+	else
+		$start_text += '<TD><center><a href="exec:$start_type = ''sg_tg'' & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD><TR>'
 	end
-	
-	act '<center><b>Cursed Schoolboy Start</b></center>':
-		cla
-		settingmode = 0
-		showstat 0
-		altQS = 1
-		csb_start = 1
-		!!blocks the save update for group standings
-		gruptipe[9000] = 1
-		gt 'preSYS', 'CSBStart'
+
+	$start_text += '<TD>City</TD>'
+
+	if start = 10:
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:start = 10 & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
+	end
+
+	if start = 20:
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:start = 20 & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
+	end
+
+	if start = 30:
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD><TR>'
+	else
+		$start_text += '<TD><center><a href="exec:start = 30 & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD><TR>'
+	end
+
+	$start_text += '<TD>University</TD>'
+
+	if start = 100:
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:start = 100 & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
+	end
+
+	if start = 200:
+		$start_text += '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:start = 200 & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
+	end
+
+	if start = 300:
+		$start_text += '<TD><img src="images/system/icons/check.png" height="50"></center></TD>'
+	else
+		$start_text += '<TD><center><a href="exec:start = 300 & gt ''begin'', ''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
 	end
 
-	act '<center><b>New in Town Start</b></center>':
-		cla
-		settingmode = 0
-		showstat 0
-		MagikDostup = 1
-		gt 'preSYS', 'TGStart'
+	$start_text
+
+	'</table></center>'
+	
+	if $start_type = 'sg' or $start_type = 'sg_m':
+		act '<center><b>Start</b></center>': gt 'intro_sg', 'start'
+	elseif $start_type = 'sg_tg':
+		act '<center><b>Start</b></center>': gt 'intro_sg_tg', 'start'
+	elseif start = 10:
+		act '<center><b>Start</b></center>': gt 'intro_city', 'start'
+	elseif start = 20:
+		act '<center><b>Start</b></center>': gt 'intro_city_m', 'start'
+	elseif start = 30:
+		act '<center><b>Start</b></center>': gt 'intro_city_tg', 'start'
+	elseif start = 100:
+		act '<center><b>Start</b></center>': gt 'intro_uni', 'start'
+	elseif start = 200:
+		act '<center><b>Start</b></center>': gt 'intro_uni_m', 'start'
+	elseif start = 300:
+		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'
 end
 
@@ -97,7 +123,7 @@ if $ARGS[0] = 'warning':
 	*nl
 	'<center><img <<$set_imgh>> src="images/system/1_openings/warning.jpg" ></center>'
 	
-	act 'Continue': gt 'begin','real_character'
+	act '<center><b>Continue</b></center>': gt 'begin','real_character'
 end
 	
 if $ARGS[0] = 'real_character':
@@ -106,266 +132,27 @@ if $ARGS[0] = 'real_character':
 	'<center><b><font color = maroon>CHARACTER SELECTION</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/character_creation_1.jpg"></center>'
 	*nl
-	'This game offers the ability to create your own character.'
-	'To do this, replace the image "avatar" in the "images" folder of the game with a file of the same name and format JPEG (.jpg). That''s it!'
-	'Please note, this choice can only be changed in the cheat menu and in-game changes to hair color, length etc. will not affect the displayed image if you are using a custom one.'
-	'This function is made solely to simplify things for those that want to use a custom image without having to sort through hundreds of pictures.'
+	'This game has two ways to display your character''s face, either dynamically depending on your hair style or a fixed image of your choice.'
+	'To use a fixed image, replace the image "avatar" in the "images" folder of the game with a file of the same name and format (.jpg) and select "Use a fixed image".'
+	'Please note, this choice can only be changed in the cheat menu at any time and only one custom image can be used at anytime across all saves.'
 	'Your selected image is your own personal choice, and is based on your personal preferences. By default, the game uses an avatar image from the site wikimedia.org.'
 
-	*NL 'If you are playing with Quest player for Android, click '
+	*nl
+	'If you are playing with Quest player for Android, click '
 	if Enable_Android = 1:
 	   *P '<a href="exec:Enable_Android = 0 & gt ''begin'',''real_character''">Here</a> (Current: <B>Yes</B>)'
 	else
 	   *P '<a href="exec:Enable_Android = 1 & gt ''begin'',''real_character''">Here</a> (Current: <B>No</B>)'
 	end
 
-	act'<center><b>Start a standard character</b></center>':
+	act'<center><b>Use the dynamic profile system</b></center>':
 		cls
 		gt 'begin', 'start'
 	end
-	act'<center><b>Use the avatar system</b></center>':
+	act'<center><b>Use a fixed profile image</b></center>':
 		cls
 		player_avatar = 1
-		pcs_eyecol = 1
-		pcs_eyesize = 2
-		pcs_lashes = 1
-		pcs_haircol = 1
-		pcs_hairlng = 81
-		pcs_lip = 2
-		if birthyear = 0: birthyear = 1998
-		if birthmonth = 0: birthmonth = 4
-		if birthday = 0: birthday = 1
-		gt 'begin', 'description_real_character'
-	end
-end
-
-if $ARGS[0] = 'description_real_character':
-	gs 'begin', 'hair'
-	gs 'begin', 'lip'
-	gs 'begin', 'eyes'
-	if birthyear = 0: birthyear = 1998
-	if birthmonth = 0: birthmonth = 4
-	if birthday = 0: birthday = 1
-	cls
-	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
-	*nl
-	'<center>On this screen, you may adjust your character''s description to match your avatar. Please note, at present, hair color and glasses choice may be overridden by the personality choice you make during the game intro.</center>'
-	*nl
-	'<center>Customize your:</center>'
-	!'<center>Your name is <B><i><<$pcs_nickname>> <<$pcs_lastname>></B></i>. (You may change this during the intro, and also at the passport office in-game.)'
-	'<center><a href="exec:gs ''begin'', ''hair''"><img src="images/system/1_openings/shared/icon_hair.png"></a> <a href="exec:gs ''begin'', ''eyes''"><img src="images/system/1_openings/shared/icon_eye.png"></a> <a href="exec:gs ''begin'', ''lip''"><img src="images/system/1_openings/shared/icon_lip.png"></a> <a href="exec:gs ''begin'', ''birthday''"><img src="images/system/1_openings/shared/icon_birthday.png"></a></center>'
-
-	act'<center><b>Done</b></center>': gt 'begin', 'start'
-end
-
-if $ARGS[0] = 'hair':
-	cls
-	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
-	*nl
-	if pcs_hairlng <= 1:
-		$hair = 'You have <a href="exec:pcs_hairlng = 31 & gs ''begin'', ''hair''">very short</a>,'
-	elseif pcs_hairlng <= 31:
-		$hair = 'You have <a href="exec:pcs_hairlng = 81 & gs ''begin'', ''hair''">short</a>,'
-	elseif pcs_hairlng <= 81:
-		$hair = 'You have <a href="exec:pcs_hairlng = 161 & gs ''begin'', ''hair''">chin length</a>,'
-	elseif pcs_hairlng <= 161:
-		$hair = 'You have <a href="exec:pcs_hairlng = 261 & gs ''begin'', ''hair''">shoulder length</a>,'
-	elseif pcs_hairlng <= 261:
-		$hair = 'You have <a href="exec:pcs_hairlng = 401 & gs ''begin'', ''hair''">breast length</a>,'
-	elseif pcs_hairlng <= 401:
-		$hair = 'You have <a href="exec:pcs_hairlng = 601 & gs ''begin'', ''hair''">back length</a>,'
-	elseif pcs_hairlng <= 601:
-		$hair = 'You have <a href="exec:pcs_hairlng = 801 & gs ''begin'', ''hair''">hip length</a>,'
-	elseif pcs_hairlng <= 801:
-		$hair = 'You have <a href="exec:pcs_hairlng = 1001 & gs ''begin'', ''hair''">ass length</a>,'
-	else
-		$hair = 'You have <a href="exec:pcs_hairlng = 1 & gs ''begin'', ''hair''">extremely long</a>,'
-	end
-
-	if pcs_haircol = 0 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">black</a> hair.'& $hair2 = 'black hair' & $hair3 = 'black hair'
-	if pcs_haircol = 1 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">brown</a> hair.'& $hair2 = 'brown hair' & $hair3 = 'brown hair'
-	if pcs_haircol = 2 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">red</a> hair.'& $hair2 = 'Red hair' & $hair3 = 'red hair'
-	if pcs_haircol = 3 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">blonde</a> hair.'& $hair2 = 'blond hair' & $hair3 = 'blond hair'
-	if pcs_haircol = 0 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">black</a> hair.'& $hair2 = 'curls' & $hair3 = 'black curls'
-	if pcs_haircol = 1 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">brown</a> hair.'& $hair2 = 'curls' & $hair3 = 'brown curls'
-	if pcs_haircol = 2 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">red</a> hair.'& $hair2 = 'curls' & $hair3 = 'red hair'
-	if pcs_haircol = 3 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">blonde</a> hair.' &$hair2 = 'curls' & $hair3 = 'blond curls'
-	'<center>Adjust your hair to match your avatar. Please note that, at present, hair choices are overridden by your starting personality choice (e.g. volleyball players will always have straight blond hair).</center>'
-	*nl
-	nathcol = pcs_haircol
-	if player_avatar = 1:
-		if avatar_hair = 1:
-			'<center>Please note that this choice is given only once and you will not be able to change it without starting a new game!</center>'
-			'<center>You have <i><<$av_hair>>.</i> <a href="exec:avatar_hair = 0 & gs ''begin'', ''hair''">Revert to default</a>.</center>'
-		else
-			'<center><i><<$hair>></i> You may also <a href="exec:gs ''begin'', ''hair_input'' & gs ''begin'', ''hair''">manually enter a description</a></center>.'
-		end
-	end
-	if $start_type = 'sgs':
-		act'<center><b>Done</b></center>': gt 'preCUST', 'SGStart'
-	else
-		act'<center><b>Done</b></center>': gt 'begin', 'description_real_character'
-	end
-end
-
-if $ARGS[0] = 'pcs_haircol':
-	pcs_haircol += 1
-	if pcs_haircol > 3: pcs_haircol = 0
-end
-
-if $ARGS[0] = 'hair_input':
-	avatar_hair = 1
-	$av_hair = input("Enter a description of your hair:")
-end
-
-if $ARGS[0] = 'lip':
-	cls
-	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
-	*nl
-	if pcs_lip = 0:$pcs_lip = 'you have thin<<$pcs_lipbalm>> lips.' & $liptalk = 'thin lips' & $liptalk2 = 'thin lips' & $liptalk3 = 'thin lips'
-	if pcs_lip = 1:$pcs_lip = 'You have normal<<$pcs_lipbalm>> lips.' & $liptalk = 'soft lips' & $liptalk2 = 'delicate lips' & $liptalk3 = 'tender lips'
-	if pcs_lip = 2:$pcs_lip = 'You have plump<<$pcs_lipbalm>> lips.' & $liptalk = 'plump lips' & $liptalk2 = 'plump lips' & $liptalk3 = 'plump lips'
-	if pcs_lip = 3:$pcs_lip = 'You have large,<<$pcs_lipbalm>> full lips.' & $liptalk = 'full lips' & $liptalk2 = 'plump lips' & $liptalk3 = 'full lips'
-	if pcs_lip = 4:$pcs_lip = 'You have huge, thick<<$pcs_lipbalm>> lips.' & $liptalk = 'thick lips' & $liptalk2 = 'thick lips' & $liptalk3 = 'thick lips'
-	'<center>Adjust the size of your lips to match your <a href="exec:view''images/avatar.jpg''">image</a>:</center>'
-	*nl
-	'<center><i><<$pcs_lip>></i></center>'
-	*nl
-	if pcs_lip < 4:'<center><a href="exec:pcs_lip += 1 & gs ''begin'', ''lip''">Bigger lips</a></center>'
-	if pcs_lip > 0:'<center><a href="exec:pcs_lip -= 1 & gs ''begin'', ''lip''">Smaller lips</a></center>'
-	act'<center><b>Done</b></center>': gt'begin','description_real_character'
-end
-
-if $ARGS[0] = 'eyes':
-	cls
-	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	if player_avatar = 1:
-		'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-	end
-	*nl
-	if pcs_eyecol = 0:$pcs_eyecol = 'brown' & $glacol2 = 'brown'
-	if pcs_eyecol = 1:$pcs_eyecol = 'gray' & $glacol2 = 'gray'
-	if pcs_eyecol = 2:$pcs_eyecol = 'green' & $glacol2 = 'green'
-	if pcs_eyecol = 3:$pcs_eyecol = 'blue' & $glacol2 = 'blue'
-	if glass <= 0:$glass = '' & glassvnesh = 0
-	if glass = 1:$glass = ' You wear silly glasses in a cheap frame.' & glassvnesh = 10
-	if pcs_lashes > 2:pcs_lashes = 2
-	if pcs_lashes = 0:$pcs_lashes = 'with short eyelashes'
-	if pcs_lashes = 1:$pcs_lashes = 'with normal eyelashes'
-	if pcs_lashes = 2:$pcs_lashes = 'with long eyelashes'
-	if pcs_eyesize > 3:pcs_eyesize = 3
-	if pcs_eyesize = 0:$glaza = 'You have small <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = '<<$pcs_eyecol>> eyes' & $glaza3 = '<<$glacol2>> eyes'
-	if pcs_eyesize = 1:$glaza = 'You have expressive <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'expressive <<$pcs_eyecol>> eyes' & $glaza3 = 'expressive <<$glacol2>> eyes'
-	if pcs_eyesize = 2:$glaza = 'You have large <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'big <<$pcs_eyecol>> eyes' & $glaza3 = 'high <<$glacol2>> eyes'
-	if pcs_eyesize = 3:$glaza = 'You have huge <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'great <<$pcs_eyecol>> eyes' & $glaza3 = 'great <<$glacol2>> eyes'
-
-	if player_avatar = 1:
-		'<center>Adjust your eyes and eyelashes to match your avatar. Please note, glasses choice may be overridden by your starting personality choice (e.g. bookworms/nerds will always start with glasses).</center>'
-	else
-		'<center>Please note, glasses choice may be overridden by your starting personality choice (e.g. bookworms/nerds will always start with glasses).</center>'
-	end	
-	*nl
-	'<center><i><<$glaza>></i></center>'
-	*nl
-	if pcs_lashes < 2:'<center><a href="exec:pcs_lashes += 1 & gs ''begin'', ''eyes''">Lengthen lashes</a></center>'
-	if pcs_lashes > 0:'<center><a href="exec:pcs_lashes -= 1 & gs ''begin'', ''eyes''">Shorten lashes</a></center>'
-	if pcs_eyesize < 3:'<center><a href="exec:pcs_eyesize += 1 & gs ''begin'', ''eyes''">Larger eyes</a></center>'
-	if pcs_eyesize > 0:'<center><a href="exec:pcs_eyesize -= 1 & gs ''begin'', ''eyes''">Smaller eyes</a></center>'
-	if glass = 0:'<center><a href="exec:glass = 1 & gs ''begin'', ''eyes''">Wear glasses</a></center>'
-	if glass = 1:'<center><a href="exec:glass = 0 & gs ''begin'', ''eyes''">Remove glasses</a></center>'
-
-	if player_avatar = 1:
-		act'<center><b>Done</b></center>': gt'begin','description_real_character'
-	elseif $start_type = 'nt':
-		act'<center><b>Done</b></center>': gt 'preCUST', 'NTStart2'
-	elseif $start_type = 'sgs':
-		act'<center><b>Done</b></center>': gt 'preCUST', 'SGStart'
-	else
-		act'<center><b>Done</b></center>': gt 'preCUST', 'TGStart'
-	end
-end
-
-if $ARGS[0] = 'eye color':
-	pcs_eyecol += 1
-	if pcs_eyecol > 3: pcs_eyecol = 0
-end
-
-if $ARGS[0] = 'birthday':
-	cls
-	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	if csb_start ! 1:
-		if player_avatar = 1:
-			'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-		end
-	else
-		'<center><img <<$set_imgh>> src="images/system/1_openings/4_csb/16.jpg"></center>'
-	end
-	'<center>Choose your date of birth:</center>'
-	*nl
-	if birthyear = 0: birthyear = 1998
-	if birthmonth = 0: birthmonth = 4
-	if birthday = 0: birthday = 1
-
-	if birthmonth = 2:
-		if ((birthyear mod 4 = 0) and (birthyear mod 100 ! 0)) or (birthyear mod 400 = 0): 
-			monthdays = 29
-		else
-			monthdays = 28
-		end
-	elseif birthmonth = 4 or birthmonth = 6 or birthmonth = 9 or birthmonth = 11:
-		monthdays = 30
-	else
-		monthdays = 31
-	end
-
-	if birthmonth > 12: birthmonth = 12
-	if birthmonth < 1: birthmonth = 1
-	if birthday < 1: birthday = 1
-	if birthday > monthdays: birthday = monthdays
-
-	if birthday < 10 and birthmonth < 10:
-		'<center>Your birthday: <B>0<<birthmonth>>/0<<birthday>></B> (MM/DD)</center>'
-	elseif birthday < 10 and birthmonth >= 10:
-		'<center>Your birthday: <B><<birthmonth>>/0<<birthday>></B> (MM/DD)</center>'
-	elseif birthday >= 10 and birthmonth < 10:
-		'<center>Your birthday: <B>0<<birthmonth>>/<<birthday>></B> (MM/DD)</center>'
-	elseif birthday >= 10 and birthmonth >= 10:
-		'<center>Your birthday: <B><<birthmonth>>/<<birthday>></B> (MM/DD)</center>'
-	end
-
-	*nl
-	'<center><a href="exec:birthday += 5 & gs ''begin'', ''birthday''">+5 Days</a></center>'
-	'<center><a href="exec:birthday += 1 & gs ''begin'', ''birthday''">+1 Day</a></center>'
-	'<center><a href="exec:birthday -= 1 & gs ''begin'', ''birthday''">-1 Day</a></center>'
-	'<center><a href="exec:birthday -= 5 & gs ''begin'', ''birthday''">-5 Days</a></center>'
-	'<center><a href="exec:birthmonth = 1 & gs ''begin'', ''birthday''">January</a></center>'
-	'<center><a href="exec:birthmonth = 2 & gs ''begin'', ''birthday''">February</a></center>'
-	'<center><a href="exec:birthmonth = 3 & gs ''begin'', ''birthday''">March</a></center>'
-	'<center><a href="exec:birthmonth = 4 & gs ''begin'', ''birthday''">April</a></center>'
-	'<center><a href="exec:birthmonth = 5 & gs ''begin'', ''birthday''">May</a></center>'
-	'<center><a href="exec:birthmonth = 6 & gs ''begin'', ''birthday''">June</a></center>'
-	'<center><a href="exec:birthmonth = 7 & gs ''begin'', ''birthday''">July</a></center>'
-	'<center><a href="exec:birthmonth = 8 & gs ''begin'', ''birthday''">August</a></center>'
-	'<center><a href="exec:birthmonth = 9 & gs ''begin'', ''birthday''">September</a></center>'
-	'<center><a href="exec:birthmonth = 10 & gs ''begin'', ''birthday''">October</a></center>'
-	'<center><a href="exec:birthmonth = 11 & gs ''begin'', ''birthday''">November</a></center>'
-	'<center><a href="exec:birthmonth = 12 & gs ''begin'', ''birthday''">December</a></center>'
-
-	if csb_start ! 1:
-		if player_avatar = 1:
-			act'<center><b>Done</b></center>': gt 'begin', 'description_real_character'
-		else
-			act'<center><b>Done</b></center>': gt 'preSYS', 'SGStart2'
-		end
-	else
-		act'<center><b>Done</b></center>': gt 'preSys', 'CSBStart'
+		gt 'begin', 'start'
 	end
 end
 

locations/intro_city.qsrc

@@ -70,41 +70,20 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'city_intro':
+	$loc = 'intro_city'
+	$loc_arg = '2'
 	!! 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.'
 	'You think back to your school days and what kind of student you were...'
 
-	act 'Continue': gt 'intro_city', 'vlad_intro'
+	act 'Continue': gt 'intro_city_select', 'start'
 end
 
 if $ARGS[0] = '2':
-	$loc = 'intro_city'
-	$loc_args = '2'
 !!	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>'
@@ -115,7 +94,7 @@ if $ARGS[0] = '2':
 	'<center>Customize your:</center>'
 	'<center><a href="exec:gs ''intro_customization'', ''hair''"><img src="images/system/1_openings/shared/icon_hair.png"></a> <a href="exec:gs ''intro_customization'', ''eyes''"><img src="images/system/1_openings/shared/icon_eye.png"></a></center>'
 	
-	act 'Done': gt 'intro_city', 'city_intro'
+	act 'Done': gt 'intro_city', 'vlad_intro'
 end
 
 if $ARGS[0] = 'vlad_intro':
@@ -240,6 +219,7 @@ if $ARGS[0] = 'family_goodbye':
 end
 
 if $ARGS[0] = 'welcome_intro':
+	gs 'intro_initialization_city'
 	!! Welcome to Girl Life speech
 	showstat 1
 	showobjs 1

locations/intro_city_select.qsrc

@@ -46,6 +46,20 @@ if $ARGS[0] = 'start':
 	brothersawpirsF = 0
 	dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
 
+	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
+
+	killvar 'class_list_institution'
+	killvar 'class_list_name'
+
 	!!Default Names
 	$pcs_firstname = 'Svetlana'
 	$pcs_lastname = 'Lebedev'
@@ -67,30 +81,16 @@ if $ARGS[0] = 'start':
 	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
-
-	killvar 'class_list_institution'
-	killvar 'class_list_name'
-
 	'<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_argsM = 'SGStart2'
+	$loc_argM = 'SGStart2'
 !!make sure this image shows up above the text that shows your birthday
 	!date_toggle = args[1]
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/pre_2.jpg"></center>'
@@ -115,7 +115,7 @@ end
 
 if $ARGS[0] = 'charselect':
 	killvar '$locM'
-	killvar '$loc_argsM'
+	killvar '$loc_argM'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/pre_4.jpg"></center>'
 	'Select your personality/social group. Your social group will have a major defining impact upon your life in school and will determine your starting friends, starting traits and overall look. While you can always change groups later on, it takes time and effort, so choose wisely. Your five choices of social group are.'
@@ -391,7 +391,7 @@ if $ARGS[0] = 'nerdqueen':
 		gs 'grades', 'grade_award', 'school', 'comp', 75
 		gs 'grades', 'grade_award', 'school', 'mus', 75
 		gs 'grades', 'grade_award', 'school', 'his', 75
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -431,7 +431,7 @@ if $ARGS[0] = 'goodstudent':
 		gs 'grades', 'grade_award', 'school', 'comp', 90
 		gs 'grades', 'grade_award', 'school', 'mus', 90
 		gs 'grades', 'grade_award', 'school', 'his', 90
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -472,7 +472,7 @@ if $ARGS[0] = 'computergeek':
 		gs 'grades', 'grade_award', 'school', 'comp', 95
 		gs 'grades', 'grade_award', 'school', 'mus', 85
 		gs 'grades', 'grade_award', 'school', 'his', 85
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -509,7 +509,7 @@ if $ARGS[0] = 'chessplayer':
 		gs 'grades', 'grade_award', 'school', 'comp', 85
 		gs 'grades', 'grade_award', 'school', 'mus', 80
 		gs 'grades', 'grade_award', 'school', 'his', 85
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -597,7 +597,7 @@ if $ARGS[0] = 'volleyball':
 		gs 'grades', 'grade_award', 'school', 'comp', 55
 		gs 'grades', 'grade_award', 'school', 'mus', 55
 		gs 'grades', 'grade_award', 'school', 'his', 55
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -653,7 +653,7 @@ if $ARGS[0] = 'dancer':
 		gs 'grades', 'grade_award', 'school', 'comp', 55
 		gs 'grades', 'grade_award', 'school', 'mus', 80
 		gs 'grades', 'grade_award', 'school', 'his', 55
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -695,7 +695,7 @@ if $ARGS[0] = 'runner':
 		gs 'grades', 'grade_award', 'school', 'comp', 55
 		gs 'grades', 'grade_award', 'school', 'mus', 55
 		gs 'grades', 'grade_award', 'school', 'his', 55
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -737,7 +737,7 @@ if $ARGS[0] = 'football':
 		gs 'grades', 'grade_award', 'school', 'comp', 55
 		gs 'grades', 'grade_award', 'school', 'mus', 55
 		gs 'grades', 'grade_award', 'school', 'his', 55
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -816,7 +816,7 @@ if $ARGS[0] = 'socialite':
 		gs 'grades', 'grade_award', 'school', 'comp', 65
 		gs 'grades', 'grade_award', 'school', 'mus', 65
 		gs 'grades', 'grade_award', 'school', 'his', 65
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -874,7 +874,7 @@ if $ARGS[0] = 'beautiful':
 		gs 'grades', 'grade_award', 'school', 'comp', 60
 		gs 'grades', 'grade_award', 'school', 'mus', 60
 		gs 'grades', 'grade_award', 'school', 'his', 60
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -968,7 +968,7 @@ if $ARGS[0] = 'gopnikstart':
 		gs 'grades', 'grade_award', 'school', 'comp', 25
 		gs 'grades', 'grade_award', 'school', 'mus', 25
 		gs 'grades', 'grade_award', 'school', 'his', 25
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -1025,7 +1025,7 @@ if $ARGS[0] = 'troublemaker':
 		gs 'grades', 'grade_award', 'school', 'comp', 25
 		gs 'grades', 'grade_award', 'school', 'mus', 25
 		gs 'grades', 'grade_award', 'school', 'his', 25
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -1101,7 +1101,7 @@ if $ARGS[0] = 'vitekgf':
 		vitekvisit = 5
 		npc_sex['A9'] += 5
 		willpowermax = 100
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -1188,7 +1188,7 @@ if $ARGS[0] = 'alternative':
 		gs 'grades', 'grade_award', 'school', 'comp', 25
 		gs 'grades', 'grade_award', 'school', 'mus', 55
 		gs 'grades', 'grade_award', 'school', 'his', 25
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -1252,7 +1252,7 @@ if $ARGS[0] = 'friendless':
 		gs 'grades', 'grade_award', 'school', 'comp', 55
 		gs 'grades', 'grade_award', 'school', 'mus', 55
 		gs 'grades', 'grade_award', 'school', 'his', 55
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -1294,7 +1294,7 @@ if $ARGS[0] = 'uglyduckling':
 		gs 'grades', 'grade_award', 'school', 'comp', 55
 		gs 'grades', 'grade_award', 'school', 'mus', 55
 		gs 'grades', 'grade_award', 'school', 'his', 55
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -1349,7 +1349,7 @@ if $ARGS[0] = 'goodgirl':
 		gs 'grades', 'grade_award', 'school', 'comp', 80
 		gs 'grades', 'grade_award', 'school', 'mus', 55
 		gs 'grades', 'grade_award', 'school', 'his', 80
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -1448,7 +1448,7 @@ if $ARGS[0] = 'slut':
 		gs 'grades', 'grade_award', 'school', 'comp', 55
 		gs 'grades', 'grade_award', 'school', 'mus', 55
 		gs 'grades', 'grade_award', 'school', 'his', 55
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 
@@ -1514,7 +1514,7 @@ if $ARGS[0] = 'goth':
 		gs 'grades', 'grade_award', 'school', 'comp', 55
 		gs 'grades', 'grade_award', 'school', 'mus', 80
 		gs 'grades', 'grade_award', 'school', 'his', 55
-		gt $loc, $loc_args
+		gt $loc, $loc_arg
 	end
 end
 

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
@@ -405,7 +408,7 @@ end
 
 if $ARGS[0] = 'custom':
 	$loc = 'intro_city_tg'
-	$loc_args = 'custom'
+	$loc_arg = 'custom'
 !!	This is to bypass the next part if the avatar system was used
 !!	It will be changed to bypass the head options, once more body options are added
 
@@ -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_customization.qsrc

@@ -562,53 +562,45 @@ if $ARGS[0] = 'hair':
 	'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
 	*nl
 	if pcs_hairlng <= 1:
-		$hair = 'You have <a href="exec:pcs_hairlng = 31 & gs ''begin'', ''hair''">very short</a>,'
+		$hair = 'You have <a href="exec:pcs_hairlng = 31 & gs ''intro_customization'', ''hair''">very short</a>,'
 	elseif pcs_hairlng <= 31:
-		$hair = 'You have <a href="exec:pcs_hairlng = 81 & gs ''begin'', ''hair''">short</a>,'
+		$hair = 'You have <a href="exec:pcs_hairlng = 81 & gs ''intro_customization'', ''hair''">short</a>,'
 	elseif pcs_hairlng <= 81:
-		$hair = 'You have <a href="exec:pcs_hairlng = 161 & gs ''begin'', ''hair''">chin length</a>,'
+		$hair = 'You have <a href="exec:pcs_hairlng = 161 & gs ''intro_customization'', ''hair''">chin length</a>,'
 	elseif pcs_hairlng <= 161:
-		$hair = 'You have <a href="exec:pcs_hairlng = 261 & gs ''begin'', ''hair''">shoulder length</a>,'
+		$hair = 'You have <a href="exec:pcs_hairlng = 261 & gs ''intro_customization'', ''hair''">shoulder length</a>,'
 	elseif pcs_hairlng <= 261:
-		$hair = 'You have <a href="exec:pcs_hairlng = 401 & gs ''begin'', ''hair''">breast length</a>,'
+		$hair = 'You have <a href="exec:pcs_hairlng = 401 & gs ''intro_customization'', ''hair''">breast length</a>,'
 	elseif pcs_hairlng <= 401:
-		$hair = 'You have <a href="exec:pcs_hairlng = 601 & gs ''begin'', ''hair''">back length</a>,'
+		$hair = 'You have <a href="exec:pcs_hairlng = 601 & gs ''intro_customization'', ''hair''">back length</a>,'
 	elseif pcs_hairlng <= 601:
-		$hair = 'You have <a href="exec:pcs_hairlng = 801 & gs ''begin'', ''hair''">hip length</a>,'
+		$hair = 'You have <a href="exec:pcs_hairlng = 801 & gs ''intro_customization'', ''hair''">hip length</a>,'
 	elseif pcs_hairlng <= 801:
-		$hair = 'You have <a href="exec:pcs_hairlng = 1001 & gs ''begin'', ''hair''">ass length</a>,'
+		$hair = 'You have <a href="exec:pcs_hairlng = 1001 & gs ''intro_customization'', ''hair''">ass length</a>,'
 	else
-		$hair = 'You have <a href="exec:pcs_hairlng = 1 & gs ''begin'', ''hair''">extremely long</a>,'
+		$hair = 'You have <a href="exec:pcs_hairlng = 1 & gs ''intro_customization'', ''hair''">extremely long</a>,'
 	end
 
-	if pcs_haircol = 0 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">black</a> hair.'& $hair2 = 'black hair' & $hair3 = 'black hair'
-	if pcs_haircol = 1 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">brown</a> hair.'& $hair2 = 'brown hair' & $hair3 = 'brown hair'
-	if pcs_haircol = 2 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">red</a> hair.'& $hair2 = 'Red hair' & $hair3 = 'red hair'
-	if pcs_haircol = 3 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''begin'', ''hair''">straight</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">blonde</a> hair.'& $hair2 = 'blond hair' & $hair3 = 'blond hair'
-	if pcs_haircol = 0 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">black</a> hair.'& $hair2 = 'curls' & $hair3 = 'black curls'
-	if pcs_haircol = 1 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">brown</a> hair.'& $hair2 = 'curls' & $hair3 = 'brown curls'
-	if pcs_haircol = 2 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">red</a> hair.'& $hair2 = 'curls' & $hair3 = 'red hair'
-	if pcs_haircol = 3 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''begin'', ''hair''">curly</a>, <a href="exec:gs ''begin'', ''pcs_haircol'' & gs ''begin'', ''hair''">blonde</a> hair.' &$hair2 = 'curls' & $hair3 = 'blond curls'
+	if pcs_haircol = 0 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''intro_customization'', ''hair''">straight</a>, <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">black</a> hair.'& $hair2 = 'black hair' & $hair3 = 'black hair'
+	if pcs_haircol = 1 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''intro_customization'', ''hair''">straight</a>, <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">brown</a> hair.'& $hair2 = 'brown hair' & $hair3 = 'brown hair'
+	if pcs_haircol = 2 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''intro_customization'', ''hair''">straight</a>, <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">red</a> hair.'& $hair2 = 'Red hair' & $hair3 = 'red hair'
+	if pcs_haircol = 3 and curly <= 0:$hair += ' <a href="exec:defcurly = 1 & curly = 2147483647 & gs ''intro_customization'', ''hair''">straight</a>, <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">blonde</a> hair.'& $hair2 = 'blond hair' & $hair3 = 'blond hair'
+	if pcs_haircol = 0 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''intro_customization'', ''hair''">curly</a>, <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">black</a> hair.'& $hair2 = 'curls' & $hair3 = 'black curls'
+	if pcs_haircol = 1 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''intro_customization'', ''hair''">curly</a>, <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">brown</a> hair.'& $hair2 = 'curls' & $hair3 = 'brown curls'
+	if pcs_haircol = 2 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''intro_customization'', ''hair''">curly</a>, <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">red</a> hair.'& $hair2 = 'curls' & $hair3 = 'red hair'
+	if pcs_haircol = 3 and curly > 0:$hair += ' <a href="exec:defcurly = 0 & curly = 0 & gs ''intro_customization'', ''hair''">curly</a>, <a href="exec:gs ''intro_customization'', ''pcs_haircol'' & gs ''intro_customization'', ''hair''">blonde</a> hair.' &$hair2 = 'curls' & $hair3 = 'blond curls'
 	'<center>Adjust your hair to match your avatar. Please note that, at present, hair choices are overridden by your starting personality choice (e.g. volleyball players will always have straight blond hair).</center>'
 	*nl
 	nathcol = pcs_haircol
 	if player_avatar = 1:
 		if avatar_hair = 1:
 			'<center>Please note that this choice is given only once and you will not be able to change it without starting a new game!</center>'
-			'<center>You have <i><<$av_hair>>.</i> <a href="exec:avatar_hair = 0 & gs ''begin'', ''hair''">Revert to default</a>.</center>'
+			'<center>You have <i><<$av_hair>>.</i> <a href="exec:avatar_hair = 0 & gs ''intro_customization'', ''hair''">Revert to default</a>.</center>'
 		else
-			'<center><i><<$hair>></i> You may also <a href="exec:gs ''begin'', ''hair_input'' & gs ''begin'', ''hair''">manually enter a description</a></center>.'
+			'<center><i><<$hair>></i> You may also <a href="exec:gs ''intro_customization'', ''hair_input'' & gs ''intro_customization'', ''hair''">manually enter a description</a></center>.'
 		end
 	end
-	if $start_type = 'sg':
-		act'<center><b>Done</b></center>': gt 'intro_sg', 'four'
-	elseif $start_type = 'sg_m':
-		act'<center><b>Done</b></center>': gt 'intro_sg_m', 'six'
-	elseif $start_type = 'sg_tg':
-		act'<center><b>Done</b></center>': gt 'preCSB', 'intro_6_looks'
-	else
-		act'<center><b>Done</b></center>': gt 'preCUST', 'TGStart'
-	end
+	act'<center><b>Done</b></center>': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'pcs_haircol':
@@ -635,9 +627,9 @@ if $ARGS[0] = 'lip':
 	*nl
 	'<center><i><<$pcs_lip>></i></center>'
 	*nl
-	if pcs_lip < 4:'<center><a href="exec:pcs_lip += 1 & gs ''begin'', ''lip''">Bigger lips</a></center>'
-	if pcs_lip > 0:'<center><a href="exec:pcs_lip -= 1 & gs ''begin'', ''lip''">Smaller lips</a></center>'
-	act'<center><b>Done</b></center>': gt'$loc','$loc_args'
+	if pcs_lip < 4:'<center><a href="exec:pcs_lip += 1 & gs ''intro_customization'', ''lip''">Bigger lips</a></center>'
+	if pcs_lip > 0:'<center><a href="exec:pcs_lip -= 1 & gs ''intro_customization'', ''lip''">Smaller lips</a></center>'
+	act'<center><b>Done</b></center>': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'eyes':
@@ -660,28 +652,26 @@ if $ARGS[0] = 'eyes':
 	if pcs_lashes = 1:$pcs_lashes = 'with normal eyelashes'
 	if pcs_lashes = 2:$pcs_lashes = 'with long eyelashes'
 	if pcs_eyesize > 3:pcs_eyesize = 3
-	if pcs_eyesize = 0:$glaza = 'You have small <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = '<<$pcs_eyecol>> eyes' & $glaza3 = '<<$glacol2>> eyes'
-	if pcs_eyesize = 1:$glaza = 'You have expressive <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'expressive <<$pcs_eyecol>> eyes' & $glaza3 = 'expressive <<$glacol2>> eyes'
-	if pcs_eyesize = 2:$glaza = 'You have large <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'big <<$pcs_eyecol>> eyes' & $glaza3 = 'high <<$glacol2>> eyes'
-	if pcs_eyesize = 3:$glaza = 'You have huge <a href="exec:gs ''begin'', ''eye color'' & gs ''begin'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'great <<$pcs_eyecol>> eyes' & $glaza3 = 'great <<$glacol2>> eyes'
+	if pcs_eyesize = 0:$glaza = 'You have small <a href="exec:gs ''intro_customization'', ''eye color'' & gs ''intro_customization'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = '<<$pcs_eyecol>> eyes' & $glaza3 = '<<$glacol2>> eyes'
+	if pcs_eyesize = 1:$glaza = 'You have expressive <a href="exec:gs ''intro_customization'', ''eye color'' & gs ''intro_customization'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'expressive <<$pcs_eyecol>> eyes' & $glaza3 = 'expressive <<$glacol2>> eyes'
+	if pcs_eyesize = 2:$glaza = 'You have large <a href="exec:gs ''intro_customization'', ''eye color'' & gs ''intro_customization'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'big <<$pcs_eyecol>> eyes' & $glaza3 = 'high <<$glacol2>> eyes'
+	if pcs_eyesize = 3:$glaza = 'You have huge <a href="exec:gs ''intro_customization'', ''eye color'' & gs ''intro_customization'', ''eyes''"><<$pcs_eyecol>></a> eyes, <<$pcs_lashes>>.<<$glass>>' & $glaza2 = 'great <<$pcs_eyecol>> eyes' & $glaza3 = 'great <<$glacol2>> eyes'
 
 	if player_avatar = 1:
-		'<center>Adjust your eyes and eyelashes to match your avatar. Please note, glasses choice may be overridden by your starting personality choice (e.g. bookworms/nerds will always start with glasses).</center>'
-	else
-		'<center>Please note, glasses choice may be overridden by your starting personality choice (e.g. bookworms/nerds will always start with glasses).</center>'
+		'<center>Adjust your eyes and eyelashes to match your avatar.</center>'
 	end	
 	*nl
 	'<center><i><<$glaza>></i></center>'
 	*nl
-	if pcs_lashes < 2:'<center><a href="exec:pcs_lashes += 1 & gs ''begin'', ''eyes''">Lengthen lashes</a></center>'
-	if pcs_lashes > 0:'<center><a href="exec:pcs_lashes -= 1 & gs ''begin'', ''eyes''">Shorten lashes</a></center>'
-	if pcs_eyesize < 3:'<center><a href="exec:pcs_eyesize += 1 & gs ''begin'', ''eyes''">Larger eyes</a></center>'
-	if pcs_eyesize > 0:'<center><a href="exec:pcs_eyesize -= 1 & gs ''begin'', ''eyes''">Smaller eyes</a></center>'
-	if glass = 0:'<center><a href="exec:glass = 1 & gs ''begin'', ''eyes''">Wear glasses</a></center>'
-	if glass = 1:'<center><a href="exec:glass = 0 & gs ''begin'', ''eyes''">Remove glasses</a></center>'
+	if pcs_lashes < 2:'<center><a href="exec:pcs_lashes += 1 & gs ''intro_customization'', ''eyes''">Lengthen lashes</a></center>'
+	if pcs_lashes > 0:'<center><a href="exec:pcs_lashes -= 1 & gs ''intro_customization'', ''eyes''">Shorten lashes</a></center>'
+	if pcs_eyesize < 3:'<center><a href="exec:pcs_eyesize += 1 & gs ''intro_customization'', ''eyes''">Larger eyes</a></center>'
+	if pcs_eyesize > 0:'<center><a href="exec:pcs_eyesize -= 1 & gs ''intro_customization'', ''eyes''">Smaller eyes</a></center>'
+	if glass = 0:'<center><a href="exec:glass = 1 & gs ''intro_customization'', ''eyes''">Wear glasses</a></center>'
+	if glass = 1:'<center><a href="exec:glass = 0 & gs ''intro_customization'', ''eyes''">Remove glasses</a></center>'
 	
 	
-	act'<center><b>Done</b></center>': gt'$loc','$loc_args'
+	act'<center><b>Done</b></center>': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'eye color':
@@ -735,24 +725,24 @@ if $ARGS[0] = 'birthday':
 	end
 
 	*nl
-	'<center><a href="exec:birthday += 5 & gs ''begin'', ''birthday''">+5 Days</a></center>'
-	'<center><a href="exec:birthday += 1 & gs ''begin'', ''birthday''">+1 Day</a></center>'
-	'<center><a href="exec:birthday -= 1 & gs ''begin'', ''birthday''">-1 Day</a></center>'
-	'<center><a href="exec:birthday -= 5 & gs ''begin'', ''birthday''">-5 Days</a></center>'
-	'<center><a href="exec:birthmonth = 1 & gs ''begin'', ''birthday''">January</a></center>'
-	'<center><a href="exec:birthmonth = 2 & gs ''begin'', ''birthday''">February</a></center>'
-	'<center><a href="exec:birthmonth = 3 & gs ''begin'', ''birthday''">March</a></center>'
-	'<center><a href="exec:birthmonth = 4 & gs ''begin'', ''birthday''">April</a></center>'
-	'<center><a href="exec:birthmonth = 5 & gs ''begin'', ''birthday''">May</a></center>'
-	'<center><a href="exec:birthmonth = 6 & gs ''begin'', ''birthday''">June</a></center>'
-	'<center><a href="exec:birthmonth = 7 & gs ''begin'', ''birthday''">July</a></center>'
-	'<center><a href="exec:birthmonth = 8 & gs ''begin'', ''birthday''">August</a></center>'
-	'<center><a href="exec:birthmonth = 9 & gs ''begin'', ''birthday''">September</a></center>'
-	'<center><a href="exec:birthmonth = 10 & gs ''begin'', ''birthday''">October</a></center>'
-	'<center><a href="exec:birthmonth = 11 & gs ''begin'', ''birthday''">November</a></center>'
-	'<center><a href="exec:birthmonth = 12 & gs ''begin'', ''birthday''">December</a></center>'
-
-	act'<center><b>Done</b></center>': $locM, $loc_argsM
+	'<center><a href="exec:birthday += 5 & gs ''intro_customization'', ''birthday''">+5 Days</a></center>'
+	'<center><a href="exec:birthday += 1 & gs ''intro_customization'', ''birthday''">+1 Day</a></center>'
+	'<center><a href="exec:birthday -= 1 & gs ''intro_customization'', ''birthday''">-1 Day</a></center>'
+	'<center><a href="exec:birthday -= 5 & gs ''intro_customization'', ''birthday''">-5 Days</a></center>'
+	'<center><a href="exec:birthmonth = 1 & gs ''intro_customization'', ''birthday''">January</a></center>'
+	'<center><a href="exec:birthmonth = 2 & gs ''intro_customization'', ''birthday''">February</a></center>'
+	'<center><a href="exec:birthmonth = 3 & gs ''intro_customization'', ''birthday''">March</a></center>'
+	'<center><a href="exec:birthmonth = 4 & gs ''intro_customization'', ''birthday''">April</a></center>'
+	'<center><a href="exec:birthmonth = 5 & gs ''intro_customization'', ''birthday''">May</a></center>'
+	'<center><a href="exec:birthmonth = 6 & gs ''intro_customization'', ''birthday''">June</a></center>'
+	'<center><a href="exec:birthmonth = 7 & gs ''intro_customization'', ''birthday''">July</a></center>'
+	'<center><a href="exec:birthmonth = 8 & gs ''intro_customization'', ''birthday''">August</a></center>'
+	'<center><a href="exec:birthmonth = 9 & gs ''intro_customization'', ''birthday''">September</a></center>'
+	'<center><a href="exec:birthmonth = 10 & gs ''intro_customization'', ''birthday''">October</a></center>'
+	'<center><a href="exec:birthmonth = 11 & gs ''intro_customization'', ''birthday''">November</a></center>'
+	'<center><a href="exec:birthmonth = 12 & gs ''intro_customization'', ''birthday''">December</a></center>'
+
+	act'<center><b>Done</b></center>': gt $locM, $loc_argM
 end
 
 --- intro_customization ---------------------------------

locations/intro_initialization.qsrc

@@ -64,23 +64,12 @@ gs 'telefon', 'setup'
 
 VersionCheck = 5030
 
-if $start = 'city':
-	birthyear = year - age
-	birthmonth = 4
-	birthday = 1
-	pcs_dob = birthyear * 10000
-	pcs_dob += (birthmonth * 100)
-	pcs_dob += birthday
-else
-
-	pcs_dob = birthyear * 10000
-	pcs_dob += (birthmonth * 100)
-	pcs_dob += birthday
+pcs_dob = birthyear * 10000
+pcs_dob += (birthmonth * 100)
+pcs_dob += birthday
 
-	age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
-	if ((month * 100) + day) < pcs_dob mod 10000: age -= 1
-		
-end
+age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
+if ((month * 100) + day) < pcs_dob mod 10000: age -= 1
 
 if age < 17:
 	vidage = age

locations/intro_initialization_city.qsrc

@@ -93,22 +93,19 @@ nathcol = pcs_haircol
 pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1
 oldsavepcs_haircol = 1
 
-gs 'body_shape', 'initial'
+gs 'body', 'initial'
 
 !! Adding underwear and default shoes and assigning them
 
-if $ARGS[1] ! 'CSB' and goth_clothing ! 1:
-	cheap_panties[1] = 1
-	cheap_bras[1] = 1
-	$pantyworntype = 'cheap'
-	pantywornnumber = 1
-	$braworntype = 'cheap'
-	brawornnumber = 1
-	gm_shoe[6] = 1
-	danilovich_shoe[21] = 1
-	$shoeworntype = 'gm'
-	shoewornnumber = 6
-end
+cheap_panties[1] = 1
+cheap_bras[1] = 1
+$pantyworntype = 'cheap'
+pantywornnumber = 1
+$braworntype = 'cheap'
+brawornnumber = 1
+gm_shoe[6] = 1
+$shoeworntype = 'gm'
+shoewornnumber = 6
 
 !!	Starting clothing set
 cheap_panties[12] = 1
@@ -123,6 +120,7 @@ gm_outfits_b[30] = pcs_hips
 cats_dress[1] = 1
 cats_dress_h[1] = 100
 cats_dress_b[1] = pcs_hips
+
 if goth_clothing = 1:
 	kats_panties[28] = 1
 	kats_bras[28] = 1
@@ -132,27 +130,44 @@ if goth_clothing = 1:
 	brawornnumber = 28
 	danilovich_outfits[91] = 1
 	danilovich_outfits_h[91] = 100
-	danilovich_shoe[21] = 1
-	gm_shoe[9] = 1
 	shoewornnumber = 9
 	$shoeworntype = 'gm'
+	dolls_dress[7] = 1
+	dolls_dress_h[7] = 100
+	dolls_dress_b[7] = pcs_hips
+	dolls_shoe[1] = 1
+	bomba_dress[4] = 1
+	bomba_dress_h[4] = 100
+	bomba_dress_b[4] = pcs_hips
+	bomba_dress[23] = 1
+	bomba_dress_h[23] = 100
+	bomba_dress_b[23] = pcs_hips
 	bomba_outfits[16] = 1
 	bomba_outfits_h[16] = 100
 	bomba_outfits_b[16] = pcs_hips
-	bomba_outfits[37] = 1
-	bomba_outfits_h[37] = 100
-	bomba_outfits_b[37] = pcs_hips
+	bomba_outfits[31] = 1
+	bomba_outfits_h[31] = 100
+	bomba_outfits_b[31] = pcs_hips
 	sportsclothingnumber = 91
-	gs 'clothing', 'wear', 'bomba_outfits', 37
+	gs 'clothing', 'wear', 'bomba_dress', 4
 elseif pcs_inhib < 5:
 	gm_outfits[30] = 1
 	gm_outfits_h[30] = 100
 	gm_outfits_b[30] = pcs_hips
+	gm_outfits[2] = 1
+	gm_outfits_h[2] = 100
+	gm_outfits_b[2] = pcs_hips
+	gm_outfits[54] = 1
+	gm_outfits_h[54] = 100
+	gm_outfits_b[54] = pcs_hips
+	coco_outfits[5] = 1
+	coco_outfits_h[5] = 100
+	coco_outfits_b[5] = pcs_hips
 	danilovich_outfits[81] = 1
 	danilovich_outfits_h[81] = 100
-	cats_dress[1] = 1
-	cats_dress_h[1] = 100
-	cats_dress_b[1] = pcs_hips
+	cats_dress[14] = 1
+	cats_dress_h[14] = 100
+	cats_dress_b[14] = pcs_hips
 	sportsclothingnumber = 81
 	gs 'clothing', 'wear', 'cats_dress', 1
 elseif pcs_inhib < 10:
@@ -161,6 +176,15 @@ elseif pcs_inhib < 10:
 	gm_outfits_b[15] = pcs_hips
 	danilovich_outfits[76] = 1
 	danilovich_outfits_h[76] = 100
+	flamingos_outfits[9] = 1
+	flamingos_outfits_h[9] = 100
+	flamingos_outfits_b[9] = pcs_hips
+	nerdvana_outfits[38] = 1
+	nerdvana_outfits_h[38] = 100
+	nerdvana_outfits_b[38] = pcs_hips
+	gm_office[11] = 1
+	gm_office_h[11] = 100
+	gm_office_b[11] = pcs_hips
 	gm_dress[4] = 1
 	gm_dress_h[4] = 100
 	gm_dress_b[4] = pcs_hips
@@ -175,6 +199,15 @@ elseif pcs_inhib < 15:
 	gm_dress[7] = 1
 	gm_dress_h[7] = 100
 	gm_dress_b[7] = pcs_hips
+	gm_dress[16] = 1
+	gm_dress_h[16] = 100
+	gm_dress_b[16] = pcs_hips
+	dolls_outfits[12] = 1
+	dolls_outfits_h[12] = 100
+	dolls_outfits_b[12] = pcs_hips
+	dolls_outfits[3] = 1
+	dolls_outfits_h[3] = 100
+	dolls_outfits_b[3] = pcs_hips
 	sportsclothingnumber = 106
 	gs 'clothing', 'wear', 'gm_dress', 7
 elseif pcs_inhib < 20:
@@ -183,83 +216,155 @@ elseif pcs_inhib < 20:
 	gm_outfits_b[55] = pcs_hips
 	danilovich_outfits[102] = 1
 	danilovich_outfits_h[102] = 100
+	danilovich_outfits[64] = 1
+	danilovich_outfits_h[64] = 100
+	flamingos_dress[109] = 1
+	flamingos_dress_h[109] = 100
+	flamingos_dress_b[109] = pcs_hips
+	gm_outfits[99] = 1
+	gm_outfits_h[99] = 100
+	gm_outfits_b[99] = pcs_hips
 	gm_dress[7] = 1
 	gm_dress_h[7] = 100
 	gm_dress_b[7] = pcs_hips
 	sportsclothingnumber = 43
-	gs 'clothing', 'wear', 'gm_dress', 7
+	gs 'clothing', 'wear', 'gm_outfits', 99
 elseif pcs_inhib < 25:
 	gm_outfits[58] = 1
 	gm_outfits_h[58] = 100
 	gm_outfits_b[58] = pcs_hips
+	gm_outfits[181] = 1
+	gm_outfits_h[181] = 100
+	gm_outfits_b[181] = pcs_hips
+	bomba_outfits[1] = 1
+	bomba_outfits_h[1] = 100
+	bomba_outfits_b[1] = pcs_hips
+	flamingos_dress[59] = 1
+	flamingos_dress_h[59] = 100
+	flamingos_dress_b[59] = pcs_hips
 	danilovich_outfits[87] = 1
 	danilovich_outfits_h[87] = 100
 	gm_dress[39] = 1
 	gm_dress_h[39] = 100
 	gm_dress_b[39] = pcs_hips
 	sportsclothingnumber = 1
-	gs 'clothing', 'wear', 'gm_dress', 39
+	gs 'clothing', 'wear', 'flamingos_dress', 59
 elseif pcs_inhib < 30:
 	gm_outfits[91] = 1
 	gm_outfits_h[91] = 100
 	gm_outfits_b[91] = pcs_hips
 	danilovich_outfits[96] = 1
 	danilovich_outfits_h[96] = 100
+	flamingos_dress[89] = 1
+	flamingos_dress_h[89] = 100
+	flamingos_dress_b[89] = pcs_hips
+	fashionista_outfits[17] = 1
+	fashionista_outfits_h[17] = 100
+	fashionista_outfits_b[17] = pcs_hips
+	scandalicious_dress[2] = 1
+	scandalicious_dress_h[2] = 100
+	scandalicious_dress_b[2] = pcs_hips
 	gm_dress[57] = 1
 	gm_dress_h[57] = 100
 	gm_dress_b[57] = pcs_hips
 	sportsclothingnumber = 48
-	gs 'clothing', 'wear', 'gm_dress', 57
+	gs 'clothing', 'wear', 'flamingos_dress', 89
 elseif pcs_inhib < 35:
 	gm_outfits[95] = 1
 	gm_outfits_h[95] = 100
 	gm_outfits_b[95] = pcs_hips
 	danilovich_outfits[48] = 1
 	danilovich_outfits_h[48] = 100
+	scandalicious_dress[18] = 1
+	scandalicious_dress_h[18] = 100
+	scandalicious_dress_b[18] = pcs_hips
+	dolls_outfits[36] = 1
+	dolls_outfits_h[36] = 100
+	dolls_outfits_b[36] = pcs_hips
+	cats_dress[67] = 1
+	cats_dress_h[67] = 100
+	cats_dress_b[67] = pcs_hips
 	gm_dress[63] = 1
 	gm_dress_h[63] = 100
 	gm_dress_b[63] = pcs_hips
 	sportsclothingnumber = 40
-	gs 'clothing', 'wear', 'gm_dress', 63
+	gs 'clothing', 'wear', 'dolls_outfits', 36
 elseif pcs_inhib < 40:
 	gm_outfits[124] = 1
 	gm_outfits_h[124] = 100
 	gm_outfits_b[124] = pcs_hips
 	danilovich_outfits[45] = 1
 	danilovich_outfits_h[45] = 100
+	scandalicious_dress[45] = 1
+	scandalicious_dress_h[45] = 100
+	scandalicious_dress_b[45] = pcs_hips
+	cats_dress[203] = 1
+	cats_dress_h[203] = 100
+	cats_dress_b[203] = pcs_hips
+	cats_outfits[196] = 1
+	cats_outfits_h[196] = 100
+	cats_outfits_b[196] = pcs_hips
 	gm_dress[89] = 1
 	gm_dress_h[89] = 100
 	gm_dress_b[89] = pcs_hips
 	sportsclothingnumber = 45
-	gs 'clothing', 'wear', 'gm_dress', 89
+	gs 'clothing', 'wear', 'cats_dress', 203
 elseif pcs_inhib < 45:
 	gm_outfits[131] = 1
 	gm_outfits_h[131] = 100
 	gm_outfits_b[131] = pcs_hips
 	danilovich_outfits[38] = 1
 	danilovich_outfits_h[38] = 100
+	scandalicious_dress[7] = 1
+	scandalicious_dress_h[7] = 100
+	scandalicious_dress_b[7] = pcs_hips
+	market_outfits[2] = 1
+	market_outfits_h[2] = 40
+	market_outfits_b[2] = pcs_hips
+	cats_dress[219] = 1
+	cats_dress_h[219] = 100
+	cats_dress_b[219] = pcs_hips
 	gm_dress[109] = 1
 	gm_dress_h[109] = 100
 	gm_dress_b[109] = pcs_hips
 	sportsclothingnumber = 38
-	gs 'clothing', 'wear', 'gm_dress', 109
+	gs 'clothing', 'wear', 'market_outfits', 2
 elseif pcs_inhib < 50:
 	gm_outfits[145] = 1
 	gm_outfits_h[145] = 100
 	gm_outfits_b[145] = pcs_hips
 	danilovich_outfits[17] = 1
 	danilovich_outfits_h[17] = 100
+	scandalicious_dress[96] = 1
+	scandalicious_dress_h[96] = 100
+	scandalicious_dress_b[96] = pcs_hips
+	market_outfits[10] = 1
+	market_outfits_h[10] = 40
+	market_outfits_b[10] = pcs_hips
+	nerdvana_outfits[60] = 1
+	nerdvana_outfits_h[60] = 100
+	nerdvana_outfits_b[60] = pcs_hips
 	gm_dress[123] = 1
 	gm_dress_h[123] = 100
 	gm_dress_b[123] = pcs_hips
 	sportsclothingnumber = 143
-	gs 'clothing', 'wear', 'gm_dress', 123
+	gs 'clothing', 'wear', 'scandalicious_dress', 96
 else
 	gm_outfits[149] = 1
 	gm_outfits_h[149] = 100
 	gm_outfits_b[149] = pcs_hips
 	danilovich_outfits[15] = 1
 	danilovich_outfits_h[15] = 100
+	scandalicious_dress[46] = 1
+	scandalicious_dress_h[46] = 100
+	scandalicious_dress_b[46] = pcs_hips
+	scandalicious_outfits[16] = 1
+	scandalicious_outfits_h[16] = 100
+	scandalicious_outfits_b[16] = pcs_hips
+	market_outfits[12] = 1
+	market_outfits_h[12] = 40
+	market_outfits_b[12] = pcs_hips
+	market_outfits
 	gm_dress[149] = 1
 	gm_dress_h[149] = 100
 	gm_dress_b[149] = pcs_hips
@@ -267,8 +372,9 @@ else
 	scandalicious_bikinis_h[55] = 60
 	scandalicious_bikinis_b[55] = pcs_hips
 	sportsclothingnumber = 15
-	gs 'clothing', 'wear', 'gm_dress', 149
+	gs 'clothing', 'wear', 'scandalicious_dress', 46
 end
+
 if swim_start = 99:
 	allure_swimsuit[99] = 1
 	allure_swimsuit_h[99] = 60

locations/intro_sg.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'four':
 	gs 'intro_sg_select', 'sg_settings'
 	gs 'intro_initialization'
 	$loc = 'intro_sg'
-	$loc_args = 'four'
+	$loc_arg = 'four'
 
 
 	'<center><b><font color = maroon>Character Face</font></b></center>'

locations/intro_sg_m.qsrc

@@ -134,7 +134,7 @@ if $ARGS[0] = 'six':
 	*clr & cla				
 	hour = 18
 	$loc = 'intro_sg_m'
-	$loc_args = 'six'
+	$loc_arg = 'six'
 	'<center><b><font color = maroon>Character Face</font></b></center>'
 	'<center><b>Allows you to alter hair and eyes, use to match fixed profile picture if in use.</b></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/character_creation_2.jpg"></center>'

locations/intro_sg_tg.qsrc

@@ -284,7 +284,7 @@ end
 
 if $ARGS[0] = 'intro_6_looks':
 	$loc = 'intro_sg_tg'
-	$loc_args = 'intro_6_looks'
+	$loc_arg = 'intro_6_looks'
 	*clr & cla
 	if player_avatar = 1:
 		'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'

locations/intro_uni.qsrc

@@ -13,7 +13,7 @@ $start_type = 'uni'
 if $ARGS[0] = 'start':
 	!! Intro to starting uni
 	$loc = 'intro_uni'
-	$loc_args = 'custom'
+	$loc_arg = 'custom'
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_day.jpg"></center>'
 	'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 the University dorms to start this new phase of your life.'
@@ -24,29 +24,8 @@ end
 
 if $ARGS[0] = 'custom':
 	$loc = 'intro_uni'
-	$loc_args = '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'
-
+	$loc_arg = 'custom'
+	*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.'