Browse Source

[added/fixed] Updated saveupdater to use the correct calculation for bodymass. Should prevent large jumps in weights. Updated all intros to use the new body weight values. Added the option to set your genetic butt size in intro_customization. Removed a floating tab from intro_sg_select_custom

anjuna krokus 5 months ago
parent
commit
3faf39f0cc

+ 2 - 2
locations/body.qsrc

@@ -905,8 +905,8 @@ end
 if $ARGS[0] = 'initial':
 	!!	Sets the genetic bust size if it was not set in the start routines
 	if pcs_mass['bust_gen'] = 0: pcs_mass['bust_gen'] = 12
-	pcs_mass['bust'] = pcs_mass['bust_gen']
-	pcs_mass['butt'] = pcs_mass['butt_gen']
+	
+	gs 'body', 'Set_mass_distribution_using_body', pcs_mass['body']
 
 	agilbuf = pcs_agil
 	strenbuf = pcs_stren

+ 18 - 18
locations/intro_city_select.qsrc

@@ -422,7 +422,7 @@ if $ARGS[0] = 'nerdqueen':
 		!!d cup for ideal bmi
 		pcs_mass['bust_gen'] = 22
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 87
+		pcs_mass['body'] = 65
 		willpowermax = 70
 		gs 'grades', 'grade_award', 'school', 'math', 85
 		gs 'grades', 'grade_award', 'school', 'rus', 90
@@ -462,7 +462,7 @@ if $ARGS[0] = 'goodstudent':
 		!!c cup for ideal bmi
 		pcs_mass['bust_gen'] = 18
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 93
+		pcs_mass['body'] = 70
 		gs 'npc_relationship', 'socialgroup_setting', 0, 0, 5, 0, 0, 20
 		npc_rel['A29'] += 20
 		if player_avatar ! 1: pcs_hairlng = 200
@@ -502,7 +502,7 @@ if $ARGS[0] = 'computergeek':
 		internet = 20
 		pcs_skin = 500
 		pcs_teeth = 1
-		pcs_mass['body'] = 56
+		pcs_mass['body'] = 42
 		pcs_inhib = 20
 		npc_rel['A152'] += 10
 		npc_rel['A153'] += 10
@@ -542,7 +542,7 @@ if $ARGS[0] = 'chessplayer':
 		pcs_react = 45
 		pcs_chess = 40
 		pcs_skin = 600
-		pcs_mass['body'] = 97
+		pcs_mass['body'] = 73
 		pcs_inhib = 15
 		chessyear = year
 		chessmonth = month
@@ -630,7 +630,7 @@ if $ARGS[0] = 'volleyball':
 		!!c cup for ideal bmi
 		pcs_mass['bust_gen'] = 17
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 75
+		pcs_mass['body'] = 56
 		pcs_vball = 50
 		gsAboVolley += 30
 		npc_rel['A13'] += 10
@@ -671,7 +671,7 @@ if $ARGS[0] = 'dancer':
 		pcs_skin = 700
 		pcs_teeth = -1
 		pcs_tan = 5
-		pcs_mass['body'] = 50
+		pcs_mass['body'] = 37
 		if player_avatar = 0:
 			pcs_hairlng = 200
 			pcs_eyesize = 2
@@ -718,7 +718,7 @@ if $ARGS[0] = 'runner':
 		pcs_vital = 55
 		pcs_agil = 55
 		pcs_inhib = 25
-		pcs_mass['body'] = 60
+		pcs_mass['body'] = 45
 		pcs_run = 55
 		gsAboBeg += 30
 		npc_rel['A3'] += 10
@@ -760,7 +760,7 @@ if $ARGS[0] = 'football':
 		!!c cup for ideal bmi
 		pcs_mass['bust_gen'] = 17
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 80
+		pcs_mass['body'] = 60
 		pcs_kick = 20
 		pcs_ftbll = 55
 		npc_rel['A131'] += 10
@@ -835,7 +835,7 @@ if $ARGS[0] = 'socialite':
 		!!c cup for ideal bmi
 		pcs_mass['bust_gen'] = 18
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 80
+		pcs_mass['body'] = 60
 		pcs_humint = 40
 		pcs_makupskl = 40
 		pcs_heels = 30
@@ -892,7 +892,7 @@ if $ARGS[0] = 'beautiful':
 		!!d cup for ideal bmi
 		pcs_mass['bust_gen'] = 22
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 75
+		pcs_mass['body'] = 56
 		pcs_inhib = 25
 		mc_inventory['cosmetics'] = 50
 		mc_inventory['eyelash_fake'] =  10
