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

# Conflicts:
#	locations/body.qsrc

locations/body.qsrc

@@ -114,15 +114,15 @@ if $ARGS[0] = 'DailyUpdate':
 		gs 'body', 'Update_Body'
 	else
 		if strenbuf > 90:
-			strenbuf += 2
+			strenbuf -= 2
 		elseif strenbuf > 80:
-			strenbuf += 1
+			strenbuf -= 1
 		end
 
 		if vitalbuf > 90:
-			vitalbuf += 2
+			vitalbuf -= 2
 		elseif vitalbuf > 80:
-			vitalbuf += 1
+			vitalbuf -= 1
 		end
 
 		gs 'body', 'Update_StatBuffs'
@@ -150,6 +150,8 @@ if $ARGS[0] = 'DailyUpdate':
 		pcs_skin += min(skinDailyGain / 2, 5) - skinDailyPenalty - 1
 	elseif pcs_skin <= 900:
 		pcs_skin += min(skinDailyGain / 3, 3) - skinDailyPenalty - 1
+	elseif pcs_skin <= 1000:
+		pcs_skin += min(skinDailyGain / 5, 2) - skinDailyPenalty - 1
 	end
 
 	gs 'body', 'Update_Teeth'
@@ -280,6 +282,7 @@ if $ARGS[0] = 'Update_Teeth':
 		tempteeth = 1
 		if teeth['caffe_or_tea'] > 8: tempteeth += 1
 		if teeth['smoked'] > 1: tempteeth += 1
+		tempteeth -= min(teeth['brushed'], 3)
 		teeth['degradation'] += max(0, tempteeth)
 		killvar 'tempteeth'
 
@@ -486,6 +489,7 @@ end
 
 !! All the ratios were rounded to 2 digits and there are divide 100s at the final calc points
 
+! Lies between 65 and 96
 if $ARGS[0] = 'Find_waist_to_hip_ratio':
 	temp_wratio = (2 * vitalbuf + strenbuf + agilbuf) / 4
 
@@ -514,7 +518,7 @@ if $ARGS[0] = 'Find_waist_to_hip_ratio':
 
 	killvar 'temp_wratio'
 
-
+! Lies between 105 and 125
 elseif $ARGS[0] = 'Find_band_to_waist_ratio':
 	temp_bratio = (2 * strenbuf + vitalbuf + agilbuf) / 4
 
@@ -530,7 +534,7 @@ elseif $ARGS[0] = 'Find_band_to_waist_ratio':
 
 	killvar 'temp_bratio'
 
-
+! Lies between 56 and 60
 elseif $ARGS[0] = 'Find_hip_to_height_ratio':
 	temp_hratio = (2 * agilbuf + vitalbuf + strenbuf) / 4
 
@@ -757,7 +761,7 @@ if $ARGS[0] = 'Set_mass_distribution_using_body':
 	pcs_mass['bust_message'] = pcs_mass['bust']
 	pcs_mass['butt_message'] = pcs_mass['butt']
 	
-	bodyVars['vhips'] = (pcs_mass['body'] - 55 + pcs_mass['butt'] - pcs_mass['butt_gen']) / 2
+	bodyVars['vhips'] = (pcs_mass['body'] + pcs_mass['butt'] - 20) / 2
 end
 
 
@@ -765,7 +769,7 @@ end
 
 
 if $ARGS[0] = 'Update_vhips':
-	vhtmp = (pcs_mass['body'] - 60 + pcs_mass['butt'] - pcs_mass['butt_gen']) / 2
+	vhtmp = (pcs_mass['body'] + pcs_mass['butt'] - 20) / 2
 
 	!	Because a reset should be updating hip size instantly (this set is a bit redundant anyway)
 	if bodyresetflag = 1:
@@ -781,7 +785,7 @@ if $ARGS[0] = 'Update_vhips':
 
 	!! Varies between 0 and 25 to 30 ish range
 	!bodyVars['butt_bonus'] = max(0, pcs_mass['butt'] - max(0, bodyVars['vhips']))
-	bodyVars['butt_bonus'] = 0
+	bodyVars['butt_bonus'] = (pcs_mass['butt'] - 20) / 3
 	
 	!! temp_vhips2 = vhips + (pcs_hgt * bodyVars['hratio'])/100 - (pcs_hgt * 72)/100
 	!! temp_vhips2 = pcs_hips - (pcs_hgt * 72) / 1000
@@ -890,7 +894,7 @@ if $ARGS[0] = 'hardreset':
 			pcs_mass['butt_gen'] = 20
 		end
 
-		bodyVars['vhips'] = (pcs_mass['body'] - 55 + pcs_mass['butt'] - pcs_mass['butt_gen']) / 2
+		bodyVars['vhips'] = (pcs_mass['body'] + pcs_mass['butt'] - 80) / 2
 
 		if pcs_mass['bust_gen'] = 0:
 			if pcs_mass['bust'] >= 27:
