Browse Source

[Renamed] Renamed body_shape.qsrc to body to now reflect all updates regarding body now happen in body.qsrc

ADCSux 2 years ago
parent
commit
7029f184ee

+ 2 - 0
changes from 0_8_5 to 0_8_6.txt

@@ -25,6 +25,7 @@ katja_lake			<- split from katjaEv
 
 
 body_desc
 body_desc
 AppearanceSystem               <- body
 AppearanceSystem               <- body
+body                           <- body_shape
 
 
 === deleted locations ===
 === deleted locations ===
 
 
@@ -41,6 +42,7 @@ rex_party_girls_events
 rex_party_sister_events
 rex_party_sister_events
 $phone_theme
 $phone_theme
 body                                 -> AppearanceSystem
 body                                 -> AppearanceSystem
+body_shape                           -> body
 
 
 
 
 Variables:
 Variables:

+ 1 - 1
glife.qproj

@@ -66,7 +66,7 @@
 	</Folder>
 	</Folder>
 	<Folder name="Body">
 	<Folder name="Body">
 		<Location name="ApperanceSystem"/>
 		<Location name="ApperanceSystem"/>
-		<Location name="body_shape"/>
+		<Location name="body"/>
 		<Location name="body_desc"/>
 		<Location name="body_desc"/>
 		<Location name="lact_lib"/>
 		<Location name="lact_lib"/>
 		<Location name="lact_bp"/>
 		<Location name="lact_bp"/>

+ 18 - 18
locations/Cheatmenu_din.qsrc

@@ -206,68 +206,68 @@ $cheatmenu['bodyMod'] = {
 		'starving (No, you may not select ''starving'', it''s here to show where the scale starts)'
 		'starving (No, you may not select ''starving'', it''s here to show where the scale starts)'
 		''
 		''
 		if salocatnow ! 1:
 		if salocatnow ! 1:
-			'<a href="exec:salo = 20 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 1)]>></a>'
+			'<a href="exec:salo = 20 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 1)]>></a>'
 			''
 			''
 		end
 		end
 		if salocatnow ! 2:
 		if salocatnow ! 2:
-			'<a href="exec:salo = 40 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 2)]>></a>'
+			'<a href="exec:salo = 40 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 2)]>></a>'
 			''
 			''
 		end
 		end
 		if salocatnow ! 3:
 		if salocatnow ! 3:
-			'<a href="exec:salo = 60 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
+			'<a href="exec:salo = 60 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
 			''
 			''
 		end
 		end
 		if salocatnow ! 4:
 		if salocatnow ! 4:
-			'<a href="exec:salo = 80 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
+			'<a href="exec:salo = 80 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
 			''
 			''
 		end
 		end
 		if salocatnow ! 5:
 		if salocatnow ! 5:
-			'<a href="exec:salo = 100 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
+			'<a href="exec:salo = 100 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
 			''
 			''
 		end
 		end
 		if salocatnow ! 6:
 		if salocatnow ! 6:
-			'<a href="exec:salo = 120 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
+			'<a href="exec:salo = 120 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
 			''
 			''
 		end
 		end
 		if salocatnow ! 7:
 		if salocatnow ! 7:
-			'<a href="exec:salo = 140 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
+			'<a href="exec:salo = 140 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
 			''
 			''
 		end
 		end
 	else
 	else
 		if (pregchem < 2688) = 0:
 		if (pregchem < 2688) = 0:
-			'<a href="exec:pregchem = 100 & pregtime = 4 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10))]>></a>'
+			'<a href="exec:pregchem = 100 & pregtime = 4 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10))]>></a>'
 			''
 			''
 		end
 		end
 		if (pregchem >= 2688 and pregchem < 3192) = 0:
 		if (pregchem >= 2688 and pregchem < 3192) = 0:
-			'<a href="exec:pregchem = 2688 & pregtime = 112 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 1)]>></a>'
+			'<a href="exec:pregchem = 2688 & pregtime = 112 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 1)]>></a>'
 			''
 			''
 		end
 		end
 		if (pregchem >= 3192 and pregchem < 3696) = 0:
 		if (pregchem >= 3192 and pregchem < 3696) = 0:
-			'<a href="exec:pregchem = 3192 & pregtime = 133 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 2)]>></a>'
+			'<a href="exec:pregchem = 3192 & pregtime = 133 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 2)]>></a>'
 			''
 			''
 		end
 		end
 		if (pregchem >= 3696 and pregchem < 4200) = 0:
 		if (pregchem >= 3696 and pregchem < 4200) = 0:
-			'<a href="exec:pregchem = 3696 & pregtime = 154 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
+			'<a href="exec:pregchem = 3696 & pregtime = 154 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 3)]>></a>'
 			''
 			''
 		end
 		end
 		if (pregchem >= 4200 and pregchem < 4704) = 0:
 		if (pregchem >= 4200 and pregchem < 4704) = 0:
-			'<a href="exec:pregchem = 4200 & pregtime = 175 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
+			'<a href="exec:pregchem = 4200 & pregtime = 175 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 4)]>></a>'
 			''
 			''
 		end
 		end
 		if (pregchem >= 4704 and pregchem < 5208) = 0:
 		if (pregchem >= 4704 and pregchem < 5208) = 0:
-			'<a href="exec:pregchem = 4704 & pregtime = 196 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
+			'<a href="exec:pregchem = 4704 & pregtime = 196 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 5)]>></a>'
 			''
 			''
 		end
 		end
 		if (pregchem >= 5208 and pregchem < 5712) = 0:
 		if (pregchem >= 5208 and pregchem < 5712) = 0:
-			'<a href="exec:pregchem = 5208 & pregtime = 217 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
+			'<a href="exec:pregchem = 5208 & pregtime = 217 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 6)]>></a>'
 			''
 			''
 		end
 		end
 		if (pregchem >= 5712 and pregchem < 6216) = 0:
 		if (pregchem >= 5712 and pregchem < 6216) = 0:
-			'<a href="exec:pregchem = 5712 & pregtime = 238 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
+			'<a href="exec:pregchem = 5712 & pregtime = 238 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 7)]>></a>'
 			''
 			''
 		end
 		end
 		if (pregchem >= 6216) = 0:
 		if (pregchem >= 6216) = 0:
-			'<a href="exec:pregchem = 6216 & pregtime = 259 & gs ''body_shape'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 8)]>></a>'
+			'<a href="exec:pregchem = 6216 & pregtime = 259 & gs ''body'', ''softreset'' & gs ''stat'' & dynamic $cheatmenu[''bodyMod'']"><<$bodimgsets[((bodset * 10) + 8)]>></a>'
 			''
 			''
 		end
 		end
 	end
 	end
@@ -809,7 +809,7 @@ $cheatmenu['looks'] = {
 	if pcs_throat >= 5:'<a href="exec:pcs_throat -= 5 & dynamic $cheatmenu[''looks'']">Decrease throat capacity</a>'
 	if pcs_throat >= 5:'<a href="exec:pcs_throat -= 5 & dynamic $cheatmenu[''looks'']">Decrease throat capacity</a>'
 	if dounspell = 1:
 	if dounspell = 1:
 		*nl
 		*nl
-		'<a href="exec:dounsplkil = 2 & gs ''body_shape'', ''hardreset''">Hard Reset body shape</a>'
+		'<a href="exec:dounsplkil = 2 & gs ''body'', ''hardreset''">Hard Reset body shape</a>'
 	end
 	end
 
 
 	'</td><td width="33%" cellpadding="20" valign="top">'
 	'</td><td width="33%" cellpadding="20" valign="top">'
@@ -840,7 +840,7 @@ $cheatmenu['looks'] = {
 	*nl
 	*nl
 	if dounspell = 0:
 	if dounspell = 0:
 		if fat ! 0: '<a href="exec:fat = 0 & dynamic $cheatmenu[''looks'']">Zero fat</a>'
 		if fat ! 0: '<a href="exec:fat = 0 & dynamic $cheatmenu[''looks'']">Zero fat</a>'
-		'Body Fat = (<<salo>>): <a href="exec:salo -= 10 & gs ''body_shape'', ''softreset'' & dynamic $cheatmenu[''looks'']">-10</a> <a href="exec:salo -= 5 & gs ''body_shape'', ''softreset'' & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:salo -= 1 & gs ''body_shape'', ''softreset'' & dynamic $cheatmenu[''looks'']">-1</a> <a href="exec:salo += 1 & gs ''body_shape'', ''softreset'' & dynamic $cheatmenu[''looks'']">+1</a> <a href="exec:salo += 5 & gs ''body_shape'', ''softreset'' & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:salo += 10 & gs ''body_shape'', ''softreset'' & dynamic $cheatmenu[''looks'']">+10</a>'
+		'Body Fat = (<<salo>>): <a href="exec:salo -= 10 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">-10</a> <a href="exec:salo -= 5 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">-5</a> <a href="exec:salo -= 1 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">-1</a> <a href="exec:salo += 1 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">+1</a> <a href="exec:salo += 5 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">+5</a> <a href="exec:salo += 10 & gs ''body'', ''softreset'' & dynamic $cheatmenu[''looks'']">+10</a>'
 		'Note: You need some Body Fat to survive, any value under 11 is clasified as "starving" and a value of 0 can lead to a Game Over.'
 		'Note: You need some Body Fat to survive, any value under 11 is clasified as "starving" and a value of 0 can lead to a Game Over.'
 	end
 	end
 	*nl
 	*nl

+ 9 - 9
locations/UnitAppearance.qsrc

@@ -37,11 +37,11 @@ if $ARGS[0] = 'GenRowBreak':
 end 
 end 
 
 
 if $ARGS[0] = 'calcHotcat':
 if $ARGS[0] = 'calcHotcat':
-	unitbmi_calc = FUNC('body_shape', 'bmicalc', unitsalo, unitpcs_hgt)
-	unitbodykoef = FUNC('body_shape', 'setbodykoef', unitbmi_calc, unitstrenbuf, unitsalocatnow, unitvofat)
-	unitHeadBonus = FUNC('body_shape', 'calcHeadBonus', unitpcs_lashes, unitpcs_eyesize, unitpcs_lip, unitpcs_teeth, unitbmi_calc)
-	unitAttributeBonus = FUNC('body_shape', 'calcAttributeBonus', unitpcs_agil, unitpcs_vital, unitbmi_calc)
-	unitpcs_apprncbase = FUNC('body_shape', 'basebeautycalc2', unitResetBase, unitvidage, unitpcs_skin, unitbodykoef, unitHeadBonus, unitAttributeBonus, unitpcs_apprncbase)
+	unitbmi_calc = FUNC('body', 'bmicalc', unitsalo, unitpcs_hgt)
+	unitbodykoef = FUNC('body', 'setbodykoef', unitbmi_calc, unitstrenbuf, unitsalocatnow, unitvofat)
+	unitHeadBonus = FUNC('body', 'calcHeadBonus', unitpcs_lashes, unitpcs_eyesize, unitpcs_lip, unitpcs_teeth, unitbmi_calc)
+	unitAttributeBonus = FUNC('body', 'calcAttributeBonus', unitpcs_agil, unitpcs_vital, unitbmi_calc)
+	unitpcs_apprncbase = FUNC('body', 'basebeautycalc2', unitResetBase, unitvidage, unitpcs_skin, unitbodykoef, unitHeadBonus, unitAttributeBonus, unitpcs_apprncbase)
 	unitclothingbonus = FUNC('body', 'calcClothesBonus', unitPXCloThinness, unitPXCloTopCut, unitPXCloBottomShortness, unitPCloQuality, $unitclothingworntype, unitbmi_calc)
 	unitclothingbonus = FUNC('body', 'calcClothesBonus', unitPXCloThinness, unitPXCloTopCut, unitPXCloBottomShortness, unitPCloQuality, $unitclothingworntype, unitbmi_calc)
 	unitAccessoriesBonus = FUNC('body', 'calcAccessoriesBonus', unitbonusZ, unitPShoQuality, $unitpantyworntype, $unitbraworntype)
 	unitAccessoriesBonus = FUNC('body', 'calcAccessoriesBonus', unitbonusZ, unitPShoQuality, $unitpantyworntype, $unitbraworntype)
 	unitGroomingBonus = FUNC('body', 'calcGroomingBonus', unitpcs_lipbalm, unitmopkoef, unitpcs_hairbsh, unitpcs_breath, unitdeodorant_on, unitbmi_calc)
 	unitGroomingBonus = FUNC('body', 'calcGroomingBonus', unitpcs_lipbalm, unitmopkoef, unitpcs_hairbsh, unitpcs_breath, unitdeodorant_on, unitbmi_calc)
@@ -77,7 +77,7 @@ if $ARGS[0] = 'HeadBonusCalc':
 end
 end
 
 
 if $ARGS[0] = 'GenHeadRow':
 if $ARGS[0] = 'GenHeadRow':
-    unitHeadBonus = FUNC('body_shape', 'calcHeadBonus', ARGS[1], ARGS[2], ARGS[3], ARGS[4])
+    unitHeadBonus = FUNC('body', 'calcHeadBonus', ARGS[1], ARGS[2], ARGS[3], ARGS[4])
     '<tr>'
     '<tr>'
         '<td><<unitHeadBonus>></td>'
         '<td><<unitHeadBonus>></td>'
         '<td><<ARGS[1]>></td>'
         '<td><<ARGS[1]>></td>'
@@ -110,7 +110,7 @@ if $ARGS[0] = 'AttribBonusCalc':
 end
 end
 
 
 if $ARGS[0] = 'GenAttribRow':
 if $ARGS[0] = 'GenAttribRow':
-    unitAttribBonus = FUNC('body_shape', 'calcAttributeBonus', ARGS[1], ARGS[2])
+    unitAttribBonus = FUNC('body', 'calcAttributeBonus', ARGS[1], ARGS[2])
     '<tr>'
     '<tr>'
         '<td><<unitAttribBonus>></td>'
         '<td><<unitAttribBonus>></td>'
         '<td><<ARGS[1]>></td>'
         '<td><<ARGS[1]>></td>'
@@ -1119,14 +1119,14 @@ if $ARGS[0] = 'CalcSaloVars':
     unitvofat = ((unitpcs_hgt * unithratio) / 100 + unitvhips - (unitpcs_hgt * 72) / 100) / 2
     unitvofat = ((unitpcs_hgt * unithratio) / 100 + unitvhips - (unitpcs_hgt * 72) / 100) / 2
 
 
     unitsalocatnow = 1 + (unitsalo - 10) / 20
     unitsalocatnow = 1 + (unitsalo - 10) / 20
-    unitbmi_calc = FUNC('body_shape', 'bmicalc', unitsalo, unitpcs_hgt)
+    unitbmi_calc = FUNC('body', 'bmicalc', unitsalo, unitpcs_hgt)
     gs 'UnitAppearance', 'GetClothThick', unitbmi_calc
     gs 'UnitAppearance', 'GetClothThick', unitbmi_calc
 end
 end
 
 
 if $ARGS[0] = 'GenerateSvetaOptions':
 if $ARGS[0] = 'GenerateSvetaOptions':
     gs 'UnitAppearance', 'SaveBase'
     gs 'UnitAppearance', 'SaveBase'
     gs 'UnitAppearance', 'GenRowBreak', $ARGS[1]
     gs 'UnitAppearance', 'GenRowBreak', $ARGS[1]
-    unitbmi_calc = FUNC('body_shape', 'bmicalc', unitsalo, unitpcs_hgt)
+    unitbmi_calc = FUNC('body', 'bmicalc', unitsalo, unitpcs_hgt)
 
 
     $svetadesc = 'Current Clothes'
     $svetadesc = 'Current Clothes'
     
     

+ 8 - 8
locations/body_shape.qsrc → locations/body.qsrc

@@ -1,4 +1,4 @@
-# body_shape
+# body
 
 
 !!vhips = derived from salo in body_shape
 !!vhips = derived from salo in body_shape
 !!vhtmp = slows the change to vhips in body_shape
 !!vhtmp = slows the change to vhips in body_shape
@@ -26,7 +26,7 @@
 !! imgset6ovr[x] and imgset7ovr[x] = a flag to indicate that an image set (x) has its own image 6 and/or 7
 !! imgset6ovr[x] and imgset7ovr[x] = a flag to indicate that an image set (x) has its own image 6 and/or 7
 !! extended lash functionality; pcs_lashes = n are: {2, largest natural size}, {3, with temporary false lashes on or basic 2D lash extensions}, {4, with ornate false lashes on or lavish 4D extensions}, {5, with extremely ornate, 6D-style extensions} - xerya
 !! extended lash functionality; pcs_lashes = n are: {2, largest natural size}, {3, with temporary false lashes on or basic 2D lash extensions}, {4, with ornate false lashes on or lavish 4D extensions}, {5, with extremely ornate, 6D-style extensions} - xerya
 
 
-$this = 'body_shape'
+$this = 'body'
 
 
 if $ARGS[0] = 'RegularUpdate':
 if $ARGS[0] = 'RegularUpdate':
 	if dounspell = 0:
 	if dounspell = 0:
@@ -346,7 +346,7 @@ if $ARGS[0] = '':
 	if salolast < salo: salolast += 1
 	if salolast < salo: salolast += 1
 
 
 	!!Setting the pcs_apprnc bonus based on fat and strength
 	!!Setting the pcs_apprnc bonus based on fat and strength
-	pcs_bmi = FUNC('body_shape', 'CalcBMI')
+	pcs_bmi = FUNC($this, 'CalcBMI')
 
 
 	!!This is to clean up unused variables
 	!!This is to clean up unused variables
 	killvar 'normbuffpick' & killvar 'nrmbfpckct'
 	killvar 'normbuffpick' & killvar 'nrmbfpckct'
@@ -472,7 +472,7 @@ if $ARGS[0] = 'softreset':
 	:resetloop
 	:resetloop
 	if salo ! salolast:
 	if salo ! salolast:
 		if gmstrtflag = 1: salobustdo = 1
 		if gmstrtflag = 1: salobustdo = 1
-		gs 'body_shape'
+		gs 'body'
 		jump 'resetloop'
 		jump 'resetloop'
 	end
 	end
 	!!Updates pcs_apprncbase after a reset
 	!!Updates pcs_apprncbase after a reset
@@ -490,7 +490,7 @@ if $ARGS[0] = 'hardreset':
 		fat = 0
 		fat = 0
 		agilbuf = pcs_agil & strenbuf = pcs_stren & vitalbuf = pcs_vital
 		agilbuf = pcs_agil & strenbuf = pcs_stren & vitalbuf = pcs_vital
 		salobustdo = 1 & sftrstflag = 1 & normbuffpick = -1
 		salobustdo = 1 & sftrstflag = 1 & normbuffpick = -1
-		gs 'body_shape'
+		gs 'body'
 		salo = (pcs_hips * 2) - ((pcs_hgt * hratio) / 50) + 80
 		salo = (pcs_hips * 2) - ((pcs_hgt * hratio) / 50) + 80
 		if salo < 10:
 		if salo < 10:
 			salocatnow = 0
 			salocatnow = 0
@@ -515,7 +515,7 @@ if $ARGS[0] = 'hardreset':
 		newbdsp = 1
 		newbdsp = 1
 		dounspell = 0
 		dounspell = 0
 		gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 		gs 'AppearanceSystem', 'UpdateBaseAppearnce'
-		gs 'body_shape'
+		gs 'body'
 		gs 'stat'
 		gs 'stat'
 	else
 	else
 		'If you''re seeing this, something odd happened. Please make a bug report that the body shape hard reset improperly triggered and what you were doing.'
 		'If you''re seeing this, something odd happened. Please make a bug report that the body shape hard reset improperly triggered and what you were doing.'
@@ -532,7 +532,7 @@ if $ARGS[0] = 'initial':
 	agilbuf = pcs_agil & strenbuf = pcs_stren & vitalbuf = pcs_vital
 	agilbuf = pcs_agil & strenbuf = pcs_stren & vitalbuf = pcs_vital
 	normbuffpick = -1 & gmstrtflag = 1
 	normbuffpick = -1 & gmstrtflag = 1
 	!!	Calling soft reset will cause the main code to cycle up to the starting value of salo
 	!!	Calling soft reset will cause the main code to cycle up to the starting value of salo
-	gs 'body_shape', 'softreset'
+	gs 'body', 'softreset'
 	!!	This sets/resets the controler variables
 	!!	This sets/resets the controler variables
 	salocatlast = salocatnow
 	salocatlast = salocatnow
 	normbuffpick = 0 & magf2bdo = 0
 	normbuffpick = 0 & magf2bdo = 0
@@ -545,5 +545,5 @@ if $ARGS[0] = 'initial':
 	gs 'body_desc', 'BMI'
 	gs 'body_desc', 'BMI'
 end
 end
 
 
---- body_shape ---------------------------------
+--- body ---------------------------------
 
 

+ 1 - 1
locations/cikl.qsrc

@@ -628,7 +628,7 @@ inhib_flr = inhib_lvl
 gs 'stat_sklattrib', 'daycall'
 gs 'stat_sklattrib', 'daycall'
 
 
 !Update body measurements and base appearnce
 !Update body measurements and base appearnce
-gs 'body_shape', 'DailyUpdate'
+gs 'body', 'DailyUpdate'
 gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 gs 'body_desc'
 gs 'body_desc'
 
 

+ 1 - 1
locations/city_clinic.qsrc

@@ -1477,7 +1477,7 @@ if $ARGS[0] = 'lyposuction':
 	salo -= 40
 	salo -= 40
 	if salo < 11: salo = 11
 	if salo < 11: salo = 11
 	money -= 75000
 	money -= 75000
-	gs 'body_shape', 'softreset'
+	gs 'body', 'softreset'
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'

+ 1 - 1
locations/intro_initialization.qsrc

@@ -101,7 +101,7 @@ nathcol = pcs_haircol
 pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1
 pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1
 oldsavepcs_haircol = 1
 oldsavepcs_haircol = 1
 
 
-gs 'body_shape', 'initial'
+gs 'body', 'initial'
 
 
 !! Adding underwear and default shoes and assigning them
 !! Adding underwear and default shoes and assigning them
 
 

+ 1 - 1
locations/lover_change.qsrc

@@ -1098,7 +1098,7 @@ if $ARGS[0] = 'Figure':
 								salo = 20 * figurePrefMin + 1
 								salo = 20 * figurePrefMin + 1
 								if salo < 11: salo = 11
 								if salo < 11: salo = 11
 
 
-								gs 'body_shape', 'softreset'
+								gs 'body', 'softreset'
 								!!'<<salocatnow>> is the value for salocatnow, the value for fat is <<fat>>, and the value for salo is <<salo>>.'
 								!!'<<salocatnow>> is the value for salocatnow, the value for fat is <<fat>>, and the value for salo is <<salo>>.'
 								
 								
 							if salocatnow > figurePrefMax:jump 'loopfatRemover'
 							if salocatnow > figurePrefMax:jump 'loopfatRemover'

+ 1 - 1
locations/preCUST.qsrc

@@ -366,7 +366,7 @@ if $ARGS[0] = 'Done':
 	pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1
 	pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1
 	oldsavepcs_haircol = 1
 	oldsavepcs_haircol = 1
 
 
-	gs 'body_shape', 'initial'
+	gs 'body', 'initial'
 
 
 !! Adding underwear and default shoes and assigning them
 !! Adding underwear and default shoes and assigning them
 
 

+ 1 - 1
locations/stat.qsrc

@@ -1049,7 +1049,7 @@ if StrongNarkota > 0:
 end
 end
 
 
 !!Health, Willpower, Auto Birth Control pregnancy check
 !!Health, Willpower, Auto Birth Control pregnancy check
-gs 'body_shape', 'RegularUpdate'
+gs 'body', 'RegularUpdate'
 gs 'AppearanceSystem'
 gs 'AppearanceSystem'
 gs 'body_desc'
 gs 'body_desc'
 
 

+ 1 - 1
locations/tatiana_lab.qsrc

@@ -383,7 +383,7 @@ if $ARGS[0] = 'Tatiana':
 					cla
 					cla
 					minut += 30
 					minut += 30
 					dounspell = 1
 					dounspell = 1
-					gs 'body_shape', 'hardreset'
+					gs 'body', 'hardreset'
 					gs 'stat'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/tatiana/magiclook.jpg"></center>'
 					'<center><img <<$set_imgh>> src="images/characters/city/tatiana/magiclook.jpg"></center>'
 					'Tatiana lowers her glasses and stares deeply into your eyes. It feels like time just stops being a thing and you are floating.'
 					'Tatiana lowers her glasses and stares deeply into your eyes. It feels like time just stops being a thing and you are floating.'