[Fixes]Rebalance appearance

locations/UnitAppearance.qsrc

@@ -1,10 +1,12 @@
 # UnitAppearance
 if $ARGS[0] = '':
 	*clr
+    'Hotcat'
 	'<table>'
 		'<tr>
 			<th>Desc</th>
 			<th>hotcat</th>
+			<th>bmi</th>
 			<th>bodykoef</th>
 			<th>HeadBonus</th>
 			<th>AttributeBonus</th>
@@ -17,13 +19,16 @@ if $ARGS[0] = '':
 		</tr>'
 		gs 'UnitAppearance', 'GenerateSvetas'
 	'</table>'
+end
 
+if $ARGS[0] = 'gashtest':
 end
 
 if $ARGS[0] = 'GenRow':
 	'<tr>'
 		'<td><<$svetadesc>></td>'
 		'<td><<unitHotcat>></td>'
+		'<td><<unitbmi_calc>></td>'
 		'<td><<unitbodykoef>></td>'
 		'<td><<unitHeadBonus>></td>'
 		'<td><<unitAttributeBonus>></td>'
@@ -36,9 +41,26 @@ if $ARGS[0] = 'GenRow':
 	'</tr>'
 end 
 
+if $ARGS[0] = 'GenRowBreak':
+	'<tr>'
+		'<td><<$ARGS[1]>></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+		'<td></td>'
+	'</tr>'
+end 
+
 if $ARGS[0] = 'calcHotcat':
 	unitbmi_calc = FUNC('body_shape', 'bmicalc', unitsalo, unitpcs_hgt)
-	unitbodykoef = FUNC('body_shape', 'setbodykoef', unitsalo, unitpcs_hgt, unitstrenbuf, unitsalocatnow, unitvofat, unitbmi_calc)
+	unitbodykoef = FUNC('body_shape', 'setbodykoef', unitbmi_calc, unitstrenbuf, unitsalocatnow, unitvofat)
 	unitHeadBonus = FUNC('body_shape', 'calcHeadBonus', unitpcs_lashes, unitpcs_eyesize, unitpcs_lip, unitpcs_teeth)
 	unitAttributeBonus = FUNC('body_shape', 'calcAttributeBonus', unitpcs_agil, unitpcs_vital)
 	unitpcs_apprncbase = FUNC('body_shape', 'basebeautycalc2', unitResetBase, unitvidage, unitpcs_skin, unitbodykoef, unitunitHeadBonus, unitunitAttributeBonus, unitpcs_apprncbase)
@@ -51,6 +73,72 @@ if $ARGS[0] = 'calcHotcat':
 	gs 'UnitAppearance', 'GenRow'
 end
 
+if $ARGS[0] = 'headbonus':
+	*clr
+    'HeadBonus'
+	'<table>'
+		'<tr>
+			<th>headbonus</th>
+			<th>pcs_lashes</th>
+			<th>pcs_eyesize</th>
+			<th>pcs_lip</th>
+			<th>pcs_teeth</th>
+		</tr>'
+		gs 'UnitAppearance', 'HeadBonusCalc'
+	'</table>'
+end
+
+if $ARGS[0] = 'HeadBonusCalc':
+    gs 'UnitAppearance', 'GenHeadRow', 5,3,3,-1
+    gs 'UnitAppearance', 'GenHeadRow', 4,3,4,-1
+    gs 'UnitAppearance', 'GenHeadRow', 3,2,2,0
+    gs 'UnitAppearance', 'GenHeadRow', 2,2,2,0
+    gs 'UnitAppearance', 'GenHeadRow', 1,1,1,1
+    gs 'UnitAppearance', 'GenHeadRow', 0,0,0,3
+end
+
+if $ARGS[0] = 'GenHeadRow':
+    unitHeadBonus = FUNC('body_shape', 'calcHeadBonus', ARGS[1], ARGS[2], ARGS[3], ARGS[4])
+    '<tr>'
+        '<td><<unitHeadBonus>></td>'
+        '<td><<ARGS[1]>></td>'
+        '<td><<ARGS[2]>></td>'
+        '<td><<ARGS[3]>></td>'
+        '<td><<ARGS[4]>></td>'
+    '</tr>'
+end
+
+if $ARGS[0] = 'attributebonus':
+	*clr
+    'AttributeBonus'
+	'<table>'
+		'<tr>
+			<th>attributebonus</th>
+			<th>pcs_agil</th>
+			<th>pcs_vital</th>
+		</tr>'
+		gs 'UnitAppearance', 'AttribBonusCalc'
+	'</table>'
+end
+
+if $ARGS[0] = 'AttribBonusCalc':
+    gs 'UnitAppearance', 'GenAttribRow', 100,100
+    gs 'UnitAppearance', 'GenAttribRow', 80,80
+    gs 'UnitAppearance', 'GenAttribRow', 60,60
+    gs 'UnitAppearance', 'GenAttribRow', 40,40
+    gs 'UnitAppearance', 'GenAttribRow', 20,20
+    gs 'UnitAppearance', 'GenAttribRow', 0,0
+end
+
+if $ARGS[0] = 'GenAttribRow':
+    unitAttribBonus = FUNC('body_shape', 'calcAttributeBonus', ARGS[1], ARGS[2])
+    '<tr>'
+        '<td><<unitAttribBonus>></td>'
+        '<td><<ARGS[1]>></td>'
+        '<td><<ARGS[2]>></td>'
+    '</tr>'
+end
+
 if $ARGS[0] = 'GenerateSvetas':
 
 	$svetadesc = 'Current Sveta'
