[fixed] Checks for the stat display popups and arousal increases for thin underwear were using old underwear variables and not the new attributes

locations/stat.qsrc

@@ -662,9 +662,9 @@ if minut >= 60:
 	if pcs_mood < 60 and $braworntype = 'cats': pcs_mood += 2
 
 !!Arousal adjustments
-	if ($pantyworntype = 'salacious' and $braworntype = 'salacious') and pcs_horny < 25:
+	if (PanThinness >= 5 and BraThinness >= 5) and pcs_horny < 25:
 		pcs_horny += 10
-	elseif pcs_horny < 10 and ($pantyworntype = 'salacious' or $braworntype = 'salacious'):
+	elseif pcs_horny < 10 and (PanThinness >= 5 or BraThinness >= 5):
 		pcs_horny += 5
 	end
 

locations/stat_display.qsrc

@@ -446,27 +446,12 @@ $stat_bra_text = ''
 
 if $clothingworntype ! 'nude':
 	if PCloThinness = 6:
-		if PCloswimwear = 1:
-			$stat_bra_msg = 'Your breasts are completely visible through your transparent swimsuit.'
-			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'salacious':
-			$stat_bra_msg = 'Your breasts are clearly visible through your transparent bra and top.'
-			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
-		elseif $braworntype ! 'none':
+		if $braworntype ! 'none':
 			$stat_bra_msg = 'Your bra is clearly showing through your transparent top.'
 			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
-		else
-			$stat_bra_msg = 'Your breasts are fully on display through your transparent top.'
-			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
 		end
 	elseif PCloThinness = 5:
-		if PCloswimwear = 1:
-			$stat_bra_msg = 'The shape of your nipples is completely visible through your swimsuit.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'salacious':
-			$stat_bra_msg = 'The shape of your nipples is completely visible through your thin top and bra.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype ! 'none':
+		if $braworntype ! 'none':
 			if PCloDress = 1:
 				$stat_bra_msg = 'The shape and color of your bra is visible through your dress.'
 				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
@@ -474,54 +459,17 @@ if $clothingworntype ! 'nude':
 				$stat_bra_msg = 'The shape and color of your bra is visible through your top.'
 				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 			end
-		elseif $braworntype = 'none' and pcs_horny >= 50:
-			$stat_bra_msg = 'Your aroused nipples are hard and showing through your top.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'none' and temper < 14:
-			$stat_bra_msg = 'Your nipples are freezing cold and visibly hard through your top.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif PCloBra = 1:
-			$stat_bra_msg = 'Your top is replacing a bra.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'none':
-			if PCloDress = 1:
-				$stat_bra_msg = 'The shape of your nipples is completely visible through your thin dress.'
-				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-			else
-				$stat_bra_msg = 'The shape of your nipples is completely visible through your thin top.'
-				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-			end
 		end
 	elseif PCloThinness = 4:
-		if PCloswimwear = 1:
-			$stat_bra_msg = 'Your nipples are slightly poking through your swimsuit.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'salacious':
-			$stat_bra_msg = 'You are wearing such a thin bra that your nipples are still being faintly outlined through your top.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype ! 'none':
-			$stat_bra_msg = 'Your bra is being outlined through your top.'
-		elseif $braworntype = 'none' and pcs_horny >= 50:
-			$stat_bra_msg = 'Your aroused nipples are visibly hard.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'none' and temper < 14:
-			$stat_bra_msg = 'Your nipples are freezing cold and visibly hard through your top.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif PCloBra = 1:
-			$stat_bra_msg = 'Your top is replacing a bra.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
-		elseif $braworntype = 'none':
-			if CloDress = 1:
-				$stat_bra_msg = 'The shape of your nipples is faintly visible through your dress.'
+		if $braworntype ! 'none':
+			if PCloDress = 1:
+				$stat_bra_msg = 'The outline of your bra is visible through your dress.'
 				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 			else
-				$stat_bra_msg = 'The shape of your nipples is faintly visible through your top.'
+				$stat_bra_msg = 'Your outline of your bra is visible through your top.'
 				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 			end
 		end
