Merge remote-tracking branch 'Anjuna/master'

locations/Cheatmenu_din.qsrc

@@ -224,74 +224,76 @@ $cheatmenu['bodyMod'] = {
 	''
 	'You may select from the following sizes:'
 	''
-	if bodset ! 3:
-		'starving (No, you may not select ''starving'', it''s here to show where the scale starts)'
-		''
-		if salocatnow ! 1:
-			'<a href="exec: pcs_mass[''body''] = 20 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 1)]>></a>'
+	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>'
 			''
 		end
-		if salocatnow ! 2:
-			'<a href="exec: pcs_mass[''body''] = 40 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 2)]>></a>'
+		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>'
 			''
 		end
-		if salocatnow ! 3:
-			'<a href="exec: pcs_mass[''body''] = 60 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
+		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>'
 			''
 		end
-		if salocatnow ! 4:
-			'<a href="exec: pcs_mass[''body''] = 80 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
+		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>'
 			''
 		end
-		if salocatnow ! 5:
-			'<a href="exec: pcs_mass[''body''] = 100 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
+		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>'
 			''
 		end
-		if salocatnow ! 6:
-			'<a href="exec: pcs_mass[''body''] = 120 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
+		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>'
 			''
 		end
-		if salocatnow ! 7:
-			'<a href="exec: pcs_mass[''body''] = 140 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
+		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>'
 			''
 		end
-	else
-		if (pregchem < 2688) = 0:
-			'<a href="exec:pregchem = 100 & pregtime = 4 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10))]>></a>'
+		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>'
 			''
 		end
-		if (pregchem >= 2688 and pregchem < 3192) = 0:
-			'<a href="exec:pregchem = 2688 & pregtime = 112 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 1)]>></a>'
+		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>'
 			''
 		end
-		if (pregchem >= 3192 and pregchem < 3696) = 0:
-			'<a href="exec:pregchem = 3192 & pregtime = 133 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 2)]>></a>'
+	else
+		bs_temp_bs_class = func('body_structure', 'get_class', pcs_bmi, strenbuf)
+		'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>'
 			''
 		end
-		if (pregchem >= 3696 and pregchem < 4200) = 0:
-			'<a href="exec:pregchem = 3696 & pregtime = 154 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
+		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>'
 			''
 		end
-		if (pregchem >= 4200 and pregchem < 4704) = 0:
-			'<a href="exec:pregchem = 4200 & pregtime = 175 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
+		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>'
 			''
 		end
-		if (pregchem >= 4704 and pregchem < 5208) = 0:
-			'<a href="exec:pregchem = 4704 & pregtime = 196 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
+		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>'
 			''
 		end
-		if (pregchem >= 5208 and pregchem < 5712) = 0:
-			'<a href="exec:pregchem = 5208 & pregtime = 217 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
+		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>'
 			''
 		end
-		if (pregchem >= 5712 and pregchem < 6216) = 0:
-			'<a href="exec:pregchem = 5712 & pregtime = 238 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
+		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>'
 			''
 		end
-		if (pregchem >= 6216) = 0:
-			'<a href="exec:pregchem = 6216 & pregtime = 259 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 8)]>></a>'
+		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>'
 			''
 		end
+		killvar 'bs_temp_bs_class'
 	end
 
 	'</tr></table></b></center>'

locations/body.qsrc

@@ -99,7 +99,8 @@ end
 
 
 if $ARGS[0] = 'CalcOptBodyMass':
-	result = ((pcs_hgt * pcs_hgt * 225) - 2820000 - 70000 * (pcs_hgt - 165)) / (550 * (60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']))
+	if ARGS[1] = 0: ARGS[1] = 225
+	result = ((pcs_hgt * pcs_hgt * ARGS[1]) - 2820000 - 70000 * (pcs_hgt - 165)) / (550 * (60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']))
 end
 
 

locations/body_structure.qsrc

@@ -98,12 +98,10 @@ end
 
 
 !	Get the appearance bonus
-!	Appearance_bonus = func('body_structure', 'appearance_bonus', pcs_bmi, strenbuf, succubusflag)
+!	Appearance_bonus = func('body_structure', 'appearance_bonus', pcs_bmi, strenbuf)
 if $ARGS[0] = 'appearance_bonus':
 	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
 	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
-	if arrsize('ARGS') = 3: ARGS[3] = succubusflag
-	if ARGS[3] = 1: ARGS[2] = 90
 
 	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
 
@@ -199,25 +197,24 @@ end
 
 
 !	Get the body shape image
-!	$bodyVars['img'] = func('body_structure', 'body_img', pcs_bmi, strenbuf, succubusflag)
+!	$bodyVars['img'] = func('body_structure', 'body_img', pcs_bmi, strenbuf, PregChem)
 if $ARGS[0] = 'body_img':
+	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
+	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
+	if arrsize('ARGS') = 3: ARGS[3] = PregChem
 
 	! =======      Pregnant       ======= !
-	if bdsetlock = 0 and (knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or PregChem > 3600))):
-		if PregChem <= 2687:
+	if bdsetlock = 0 and (knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or ARGS[3] > 3600))):
+		if ARGS[3] <= 2687:
 			$result = 'images/pc/body/shape/default_preg/0.jpg'
-		elseif PregChem <= 6215:
-			$result = 'images/pc/body/shape/default_preg/<<((PregChem - 2184)/504)>>.jpg'
+		elseif ARGS[3] <= 6215:
+			$result = 'images/pc/body/shape/default_preg/<<((ARGS[3] - 2184)/504)>>.jpg'
 		else
 			$result = 'images/pc/body/shape/default_preg/8.jpg'
 		end
 		exit
 	end
 
-	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
-	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
-	if arrsize('ARGS') = 3: ARGS[3] = succubusflag
-	if ARGS[3] = 1: ARGS[2] = 80
 
 	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
 
@@ -337,24 +334,28 @@ end
 
 
 !	Get the body description
-!	$bodyVars['desc'] = func('body_structure', 'body_desc', pcs_bmi, strenbuf, succubusflag)
+!	$bodyVars['desc'] = func('body_structure', 'body_desc', pcs_bmi, strenbuf, PregChem)
 if $ARGS[0] = 'body_desc':
-	if knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or PregChem > 3600)):
-		if PregChem <= 2687:
+	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
+	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
+	if arrsize('ARGS') = 3: ARGS[3] = PregChem
+
+	if knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or ARGS[3] > 3600)):
+		if ARGS[3] <= 2687:
 			$result = 'pregnant, but not showing'