@@ -970,6 +974,7 @@ if $ARGS[0] = 'initial':
 	killvar 'temp_bmi'
 
 	gs 'body', 'UpdateBodyImage'
+	gs 'body', 'Update_Appearance'
 end
 
 

locations/body_structure.qsrc

@@ -226,8 +226,12 @@ if $ARGS[0] = 'body_img':
 			bs_temp_bs_class = 100 * (bs_temp_bs_class / 100) + 4
 		elseif fixbodset = 1:
 			bs_temp_bs_class = 100 * (bs_temp_bs_class / 100) + 6
-		else
+		elseif fixbodset = 2:
 			bs_temp_bs_class = 100 * (bs_temp_bs_class / 100) + 8
+		else
+			$result = func('body_structure', 'custom_body_img', bs_temp_bs_class)
+			killvar 'bs_temp_bs_class'
+			exit
 		end
 	end
 
@@ -320,6 +324,17 @@ if $ARGS[0] = 'body_img':
 	killvar 'bs_temp_bs_class'
 end
 
+if $ARGS[0] = 'custom_body_img':
+	ARGS[1] = ARGS[1] / 100
+	if ARGS[1] = 0 or ARGS[1] >= 6:
+		if dyneval('result = imset<<ARGS[1]>>ovr[<<fixbodset>>]') = 0:
+			$result = 'images/pc/body/shape/<<ARGS[1]>>.jpg'
+			exit
+		end
+	end
+	$result = 'images/pc/body/shape/<<$bodimgsets[((fixbodset * 10) + 9)]>>/<<ARGS[1]>>.jpg'
+end
+
 
 !	Get the body description
 !	$bodyVars['desc'] = func('body_structure', 'body_desc', pcs_bmi, strenbuf, succubusflag)

locations/intro_city_select.qsrc

@@ -325,7 +325,7 @@ if $ARGS[0] = 'nerd':
 	pcs_eyesize		-= 1
 	pcs_lashes		-= 1
 	pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-	pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+	pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 	pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
@@ -396,7 +396,7 @@ if $ARGS[0] = 'nerdqueen':
 		pcs_lip		+= 1
 		pcs_teeth	-= 1
 		pcs_mass['bust_gen']	= 22	& !D-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 12??
+		pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
 		pcs_mass['body']		= 65
 
 		!!----- INVENTRORY -----!!
@@ -454,7 +454,7 @@ elseif $ARGS[0] = 'goodstudent':
 		!!----- APPEARANCE -----!!
 		pcs_hairlng		-= 100
 		pcs_mass['bust_gen']	= 18	& !C-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 70
 
 		! Other
@@ -513,7 +513,7 @@ elseif $ARGS[0] = 'computergeek':
 		pcs_skin	-= 100
 		pcs_teeth	+= 1
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']	= 42
 
 		! Other
@@ -561,7 +561,7 @@ elseif $ARGS[0] = 'chessplayer':
 		!!----- APPEARANCE -----!!
 		pcs_hairlng		-= 100
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 73
 
 		!!----- RELATIONSHIPS -----!!
@@ -636,7 +636,7 @@ if $ARGS[0] = 'jock':
 	pcs_eyesize		+= 1
 	pcs_lip			+= 1
 	pcs_mass['bust_gen']	= 12	& !B-Cup at ideal BMI
-	pcs_mass['butt_gen']	= 20	& !pcs_butt = 12
+	pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
 	pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
@@ -685,7 +685,7 @@ if $ARGS[0] = 'volleyball':
 
 		!!----- APPEARANCE -----!!
 		pcs_mass['bust_gen']	= 17	& !C-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 12
+		pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
 		pcs_mass['body']		= 56
 
 		!!----- INVENTRORY -----!!
@@ -734,7 +734,7 @@ elseif $ARGS[0] = 'dancer':
 		pcs_eyesize		-= 1
 		pcs_teeth		-= 1
 		pcs_mass['bust_gen']	= 12	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 12
+		pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
 		pcs_mass['body']		= 37
 
 		!!----- INVENTRORY -----!!
@@ -778,7 +778,7 @@ elseif $ARGS[0] = 'runner':
 
 		!!----- APPEARANCE -----!!
 		pcs_mass['bust_gen']	= 12	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 12
+		pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
 		pcs_mass['body']		= 45
 
 		!!----- INVENTRORY -----!!
@@ -825,7 +825,7 @@ elseif $ARGS[0] = 'football':
 
 		!!----- APPEARANCE -----!!
 		pcs_mass['bust_gen']	= 17	& !C-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 12
+		pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
 		pcs_mass['body']		= 60
 
 		!!----- INVENTRORY -----!!
