[changed] full transfer from `swim_start` and `school_clothing` to `$start_type`

locations/intro_city_select.qsrc

@@ -640,7 +640,6 @@ if $ARGS[0] = 'jock':
 	pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
-	swim_start = 1
 	mc_inventory['cosmetics']	= 10
 	mc_inventory['scrunchies']	= 10
 	mc_inventory['razor']		= 10
@@ -688,7 +687,6 @@ if $ARGS[0] = 'volleyball':
 		pcs_mass['body']		= 56
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 7
 		gsAboVolley += 30
 
 		!!----- RELATIONSHIPS -----!!
@@ -738,7 +736,6 @@ elseif $ARGS[0] = 'dancer':
 		pcs_mass['body']		= 37
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 7
 		gsAboDance += 30
 
 		!!----- RELATIONSHIPS -----!!
@@ -784,7 +781,6 @@ elseif $ARGS[0] = 'runner':
 		pcs_mass['body']		= 45
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 7
 		gsAboBeg += 30
 
 		!!----- RELATIONSHIPS -----!!
@@ -833,7 +829,6 @@ elseif $ARGS[0] = 'football':
 		pcs_mass['body']		= 60
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 7
 		$currentpursetype	= 'fashionista'
 		currentpursenumber	= 11
 		fashionista_purses[11] = 1
@@ -897,7 +892,6 @@ if $ARGS[0] = 'cool':
 
 	!!----- INVENTRORY -----!!
 		money += 1000
-		swim_start = 99
 		mc_inventory['cosmetics']		= 20
 		mc_inventory['shampoo']			= 20
 		mc_inventory['razor']			= 20
@@ -946,7 +940,6 @@ if $ARGS[0] = 'socialite':
 		pcs_mass['body']		= 60
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 6
 		pirsC = 1
 		PirsC1_owned = 1
 		$currentpursetype	= 'fashionista'
@@ -1003,7 +996,6 @@ elseif $ARGS[0] = 'beautiful':
 		pcs_mass['body']		= 56
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 6
 		mc_inventory['comb']			=  1
 		mc_inventory['cosmetics']		= 50
 		mc_inventory['travel_makeup']	= 10
@@ -1082,7 +1074,6 @@ elseif $ARGS[0] = 'anorexic':
 		pcs_mass['body']		= 15
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 6
 		mc_inventory['comb']			= 1
 		mc_inventory['cosmetics']		= 10
 		mc_inventory['suncream']		= 10
@@ -1221,9 +1212,6 @@ if $ARGS[0] = 'gopnikstart':
 		pcs_mass['butt_gen']	= 20
 		pcs_mass['body']		= 65
 
-		!!----- INVENTRORY -----!!
-		school_clothing = 5
-
 		!!----- RELATIONSHIPS -----!!
 		gs 'npc_relationship', 'socialgroup_setting', -10, -10, -10, 5, -10, -10
 		npc_rel['A9']	+= 10
@@ -1276,7 +1264,6 @@ elseif $ARGS[0] = 'troublemaker':
 		pcs_mass['body']		= 49
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 5
 		pirsD = 4
 		PirsD4_owned = 1
 		$currentpursetype	= 'dolls'
@@ -1340,7 +1327,6 @@ elseif $ARGS[0] = 'alternative':
 		pcs_mass['body']		= 56
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 4
 		mc_inventory['cosmetics']		= 20
 		mc_inventory['eyelash_fake']	= 5
 		pirsD = 5
@@ -1497,7 +1483,6 @@ elseif $ARGS[0] = 'uglyduckling':
 		if glass < 1 : glass = 1
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 3
 		gm_purses[8] = 1
 		$currentpursetype	= 'gm'
 		currentpursenumber	= 8
@@ -1543,7 +1528,6 @@ elseif $ARGS[0] = 'goodgirl':
 
 		!!----- INVENTRORY -----!!
 		money += 1000
-		school_clothing = 3
 		mc_inventory['shampoo']		= 10
 		$currentpursetype	= 'gm'
 		currentpursenumber	= 6
