Merge remote-tracking branch 'Anjuna/master'

locations/AppearanceSystem.qsrc

@@ -141,9 +141,9 @@ if $ARGS[0] = 'SetBodyShapeBonus':
 		tempBodyShapeBonus = func('body_structure', 'appearance_bonus')
 
 		!!This modifies bodykoef for high or low pcs_mass['body'] values
-		if salocatnow = 0 or salocatnow >= 7:
+		if pcs_mass['body'] < 8 or pcs_mass['body'] >= 98:
 			tempBodyShapeBonus -= 8
-		elseif salocatnow = 1 or salocatnow = 6:
+		elseif pcs_mass['body'] < 23 or pcs_mass['body'] >= 83:
 			tempBodyShapeBonus -= 4
 		end
 

locations/Cheatmenu_din.qsrc

@@ -226,39 +226,39 @@ $cheatmenu['bodyMod'] = {
 	''
 	if knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or PregChem > 3600)):
 		if (pregchem < 2688) = 0:
-			'<a href="exec:pregchem = 100 & pregtime = 4 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 100)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 100"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 100)>></a>'
 			''
 		end
 		if (pregchem >= 2688 and pregchem < 3192) = 0:
-			'<a href="exec:pregchem = 2688 & pregtime = 112 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 2688)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 2688"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 2688)>></a>'
 			''
 		end
 		if (pregchem >= 3192 and pregchem < 3696) = 0:
-			'<a href="exec:pregchem = 3192 & pregtime = 133 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 3192)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 3192"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 3192)>></a>'
 			''
 		end
 		if (pregchem >= 3696 and pregchem < 4200) = 0:
-			'<a href="exec:pregchem = 3696 & pregtime = 154 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 3696)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 3696"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 3696)>></a>'
 			''
 		end
 		if (pregchem >= 4200 and pregchem < 4704) = 0:
-			'<a href="exec:pregchem = 4200 & pregtime = 175 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 4200)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 4200"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 4200)>></a>'
 			''
 		end
 		if (pregchem >= 4704 and pregchem < 5208) = 0:
-			'<a href="exec:pregchem = 4704 & pregtime = 196 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 4704)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 4704"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 4704)>></a>'
 			''
 		end
 		if (pregchem >= 5208 and pregchem < 5712) = 0:
-			'<a href="exec:pregchem = 5208 & pregtime = 217 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 5208)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 5208"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 5208)>></a>'
 			''
 		end
 		if (pregchem >= 5712 and pregchem < 6216) = 0:
-			'<a href="exec:pregchem = 5712 & pregtime = 238 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 5712)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 5712"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 5712)>></a>'
 			''
 		end
 		if (pregchem >= 6216) = 0:
-			'<a href="exec:pregchem = 6216 & pregtime = 259 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 6216)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_preg_body''], 6216"><<func(''body_structure'', ''body_desc'', pcs_bmi, strenbuf, 6216)>></a>'
 			''
 		end
 	else
@@ -266,31 +266,31 @@ $cheatmenu['bodyMod'] = {
 		'starving (No, you may not select ''starving'', it''s here to show where the scale starts)'
 		''
 		if (bs_temp_bs_class / 100) ! 1:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 170) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 17, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 170"><<func(''body_structure'', ''body_desc'', 17, strenbuf)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 2:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 200) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 20, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 200"><<func(''body_structure'', ''body_desc'', 20, strenbuf)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 3:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 230) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 23, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 230"><<func(''body_structure'', ''body_desc'', 23, strenbuf)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 4:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 270) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 27, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 270"><<func(''body_structure'', ''body_desc'', 27, strenbuf)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 5:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 320) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 32, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 320"><<func(''body_structure'', ''body_desc'', 32, strenbuf)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 6:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 370) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 37, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 370"><<func(''body_structure'', ''body_desc'', 37, strenbuf)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 7:
-			'<a href="exec: pcs_mass[''body''] = func(''body'', ''CalcOptBodyMass'', 420) & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<func(''body_structure'', ''body_desc'', 42, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 420"><<func(''body_structure'', ''body_desc'', 42, strenbuf)>></a>'
 			''
 		end
 		killvar 'bs_temp_bs_class'
@@ -299,6 +299,23 @@ $cheatmenu['bodyMod'] = {
 	'</tr></table></b></center>'
 }
 