@@ -884,7 +884,7 @@ if $ARGS[0] = 'cool':
 		pcs_eyecol	= 2
 		pcs_lip		+= 1
 		pcs_mass['bust_gen']	= 17	& !C-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 16
+		pcs_mass['butt_gen']	= 32	& !pcs_butt = 14
 		pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
@@ -933,7 +933,7 @@ if $ARGS[0] = 'socialite':
 		!!----- APPEARANCE -----!!
 		pcs_hairlng	-= 100
 		pcs_mass['bust_gen']	= 18	& !C-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 16
+		pcs_mass['butt_gen']	= 32	& !pcs_butt = 14
 		pcs_mass['body']		= 60
 
 		!!----- INVENTRORY -----!!
@@ -989,7 +989,7 @@ elseif $ARGS[0] = 'beautiful':
 		pcs_lashes		+= 1
 		pcs_lip			+= 1
 		pcs_mass['bust_gen']	= 22	& !D-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 16
+		pcs_mass['butt_gen']	= 32	& !pcs_butt = 14
 		pcs_mass['body']		= 56
 
 		!!----- INVENTRORY -----!!
@@ -1067,7 +1067,7 @@ elseif $ARGS[0] = 'anorexic':
 		pcs_lip			-= 1
 		pcs_teeth		-= 1
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 15
 
 		!!----- INVENTRORY -----!!
@@ -1136,7 +1136,7 @@ if $ARGS[0] = 'gopnik':
 	pcs_eyesize		+= 1
 	pcs_lip			+= 1
 	pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-	pcs_mass['butt_gen']	= 20
+	pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 	pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
@@ -1207,7 +1207,7 @@ if $ARGS[0] = 'gopnikstart':
 
 		!!----- APPEARANCE -----!!
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 65
 
 		!!----- RELATIONSHIPS -----!!
@@ -1258,7 +1258,7 @@ elseif $ARGS[0] = 'troublemaker':
 		!!----- APPEARANCE -----!!
 		pcs_hairlng		-= 65
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 49
 
 		!!----- INVENTRORY -----!!
@@ -1321,7 +1321,7 @@ elseif $ARGS[0] = 'alternative':
 		pcs_eyesize	-= 1
 		pcs_teeth	-= 1
 		pcs_mass['bust_gen']	= 18	& !C-cup at ideal BMI
-		pcs_mass['butt_gen']	= 20
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 56
 
 		!!----- INVENTRORY -----!!
@@ -1403,7 +1403,7 @@ if $ARGS[0] = 'outcast':
 	pcs_eyesize		-= 1
 	pcs_lashes		-= 1
 	pcs_mass['bust_gen']	= 17	& !C-Cup at ideal BMI
-	pcs_mass['butt_gen']	= 20	& !pcs_butt = 4??
+	pcs_mass['butt_gen']	= 7		& !pcs_butt = 5
 	pcs_mass['body']		= 60
 
 	!!----- RELATIONSHIPS -----!!
@@ -1437,7 +1437,7 @@ if $ARGS[0] = 'friendless':
 		!!----- APPEARANCE -----!!
 		pcs_skin	-= 200
 		pcs_mass['bust_gen']	= 12	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20
+		pcs_mass['butt_gen']	= 7		& !pcs_butt = 5
 		pcs_mass['body']		= 51
 
 		!!----- RELATIONSHIPS -----!!
@@ -1475,7 +1475,7 @@ elseif $ARGS[0] = 'uglyduckling':
 		pcs_lashes	+= 2
 		pcs_lip		-= 1
 		pcs_mass['bust_gen']	= 28	& !E-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20
+		pcs_mass['butt_gen']	= 7		& !pcs_butt = 5
 		pcs_mass['body']		= 94
 
 		! Other
@@ -1522,7 +1522,7 @@ elseif $ARGS[0] = 'goodgirl':
 		pcs_lashes		+= 1
 		pcs_lip			+= 1
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20
+		pcs_mass['butt_gen']	= 7		& !pcs_butt = 5
 		pcs_mass['body']		= 43
 
 		!!----- INVENTRORY -----!!
@@ -1589,7 +1589,7 @@ elseif $ARGS[0] = 'slut':
 		pcs_lashes	+= 1
 		pcs_lip		+= 1
 		pcs_mass['bust_gen']	= 22	& !D-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8
+		pcs_mass['butt_gen']	= 22	& !pcs_butt = 10
 		pcs_mass['body']		= 52
 
 		!!----- INVENTRORY -----!!
@@ -1693,7 +1693,7 @@ elseif $ARGS[0] = 'goth':
 		pcs_eyesize		+= 2
 		pcs_lashes		+= 1
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20
+		pcs_mass['butt_gen']	= 7		& !pcs_butt = 5
 		pcs_mass['body']		= 41
 
 		!!----- INVENTRORY -----!!