@@ -1610,7 +1594,6 @@ elseif $ARGS[0] = 'slut':
 		pcs_mass['body']		= 52
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 2
 		mc_inventory['comb']			= 1
 		mc_inventory['cosmetics']		= 30
 		mc_inventory['travel_makeup']	= 10

locations/intro_functions.qsrc

@@ -98,8 +98,6 @@ if $ARGS[0] = 'set_base_stats':
 
 	!!----- INVENTRORY -----!!
 	money = 2000
-	school_clothing = 0
-	swim_start = 0
 	mc_inventory['comb']			= 0
 	mc_inventory['umbrella']		= 0
 	mc_inventory['travel_mirror']	= 0
@@ -199,131 +197,6 @@ if $ARGS[0] = 'set_base_city_stats':
 end
 
 
-if $ARGS[0] = 'city_backup_full':
-	gs 'intro_functions', 'set_base_city_stats'
-
-		!!----- SKILS -----!!
-		! Attributes
-		pcs_stren		= 40
-		pcs_agil		= 40
-		pcs_vital		= 40
-		pcs_intel		= 40
-		pcs_react		= 40
-		pcs_sprt		= 40
-		pcs_chrsm		= 40
-		pcs_prcptn		= 40
-		pcs_magik		= 0
-
-		strenbuf		= 40
-		agilbuf			= 40
-		vitalbuf		= 40
-
-		! Sexual
-		pcs_inhib		= 15
-		willpowermax 	= 60
-
-		! Combat
-		pcs_jab			= 0
-		pcs_punch		= 0
-		pcs_kick		= 0
-		pcs_def			= 0
-		pcs_shoot		= 0
-		pcs_bushcraft	= 0
-
-		! Craft
-		pcs_vokal		= 0
-		pcs_sewng		= 0
-		pcs_instrmusic	= 0
-		pcs_photoskl	= 0
-		pcs_artskls		= 15
-		pcs_perform		= 0
-		pcs_musicprod	= 0
-
-		! Dance
-		pcs_danc		= 30
-		pcs_dancero		= 0
-		pcs_dancpol		= 0
-		pcs_cheer		= 0
-
-		! Sport
-		pcs_run			= 0
-		pcs_vball		= 0
-		pcs_icesktng	= 0
-		pcs_wrstlng		= 0
-		pcs_ftbll		= 0
-
-		! Work
-		pcs_wrstlng		= 0
-		pcs_mdlng		= 0
-		pcs_medcn		= 0
-		pcs_cleaning	= 0
-
-		! Other
-		pcs_chess		= 15
-		pcs_gaming		= 0
-		pcs_humint		= 0
-		pcs_persuas		= 0
-		pcs_observ		= 0
-		pcs_makupskl	= 15
-		pcs_compskl		= 20
-		pcs_comphckng	= 10
-		pcs_hndiwrk		= 0
-		pcs_pool		= 0
-		pcs_heels		= 20
-
-		!!----- APPEARANCE -----!!
-		pcs_hgt		= 170
-		dick		= 0
-		pcs_skin	= 500
-		pcs_tan		= 0
-		pcs_haircol	= 1
-		pcs_hairlng	= 300
-		pcs_eyecol	= 0
-		pcs_eyesize	= 2
-		pcs_lashes	= 1
-		pcs_lip		= 1
-		pcs_pubes	= 30
-		pcs_leghair	= 12
-		pcs_teeth	= 0
-		pcs_mass['bust_gen']	= 17
-		pcs_mass['butt_gen']	= 20
-		pcs_mass['body']		= 60
-		pcs_energy	= 60
-		pcs_hydra	= 60
-		pcs_sleep	= 70
-
-		! Other
-		pcs_makeup = 5
-		hscrunchw = 0
-
-		!!----- INVENTRORY -----!!
-		money = 2000
-		mc_inventory['shampoo']			= 20
-		mc_inventory['tampons']			= 15
-		mc_inventory['sanitary_pads']	= 10
-		mc_inventory['food_basic']		= 5
-		mc_inventory['dish_plates']		= 1
-		mc_inventory['dish_soap']		= 10
-		mc_inventory['laundry_soap']	= 5
-		gm_purses[7] = 1
-		$currentpursetype	= 'gm'
-		currentpursenumber	= 7
-		bag = 1
-
-		!!----- RELATIONSHIPS -----!!
-		brothersawpirsF = 0
-
-		!!----- TRIATS -----!!
-
-		!!----- SEX STATS -----!!
-		prezikProver = 3
-
-		!!----- SCHOOL GRADES -----!!
-end
-
-
-
-
 if $ARGS[0] = 'create_sgclasses':
 	gs 'grades', 'createclass', 'school', 'math', 3, 2, 'yes', 'yes', 0, 0
 	gs 'grades', 'createclass', 'school', 'rus',  3, 2, 'yes', 'yes', 0, 0
