Prechádzať zdrojové kódy

[changed] introducing an updated $start_type variable, getting rid of alterstrtimg. This is the mass migration for everything BUT the ballet stuff

anjuna krokus 4 mesiacov pred
rodič
commit
f59fb376f6

+ 3 - 3
locations/albina_chat.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'stripper_talk1':
 		'"I... do some strip dancing in the city," you admit, blushing hard.'
 		if age < 18:
 			'"You''re a stripper?" Her jaw drops. "How? You''re underage!"'
-			if alterstrtimg = 18 or alterstrtimg = 19 or alterstrtimg = 20 or alterstrtimg = 21:
+			if $start_type['group'] = 'gopnik':
 				'"I''ve had a fake passport for years," you shrug uncomfortably. "Easiest way to get booze. Now it helps me with other things too."'
 			else
 				'"I... got a fake passport that the club don''t really care to check," you admit. "It... wasn''t easy getting it."'
@@ -117,7 +117,7 @@ if $ARGS[0] = 'stripper_talk1':
 		'"I do some strip dancing in the city," you say casually.'
 		if age < 18:
 			'"You''re a stripper?" she exclaims, her jaw dropping. "How? You''re underage!"'
-			if alterstrtimg = 18 or alterstrtimg = 19 or alterstrtimg = 20 or alterstrtimg = 21:
+			if $start_type['group'] = 'gopnik':
 				'"I''ve had a fake passport for years, Albina," you say, rolling your eyes. "How do you think I got all my booze?"'
 			else
 				'"I got a fake passport," you admit with a shrug. "It wasn''t easy but it gets me past any doors that have an 18+ requirement."'
@@ -139,7 +139,7 @@ if $ARGS[0] = 'stripper_talk1':
 		'"I do some strip dancing in the city," you admit, letting a smug smile creep onto your lips.'
 		if age < 18:
 			'"You''re a stripper?!" she exclaims, her jaw dropping. "How? You''re underage!"'
-			if alterstrtimg = 18 or alterstrtimg = 19 or alterstrtimg = 20 or alterstrtimg = 21:
+			if $start_type['group'] = 'gopnik':
 				'"I''ve had a fake passport for years," you grin. "Easiest way to get booze. Now it helps me with other things too."'
 			else
 				'"I got a fake passport. Expensive sumbitch, but it gets me into 18+ areas."'

+ 1 - 1
locations/albina_house_events.qsrc

@@ -650,7 +650,7 @@ if $ARGS[0] = 'hot_tub_no_panties':
 	else
 		'"I uhh, may have forgotten to wear them today..." you blush before stepping into the tub with her.'
 	end
-	if albina['commando_know'] = 0 and alterstrtimg = 24:
+	if albina['commando_know'] = 0 and $start_type['cat'] = 'goodgirl':
 		gs 'albina_house_events', 'goodie_two_shoes'
 	else
 		gs 'albina_house_events', 'hot_tub_no_panties2'

+ 18 - 14
locations/begin.qsrc

@@ -12,10 +12,10 @@ if $ARGS[0] = 'start':
 
 	settingmode = 0
 	$checkimg = {
-		if $ARGS[0]=$ARGS[1]:
+		if $ARGS[0]=$ARGS[2] and $ARGS[1]=$ARGS[3]:
 			$result = '<TD><center><img src="images/system/icons/check.png" height="50"></center></TD>'
 		else
-			$result = '<TD><center><a href="exec:$start_type = ''<<$ARGS[1]>>'' & gt ''begin'',''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
+			$result = '<TD><center><a href="exec:$start_type[''loc''] = ''<<$ARGS[2]>>'' & $start_type[''magic''] = ''<<$ARGS[3]>>'' & gt ''begin'',''start''"><img src="images/system/icons/uncheck.png" height="50"></a></center></TD>'
 		end
 	}
 	gs 'Cheatmenu_din'
@@ -40,30 +40,34 @@ if $ARGS[0] = 'start':
 
 	$start_text = '<TR><TD><p align="center">School</p></TD>'
 
-	$start_text += $dyneval($checkimg,$start_type,'sg')
-	$start_text += $dyneval($checkimg,$start_type,'sg_m')
-	$start_text += $dyneval($checkimg,$start_type,'sg_tg')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'sg', 'nomagic')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'sg', 'magic')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'sg', 'tg')
 
 	$start_text += '<TR><TD><p align="center">City</p></TD>'
 
-	$start_text += $dyneval($checkimg,$start_type,'city')
-	$start_text += $dyneval($checkimg,$start_type,'city_m')
-	$start_text += $dyneval($checkimg,$start_type,'city_tg')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'nomagic')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'magic')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'tg')
 
 	$start_text += '<TR><TD><p align="center">University</p></TD>'
 
-	$start_text += $dyneval($checkimg,$start_type,'uni')
-	$start_text += $dyneval($checkimg,$start_type,'uni_m')
-	$start_text += $dyneval($checkimg,$start_type,'uni_tg')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'uni', 'nomagic')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'uni', 'magic')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'uni', 'tg')
 
 	$start_text
 
 	'</table></center>'
 
-	if $start_type = 'sg' or $start_type = 'sg_m':
+	if $start_type['loc'] = 'sg' and $start_type['magic'] ! 'tg':
 		act '<center><b>Start</b></center>': gt 'intro_sg', 'start'
-	elseif $start_type ! '':
-		act '<center><b>Start</b></center>': gt 'intro_'+$start_type, 'start'
+	elseif $start_type['magic'] = 'nomagic':
+		act '<center><b>Start</b></center>': gt 'intro_' + $start_type['loc'], 'start'
+	elseif $start_type['magic'] = 'magic':
+		act '<center><b>Start</b></center>': gt 'intro_' + $start_type['loc'] + '_m', 'start'
+	elseif $start_type['magic'] = 'tg':
+		act '<center><b>Start</b></center>': gt 'intro_' + $start_type['loc'] + '_tg', 'start'
 	end
 
 	act '<center><b>Change game settings</b></center>': settingmode = 1 & gs '$menu_setting'

+ 2 - 2
locations/ender.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'loss':
 
 		'You fall to the floor and feel your consciousness slipping away.'
 
-		if $start_type = 'uni_tg':
+		if $start_type['loc'] = 'uni' and $start_type['magic'] = 'tg':
 			act 'Further': gt 'intro_uni_tg', 'tatianaPRE'
 		else
 			act 'Further': gt 'intro_city_tg', 'tatianaPRE'
@@ -681,7 +681,7 @@ if $ARGS[0] = 'surrender':
 		'He ignores your pleas and hits you with a huge upper cut.'
 		'You fall to the floor and feel your consciousness slipping away.'
 
-		if $start_type = 'uni_tg':
+		if $start_type['loc'] = 'uni' and $start_type['magic'] = 'tg':
 			act 'Further': gt 'intro_uni_tg', 'tatianaPRE'
 		else
 			act 'Further': gt 'intro_city_tg', 'tatianaPRE'

+ 1 - 1
locations/gdksport.qsrc

@@ -274,7 +274,7 @@ if $ARGS[0] = 'dance2':
 
 		act 'Leave':
 			if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and mid($start_type,1,2) = 'sg' and ( month < 10 or ( month = 10 and day < 18 )):
-				if alterstrtimg = 13:
+				if $start_type['cat'] = 'dancer':
 					gt 'albina_starlets', 'albina3'
 				elseif (grupTipe = 1 or grupTipe = 2) and npc_rel['A23'] >= 60:
 					gt 'albina_starlets', 'albina2'

+ 2 - 10
locations/intro_city.qsrc

@@ -1,16 +1,8 @@
 # intro_city
 
-if $ARGS[0] = 'start':
+gs 'themes', 'indoors'
 
-	gs 'themes', 'indoors'
-	killvar '$start_type'
-	$start_type = 'city'
-	$start_type[1] = 'nomagic'
-	
-	gt 'intro_city', 'city_intro'
-end
-
-if $ARGS[0] = 'city_intro':
+if $ARGS[0] = 'start':
 	$loc = 'intro_city'
 	$loc_arg = '2'
 	!! Intro to starting city

+ 1 - 3
locations/intro_city_m.qsrc

@@ -1,8 +1,6 @@
 # intro_city_m
 
 gs 'themes', 'indoors'
-killvar '$start_type'
-$start_type = 'city_m'
 
 if $ARGS[0] = 'start':
 	*clr & cla
@@ -113,7 +111,7 @@ if $ARGS[0] = 'wakeup':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/start_sg.jpg"></center>'
 								'You give Gustav directions to your apartment building. Half an hour later, he drops you off in front of your apartment building in Pavlovsk. You head inside and, feeling exhausted after the days events, you go to your room and collapse on the bed, quickly falling asleep.'
-								act '<center><b>Done</b></center>': gt 'intro_city', 'city_intro'
+								act '<center><b>Done</b></center>': gt 'intro_city', 'start'
 							end
 						end
 					end

+ 12 - 13
locations/intro_city_select.qsrc

@@ -1042,7 +1042,7 @@ elseif $ARGS[0] = 'anorexic':
 		gs 'intro_sg_select', 'cool'
 		$start_type['cat'] = 'anorexic'
 
-				!!----- SKILS -----!!
+		!!----- SKILS -----!!
 		! Attributes
 		pcs_sprt		-= 10
 
@@ -1051,27 +1051,26 @@ elseif $ARGS[0] = 'anorexic':
 		willpowermax 	-= 15
 
 		! Dance
-		pcs_danc		= 10
+		pcs_danc		+= 10
 
 		! Sport
-		pcs_run			= 15
+		pcs_run			+= 15
 
 		! Other
-		pcs_humint		= 15
-		pcs_persuas		= 10
-		pcs_makupskl	= 30
-		pcs_compskl		= 5
+		pcs_humint		-= 5
+		pcs_persuas		+= 10
+		pcs_makupskl	+= 20
+		pcs_compskl		+= 5
 
 		!!----- APPEARANCE -----!!