@@ -990,7 +990,7 @@ if $ARGS[0] = 'gopnikstart':
 		pcs_punch = 35
 		pcs_kick = 35
 		pcs_def = 35
-		pcs_mass['body'] = 86
+		pcs_mass['body'] = 65
 		school_clothing = 5
 		npc_rel['A9'] += 10
 		npc_rel['A10'] += 10
@@ -1039,7 +1039,7 @@ if $ARGS[0] = 'troublemaker':
 		pcs_def = 20
 		pcs_humint = 10
 		pcs_persuas = 10
-		pcs_mass['body'] = 65
+		pcs_mass['body'] = 49
 		pirsD = 4
 		PirsD4_owned = 1
 		$currentpursetype = 'dolls'
@@ -1100,7 +1100,7 @@ if $ARGS[0] = 'alternative':
 		!!c cup for ideal bmi
 		pcs_mass['bust_gen'] = 18
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 75
+		pcs_mass['body'] = 56
 		pcs_chrsm = 35
 		pcs_humint = 20
 		pcs_persuas = 20
@@ -1204,7 +1204,7 @@ if $ARGS[0] = 'friendless':
 		!!b cup for ideal bmi
 		pcs_mass['bust_gen'] = 12
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 68
+		pcs_mass['body'] = 51
 		pcs_chrsm = 20
 		pcs_observ = 20
 		pcs_skin = 300 
@@ -1242,7 +1242,7 @@ if $ARGS[0] = 'uglyduckling':
 		!!e cup for ideal bmi
 		pcs_mass['bust_gen'] = 28
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 130
+		pcs_mass['body'] = 94
 		pcs_inhib = 5
 		if player_avatar = 0:
 			pcs_eyesize = 0
@@ -1312,7 +1312,7 @@ if $ARGS[0] = 'goodgirl':
 		!!b cup for ideal bmi
 		pcs_mass['bust_gen'] = 13
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 58
+		pcs_mass['body'] = 43
 		willpowermax = 75
 		gs 'grades', 'grade_award', 'school', 'math', 80
 		gs 'grades', 'grade_award', 'school', 'rus', 80
@@ -1359,7 +1359,7 @@ if $ARGS[0] = 'slut':
 		!!d cup for ideal bmi
 		pcs_mass['bust_gen'] = 22
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 70
+		pcs_mass['body'] = 52
 		mc_inventory['cosmetics'] = 30
 		mc_inventory['eyelash_fake'] =  20
 		$currentpursetype = 'cats'
@@ -1448,7 +1448,7 @@ if $ARGS[0] = 'goth':
 		!!b cup for ideal bmi
 		pcs_mass['bust_gen'] = 13
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 55
+		pcs_mass['body'] = 41
 		pcs_chrsm = 45
 		pcs_intel = 45
 		pcs_sprt = 50

+ 66 - 14
locations/intro_customization.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'start':
 	'If you want to set your skills and attributes to a certain number, use the cheat menu to do it, the options to do it here were removed.'
 	pcs_mass['butt_gen'] = 20
-	if pcs_mass['bust_gen'] = '': pcs_mass['bust_gen'] = 22
+	if pcs_mass['bust_gen'] = 0: pcs_mass['bust_gen'] = 22
 	if $soc_grup = '':gs 'intro_customization', 'none'
 	act 'Set attributes': gt 'intro_customization','modatt'
 	act 'Set skills': gt 'intro_customization','modskl'
@@ -108,6 +108,58 @@ if $ARGS[0] = 'modapp':
 	else
 		'<a href="exec:pcs_mass[''bust_gen''] = 87 & gt ''intro_customization'',''modapp''">You''ve been eclipsed by 2 small moons</a>'
 	end
