[changed] Complete body overhaul. New variable, new systems, new you.

Variables affected include nbsize, genbsize, salo, magicf2b, silicone, butt_cheat, and more

locations/AppearanceSystem.qsrc

@@ -196,14 +196,14 @@ if $ARGS[0] = 'SetBodyShapeBonus':
 			end
 		end
 
-		!!This modifies bodykoef for high or low salo values
+		!!This modifies bodykoef for high or low pcs_mass['body'] values
 		if salocatnow = 0 or salocatnow >= 7:
 			tempBodyShapeBonus -= 8
 		elseif salocatnow = 1 or salocatnow = 6:
 			tempBodyShapeBonus -= 4
 		end
 
-		if vofat > 0: tempBodyShapeBonus -= vofat
+		if bodyVars['vofat'] > 0: tempBodyShapeBonus -= bodyVars['vofat']
 
 		result = tempBodyShapeBonus
 

locations/Cheatmenu_din.qsrc

@@ -217,31 +217,31 @@ $cheatmenu['bodyMod'] = {
 		'starving (No, you may not select ''starving'', it''s here to show where the scale starts)'
 		''
 		if salocatnow ! 1:
-			'<a href="exec:salo = 20 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 1)]>></a>'
+			'<a href="exec: pcs_mass[''body''] = 20 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 1)]>></a>'
 			''
 		end
 		if salocatnow ! 2:
-			'<a href="exec:salo = 40 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 2)]>></a>'
+			'<a href="exec: pcs_mass[''body''] = 40 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 2)]>></a>'
 			''
 		end
 		if salocatnow ! 3:
-			'<a href="exec:salo = 60 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
+			'<a href="exec: pcs_mass[''body''] = 60 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
 			''
 		end
 		if salocatnow ! 4:
-			'<a href="exec:salo = 80 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
+			'<a href="exec: pcs_mass[''body''] = 80 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
 			''
 		end
 		if salocatnow ! 5:
-			'<a href="exec:salo = 100 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
+			'<a href="exec: pcs_mass[''body''] = 100 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
 			''
 		end
 		if salocatnow ! 6:
-			'<a href="exec:salo = 120 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
+			'<a href="exec: pcs_mass[''body''] = 120 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
 			''
 		end
 		if salocatnow ! 7:
-			'<a href="exec:salo = 140 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
+			'<a href="exec: pcs_mass[''body''] = 140 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
 			''
 		end
 	else
@@ -839,10 +839,10 @@ $cheatmenu['looks'] = {
 	*p 'Toned Butt (<<butt_tr_lvl>>): ' & dynamic $cheatmenu['printLooksLinks'], 'butt_tr', 'Toned Butt'
 	*nl
 	'You have <<$titsize>> breasts'
-	if tits => 0 and tits < 11:'<a href="exec:silicone += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(silicone)</a>'
-	if silicone => 1:'<a href="exec:silicone -= 5 & dynamic $cheatmenu[''looks'']">Shrink breasts(silicone)</a>'
-	if tits => 0 and tits < 11:'<a href="exec:nbsize += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(natural)</a>'
-	if nbsize => 1:'<a href="exec:nbsize -= 5 & titreduc = 1 & dynamic $cheatmenu[''looks'']">Shrink breasts(natural)</a>'
+	if tits => 0 and tits < 11:'<a href="exec: bodyVars[''bust_silicone''] += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(silicone)</a>'
+	if bodyVars['bust_silicone'] => 1:'<a href="exec: bodyVars[''bust_silicone''] -= 5 & dynamic $cheatmenu[''looks'']">Shrink breasts(silicone)</a>'
+	if tits => 0 and tits < 11:'<a href="exec: pcs_mass[''bust'' += 5 & dynamic $cheatmenu[''looks'']">Enlarge breasts(natural)</a>'
+	if pcs_mass['bust'] => 1: '<a href="exec: pcs_mass[''bust''] -= 5 & titreduc = 1 & dynamic $cheatmenu[''looks'']">Shrink breasts(natural)</a>'
 	*nl
 	if pcs_butt <= 4:
 		$pcs_butt[1] = 'flat'
@@ -854,11 +854,11 @@ $cheatmenu['looks'] = {
 		$pcs_butt[1] = 'bubble'
 	end
 	'You have <<$pcs_butt[1]>> butt'
-	if pcs_butt < 20:'<a href="exec:butt_cheat += 2 & dynamic $cheatmenu[''looks'']">Enlarge butt</a>'
-	if pcs_butt > 1:'<a href="exec:butt_cheat -= 2 & dynamic $cheatmenu[''looks'']">Shrink butt</a>'
-	if butt_cheat ! 0:'<a href="exec:butt_cheat = 0 & dynamic $cheatmenu[''looks'']">Reset butt shape to default</a>'
-	if silicone_butt => 1:'<a href="exec:silicone_butt = 0 & dynamic $cheatmenu[''looks'']">Remove butt implants</a>'
-	if silicone_butt = 0:'<a href="exec:silicone_butt += 16 & dynamic $cheatmenu[''looks'']">Add butt implants</a>'
+	if pcs_butt < 20:'<a href="exec: bodyVars[''butt_cheat''] += 2 & dynamic $cheatmenu[''looks'']">Enlarge butt</a>'
+	if pcs_butt > 1:'<a href="exec: bodyVars[''butt_cheat''] -= 2 & dynamic $cheatmenu[''looks'']">Shrink butt</a>'
+	if bodyVars['butt_cheat'] ! 0:'<a href="exec: bodyVars[''butt_cheat''] = 0 & dynamic $cheatmenu[''looks'']">Reset butt shape to default</a>'
+	if bodyVars['butt_silicone'] => 1:'<a href="exec: bodyVars[''butt_silicone''] = 0 & dynamic $cheatmenu[''looks'']">Remove butt implants</a>'
+	if bodyVars['butt_silicone'] = 0:'<a href="exec: bodyVars[''butt_silicone''] += 16 & dynamic $cheatmenu[''looks'']">Add butt implants</a>'
 	*nl
 	'<<$lip>>'
 	if pcs_lip < 4:'<a href="exec:pcs_lip += 1 & dynamic $cheatmenu[''looks'']">Enlarge lips</a>'
@@ -907,7 +907,7 @@ $cheatmenu['looks'] = {
 	*nl
 	if dounspell = 0:
 		if fat ! 0: '<a href="exec:fat = 0 & dynamic $cheatmenu[''looks'']">Zero fat</a>'
-		'Body Fat = (<<salo>>): <a href="exec:salo -= 10 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">-10</a> <a href="exec:salo -= 5 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:salo -= 1 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">-1</a> <a href="exec:salo += 1 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">+1</a> <a href="exec:salo += 5 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:salo += 10 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">+10</a>'
+		'Body Fat = (<<pcs_mass[''body'']>>): <a href="exec: pcs_mass[''body''] -= 10 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">-10</a> <a href="exec: pcs_mass[''body''] -= 5 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec: pcs_mass[''body''] -= 1 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">-1</a> <a href="exec: pcs_mass[''body''] += 1 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">+1</a> <a href="exec: pcs_mass[''body''] += 5 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec: pcs_mass[''body''] += 10 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">+10</a>'
 		'Note: You need some Body Fat to survive, any value under 11 is clasified as "starving" and a value of 0 can lead to a Game Over.'
 	end
 	*nl
@@ -1018,7 +1018,7 @@ $cheatmenu['parameters'] = {
 	*nl
 	'Body Shape Parameters'
 	'<<pcs_bust>> - <<pcs_waist>> - <<pcs_hips>>, <<$titsize>> breasts, the difference between the hips and waist <<pcs_hips-pcs_waist>> cm'
-	'Muscularity: strenbuf = <<strenbuf>>, salo =	<<salo>>, fat = <<fat>>'
+	'Muscularity: strenbuf = <<strenbuf>>, pcs_mass[''body''] =	<<pcs_mass[''body'']>>, fat = <<fat>>'
 	'Variable List:'
 	'agilbuf = <<agilbuf>>'
 	'strenbuf = <<strenbuf>>'
@@ -1030,15 +1030,15 @@ $cheatmenu['parameters'] = {
 	'waist (pcs_waist) = <<pcs_waist>>'
 	'hips (pcs_hips) = <<pcs_hips>>'
 	'bust - band (pcs_cupsize) = <<pcs_cupsize>>'
-	'silicone = <<silicone>>'
-	'nbsize = <<nbsize>>'
-	'magicf2b = <<magicf2b>>'
-	'genbsize = <<genbsize>>'
-	'vhips = <<vhips>>'
-	'wratio = <<wratio>>'
-	'bratio = <<bratio>>'
-	'hratio = <<hratio>>'
-	'vofat = <<vofat>>'
+	'bodyVars[''bust_silicone''] = <<bodyVars[''bust_silicone'']>>'
+	'pcs_mass[''bust''] = <<pcs_mass[''bust'']>>'
+	'bodyVars[''bust_magic''] = <<bodyVars[''bust_magic'']>>'
+	'pcs_mass[''bust_gen''] = <<pcs_mass[''bust_gen'']>>'
+	'bodyVars[''vhips''] = <<bodyVars[''vhips'']>>'
+	'bodyVars[''wratio''] = <<bodyVars[''wratio'']>>'
+	'bodyVars[''bratio''] = <<bodyVars[''bratio'']>>'
+	'bodyVars[''hratio''] = <<bodyVars[''hratio'']>>'
+	'bodyVars[''vofat''] = <<bodyVars[''vofat'']>>'
 	'salocatnow = <<salocatnow>>'
 	'salocatlast = <<salocatlast>>'
 	'magf2bdo = <<magf2bdo>>'

locations/UnitAppearance.qsrc

@@ -121,11 +121,11 @@ end
 if $ARGS[0] = 'GenerateSvetas':
 
 	$svetadesc = 'Current Sveta'
-	unitsalo = salo
+	unitsalo = pcs_mass['body']
 	unitpcs_hgt = pcs_hgt
 	unitstrenbuf = strenbuf
 	unitsalocatnow = salocatnow
-	unitvofat = vofat
+	unitvofat = bodyVars['vofat']
 	unitpcs_lashes = pcs_lashes
 	unitpcs_eyesize = pcs_eyesize
 	unitpcs_lip = pcs_lip
@@ -1507,12 +1507,12 @@ if $ARGS[0] = 'CurVal':
     $SvetaDesc = input("Enter a description for Sveta")
 	*clr
 	''
-	'    $svetadesc = ''<<$SvetaDesc>>'''
-	'    unitsalo = <<salo>>'
+	'    $svetadesc = ''<<$SvetaDesc>>'' '
+	'    unitsalo = <<pcs_mass[''body'']>>'
 	'    unitpcs_hgt = <<pcs_hgt>>'
 	'    unitstrenbuf = <<strenbuf>>'
 	'    unitsalocatnow = <<salocatnow>>'
-	'    unitvofat = <<vofat>>'
+	'    unitvofat = <<bodyVars[''vofat'']>>'
 	'    unitpcs_lashes = <<pcs_lashes>>'
 	'    unitpcs_eyesize = <<pcs_eyesize>>'
 	'    unitpcs_lip = <<pcs_lip>>'
@@ -1525,11 +1525,11 @@ if $ARGS[0] = 'CurVal':
 	'    unitPXCloTopCut = <<PXCloTopCut>>'
 	'    unitPXCloBottomShortness = <<PXCloBottomShortness>>'
 	'    unitPCloQuality = <<PCloQuality>>'
-	'    $unitclothingworntype = ''<<$clothingworntype>>'''
+	'    $unitclothingworntype = ''<<$clothingworntype>>'' '
 	'    unitbonusZ = <<bonusZ>>'
 	'    unitPShoQuality = <<PShoQuality>>'
-	'    $unitpantyworntype = ''<<$pantyworntype>>'''
-	'    $unitbraworntype = ''<<$braworntype>>'''
+	'    $unitpantyworntype = ''<<$pantyworntype>>'' '
+	'    $unitbraworntype = ''<<$braworntype>>'' '
 	'    unitpcs_lipbalm = <<pcs_lipbalm>>'
 	'    unitmopkoef = <<mopkoef>>'
 	'    unitpcs_hairbsh = <<pcs_hairbsh>>'

locations/body.qsrc

@@ -1,16 +1,16 @@
 # body
 
-!!vhips = derived from salo in body_shape
+!!bodyVars['vhips'] = derived from pcs_mass['body'] in body_shape
 !!vhtmp = slows the change to vhips in body_shape
-!!wratio = waist to hips ratio set in body_shape
-!!bratio = band to waist ratio set in body_shape
-!!hratio = hip to height ratio set in body_shape
-!!vofat = used as a place to put extra salo at extreme high values (i.e. really, really fat) set in body_shape
-!!nbsize = starts at a set genetic bust size, but can be adjusted down if salo drops too low
-!!magicf2b = set in body_shape for the fat moved to bust
-!!genbsize = the set genetic bust size
-!!salocatnow = the current category of salo
-!!salocatlast = the previous category of salo
+!!bodyVars['wratio'] = waist to hips ratio set in body_shape
+!!bodyVars['bratio'] = band to waist ratio set in body_shape
+!!bodyVars['hratio'] = hip to height ratio set in body_shape
+!!bodyVars['vofat'] = used as a place to put extra pcs_mass['body'] at extreme high values (i.e. really, really fat) set in body_shape
+!!pcs_mass['bust'] = starts at a set genetic bust size, but can be adjusted down if pcs_mass['body'] drops too low
+!!bodyVars['bust_magic'] = set in body_shape for the fat moved to bust
+!!pcs_mass['bust_gen'] = the set genetic bust size
+!!salocatnow = the current category of pcs_mass['body']
+!!salocatlast = the previous category of pcs_mass['body']
 !!magf2bdo = flag for magic bust increase; 0, ready; 1, do it; 2, ask; 3, no
 !!mgf2bnocnt = used to count the number of times a bust increase was turned down and stop asking after 3
 !!magtarcup = set in the dream code as the target cup size 
@@ -49,37 +49,36 @@ if $ARGS[0] = 'RegularUpdate':
 end
 
 if $ARGS[0] = 'UpdateBodyMeasurement':
-	pcs_hips  = (pcs_hgt   * hratio) / 100 + vhips
-	pcs_waist = (pcs_hips  * wratio) / 100 + vofat
-	pcs_band  = (pcs_waist * bratio) / 100 + vofat
-	pcs_bust  = (pcs_waist * bratio) / 100 + nbsize + magicf2b + silicone + bust_other
-	pcs_butt  = (pcs_hips  * 10    ) / 100 + nasize + silicone_butt + butt_cheat + pcs_butt_tr + butt_other
+	pcs_hips  = (pcs_hgt   * bodyVars['hratio']) / 100 + bodyVars['vhips']
+	pcs_waist = (pcs_hips  * bodyVars['wratio']) / 100 + bodyVars['vofat']
+	pcs_band  = (pcs_waist * bodyVars['bratio']) / 100 + bodyVars['vofat']
+	pcs_bust  = (pcs_waist * bodyVars['bratio']) / 100 + pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] + bodyVars['bust_other']
+	pcs_butt  = (pcs_hips  * 10    ) / 100 + bodyVar['butt_bonus'] + bodyVars['butt_silicone'] + bodyVars['butt_cheat'] + pcs_butt_tr + bodyVars['butt_other']
 
-	!!pcs_cupsize = nbsize + magicf2b + silicone - vofat
+	!! pcs_cupsize = pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] - bodyVars['vofat']
 	pcs_cupsize = pcs_bust - pcs_band
-	pcs_asssize = pcs_butt - pcs_hips
 end
 
 if $ARGS[0] = 'CalcWeight':
 	!{pcs_weight: Svetas weight in kg 
-	Optimal Weight (170cm): 60kg, 60 salo
-	This is an approximation, so that a sveta with a different height has the same BMI for the same salo values.
+	Optimal Weight (170cm): 60kg, 60 pcs_mass['body']
+	This is an approximation, so that a sveta with a different height has the same BMI for the same pcs_mass['body'] values.
 	The default height of 170 cm is used as a starting point. The bmi deviates by 0.06 for a deviation of 10cm and 0.4 for a deviation of 20cm.}
 
-	result = 30 + salo / 2 + (pcs_hgt - 170) * 7 / 10
+	result = 30 + (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']) / 3 + (pcs_hgt - 170) * 7 / 10
 
 	!{Do not remove (julzor)
 	This is the old more complex function, but it doesn''t work correctly.
 	This variable is actually only used ONCE (except for the BMI calculation), when stripping, to see if you fall off the pole from being too heavy. I am reluctant to touch it, since the math is not explained. Maybe later.
 	Weight = (height in cm x bottom of average weight in kilos for a 170cm female / 170cm + (hip modifier + 2 x overrun fat)/4 + cup size}
 
-	!result = (pcs_hgt * 62 / 170) + (vhips + (vofat * 2)) / 4 + tits
+	!result = (pcs_hgt * 62 / 170) + (vhips + (bodyVars['vofat'] * 2)) / 4 + tits
 end
 
 if $ARGS[0] = 'CalcWeight2':
 	!! weight2 = 10 * weight
-	result = 300 + (10 * salo) / 2 + (pcs_hgt - 170) * 7
-	!result = (pcs_hgt * 62 / 17) + (10 * (vhips + (vofat * 2))) / 4 + 10 * tits
+	result = 300 + (10 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt'])) / 3 + (pcs_hgt - 170) * 7
+	!result = (pcs_hgt * 62 / 17) + (10 * (vhips + (bodyVars['vofat'] * 2))) / 4 + 10 * tits
 end
 
 if $ARGS[0] = 'CalcBMI':
@@ -297,23 +296,23 @@ end
 if $ARGS[0] = 'Update_Body':
 	gs 'body', 'Update_StatBuffs'
 
-	!!Salo Handling; the first part is because during a reset fat is not used and should be cleared
+	!!pcs_mass['body'] Handling; the first part is because during a reset fat is not used and should be cleared
 	if bodyresetflag = 1 or cheatNoFat = 1:
 		fat = 0
 	else
 		if fat > (17 + vitalbuf / 25):
-			salo += 1
+			pcs_mass['body'] += 1
 			fat = 0
 		elseif fat < (-2 - vitalbuf / 10):
-			salo -= 1
+			pcs_mass['body'] -= 1
 			fat = 0
 		else
 			fat = fat / 4
 		end
 	end
 
-	!!This is the salo cap for the weight approximation
-	if salo > 250: salo = 250
+	!!This is the pcs_mass['body'] cap for the weight approximation
+	if pcs_mass['body'] > 250: pcs_mass['body'] = 250
 
 
 
@@ -322,24 +321,24 @@ if $ARGS[0] = 'Update_Body':
 	gs 'body', 'Find_band_to_waist_ratio'
 	gs 'body', 'Find_hip_to_height_ratio'
 
-	salocatnow = func('body', 'Calc_salocatnow')
-	gs 'body', 'Update_nbsize'
+	salocatnow = func('body', 'Calc_salocat')
+	gs 'body', 'Redistribute_Mass'
 
-	!!This is if a Succubus has salo < 1
-	if succubusflag = 1 and salo < 1:
+	!!This is if a Succubus has pcs_mass['body'] < 1
+	if succubusflag = 1 and pcs_mass['body'] < 1:
 		sucexcess -= 1
-		salo += 3
+		pcs_mass['body'] += 3
 	end
 
-	!!This is if salo is still < 1
-	if salo < 1:
+	!!This is if pcs_mass['body'] is still < 1
+	if pcs_mass['body'] < 1:
 		if fat >= 1:
-			salo = 1
+			pcs_mass['body'] = 1
 			fat -= 1
 		elseif fat <= 0 and pcs_stren + pcs_vital > 0:
 			stren_deg -= 1000
 			vital_deg -= 1000
-			salo = 1
+			pcs_mass['body'] = 1
 		else
 			if Enable_nogameover = 0:
 				over = 3
@@ -347,26 +346,26 @@ if $ARGS[0] = 'Update_Body':
 				exit
 			else
 				pl '<font color=red><B>You starved to death, but Cheat Mode keeps you Alive.</B></font>'
-				salo = 1
+				pcs_mass['body'] = 1
 			end
 		end
 	end
 
 	gs 'body', 'Update_vhips'
 
-	salocatnow = func('body', 'Calc_salocatnow')
+	salocatnow = func('body', 'Calc_salocat')
 
-	!!This will trigger the warning notices in the bathing code (the +/- 12 should always be +/- 11 + the max change to salo w/ fat)
-	if salolast > salo and salo <= (20 * (salocatnow - 1)) + 12:
+	!!This will trigger the warning notices in the bathing code (the +/- 12 should always be +/- 11 + the max change to pcs_mass['body'] w/ fat)
+	if salolast > pcs_mass['body'] and pcs_mass['body'] <= (20 * (salocatnow - 1)) + 12:
 		btwarn = 1
-	elseif salolast < salo and salo >= (20 * (salocatnow + 1)) - 12:
+	elseif salolast < pcs_mass['body'] and pcs_mass['body'] >= (20 * (salocatnow + 1)) - 12:
 		btwarn = 2
 	end
 
 	!!This will trigger the dream for the option to use magic to increase bust
 	!!Three nos at the dream will lock it out (1 yes resets the count)
 	if pcs_magik >= 5 and MagikDostup = 0 and magf2bdo = 0:
-		if tits < 10 and salolast < salo and salo >= (20 * (salocatnow + 1)) - 11:
+		if tits < 10 and salolast < pcs_mass['body'] and pcs_mass['body'] >= (20 * (salocatnow + 1)) - 11:
 			if mgf2bnocnt < 3:
 				magf2bdo = 2
 			else
@@ -380,8 +379,8 @@ if $ARGS[0] = 'Update_Body':
 	if salocatnow > salocatlast: salocatlast += 1
 
 	!!This is for use in the warning code and as part of the reset routines
-	if salolast > salo: salolast -= 1
-	if salolast < salo: salolast += 1
+	if salolast > pcs_mass['body']: salolast -= 1
+	if salolast < pcs_mass['body']: salolast += 1
 
 	!!Setting the pcs_apprnc bonus based on fat and strength
 	temp_bmi = func('body', 'CalcBMI2')
@@ -432,28 +431,28 @@ end
 if $ARGS[0] = 'Find_waist_to_hip_ratio':
 	temp_wratio = (2 * vitalbuf + strenbuf + agilbuf) / 4
 
-	!! Primary wratio handling
+	!! Primary bodyVars['wratio'] handling
 	if temp_wratio < 11:
-		wratio = 85 + (11 - (vitalbuf + strenbuf + agilbuf) / 3)
+		bodyVars['wratio'] = 85 + (11 - (vitalbuf + strenbuf + agilbuf) / 3)
 	elseif temp_wratio < 20:
-		wratio = 85
+		bodyVars['wratio'] = 85
 	elseif temp_wratio < 35:
-		wratio = 85 - (temp_wratio - 20) / 3
+		bodyVars['wratio'] = 85 - (temp_wratio - 20) / 3
 	elseif temp_wratio < 55:
-		wratio = 80 - (temp_wratio - 35) / 4
+		bodyVars['wratio'] = 80 - (temp_wratio - 35) / 4
 	elseif temp_wratio < 80:
-		wratio = 75 - (temp_wratio - 55) / 5
+		bodyVars['wratio'] = 75 - (temp_wratio - 55) / 5
 	elseif temp_wratio >= 80:
-		wratio = 70
+		bodyVars['wratio'] = 70
 	end
 
 	!!	High stat value edge case handling
 	if (vitalbuf + strenbuf + agilbuf) / 3 > 100:
-		wratio += (2 * agilbuf - vitalbuf - strenbuf) / 10
+		bodyVars['wratio'] += (2 * agilbuf - vitalbuf - strenbuf) / 10
 	end
 
 	!!	This is the oops and high stat gone overboard handling
-	if wratio < 65: wratio = 65
+	if bodyVars['wratio'] < 65: bodyVars['wratio'] = 65
 
 	killvar 'temp_wratio'
 
@@ -462,11 +461,11 @@ elseif $ARGS[0] = 'Find_band_to_waist_ratio':
 	temp_bratio = (2 * strenbuf + vitalbuf + agilbuf) / 4
 
 	if temp_bratio < 10:
-		bratio = 105
+		bodyVars['bratio'] = 105
 	elseif temp_bratio <= 23:
-		bratio = 106
+		bodyVars['bratio'] = 106
 	elseif temp_bratio <= 80:
-		bratio = 106 + (temp_bratio - 23) / 3
+		bodyVars['bratio'] = 106 + (temp_bratio - 23) / 3
 	else
 		bratio = 125
 	end
@@ -478,103 +477,230 @@ elseif $ARGS[0] = 'Find_hip_to_height_ratio':
 	temp_hratio = (2 * agilbuf + vitalbuf + strenbuf) / 4
 
 	if temp_hratio < 35:
-		hratio = 60
+		bodyVars['hratio'] = 60
 	elseif temp_hratio < 45:
-		hratio = 59
+		bodyVars['hratio'] = 59
 	elseif temp_hratio < 60:
-		hratio = 58
+		bodyVars['hratio'] = 58
 	elseif temp_hratio < 80:
-		hratio = 57
+		bodyVars['hratio'] = 57
 	else
-		hratio = 56
+		bodyVars['hratio'] = 56
 	end
 
 	killvar 'temp_hratio'
 end
 
-if $ARGS[0] = 'Calc_salocatnow':
-	!!This calculates the current salo category; ranges are 20 points, seemed to balance best if the range is x10 the hip devisor
-	if salo < 10:
+if $ARGS[0] = 'Calc_salocat':
+	!!This calculates the current pcs_mass['body'] category; ranges are 20 points, seemed to balance best if the range is x10 the hip devisor
+	if pcs_mass['body'] < 10:
 		result = 0
 	else
-		result = 1 + (salo - 10) / 20
+		result = 1 + (pcs_mass['body'] - 10) / 20
 	end
 end
 
 
-	!!-------------------------    UPDATE nbsize and vhips    -------------------------!!
 
 
-if $ARGS[0] = 'Update_nbsize':
-	!!This resets the genetic bust size (genbsize) when the cheat is used to reduce breast size (maybe other things later)
+if $ARGS[0] = 'Redistribute_Mass':
+	!!This resets the genetic bust size (pcs_mass['bust_gen']) when the cheat is used to reduce breast size (maybe other things later)
 	if titreduc = 1:
 		killvar 'titreduc'
-		if genbsize > nbsize:
-			genbsize = nbsize + 2 - nbsize mod 5
+		if pcs_mass['bust_gen'] > pcs_mass['bust']:
+			pcs_mass['bust_gen'] = pcs_mass['bust'] + 8 - pcs_mass['bust'] mod 20
 		end
 	end
 
+	if assreduc = 1:
+		killvar 'assreduc'
+		if pcs_mass['butt_gen'] > pcs_mass['butt']:
+			pcs_mass['butt_gen'] = pcs_mass['butt'] + 8 - pcs_mass['butt'] mod 20
+		end
+	end
+
+
 	if salobustdo = 0:
-		!!This controls the movement of salo to/from bust in order of precedence
-		if salocatnow > 2 and nbsize < genbsize:
-			if bodyresetflag = 0: '<b>Your breasts seem fuller.</b>'
-			nbsize += 1
-			salo -= 3
+		!!This controls the movement of pcs_mass['body'] to/from bust in order of precedence
 
-		elseif salocatnow > salocatlast:
-			if magf2bdo = 1 and magikDostup = 0 and pcs_mana >= manamax / 2:
-				if bodyresetflag = 0: '<b>Your breasts seem fuller.</b>'
-				magicf2b += 1
-				salo -= 3
+		!!===============    MAGIC    ===============!!
+		if magikDostup = 0 and magf2bdo = 1 and daystart > pcs_mass['magic_day'] and pcs_mana >= manamax / 2:
+			if bodyresetflag = 0: '<b>Your breasts seem fuller.</b>'
 
-				if magicf2b >= 2 + magtarcup * 5: magf2bdo = 0
-				pcs_mana -= max(100, 2000 / pcs_magik)
+			bodyVars['bust_magic'] += 1
+			if $ARGS[1] ! 'test':
+				if pcs_mass['body'] > 90: pcs_mass['body'] -= 3
 			end
+
+			pcs_mass['magic_day'] = daystart + rand(7, 14)
+
+			if bodyVars['bust_magic'] >= 2 + magtarcup * 5: magf2bdo = 0
+			pcs_mana -= max(100, 2000 / pcs_magik)
+		
+		!! Old content
+		!{
 		elseif salocatnow < salocatlast:
-			if magicf2b > 0 and magikDostup = 0 and salocatnow < 2:
+			if magikDostup = 0 and bodyVars['bust_magic'] > 0 and salocatnow < 2:
 				if bodyresetflag = 0: '<b>Your breasts seem to be getting smaller.</b>'
-				magicf2b -= 1
-				salo += 3
+
+				bodyVars['bust_magic'] -= 1
+				if $ARGS[1] ! 'test':
+					pcs_mass['body'] += 3
+				end
 				magf2bdo = 1
+			end
+		}
+		end
+		
+		!!===============    Low Weight    ===============!!
+		if pcs_mass['body'] < 10:
+			if pcs_mass['bust'] > 0:
+				if bodyresetflag = 0: '<b>Your breasts seem to be getting smaller.</b>'
+
+				temp_diff = min(pcs_mass['bust'], 3)
+				pcs_mass['bust'] -= temp_diff
+				if $ARGS[1] ! 'test': pcs_mass['body'] += temp_diff
+			end
 
-			elseif salocatnow = 0 and nbsize > 0:
+			if pcs_mass['butt'] > 0:
+				if bodyresetflag = 0: '<b>Your ass seem to be getting smaller.</b>'
+
+				temp_diff = min(pcs_mass['butt'], 3)
+				pcs_mass['butt'] -= temp_diff
+				if $ARGS[1] ! 'test': pcs_mass['body'] += temp_diff
+			end
+
+		else
+			temp_total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
+			temp_tot_gen_mass = 80 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']
+
+			!!===============    Bust    ===============!!
+			temp_mass_bust = (pcs_mass['bust_gen'] * temp_total_mass) / temp_tot_gen_mass
+
+				!!----------- Small -----------!!
+			if pcs_mass['body'] >= 50 and pcs_mass['bust'] < pcs_mass['bust_gen']:
+				if pcs_mass['bust'] < pcs_mass['bust_gen']:
+					if bodyresetflag = 0: '<b>Your breasts seem fuller.</b>'
+
+					temp_diff = min(pcs_mass['bust_gen'] - pcs_mass['bust'], 3)
+					pcs_mass['bust'] += temp_diff
+					if $ARGS[1] ! 'test': pcs_mass['body'] -= temp_diff
+				end
+
+				!!-----------    Growth    -----------!!
+			elseif temp_mass_bust > pcs_mass['bust']:
+				if bodyresetflag = 0: '<b>Your breasts seem fuller.</b>'
+
+				pcs_mass['bust'] += 1
+				if $ARGS[1] ! 'test': pcs_mass['body'] -= 1
+
+				!!-----------    Shrink    -----------!!
+			elseif temp_mass_bust < pcs_mass['bust'] and pcs_mass['bust'] > 0:
 				if bodyresetflag = 0: '<b>Your breasts seem to be getting smaller.</b>'
-				nbsize -= 1
-				salo += 3
+
+				pcs_mass['bust'] -= 1
+				if $ARGS[1] ! 'test': pcs_mass['body'] += 1
 			end
+
+
+			!!===============    Ass    ===============!!
+			temp_mass_ass  = (pcs_mass['butt_gen']  * temp_total_mass) / temp_tot_gen_mass
+
+				!!----------- Small -----------!!
+			if pcs_mass['body'] >= 50 and pcs_mass['butt'] < pcs_mass['butt_gen']:
+				if bodyresetflag = 0: '<b>Your ass seem fuller.</b>'
+
+				temp_diff = min(pcs_mass['butt_gen'] - pcs_mass['butt'], 3)
+				pcs_mass['butt'] += temp_diff
+				if $ARGS[1] ! 'test': pcs_mass['body'] -= temp_diff
+
+				!!-----------    Rest    -----------!!
+			elseif temp_mass_ass > pcs_mass['butt']:
+				!if pcs_mass['butt'] < 2 * pcs_mass['butt_gen'] + 40:
+					if bodyresetflag = 0: '<b>Your ass seem fuller.</b>'
+
+					pcs_mass['butt'] += 1
+					if $ARGS[1] ! 'test': pcs_mass['body'] -= 1
+				!end
+
+			elseif emp_mass_ass < pcs_mass['butt'] and pcs_mass['butt'] > 0:
+				if bodyresetflag = 0: '<b>Your ass seem to be getting smaller.</b>'
+
+				pcs_mass['butt'] -= 1
+				if $ARGS[1] ! 'test': pcs_mass['body'] += 1
+			end
+
+			killvar 'temp_total_mass'
+			killvar 'temp_tot_gen_mass'
+			killvar 'temp_mass_bust'
+			killvar 'temp_mass_ass'
+			killvar 'temp_diff'
 		end
 	end
 
+
+	gs 'body', 'Set_bust_vhips'
+
 	killvar 'salobustdo'
+	killvar 'temp_massbustchange'
+	killvar 'temp_massasschange'
+end
+
+
+if $ARGS[0] = 'Reset_Mass_distribution':
+	total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
+	total_gen_mass = 80 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']
+
+
+	pcs_mass['bust'] = (pcs_mass['bust_gen'] * total_mass) / total_gen_mass
+	pcs_mass['butt']  = (pcs_mass['butt_gen']  * total_mass) / total_gen_mass
+
+	pcs_mass['body'] = total_mass - pcs_mass['bust'] - pcs_mass['butt']
+
+	pcs_mass['bust_last'] = pcs_mass['body']
+	pcs_mass['butt_last']  = pcs_mass['body']
+
+	killvar 'total_mass'
+
+	gs 'body', 'Update_vhips'
 end
 
 
+	!!-------------------------    UPDATE vhips    -------------------------!!
+
+
 if $ARGS[0] = 'Update_vhips':
-	!!This is the hip calcs, 80 is the center of the current max-min range (10 - 130)
-	vhtmp = (salo - 80) / 2
+	vhtmp = (pcs_mass['body'] + pcs_mass['butt'] - pcs_mass['butt_gen'] - 80) / 2
 
-	!!	Because a reset should be updating hip size instantly (this set is a bit redundant anyway)
+	!	Because a reset should be updating hip size instantly (this set is a bit redundant anyway)
 	if bodyresetflag = 1:
-		vhips = vhtmp
+		bodyVars['vhips'] = vhtmp
 	else
-		if vhtmp < vhips:
-			vhips -= 1
-		elseif vhtmp > vhips:
-			vhips += 1
+		if vhtmp < bodyVars['vhips']:
+			bodyVars['vhips'] -= 1
+		elseif vhtmp > bodyVars['vhips']:
+			bodyVars['vhips'] += 1
 		end
 	end
+	killvar 'vhtmp'
 
-	!! If temp_vhips2 > 0, vhips = pcs_hgt * (72 - hratio) / 100 ????
-	temp_vhips2 = vhips - (pcs_hgt * (72 - hratio)) / 100
-	vofat = max(0, temp_vhips2 / 2)
-	vhips -= 2 * vofat
+	bodyVar['butt_bonus'] = max(0, pcs_mass['butt'] - max(0, bodyVars['vhips']))
+
+	!! temp_vhips2 = vhips + (pcs_hgt * bodyVars['hratio'])/100 - (pcs_hgt * 72)/100
+	!! temp_vhips2 = pcs_hips - (pcs_hgt * 72) / 1000
+	temp_vhips2 = vhips - (pcs_hgt * (72 - bodyVars['hratio'])) / 100
+	bodyVars['vofat'] = max(0, temp_vhips2 / 2)
+	bodyVars['vhips'] -= 2 * bodyVars['vofat']
 	
-	killvar 'vhtmp'
+	!! vhips = vhips - max(0, temp_vhips2)
+	!! vhips = vhips || vhips = (pcs_hgt * (72 - bodyVars['hratio'])) / 100
+
 	killvar 'temp_vhips2'
 end
 
 
 
+
 	!!==================================!!
 	!!                                  !!
 	!!         Skin Gain & Loss         !!
@@ -614,10 +740,10 @@ end
 	!!==================================!!
 
 if $ARGS[0] = 'softreset':
-	!!This is for use in immediately updating shape if something has caused a large change in salo, primarily fat burners and plastic surgery
+	!!This is for use in immediately updating shape if something has caused a large change in pcs_mass['body'], primarily fat burners and plastic surgery
 	bodyresetflag = 1
 	:resetloop
-	if salo ! salolast:
+	if pcs_mass['body'] ! salolast:
 		if gamestartflag = 1: salobustdo = 1
 		gs 'body', 'Update_Body'
 		jump 'resetloop'
@@ -632,12 +758,12 @@ if $ARGS[0] = 'softreset':
 end
 
 if $ARGS[0] = 'hardreset':
-	!!This is primarily for canceling out "dounspell" and setting salo to whatever value will result in the current hip size then balancing everything out.
+	!!This is primarily for canceling out "dounspell" and setting pcs_mass['body'] to whatever value will result in the current hip size then balancing everything out.
 	!!Also could be built in as a means to in-game undo "dounspell", other than the cheat.
 	if dounspell ! 1 or dounsplkil = 0:
 		'If you''re seeing this, something odd happened. Please make a bug report that the body shape hard reset improperly triggered and what you were doing.'
 	else
-		salo = 12
+		pcs_mass['body'] = 12
 		fat = 0
 
 		agilbuf = pcs_agil
@@ -650,29 +776,29 @@ if $ARGS[0] = 'hardreset':
 
 		gs 'body', 'Update_Body'
 
-		salo = 80 + (2 * pcs_hips) - (pcs_hgt * hratio) / 50
-		if salo < 10:
+		pcs_mass['body'] = 80 + (2 * pcs_hips) - (pcs_hgt * bodyVars['hratio']) / 50
+		if pcs_mass['body'] < 10:
 			salocatnow = 0
 		else
-			salocatnow = 1 + (salo - 10) / 20
+			salocatnow = 1 + (pcs_mass['body'] - 10) / 20
 		end
 
 		salocatlast = salocatnow
-		salolast = salo
+		salolast = pcs_mass['body']
 
-		vhips = (salo - 80) / 2
+		bodyVars['vhips'] = (pcs_mass['body'] - 80) / 2
 
-		if genbsize = 0:
-			if nbsize >= 27:
-				genbsize = 27
+		if pcs_mass['bust_gen'] = 0:
+			if pcs_mass['bust'] >= 27:
+				pcs_mass['bust_gen'] = 27
 
-			elseif nbsize > 0:
-				genbsize = 2 + nbsize - nbsize mod 5
+			elseif pcs_mass['bust'] > 0:
+				pcs_mass['bust_gen'] = 2 + pcs_mass['bust'] - pcs_mass['bust'] mod 5
 
-			elseif silicone >= 20:
-				genbsize = 12
-				nbsize = 12
-				silicone -= 10
+			elseif bodyVars['bust_silicone'] >= 20:
+				pcs_mass['bust_gen'] = 12
+				pcs_mass['bust'] = 12
+				bodyVars['bust_silicone'] -= 10
 			end
 		end
 
@@ -702,8 +828,9 @@ end
 
 if $ARGS[0] = 'initial':
 	!!	Sets the genetic bust size if it was not set in the start routines
-	if genbsize = 0: genbsize = 12
-	nbsize = genbsize
+	if pcs_mass['bust_gen'] = 0: pcs_mass['bust_gen'] = 12
+	pcs_mass['bust'] = pcs_mass['bust_gen']
+	pcs_mass['butt'] = pcs_mass['butt_gen']
 
 	agilbuf = pcs_agil
 	strenbuf = pcs_stren
@@ -712,7 +839,7 @@ if $ARGS[0] = 'initial':
 	normbuffpick = -1
 	gamestartflag = 1
 
-	!!	Calling soft reset will cause the main code to cycle up to the starting value of salo
+	!!	Calling soft reset will cause the main code to cycle up to the starting value of pcs_mass['body']
 	gs 'body', 'softreset'
 
 	!!	This sets/resets the controler variables
@@ -732,5 +859,6 @@ if $ARGS[0] = 'initial':
 	gs 'body_desc', 'BMI'
 end
 
+
 --- body ---------------------------------
 

locations/body_desc.qsrc

@@ -211,7 +211,7 @@ if $ARGS[0] = 'breasts':
 	!! more noticeable on a thinner body than a heavier one. I have experimented with moving where the silicone is factored in to the body shape calculations, but ultimately there is just no better way to do it than how it is now, given the things that increase the amount
 	!! of silicone in the PC body. The best kludge I can make is working off of stored fat (pcs_weight does actually not do the job at all, as a fat PC and thin PC are almost the same, oddly, in my tests) and making an approximation from there. The amount of the silicone
 	!! variable does not really equate to any particular real-life cc calculation for implant size, so we cannot go off of that. This will have to do for now.
-	pcs_bustdisparity = (silicone/10) - salocatnow
+	pcs_bustdisparity = (bodyVars['bust_silicone']/10) - salocatnow
 
 	if pcs_bustdisparity >=1 and pcs_bustdisparity < 2:
 		$pcdesc_breastsqualifierinsertive = ''
@@ -248,7 +248,7 @@ if $ARGS[0] = 'breasts':
 		$pcdesc_breastsword = 'bolt-ons'
 		pcdesc_breastimplantcheck = 1
 	!! This triggers if they have fake breasts, but they are not obviously, blatantly fake breasts. In fact, this should be what triggers most of the time with a PC who has implants, given average cases.
-	elseif pcs_bustdisparity < 1 and silicone > 0:
+	elseif pcs_bustdisparity < 1 and bodyVars['bust_silicone'] > 0:
 		if pcs_cupsize <= 30:
 			$pcdesc_breastsword = 'breasts'
 		else
@@ -417,7 +417,7 @@ if $ARGS[0] = 'butt':
 	end
 
 	!have butt implant
-	if silicone_butt > 0:
+	if bodyVars['butt_silicone'] > 0:
 		buttpic = 4
 		$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a>.'
 	end

locations/cikl.qsrc

@@ -1017,9 +1017,9 @@ killvar 'last_pee'
 
 if bcream_used >= 1:
 	bcream_used = 0
-	temp = rand(0,max(nbsize-genbsize+5,5)) / max(nbsize-genbsize,1)
+	temp = rand(0, 5 + max(0, pcs_mass['bust'] - pcs_mass['bust_gen'])) / max(1, pcs_mass['bust'] - pcs_mass['bust_gen'])
 	if temp > 0: temp = 1
-	nbsize += temp
+	pcs_mass['bust'] += temp
 	if temp > 0:'Feels like your breasts have grown slightly.'
 end
 if steroid_dose >= 1:

locations/city_clinic.qsrc

@@ -1357,13 +1357,13 @@ if $ARGS[0] = 'cosmetic1':
 		else
 		'Eye reduction surgery - 90,000 <b>₽</b>' 
 	end
-	if money >= 75000 and salo > 40:
+	if money >= 75000 and pcs_mass['body'] > 40:
 		'<a href="exec:gt ''city_clinic'', ''lyposuction''">Liposuction</a> - 75,000 <b>₽</b>'
 		else
 		'Liposuction - 75,000 <b>₽</b>'
 	end
 	''
-	if money >= 90000 and silicone ! 0:
+	if money >= 90000 and bodyVars['bust_silicone'] ! 0:
 		'<a href="exec:brSurTemp = 0 & stringimplant = 0 & fillimplant = 0 & gt ''city_clinic'', ''bImplantA''">Remove breast implants</a> - 90,000 <b>₽</b>'
 		else
 		'Remove breast implants - 90,000 <b>₽</b>'
@@ -1388,17 +1388,17 @@ if $ARGS[0] = 'cosmetic1':
 		else
 		'Get XXL breast implants - 200,000 <b>₽</b>'
 	end
-	if money >= 200000 and silicone = 0 and fillimplant = 0 and stringimplant = 0:
+	if money >= 200000 and bodyVars['bust_silicone'] = 0 and fillimplant = 0 and stringimplant = 0:
 		'<a href="exec:brSurTemp = 20 & fillimplant = 1 & gt ''city_clinic'', ''bImplantA''">Get fillable implants</a> - 200,000 <b>₽</b>'
 		else
 		'Get fillable implants - 200,000 <b>₽</b>'
 	end
-	if money >= 250000 and silicone = 0 and fillimplant = 0 and stringimplant = 0:
+	if money >= 250000 and bodyVars['bust_silicone'] = 0 and fillimplant = 0 and stringimplant = 0:
 		'<a href="exec:brSurTemp = 20 & stringimplant = 1 & gt ''city_clinic'', ''bImplantA''">Get string implants</a> - 250,000 <b>₽</b>'
 		else
 		'Get string implants - 250,000 <b>₽</b>'
 	end
-	if stringimplant = 1 and silicone >= 30 and money >= 2000:'<a href="exec:silicone -= 10 & money -= 2000 & MSG ''You drain some of your string implant''">Drain string implant</a> - 2,000 <b>₽</b>'
+	if stringimplant = 1 and bodyVars['bust_silicone'] >= 30 and money >= 2000:'<a href="exec: bodyVars[''bust_silicone''] -= 10 & money -= 2000 & MSG ''You drain some of your string implant''">Drain string implant</a> - 2,000 <b>₽</b>'
 	''
 	if money >= 500:
 		'<a href="exec:siliconeBag += 1 & money -= 500 & MSG ''You buy a silicone bag.''">Buy silicone bag</a> - 500 <b>₽</b>'
@@ -1478,8 +1478,8 @@ end
 if $ARGS[0] = 'lyposuction':
 	*clr & cla
 	minut += 60
-	salo -= 40
-	if salo < 11: salo = 11
+	pcs_mass['body'] -= 40
+	if pcs_mass['body'] < 11: pcs_mass['body'] = 11
 	money -= 75000
 	gs 'body', 'softreset'
 	gs 'stat'
@@ -1493,7 +1493,7 @@ end
 if $ARGS[0] = 'bImplantA':
 	*clr & cla
 	minut += 60
-	silicone = brSurTemp
+	bodyVars['bust_silicone'] = brSurTemp
 	! Get String Implants
 	if stringimplant = 1:
 		money -= 250000
@@ -1501,19 +1501,19 @@ if $ARGS[0] = 'bImplantA':
 	elseif fillimplant = 1:
 		money -= 200000
 	! Get XXL Implants
-	elseif silicone = 40:
+	elseif bodyVars['bust_silicone'] = 40:
 		money -= 200000
 	! Get Large Implants
-	elseif silicone = 30:
+	elseif bodyVars['bust_silicone'] = 30:
 		money -= 190000
 	! Get Medium Implants
-	elseif silicone = 20:
+	elseif bodyVars['bust_silicone'] = 20:
 		money -= 180000
 	! Get Small Implants
-	elseif silicone = 10:
+	elseif bodyVars['bust_silicone'] = 10:
 		money -= 170000
 	! Remove any implants
-	elseif silicone = 0:
+	elseif bodyVars['bust_silicone'] = 0:
 		money -= 90000
 	end
 	gs 'stat'
@@ -1607,19 +1607,19 @@ if $ARGS[0] = 'milk_donation_room':
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/milkbank/small_sample.jpg"></center>'
 					'The woman takes your pumped milk and signals you to cover up.'
 					'"Okay, we''ll have this sample checked and you can come back later."'
-					if salo > 40:
-						lact_ev['poli_sample_fat'] = (60 + rand(0,9))
-					elseif salo > 20:
-						lact_ev['poli_sample_fat'] = (45 + rand(0,9))
-					elseif salo > 15:
-						lact_ev['poli_sample_fat'] = (20 + rand(0,9))
+					if pcs_mass['body'] > 40:
+						lact_ev['poli_sample_fat'] = (60 + rand(0, 9))
+					elseif pcs_mass['body'] > 20:
+						lact_ev['poli_sample_fat'] = (45 + rand(0, 9))
+					elseif pcs_mass['body'] > 15:
+						lact_ev['poli_sample_fat'] = (20 + rand(0, 9))
 					else
-						lact_ev['poli_sample_fat'] = (10 + rand(0,9))
+						lact_ev['poli_sample_fat'] = (10 + rand(0, 9))
 					end
 					if pcs_energy > 30:
 						lact_ev['poli_sample_sugar'] = rand(69, 80)
 					elseif sick > 1:
-						lact_ev['poli_sample_sugar'] = rand(0,45)
+						lact_ev['poli_sample_sugar'] = rand(0, 45)
 					else
 						lact_ev['poli_sample_sugar'] = rand(45, 69)
 					end

locations/city_experimental_trials_events.qsrc

@@ -22,21 +22,10 @@ if $experimentQW['trial_active'] = 'pill_cyan':
 
 
 	if experimentQW['random_option'] = 1:
-		nbsize -= 2
-		if nbsize < 2: nbsize = 2
-
-		genbsize -= 2
-		if genbsize < 2: genbsize = 2
-
+		bodyVars['bust_other'] -= 2
 		'You notice that your breast have shrunk! This must have been that experimental pill you took.'
-
 	else
-		nbsize += 2
-		if nbsize > 57: nbsize = 57
-
-		genbsize += 2
-		if genbsize > 57: genbsize = 57
-
+		bodyVars['bust_other'] += 2
 		'You notice that your breast have grown! This must have been that experimental pill you took.'
 	end
 
@@ -460,12 +449,7 @@ end
 
 
 if $experimentQW['trial_active'] = 'breast_cream':
-	nbsize += 2
-	if nbsize > 57: nbsize = 57
-
-	genbsize += 2
-	if genbsize > 57: genbsize = 57
-
+	bodyVars['bust_other'] += 2
 
 	if experimentQW['trial_duration'] > 1:
 		*nl

locations/city_experimental_trials_list.qsrc

@@ -63,8 +63,7 @@ if $ARGS[0] = 'see_trials':
 	minut += 2
 	gs 'stat'
 
-	!!Image of the desk, or a experimental trials folder.
-	'<center><img <<$set_imgh>> src="images\system\image_needed.png"></center>'
+	'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\experiment_form.jpg"></center>'
 	'You look through the long list of various available clinical trials and the following stick out:'
 	*nl
 	*nl

locations/city_experimental_trials_pharmacy.qsrc

@@ -2,12 +2,18 @@
 
 if $ARGS[0] = 'counter':
 		'<center><B><font color="maroon">Experimental Pharmacy</font></B></center>'
-		!!Image of a pharmacy lady?
-		'<center><img <<$set_imgh>> src="images\system\image_needed.png"></center>'
+		if rand(0, 1) = 0:
+			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pharmacist1.jpg"></center>'
+			*nl
+			'You approach the pharmacy front desk. The older pharmacist behind the counter looks up at you and gives you a smile.'
+			'"How can I help you?"'
+		else
+			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pharmacist2.jpg"></center>'
+			*nl
+			'You approach the pharmacy front desk. The middle aged pharmacist behind the counter looks up at you and smiles.'
+			'"How can I help you".'
+		end
 		*nl
-		'You approach the pharmacy front desk. The nurse behind the counter looks up at you an smiles. "How can I help you".'
-		*nl
-
 
 		'There is currently nothing of note being sold here (yet).'
 		'More content will be added here in later updates.'

locations/city_market.qsrc

@@ -269,8 +269,8 @@ if $ARGS[0] = 'tailor':
 					act 'Continue': gt 'city_market', 'tailor'
 				end
 
-				act 'Take in different clothes':gt 'clothing', 'view_clothing_list', 'resize'
-				act 'Take in all the clothes':gt 'portnoi2'
+				act 'Take in different clothes': gt 'clothing', 'view_clothing_list', 'resize'
+				act 'Take in all the clothes': gt 'tailor'
 			end
 		else
 			'"Hello young lady. I am Jacob Solomonovich, but you can call me Yasha. And what is your name?"'

locations/din_van.qsrc

@@ -1097,8 +1097,8 @@ if $ARGS[0] = 'private':
 
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:*clr & cla & dynamic $pirManage">Manage your piercings</a>'
 
-	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & silicone += 10 & gt $loc, $loc_arg">Inject silicone into your breast implants.</a>'
-	if fillimplant = 1 and silicone >= 20:'<a href="exec:cls & silicone -= 10 & gt $loc, $loc_arg">Drain silicone from your breast implants.</a>'
+	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & bodyVars[''bust_silicone''] += 10 & gt $loc, $loc_arg">Inject silicone into your breast implants.</a>'
+	if fillimplant = 1 and bodyVars['bust_silicone'] >= 20:'<a href="exec:cls & bodyVars[''bust_silicone''] -= 10 & gt $loc, $loc_arg">Drain silicone from your breast implants.</a>'
 
 	dynamic $bteeth
 

locations/gadroad.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = '':
 				elseif month=9 or month=10 or month=4 or month=5:
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg3.jpg"></center>'
 				else
-					if strenbuf >= salo:
+					if strenbuf >= pcs_mass['body']:
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg1.jpg"></center>'
 					else
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadbeg2.jpg"></center>'

locations/hunterLoveSex.qsrc

@@ -3056,7 +3056,7 @@ if $ARGS[0] = 'din_hunters_sex_misionary_bonus':
 	i = rand(1,4)
 	j = rand(1,3)
 	h = rand(1,3)
-	if pcs_agil > 50 and strenbuf >= salo:'Throw legs <a href="exec:gt ''hunterLoveSex'', ''din_hunters_sex_misionary_bonus1''">head</a> .'
+	if pcs_agil > 50 and strenbuf >= pcs_mass['body']: 'Throw legs <a href="exec:gt ''hunterLoveSex'', ''din_hunters_sex_misionary_bonus1''">head</a> .'
 	*pl
 	if h < 3:'Having had enough of this position he asks you...'
 	if h = 3:'Suddenly <<$boydesc>> begins to move even faster and you realize that he is already on edge and ready...'

locations/intro_city_select.qsrc

@@ -3,8 +3,8 @@
 if $ARGS[0] = 'start':
 
 !!--------------------------inner thought stuff--------------------------------
-    $OpenInnerThought = '<i><font color=''magenta''>'
-    $CloseInnerThought = '</font></i>'
+	$OpenInnerThought = '<i><font color=''magenta''>'
+	$CloseInnerThought = '</font></i>'
 
 	age = 18
 	$month = 'June'
@@ -15,7 +15,8 @@ if $ARGS[0] = 'start':
 	year = 2017
 !!		Body
 	pcs_hgt = 170
-	salo = 60
+	pcs_mass['body'] = 60
+	pcs_mass['butt_gen'] = 20
 	pcs_teeth = 0
 	dick = 0
 !!		Stats
@@ -374,8 +375,9 @@ if $ARGS[0] = 'nerd':
 	npc_rel['A129'] += 10
 	npc_rel['A28'] += 10
 	npc_rel['A29'] += 10
-	genbsize = 13 
-!!b cup for ideal bmi
+	!!b cup for ideal bmi
+	pcs_mass['bust_gen'] = 13
+	pcs_mass['butt_gen'] = 20
 	pcs_traits['nerd_points'] = 60
 	pcs_traits['nerd_status'] = 2
 	pcs_traits['nerd_lernHome'] = 5
@@ -417,9 +419,10 @@ if $ARGS[0] = 'nerdqueen':
 		pcs_skin = 700
 		pcs_teeth = -1
 		pcs_butt = 12
-		genbsize = 22
-!!d cup for ideal bmi
-		salo = 87
+		!!d cup for ideal bmi
+		pcs_mass['bust_gen'] = 22
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 87
 		willpowermax = 70
 		gs 'grades', 'grade_award', 'school', 'math', 85
 		gs 'grades', 'grade_award', 'school', 'rus', 90
@@ -456,9 +459,10 @@ if $ARGS[0] = 'goodstudent':
 		pcs_artskls = 10
 		money += 2000
 		pcs_skin = 600
-		salo = 93
-		genbsize = 18
-!!c cup for ideal bmi
+		!!c cup for ideal bmi
+		pcs_mass['bust_gen'] = 18
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 93
 		gs 'npc_relationship', 'socialgroup_setting', 0, 0, 5, 0, 0, 20
 		npc_rel['A29'] += 20
 		if player_avatar ! 1: pcs_hairlng = 200
@@ -498,7 +502,7 @@ if $ARGS[0] = 'computergeek':
 		internet = 20
 		pcs_skin = 500
 		pcs_teeth = 1
-		salo = 56
+		pcs_mass['body'] = 56
 		pcs_inhib = 20
 		npc_rel['A152'] += 10
 		npc_rel['A153'] += 10
@@ -538,7 +542,7 @@ if $ARGS[0] = 'chessplayer':
 		pcs_react = 45
 		pcs_chess = 40
 		pcs_skin = 600
-		salo = 97
+		pcs_mass['body'] = 97
 		pcs_inhib = 15
 		chessyear = year
 		chessmonth = month
@@ -569,8 +573,9 @@ if $ARGS[0] = 'jock':
 	pcs_vital = 50
 	pcs_react = 50
 	pcs_agil = 50
-	genbsize = 12
-!!b cup for ideal bmi
+	!!b cup for ideal bmi
+	pcs_mass['bust_gen'] = 12
+	pcs_mass['butt_gen'] = 20
 	pcs_skin = 600
 	pcs_butt = 12
 	mc_inventory['cosmetics'] = 10
@@ -622,9 +627,10 @@ if $ARGS[0] = 'volleyball':
 		alterstrtimg = 12
 		pcs_react = 55
 		pcs_agil = 55
-		genbsize = 17
-!!c cup for ideal bmi
-		salo = 75
+		!!c cup for ideal bmi
+		pcs_mass['bust_gen'] = 17
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 75
 		pcs_vball = 50
 		gsAboVolley += 30
 		npc_rel['A13'] += 10
@@ -665,7 +671,7 @@ if $ARGS[0] = 'dancer':
 		pcs_skin = 700
 		pcs_teeth = -1
 		pcs_tan = 5
-		salo = 50
+		pcs_mass['body'] = 50
 		if player_avatar = 0:
 			pcs_hairlng = 200
 			pcs_eyesize = 2
@@ -712,7 +718,7 @@ if $ARGS[0] = 'runner':
 		pcs_vital = 55
 		pcs_agil = 55
 		pcs_inhib = 25
-		salo = 60
+		pcs_mass['body'] = 60
 		pcs_run = 55
 		gsAboBeg += 30
 		npc_rel['A3'] += 10
@@ -751,9 +757,10 @@ if $ARGS[0] = 'football':
 		pcs_stren = 80
 		pcs_react = 55
 		pcs_vital = 55
-		salo = 80
-		genbsize = 17
-!!c cup for ideal bmi
+		!!c cup for ideal bmi
+		pcs_mass['bust_gen'] = 17
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 80
 		pcs_kick = 20
 		pcs_ftbll = 55
 		npc_rel['A131'] += 10
@@ -825,8 +832,10 @@ if $ARGS[0] = 'socialite':
 		gs 'intro_city_select', 'cool'
 		alterstrtimg = 16
 		pcs_chrsm = 55
-		genbsize = 18
-!!c cup for ideal bmi
+		!!c cup for ideal bmi
+		pcs_mass['bust_gen'] = 18
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 80
 		pcs_humint = 40
 		pcs_makupskl = 40
 		pcs_heels = 30
@@ -840,7 +849,6 @@ if $ARGS[0] = 'socialite':
 		school_clothing = 6
 		if player_avatar ! 1: pcs_hairlng = 200
 		npc_rel['A140'] += 10
-		salo = 80
 		willpowermax = 70
 		gs 'grades', 'grade_award', 'school', 'math', 65
 		gs 'grades', 'grade_award', 'school', 'rus', 90
@@ -881,8 +889,10 @@ if $ARGS[0] = 'beautiful':
 		pcs_skin = 800
 		pcs_teeth = -1
 		pcs_tan = 50
-		genbsize = 22
-!!d cup for ideal bmi
+		!!d cup for ideal bmi
+		pcs_mass['bust_gen'] = 22
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 75
 		pcs_inhib = 25
 		mc_inventory['cosmetics'] = 50
 		mc_inventory['eyelash_fake'] =  10
@@ -898,7 +908,6 @@ if $ARGS[0] = 'beautiful':
 		pirsC = 2
 		PirsC2_owned = 1
 		gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 10, 10, 10, 0
-		salo = 75
 		gs 'fame', 'pav', 'sex', 20
 		willpowermax = 80
 		gs 'grades', 'grade_award', 'school', 'math', 60
@@ -925,8 +934,9 @@ if $ARGS[0] = 'gopnik':
 	pcs_vital = 45
 	pcs_react = 45
 	pcs_agil = 45
-	genbsize = 13
-!!b cup for ideal bmi
+		!!b cup for ideal bmi
+	pcs_mass['bust_gen'] = 13
+	pcs_mass['butt_gen'] = 20
 	pcs_inhib = 25
 	pcs_heels = 10
 	pcs_makupskl = 25
@@ -980,7 +990,7 @@ if $ARGS[0] = 'gopnikstart':
 		pcs_punch = 35
 		pcs_kick = 35
 		pcs_def = 35
-		salo = 86
+		pcs_mass['body'] = 86
 		school_clothing = 5
 		npc_rel['A9'] += 10
 		npc_rel['A10'] += 10
@@ -1029,7 +1039,7 @@ if $ARGS[0] = 'troublemaker':
 		pcs_def = 20
 		pcs_humint = 10
 		pcs_persuas = 10
-		salo = 65
+		pcs_mass['body'] = 65
 		pirsD = 4
 		PirsD4_owned = 1
 		$currentpursetype = 'dolls'
@@ -1087,9 +1097,10 @@ if $ARGS[0] = 'alternative':
 		pcs_vital = 45
 		pcs_agil = 45
 		pcs_react = 45
-		genbsize = 18
-!!c cup for ideal bmi
-		salo = 75
+		!!c cup for ideal bmi
+		pcs_mass['bust_gen'] = 18
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 75
 		pcs_chrsm = 35
 		pcs_humint = 20
 		pcs_persuas = 20
@@ -1190,15 +1201,16 @@ if $ARGS[0] = 'friendless':
 		gs 'intro_city_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -10, -10, -10, -10, -10, 0
 		alterstrtimg = 22
-		genbsize = 12
-!!b cup for ideal bmi
+		!!b cup for ideal bmi
+		pcs_mass['bust_gen'] = 12
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 68
 		pcs_chrsm = 20
 		pcs_observ = 20
 		pcs_skin = 300 
 		pcs_makupskl = 10
 		npc_rel['A11'] -= 20
 		willpowermax = 60
-		salo = 68
 		gs 'grades', 'grade_award', 'school', 'math', 55
 		gs 'grades', 'grade_award', 'school', 'rus', 25
 		gs 'grades', 'grade_award', 'school', 'lit', 55
@@ -1227,8 +1239,10 @@ if $ARGS[0] = 'uglyduckling':
 		gs 'npc_relationship', 'socialgroup_setting_boys', -10, -10, 0, -10, 0, 0
 		alterstrtimg = 23
 		if glass < 1 : glass = 1
-		genbsize = 28
-!!e cup for ideal bmi
+		!!e cup for ideal bmi
+		pcs_mass['bust_gen'] = 28
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 130
 		pcs_inhib = 5
 		if player_avatar = 0:
 			pcs_eyesize = 0
@@ -1240,7 +1254,6 @@ if $ARGS[0] = 'uglyduckling':
 		currentpursenumber = 8
 		gm_purses[8] = 1
 		bag = 1
-		salo = 130
 		pcs_teeth = 2
 		willpowermax = 55
 		gs 'grades', 'grade_award', 'school', 'math', 55
@@ -1296,9 +1309,10 @@ if $ARGS[0] = 'goodgirl':
 			pcs_lashes = 1
 		end
 		school_clothing = 3
-		salo = 58
-		genbsize = 13
-!!b cup for ideal bmi
+		!!b cup for ideal bmi
+		pcs_mass['bust_gen'] = 13
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 58
 		willpowermax = 75
 		gs 'grades', 'grade_award', 'school', 'math', 80
 		gs 'grades', 'grade_award', 'school', 'rus', 80
@@ -1342,8 +1356,10 @@ if $ARGS[0] = 'slut':
 		pcs_makupskl = 40
 		pcs_danc = 30
 		pcs_heels = 50
-		genbsize = 22
-!!d cup for ideal bmi
+		!!d cup for ideal bmi
+		pcs_mass['bust_gen'] = 22
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 70
 		mc_inventory['cosmetics'] = 30
 		mc_inventory['eyelash_fake'] =  20
 		$currentpursetype = 'cats'
@@ -1378,7 +1394,6 @@ if $ARGS[0] = 'slut':
 		GspravkaT = 2
 		motherKnowSpravka = 2
 		Gspassed = 0
-		salo = 70
 		stat['porn'] = 75
 		stat['mast'] = 100
 		stat['hj'] = 70
@@ -1423,16 +1438,17 @@ if $ARGS[0] = 'goth':
 		pcs_traits['nerd_points'] = -10
 		gs 'intro_city_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', 0, 0, 5, +20, 0, 0
-        npc_rel['A28'] -= 20
-	    npc_rel['A29'] -= 20
+		npc_rel['A28'] -= 20
+		npc_rel['A29'] -= 20
 		npc_rel['A33'] -= 20
-	    npc_rel['A34'] -= 20
-	    npc_rel['A144'] += 10
+		npc_rel['A34'] -= 20
+		npc_rel['A144'] += 10
 		npc_rel['A155'] += 5
-        alterstrtimg = 28
-		genbsize = 13
-!!b cup for ideal bmi
-		salo = 55
+		alterstrtimg = 28
+		!!b cup for ideal bmi
+		pcs_mass['bust_gen'] = 13
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 55
 		pcs_chrsm = 45
 		pcs_intel = 45
 		pcs_sprt = 50
@@ -1443,20 +1459,20 @@ if $ARGS[0] = 'goth':
 		pcs_artskls = 20
 		pcs_sewng = 20
 		pcs_skin = 700
-	    pcs_inhib = 25
+		pcs_inhib = 25
 		willpowermax = 65
 		if player_avatar = 0:
-		    pcs_hairlng = 265
-            pcs_haircol = 0
+			pcs_hairlng = 265
+			pcs_haircol = 0
 			pcs_eyesize = 3
 			pcs_eyecol = 1
 			pcs_lashes = 1
-        end
+		end
 		school_clothing = 1
-        mc_inventory['cosmetics'] = 25
+		mc_inventory['cosmetics'] = 25
 		mc_inventory['razor'] =  20
 		mc_inventory['tampons'] =  10
-        $currentpursetype = 'dolls'
+		$currentpursetype = 'dolls'
 		currentpursenumber = 18
 		dolls_purses[18] = 1
 		bag = 1

locations/intro_customization.qsrc

@@ -2,7 +2,8 @@
 !!2022/03/12
 if $ARGS[0] = 'start':
 	'If you want to set your skills and attributes to a certain number, use the cheat menu to do it, the options to do it here were removed.'
-	if genbsize = '': genbsize = 22
+	pcs_mass['butt_gen'] = 20
+	if pcs_mass['bust_gen'] = '': pcs_mass['bust_gen'] = 22
 	if $soc_grup = '':gs 'intro_customization', 'none'
 	act 'Set attributes': gt 'intro_customization','modatt'
 	act 'Set skills': gt 'intro_customization','modskl'
@@ -26,94 +27,94 @@ end
 
 if $ARGS[0] = 'modapp':
 	cla & *clr
-	if genbsize = 0:genbsize = 12
+	if pcs_mass['bust_gen'] = 0: pcs_mass['bust_gen'] = 12
 
 	'Choose base genetic breast size: (this is the genetic disposition and not the actual size at game start)'
 	nl
-	if genbsize = 2:
+	if pcs_mass['bust_gen'] = 2:
 		'Very small - Currently set'
 	else
-		'<a href="exec:genbsize = 2 & gt ''intro_customization'',''modapp''">Very small</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 2 & gt ''intro_customization'',''modapp''">Very small</a>'
 	end
 
-	if genbsize = 7:
+	if pcs_mass['bust_gen'] = 7:
 		'Below average - Currently set'
 	else
-		'<a href="exec:genbsize = 7 & gt ''intro_customization'',''modapp''">Below average</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 7 & gt ''intro_customization'',''modapp''">Below average</a>'
 	end
 	
-	if genbsize = 12:
+	if pcs_mass['bust_gen'] = 12:
 		'Average - Currently set'
 	else
-		'<a href="exec:genbsize = 12 & gt ''intro_customization'',''modapp''">Average</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 12 & gt ''intro_customization'',''modapp''">Average</a>'
 	end
 	
-	if genbsize = 17:
+	if pcs_mass['bust_gen'] = 17:
 		'Above average - Currently set'
 	else
-		'<a href="exec:genbsize = 17 & gt ''intro_customization'',''modapp''">Above average</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 17 & gt ''intro_customization'',''modapp''">Above average</a>'
 	end
 
-	if genbsize = 22:
+	if pcs_mass['bust_gen'] = 22:
 		'Large - Currently set'
 	else
-		'<a href="exec:genbsize = 22 & gt ''intro_customization'',''modapp''">Large</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 22 & gt ''intro_customization'',''modapp''">Large</a>'
 	end
 
-	if genbsize = 27:
+	if pcs_mass['bust_gen'] = 27:
 		'Extra large - Currently set'
 	else
-		'<a href="exec:genbsize = 27 & gt ''intro_customization'',''modapp''">Extra large</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 27 & gt ''intro_customization'',''modapp''">Extra large</a>'
 	end
 
-	if genbsize = 32:
+	if pcs_mass['bust_gen'] = 32:
 		'Really big - Currently set'
 	else
-		'<a href="exec:genbsize = 32 & gt ''intro_customization'',''modapp''">Really big</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 32 & gt ''intro_customization'',''modapp''">Really big</a>'
 	end
 
-	if genbsize = 37:
+	if pcs_mass['bust_gen'] = 37:
 		'Massive - Currently set'
 	else
-		'<a href="exec:genbsize = 37 & gt ''intro_customization'',''modapp''">Massive</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 37 & gt ''intro_customization'',''modapp''">Massive</a>'
 	end
 
-	if genbsize = 42:
+	if pcs_mass['bust_gen'] = 42:
 		'Getting silly - Currently set'
 	else
-		'<a href="exec:genbsize = 42 & gt ''intro_customization'',''modapp''">Getting silly</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 42 & gt ''intro_customization'',''modapp''">Getting silly</a>'
 	end
 
-	if genbsize = 47:
+	if pcs_mass['bust_gen'] = 47:
 		'Crazy big - Currently set'
 	else
-		'<a href="exec:genbsize = 47 & gt ''intro_customization'',''modapp''">Crazy big</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 47 & gt ''intro_customization'',''modapp''">Crazy big</a>'
 	end
 
-	if genbsize = 57:
+	if pcs_mass['bust_gen'] = 57:
 		'Freakishly big - Currently set'
 	else
-		'<a href="exec:genbsize = 57 & gt ''intro_customization'',''modapp''">Freakishly big</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 57 & gt ''intro_customization'',''modapp''">Freakishly big</a>'
 	end
 	
-	if genbsize = 67:
+	if pcs_mass['bust_gen'] = 67:
 		'Will struggle to open doors or see the ground big - Currently set'
 	else
-		'<a href="exec:genbsize = 67 & gt ''intro_customization'',''modapp''">Will struggle to open doors or see the ground big</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 67 & gt ''intro_customization'',''modapp''">Will struggle to open doors or see the ground big</a>'
 	end
 	
-	if genbsize = 87:
+	if pcs_mass['bust_gen'] = 87:
 		'You''ve been eclipsed by 2 small moons - Currently set'
 	else
-		'<a href="exec:genbsize = 87 & gt ''intro_customization'',''modapp''">You''ve been eclipsed by 2 small moons</a>'
+		'<a href="exec:pcs_mass[''bust_gen''] = 87 & gt ''intro_customization'',''modapp''">You''ve been eclipsed by 2 small moons</a>'
 	end
 
-	act 'Body fat (<<salo>>/200)':  gs 'intro_customization','setsalo' & salo = nstat & gt 'intro_customization','modapp'
+	act 'Body fat (<<pcs_mass[''body'']>>/200)':  gs 'intro_customization','setbodymass' & pcs_mass['body'] = nstat & gt 'intro_customization','modapp'
 	act 'Return': gt'intro_customization','start'
 end
 
 if $ARGS[0] = 'setgenbsize':
-	nstat = genbsize
+	nstat = pcs_mass['bust_gen']
 	nstat = input 'Enter value that ends in a 2 or a 7. For example, 2, 7, 12 etc.'
 	if nstat > 97:
 		msg 'Please enter a value less than or equal to 97'
@@ -380,7 +381,7 @@ if $ARGS[0] = 'setval3':
 	end
 end
 
-if $ARGS[0] = 'setsalo':
+if $ARGS[0] = 'setbodymass':
 	*clr & cla
 	'20 = underweight, slight, wiry'
 	'40 = slender, skinny, lean'
@@ -390,7 +391,7 @@ if $ARGS[0] = 'setsalo':
 	'120 = overweight, stocky'
 	'140 = fat, heavy set'
 
-	nstat = salo
+	nstat = pcs_mass['body']
 	nstat = input 'Enter value in multiples of 20. For example, 20, 40, 60 etc.'
 	if nstat > 200:
 		msg 'Please enter a value less than 200'

locations/intro_sg_select.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'start':
 	gs 'npcstatic5'
 	gs 'npcstatic6'
 
-	!! default friendship is 30 for all  npcs
+	!! default friendship is 30 for all npcs
 	gs 'npc_relationship', 'default'
 	!! changes the values for family members and old friends
 	gs 'npc_relationship', 'default_family_friends'
@@ -264,7 +264,7 @@ if $ARGS[0] = 'charselect':
 		gs 'intro_sg_select', 'gopnikinfo'
 		act 'I am a gopnik': gt 'intro_sg_select', 'gopnikstart'
 		act 'I am a punk or troublemaker': gt 'intro_sg_select', 'troublemaker'
-		act 'I am <<$npc_nickname[''A9'']>>''s girlfriend':  gt 'intro_sg_select', 'vitekgf'
+		act 'I am <<$npc_nickname[''A9'']>>''s girlfriend': gt 'intro_sg_select', 'vitekgf'
 		act 'I am an alternative, party girl or rebel': gt 'intro_sg_select', 'alternative'
 	end
 
@@ -409,7 +409,7 @@ if $ARGS[0] = 'nerd':
 	fantasybook = 5
 	grupTipe=3
 	money += 3000
-	mc_inventory['shampoo'] =  20
+	mc_inventory['shampoo'] = 20
 	mc_inventory['sanitary_pads'] = 40
 	if player_avatar = 0:
 		pcs_eyesize = 1
@@ -435,8 +435,9 @@ if $ARGS[0] = 'nerd':
 	grupvalue[3] = 800
 	grupvalue[4] = 100
 	grupvalue[6] = 600
-	genbsize = 13 
-!!b cup for ideal bmi
+	!!b cup for ideal bmi
+	pcs_mass['bust_gen'] = 13
+	pcs_mass['butt_gen'] = 20
 	pcs_traits['nerd_points'] = 60
 	pcs_traits['nerd_status'] = 2
 	pcs_traits['nerd_lernHome'] = 5
@@ -471,7 +472,7 @@ if $ARGS[0] = 'nerdqueen':
 		grupvalue[3] = 900
 		grupvalue[6] = 700
 		mc_inventory['cosmetics'] = 10
-		mc_inventory['razor'] =  10
+		mc_inventory['razor'] = 10
 		if player_avatar = 0:
 			pcs_hairlng = 300
 			pcs_eyesize = 3
@@ -481,9 +482,10 @@ if $ARGS[0] = 'nerdqueen':
 		pcs_skin = 700
 		pcs_teeth = -1
 		pcs_butt = 12
-		genbsize = 22
-!!d cup for ideal bmi
-		salo = 87
+		!!d cup for ideal bmi
+		pcs_mass['bust_gen'] = 22
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 87
 		willpowermax = 70
 		gs 'grades', 'grade_award', 'school', 'math', 85
 		gs 'grades', 'grade_award', 'school', 'rus', 90
@@ -518,9 +520,10 @@ if $ARGS[0] = 'goodstudent':
 		pcs_instrmusic = 10
 		pcs_artskls = 10
 		money += 2000
-		salo = 93
-		genbsize = 18
-!!c cup for ideal bmi
+		!!c cup for ideal bmi
+		pcs_mass['bust_gen'] = 18
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 93
 		grupvalue[3] = 850
 		grupvalue[6] = 700
 		gs 'npc_relationship', 'socialgroup_setting', 0, 0, 5, 0, 0, 20
@@ -561,7 +564,7 @@ if $ARGS[0] = 'computergeek':
 		internet = 20
 		pcs_skin = 500
 		pcs_teeth = 1
-		salo = 56
+		pcs_mass['body'] = 56
 		pcs_inhib = 20
 		npc_rel['A152'] += 10
 		npc_rel['A153'] += 10
@@ -600,7 +603,7 @@ if $ARGS[0] = 'chessplayer':
 		pcs_prcptn = 40
 		pcs_react = 40
 		pcs_chess = 40
-		salo = 97
+		pcs_mass['body'] = 97
 		pcs_inhib = 15
 		chessyear = year
 		chessmonth = month
@@ -631,15 +634,16 @@ if $ARGS[0] = 'jock':
 	pcs_vital = 45
 	pcs_react = 45
 	pcs_agil = 45
-	genbsize = 12
-!!b cup for ideal bmi
+	!!b cup for ideal bmi
+	pcs_mass['bust_gen'] = 12
+	pcs_mass['butt_gen'] = 20
 	pcs_skin = 600
 	pcs_butt = 12
 	mc_inventory['cosmetics'] = 10
-	mc_inventory['razor'] =  10
-	mc_inventory['shampoo'] =  20
+	mc_inventory['razor'] = 10
+	mc_inventory['shampoo'] = 20
 	mc_inventory['sanitary_pads'] = 20
-	mc_inventory['tampons'] =  20
+	mc_inventory['tampons'] = 20
 	pcs_run = 20
 	pcs_bushcraft = 5
 	pcs_ftbll = 10
@@ -665,7 +669,7 @@ if $ARGS[0] = 'jock':
 	gs 'npc_relationship', 'socialgroup_setting', 10, 25, -5, 0, -10, 0
 	npc_rel['A129'] -= 10
 	npc_rel['A18'] = 1
-	mc_inventory['scrunchies'] =  10
+	mc_inventory['scrunchies'] = 10
 	hscrunchw = 0
 	pcs_tan = 20
 	if player_avatar = 0:
@@ -689,9 +693,10 @@ if $ARGS[0] = 'volleyball':
 		alterstrtimg = 12
 		pcs_react = 45
 		pcs_agil = 45
-		genbsize = 17
-!!c cup for ideal bmi
-		salo = 75
+		!!c cup for ideal bmi
+		pcs_mass['bust_gen'] = 17
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 75
 		pcs_vball = 50
 		gsAboVolley += 30
 		npc_rel['A13'] += 10
@@ -734,7 +739,7 @@ if $ARGS[0] = 'dancer':
 		pcs_skin = 700
 		pcs_teeth = -1
 		pcs_tan = 5
-		salo = 50
+		pcs_mass['body'] = 50
 		if player_avatar = 0:
 			pcs_hairlng = 200
 			pcs_eyesize = 2
@@ -780,7 +785,7 @@ if $ARGS[0] = 'runner':
 		pcs_vital = 50
 		pcs_agil = 50
 		pcs_inhib = 25
-		salo = 60
+		pcs_mass['body'] = 60
 		pcs_run = 50
 		gsAboBeg += 30
 		npc_rel['A3'] += 10
@@ -819,9 +824,10 @@ if $ARGS[0] = 'football':
 		pcs_stren = 80
 		pcs_react = 45
 		pcs_vital = 45
-		salo = 80
-		genbsize = 17
-!!c cup for ideal bmi
+		!!c cup for ideal bmi
+		pcs_mass['bust_gen'] = 17
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 80
 		pcs_kick = 20
 		pcs_ftbll = 50
 		npc_rel['A131'] += 10
@@ -862,10 +868,10 @@ if $ARGS[0] = 'cool':
 	pcs_inhib = 20
 	swim_start = 99
 	mc_inventory['cosmetics'] = 20
-	mc_inventory['shampoo'] =  20
-	mc_inventory['razor'] =  20
+	mc_inventory['shampoo'] = 20
+	mc_inventory['razor'] = 20
 	mc_inventory['sanitary_pads'] = 20
-	mc_inventory['tampons'] =  20
+	mc_inventory['tampons'] = 20
 	money += 1000
 	grupvalue[1] = 800
 	grupvalue[2] = 300
@@ -899,8 +905,10 @@ if $ARGS[0] = 'socialite':
 		gs 'intro_sg_select', 'cool'
 		alterstrtimg = 16
 		pcs_chrsm = 50
-		genbsize = 18
-!!c cup for ideal bmi
+		!!c cup for ideal bmi
+		pcs_mass['bust_gen'] = 18
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 80
 		pcs_humint = 40
 		pcs_makupskl = 40
 		pcs_heels = 30
@@ -914,7 +922,6 @@ if $ARGS[0] = 'socialite':
 		school_clothing = 6
 		if player_avatar ! 1: pcs_hairlng = 200
 		npc_rel['A140'] += 10
-		salo = 80
 		willpowermax = 70
 		gs 'grades', 'grade_award', 'school', 'math', 65
 		gs 'grades', 'grade_award', 'school', 'rus', 90
@@ -954,25 +961,26 @@ if $ARGS[0] = 'beautiful':
 		pcs_skin = 900
 		pcs_teeth = -1
 		pcs_tan = 50
-		genbsize = 22
-!!d cup for ideal bmi
+		!!d cup for ideal bmi
+		pcs_mass['bust_gen'] = 22
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 75
 		pcs_inhib = 25
 		mc_inventory['cosmetics'] = 50
-		mc_inventory['eyelash_fake'] =  10
-		mc_inventory['eyelash_mink'] =  2
+		mc_inventory['eyelash_fake'] = 10
+		mc_inventory['eyelash_mink'] = 2
 		$currentpursetype = 'fashionista'
 		currentpursenumber = 9
 		fashionista_purses[9] = 1
 		bag = 1
 		gs 'obj_din', 'old'
-		mc_inventory['comb'] =  1
-		mc_inventory['travel_makeup'] =  10
-		mc_inventory['suncream'] =  10
+		mc_inventory['comb'] = 1
+		mc_inventory['travel_makeup'] = 10
+		mc_inventory['suncream'] = 10
 		pirsC = 2
 		PirsC2_owned = 1
 		gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 10, 10, 10, 0
 		npc_rel['A18'] = 1
-		salo = 75
 		grupvalue[1] = 900
 		grupvalue[4] = 300
 		gs 'fame', 'pav', 'sex', 20
@@ -1001,16 +1009,17 @@ if $ARGS[0] = 'gopnik':
 	pcs_vital = 40
 	pcs_react = 40
 	pcs_agil = 40
-	genbsize = 13
-!!b cup for ideal bmi
+	!!b cup for ideal bmi
+	pcs_mass['bust_gen'] = 13
+	pcs_mass['butt_gen'] = 20
 	pcs_inhib = 25
 	pcs_heels = 10
 	pcs_makupskl = 25
 	mc_inventory['cosmetics'] = 10
-	mc_inventory['shampoo'] =  20
-	mc_inventory['razor'] =  10
+	mc_inventory['shampoo'] = 20
+	mc_inventory['razor'] = 10
 	mc_inventory['sanitary_pads'] = 30
-	mc_inventory['tampons'] =  10
+	mc_inventory['tampons'] = 10
 	mc_inventory['cigarettes'] = 20
 	fakepassport = 1
 	pirsC = 1
@@ -1025,7 +1034,7 @@ if $ARGS[0] = 'gopnik':
 	npc_rel['A11'] += 10
 	npc_rel['A18'] = 1
 	npc_rel['A23'] = 20
-	mc_inventory['tampons'] =  20
+	mc_inventory['tampons'] = 20
 	pcs_run = 20
 	pcs_humint = 10
 	pcs_tan = 10
@@ -1064,7 +1073,7 @@ if $ARGS[0] = 'gopnikstart':
 		pcs_punch = 35
 		pcs_kick = 35
 		pcs_def = 35
-		salo = 86
+		pcs_mass['body'] = 86
 		pcs_teeth = 1
 		school_clothing = 5
 		npc_rel['A9'] += 10
@@ -1115,7 +1124,7 @@ if $ARGS[0] = 'troublemaker':
 		pcs_def = 20
 		pcs_humint = 10
 		pcs_persuas = 10
-		salo = 65
+		pcs_mass['body'] = 65
 		pirsD = 4
 		PirsD4_owned = 1
 		$currentpursetype = 'dolls'
@@ -1164,8 +1173,10 @@ if $ARGS[0] = 'vitekgf':
 		gs 'intro_sg_select', 'gopnik'
 		alterstrtimg = 20
 		pcs_chrsm = 40
-		genbsize = 32
-!!e cup for ideal bmi
+		!!e cup for ideal bmi
+		pcs_mass['bust_gen'] = 32
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 73
 		pcs_humint = 20
 		pcs_makupskl = 30
 		pcs_heels = 30
@@ -1199,7 +1210,6 @@ if $ARGS[0] = 'vitekgf':
 		pcs_tan = 5
 		pcs_vag = 1
 		pcs_throat = 1
-		salo = 73
 		stat['hj'] = 10
 		stat['bj'] = 5
 		stat['vaginal'] = 2
@@ -1245,16 +1255,17 @@ if $ARGS[0] = 'alternative':
 		pcs_vital = 40
 		pcs_agil = 40
 		pcs_react = 40
-		genbsize = 18
-!!c cup for ideal bmi
-		salo = 75
+		!!c cup for ideal bmi
+		pcs_mass['bust_gen'] = 18
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 75
 		pcs_chrsm = 45
 		pcs_humint = 20
 		pcs_persuas = 10
 		pcs_makupskl = 40
 		pcs_danc = 20
 		pcs_heels = 20
-		mc_inventory['eyelash_fake'] =  5
+		mc_inventory['eyelash_fake'] = 5
 		mc_inventory['cosmetics'] = 20
 		pirsD = 5
 		PirsD5_owned = 1
@@ -1343,7 +1354,7 @@ if $ARGS[0] = 'outcast':
 	pcs_butt = 4
 	pcs_tan = 0
 	grupTipe=5
-	mc_inventory['shampoo'] =  20
+	mc_inventory['shampoo'] = 20
 	mc_inventory['sanitary_pads'] = 40
 end
 
@@ -1355,8 +1366,10 @@ if $ARGS[0] = 'friendless':
 		gs 'intro_sg_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -10, -10, -10, -10, -10, 0
 		alterstrtimg = 22
-		genbsize = 12
-!!b cup for ideal bmi
+		!!b cup for ideal bmi
+		pcs_mass['bust_gen'] = 12
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 68
 		pcs_chrsm = 20
 		pcs_observ = 20
 		pcs_skin = 400
@@ -1366,7 +1379,6 @@ if $ARGS[0] = 'friendless':
 		grupvalue[1] = 50
 		grupvalue[3] = 200
 		willpowermax = 60
-		salo = 68
 		gs 'grades', 'grade_award', 'school', 'math', 55
 		gs 'grades', 'grade_award', 'school', 'rus', 25
 		gs 'grades', 'grade_award', 'school', 'lit', 55
@@ -1398,8 +1410,10 @@ if $ARGS[0] = 'uglyduckling':
 		uglyduck_flag = 1
 		alterstrtimg = 23
 		if glass < 1 : glass = 1
-		genbsize = 28
-!!e cup for ideal bmi
+		!!e cup for ideal bmi
+		pcs_mass['bust_gen'] = 28
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 125
 		pcs_inhib = 5
 		pcs_teeth = 2
 		if player_avatar = 0:
@@ -1408,7 +1422,6 @@ if $ARGS[0] = 'uglyduckling':
 			pcs_lashes = 2
 		end
 		school_clothing = 3
-		salo = 125
 		willpowermax = 55
 		gs 'grades', 'grade_award', 'school', 'math', 55
 		gs 'grades', 'grade_award', 'school', 'rus', 25
@@ -1451,7 +1464,7 @@ if $ARGS[0] = 'goodgirl':
 		pcs_makupskl = 10
 		church_moral = 40
 		money += 1000
-		mc_inventory['shampoo'] =  10
+		mc_inventory['shampoo'] = 10
 		pcs_skin = 500
 		$currentpursetype = 'gm'
 		currentpursenumber = 6
@@ -1464,9 +1477,10 @@ if $ARGS[0] = 'goodgirl':
 			pcs_lashes = 1
 		end
 		school_clothing = 3
-		salo = 58
-		genbsize = 13
-!!b cup for ideal bmi
+		!!b cup for ideal bmi
+		pcs_mass['bust_gen'] = 13
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 58
 		willpowermax = 75
 		gs 'grades', 'grade_award', 'school', 'math', 80
 		gs 'grades', 'grade_award', 'school', 'rus', 80
@@ -1516,20 +1530,22 @@ if $ARGS[0] = 'slut':
 		pcs_makupskl = 30
 		pcs_danc = 20
 		pcs_heels = 50
-		genbsize = 22
-!!d cup for ideal bmi
+		!!d cup for ideal bmi
+		pcs_mass['bust_gen'] = 22
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 70
 		mc_inventory['cosmetics'] = 30
-		mc_inventory['eyelash_fake'] =  20
+		mc_inventory['eyelash_fake'] = 20
 		$currentpursetype = 'cats'
 		currentpursenumber = 10
 		cats_purses[10] = 1
 		bag = 1
 		gs 'obj_din', 'old'
-		mc_inventory['comb'] =  1
-		mc_inventory['travel_makeup'] =  10
-		mc_inventory['makeup_wipes'] =  10
-		mc_inventory['razor'] =  10
-		mc_inventory['shampoo'] =  20
+		mc_inventory['comb'] = 1
+		mc_inventory['travel_makeup'] = 10
+		mc_inventory['makeup_wipes'] = 10
+		mc_inventory['razor'] = 10
+		mc_inventory['shampoo'] = 20
 		pirsC = 2
 		PirsC2_owned = 1
 		motherKnowSpravka = 1
@@ -1552,9 +1568,8 @@ if $ARGS[0] = 'slut':
 		GspravkaT = 2
 		motherKnowSpravka = 2
 		mc_inventory['sanitary_pads'] = 0
-		mc_inventory['tampons'] =  40
+		mc_inventory['tampons'] = 40
 		Gspassed = 0
-		salo = 70
 		stat['porn'] = 75
 		stat['mast'] = 100
 		stat['hj'] = 70
@@ -1601,17 +1616,18 @@ if $ARGS[0] = 'goth':
 		pcs_traits['nerd_points'] = -10
 		gs 'intro_sg_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -5, 0, 0, +10, 0, -10
-        npc_rel['A28'] -= 20
-	    npc_rel['A29'] -= 20
+		npc_rel['A28'] -= 20
+		npc_rel['A29'] -= 20
 		npc_rel['A33'] -= 20
-	    npc_rel['A34'] -= 20
-	    npc_rel['A144'] += 10
+		npc_rel['A34'] -= 20
+		npc_rel['A144'] += 10
 		npc_rel['A155'] += 5
 		grupvalue[4] = 300
-        alterstrtimg = 28
-		genbsize = 13
-!!b cup for ideal bmi
-		salo = 55
+		alterstrtimg = 28
+		!!b cup for ideal bmi
+		pcs_mass['bust_gen'] = 13
+		pcs_mass['butt_gen'] = 20
+		pcs_mass['body'] = 55
 		pcs_chrsm = 40
 		pcs_intel = 40
 		pcs_sprt = 45
@@ -1623,20 +1639,20 @@ if $ARGS[0] = 'goth':
 		pcs_sewng = 20
 		pcs_skin = 700
 		pcs_teeth = -1
-	    pcs_inhib = 25
+		pcs_inhib = 25
 		willpowermax = 65
 		if player_avatar = 0:
-		    pcs_hairlng = 265
-            pcs_haircol = 0
+			pcs_hairlng = 265
+			pcs_haircol = 0
 			pcs_eyesize = 3
 			pcs_eyecol = 1
 			pcs_lashes = 1
-        end
+		end
 		school_clothing = 1
-        mc_inventory['cosmetics'] = 25
-		mc_inventory['razor'] =  20
-		mc_inventory['tampons'] =  10
-        $currentpursetype = 'dolls'
+		mc_inventory['cosmetics'] = 25
+		mc_inventory['razor'] = 20
+		mc_inventory['tampons'] = 10
+		$currentpursetype = 'dolls'
 		currentpursenumber = 18
 		dolls_purses[18] = 1
 		bag = 1
@@ -1669,7 +1685,7 @@ if $ARGS[0] = 'sg_settings':
 	mc_inventory['dish_soap'] = 0
 	mc_inventory['food_basic'] = 0
 	mc_inventory['laundry_soap'] = 0
-	mc_inventory['shampoo'] =  0
+	mc_inventory['shampoo'] = 0
 
 	hcolmotherremember = pcs_haircol
 	hcolfatherremember = pcs_haircol

locations/intro_sg_select_custom.qsrc

@@ -179,7 +179,7 @@ if $ARGS[0] = 'none':
 	pcs_stren = 30
 	pcs_agil = 30
 	pcs_vital = 30
-	pcs_intel = 30	
+	pcs_intel = 30
 	pcs_react = 30
 	pcs_sprt = 30
 	pcs_chrsm = 30
@@ -231,18 +231,18 @@ if $ARGS[0] = 'none':
 	pcs_medcn = 0
 	
 	!!social group Reset
-	grupTipe = 0	
-	grupvalue[1] = 0	
-	grupvalue[2] = 0	
-	grupvalue[3] = 0	
-	grupvalue[4] = 0	
-	grupvalue[6] = 0	
+	grupTipe = 0
+	grupvalue[1] = 0
+	grupvalue[2] = 0
+	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['A129'] = 30
+	npc_rel['A133'] = 30
 	npc_rel['A28'] = 50	
 	npc_rel['A29'] = 50	
 	npc_rel['A33'] = 70	
@@ -250,28 +250,29 @@ if $ARGS[0] = 'none':
 	
 	!!items Reset
 	money = 2000
-	fakepassport = 0	
-	fantasybook = 0	
-	glass = 0	
-	mc_inventory['scrunchies'] =  0
+	fakepassport = 0
+	fantasybook = 0
+	glass = 0
+	mc_inventory['scrunchies'] = 0
 	mc_inventory['cosmetics'] = 0
-	pirsC = 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
+	mc_inventory['shampoo'] = 0
+	mc_inventory['cigarettes'] = 0
+	mc_inventory['razor'] = 0
+	swim_start = 0
+	mc_inventory['tampons'] = 0
 	
 	!!apprnc & sex stat reset
-	genbsize = 22
+	pcs_mass['bust_gen'] = 22
+	pcs_mass['butt_gen'] = 20
 	pcs_skin = 40
-	salo = 80
+	pcs_mass['body'] = 80
 	pcs_tan = 0	
-	pcs_throat = 0	
+	pcs_throat = 0
 	pcs_vag = 0
-	stat['bj'] = 0	
-	stat['hj'] = 0	
+	stat['bj'] = 0
+	stat['hj'] = 0
 	stat['vaginal'] = 0
 	$soc_grup = 'outcast'
 	grupTipe = 5

locations/intro_sg_tg.qsrc

@@ -214,8 +214,9 @@ if $ARGS[0] = 'settings':
 
 	!!Looks
 	pcs_hgt = 170
-	salo = 80
-	genbsize = 17
+	pcs_mass['body'] = 80
+	pcs_mass['bust_gen'] = 17
+	pcs_mass['butt_gen'] = 20
 	pcs_pubes = 30
 	pcs_leghair = 12
 	pcs_makeup = 1

locations/katja_city.qsrc

@@ -197,7 +197,7 @@ if $ARGS[0] = 'Pussy-Cats':
 		loop_counter += 1
 		if loop_counter = 600:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-			'You try to put on what Katja brought you, but it''s '+iif(salo < 60, 'way too loose and will fall off', 'so tight you can''t get into it')+' so you give up. "I''m sorry, <<$pcs_nickname>>. I''ve miscalculated your size. Let me get something else," Katja says.'
+			'You try to put on what Katja brought you, but it''s ' + iif(pcs_mass['body'] < 60, 'way too loose and will fall off', 'so tight you can''t get into it') + ' so you give up. "I''m sorry, <<$pcs_nickname>>. I''ve miscalculated your size. Let me get something else," Katja says.'
 			'You stop her before she runs out. "Hey don''t be sorry, it''s not your fault. Try what I picked out first."'
 			act 'Katja tries the clothes you picked': gt 'katja_city', 'pussy_cat_outfit<<rand(0,3)>>'
 		else

locations/korr.qsrc

@@ -152,7 +152,7 @@ if BurgerQW['IlyQW']  = 3 and hour >= 9 and hour <= 20:
 			*clr & cla
 			srok_kolvo = 1
 			srok_otsidki += 5
-			salo = 10
+			pcs_mass['body'] = 10
 			fat = 10
 			if defcurly = 0:
 				curly = 0

locations/korr2x.qsrc

@@ -119,7 +119,7 @@ if BurgerQW['IlyQW']  = 3 and hour >= 9 and hour <= 20:
 			cla
 			srok_kolvo = 1
 			srok_otsidki += 5
-			salo = 10
+			pcs_mass['body'] = 10
 			fat = 10
 			if defcurly = 0:
 				curly = 0

locations/lact_lib.qsrc

@@ -45,7 +45,7 @@
 if $ARGS[0] = 'init_breasttissue':
 	!!	use func('lact_lib','init_breasttissue')
 	!!	getting the useable tissue
-	lactation['useable_cupsize'] = nbsize + magicf2b - vofat
+	lactation['useable_cupsize'] = pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_other'] - bodyVars['vofat']
 	!!	checking the variable. If it is greater 0, sveta has natural breast tissue to work with.
 	!!	else she has fake breasts or no breasts at all and no ability to lactate
 	if lactation['useable_cupsize'] > 0:
@@ -54,11 +54,11 @@ if $ARGS[0] = 'init_breasttissue':
 		!! breast density type. Density of glands.
 		!! 0 = not initialized, 1 = 17% gland tissue, 2 = 36% gland tissue, 3 = 55% gland tissue, 4 = 74% gland tissue, 5 = 93% gland tissue. This is based on studies I found on the internet.
 		!! The logic behind the below is, when losing fat, breasts usually volunteer first. So the more bodyfat sveta has, the more she has in her breasts, and therefore the percentage of gland tissue goes down.
-		!! Breasts cannot lose glandular tissue (if not cut out, yikes), therefore this will define the maximum they can shrink if fat is removed. At the moment this is done by Genbsize. The below will replace this in the future.
-		!! Genbsize is the breastsize that is given to Sveta by her parents. During puberty the breasts swell up to this size with mostly being fat tissue. Due to genetic variability and hormones, breasts will develop more or
+		!! Breasts cannot lose glandular tissue (if not cut out, yikes), therefore this will define the maximum they can shrink if fat is removed. At the moment this is done by pcs_mass['bust_gen']. The below will replace this in the future.
+		!! pcs_mass['bust_gen'] is the breastsize that is given to Sveta by her parents. During puberty the breasts swell up to this size with mostly being fat tissue. Due to genetic variability and hormones, breasts will develop more or
 		!! less mammary gland tissue during puberty. As the game starts after Svetas puberty, this is impossible to simulate. That is why I came up with the below part. It will calculate the breastdensity using Svetas body fat.
 		!! During pregnancy most of the breast fat is getting replaced by conjuctive tissue and mammary glands. But the genetical breastsize also affects the total mammary gland growth. So for example, if Sveta is a chubby,
-		!! and has D cups with a breastdensitytype of 1, and she looses weight, her breast will shrink down to B cups. If her Genbsize is D, then she will grow D cups or bigger during pregnancy. But that is part of another function.
+		!! and has D cups with a breastdensitytype of 1, and she looses weight, her breast will shrink down to B cups. If her pcs_mass['bust_gen'] is D, then she will grow D cups or bigger during pregnancy. But that is part of another function.
 		lactation['breastcount'] = 2
 		
 		if lactation['breastdensitytype'] < 3:
@@ -102,7 +102,7 @@ if $ARGS[0] = 'bsizetoccm':
 	!!	Getting breast ccm per breast function based on the bra size chart in here https://en.wikipedia.org/wiki/Bra_size
 	!!	I tried to create a math polynom for this, but ended up with x^16 monsters and inaccurate numbers, so I am going this approach.
 	!!	This is the most accurate function I was able to make, and is doing the job really good. So please do not touch it.
-	!!	usage func('lact_lib','bsizetoccm', (nbsize + magicf2b + silicone))
+	!!	usage func('lact_lib','bsizetoccm', (pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone']))
 	if ARGS[1] < 0:
 		result = 100
 	elseif ARGS[1] <= 15:
@@ -143,7 +143,7 @@ if $ARGS[0] = 'bsizetoccm':
 end
 
 if $ARGS[0] = 'bccmtosize':
-	!!	backwardsfunction of bsizetoccm. It just reverts breast ccm to "nbsize + magicf2b + silicone" 
+	!!	backwardsfunction of bsizetoccm. It just reverts breast ccm to "pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone']" 
 	!!	func('lact_lib','bccmtosize',lactation['breastccm'])
 	if ARGS[1] < 0:
 		result = 0
@@ -184,22 +184,22 @@ if $ARGS[0] = 'bccmtosize':
 	end
 end
 
-!! This function is used for lactation based growth. It writes back to nbsize, magicf2b.
+!! This function is used for lactation based growth. It writes back to pcs_mass['bust'], bodyVars['bust_magic'].
 if $ARGS[0] = 'lactationBreastGrowth':
 	if lactation['maturebreast'] = 1 and lactation['preggrowth'] > 0:
 !!		lactation['lactlib_change'] = 1
-		lactation['useable_cupsize'] = nbsize + magicf2b - vofat
-		nbsize += func('lact_lib','bccmtosize',(func('lact_lib','bsizetoccm', lactation['useable_cupsize']) + (lactation['preggrowth']/100))) + vofat - magicf2b - nbsize
+		lactation['useable_cupsize'] = pcs_mass['bust'] + bodyVars['bust_magic'] - bodyVars['vofat']
+		pcs_mass['bust'] += func('lact_lib','bccmtosize',(func('lact_lib','bsizetoccm', lactation['useable_cupsize']) + (lactation['preggrowth']/100))) + bodyVars['vofat'] - bodyVars['bust_magic'] - pcs_mass['bust']
 		lactation['result'] = func('lact_lib','init_breasttissue')
 	end
 	if lactation['alveoliexpandlvl_change'] <> lactation['alveoliexpandlvl']:
 		!!	lactlib makes a change. we need to flag that, else checkExtBreastGrowth will go off and mess up everything.
 !!		lactation['lactlib_change'] = 1
 		if lactation['alveoliexpandlvl'] mod 3 = 0 and lactation['alveoliexpandlvl_change'] + 1 = lactation['alveoliexpandlvl']:
-			nbsize += 5
+			pcs_mass['bust'] += 5
 			'<b>Your breasts seem fuller.</b>'
-		elseif lactation['alveoliexpandlvl_change'] mod 3 = 0 and lactation['alveoliexpandlvl'] + 1 = lactation['alveoliexpandlvl_change'] and lactation['alveoliexpandlvl_change'] > 0 and nbsize > 10:
-			nbsize -= 5
+		elseif lactation['alveoliexpandlvl_change'] mod 3 = 0 and lactation['alveoliexpandlvl'] + 1 = lactation['alveoliexpandlvl_change'] and lactation['alveoliexpandlvl_change'] > 0 and pcs_mass['bust'] > 10:
+			pcs_mass['bust'] -= 5
 			'<b>Your breasts seem to be getting smaller.</b>'
 		end	
 		lactation['alveoliexpandlvl_change'] = lactation['alveoliexpandlvl'] 	
@@ -243,8 +243,8 @@ if $ARGS[0] = 'prod_milk':
 		lactation['used_lactaterate'] += ARGS[1]
 		if lactation['used_lactaterate'] > lactation['lactaterate']: lactation['used_lactaterate'] = lactation['lactaterate']
 	end
-	!!	If Sveta has salo <= 15, she will not produce breast milk as she is basically starving and her body will shut down everything that is causing too much energy consumption.
-	if lactation['active'] > 0 and salo > 15:
+	!!	If Sveta has pcs_mass['body'] <= 15, she will not produce breast milk as she is basically starving and her body will shut down everything that is causing too much energy consumption.
+	if lactation['active'] > 0 and pcs_mass['body'] > 15:
 		!!	checking how much hydration, stamina and hunger is needed to produce x amount of breast milk
 		!!	checking if enough stamina and hydra is available
 		if (lactation['prod_milk_req']/10000) < pcs_stam and (lactation['prod_milk_req']/10000) < pcs_hydra:
@@ -304,15 +304,15 @@ if $ARGS[0] = 'prod_milk':
 					if pcs_energy < 1: pcs_energy = 1
 				end
 			else
-				!!	If energy is too low, milk will be produced but there is a chance that salo will shrink.
+				!!	If energy is too low, milk will be produced but there is a chance that pcs_mass['body'] will shrink.
 				pcs_energy = 1
-				if rand(0,100) > 95: salo -= 1
+				if rand(0,100) > 95: pcs_mass['body'] -= 1
 				if pain['breasts'] < 20: pain['breasts'] += 1
 			end
 			if pcs_energy < 1: pcs_energy = 1
 			if pcs_hydra < 1: pcs_hydra = 1
 			if pcs_stam < 1: pcs_stam = 1
-			result = lactation['prod_milk_temp_var']			
+			result = lactation['prod_milk_temp_var']
 		end
 	else
 		result = 0

locations/lover_change.qsrc

@@ -5,7 +5,7 @@ gs 'lover_pronouns'
 if $ARGS[0] = 'Hair':
 	'As you arrive at the salon with <<$loverdesc[lover_number]>>, <<$tXe>> heads over to the counter and tells something to the barber. The barber nods and comes towards you.' 
 	'"So Ms. <<$pcs_lastname>>, you want to get your hair dyed <<$hairPref>> now is that right?"'
-	act 'Nod':		
+	act 'Nod':
 		cla 
 		'Knowing there is no way to back out of this now, you meekly nod.'	
 		'"Alrighty then, your hair will be <<$hairPref>> before you know it!"'
@@ -934,7 +934,7 @@ if $ARGS[0] = 'Tits':
 					act 'Wake up':
 						cla
 						minut += 120
-						silicone += titAmount
+						bodyVars['bust_silicone'] += titAmount
 						gs 'stat'
 						'"<<$pcs_firstname>> <<$pcs_lastname>>, are you listening?"'
 						' ''Wait... I''m awake?'' It seemed just a couple of seconds ago you were laying down on the operating table about to have surgery.'
@@ -1000,12 +1000,12 @@ if $ARGS[0] = 'Tits':
 					act 'Wake up':
 						cla
 						minut += 120
-						if silicone - titAmount < 0:
-							titExtra = titAmount - silicone
-							silicone = 0
-							nbsize -= titExtra
+						if bodyVars['bust_silicone'] - titAmount < 0:
+							titExtra = titAmount - bodyVars['bust_silicone']
+							bodyVars['bust_silicone'] = 0
+							pcs_mass['bust'] -= titExtra
 						else
-							silicone -= titAmount
+							bodyVars['bust_silicone'] -= titAmount
 						end
 						gs 'stat'
 						'"<<$pcs_firstname>> <<$pcs_lastname>>, are you listening?"'
@@ -1086,7 +1086,7 @@ if $ARGS[0] = 'Figure':
 					*nl
 					*nl
 					*nl
-					!!'<<salocatnow>> is the value for salocatnow, the value for fat is <<fat>>, and the value for salo is <<salo>>.'
+					!!'<<salocatnow>> is the value for salocatnow, the value for fat is <<fat>>, and the value for pcs_mass['body'] is <<pcs_mass[''body'']>>.'
 					act 'Wake up':
 						cla
 						minut += 120
@@ -1094,11 +1094,11 @@ if $ARGS[0] = 'Figure':
 						if figurlover[lover_number] ! 3:
 
 							:loopfatRemover
-								salo = 20 * figurePrefMin + 1
-								if salo < 11: salo = 11
+								pcs_mass['body'] = 20 * figurePrefMin + 1
+								if pcs_mass['body'] < 11: pcs_mass['body'] = 11
 
 								gs 'body', 'softreset'
-								!!'<<salocatnow>> is the value for salocatnow, the value for fat is <<fat>>, and the value for salo is <<salo>>.'
+								!!'<<salocatnow>> is the value for salocatnow, the value for fat is <<fat>>, and the value for pcs_mass['body'] is <<pcs_mass[''body'']>>.'
 								
 							if salocatnow > figurePrefMax:jump 'loopfatRemover'
 						else

locations/obj_din.qsrc

@@ -345,8 +345,8 @@ if $ARGS[0] = 'description':
 	if defcurly = 1 and straight > 0: 'Your hair should be straight for another <<straight>> days.'
 	*nl
 
-	if salo < 10 and strenbuf > 0 and dounspell = 0: '<b><font color="red">You are showing signs of malnourishment. You should probably eat more and more often.</font></b>'
-	if salo < 10 and strenbuf = 0 and dounspell = 0: '<b><font color="red">You are dangerously malnourished, which has led to a loss in muscle mass. You''re in a critical condition and likely to pass out!</font></b>'
+	if pcs_mass['body'] < 10 and strenbuf > 0 and dounspell = 0: '<b><font color="red">You are showing signs of malnourishment. You should probably eat more and more often.</font></b>'
+	if pcs_mass['body'] < 10 and strenbuf = 0 and dounspell = 0: '<b><font color="red">You are dangerously malnourished, which has led to a loss in muscle mass. You''re in a critical condition and likely to pass out!</font></b>'
 	if pcs_missing_teeth = 1:
 		 'You have lost <<pcs_missing_teeth>> <a href="exec:gs ''obj_din'', ''show_missing_teeth''">tooth</a>.'
 	elseif pcs_missing_teeth >= 2:

locations/pav_clinic.qsrc

@@ -1692,11 +1692,11 @@ if $ARGS[0] = 'maternity_ward':
 									else
 										mward_donatesv = lact_ev['gpoli_milkedvolume']
 									end
-									if salo > 40:
+									if pcs_mass['body'] > 40:
 										mward_donatesf = 60
-									elseif salo > 20:
+									elseif pcs_mass['body'] > 20:
 										mward_donatesf = 45
-									elseif salo > 15:
+									elseif pcs_mass['body'] > 15:
 										mward_donatesf = 20
 									else
 										mward_donatesf = 10
@@ -1769,11 +1769,11 @@ if $ARGS[0] = 'maternity_ward':
 									else
 										mward_donatesv = lact_ev['gpoli_milkedvolume']
 									end
-									if salo > 40:
+									if pcs_mass['body'] > 40:
 										mward_donatesf = 60
-									elseif salo > 20:
+									elseif pcs_mass['body'] > 20:
 										mward_donatesf = 45
-									elseif salo > 15:
+									elseif pcs_mass['body'] > 15:
 										mward_donatesf = 20
 									else
 										mward_donatesf = 10
@@ -1851,11 +1851,11 @@ if $ARGS[0] = 'maternity_ward':
 						else
 							mward_donatesv = lact_ev['gpoli_milkedvolume']
 						end
-						if salo > 40:
+						if pcs_mass['body'] > 40:
 							mward_donatesf = 60
-						elseif salo > 20:
+						elseif pcs_mass['body'] > 20:
 							mward_donatesf = 45
-						elseif salo > 15:
+						elseif pcs_mass['body'] > 15:
 							mward_donatesf = 20
 						else
 							mward_donatesf = 10

locations/pav_factory.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'tailor':
 		end
 
 		act 'Resize your other clothes':gt 'clothing', 'view_clothing_list', 'resize'
-		act 'Resize all your clothes':gt 'portnoi2'
+		act 'Resize all your clothes':gt 'tailor'
 	end
 end
 

locations/placer_sex.qsrc

@@ -1431,7 +1431,7 @@ if $args[0] = 'sleep':
 	if analplugIN = 1:analplugIN = 0 & 'Before going to bed, you take out your butt plug and give it a quick wash.'
 	if vibratorIN = 1:vibratorIN = 0 & 'Before going to bed, you take out your vibrator and give it a quick wash.'
 	if pcs_makeup > 1:pcs_makeup = 0 & vidageday -= 1 & 'Your make-up got smeared all over your face while you slept. You realize you really should''ve removed it before going to bed, your skin ages much faster if you don''t take good care of it.'
-	if fat > 5 and stringimplant = 1:silicone += 1 & fat -= 5
+	if fat > 5 and stringimplant = 1: bodyVars['bust_silicone'] += 1 & fat -= 5
 	'You have a good night''s rest. You did not dream of anything.'
 
 	:loopson

locations/pod_whore.qsrc

@@ -75,11 +75,11 @@ if $ARGS[0] = 'setup':
 	!------------------
 	!parameters plus:
 	!silicone
-	if silicone < 20:
+	if bodyVars['bust_silicone'] < 20:
 		money_silicone = 0
-	elseif silicone < 30:
+	elseif bodyVars['bust_silicone'] < 30:
 		money_silicone = 50
-	elseif silicone < 40:
+	elseif bodyVars['bust_silicone'] < 40:
 		money_silicone = 100
 	else
 		money_silicone = 150

locations/post_deliveries.qsrc

@@ -1083,7 +1083,7 @@ if $ARGS[0] = 'bandits':
 				''
 	!!running check
 				begminus = 0
-				if salo > 40: begminus = ((salo - 35)/5)
+				if pcs_mass['body'] > 40: begminus = ((pcs_mass['body'] - 35)/5)
 				begresult = pcs_run - begminus
 				randrun = rand(1, 6)
 				if begresult >= 23 and randrun >= 3:

locations/pre_sleep.qsrc

@@ -150,7 +150,7 @@ if $ARGS[0] = 'prepare_sleep':
 		'You went to bed wearing your makeup, which will smear your face as you sleep; your skin will age faster from this!'
 	end
 
-	if fat > 5 and stringimplant = 1: silicone += 1 & fat -= 5
+	if fat > 5 and stringimplant = 1: bodyVars['bust_silicone'] += 1 & fat -= 5
 
 	xgt 'pre_sleep', 'mod_sleeptriggers'
 

locations/rolanbath.qsrc

@@ -397,8 +397,8 @@ if $ARGS[0] = 'start':
 
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:dynamic $pirManage">Manage Piercings.</a>'
 
-	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & silicone += 10 & gt $loc, $loc_arg">Inject silicone into breast implants.</a>'
-	if fillimplant = 1 and silicone >= 20:'<a href="exec:cls & silicone -= 10 & gt $loc, $loc_arg">Drain silicone from breast implants.</a>'
+	if fillimplant = 1 and siliconeBag >= 1:'<a href="exec:cls & siliconeBag -= 1 & bodyVars[''bust_silicone''] += 10 & gt $loc, $loc_arg">Inject silicone into breast implants.</a>'
+	if fillimplant = 1 and bodyVars['bust_silicone'] >= 20:'<a href="exec:cls & bodyVars[''bust_silicone''] -= 10 & gt $loc, $loc_arg">Drain silicone from breast implants.</a>'
 
 	dynamic $bteeth
 	dynamic $tampon

locations/saveupdater.qsrc

@@ -2359,8 +2359,34 @@ if temp_current_save_version < 00090101:
 
 		killvar 'night_mode'
 	end
+end
 
+!!------------------------------------!!Version 0.9.2.0!!-----------------------------------------------!!
+if temp_current_save_version < 00090200:
+
+	! Body update -- By Anjuna
+	pcs_mass['bust_gen']		= genbsize		& killvar 'genbsize'
+	pcs_mass['bust']			= nbsize		& killvar 'nbsize'
+	pcs_mass['butt_gen']		= 20
+	pcs_mass['butt']			= (20 * salo) / 80
+	pcs_mass['body']			= salo			& killvar 'salo'
+
+	bodyVars['vofat']			= vofat			& killvar 'vofat'
+	bodyVars['vhips']			= vhips			& killvar 'vhips'
+	bodyVars['wratio']			= wratio		& killvar 'wratio'
+	bodyVars['bratio']			= bratio		& killvar 'bratio'
+	bodyVars['hratio']			= hratio		& killvar 'hratio'
+	bodyVars['bust_magic']		= magicf2b		& killvar 'magicf2b'
+	bodyVars['butt_silicone']	= silicone_butt	& killvar 'silicone_butt'
+	bodyVars['bust_silicone']	= silicone		& killvar 'silicone'
+	bodyVars['butt_cheat']		= butt_cheat	& killvar 'butt_cheat'
+	
+	!!update_clothing
+	gs 'tailor2'
 end
+
+
+
 killvar 'temp_current_save_version'
 gs 'saveg'
 

locations/stat.qsrc

@@ -750,11 +750,11 @@ if pcs_energy < 0:
 	pcs_energy = 0
 	pcs_health -= 5
 
-	if salo = 0 and pcs_stren + pcs_vital > 0:
+	if pcs_mass['body'] = 0 and pcs_stren + pcs_vital > 0:
 		stren_deg -= 1
 		vital_deg -= 1
 		pcs_energy += 8
-	elseif salo = 0 and pcs_stren + pcs_vital <= 0:
+	elseif pcs_mass['body'] = 0 and pcs_stren + pcs_vital <= 0:
 		if Enable_nogameover = 0 :
 			over = 3
 			if $loc ! 'gameover': gt 'gameover'
@@ -763,7 +763,7 @@ if pcs_energy < 0:
 			$stat_msg += '<BR><font color=red><B>You starved to death, but Cheat Mode keeps you Alive.</B></font>'
 			fat = 1
 		end
-	elseif salo > 0:
+	elseif pcs_mass['body'] > 0:
 		if cheatNoFat = 0: fat -= 1
 		pcs_energy += 8
 	end

locations/succubus.qsrc

@@ -153,11 +153,11 @@ if $ARGS[0] = 'cikl':
 			vidageday -= 360
 			vidage -= 1
 		end
-		if salo < 60:
-			salo += 2
+		if pcs_mass['body'] < 60:
+			pcs_mass['body'] += 2
 			sucexcess -= 10
-		elseif salo > 60:
-			salo -= 2
+		elseif pcs_mass['body'] > 60:
+			pcs_mass['body'] -= 2
 			sucexcess -= 10
 		end
 

locations/tatiana_lab.qsrc

@@ -326,7 +326,7 @@ if $ARGS[0] = 'Tatiana':
 		$EyeColorTab =   func('tatiana_lab', 'ListBuilder', 'Eye Color',  300, 120,'$eyeColors', 'i',		 'pcs_eyecol',	'eye',	'')
 		$EyeLashTab =	func('tatiana_lab', 'ListBuilder', 'Eye Lashes', 100, 30, '$eyeLashes', 'i',		 'pcs_lashes',	'eye',	'')
 		$LipTab =		func('tatiana_lab', 'ListBuilder', 'Lip Size',   300, 120,'$lipSize',   'i',		 'pcs_lip',	'lip',	'')
-		$BreastTab =	 func('tatiana_lab', 'ListBuilder', 'Breast Size',1000,240,'$breastSize','breastSize','nbsize',		'breasts','magicf2b=0')
+		$BreastTab =	 func('tatiana_lab', 'ListBuilder', 'Breast Size',1000,240,'$breastSize','breastSize','pcs_mass[''bust'']',		'breasts','bodyVars[''bust_magic'']')
 
 		$SkinTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,240,'pcs_skin',1000,'clear','Skin','head',''"">Clear Skin</a>"
 		$VirginTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,120,'pcs_vag',0,'renewed','Virginity','vaginal',''"">Renew Virginity</a>"