-		pcs_skin		= 400
+		pcs_skin		-= 300
 		pcs_haircol		= 2
-		pcs_hairlng		= 250
+		pcs_hairlng		-= 50
 		pcs_eyecol		= 2
-		pcs_eyesize		= 2
-		pcs_lip			= 1
-		pcs_teeth		= -1
+		pcs_lip			-= 1
+		pcs_teeth		-= 1
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 16
+		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8
 		pcs_mass['body']		= 15
 
 		!!----- INVENTRORY -----!!

+ 1 - 4
locations/intro_city_tg.qsrc

@@ -1,9 +1,6 @@
 # intro_city_tg
 !!2022/03/17
 gs 'themes', 'indoors'
-killvar '$start_type'
-$start_type = 'city_tg'
-$start_type[1] = 'tg'
 
 if $ARGS[0] = 'start':
 	menu_off = 1
@@ -384,7 +381,7 @@ if $ARGS[0] = 'sleepPRE':
 					gs 'obj_din', 'old'
 					'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/start_tf.jpg"></center>'
 					'You''re exhausted and are still struggling to take in all the strange things you''ve learnt, so decide to get an early night''s sleep.'
-					act 'Sleep': gt 'intro_city', 'city_intro'
+					act 'Sleep': gt 'intro_city', 'start'
 				end
 			end
 		end

+ 4 - 4
locations/intro_customization.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'start':
 	act 'Set purse': gt 'intro_customization','modpur'
 	act 'Set items': gt 'intro_customization','modite'
 	act 'Set money (<<money>>₽)': money = input 'Set Cash Amount' & gt'intro_customization','start'
-	if mid($start_type,1,2) = 'sg':
+	if $start_type['loc'] = 'sg':
 		gs 'intro_sg_select_custom', 'start'
 	else
 		act 'Confirm these options':
@@ -484,7 +484,7 @@ if $ARGS[0] = 'modatt':
 	gs 'intro_customization', 'modrel_setup2', 'pcs_react', 'Reaction'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_chrsm', 'Charisma'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_prcptn', 'Perception'
-	if $start_type[1] ! 'nomagic': gs 'intro_customization', 'modrel_setup2', 'pcs_magik', 'Magic'
+	if $start_type['magic'] ! 'nomagic': gs 'intro_customization', 'modrel_setup2', 'pcs_magik', 'Magic'
 	gs 'intro_customization', 'modrel_setup4', 'pcs_inhib', 'Inhibition'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_heels', 'Heels'
 	gs 'intro_customization', 'modrel_setup3', 'willpowermax', 'Willpower'
@@ -514,7 +514,7 @@ if $ARGS[0] = 'modskl_men':
 	'<center><b>Mental Skills</b></center>'
 	*nl
 	killvar '$table_display'
-	if $start_type[1] ! 'nomagic': gs 'intro_customization', 'modrel_setup2', 'pcs_splcstng', 'Spell Casting'
+	if $start_type['magic'] ! 'nomagic': gs 'intro_customization', 'modrel_setup2', 'pcs_splcstng', 'Spell Casting'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_humint', 'People skills'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_persuas', 'Persuasion'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_observ', 'Observation'
@@ -762,7 +762,7 @@ end
 if $ARGS[0] = 'birthday':
 	cls
 	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
-	if $start_type ! 'sg_tg':
+	if $start_type['loc'] ! 'sg' or $start_type['magic'] ! 'tg':
 		if player_avatar = 1:
 			'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
 		else

+ 2 - 2
locations/intro_initialization.qsrc

@@ -253,7 +253,7 @@ elseif $ARGS[1] = 'CSB':
 	cats_dress_b[1] = pcs_hips
 	sportsclothingnumber = 81
 	gs 'clothing', 'wear', 'cats_dress', 1
-elseif alterstrtimg = 17:
+elseif $start_type['cat'] = 'beautiful':
 	!!Beautiful start
 	cats_outfits[56] = 1
 	cats_outfits_h[56] = 100
@@ -432,7 +432,7 @@ if school_clothing = 1:
 	coatwornnumber = 19
 	$sportscoattype = 'dolls'
 	sportscoatnumber = 19
-elseif alterstrtimg = 17:
+elseif $start_type['cat'] = 'beautiful':
 !! beautiful start
 	cats_coats[16] = 1
 	cats_coats_h[16] = 200

+ 2 - 2
locations/intro_initialization_city.qsrc

@@ -3,7 +3,7 @@
 !!	Final Initializations
 !!	Top area for things that need to be done before setting the variables for either start
 
-if mid($start_type,1,3) ! 'uni':
+if $start_type['loc'] ! 'uni':
 	month = 6
 	$month = 'June'
 	day = 4
@@ -79,7 +79,7 @@ age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
 if ((month * 100) + day) < pcs_dob mod 10000: age -= 1
 
 !! apartment access and two months of rent paid
-if mid($start_type,1,4) = 'city':
+if $start_type['loc'] = 'city':
 	gs 'homes_properties', 'give_access', 'parents_home'
 	SchoolAtestat = 1
 	gs 'homes_properties', 'rent_property', 'city_apartment', 61