@@ -89,19 +177,7 @@ if $ARGS[0] = 'GenerateSvetas':
 	unitsupnatvnesh = supnatvnesh
     unitpcs_apprncbase = pcs_apprncbase
     unitResetBase = 0
-	gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked current Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    unitpcs_apprncbase = pcs_apprncbase
-    unitResetBase = 0
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Hot Sveta'
     unitsalo = 65
@@ -139,17 +215,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Hot Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Nerd start Sveta'
     unitsalo = 132
@@ -187,17 +253,8 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
-    $svetadesc = 'Naked Nerd start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
 
     $svetadesc = 'Dancer start Sveta'
     unitsalo = 55
@@ -235,17 +292,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Dancer start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
 
     $svetadesc = 'Popular start Sveta'
@@ -284,17 +331,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Popular start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Gopnik start Sveta'
     unitsalo = 80
@@ -332,17 +369,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Gopnik start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Ugly start Sveta'
     unitsalo = 220
@@ -380,17 +407,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Ugly start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'Slut start Sveta'
     unitsalo = 60
@@ -428,17 +445,7 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
     unitpcs_apprncbase = 0
     unitResetBase = 1
-    gs 'UnitAppearance', 'calcHotcat'
-
-    $svetadesc = 'Naked Slut start Sveta'
-    unitPXCloThinness = 0
-    unitPXCloTopCut = 0
-    unitPXCloBottomShortness = 0
-    unitPCloQuality = 0
-    $unitclothingworntype = 'nude'
-    $unitpantyworntype = ''
-    $unitbraworntype = ''
-    gs 'UnitAppearance', 'calcHotcat'
+	gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
     $svetadesc = 'goth start Sveta'
     unitsalo = 45
@@ -476,20 +483,71 @@ if $ARGS[0] = 'GenerateSvetas':
     unitsupnatvnesh = 0
    unitpcs_apprncbase = 0
    unitResetBase = 1
-
-   gs 'UnitAppearance', 'calcHotcat'
-   $svetadesc = 'Naked goth start Sveta'
-   unitPXCloThinness = 0
-   unitPXCloTopCut = 0
-   unitPXCloBottomShortness = 0
-   unitPCloQuality = 0
-   $unitclothingworntype = 'nude'
-   $unitpantyworntype = ''
-   $unitbraworntype = ''
-   gs 'UnitAppearance', 'calcHotcat'
+   gs 'UnitAppearance', 'GenerateSvetaOptions', $svetadesc
 
 end
 
+if $ARGS[0] = 'GenerateSvetaOptions':
+
+
+    gs 'UnitAppearance', 'GenRowBreak', $svetadesc
+
+    $svetadesc = 'Current Clothes <<$ARGS[1]>>'
+    
+    gs 'UnitAppearance', 'calcHotcat'
+
+    $svetadesc = 'Low Clothes <<$ARGS[1]>>'
+    unitPXCloThinness = 150
+    unitPXCloTopCut = 100
+    unitPXCloBottomShortness = 100
+    unitPCloQuality = 1
+    $unitclothingworntype = ''
+    unitbonusZ = 1
+    unitPShoQuality = 1
+    $unitpantyworntype = ''
+    $unitbraworntype = ''
+    gs 'UnitAppearance', 'calcHotcat'
+
+    $svetadesc = 'Med Clothes <<$ARGS[1]>>'
+    unitPXCloThinness = 250
+    unitPXCloTopCut = 300
+    unitPXCloBottomShortness = 150
+    unitPCloQuality = 4
+    $unitclothingworntype = ''
+    unitbonusZ = 3
+    unitPShoQuality = 4
+    $unitpantyworntype = 'fashionista'
+    $unitbraworntype = 'fashionista'
+    gs 'UnitAppearance', 'calcHotcat'
+
+    $svetadesc = 'High Clothes <<$ARGS[1]>>'
+    unitPXCloThinness = 400
+    unitPXCloTopCut = 500
+    unitPXCloBottomShortness = 400
+    unitPCloQuality = 7
+    $unitclothingworntype = ''
+    unitbonusZ = 5
+    unitPShoQuality = 7
+    $unitpantyworntype = 'boutique'
+    $unitbraworntype = 'boutique'
+    gs 'UnitAppearance', 'calcHotcat'
+
+    $svetadesc = 'Naked <<$ARGS[1]>>'
+    unitPXCloThinness = 0
+    unitPXCloTopCut = 0
+    unitPXCloBottomShortness = 0
+    unitPCloQuality = 0
+    $unitclothingworntype = 'nude'
+    $unitpantyworntype = ''
+    $unitbraworntype = ''
+    gs 'UnitAppearance', 'calcHotcat'
+
+    gs 'UnitAppearance', 'GenRowBreak', ''
+
+end 
+
+
+
 if $ARGS[0] = 'CurVal':
     $SvetaDesc = input("Enter a description for Sveta")
 	*clr