-	elseif PCloBra = 1:
-			$stat_bra_msg = 'Your top is replacing a bra.'
-			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 	elseif $braworntype = 'none' and pcs_horny >= 50:
 		$stat_bra_msg = 'You are not wearing a bra and your aroused nipples are rock hard.'
 		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
@@ -530,96 +478,167 @@ if $clothingworntype ! 'nude':
 		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 	elseif $braworntype = 'none':
 		if pcs_cupsize <= 5:
-			$stat_bra_msg = 'You are not wearing a bra and your flat chest feels comfortable against the inside of your clothes.'
+			$stat_bra_msg = 'You are not wearing a bra and your <<$pcdesc_breasts>> breasts feel comfortable against the inside of your clothes.'
 !!			$titsize = 'AA cup'
 		elseif pcs_cupsize <= 10:
-			$stat_bra_msg = 'You are not wearing a bra and your modest breasts ever so slightly bounce as you walk.'
+			$stat_bra_msg = 'You are not wearing a bra and your <<$pcdesc_breasts>> breasts ever so slightly bounce as you walk.'
 !!			$titsize = 'A cup'
 		elseif pcs_cupsize <= 15:
-			$stat_bra_msg = 'You are not wearing a bra and your pert breasts jiggle softly as you walk.'
+			$stat_bra_msg = 'You are not wearing a bra and your <<$pcdesc_breasts>> breasts jiggle softly as you walk.'
 !!			$titsize = 'B cup'
 		elseif pcs_cupsize <= 20:
-			$stat_bra_msg = 'You are not wearing a bra and your breasts bounce with every step.'
+			$stat_bra_msg = 'You are not wearing a bra and your <<$pcdesc_breasts>> breasts bounce with every step.'
 !!			$titsize = 'C cup'
 		elseif pcs_cupsize <= 30:
-			$stat_bra_msg = 'You are not wearing a bra and your large breasts bounce with every step.'
+			$stat_bra_msg = 'You are not wearing a bra and your <<$pcdesc_breasts>> breasts bounce with every step.'
 !!			$titsize = 'E cup'
 		else
-			$stat_bra_msg = 'You are not wearing a bra and your enormous breasts bounce dramatically with every step.'
+			$stat_bra_msg = 'You are not wearing a bra and your <<$pcdesc_breasts>> breasts bounce dramatically with every step.'
 !!			$titsize = 'K cup'
 		end
 		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 	end
+	if PCloBra = 1:
+		$stat_bra_msg = 'Your top is replacing your bra.'
+		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+	end
+	if CoverTop = 4:
+		$stat_bra_msg = 'Your <<$pcdesc_breasts>> breasts are completely exposed.'
+		$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
+	elseif CoverTop = 3:
+		$stat_bra_msg = 'Your <<$pcdesc_breasts>> breasts are clearly visible through your clothing.'
+		$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
+	elseif CoverTop = 3:
+		$stat_bra_msg = 'Your <<$pcdesc_breasts>> breasts are visible through your clothing.'
+		$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
+	elseif CoverTop = 3:
+		$stat_bra_msg = 'Your <<$pcdesc_breasts>> breasts are barely visible through your clothing.'
+		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+	end
 end
 
 $stat_panty_msg = ''
 $stat_panty_text = ''
 