+ 1 - 5
locations/intro_sg.qsrc

@@ -1,14 +1,10 @@
 # intro_sg
 
 gs 'themes', 'indoors'
-if $start_type ! 'sg_m':
-	killvar '$start_type'
-	$start_type = 'sg'
-	$start_type[1] = 'nomagic'
-end
 
 if $ARGS[0] = 'start':
 	menu_off = 1
+
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/pre_5.jpg"></center>'
 	'You were born in the small town of Pavlovsk near the city of St Petersburg. You have an older sister, Anya, who is two years older than you.'
 	'Your mother is Natasha. You don''t know much about your biological father; your mother never wants to talk about him, or why he left you and Anya with her.'

+ 2 - 1
locations/intro_sg_m.qsrc

@@ -2,7 +2,8 @@
 
 gs 'themes', 'indoors'
 killvar '$start_type'
-$start_type = 'sg_m'
+$start_type['loc'] = 'sg'
+$start_type['magic'] = 'magic'
 
 if $ARGS[0] = 'four':
 	*clr & cla

+ 43 - 119
locations/intro_sg_select_custom.qsrc

@@ -1,6 +1,9 @@
 # intro_sg_select_custom
 
 if $ARGS[0] = 'start':
+	$start_type['group'] = 'custom'
+	$start_type['cat'] = 'custom'
+
 	act 'Pick a social group': gt 'intro_sg_select_custom','modgrup'
 	act 'Set relationships': gt 'intro_sg_select_custom','modrel'
 	act 'Confirm these options':
@@ -25,34 +28,11 @@ if $ARGS[0] = 'start':
 		killvar 'class_list_name'
 
 		!!Setting the shcoll classes such that grades can be assigned
-		gs 'grades', 'createclass', 'school', 'math', 3, 2, 'yes', 'yes', 0, 0
-		gs 'grades', 'createclass', 'school', 'rus', 3, 2, 'yes', 'yes', 0, 0
-		gs 'grades', 'createclass', 'school', 'lit', 2, 2, 'yes', 'yes', 0, 0
-		gs 'grades', 'createclass', 'school', 'art', 2, 2, 'yes', 'no', 0, 0
-		gs 'grades', 'createclass', 'school', 'bio', 2, 2, 'yes', 'yes', 0, 0
-		gs 'grades', 'createclass', 'school', 'pe', 3, 1, 'yes', 'no', 0, 0
-		gs 'grades', 'createclass', 'school', 'eng', 2, 2, 'yes', 'yes', 0, 0
-		gs 'grades', 'createclass', 'school', 'geo', 2, 2, 'yes', 'yes', 0, 0
-		gs 'grades', 'createclass', 'school', 'sci', 2, 2, 'yes', 'yes', 0, 0
-		gs 'grades', 'createclass', 'school', 'shop', 2, 2, 'yes', 'no', 0, 0
-		gs 'grades', 'createclass', 'school', 'comp', 3, 2, 'yes', 'yes', 0, 0
-		gs 'grades', 'createclass', 'school', 'mus', 2, 2, 'yes', 'no', 0, 0
-		gs 'grades', 'createclass', 'school', 'his', 2, 2, 'yes', 'yes', 0, 0
+		gs 'intro_functions', 'create_sgclasses'
 
 		!!Set the greades to be average.
-		gs 'grades', 'grade_award', 'school', 'math', 55
-		gs 'grades', 'grade_award', 'school', 'rus', 55
-		gs 'grades', 'grade_award', 'school', 'lit', 55
-		gs 'grades', 'grade_award', 'school', 'art', 55
-		gs 'grades', 'grade_award', 'school', 'bio', 55
-		gs 'grades', 'grade_award', 'school', 'pe', 55
-		gs 'grades', 'grade_award', 'school', 'eng', 55
-		gs 'grades', 'grade_award', 'school', 'geo', 55
-		gs 'grades', 'grade_award', 'school', 'sci', 55
-		gs 'grades', 'grade_award', 'school', 'shop', 55
-		gs 'grades', 'grade_award', 'school', 'comp', 55
-		gs 'grades', 'grade_award', 'school', 'mus', 55
-		gs 'grades', 'grade_award', 'school', 'his', 55
+		gs 'intro_functions', 'set_base_sgrades'
+
 		gt $loc, $loc_arg
 	end
 end
@@ -118,117 +98,71 @@ if $ARGS[0] = 'modgrup':
 	'Your current social group is <<$soc_grup>>.'
 	act 'Nerd':
 		killvar 'grupvalue'
+		$start_type['group'] = 'nerd'
 		$soc_grup = 'Nerd'
+		grupTipe = 3
 		grupvalue[1] = 200
 		grupvalue[2] = 100
 		grupvalue[3] = 800
 		grupvalue[4] = 100
 		grupvalue[6] = 600
-		grupTipe = 3
 		gt 'intro_sg_select_custom','modgrup'
 	end
 	act 'Jock':
 		killvar 'grupvalue'