+	*nl
+	*nl
+	*nl
+	'Choose base genetic butt size: (this is the genetic disposition and not the actual size at game start)'
+	if pcs_mass['butt_gen'] = 2:
+		'Flat - Currently set'
+	else
+		'<a href="exec:pcs_mass[''butt_gen''] = 2 & gt ''intro_customization'',''modapp''">Flat</a>'
+	end
+
+	if pcs_mass['butt_gen'] = 7:
+		'Mostly Flat - Currently set'
+	else
+		'<a href="exec:pcs_mass[''bust_gen''] = 7 & gt ''intro_customization'',''modapp''">Mostly Flat</a>'
+	end
+	
+	if pcs_mass['butt_gen'] = 12:
+		'Small - Currently set'
+	else
+		'<a href="exec:pcs_mass[''bust_gen''] = 12 & gt ''intro_customization'',''modapp''">Small</a>'
+	end
+	
+	if pcs_mass['butt_gen'] = 17:
+		'Below Average - Currently set'
+	else
+		'<a href="exec:pcs_mass[''bust_gen''] = 17 & gt ''intro_customization'',''modapp''">Below Average</a>'
+	end
+
+	if pcs_mass['butt_gen'] = 22:
+		'Average - Currently set'
+	else
+		'<a href="exec:pcs_mass[''bust_gen''] = 22 & gt ''intro_customization'',''modapp''">Average</a>'
+	end
+
+	if pcs_mass['butt_gen'] = 27:
+		'Above Average - Currently set'
+	else
+		'<a href="exec:pcs_mass[''bust_gen''] = 27 & gt ''intro_customization'',''modapp''">Above Average</a>'
+	end
+
+	if pcs_mass['butt_gen'] = 32:
+		'Big - Currently set'
+	else
+		'<a href="exec:pcs_mass[''bust_gen''] = 32 & gt ''intro_customization'',''modapp''">Big</a>'
+	end
+
+	if pcs_mass['butt_gen'] = 37:
+		'Massive - Currently set'
+	else
+		'<a href="exec:pcs_mass[''bust_gen''] = 37 & gt ''intro_customization'',''modapp''">Massive</a>'
+	end
+
 
 	act 'Body fat (<<pcs_mass[''body'']>>/200)':  gs 'intro_customization','setbodymass' & pcs_mass['body'] = nstat & gt 'intro_customization','modapp'
 	act 'Return': gt'intro_customization','start'
@@ -383,23 +435,23 @@ end
 
 if $ARGS[0] = 'setbodymass':
 	*clr & cla
-	'20 = underweight, slight, wiry'
-	'40 = slender, skinny, lean'
-	'60 = healthy, toned, ripped'
-	'80 = cute, muscular'
-	'100 = chubby, curvy, herculean'
-	'120 = overweight, stocky'
-	'140 = fat, heavy set'
+	'15 = underweight, slight, wiry'
+	'30 = slender, skinny, lean'
+	'45 = healthy, toned, ripped'
+	'60 = cute, muscular'
+	'75 = chubby, curvy, herculean'
+	'90 = overweight, stocky'
+	'105 = fat, heavy set'
 
 	nstat = pcs_mass['body']
-	nstat = input 'Enter value in multiples of 20. For example, 20, 40, 60 etc.'
-	if nstat > 200:
-		msg 'Please enter a value less than 200'
+	nstat = input 'Enter value in multiples of 5, between 15 and 150. For example, 15, 20, 60 etc.'
+	if nstat > 150:
+		msg 'Please enter a value less than 150'
 		gs 'intro_customization', 'setval'
-	elseif nstat < 20:
-		msg 'Please enter a value greater than 20'
+	elseif nstat < 15:
+		msg 'Please enter a value greater than 15'
 		gs 'intro_customization', 'setval'
-	elseif nstat mod 20 ! 0:
+	elseif nstat mod 5 ! 0:
 		msg 'Please enter a value in multiples of 20'
 		gs 'intro_customization', 'setval'
 	else

+ 19 - 19
locations/intro_sg_select.qsrc

@@ -485,7 +485,7 @@ if $ARGS[0] = 'nerdqueen':
 		!!d cup for ideal bmi
 		pcs_mass['bust_gen'] = 22
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 87
+		pcs_mass['body'] = 65
 		willpowermax = 70
 		gs 'grades', 'grade_award', 'school', 'math', 85
 		gs 'grades', 'grade_award', 'school', 'rus', 90
@@ -523,7 +523,7 @@ if $ARGS[0] = 'goodstudent':
 		!!c cup for ideal bmi
 		pcs_mass['bust_gen'] = 18
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 93
+		pcs_mass['body'] = 70
 		grupvalue[3] = 850
 		grupvalue[6] = 700
 		gs 'npc_relationship', 'socialgroup_setting', 0, 0, 5, 0, 0, 20
@@ -564,7 +564,7 @@ if $ARGS[0] = 'computergeek':
 		internet = 20
 		pcs_skin = 500
 		pcs_teeth = 1