@@ -341,19 +214,19 @@ if $ARGS[0] = 'create_sgclasses':
 end
 
 if $ARGS[0] = 'set_base_sgrades':
-		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', 'eng',  55
-		gs 'grades', 'grade_award', 'school', 'geo',  55
-		gs 'grades', 'grade_award', 'school', 'sci',  55
-		gs 'grades', 'grade_award', 'school', 'his',  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', 'pe',   55
+	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', 'eng',  55
+	gs 'grades', 'grade_award', 'school', 'geo',  55
+	gs 'grades', 'grade_award', 'school', 'sci',  55
+	gs 'grades', 'grade_award', 'school', 'his',  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', 'pe',   55
 end
 
 

locations/intro_initialization.qsrc

@@ -407,7 +407,8 @@ else
 	sportsclothingnumber = 15
 	gs 'clothing', 'wear', 'gm_dress', 149
 end
-if $start_type['group'] = 'cool' or swim_start = 99:
+
+if $start_type['group'] = 'cool':
 	if pcs_inhib <= 10:
 		allure_swimsuit[3] = 1
 		allure_swimsuit_h[3] = 60
@@ -417,7 +418,8 @@ if $start_type['group'] = 'cool' or swim_start = 99:
 		allure_swimsuit_h[99] = 60
 		allure_swimsuit_b[99] = pcs_hips
 	end
-elseif $start_type['group'] = 'jock' or swim_start = 1:
+
+elseif $start_type['group'] = 'jock':
 	if pcs_inhib <= 10:
 		danilovich_swimsuit[1] = 1
 		danilovich_swimsuit_h[1] = 60
@@ -431,7 +433,6 @@ end
 
 !!setting default danilovich outfit and setting coats
 if $start_type['cat'] = 'goth':
-	killvar 'school_clothing'
 	dolls_outfits[29] = 1
 	dolls_outfits_h[29] = 120
 	dolls_outfits_b[29] = pcs_hips
@@ -483,7 +484,8 @@ else
 	danilovich_pantiesS[1] = 0
 	$sportspantytype = 'danilovich'
 	sportspantynumber = 1
-	if school_clothing = 2:
+
+	if $start_type['cat'] = 'slut':
 		gm_school[49] = 1
 		gm_school_h[49] = 120
 		gm_school_b[49] = pcs_hips
@@ -494,26 +496,35 @@ else
 		gm_school[18] = 1
 		gm_school_h[18] = 120
 		gm_school_b[18] = pcs_hips
-	elseif school_clothing = 3:
+	elseif $start_type['cat'] = 'uglyduckling' or $start_type['cat'] = 'goodgirl':
 		gm_school[25] = 1
 		gm_school_h[25] = 120
 		gm_school_b[25] = pcs_hips
-	elseif school_clothing = 4:
+	elseif $start_type['cat'] = 'alternative':
 		bomba_dress[40] = 1
 		bomba_dress_h[40] = 120
 		bomba_dress_b[40] = pcs_hips
 		gm_school[52] = 1
 		gm_school_h[52] = 120
 		gm_school_b[52] = pcs_hips