locations/intro_functions.qsrc

@@ -85,7 +85,7 @@ if $ARGS[0] = 'set_base_stats':
 	pcs_leghair		= 12
 	pcs_teeth		= 0
 	pcs_mass['bust_gen']	= 17	& !C-Cup at ideal BMI
-	pcs_mass['butt_gen']	= 20
+	pcs_mass['butt_gen']	= 22
 	pcs_mass['body']		= 60
 	pcs_energy		= 60
 	pcs_hydra		= 60

locations/intro_sg.qsrc

@@ -40,7 +40,7 @@ if $ARGS[0] = 'four':
 	'<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>'
 
-	if $start_type = 'sg_m':
+	if $start_type['magic'] = 'magic':
 		act '<center><b>Done</b></center>': gt 'intro_sg_m', 'four'
 	else
 		act '<center><b>Done</b></center>': gt 'intro_sg', 'five'

locations/intro_sg_select.qsrc

@@ -394,7 +394,7 @@ if $ARGS[0] = 'nerd':
 	pcs_eyesize		-= 1
 	pcs_lashes		-= 1
 	pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-	pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+	pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 	pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
@@ -472,7 +472,7 @@ if $ARGS[0] = 'nerdqueen':
 		pcs_lip			+= 1
 		pcs_teeth		-= 1
 		pcs_mass['bust_gen']	= 22	& !D-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 12??
+		pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
 		pcs_mass['body']		= 65
 
 		!!----- INVENTORY -----!!
@@ -533,7 +533,7 @@ elseif $ARGS[0] = 'goodstudent':
 		!!----- APPEARANCE -----!!
 		pcs_hairlng		-= 100
 		pcs_mass['bust_gen']	= 18	& !C-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 70
 
 		! other
@@ -595,7 +595,7 @@ elseif $ARGS[0] = 'computergeek':
 		pcs_hairlng 	-= 180
 		pcs_teeth		+= 1
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 42
 
 		! Other
@@ -641,7 +641,7 @@ elseif $ARGS[0] = 'chessplayer':
 		!!----- APPEARANCE -----!!
 		pcs_hairlng 	-= 100
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 73
 
 		!!----- RELATIONSHIPS -----!!
@@ -717,7 +717,7 @@ if $ARGS[0] = 'jock':
 	pcs_eyesize		+= 1
 	pcs_lip			+= 1
 	pcs_mass['bust_gen']	= 12	& !B-Cup at ideal BMI
-	pcs_mass['butt_gen']	= 20	& !pcs_butt = 12??
+	pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
 	pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
@@ -769,7 +769,7 @@ if $ARGS[0] = 'volleyball':
 
 		!!----- APPEARANCE -----!!
 		pcs_mass['bust_gen']	= 17	& !C-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 12??
+		pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
 		pcs_mass['body']		= 56
 
 		!!----- INVENTRORY -----!!
@@ -826,7 +826,7 @@ elseif $ARGS[0] = 'dancer':
 		pcs_teeth		-= 1
 
 		pcs_mass['bust_gen']	= 12	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 12??
+		pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
 		pcs_mass['body']		= 37
 
 		!!----- INVENTRORY -----!!
@@ -871,7 +871,7 @@ elseif $ARGS[0] = 'runner':
 
 		!!----- APPEARANCE -----!!
 		pcs_mass['bust_gen']	= 12	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 12??
+		pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
 		pcs_mass['body']		= 45
 
 		!!----- INVENTRORY -----!!
@@ -913,7 +913,7 @@ elseif $ARGS[0] = 'football':
 
 		!!----- APPEARANCE -----!!
 		pcs_mass['bust_gen']	= 17	& !C-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 12??
+		pcs_mass['butt_gen']	= 27	& !pcs_butt = 12
 		pcs_mass['body']		= 60
 
 		!!----- INVENTRORY -----!!
@@ -973,7 +973,7 @@ if $ARGS[0] = 'cool':
 	pcs_eyecol		= 2
 	pcs_lip			+= 1
 	pcs_mass['bust_gen']	= 22	& !D-Cup at ideal BMI
-	pcs_mass['butt_gen']	= 20	& !pcs_butt = 16
+	pcs_mass['butt_gen']	= 32	& !pcs_butt = 14
 	pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
@@ -1027,7 +1027,7 @@ if $ARGS[0] = 'socialite':
 		!!----- APPEARANCE -----!!
 		pcs_hairlng		= 200
 		pcs_mass['bust_gen']	= 18	& !C-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 16
+		pcs_mass['butt_gen']	= 32	& !pcs_butt = 14
 		pcs_mass['body']		= 60
 
 		!!----- INVENTRORY -----!!
