[Fixed] Fix bugs in rewrote appearance calculations

locations/body.qsrc

@@ -13,34 +13,16 @@ if $ARGS[0] = '':
 	if pcs_makeup = 6 and bimbolevel >= 2: extra_supnatvnesh = 2*bimbolevel - 2
 
 	!! Calculate hotcat etc
-	clothingBonus = func($this, 'CalcClothingBonus')
-	accessoriesBonus = func($this, 'CalcAccessoriesBonus', bonusZ, PShoQuality)
-	groomingBonus = func($this, 'CalcGroomingBonus')
-	groomingPenalty = func($this, 'CalcGroomingPenalty')
-	pcs_apprnc = func($this, 'CalcAppearance', (supnatvnesh + extra_supnatvnesh))
-	Hotcat = func($this, 'ConvertToHotcat')
-
-
-	if StrongNarkota <= 0:
-		if SNarkTimes >= 3 and SLomka = 0:SLomka = 1
-		if Gerpes >= 3 or Sifilis >= 21 or Triper > 2:pcs_apprnc = -10
-	end
-
-	if amphCount > 3 and amphHigh <= 0:
-		addictChance = rand(1,10)
-		if addictChance > 8:
-			amphWithdrawl = 2
-		end
-	end
-
-	if StrongNarkota > 0:
-		if SLomka > 0:SLomka = 0
-		pcs_mood = 100
+	if Gerpes >= 3 or Sifilis >= 21 or Triper > 2:
+		pcs_apprnc = -10
+	else:
+		clothingBonus = func($this, 'CalcClothingBonus')
+		accessoriesBonus = func($this, 'CalcAccessoriesBonus', bonusZ, PShoQuality)
+		groomingBonus = func($this, 'CalcGroomingBonus')
+		groomingPenalty = func($this, 'CalcGroomingPenalty')
+		pcs_apprnc = func($this, 'CalcAppearance', (supnatvnesh + extra_supnatvnesh))
+		Hotcat = func($this, 'ConvertToHotcat')
 	end
-
-	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-	!! kill temporary variables
 	!{killvar 'clothingBonus'
 	killvar 'accessoriesBonus'
 	killvar 'groomingBonus'
@@ -71,8 +53,6 @@ if $args[0] = 'UpdateBaseAppearnce':
 
 	! Calculte vnesh
 	pcs_apprncbase = (vidageBonus * (skinBonus + bodyShapeBonus + faceBonus + attributeBonus) / 100) + supnatvnesh
-
-	killvar 'vidageBonus'
 end 
 
 if $ARGS[0] = 'CalcFaceBonus':
@@ -197,30 +177,30 @@ if $ARGS[0] = 'SetBodyShapeBonus':
 end
 
 if $ARGS[0] = 'CalcClothingBonus':
-
 	if $clothingworntype = 'nude':
-		!heathy weight and overweight
 		if pcs_bmi >= 19 and pcs_bmi < 30:
+			! Healthy and overweight
 			tempRevealing = 405
-			tempPCloQuality = 3
+			PCloQuality = 3
 		else
 			tempRevealing = 0
-			tempPCloQuality = 1
+			PCloQuality = 1
 		end
 	else
-		!heathy weight and overweight
-		if pcs_bmi >= 19 and pcs_bmi < 30:
-			tempRevealing = PXCloThinness + PXCloTopCut + PXCloBottomShortness
-		else
-			tempRevealing = (400 - PXCloThinness) + (500 - PXCloTopCut) + (400 - PXCloBottomShortness)
+		if pcs_bmi < 19:
+			!Skinny and severely skinny
+			tempRevealing = ((400 - PXCloThinness) + (500 - PXCloTopCut) + (400 - PXCloBottomShortness))/2
+		elseif pcs_bmi >= 19 and pcs_bmi < 30:
+			!Healthy and overweight
+			tempRevealing = (PXCloThinness + PXCloTopCut + PXCloBottomShortness)/2
+		elseif pcs_bmi >= 30:
+			!Moderately overweight and above
+			tempRevealing = ((400 - PXCloThinness) + (500 - PXCloTopCut) + (400 - PXCloBottomShortness)) * 3/4
 		end
-		tempRevealing = tempRevealing / 2
 	end
-	tempRevealing = tempRevealing / 76
 
-	result = tempRevealing * PCloQuality
+	result = tempRevealing/ 76 * PCloQuality
 
-	killvar 'tempRevealing'
 end
 
 if $ARGS[0] = 'CalcAccessoriesBonus':

locations/stat.qsrc

@@ -1031,6 +1031,22 @@ elseif rape > 0 and rape ! rape_count and orgasm > 0 and orgasm ! orgasm_count:
 	orgasm_count = orgasm
 	rape_count = rape
 end
+!! Drug stats
+if StrongNarkota <= 0:
+	if SNarkTimes >= 3 and SLomka = 0:SLomka = 1
+end
+
+if amphCount > 3 and amphHigh <= 0:
+	addictChance = rand(1,10)
+	if addictChance > 8:
+		amphWithdrawl = 2
+	end
+end
+
+if StrongNarkota > 0:
+	if SLomka > 0:SLomka = 0
+	pcs_mood = 100
+end
 
 !!Health, Willpower, Auto Birth Control pregnancy check
 gs 'body_shape', 'RegularUpdate'