+$cheatmenu['set_preg_body'] = {
+	pregchem = ARGS[0]
+	pregtime = ARGS[0] / 24
+	gs 'body', 'reset_preg_mass'
+	gs 'body', 'softreset'
+	gs 'stat'
+	dynamic $cheatmenu['bodyMod']
+}
+
+$cheatmenu['set_body_class'] = {
+	pcs_mass['body'] = func('body', 'CalcOptBodyMass', ARGS[0])
+	gs 'body', 'softreset'
+	gs 'stat'
+	dynamic $cheatmenu['bodyMod']
+}
+
+
 $cheatmenu['addict'] = {
 	if drugVars['cheat_immune'] = 0:
 		drugVars['cheat_immune'] = 1

locations/NikoEv2.qsrc

@@ -718,7 +718,7 @@ if $ARGS[0] = 'Diner 1':
 									'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/blonde/15.jpg"></center>'
 									'"Wow, she walks around like that?" one of the bikers asks.'
 									'"Well she''s obviously a slut looking for customers," another replies.'
-									if salocatnow >= 5:
+									if pcs_bmi >= 26:
 										'"A slut, huh?" a trucker asks. "She looks more like a cow to me."'
 										'"Yeah, she looks like my old lady," another biker says. "But a pussy''s a pussy, I guess."'
 									else

locations/NikoWhore.qsrc

@@ -152,7 +152,7 @@ if $ARGS[0] = 'Locker Room':
 															'"I told you she was a freak! She loves getting fucked. She was basically begging me to fuck her ass!" Dan laughs.'
 															'"Come on guys, we already have Sonia. We don''t need <<$pcs_nickname>> too," Vasily responds.'
 															'"She might be Sonia 2.0! It would be wrong for us <i>not</i> to show her off. Now is the perfect time too. The boys are still on the stairwell," Dan adds.'
-															if hotcat >= 7 and salocatnow < 5:
+															if hotcat >= 7 and pcs_bmi <= 25:
 																'"That sounds like a great idea. <<$pcs_nickname>> is much hotter than Sonia anyway. Let''s do it," Vitek responds before pulling you to your feet. "You''re coming with us."'
 															else
 																'"That sounds like a great idea. She looks like an overgrown pig, but we can always fuck her from behind. Alright, let''s do it," Vitek responds before pulling you to your feet. "You''re coming with us."'
@@ -331,7 +331,7 @@ if $ARGS[0] = 'Exposed':
 	'"What the fuck was she thinking? Why would she do this to herself? Is she that desperate for dick?" Lariska asks.'
 	'"I always thought she was a nice girl, but I guess she was just a whore all along. She hid it well," Lina responds.'
 	'Christina laughs. "You''re both so stupid! I knew she was a fucking whore all along, you just have to look at how she acts. So weak and pathetic and eager to please any boy that paid any attention to her." You hear several of the other girls agree with her.'
-	if hotcat >= 6 and salocatnow < 5:
+	if hotcat >= 6 and pcs_bmi <= 25:
 		'"Fuck yeah! I''ve been wanting to fuck <<$pcs_nickname>> since I first saw her drop that chalk in math class!" Roman laughs.'
 	else
 		'"I always thought about what it would be like to fuck <<$pcs_firstname>> since I first saw her drop that chalk in math class. If only she wasn''t so ugly..." Roman laughs.'

locations/body.qsrc

@@ -32,6 +32,13 @@
 !! imgset6ovr[x] and imgset7ovr[x] = a flag to indicate that an image set (x) has its own image 6 and/or 7
 !! extended lash functionality; pcs_lashes = n are: {2, largest natural size}, {3, with temporary false lashes on or basic 2D lash extensions}, {4, with ornate false lashes on or lavish 4D extensions}, {5, with extremely ornate, 6D-style extensions} - xerya
 
+
+!! Pregnancy weight gain:
+!! Weight gain in the first 5 weeks (roughly pregChem < 800. -> Pregtime = pregchem / 24) is negligable
+!! Afterwards we approximate the weight gain as mass = ((pregChem - 800)^2 * 33 / (7000 - 800)^2) approx (pregChem - 800)^2 / (1080)^2
+
+
+
 if $ARGS[0] = 'RegularUpdate':
 	if dounspell = 0:
 		gs 'body', 'UpdateBodyMeasurement'
@@ -58,7 +65,7 @@ if $ARGS[0] = 'UpdateBodyMeasurement':
 	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'] + max(-10, min(bodyVars['bust_other'], 10))
+	pcs_bust  = (pcs_waist * bodyVars['bratio']) / 100 + pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] + max(-10, min(bodyVars['bust_other'], 10)) + pcs_mass['preg'] / 5
 	pcs_butt  = min(pcs_mass['butt'], 50) + bodyVars['butt_bonus'] + bodyVars['butt_silicone'] + bodyVars['butt_cheat'] + pcs_butt_tr + max(-10, min(bodyVars['butt_other'], 10))
 
 	!! pcs_cupsize = pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] - bodyVars['vofat']