-		elseif PregChem <= 3191:
+		elseif ARGS[3] <= 3191:
 			$result = 'glowing'
-		elseif PregChem <= 3695:
+		elseif ARGS[3] <= 3695:
 			$result = 'starting to show'
-		elseif PregChem <= 4199:
+		elseif ARGS[3] <= 4199:
 			$result = 'clearly showing'
-		elseif PregChem <= 4703:
+		elseif ARGS[3] <= 4703:
 			$result = 'fairly pregnant'
-		elseif PregChem <= 5207:
+		elseif ARGS[3] <= 5207:
 			$result = 'quite pregnant'
-		elseif PregChem <= 5711:
+		elseif ARGS[3] <= 5711:
 			$result = 'very pregnant'
-		elseif PregChem <= 6215:
+		elseif ARGS[3] <= 6215:
 			$result = 'extremely pregnant'
 		else
 			$result = 'ready to pop'
@@ -363,10 +364,6 @@ if $ARGS[0] = 'body_desc':
 	end
 
 
-	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
-	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
-	if arrsize('ARGS') = 3: ARGS[3] = succubusflag
-	if ARGS[3] = 1: ARGS[2] = 80
 
 	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
 

locations/foto_shoot.qsrc

@@ -880,7 +880,8 @@ if $ARGS[0] = 'sportswear':
 	gs 'exp_gain', 'mdlng', rand(2,4)
 	gs 'fame', 'city', 'modelling', 'small'
 	gs 'stat'
-	if bodset = 2 and salocatnow >= 2:
+	temp_bs_class = func('body_structure', 'get_class', pcs_bmi, strenbuf)
+	if temp_bs_class / 100 >= 2 and (temp_bs_class mod 100) >= 8:
 		*clr & cla
 		modelpayfin += 300
 		gs 'stat'
@@ -888,6 +889,7 @@ if $ARGS[0] = 'sportswear':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fitness/FSV<<rand(1,4)>>.jpg"></center>'
 	end
+	killvar 'temp_bs_class'
 	*nl
 	'Modeling sportwear, is slighty different from other jobs. First, you are taken to the near-by Havanna Fitness Center, as the studio doesn''t have all the necessary props to do it. Second, you must look "dynamic", and that means do some warm-ups, and add some oil, to give that "sweaty" and "sporty" look. After that, you are ready to pose the next two hours for the photographer.'
 	*nl
@@ -909,7 +911,8 @@ if $ARGS[0] = 'sports_underwear':
 	gs 'exp_gain', 'mdlng', rand(3,6)
 	if pcs_inhib < 50:inhib_exp += 1
 	gs 'stat'
-	if bodset = 2 and salocatnow >= 2:
+	temp_bs_class = func('body_structure', 'get_class', pcs_bmi, strenbuf)
+	if temp_bs_class / 100 >= 2 and (temp_bs_class mod 100) >= 8:
 		*clr & cla
 		modelpayfin += 325
 		gs 'stat'
@@ -917,6 +920,7 @@ if $ARGS[0] = 'sports_underwear':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fitness/FUV<<rand(1,4)>>.jpg"></center>'
 	end
+	killvar 'temp_bs_class'
 	*nl
 	'Modeling sport underwear, is slighty different from other jobs. First, you are taken to the Havanna Fitness Center, as the studio doesn''t have all the necessary props to do it. Second, you must look "dynamic", and that means do some warm-ups, and add some oil, to give that "sweaty" and "sporty" look. After that, you are ready to pose the next two hours for the photographer.'
 	*nl
@@ -936,7 +940,8 @@ if $ARGS[0] = 'fitness_artistic_nude':
 	gs 'fame', 'city', 'modelling', 'small'
 	inhib_exp += 2
 	gs 'stat'	
-	if bodset = 2 and salocatnow >= 2:
+	temp_bs_class = func('body_structure', 'get_class', pcs_bmi, strenbuf)
+	if temp_bs_class / 100 >= 2 and (temp_bs_class mod 100) >= 8:
 		*clr & cla
 		modelpayfin += 600
 		gs 'stat'
@@ -944,6 +949,7 @@ if $ARGS[0] = 'fitness_artistic_nude':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fitness/FNV<<rand(1,4)>>.jpg"></center>'
 	end
+	killvar 'temp_bs_class'
 	*nl
 	'Already naked, you do some warm-ups, work up a sweat, add some body-oil and step onto the set to begin the shoot.'
 	*nl