-	elseif school_clothing = 5:
+	elseif $start_type['cat'] = 'dancer':
+		gm_school[60] = 1
+		gm_school_h[60] = 120
+		gm_school_b[60] = pcs_hips
+		!!Dancer gets leotard
+		danilovich_outfits[155] = 1
+		danilovich_outfits_h[155] = 100
+		danilovich_shoe[6] = 1
+
+	elseif $start_type['group'] = 'gopnik':
 		gm_school[52] = 1
 		gm_school_h[52] = 120
 		gm_school_b[52] = pcs_hips
-	elseif school_clothing = 6:
+	elseif $start_type['group'] = 'cool':
 		gm_school[32] = 1
 		gm_school_h[32] = 120
 		gm_school_b[32] = pcs_hips
-	elseif school_clothing = 7:
+	elseif $start_type['group'] = 'jock':
 		gm_school[60] = 1
 		gm_school_h[60] = 120
 		gm_school_b[60] = pcs_hips
@@ -522,27 +533,19 @@ else
 		sportsclothingnumber = 65
 		danilovich_shoe[17] = 1
 		danilovich_shoe[21] = 0
-	elseif school_clothing = 8:
-		gm_school[60] = 1
-		gm_school_h[60] = 120
-		gm_school_b[60] = pcs_hips
-		!!Dancer gets leotard
-		danilovich_outfits[155] = 1
-		danilovich_outfits_h[155] = 100
-		danilovich_shoe[6] = 1
 	end
-	killvar 'school_clothing'
 end
+
 if danilovich_shoe[17] = 1:
 	sportsshoenumber = 17
 else
 	sportsshoenumber = 21
 end
+
 $sportspursetype = $currentpursetype
 sportspursenumber = currentpursenumber
 $sports_clothing_name = 'default sports outfit'
 
-killvar 'swim_start'
 
 gs 'body', 'Update_Body'
 gs 'body', 'DailyUpdate'

locations/intro_initialization_city.qsrc

@@ -226,7 +226,7 @@ cats_dress[1] = 1
 cats_dress_h[1] = 100
 cats_dress_b[1] = pcs_hips
 danilovich_shoe[21] = 1
-if school_clothing = 7:
+if $start_type['group'] = 'jock':
 	!!Dancer gets leotard and nicer swimwear
 	danilovich_outfits[155] = 1
 	danilovich_outfits_h[155] = 100
@@ -516,11 +516,11 @@ else
 	gs 'clothing', 'wear', 'scandalicious_dress', 46
 end
 
-if $start_type['group'] = 'cool' or swim_start = 99:
+if $start_type['group'] = 'cool':
 	allure_swimsuit[99] = 1
 	allure_swimsuit_h[99] = 60
 	allure_swimsuit_b[99] = pcs_hips
-elseif $start_type['group'] = 'jack' or swim_start = 1:
+elseif $start_type['group'] = 'jack':
 	danilovich_swimsuit[1] = 1
 	danilovich_swimsuit_h[1] = 60
 	danilovich_swimsuit_b[1] = pcs_hips
@@ -535,7 +535,6 @@ $sportspursetype = $currentpursetype
 sportspursenumber = currentpursenumber
 $sports_clothing_name = 'default sports outfit'
 
-killvar 'swim_start'
 
 gs 'body', 'Update_Body'
 gs 'body', 'DailyUpdate'

locations/intro_sg_select.qsrc

@@ -721,7 +721,6 @@ if $ARGS[0] = 'jock':
 	pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
-	swim_start = 1
 	mc_inventory['cosmetics']		= 10
 	mc_inventory['shampoo']			= 20
 	mc_inventory['scrunchies']		= 10
@@ -773,7 +772,6 @@ if $ARGS[0] = 'volleyball':
 		pcs_mass['body']		= 56
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 7
 		gsAboVolley += 30
 
 		!!----- RELATIONSHIPS -----!!
@@ -831,7 +829,6 @@ elseif $ARGS[0] = 'dancer':
 		pcs_mass['body']		= 37
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 8
 		gsAboDance += 30
 
 		!!----- RELATIONSHIPS -----!!