@@ -71,7 +78,7 @@ if $ARGS[0] = 'CalcWeight':
 	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 = (2820 + 33 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']) + 70 * (pcs_hgt - 165)) / 100
+	result = (2820 + 33 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt'] + pcs_mass['preg']) + 70 * (pcs_hgt - 165)) / 100
 
 	!{Do not remove (julzor)
 	This is the old more complex function, but it doesn''t work correctly.
@@ -83,7 +90,7 @@ end
 
 if $ARGS[0] = 'CalcWeight2':
 	!! weight2 = 10 * weight
-	result = (2820 + 33 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']) + 70 * (pcs_hgt - 165)) / 10
+	result = (2820 + 33 * (pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt'] + pcs_mass['preg']) + 70 * (pcs_hgt - 165)) / 10
 	!result = (pcs_hgt * 62 / 17) + (10 * (vhips + (bodyVars['vofat'] * 2))) / 4 + 10 * tits
 end
 
@@ -322,15 +329,44 @@ if $ARGS[0] = 'Update_Body':
 	if bodyresetflag = 1 or cheatNoFat = 1:
 		fat = 0
 	else
-		if fat > (17 + vitalbuf / 25):
-			pcs_mass['body'] += 1
-			fat = 0
-		elseif fat < -(2 + vitalbuf / 10):
-			pcs_mass['body'] -= 1
-			fat = 0
+		if pregChem >= 800 and (pregChem - 800)*(pregChem - 800) >= bodyVars['pchem_next']:
+			pcs_mass['preg'] += 1
+			bodyVars['pchem_next'] += 1166400	& !! 1080 * 1080
+		elseif bodyVars['pchem_next'] > 0 and bodyVars['pchem_next'] - 1166400 >= (pregChem - 800) * (pregChem - 800):
+			if pcs_mass['preg'] > 0:
+				pcs_mass['preg'] -= 1
+				bodyVars['pchem_next'] -= 1166400	& !! 1080 * 1080
+			else
+				pcs_mass['preg'] = 0
+				bodyVars['pchem_next'] = 0
+			end
+		end
+		if pregChem >= 800:
+			if fat > (12 + vitalbuf / 25):
+				pcs_mass['body'] += 1
+				fat = 0
+			elseif fat < -(7 + vitalbuf / 10):
+				pcs_mass['body'] -= 1
+				fat = 0
+			else
+				if fat < 0:
+					fat = fat / 2
+				else
+					fat = fat / 6
+				end
+			end
 		else
-			fat = fat / 4
+			if fat > (17 + vitalbuf / 25):
+				pcs_mass['body'] += 1
+				fat = 0
+			elseif fat < -(2 + vitalbuf / 10):
+				pcs_mass['body'] -= 1
+				fat = 0
+			else
+				fat = fat / 4
+			end
 		end
+
 	end
 
 	!!This is the pcs_mass['body'] cap for the weight approximation
@@ -379,9 +415,9 @@ if $ARGS[0] = 'Update_Body':
 
 	!!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:
+!	if salolast > pcs_mass['body'] + pcs_mass['butt'] and pcs_mass['body'] + pcs_mass['butt'] <= (20 * (salocatnow - 1)) + 12:
 !		bodyVars['weight_warning'] = 1
-!	elseif salolast < pcs_mass['body'] and pcs_mass['body'] >= (20 * (salocatnow + 1)) - 12:
+!	elseif salolast < pcs_mass['body'] + pcs_mass['butt'] and pcs_mass['body'] + pcs_mass['butt'] >= (20 * (salocatnow + 1)) - 12:
 !		bodyVars['weight_warning'] = 2
 !	end
 
@@ -398,7 +434,7 @@ if $ARGS[0] = 'Update_Body':
 	!!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 < pcs_mass['body'] and pcs_mass['body'] >= (20 * (salocatnow + 1)) - 11:
+		if tits < 10 and salolast < pcs_mass['body'] + pcs_mass['butt'] and pcs_mass['body'] + pcs_mass['butt'] >= (20 * (salocatnow + 1)) - 11:
 			if mgf2bnocnt < 3:
 				magf2bdo = 2
 			else
@@ -412,8 +448,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 > pcs_mass['body']: salolast -= 1
-	if salolast < pcs_mass['body']: salolast += 1
+	if salolast > pcs_mass['body'] + pcs_mass['butt']: salolast -= 1
+	if salolast < pcs_mass['body'] + pcs_mass['butt']: salolast += 1
 
 	!!Setting the pcs_apprnc bonus based on fat and strength
 	temp_bmi = func('body', 'CalcBMI2')
@@ -750,6 +786,17 @@ if $ARGS[0] = 'Reset_mass_distribution':
 	gs 'body', 'Update_vhips'
 end
 
+if $ARGS[0] = 'Reset_preg_mass':
+	bodyVars['pchem_next'] = 0
+	pcs_mass['preg'] = 0
+	:set_preg_body_loop
+	if pregChem >= 800 and (pregChem - 800) * (pregChem - 800) >= bodyVars['pchem_next']:
+		bodyVars['pchem_next'] += 1166400	& 1080 * 1080
+		pcs_mass['preg'] += 1
+		jump 'set_preg_body_loop'
+	end
+end
+
 
 if $ARGS[0] = 'Set_mass_distribution_using_body':
 	pcs_mass['body'] = ARGS[1]
@@ -847,7 +894,7 @@ if $ARGS[0] = 'softreset':
 	!!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 pcs_mass['body'] ! salolast:
+	if pcs_mass['body'] + pcs_mass['butt'] ! salolast:
 		if gamestartflag = 1:
 			salobustdo = 1
 		end
@@ -884,14 +931,14 @@ if $ARGS[0] = 'hardreset':
 		gs 'body', 'Update_Body'
 
 		pcs_mass['body'] = 60 + (2 * pcs_hips) - (pcs_hgt * bodyVars['hratio']) / 50
-		if pcs_mass['body'] < 10:
+		if pcs_mass['body'] + pcs_mass['butt'] < 10:
 			salocatnow = 0
 		else
-			salocatnow = 1 + (pcs_mass['body'] - 10) / 20
+			salocatnow = 1 + (pcs_mass['body'] + pcs_mass['butt'] - 10) / 20
 		end
 
 		salocatlast = salocatnow
-		salolast = pcs_mass['body']
+		salolast = pcs_mass['body'] + pcs_mass['butt']
 
 		if pcs_mass['butt_gen'] = 0:
 			pcs_mass['butt_gen'] = 20
@@ -917,6 +964,8 @@ if $ARGS[0] = 'hardreset':
 		pcs_mass['bust_message'] = pcs_mass['bust']
 		pcs_mass['butt_message'] = pcs_mass['butt']
 
+		gs 'body', 'reset_preg_mass'
+
 		bodyresetflag = 0
 		normbuffpick = 0
 		bodyVars['weight_warning'] = 0

locations/foto_shoot.qsrc

@@ -228,7 +228,7 @@ if $ARGS[0] = 'glamour_shoot':
 	act 'Sexy clothing':
 		*clr & cla
 		$modelfoto['shoot_type'] = 'sexy_clo'
-		if modelfoto['sexy'] >= 10 and modelfoto['trans_ling'] + modelfoto['trans_ling'] < 1 and modelfoto['nip'] < 1 and modelfoto['nude'] < 1: gt'foto_events','trans_persuasion'
+		if modelfoto['sexy'] >= 10 and modelfoto['transparent'] + modelfoto['trans_ling'] < 1 and modelfoto['nip'] < 1 and modelfoto['nude'] < 1: gt'foto_events','trans_persuasion'
 		if pcs_inhib < 30:
 			if modelfoto['sexy'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'

locations/gschool_lessons4.qsrc

@@ -225,7 +225,7 @@ if $ARGS[0] = 'math':
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
 			'The day seems to be dragging in and you find yourself constantly staring at the clock, waiting for the class to finally be over. You decide to play on your phone to pass the time.'
-		    if VK = 1 and (christinaQW['fight'] = -1 or christinaQW['subpath'] >= 2) and salocatnow >= 5:
+		    if VK = 1 and (christinaQW['fight'] = -1 or christinaQW['subpath'] >= 2) and pcs_bmi >= 25:
 				gs 'npc_relationship', 'modify', 'A18', 'loathe'
 				'As you''re browsing the web, you receive a text message from Christina reading; "Hey there piggy, are you looking up discounts on Peremech so that you can shove them down your throat? Why don''t you lose some weight before the teachers decide to add bovine etiquette to the curriculum because they may feel it necessary to teach the students how to talk to a cow like you?" You can feel your face flushing in embarrassment while reading Christina''s hurtful comments. You quickly turn off your phone and try not to make eye contact with Christina for the rest of the lesson.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'

locations/pav_shared_nestor.qsrc

@@ -128,18 +128,18 @@ if $ARGS[0] = 'nestor_Chat':
 		if say = 1:
 			if $clothingworntype = 'nude':
 				'<<$npc_firstname[$boy]>> is scanning your nude body with his eyes.'
-				if salocatnow <= 2:
+				if pcs_bmi <= 18:
 					'He obviously enjoys the sight: <font color=#<<$nestor_font>>>"Nice body <<$pcs_firstname>>. Are you here to offer it?"</font>'
-				elseif salocatnow > 2 and salocatnow <= 4:
+				elseif pcs_bmi <= 25:
 					'He is not very content with the sight: <font color=#<<$nestor_font>>>"You should lose some weight, <<$pcs_firstname>>, you are getting fat."</font>'
 				else
 					'He seems almost disgusted by the sight: <font color=#<<$nestor_font>>>"Jeezus <<$pcs_firstname>>, stop eating you are beginning to look like an elephant!"</font>'
 				end
 				!panties on
-				if salocatnow <= 4 and $pantyworntype ! 'none':
+				if pcs_bmi <= 25 and $pantyworntype ! 'none':
 					'<font color=#<<$nestor_font>>>"Why did you leave those panties on <<$pcs_firstname>>? Such a shame."</font>'
 				!panties off, anal plug
-				elseif salocatnow <= 4 and $pantyworntype = 'none' and analplugIN = 1:
+				elseif pcs_bmi <= 25 and $pantyworntype = 'none' and analplugIN = 1:
 					'As you accidentally turn around, he gazes between your asscheeks on the plug stuck in your ass.'
 					'<font color=#<<$nestor_font>>>"Wow, you just can''t be a second without something filling your holes, do you?"</font>'
 					if rand(0, 100) < 30:
@@ -149,14 +149,14 @@ if $ARGS[0] = 'nestor_Chat':
 				end
 			elseif CloBimbo = 1:
 				'<<$npc_firstname[$boy]>> is scanning your outfit with his eyes.'
-				if salocatnow <= 4:
+				if pcs_bmi <= 25:
 					'<font color=#<<$nestor_font>>>"You know I like when you dress like a mindless bimbo. Not that you aren''t, but anyway, good job!"</font>'
 				else
 					'<font color=#<<$nestor_font>>>"I like girls dressed like bimbos, but they should have the body shape for it. Waste of good clothes on you."</font>'
 				end
 			elseif CloStyle = 4:
 				'<<$npc_firstname[$boy]>> is scanning your outfit with his eyes.'
-				if salocatnow <= 4:
+				if pcs_bmi <= 25:
 					'<font color=#<<$nestor_font>>>"Only thing that I like more than stupid bimbos are whores. I won''t pay you anyway, but good job!"</font>'
 				else
 					'<font color=#<<$nestor_font>>>"I literally love whores, but with your body shape you won''t be earning much money, darling."</font>'

locations/pav_shared_oleg.qsrc

@@ -56,9 +56,9 @@ if $ARGS[0] = 'oleg_Chat':
 			!clothing and bodyshape reactions
 			if $clothingworntype = 'nude':
 				'<<$npc_firstname[$boy]>> is looking at your nude body with obvious shame, blurring.'
-				if salocatnow <= 1:
+				if pcs_bmi <= 15:
 					'He is not very content with the sight: <font color=#<<$oleg_font>>>"<<$pcs_firstname>>, you should eat more, it is unhealthy to be too thin."</font>'
-				elseif salocatnow > 1 and salocatnow <= 4:
+				elseif pcs_bmi <= 25:
 					'Even though he is ashamed, he is obviously pleased with the sight: <font color=#<<$oleg_font>>>"<<$pcs_firstname>>, you have a beautiful body you know... But please, put on some clothes!"</font>'
 				else
 					'He is not very content with the sight: <font color=#<<$oleg_font>>>"<<$pcs_firstname>>, you should eat less, it is unhealthy to be too fat."</font>'
@@ -79,14 +79,14 @@ if $ARGS[0] = 'oleg_Chat':
 				end
 			elseif CloBimbo = 1:
 				'<<$npc_firstname[$boy]>> is looking at your outfit with suspicion.'
-				if salocatnow >= 1 and salocatnow <= 4:
+				if pcs_bmi >= 12 and pcs_bmi <= 25:
 					'<font color=#<<$oleg_font>>>"You know nice girls like you should not wear so skimpy dresses. Some people can''t hold themselves, you know?"</font>'
 				else
 					'<font color=#<<$oleg_font>>>"Girls should not wear so skimpy dresses, it may be offending to other people, you know?"</font>'
 				end
 			elseif CloBimbo = 4:
 				'<<$npc_firstname[$boy]>> is looking at your outfit with suspicion.'
-				if salocatnow <= 4:
+				if pcs_bmi <= 25:
 					'<font color=#<<$oleg_font>>>"You know nice girls like you should not dress like whores. Some people can''t know that they actually are not, you know?"</font>'
 				else
 					'<font color=#<<$oleg_font>>>"Girls should not dress like a whores when they aren''t."</font>'

locations/pav_shared_yakov.qsrc

@@ -56,9 +56,9 @@ if $ARGS[0] = 'yakov_Chat':
 			!clothing and bodyshape reactions
 			if $clothingworntype = 'nude':
 				'<<$npc_firstname[$boy]>> is looking at your nude body wondering...'
-				if salocatnow <= 1:
+				if pcs_bmi <= 15:
 					'He is not very content with the sight: <font color=#<<$yakov_font>>>"<<$pcs_firstname>>, are you not anorexic? Better not, it is a terrible thing."</font>'
-				elseif salocatnow > 1 and salocatnow <= 3:
+				elseif pcs_bmi >= 15 and pcs_bmi <= 20:
 					'<font color=#<<$yakov_font>>>"<<$pcs_firstname>>, you have nice bodyshape you know. Do you exercise or are you mp4ten from nature?"</font>'
 				else
 					'He is not very content with the sight: <font color=#<<$yakov_font>>>"<<$pcs_firstname>>, you should eat less, too much body fat is bad for your sports performance."</font>'
@@ -83,14 +83,14 @@ if $ARGS[0] = 'yakov_Chat':
 				end
 			elseif CloBimbo = 1:
 				'<<$npc_firstname[$boy]>> is looking at your outfit with suspicion.'
-				if salocatnow >= 1 and salocatnow <= 4:
+				if pcs_bmi >= 12 and pcs_bmi <= 25:
 					'<font color=#<<$yakov_font>>>"What a sexy dress are you wearing! Aren''t you afraid it is too sexy for some people in the town, though?"</font>'
 				else
 					'<font color=#<<$yakov_font>>>"Nice dress sweetie, but it would look better if you lost some fat, you know..."</font>'
 				end
 			elseif CloStyle = 4:
 				'<<$npc_firstname[$boy]>> is looking at your outfit with suspicion.'
-				if salocatnow <= 4:
+				if pcs_bmi <= 25:
 					'<font color=#<<$yakov_font>>>"I love sexy dresses on you sweetie, but this one makes you look like a... playgirl if you know what I mean."</font>'
 				else
 					'<font color=#<<$yakov_font>>>"Sweetie this dress one makes you look like a... playgirl if you know what I mean."</font>'