Browse Source

[fixed] Some inconsistancies if clothing replaced panties/bra

Kevin_Smarts 2 years ago
parent
commit
a038236d90
3 changed files with 14 additions and 13 deletions
  1. 1 0
      locations/clothing.qsrc
  2. 4 4
      locations/shortgs.qsrc
  3. 9 9
      locations/stat_display.qsrc

+ 1 - 0
locations/clothing.qsrc

@@ -1693,6 +1693,7 @@ if $ARGS[0] = 'strip':
 	PShoHeels = 0
 	PShoStyle = 0
 	PCloPanties = 0
+	PCloBra = 0
 	PCloQuality = 0
 	PCloThinness = 0
 	PCloTopCut = 0

+ 4 - 4
locations/shortgs.qsrc

@@ -741,13 +741,13 @@ if $ARGS[0] = 'clothing_state':
 		'You are just wearing panties.'
 	elseif $clothingworntype = 'nude' and $pantyworntype = 'none':
 		'You are just wearing a bra.'
-	elseif 'clothing_state' = 'nude':
+	elseif $clothingworntype = 'nude':
 		'You are in your underwear.'
-	elseif $braworntype = 'none' and $pantyworntype = 'none':
+	elseif $braworntype = 'none' and $pantyworntype = 'none' and PCloPanties = 0 and PCloBra = 0:
 		'You are not wearing any underwear.'
-	elseif $pantyworntype = 'none':
+	elseif $pantyworntype = 'none' and PCloPanties = 0:
 		'You are not wearing panties'
-	else
+	elseif PCloBra = 0:
 		'You are not wearing a bra'
 	end
 end

+ 9 - 9
locations/stat_display.qsrc

@@ -369,7 +369,7 @@ $stat_bra_msg = ''
 $stat_bra_text = ''
 
 if $clothingworntype ! 'nude':
-	if CloThinness = 6:
+	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>'
@@ -383,7 +383,7 @@ if $clothingworntype ! 'nude':
 			$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 CloThinness = 5:
+	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>'
@@ -391,7 +391,7 @@ if $clothingworntype ! 'nude':
 			$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 CloDress = 1:
+			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>'
 			else
@@ -404,11 +404,11 @@ if $clothingworntype ! 'nude':
 		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 CloBra = 1:
+		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:
+			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
@@ -416,7 +416,7 @@ if $clothingworntype ! 'nude':
 				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 			end
 		end
-	elseif CloThinness = 4:
+	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>'
@@ -431,7 +431,7 @@ if $clothingworntype ! 'nude':
 		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 CloBra = 1:
+		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':
@@ -443,7 +443,7 @@ if $clothingworntype ! 'nude':
 				$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 			end
 		end
-	elseif CloBra = 1:
+	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:
@@ -461,7 +461,7 @@ end
 $stat_panty_msg = ''
 $stat_panty_text = ''
 
-if $pantyworntype = 'none' and PCloswimwear = 0:
+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>'