[fixes] pcs_weight in body and body_shape

[fixes] copy&paste error in down, nord and street

locations/Nord.qsrc

@@ -132,7 +132,7 @@ if $ARGS[0] = 'redlight':
 	if hour >= 20 or hour <= 4:
 		*nl
 		'There are prostitutes working in places near here.'
-		if pcs_makeup > 2 and PCloStyle = 4 and if pcs_inhib >= 40:
+		if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40:
 			act 'Prostitute yourself': gt 'street_walker', 'work'
 		end
 	end

locations/body.qsrc

@@ -263,7 +263,6 @@ if dounspell = 0:
 	pcs_butt = (pcs_hips / 10) + silicone_butt
 	pcs_cupsize = pcs_bust - pcs_band
 
-
 !! If the PC has vastly less breast tissue than she does silicone, use a slightly more derogatory term. There is actually not a great way to calculate this; silicone counts almost the same on all body types, even though an increase of 200cc, for example, would be vastly
 !! 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
@@ -448,12 +447,21 @@ if dounspell = 0:
 		if pcdesc_breastimplantcheck = 0:$pcdesc_breastswordy = 'ridiculously big and figure-dominating <<$pcdesc_breastsword>>'
 		$pcdesc_breasts = 'whorishly oversized'
 	end
+
+!!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.
+!!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. 
+	
+	pcs_weight = 30 + salo / 2 + (pcs_hgt - 170) * 7 / 10
 	
-!! This sets weight
-!! This variable is actually only used ONCE (apart from the BMI), 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
-	pcs_weight = (pcs_hgt * 62 / 170) + (vhips + (vofat * 2)) / 4 + tits
+!!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
 	
+	!!pcs_weight = (pcs_hgt * 62 / 170) + (vhips + (vofat * 2)) / 4 + tits
+		
 !!BMI Calculation
 	bmi_calc = 10000 * pcs_weight / (pcs_hgt * pcs_hgt)
 	

locations/body_shape.qsrc

@@ -116,6 +116,9 @@ if $ARGS[0] = '':
 		if fat < (-2 - (vitalbuf / 10)): salo -= 1 & fat = 0
 	end
 
+!!This is the salo cap for the weight approximation
+	if salo > 150: salo = 150
+	
 !!This calculates the current salo category; ranges are 20 points, seemed to balance best if the range is x10 the hip devisor
 	:salocatloop
 	if salo < 10:
@@ -380,7 +383,42 @@ if $ARGS[0] = 'initial':
 		tits = 11
 		$titsize = 'K cup'
 	end
-	pcs_weight = (pcs_hgt * 62 / 170) + (vhips + (vofat * 2)) / 4 + tits
+		
+!!pcs_weight: Svetas weight in kg 
+!!Optimal Weight for a 170cm sveta (BMI: 20.76): 60 salo / 60kg
+!!This is an approximation, so that a sveta with a different height has the same BMI for the same salo values.
+!!The default height of 170 cm is used as a starting point for the approximation. The BMI deviates by 0.06 for a deviation of 10cm and 0.4 for a deviation of 20cm. 
+	
+	pcs_weight = 30 + salo / 2 + (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
+	
+	!!pcs_weight = (pcs_hgt * 62 / 170) + (vhips + (vofat * 2)) / 4 + tits
+	
+!!BMI Calculation
+	bmi_calc = 10000 * pcs_weight / (pcs_hgt * pcs_hgt)
+	
+!!BMI Descriptions
+	if bmi_calc < 16:
+		$bmi_desc = 'You are severely underweight.'
+	elseif bmi_calc >= 16 and bmi_calc < 19:
+		$bmi_desc = 'You are underweight'
+	elseif bmi_calc >= 19 and bmi_calc < 25:
+		$bmi_desc = 'You have a normal, healthy weight.'
+	elseif bmi_calc >= 25 and bmi_calc < 30:
+		$bmi_desc = 'You are overweight.'
+	elseif bmi_calc >= 30 and bmi_calc < 35:
+		$bmi_desc = 'You are moderately obese.'
+	elseif bmi_calc >= 35 and bmi_calc < 40:
+		$bmi_desc = 'You are severely obese.'
+	elseif bmi_calc >= 40 and bmi_calc < 45:
+		$bmi_desc = 'You are very severely obese.'
+	elseif bmi_calc >= 45:
+		$bmi_desc = 'You are morbidly obese.'
+	end
 end
 
 !!This is the calculation for the base appearance

locations/down.qsrc

@@ -230,7 +230,7 @@ end
 if hour >= 20 or hour <= 4:
 	*nl
 	'There are prostitutes working in places near here.'
-	if pcs_makeup > 2 and PCloStyle = 4 and if pcs_inhib >= 40:
+	if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40:
 		act 'Prostitute yourself': gt 'street_walker', 'work'
 	end
 end

locations/street.qsrc

@@ -157,7 +157,7 @@ if hour >= 8 and hour <= 23 or saunaWorkWhore > 0 or workDisk = 2:'<a href="exec
 if hour >= 20 or hour <= 4:
 	*nl
 	'There are prostitutes working in places near here.'
-	if pcs_makeup > 2 and PCloStyle = 4 and if pcs_inhib >= 40:
+	if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40:
 		act 'Prostitute yourself': gt 'street_walker', 'work'
 	end
 end