-		pcs_mass['body'] = 56
+		pcs_mass['body'] = 42
 		pcs_inhib = 20
 		npc_rel['A152'] += 10
 		npc_rel['A153'] += 10
@@ -603,7 +603,7 @@ if $ARGS[0] = 'chessplayer':
 		pcs_prcptn = 40
 		pcs_react = 40
 		pcs_chess = 40
-		pcs_mass['body'] = 97
+		pcs_mass['body'] = 73
 		pcs_inhib = 15
 		chessyear = year
 		chessmonth = month
@@ -696,7 +696,7 @@ if $ARGS[0] = 'volleyball':
 		!!c cup for ideal bmi
 		pcs_mass['bust_gen'] = 17
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 75
+		pcs_mass['body'] = 56
 		pcs_vball = 50
 		gsAboVolley += 30
 		npc_rel['A13'] += 10
@@ -739,7 +739,7 @@ if $ARGS[0] = 'dancer':
 		pcs_skin = 700
 		pcs_teeth = -1
 		pcs_tan = 5
-		pcs_mass['body'] = 50
+		pcs_mass['body'] = 37
 		if player_avatar = 0:
 			pcs_hairlng = 200
 			pcs_eyesize = 2
@@ -785,7 +785,7 @@ if $ARGS[0] = 'runner':
 		pcs_vital = 50
 		pcs_agil = 50
 		pcs_inhib = 25
-		pcs_mass['body'] = 60
+		pcs_mass['body'] = 45
 		pcs_run = 50
 		gsAboBeg += 30
 		npc_rel['A3'] += 10
@@ -827,7 +827,7 @@ if $ARGS[0] = 'football':
 		!!c cup for ideal bmi
 		pcs_mass['bust_gen'] = 17
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 80
+		pcs_mass['body'] = 60
 		pcs_kick = 20
 		pcs_ftbll = 50
 		npc_rel['A131'] += 10
@@ -908,7 +908,7 @@ if $ARGS[0] = 'socialite':
 		!!c cup for ideal bmi
 		pcs_mass['bust_gen'] = 18
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 80
+		pcs_mass['body'] = 60
 		pcs_humint = 40
 		pcs_makupskl = 40
 		pcs_heels = 30
@@ -964,7 +964,7 @@ if $ARGS[0] = 'beautiful':
 		!!d cup for ideal bmi
 		pcs_mass['bust_gen'] = 22
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 75
+		pcs_mass['body'] = 56
 		pcs_inhib = 25
 		mc_inventory['cosmetics'] = 50
 		mc_inventory['eyelash_fake'] = 10
@@ -1073,7 +1073,7 @@ if $ARGS[0] = 'gopnikstart':
 		pcs_punch = 35
 		pcs_kick = 35
 		pcs_def = 35
-		pcs_mass['body'] = 86
+		pcs_mass['body'] = 65
 		pcs_teeth = 1
 		school_clothing = 5
 		npc_rel['A9'] += 10
@@ -1124,7 +1124,7 @@ if $ARGS[0] = 'troublemaker':
 		pcs_def = 20
 		pcs_humint = 10
 		pcs_persuas = 10
-		pcs_mass['body'] = 65
+		pcs_mass['body'] = 49
 		pirsD = 4
 		PirsD4_owned = 1
 		$currentpursetype = 'dolls'
@@ -1176,7 +1176,7 @@ if $ARGS[0] = 'vitekgf':
 		!!e cup for ideal bmi
 		pcs_mass['bust_gen'] = 32
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 73
+		pcs_mass['body'] = 55
 		pcs_humint = 20
 		pcs_makupskl = 30
 		pcs_heels = 30
@@ -1258,7 +1258,7 @@ if $ARGS[0] = 'alternative':
 		!!c cup for ideal bmi
 		pcs_mass['bust_gen'] = 18
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 75
+		pcs_mass['body'] = 56
 		pcs_chrsm = 45
 		pcs_humint = 20
 		pcs_persuas = 10
@@ -1369,7 +1369,7 @@ if $ARGS[0] = 'friendless':
 		!!b cup for ideal bmi
 		pcs_mass['bust_gen'] = 12
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 68
+		pcs_mass['body'] = 51
 		pcs_chrsm = 20
 		pcs_observ = 20
 		pcs_skin = 400
@@ -1413,7 +1413,7 @@ if $ARGS[0] = 'uglyduckling':
 		!!e cup for ideal bmi
 		pcs_mass['bust_gen'] = 28
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 125
+		pcs_mass['body'] = 94
 		pcs_inhib = 5
 		pcs_teeth = 2
 		if player_avatar = 0:
@@ -1480,7 +1480,7 @@ if $ARGS[0] = 'goodgirl':
 		!!b cup for ideal bmi
 		pcs_mass['bust_gen'] = 13
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 58
+		pcs_mass['body'] = 43
 		willpowermax = 75
 		gs 'grades', 'grade_award', 'school', 'math', 80
 		gs 'grades', 'grade_award', 'school', 'rus', 80
@@ -1533,7 +1533,7 @@ if $ARGS[0] = 'slut':
 		!!d cup for ideal bmi
 		pcs_mass['bust_gen'] = 22
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 70
+		pcs_mass['body'] = 52
 		mc_inventory['cosmetics'] = 30
 		mc_inventory['eyelash_fake'] = 20
 		$currentpursetype = 'cats'
@@ -1627,7 +1627,7 @@ if $ARGS[0] = 'goth':
 		!!b cup for ideal bmi
 		pcs_mass['bust_gen'] = 13
 		pcs_mass['butt_gen'] = 20
-		pcs_mass['body'] = 55
+		pcs_mass['body'] = 41
 		pcs_chrsm = 40
 		pcs_intel = 40
 		pcs_sprt = 45

+ 1 - 1
locations/intro_sg_select_custom.qsrc

@@ -191,7 +191,7 @@ if $ARGS[0] = 'none':
 	!!Mental Skills Reset
 	pcs_humint = 0
 	pcs_persuas = 0
-	pcs_observ = 0	
+	pcs_observ = 0
 	
 	!!Sport Skills Reset
 	pcs_jab = 0

+ 16 - 13
locations/saveupdater.qsrc

@@ -2371,19 +2371,22 @@ if temp_current_save_version < 00090200:
 	if nbsize			! 0:		pcs_mass['bust']			= nbsize		& killvar 'nbsize'
 	if pcs_mass['butt_gen'] = 0:
 		pcs_mass['butt_gen']		= 20
-		pcs_mass['butt']			= (20 * salo) / 80
-	end
-	if salo				! 0: 		pcs_mass['body']			= salo			& killvar 'salo'
-
-	if vofat			! 0:		bodyVars['vofat']			= vofat			& killvar 'vofat'
-	if vhips			! 0:		bodyVars['vhips']			= vhips			& killvar 'vhips'
-	if wratio			! 0:		bodyVars['wratio']			= wratio		& killvar 'wratio'
-	if bratio			! 0:		bodyVars['bratio']			= bratio		& killvar 'bratio'
-	if hratio			! 0:		bodyVars['hratio']			= hratio		& killvar 'hratio'
-	if magicf2b			! 0:		bodyVars['bust_magic']		= magicf2b		& killvar 'magicf2b'
-	if silicone_butt	! 0:		bodyVars['butt_silicone']	= silicone_butt	& killvar 'silicone_butt'
-	if silicone			! 0:		bodyVars['bust_silicone']	= silicone		& killvar 'silicone'
-	if butt_cheat		! 0:		bodyVars['butt_cheat']		= butt_cheat	& killvar 'butt_cheat'
+		pcs_mass['butt']			= (20 * salo) / 60
+	end
+	if salo ! 0:
+		pcs_mass['body'] = salo - pcs_mass['butt']
+		killvar 'salo'
+	end
+
+	if vofat			! 0:		bodyVars['vofat']			= vofat				& killvar 'vofat'
+	if vhips			! 0:		bodyVars['vhips']			= vhips				& killvar 'vhips'
+	if wratio			! 0:		bodyVars['wratio']			= wratio			& killvar 'wratio'
+	if bratio			! 0:		bodyVars['bratio']			= bratio			& killvar 'bratio'
+	if hratio			! 0:		bodyVars['hratio']			= hratio			& killvar 'hratio'
+	if magicf2b			! 0:		bodyVars['bust_magic']		= magicf2b			& killvar 'magicf2b'
+	if silicone_butt	! 0:		bodyVars['butt_silicone']	= silicone_butt		& killvar 'silicone_butt'
+	if silicone			! 0:		bodyVars['bust_silicone']	= silicone			& killvar 'silicone'
+	if butt_cheat		! 0:		bodyVars['butt_cheat']		= butt_cheat		& killvar 'butt_cheat'
 	
 	!!update_clothing
 	gs 'tailor2'