|
@@ -379,9 +379,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 +398,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 +412,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')
|
|
@@ -847,7 +847,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 +884,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
|