@@ -1086,7 +1086,7 @@ elseif $ARGS[0] = 'beautiful':
 		pcs_lip		+= 1
 		pcs_teeth	-= 1
 		pcs_mass['bust_gen']	= 20	& !D-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 16
+		pcs_mass['butt_gen']	= 32	& !pcs_butt = 14
 		pcs_mass['body']		= 56
 
 		!!----- INVENTRORY -----!!
@@ -1167,7 +1167,7 @@ elseif $ARGS[0] = 'anorexic':
 		pcs_lip			-= 1
 		pcs_teeth		-= 1
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 15
 
 		!!----- INVENTRORY -----!!
@@ -1236,7 +1236,7 @@ if $ARGS[0] = 'gopnik':
 	pcs_eyesize		+= 1
 	pcs_lip			+= 1
 	pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-	pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+	pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 	pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
@@ -1316,7 +1316,7 @@ if $ARGS[0] = 'gopnikstart':
 		!!----- APPEARANCE -----!!
 		pcs_teeth	+= 1
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 65
 
 		!!----- RELATIONSHIPS -----!!
@@ -1370,7 +1370,7 @@ elseif $ARGS[0] = 'troublemaker':
 		!!----- APPEARANCE -----!!
 		pcs_hairlng		-= 65
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 49
 
 		!!----- INVENTRORY -----!!
@@ -1435,7 +1435,7 @@ elseif $ARGS[0] = 'vitekgf':
 		pcs_hairlng		+= 80
 		pcs_eyesize		-= 1
 		pcs_mass['bust_gen']	= 32	& !E-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 55
 
 		!!----- INVENTRORY -----!!
@@ -1525,7 +1525,7 @@ elseif $ARGS[0] = 'alternative':
 		pcs_eyesize		-= 1
 		pcs_teeth		-= 1
 		pcs_mass['bust_gen']	= 18	& !C-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20
+		pcs_mass['butt_gen']	= 17	& !pcs_butt = 8
 		pcs_mass['body']		= 56
 
 		!!----- INVENTRORY -----!!
@@ -1601,7 +1601,7 @@ if $ARGS[0] = 'outcast':
 	pcs_eyesize	-= 1
 	pcs_lashes	-= 1
 	pcs_mass['bust_gen']	= 22	& !D-Cup at ideal BMI
-	pcs_mass['butt_gen']	= 20	& !pcs_butt = 4
+	pcs_mass['butt_gen']	= 7		& !pcs_butt = 5
 	pcs_mass['body']		= 60
 
 	!!----- INVENTRORY -----!!
@@ -1649,7 +1649,7 @@ if $ARGS[0] = 'friendless':
 		pcs_skin	-= 100
 		pcs_teeth	+= 1
 		pcs_mass['bust_gen']	= 12	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 4
+		pcs_mass['butt_gen']	= 7		& !pcs_butt = 5
 		pcs_mass['body']		= 51
 
 		!!----- RELATIONSHIPS -----!!
@@ -1691,7 +1691,7 @@ elseif $ARGS[0] = 'uglyduckling':
 		pcs_lip		-= 1
 		pcs_teeth	+= 2
 		pcs_mass['bust_gen']	= 28	& !E-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 4
+		pcs_mass['butt_gen']	= 7		& !pcs_butt = 5
 		pcs_mass['body']		= 94
 
 		! Other
@@ -1732,7 +1732,7 @@ elseif $ARGS[0] = 'goodgirl':
 		pcs_lashes		+= 1
 		pcs_lip			+= 1
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 4
+		pcs_mass['butt_gen']	= 7		& !pcs_butt = 5
 		pcs_mass['body']		= 43
 
 		!!----- INVENTRORY -----!!
@@ -1807,7 +1807,7 @@ elseif $ARGS[0] = 'slut':
 		pcs_lashes		+= 1
 		pcs_lip			+= 1
 		pcs_mass['bust_gen']	= 22	& !D-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 8??
+		pcs_mass['butt_gen']	= 22	& !pcs_butt = 10
 		pcs_mass['body']		= 52
 
 		!!----- INVENTRORY -----!!
@@ -1921,7 +1921,7 @@ elseif $ARGS[0] = 'goth':
 		pcs_lashes		+= 1
 		pcs_teeth		-= 1
 		pcs_mass['bust_gen']	= 13	& !B-Cup at ideal BMI
-		pcs_mass['butt_gen']	= 20	& !pcs_butt = 4
+		pcs_mass['butt_gen']	= 7		& !pcs_butt = 5
 		pcs_mass['body']		= 41
 
 		!!----- INVENTRORY -----!!

locations/intro_sg_tg.qsrc

@@ -197,94 +197,56 @@ if $ARGS[0] = 'settings':
 	gs 'homes_properties', 'give_access', 'parents_home'
 	gs 'homes_properties', 'set_home', 'parents_home'
 