locations/body.qsrc

@@ -2400,9 +2400,9 @@ if $ARGS[0] = 'calcClothesBonus':
 
 	if $tempclothingworntype = 'nude':
 		!! needs a rethink as this is skewing the results
-		tempCloAdjustedBeauty =  temppcs_apprncbase
+		tempCloAdjustedBeauty =  0
 	else
-		tempCloAdjustedBeauty = temppcs_apprncbase * tempRevealing * tempPCloQuality / 5000
+		tempCloAdjustedBeauty = temppcs_apprncbase * tempRevealing * tempPCloQuality / 10000
 	end
 
 	if $tempclothingworntype = 'exercise': tempCloAdjustedBeauty = tempCloAdjustedBeauty * 2 / 3

locations/body_shape.qsrc

@@ -245,7 +245,7 @@ if $ARGS[0] = '':
 
 !!Setting the pcs_apprnc bonus based on fat and strength
 	bmi_calc = FUNC('body_shape', 'bmicalc', salo, pcs_hgt)
-	bodykoef = FUNC('body_shape', 'setbodykoef', salo, pcs_hgt, strenbuf, salocatnow, vofat, bmi_calc)
+	bodykoef = FUNC('body_shape', 'setbodykoef', bmi_calc, strenbuf, salocatnow, vofat)
 
 !!This is to clean up unused variables
 	killvar 'normbuffpick' & killvar 'nrmbfpckct'
@@ -255,17 +255,15 @@ end
 
 if $ARGS[0] = 'setbodykoef':
 	!!Setting the pcs_apprnc bonus based on fat and strength
-	tempbodyFat = ARGS[1] & !!salo
-	temppcs_hgt = ARGS[2] & !!pcs_hgt
-	tempstrenbuf = ARGS[3] & !!strenbuf
-	tempsalocatnow = ARGS[4] & !! salocatnow
-	tempvofat = ARGS[5] & !! vofat
-	tempbmi_calc = ARGS[6] & !! result of bmicalc
+	tempbmi_calc = ARGS[1] & !! result of bmicalc
+	tempstrenbuf = ARGS[2] & !!strenbuf
+	tempsalocatnow = ARGS[3] & !! salocatnow
+	tempvofat = ARGS[4] & !! vofat
 
 	if tempbmi_calc < 16:
 		tempbodykoef = 35
     elseif tempbmi_calc < 19:
-		botempbodykoefdykoef = 70
+		tempbodykoef = 70
     elseif tempbmi_calc < 25:
 		tempbodykoef = 90
     elseif tempbmi_calc < 30:
@@ -588,18 +586,17 @@ if $args[0] = 'basebeautycalc2':
 
 !!	Setting vidagebonus
 	vidagebonus = 100
-	if tempvidage < 20: vidagebonus = 60 + 2 * tempvidage
-	if tempvidage > 30: vidagebonus = 160 - 2 * tempvidage
+	if tempvidage < 20: vidagebonus = 60 + (2 * tempvidage)
+	if tempvidage > 30: vidagebonus = 160 - (2 * tempvidage)
 
 !!	Preforming the calculation
 	skincalc = (temppcs_skin * 2 / 5)
-	bodykoefcalc = (3 * (2 + tempbodykoef))
-	vneshtemp = vidagebonus * (skincalc + bodykoefcalc + tempAttributeBonus + tempHeadBonus) / 100
+	vneshtemp = vidagebonus * (skincalc + tempbodykoef + tempAttributeBonus + tempHeadBonus) / 100
 
 !!	pcs_skin = skin condition, corrected to a 0 to 40 range; bodykoef set in main body_shape; pcs_teeth is missing teeth or cosmetically improved teeth (-1)
 
 !!	This is the first limiter
-	if vneshtemp > 100: vneshtemp = 100
+	!!if vneshtemp > 100: vneshtemp = 100
 
 !!	This adds the supernatural pcs_apprnc bonus; currently Bimbo and Succubus
 	vneshtemp += supnatvnesh
@@ -613,7 +610,6 @@ if $args[0] = 'basebeautycalc2':
 	!!do not kill vneshtemp here it gets killed in basebeautycalc
 	killvar 'temppcs_apprncbase'
 	killvar 'skincalc'
-	killvar 'bodykoefcalc'
 	killvar 'tempvidage'
 	killvar 'temppcs_skin'
 	killvar 'tempbodykoef'