-if $pantyworntype = 'none' and PCloswimwear = 0 and PCloPanties = 0:
-	if PCloStyle = 4:
-		$stat_panty_msg = 'You are not wearing panties, but you are dressed as a hooker, so that''s hardly surprising.'
-		$stat_panty_text = '<BR><font color= #FF00FF><<$stat_panty_msg>></font>'
-	elseif PCloBimbo = 1 or bimbolevel > 0 and PCloSkirt > 3 and cheatBimbo = 0:
-		$stat_panty_msg = 'You like, totally forgot to put on any panties. You are such a bimbo.'
-		$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
-	elseif PCloSkirt > 3 and pcs_traits['commando_lvl'] > 0:
-		$stat_panty_msg = 'You feel liberated not wearing panties as your naked ass flashes from under your short skirt.'
-		$stat_panty_text = '<BR><font color=#0064FF><<$stat_panty_msg>></font>'
-	elseif PCloSkirt > 3 and pcs_traits['commando_lvl'] < 1:
-		if pcs_inhib <= 50:
-			$stat_panty_msg = 'Your face is flushed with shame. You are not wearing panties, and your naked ass flashes from under your short skirt.'
-		else
-			$stat_panty_msg = 'It feels odd and a bit uncomfortable not wearing panties with such a short skirt. Your naked ass flashes from under it.'
+if $clothingworntype ! 'nude':
+	if PCloThinness = 6:
+		if $pantyworntype ! 'none':
+			if PCloDress = 1:
+				$stat_panty_msg = 'Your panties are clearly showing through your transparent dress.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			elseif PCloSkirt > 0:
+				$stat_panty_msg = 'Your panties are clearly showing through your transparent skirt.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			else
+				$stat_panty_msg = 'Your panties are clearly showing through your transparent pants.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			end
+		end
+	elseif PCloThinness = 5:
+		if $pantyworntype ! 'none':
+			if PCloDress = 1:
+				$stat_panty_msg = 'The shape and color of your panties are visible through your dress.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			elseif PCloSkirt > 0:
+				$stat_panty_msg = 'The shape and color of your panties are visible through your skirt.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			else
+				$stat_panty_msg = 'The shape and color of your panties are visible through your pants.'
+				$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+			end
+		end
+	elseif PCloThinness = 4:
+		elseif $pantyworntype ! 'none':
+			if PCloDress = 1:
+				$stat_panty_msg = 'The outline of your panties is visible through your dress.'
+				$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+			elseif PCloSkirt > 0:
+				$stat_panty_msg = 'The outline of your panties is visible through your skirt.'
+				$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+			else
+				$stat_panty_msg = 'The outline of your panties is visible through your pants.'
+				$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+			end
 		end