-	pcs_eyesize = 3
-	pcs_lip = 2
-	pcs_lashes = 1
-	pcs_haircol = 3
-	pcs_eyecol = 3
-	pcs_hairlng = 300
-
-	if birthmonth = 0: birthmonth = 4
-	if birthday = 0: birthday = 1
-
 	birthyear = 1999
 	yearlefttemp = 1
 
-	!!Looks
-	pcs_hgt = 170
-	pcs_mass['body'] = 80
-	pcs_mass['bust_gen'] = 17
-	pcs_mass['butt_gen'] = 20
-	pcs_pubes = 30
-	pcs_leghair = 12
-	pcs_makeup = 1
-	pcs_skin = 40
-	dick = 0
-
-	!!Basic
-	pcs_energy = 60
-	pcs_hydra = 60
-	pcs_sleep = 70
-
-	!!Attributes
-	pcs_inhib = 10
-	pcs_stren = 30
-	strenbuf = 10
-	pcs_agil = 30
-	agilbuf = 10
-	pcs_vital = 30
-	vitalbuf = 10
-	pcs_intel = 30
-	pcs_react = 30
-	pcs_sprt = 20
-	pcs_chrsm = 35
-	pcs_prcptn = 40
-	willpowermax = 50
-
-	!!Skills
-	pcs_def = 20
-	pcs_run = 20
-	pcs_gaming = 20
-	pcs_humint = 20
-	pcs_observ = 20
+	if birthmonth = 0: birthmonth = 4
+	if birthday = 0: birthday = 1
 
+	gs 'intro_functions', 'set_base_stats'
+
+	!!----- SKILS -----!!
+	! Attributes
+	pcs_stren		= 30
+	pcs_agil		= 30
+	pcs_vital		= 30
+	pcs_intel		= 30
+	pcs_react		= 30
+	pcs_sprt		= 20
+	pcs_prcptn		= 40
+
+	strenbuf		= 30
+	agilbuf			= 30
+	vitalbuf		= 30
+
+	! Sexual
+	pcs_inhib		= 10
+	willpowermax 	= 50
+
+	! Combat
+	pcs_def			= 20
+
+	! Sport
+	pcs_run			= 20
+
+	! Other
+	pcs_gaming		= 20
+	pcs_humint		= 20
+	pcs_observ		= 20
+
+	!!----- APPEARANCE -----!!
+	pcs_skin		= 40
+	pcs_haircol		= 3
+	pcs_eyecol		= 3
+	pcs_eyesize		= 3
+	pcs_lip			= 2
+
+	!!----- SCHOOL GRADES -----!!
 	killvar 'class_list_institution'
 	killvar 'class_list_name'
+	gs 'intro_functions', 'create_sgclasses'
+	gs 'intro_functions', 'set_base_sgrades'
 
-	!!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
-
-	!!Grades
-	gs 'grades', 'grade_award', 'school', 'math', 55
-	gs 'grades', 'grade_award', 'school', 'rus', 25
-	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', 25
-	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
-
-	!!Money, School, ...
-	money = 2000
-	prezikProver = 3
-	brothersawpirsF = 0
 	
 	gt 'intro_sg_tg', 'intro_6_looks'
 end

locations/pav_park_sex.qsrc

@@ -319,6 +319,7 @@ if $ARGS[0] = 'pressured_for_bra':
 	act 'Expose your bra':
 		*clr & cla
 		gs 'fame', 'pav', 'sex', 1
+		svetafall += 1
 		grupvalue[4] += 1
 		npc_rel['A9'] += 1
 		npc_rel['A10'] += 1
@@ -332,11 +333,11 @@ if $ARGS[0] = 'pressured_for_bra':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/fall_strip2.jpg"></center>'
 		'You grin, get up in front of everyone and expose your bra for everyone to see. The boys hoot and holler while Pauline records the whole thing on her phone. You stand there with your bra for several minutes for them, and you can''t help but smile at how happy it makes them all. Arkadi then speaks up.'
 		if grupTipe = 1:
-			$grp_msg = '"You know, being one of the stuck-up bitches, you''re much cooler than I expected."'
+			$grp_msg = 'You know, being one of the stuck-up bitches, you''re much cooler than I expected.'
 		elseif grupTipe = 2:
-			$grp_msg = '"You know, being one of the brain-dead jocks, you''re much cooler than I expected."'
+			$grp_msg = 'You know, being one of the brain-dead jocks, you''re much cooler than I expected.'
 		else
-			$grp_msg = '"You know, being such a nerd, you''re much less shy than I expected."'
+			$grp_msg = 'You know, being such a nerd, you''re much less shy than I expected.'
 		end
 		'"<<$grp_msg>> Not to mention a hell of a lot more fun." The rest all agree. You blush at the compliment and put your top back on. Shortly after the party is over and everyone starts to go their own way, but Vitek calls out to you as you walk away. "You should really come back and hang out with us again." Most of the others agree before they split up and head off.'
 		gs 'arousal', 'flashlite', 5, 'sub', 'inhibition', 'humiliation'