+		$start_type['group'] = 'jock'
 		$soc_grup = 'Jock'
+		grupTipe = 2
 		grupvalue[1] = 400
 		grupvalue[2] = 800
 		grupvalue[3] = 100
 		grupvalue[4] = 200
 		grupvalue[6] = 400
-		grupTipe = 2
 		gt 'intro_sg_select_custom','modgrup'
 	end
 	act 'Popular':
 		killvar 'grupvalue'
+		$start_type['group'] = 'cool'
 		$soc_grup = 'Cool'
+		grupTipe = 1
 		grupvalue[1] = 800
 		grupvalue[2] = 400
 		grupvalue[3] = 200
 		grupvalue[4] = 100
 		grupvalue[6] = 400
-		grupTipe = 1
 		gt 'intro_sg_select_custom','modgrup'
 	end
 	act 'Gopnik':
 		killvar 'grupvalue'
+		$start_type['group'] = 'gopnik'
 		$soc_grup = 'Gopnik'
+		grupTipe = 4
 		grupvalue[1] = 200
 		grupvalue[2] = 300
 		grupvalue[3] = 100
 		grupvalue[4] = 800
 		grupvalue[6] = 100
-		grupTipe = 4
 		gt 'intro_sg_select_custom','modgrup'
 	end
 	act 'Outcast':
 		killvar 'grupvalue'
+		$start_type['group'] = 'outcast'
+		$soc_grup = 'Outcast'
+		grupTipe = 5
 		grupvalue[1] = 200
 		grupvalue[2] = 200
 		grupvalue[3] = 200
 		grupvalue[4] = 200
 		grupvalue[6] = 200
-		$soc_grup = 'Outcast'
-		grupTipe = 5
 		gt 'intro_sg_select_custom','modgrup'
 	end
-	act 'Return':gt'intro_customization','start'
+	act 'Return': gt'intro_customization','start'
 end
 
 if $ARGS[0] = 'none':
 	!!Attributes Reset - I know most of these att&skl are not in need of reset, but I dont know how to use loops and I wanted this to clear all changes made by choosing social group and/or player choices.
-	pcs_stren = 30
-	pcs_agil = 30
-	pcs_vital = 30
-	pcs_intel = 30
-	pcs_react = 30
-	pcs_sprt = 30
-	pcs_chrsm = 30
-	pcs_prcptn = 30
-	pcs_grades = 75
-	pcs_inhib = 10
-	pcs_heels = 5
 
-	!!Mental Skills Reset
-	pcs_humint = 0
-	pcs_persuas = 0
-	pcs_observ = 0
-	
-	!!Sport Skills Reset
-	pcs_jab = 0
-	pcs_punch = 0
-	pcs_kick = 0
-	pcs_def = 0
-	pcs_run = 0
-	pcs_vball = 0
-	pcs_ftbll = 0
-	pcs_wrstlng = 0
-	pcs_shoot = 0
-	pcs_bushcraft = 0
-	pcs_chess = 0
-	pcs_icesktng = 0
-	pcs_gaming = 0
-	
-	!!Beauty Skills Reset
-	pcs_makupskl = 20
-	pcs_danc = 0
-	pcs_dancero = 0
-	pcs_dancpol = 0
-	pcs_cheer = 0
-	pcs_mdlng = 0
-	
-	!!Artistic Skills Reset
-	pcs_vokal = 0
-	pcs_instrmusic = 0
-	pcs_photoskl = 0
-	pcs_artskls = 0
-	
-	!!Job Skills Reset
-	pcs_compskl = 0
-	pcs_comphckng = 0
-	pcs_hndiwrk = 0
-	pcs_sewng = 0
-	pcs_servng = 0
-	pcs_medcn = 0
+	gs 'intro_functions', 'set_base_stats'
 	
 	!!social group Reset
 	grupTipe = 0
@@ -237,57 +171,47 @@ if $ARGS[0] = 'none':
 	grupvalue[3] = 0
 	grupvalue[4] = 0
 	grupvalue[6] = 0
+
 	gs 'npc_relationship', 'socialgroup_setting', 0, 0, 0, 0, 0, 0	
 	
 	!!npc relationship Reset
-	npc_rel['A11'] = 60	
-	npc_rel['A129'] = 30
-	npc_rel['A133'] = 30
-	npc_rel['A28'] = 50	
-	npc_rel['A29'] = 50	
-	npc_rel['A33'] = 70	
-	npc_rel['A34'] = 50	
+	npc_rel['A11']	= 60
+	npc_rel['A28']	= 50
+	npc_rel['A29']	= 50
+	npc_rel['A33']	= 70
+	npc_rel['A34']	= 50
+	npc_rel['A129']	= 30
+	npc_rel['A133']	= 30
 	
 	!!items Reset
-	money = 2000
 	fakepassport = 0
 	fantasybook = 0
-	glass = 0
-	mc_inventory['scrunchies'] = 0
-	mc_inventory['cosmetics'] = 0
 	pirsC = 0
 	PirsC1_owned = 0
