Merge remote-tracking branch 'upstream/master'

locations/AppearanceSystem.qsrc

@@ -251,16 +251,24 @@ if $ARGS[0] = 'CalcAccessoriesBonus':
 	shoesQualityBonus = ARGS[2] & !! PShoQuality
 
 	!!bonuses for certain underwear
-	if $pantyworntype = 'lusso':
+	if PanQuality = 6:
 		pantyBonus = 4
-	elseif $pantyworntype = 'fashionista':
+	elseif PanQuality = 5:
+		pantyBonus = 3
+	elseif PanQuality >= 3:
 		pantyBonus = 2
+	else
+		pantyBonus = PanQuality - 1
 	end
 
-	if $braworntype = 'lusso':
-		braBonus = 4
-	elseif $braworntype = 'fashionista':
-		braBonus = 2
+	if BraQuality = 6:
+		pantyBonus = 4
+	elseif BraQuality = 5:
+		pantyBonus = 3
+	elseif BraQuality >= 3:
+		pantyBonus = 2
+	else
+		pantyBonus = BraQuality - 1
 	end
 
 	result = coatQualityBonus + shoesQualityBonus + pantyBonus + braBonus