@@ -387,6 +388,7 @@ if $ARGS[0] = 'pressured_for_panties':
 	act 'Expose your panties':
 		*clr & cla
 		gs 'fame', 'pav', 'sex', 2
+		svetafall += 1
 		grupvalue[4] += 1
 		npc_rel['A9'] += 1
 		npc_rel['A10'] += 1
@@ -400,14 +402,14 @@ if $ARGS[0] = 'pressured_for_panties':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/fall_strip3.jpg"></center>'
 		'You grin and get up in front of everyone and expose your panties for all to see, turning around to give them a complete view. The boys hoot and holler while Pauline records the whole thing on her phone. You stand there with your panties exposed for several minutes for them, and you can''t help but smile at how happy it makes them all. Arkadi then speaks up.'
 		if grupTipe = 1:
-			$grp_msg = '"You know, being one of the stuck-up bitches, you''re much cooler than I expected."'
+			$grp_msg = 'You know, being one of the stuck-up bitches, you''re much cooler than I expected.'
 		elseif grupTipe = 2:
-			$grp_msg = '"You know, being one of the brain-dead jocks, you''re much cooler than I expected."'
+			$grp_msg = 'You know, being one of the brain-dead jocks, you''re much cooler than I expected.'
 		else
-			$grp_msg = '"You know, being such a nerd, you''re much less shy than I expected."'
+			$grp_msg = 'You know, being such a nerd, you''re much less shy than I expected.'
 		end
 
-		'<<grp_msg>>  Not to mention a hell of a lot more fun." The rest all agree. You blush at the compliment and put your bottoms back on. Shortly after the party is over and everyone starts to go their own way, but Vitek calls out to you as you begin to walk away. "You should really come back and hang out with us again." Most of the others agree before they split up and head off.'
+		'"<<$grp_msg>> Not to mention a hell of a lot more fun." The rest all agree. You blush at the compliment and put your bottoms back on. Shortly after the party is over and everyone starts to go their own way, but Vitek calls out to you as you begin to walk away. "You should really come back and hang out with us again." Most of the others agree before they split up and head off.'
 		gs 'arousal', 'flashlite', 5, 'sub', 'inhibition', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -455,6 +457,7 @@ if $ARGS[0] = 'pressured_for_tits':
 	act 'Expose your tits':
 		*clr & cla
 		gs 'fame', 'pav', 'sex', 3
+		svetafall += 1
 		grupvalue[4] += 1
 		npc_rel['A9'] += 1
 		npc_rel['A10'] += 1
@@ -468,13 +471,13 @@ if $ARGS[0] = 'pressured_for_tits':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/fall_strip4.jpg"></center>'
 		'You grin, get up in front of everyone and expose your breasts for all to see. The boys hoot and holler while Pauline records the whole thing on her phone. You kneel there with your breasts out for several minutes for them, and you can''t help but smile at how happy it makes them all. Arkadi then speaks up.'
 		if grupTipe = 1:
-			$grp_msg = '"You have nice tits for one of the stuck-up princesses."' 
+			$grp_msg = 'You have nice tits for one of the stuck-up princesses.' 
 		elseif grupTipe = 2:
-			$grp_msg = '"You have nice tits for one of the juiced-up jocks. You''re a lot cooler than I was expecting."'
+			$grp_msg = 'You have nice tits for one of the juiced-up jocks. You''re a lot cooler than I was expecting.'
 		else
-			$grp_msg = '"You have nice tits for one of the nerds. You should wear tighter clothes and show them off more."'
+			$grp_msg = 'You have nice tits for one of the nerds. You should wear tighter clothes and show them off more.'
 		end
-		'"<<$grp_msg>>  Not to mention a hell of a lot more fun." The rest all agree. You blush at the compliment and put your top back on. Shortly after the party is over and everyone starts to go their own way, but Vitek calls out to you as you begin to walk away. "You should really come back and hang out with us again." Most of the others agree before they split up and head off.'
+		'"<<$grp_msg>> Not to mention a hell of a lot more fun." The rest all agree. You blush at the compliment and put your top back on. Shortly after the party is over and everyone starts to go their own way, but Vitek calls out to you as you begin to walk away. "You should really come back and hang out with us again." Most of the others agree before they split up and head off.'
 		gs 'arousal', 'flash', 5, 'sub', 'inhibition', 'humiliation'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -522,6 +525,7 @@ if $ARGS[0] = 'pressured_for_pussy':
 	act 'Expose your pussy':
 		*clr & cla
 		gs 'fame', 'pav', 'sex', 4