-	mc_inventory['shampoo'] = 0
-	mc_inventory['cigarettes'] = 0
-	mc_inventory['razor'] = 0
 	swim_start = 0
-	mc_inventory['tampons'] = 0
 	
 	!!apprnc & sex stat reset
-	pcs_mass['bust_gen'] = 22
-	pcs_mass['butt_gen'] = 20
-	pcs_skin = 40
-	pcs_mass['body'] = 80
-	pcs_tan = 0	
-	pcs_throat = 0
-	pcs_vag = 0
-	stat['bj'] = 0
-	stat['hj'] = 0
-	stat['vaginal'] = 0
+	pcs_vag		= 10
+	pcs_ass		= 10
+	pcs_throat	= 10
+	stat['bj']	= 0
+	stat['hj']	= 0
+	stat['vaginal']	= 0
+
 	$soc_grup = 'outcast'
 	grupTipe = 5
 end
 
 if $ARGS[0] = 'modrel':
-	act 'Family':gt 'intro_sg_select_custom','modrel_fam'
-	act 'Popular Kids':gt 'intro_sg_select_custom','modrel_pop'
-	act 'Athletes':gt 'intro_sg_select_custom','modrel_ath'
-	act 'Nerds':gt 'intro_sg_select_custom','modrel_ner'
-	act 'Gopniks':gt 'intro_sg_select_custom','modrel_gop'
-	act 'Outcasts/Loners':gt'intro_sg_select_custom','modrel_out'
-	act 'Teachers/Coaches':gt'intro_sg_select_custom','modrel_tea'
-	act 'Others':gt'intro_sg_select_custom','modrel_oth'
-	act 'Return':gt'intro_customization','start'
+	act 'Family': gt 'intro_sg_select_custom','modrel_fam'
+	act 'Popular Kids': gt 'intro_sg_select_custom','modrel_pop'
+	act 'Athletes': gt 'intro_sg_select_custom','modrel_ath'
+	act 'Nerds': gt 'intro_sg_select_custom','modrel_ner'
+	act 'Gopniks': gt 'intro_sg_select_custom','modrel_gop'
+	act 'Outcasts/Loners': gt'intro_sg_select_custom','modrel_out'
+	act 'Teachers/Coaches': gt'intro_sg_select_custom','modrel_tea'
+	act 'Others': gt'intro_sg_select_custom','modrel_oth'
+	act 'Return': gt'intro_customization','start'
 end
 
 if $ARGS[0] = 'modrel_fam':

+ 1 - 3
locations/intro_sg_tg.qsrc

@@ -1,15 +1,13 @@
 # intro_sg_tg
 
 gs 'themes', 'indoors'
-killvar '$start_type'
-$start_type[1] = 'tg'
-$start_type = 'sg_tg'
 
 if $ARGS[0] = 'start':
 	$locM = 'intro_sg_tg'
 	$locM_arg = 'start'
 	*clr & cla
 	menu_off = 1
+
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_ivan.jpg"></center>'
 	'You are Mikhail Ivanov.'
 	*nl

+ 1 - 8
locations/intro_uni.qsrc

@@ -2,14 +2,7 @@
 
 gs 'themes', 'indoors'
 
-if $ARGS[0] = 'start':
-	killvar '$start_type'
-	$start_type = 'uni'
-	$start_type[1] = 'nomagic'
-	gt 'intro_uni', 'intro'
-end
-
-if $ARGS[0] = 'intro':
+if $ARGS[0] = 'start' or $ARGS[0] = 'intro':
 	!! Intro to starting uni
 	$loc = 'intro_uni'
 	$loc_arg = 'custom'

+ 1 - 3
locations/intro_uni_m.qsrc

@@ -2,8 +2,6 @@
 
 if $ARGS[0] = 'start':
 	gs 'themes', 'indoors'
-	killvar '$start_type'
-	$start_type = 'uni_m'
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_gadukino.jpg"></center>'
@@ -112,7 +110,7 @@ if $ARGS[0] = 'wakeup':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/start_sg.jpg"></center>'
 								'You give Gustav directions to your apartment building. Half an hour later, he drops you off in front of your apartment building in Pavlovsk. You head inside and, feeling exhausted after the days events, you go to your room and collapse on the bed, quickly falling asleep.'
-								act 'Done': gt 'intro_uni', 'intro'
+								act 'Done': gt 'intro_uni', 'start'
 							end
 						end
 					end

+ 1 - 5
locations/intro_uni_tg.qsrc

@@ -3,10 +3,6 @@
 !2022/01/09
 !!The TF Story Elements
 gs 'themes', 'indoors'
-killvar '$start_type'
-$start_type = 'uni_tg'
-$start_type[1] = 'tg'
-
 
 if $ARGS[0] = 'start':
 	menu_off = 1
@@ -382,7 +378,7 @@ if $ARGS[0] = 'sleepPRE':
 				act 'Go to the apartment':
 					'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_day.jpg"></center>'
 					'You''re exhausted and are still struggling to take in all the strange things you''ve learnt, so decide to get an early night''s sleep.'
