1
0
Răsfoiți Sursa

[fixed] body_structure now takes your succubus state into account

anjuna krokus 5 luni în urmă
părinte
comite
7ec883d30f

+ 1 - 5
locations/AppearanceSystem.qsrc

@@ -138,11 +138,7 @@ if $ARGS[0] = 'SetBodyShapeBonus':
 
 	!!Setting the pcs_apprnc bonus based on fat and strength
 	else
-		if succubusflag = 1:
-			temp_BodyShapeBonus = func('body_structure', 'appearance_bonus', pcs_bmi, 80)
-		else
-			temp_BodyShapeBonus = func('body_structure', 'appearance_bonus', pcs_bmi, strenbuf)
-		end
+		temp_BodyShapeBonus = func('body_structure', 'appearance_bonus', pcs_bmi, strenbuf, succubusflag)
 
 		!!This modifies bodykoef for high or low pcs_mass['body'] values
 		if salocatnow = 0 or salocatnow >= 7:

+ 1 - 2
locations/_body_image.qsrc

@@ -6,8 +6,7 @@
 
 $body_image_msg = ''
 if $ARGS[0] = 'body':
-	!!!! $result = func('body_bmi_stren', 'body_img', pcs_bmi, 'strenbuf')
-	$bodyVars['img'] = func('body_structure', 'body_img', pcs_bmi, strenbuf)
+	$bodyVars['img'] = func('body_structure', 'body_img', pcs_bmi, strenbuf, succubusflag)
 	$result = $bodyVars['img']
 	$body_image_msg += 'You are <<pcs_hgt>>cm tall and <<$bodyVars[''desc'']>>'
 end

+ 5 - 3
locations/body.qsrc

@@ -180,9 +180,10 @@ if $ARGS[0] = 'UpdateBodyImage':
 		salocatnow = (pcs_hips / 10) - 5
 	end
 
-	$bodyVars['desc'] = func('body_structure', 'body_desc', pcs_bmi, strenbuf)
-	$bodyVars['img'] = func('body_structure', 'body_img', pcs_bmi, strenbuf)
-	$bodyVars['bmi_desc'] = func('body_structure', 'bmi_desc', pcs_bmi, strenbuf)
+
+	$bodyVars['desc']     = func('body_structure', 'body_desc', pcs_bmi, strenbuf, succubusflag)
+	$bodyVars['img']      = func('body_structure', 'body_img',  pcs_bmi, strenbuf, succubusflag)
+	$bodyVars['bmi_desc'] = func('body_structure', 'bmi_desc',  pcs_bmi, strenbuf, succubusflag)
 end
 
 
@@ -728,6 +729,7 @@ if $ARGS[0] = 'Reset_mass_distribution':
 	pcs_mass['butt_last']  = pcs_mass['body']
 
 	killvar 'total_mass'
+	killvar 'total_gen_mass'
 
 	gs 'body', 'Update_vhips'
 end

+ 1 - 1
locations/body_desc.qsrc

@@ -186,7 +186,7 @@ if $ARGS[0] = 'anus':
 end
 
 if $ARGS[0] = 'BMI':
-	$bodyVars['bmi_desc'] = func('body_structure', 'bmi_desc', pcs_bmi, strenbuf)
+	$bodyVars['bmi_desc'] = func('body_structure', 'bmi_desc', pcs_bmi)
 end
 
 if $ARGS[0] = 'breasts':

+ 11 - 2
locations/body_structure.qsrc

@@ -62,8 +62,8 @@ end
 
 if $ARGS[0] = 'bmi_desc':
 	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
-	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
-	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
+
+	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], 30)
 
 	if bs_temp_bs_class < 100:
 		$result = 'You are severely underweight.'
@@ -92,6 +92,9 @@ end
 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] = 80
+
 	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
 
 	if bs_temp_bs_class < 100:
@@ -181,6 +184,9 @@ 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] = succubusflag
+	if ARGS[3] = 1: ARGS[2] = 80
+
 	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
 
 	if bdsetlock = 1:
@@ -283,6 +289,9 @@ if $ARGS[0] = 'body_desc':
 
 	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])
 
 	! starving: