Browse Source

[Refactored] Added some documentations and cleaned up local variables

ADCSux 2 years ago
parent
commit
b266185ed4
1 changed files with 26 additions and 23 deletions
  1. 26 23
      locations/body.qsrc

+ 26 - 23
locations/body.qsrc

@@ -1,18 +1,15 @@
 # body
-
-!! I have gone through and added a new category of string variables, standardised to be used for descriptive writing. You will notice some duplication here -- this is for purposes of backwards compatibility, as if I completely rename and discard some of these strings,
-!! extant saved games will irreparably break, and this would be Bad. One day down the line, most of the duplicated variables here can be culled, when there is a new release that warrants new saves being used, but until then the duplication needs to stay. Use of
-!! strings for descriptions that do not begin with $pcdesc_ should be avoided, as it would be best to have everything standardised when moving forward into the present and future.
-!! Available strings follow this format: $pcdesc_type, $pcdesc_typewordy, and $pcdesc_typerandom. The last will give a new string each time, to allow for repeatedly referencing something accurately without it becoming repetitive.  Not EVERYTHING has a wordy 
-!! or even random variation, but these should work regardless -- they just may use a non-wordy, or non-random version, if it is something that does not really warrant such. 
-!! There is also a special string, $pcdesc_typeinsertive, that follows the format " , descriptive text" as in, " , invitingly-glossed". Please check the master string document to see if this exists for the string you need. - xerya, July 2017
-
 $this = 'body'
 
 if $ARGS[0] = '':
+	!{
+        PC's appearance is updated regularly in stat.qsrc.
+        Note: A huge part of PC's appearance is from base appearance, which is updated once a day. Because it's
+        a global variable, it does not show in this function in particular, but it's used in 'CalcAppearance'
+    }
 	if pcs_makeup = 6 and bimbolevel >= 2: extra_supnatvnesh = 2*bimbolevel - 2
 
-	!! Calculate hotcat etc
+	!STD check. STD will make appearance automatically -10
 	if Gerpes >= 3 or Sifilis >= 21 or Triper > 2:
 		pcs_apprnc = -10
 	else:
@@ -23,10 +20,11 @@ if $ARGS[0] = '':
 		pcs_apprnc = func($this, 'CalcAppearance', (supnatvnesh + extra_supnatvnesh))
 		Hotcat = func($this, 'ConvertToHotcat')
 	end
-	!{killvar 'clothingBonus'
+
+	killvar 'clothingBonus'
 	killvar 'accessoriesBonus'
 	killvar 'groomingBonus'
-	killvar 'groomingPenalty'}
+	killvar 'groomingPenalty'
 end
 
 if $args[0] = 'UpdateBaseAppearnce':
@@ -51,8 +49,14 @@ if $args[0] = 'UpdateBaseAppearnce':
 	skinBonus = (pcs_skin * 2 / 5)
 	bodyShapeBonus = func($this, 'SetBodyShapeBonus')
 
-	! Calculte vnesh
+	! Calculte base appearance
 	pcs_apprncbase = (vidageBonus * (skinBonus + bodyShapeBonus + faceBonus + attributeBonus) / 100) + supnatvnesh
+
+	killvar 'vidageBonus'
+	killvar 'skinBonus'
+	killvar 'bodyShapeBonus'
+	killvar 'faceBonus'
+	killvar 'attributeBonus'
 end 
 
 if $ARGS[0] = 'CalcFaceBonus':
@@ -102,6 +106,9 @@ if $ARGS[0] = 'CalcFaceBonus':
 
 	result = eyelashesBonus + eyeSizeBonus + lipBonus
 
+	killvar 'eyelashesBonus'
+	killvar 'eyeSizeBonus'
+	killvar 'lipBonus'
 end
 
 if $ARGS[0] = 'CalcAttributeBonus':
@@ -200,6 +207,7 @@ if $ARGS[0] = 'CalcClothingBonus':
 	end
 
 	result = tempRevealing/ 76 * PCloQuality
+	killvar 'tempRevealing'
 
 end
 
@@ -252,11 +260,11 @@ if $ARGS[0] = 'CalcGroomingBonus':
 	!result = tempGroomingBonus
 	result = func($this, 'AdjustFromBMI', tempGroomingBonus)
 
-	!{killvar 'lipBalmBonus'
+	killvar 'lipBalmBonus'
 	killvar 'makeupBonus'
 	killvar 'hairBonus'
 	killvar 'breathBonus'
-	killvar 'tempGroomingBonus'}
+	killvar 'tempGroomingBonus'
 end
 
 if $ARGS[0] = 'CalcGroomingPenalty':
@@ -313,21 +321,17 @@ end
 
 
 if $ARGS[0] = 'CalcAppearance':
-	!!Appearance factors; hairkoef = very short hair / mopkoef = makeup bonus / legkoef = shaved legs / CloAdjustedBeauty = clothes / pcs_hairbsh = Hair brushed / lipbalmKoef = lip balm / pcs_breath = freash breath / sweatKoef = pcs_sweat / glassvnesh = glasses / dyevmod = hair dye fading
-	!!Moved to base calculation in "body_shape"; bimbobeauty = Bimbo bonus; pcs_lip = lip size; skin = skin condition; pcs_lashes = eyelashes; pcs_eyesize = eyes; bodykoef = hips:waist ratio; pcs_teeth = missing teeth; vidagebonus = youth
-	tempsupnatvnesh = ARGS[1] & !! supnatvnesh
+	superNaturalBonus = ARGS[1] & !! supnatvnesh
 
 	temp_apprnc = pcs_apprncbase + clothingBonus + accessoriesBonus + groomingBonus - groomingPenalty
 
 	if temp_apprnc >= 200: temp_apprnc = 200 
-
-	temp_apprnc = temp_apprnc + tempsupnatvnesh
-
 	if temp_apprnc < 0: temp_apprnc = 0
 
-	result = temp_apprnc
+	!Any super natural bonuses are allowed to go above the max scale
+	result = temp_apprnc + superNaturalBonus
 	
-	killvar 'tempsupnatvnesh'
+	killvar 'superNaturalBonus'
 	killvar 'temp_apprnc'
 end
 
@@ -370,6 +374,5 @@ if $ARGS[0] = 'AdjustFromBMI':
 
 	result = tempValue
 	killvar 'tempValue'
-	killvar 'tempadjpcs_bmi'
 end
 --- body ---------------------------------