+		svetafall += 1
 		grupvalue[4] += 1
 		npc_rel['A9'] += 1
 		npc_rel['A10'] += 1
@@ -535,11 +539,11 @@ if $ARGS[0] = 'pressured_for_pussy':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/fall_strip5.jpg"></center>'
 		'You grin and get up before everyone, stripping down and exposing your pussy for all to see. The boys hoot and holler while Pauline records the whole thing on her phone. You stand there with your pussy exposed for several minutes for them, and you can''t help but smile at how happy it makes them all. Arkadi then speaks up.'
 		if grupTipe = 1:
-			$grp_msg = '"You''re a lot cooler than I expected for one of the stuck-up queens."'
+			$grp_msg = 'For one of the stuck-up queens, you''re a lot cooler than I expected.'
 		elseif grupTipe = 2:
-			$grp_msg = '"You''re much cooler than I was expecting for one of the jocks."'
+			$grp_msg = 'For one of the jocks, you''re much cooler than I was expecting.'
 		else
-			$grp_msg= '"For one of the nerds, you''re a lot cooler than I was expecting."'
+			$grp_msg= 'For one of the nerds, you''re a lot cooler than I was expecting.'
 		end
 		
 		'"You have a real fuckable looking pussy. <<$grp_msg>> Not to mention a hell of a lot more fun." The rest all agree. You blush at the compliment and put your top back on. Shortly after the party is over and everyone starts to go their own way, but Vitek calls out to you as you begin to walk away. "You should really come back and hang out with us again." Most of the others agree before they split up and head off.'
@@ -595,6 +599,7 @@ if $ARGS[0] = 'pressured_for_blowjob':
 		*clr & cla
 		gs 'fame', 'pav', 'sex', 10
 		grupvalue[4] += 1
+		svetafall += 1
 		npc_rel['A9'] += 1
 		npc_rel['A10'] += 1
 		npc_rel['A11'] += 1
@@ -675,6 +680,7 @@ if $ARGS[0] = 'pressured_for_oral_gb':
 	act 'Get down on your knees':
 		*clr & cla
 		gs 'fame', 'pav', 'sex', 50
+		svetafall += 1
 		grupvalue[4] += 1
 		npc_rel['A9'] += 1
 		npc_rel['A10'] += 1
@@ -782,6 +788,7 @@ if $ARGS[0] = 'pressured_for_gangbang':
 		*clr & cla
 		gs 'fame', 'pav', 'sex', 100
 !!to explain why the huge hits to fame it is because they are all bragging about it telling everyone and Pauline has been sharing the videos with all the gopniks, after this one she will share all the videos with all the students in school.
+		svetafall = 6
 		grupvalue[4] += 1
 		npc_rel['A9'] += 1
 		npc_rel['A10'] += 1

locations/pushkin_ballet_res.qsrc

@@ -49,8 +49,7 @@ if $ARGS[0] = 'bedroom':
 	gs 'core_library', 'stage_title'
 
 	if ballet_first_visit = 0:
-		gs 'homes_properties', 'set_access', 'pushkin_ballet_dorm', 1
-		gs 'homes_preperties', 'set_home', 'pushkin_ballet_dorm'
+		gs 'homes_properties', 'set_home', 'pushkin_ballet_dorm'
 
 		ballet_first_visit = 1
 		if week ! 7 : ballet_day = week

locations/therapist_hotel.qsrc

@@ -552,7 +552,7 @@ if $ARGS[0] = 'event5_submit':
 			'"Sir?!" You moan out as he ravishes your pussy with his mouth and tongue.'
 			'"You will be mine, your body will not deny me, you only have to say yes to me. My dear, tell me to fuck you." He exclaims and the trigger clicks in your mind.'
 
-			act '"Sire, please, fuck me"':
+			act '"Sir, please, fuck me"':
 				*clr & cla
 				gs 'arousal', 'vaginal', 60, 'sub'
 				gs 'cum_call', 0, 'A186', 2, 0, 15000, 60
@@ -852,7 +852,6 @@ if $ARGS[0] = 'event6_submit4':
 	HotelRoom['pav_hotel'] = 0
 	hotelRoomDays['pav_hotel'] = 0
 	therapistQW['hotel_key'] = 3
-	gs 'homes_properties', 'set_access', 'hotel_therapist', 1
 	gs 'homes_preperties', 'set_home', 'hotel_therapist'
 
 	gt 'pav_hotel'

locations/transport_functions.qsrc

@@ -457,7 +457,7 @@ end
 	!!=======================================!!
 
 if $ARGS[0] = 'buy_bus_pass':
-	if transportVars['trainpass_day'] <= daystart:
+	if transportVars['buspass_day'] <= daystart:
 		if money >= 100:
 			dynamic 'act ''Buy a daily bus pass (1 day - 100 <b>₽</b>)'':
 				cla