-					act 'Continue': gt 'intro_uni', 'intro'
+					act 'Continue': gt 'intro_uni', 'start'
 				end
 			end
 		end

+ 1 - 1
locations/katja_nightclub.qsrc

@@ -13,7 +13,7 @@
 if $ARGS[0] = 'activity':
 	gs 'katja_meynold_schedule' 
 
-	if locat['Katja'] = 53 and (katjaQW['know_katja_uni'] = 1 or ($start_type ! 'city_tg' and $start_type ! 'uni_tg')):
+	if locat['Katja'] = 53 and (katjaQW['know_katja_uni'] = 1 or ($start_type['loc'] = 'sg' or $start_type['magic'] ! 'tg')):
 		!! This sets what Katja is doing if she is not with the player character
 		if katjaQW['disco_check_time'] + 600 < totminut:
 			katjaQW['disco_loc'] = 0

+ 1 - 1
locations/katja_uni.qsrc

@@ -200,7 +200,7 @@ if $ARGS[0] = 'first_in_class_meet':
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'	
-		if $start_type = 'city_tg' or $start_type = 'uni_tg':
+		if $start_type['loc'] ! 'sg' and $start_type['magic'] = 'tg':
 			'As you walk into the lecture hall, a pretty redhead walks up to you. "Hey <<$pcs_nickname>>! I didn''t know you also wanted to become a teacher," she says.'
 			'"I thought it would make for an interesting education and a fun career," you reply while trying to remember who this girl is.'
 			'"If you want, then we can meet and talk about the lectures and maybe do some studying together," she says.'

+ 85 - 0
locations/saveupdater.qsrc

@@ -2410,6 +2410,91 @@ if temp_current_save_version < 00090200:
 	!! body_structure introduction and variable migration:
 	if $bmi_desc	! '':		$bodyVars['bmi_desc']	= $bmi_desc		& killvar '$bmi_desc'
 	if $body		! '':		$bodyVars['desc']		= $body			& killvar '$body'
+
+	!! Migration of alterstrtimg and start_type
+	if arrsize('start_type') = 2 and alterstrtimg ! 0:
+		if mid($start_type[0], 1, 2) = 'sg':
+			$temp_st[0] = 'sg'
+		elseif mid($start_type[0], 1, 3) = 'uni':
+			$temp_st[0] = 'uni'
+		else
+			$temp_st[0] = 'city'
+		end
+
+		$temp_st[1] = $start_type[1]
+		if $temp_st[1] = '': $temp_st[1] = 'magic'
+
+		if alterstrtimg >= 8 and alterstrtimg <= 11:
+			$temp_st[2] = 'nerd'
+			if alterstrtimg = 8:
+				$temp_st[3] = 'nerdqueen'
+			elseif alterstrtimg = 9:
+				$temp_st[3] = 'goodstudent'
+			elseif alterstrtimg = 10:
+				$temp_st[3] = 'computergeek'
+			else
+				$temp_st[3] = 'chessplayer'
+			end
+		elseif alterstrtimg >= 12 and alterstrtimg <= 15:
+			$temp_st[2] = 'jock'
+			if alterstrtimg = 12:
+				$temp_st[3] = 'volleyball'
+			elseif alterstrtimg = 13:
+				$temp_st[3] = 'dancer'
+			elseif alterstrtimg = 14:
+				$temp_st[3] = 'runner'
+			else
+				$temp_st[3] = 'football'
+			end
+		elseif alterstrtimg >= 16 and alterstrtimg <= 17:
+			$temp_st[2] = 'cool'
+			if alterstrtimg = 16:
+				$temp_st[3] = 'socialite'
+			elseif alterstrtimg = 17:
+				$temp_st[3] = 'beautiful'
+			end
+		elseif alterstrtimg >= 18 and alterstrtimg <= 21:
+			$temp_st[2] = 'gopnik'
+			if alterstrtimg = 18:
+				$temp_st[3] = 'gopnikstart'
+			elseif alterstrtimg = 19:
+				$temp_st[3] = 'troublemaker'
+			elseif alterstrtimg = 20:
+				$temp_st[3] = 'vitekgf'
+			else
+				$temp_st[3] = 'alternative'
+			end
+		elseif alterstrtimg >= 22 and alterstrtimg <= 28:
+			$temp_st[2] = 'outcast'
+			if alterstrtimg = 22:
+				$temp_st[3] = 'friendless'
+			elseif alterstrtimg = 23:
+				$temp_st[3] = 'uglyduckling'
+			elseif alterstrtimg = 24:
+				$temp_st[3] = 'goodgirl'
+			elseif alterstrtimg = 25:
+				$temp_st[3] = 'slut'
+			else
+				$temp_st[3] = 'goth'
+			end
+		elseif alterstrtimg = 31:
+			$temp_st[2] = 'cool'
+			$temp_st[3] = 'anorexic'
+		else
+			$temp_st[2] = 'nerd'
+			$temp_st[3] = 'nerdqueen'
+		end
+
+		killvar 'start_type'
+		killvar 'alterstrtimg'
+
+		$start_type['loc']		= $temp_st[0]
+		$start_type['magic']	= #temp_st[1]
+		$start_type['group']	= #temp_st[2]
+		$start_type['cat']		= #temp_st[3]
+
+		killvar 'temp_st'
+	end
 end
 
 