-		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	elseif PCloPants > 0 and pcs_traits['commando_lvl'] = 2:
-		$stat_panty_msg = 'You are comfortably commando, not bothered at all by your bare pussy rubbing against the inside of your pants.'
-	elseif PCloPants > 0 and pcs_traits['commando_lvl'] = 3:
-		$stat_panty_msg = 'You are happily commando, feeling very comfortable with your ass and pussy touching the inside of your pants.'
-	elseif PCloPants > 0 and $braworntype = 'none':
-		$stat_panty_msg = 'You aren''t wearing underwear, and your bare pussy is rubbing against your clothing.'
-		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	elseif PCloPants > 0 and $braworntype ! 'none':
-		$stat_panty_msg = 'You aren''t wearing panties, and your bare pussy is rubbing against your clothing.'
-		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	elseif towel = 1:
-		$stat_panty_msg = 'Your naked body is covered only by a short towel.'
+	elseif $pantyworntype = 'none':
+		$stat_panty_msg = 'You are not wearing a panties.'
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
-	elseif $clothingworntype ! 'nude' and pcs_traits['commando_lvl'] < 1:
-		$stat_panty_msg = 'You are not wearing panties and it makes you uncomfortable.'
+	end
+
+	if PCloPants = 1:
+		$stat_panty_msg = 'Your outfit is replacing your panties.'
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
-	elseif $clothingworntype ! 'nude':
-		$stat_panty_msg = 'You are not wearing panties.'
-	end
-elseif $pantyworntype = 'salacious' and PCloswimwear = 0:
-	if PCloStyle = 4:
-		$stat_panty_msg = 'You are wearing see-through panties, but you are dressed as a hooker, so that''s hardly surprising.'
-		$stat_panty_text = '<BR><font color= #FF00FF><<$stat_panty_msg>></font>'
-	elseif PCloSkirt > 3 and pcs_inhib > 50:
-		$stat_panty_msg = 'Your ass is clearly visible through your panties, is flashing from under your short skirt.'
-		$stat_panty_text = '<BR><font color=#0064FF><<$stat_panty_msg>></font>'
-	elseif PCloSkirt > 3 and pcs_inhib <= 50:
-		$stat_panty_msg = 'Your face is flushed with shame. You are wearing panties so thin they leave your ass clearly visible as it flashes from under your short skirt.'
-		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	elseif PCloPants > 0 and pcs_traits['commando_lvl'] = 3:
-		$stat_panty_msg = 'You wearing transparent panties, but that you''re wearing any at all is bringing down your mood.'
-		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	end
-elseif $pantyworntype ! 'none' and pcs_traits['commando_lvl'] = 3:
-	$stat_panty_msg = 'You wearing panties and it makes you uncomfortable.'
-	$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
+	end
+
+	if CoverBack = 4:
+		if CoverFront = 4:
+			$stat_panty_msg = 'Your pussy and butt are completely exposed.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 3:
+			$stat_panty_msg = 'Your pussy is clearly visible and your butt completely exposed through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 2:
+			$stat_panty_msg = 'Your pussy is visible and your butt completely exposed through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 1:
+			$stat_panty_msg = 'Your pussy is barely visible and your butt completely exposed through your clothing.'
+			$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+		end
+	elseif CoverBack = 3:
+		if CoverFront = 4:
+			$stat_panty_msg = 'Your butt is clearly visible and your pussy completely exposed.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 3:
+			$stat_panty_msg = 'Your pussy and your butt are clearly visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 2:
+			$stat_panty_msg = 'Your pussy is visible and your butt clearly visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 1:
+			$stat_panty_msg = 'Your pussy is barely visible and your butt clearly visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+		end
+	elseif CoverBack = 2:
+		if CoverFront = 4:
+			$stat_panty_msg = 'Your butt is visible and your pussy completely exposed.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 3:
+			$stat_panty_msg = 'Your pussy is clearly visible and your butt visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 2:
+			$stat_panty_msg = 'Your pussy and butt are visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 1:
+			$stat_panty_msg = 'Your pussy is barely visible and your butt visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+		end
+	elseif CoverBack = 1:
+		if CoverFront = 4:
+			$stat_panty_msg = 'Your butt is barely visible and your pussy completely exposed.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 3:
+			$stat_panty_msg = 'Your pussy is clearly visible and your butt barely visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 2:
+			$stat_panty_msg = 'Your pussy is visible and your butt barely visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
+		elseif CoverFront = 1:
+			$stat_panty_msg = 'Your pussy and your butt are barely visible through your clothing.'
+			$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
+		end
+	end
 end
 
 $stat_clothes_msg = ''
 $stat_clothes_text = ''
 
 if $clothingworntype = 'nude':
-	if $pantyworntype = 'salacious':
-		if $braworntype = 'none':
+	if PanThinness >= 5:
+		if BraThinness >= 5:
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through panties, and your boobs sway invitingly as you walk.</font>'
 			$stat_clothes_tooltip = 'You are wearing your see-through panties.'
 			$stat_clothes_msg = 'You are only wearing your see-through panties, and your boobs sway invitingly as you walk.'
-		elseif $braworntype = 'salacious':
+		elseif BraThinness >= 5:
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through underwear.</font>'
 			$stat_clothes_tooltip = 'You are wearing your see-through underwear.'
 			$stat_clothes_msg = 'You are only wearing your see-through underwear.'
@@ -633,7 +652,7 @@ if $clothingworntype = 'nude':
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your panties, and your boobs sway invitingly as you walk.</font>'
 			$stat_clothes_tooltip = 'You are wearing your panties.'
 			$stat_clothes_msg = 'You are only wearing your panties, and your boobs sway invitingly as you walk.'
-		elseif $braworntype = 'salacious':
+		elseif BraThinness >= 5:
 			$stat_clothes_text = '<BR><font color = #AB052A>You are only wearing your see-through bra and panties.</font>'
 			$stat_clothes_tooltip = 'You are wearing your see-through bra and panties.'
 			$stat_clothes_msg = 'You are only wearing your see-through bra and panties.'