@@ -877,7 +874,6 @@ elseif $ARGS[0] = 'runner':
 		pcs_mass['body']		= 45
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 7
 		gsAboBeg += 30
 
 		!!----- RELATIONSHIPS -----!!
@@ -920,7 +916,6 @@ elseif $ARGS[0] = 'football':
 		pcs_mass['body']		= 60
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 7
 		$currentpursetype = 'fashionista'
 		currentpursenumber = 11
 		fashionista_purses[11] = 1
@@ -982,7 +977,6 @@ if $ARGS[0] = 'cool':
 
 	!!----- INVENTRORY -----!!
 	money += 1000
-	swim_start = 99
 	mc_inventory['cosmetics']		= 20
 	mc_inventory['shampoo']			= 20
 	mc_inventory['razor']			= 20
@@ -1036,7 +1030,6 @@ if $ARGS[0] = 'socialite':
 		pcs_mass['body']		= 60
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 6
 		pirsC = 1
 		PirsC1_owned = 1
 		$currentpursetype = 'fashionista'
@@ -1177,7 +1170,6 @@ elseif $ARGS[0] = 'anorexic':
 		pcs_mass['body']		= 15
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 6
 		mc_inventory['comb']			= 1
 		mc_inventory['cosmetics']		= 10
 		mc_inventory['suncream']		= 10
@@ -1324,9 +1316,6 @@ if $ARGS[0] = 'gopnikstart':
 		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
 		pcs_mass['body']		= 65
 
-		!!----- INVENTRORY -----!!
-		school_clothing = 5
-
 		!!----- RELATIONSHIPS -----!!
 		grupvalue[4] = 900
 		gs 'npc_relationship', 'socialgroup_setting', -10, -10, -10, 10, -10, -10
@@ -1382,7 +1371,6 @@ elseif $ARGS[0] = 'troublemaker':
 		pcs_mass['body']		= 49
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 5
 		pirsD = 4
 		PirsD4_owned = 1
 		$currentpursetype = 'dolls'
@@ -1448,7 +1436,6 @@ elseif $ARGS[0] = 'vitekgf':
 		pcs_mass['body']		= 55
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 5
 		pirsD = 3
 		PirsD3_owned = 1
 		$currentpursetype = 'dolls'
@@ -1539,7 +1526,6 @@ elseif $ARGS[0] = 'alternative':
 		pcs_mass['body']		= 56
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 4
 		mc_inventory['cosmetics']		= 20
 		mc_inventory['eyelash_fake']	= 5
 		pirsD = 5
@@ -1708,9 +1694,6 @@ elseif $ARGS[0] = 'uglyduckling':
 		! Other
 		if glass < 1 : glass = 1
 
-		!!----- INVENTRORY -----!!
-		school_clothing = 3
-
 		!!----- RELATIONSHIPS -----!!
 		grupvalue[1] = 0
 		gs 'npc_relationship', 'socialgroup_setting_boys', -10, -10, 0, -10, 0, 0
@@ -1751,7 +1734,6 @@ elseif $ARGS[0] = 'goodgirl':
 
 		!!----- INVENTRORY -----!!
 		money += 1000
-		school_clothing = 3
 		mc_inventory['shampoo'] = 10
 		$currentpursetype = 'gm'
 		currentpursenumber = 6
@@ -1826,7 +1808,6 @@ elseif $ARGS[0] = 'slut':
 		pcs_mass['body']		= 52
 
 		!!----- INVENTRORY -----!!
-		school_clothing = 2
 		mc_inventory['comb']			= 1
 		mc_inventory['travel_mirror']	= 1
 		mc_inventory['cosmetics']		= 30

locations/intro_sg_select_custom.qsrc

@@ -188,7 +188,6 @@ if $ARGS[0] = 'none':
 	fantasybook = 0
 	pirsC = 0
 	PirsC1_owned = 0
-	swim_start = 0
 	
 	!!apprnc & sex stat reset
 	pcs_vag		= 10