+ 3 - 3
locations/uni_cafe.qsrc

@@ -18,17 +18,17 @@ if $ARGS[0] = '':
 	'The university cafe is a popular spot for students preparing for their exams or just unwinding from their busy schedule.'
 	'It offers a rich variation of reasonably priced food and beverages. You can often overhear students complaining about the free, yet somewhat sub-par quality wi-fi.'
 	if locat['katja'] = 28:
-		'You see '+iif(katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'a cute redheaded girl', '<a href="exec:gt ''katja_chat'', ''uni_cafe''">Katja</a>')+' sitting at a table eating her lunch.'
+		'You see '+iif(katjaQW['know_katja_uni'] = 0 and ($start_type['loc'] ! 'sg' and $start_type['magic'] = 'tg'), 'a cute redheaded girl', '<a href="exec:gt ''katja_chat'', ''uni_cafe''">Katja</a>')+' sitting at a table eating her lunch.'
 	end
 	
 	!!if locat['albina'] = 13:
-		!!'You see '+iif(AlbinaQW['know_albina_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'an attractive looking brunette', '<a href="exec:gt ''albina_uni'', ''lunch_chat''">Albina</a>')+' sitting at one of the tables, eating her lunch while texting on her phone.'
+		!!'You see '+iif(AlbinaQW['know_albina_uni'] = 0 and ($start_type['loc'] ! 'sg' and $start_type['magic'] = 'tg'), 'an attractive looking brunette', '<a href="exec:gt ''albina_uni'', ''lunch_chat''">Albina</a>')+' sitting at one of the tables, eating her lunch while texting on her phone.'
 	!!end
 	
 	if week < 5 and hour = 10 and minut >= 30:
 !!is this correct for the 30 min lunch break during school days?
 		temp_rand = rand(1,7)
-		if mid($start_type,1,2) = 'sg' and yearstart = 2:
+		if $start_type['loc'] = 'sg' and yearstart = 2:
 			if temp_rand = 1:
 				'You see a familiar face sitting at one of the tables having lunch, your former classmate <a href="exec:gt ''uni_cafe'',''lazar''">Lazar.</a>'
 			elseif temp_rand = 2:

+ 1 - 1
locations/uni_grounds.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'main':
 	end
 
 	if locat['katja']  = 25:
-		'You see '+iif( katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'a redheaded girl', '<a href="exec:gt ''katja_chat'', ''start''">Katja</a>')+' sitting  talking on her phone.'
+		'You see '+iif( katjaQW['know_katja_uni'] = 0 and ($start_type['loc'] ! 'sg' and $start_type['magic'] = 'tg'), 'a redheaded girl', '<a href="exec:gt ''katja_chat'', ''start''">Katja</a>')+' sitting  talking on her phone.'
 	end
 
 	act 'Return to the city':

+ 3 - 3
locations/uni_library.qsrc

@@ -39,11 +39,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'One of the medium sized buildings is the university''s library. It is three stories tall and filled with books, sections with tables scattered around to study or relax at and computer stations to help students with their studying.'
 	
 	if locat['katja'] = 29:
-		'You see '+iif(katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'a cute redheaded girl', '<a href="exec:gt ''katja_uni'', ''library''">Katja</a>')+' sitting at one of the desks with a laptop and a pile of books.'
+		'You see '+iif(katjaQW['know_katja_uni'] = 0 and ($start_type['loc'] ! 'sg' and $start_type['magic'] = 'tg'), 'a cute redheaded girl', '<a href="exec:gt ''katja_uni'', ''library''">Katja</a>')+' sitting at one of the desks with a laptop and a pile of books.'
 	end
 	
 	!!if locat['albina'] = 6:
-		!!'You see '+iif(AlbinaQW['know_albina_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'an attractive looking brunette', '<a href="exec:gt ''albina_uni'', ''library''">Albina</a>')+' searching the shelves for books.'
+		!!'You see '+iif(AlbinaQW['know_albina_uni'] = 0 and ($start_type['loc'] ! 'sg' and $start_type['magic'] = 'tg'), 'an attractive looking brunette', '<a href="exec:gt ''albina_uni'', ''library''">Albina</a>')+' searching the shelves for books.'
 	!!end
 
 	if week <= 4 and hour >= 15 and hour < 17:
@@ -54,7 +54,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		end
 	end
 	
-	if mid($start_type,1,2) = 'sg' and yearstart > 1 and week > 5 and hour >= 12 and hour < 14:
+	if $start_type['loc'] = 'sg' and yearstart > 1 and week > 5 and hour >= 12 and hour < 14:
 		if nataliaQW['library_day_check'] ! daystart:
 			nataliaQW['library_day_check'] = daystart
 			if rand(0,3) = 0: nataliaQW['library_day'] = daystart