[added] Ability to add bodysuits to stored outfits and pair for sets of bras and panties so you can buy and wear them from one or the other part of the set.

locations/_attributes_lusso_bra.qsrc

@@ -1,4 +1,4 @@
-# $_attributes_lusso_bra
+# $attributes_lusso_bra
 
 
 if ARGS[1] = 1:
@@ -7,7 +7,7 @@ if ARGS[1] = 1:
 	BraType = 5
 	BraFun = 1
 	BraThinness = 2
-	underwear['set'] = 1
+	underwear['pair'] = 1
 
 elseif ARGS[1] = 2:
 	BraQuality = 2
@@ -15,7 +15,7 @@ elseif ARGS[1] = 2:
 	BraType = 5
 	BraFun = 1
 	BraThinness = 3
-	underwear['set'] = 2
+	underwear['pair'] = 2
 
 elseif ARGS[1] = 3:
 	BraQuality = 3
@@ -23,57 +23,57 @@ elseif ARGS[1] = 3:
 	BraType = 9
 	BraFun = 1
 	BraThinness = 5
-	underwear['set'] = 3
+	underwear['pair'] = 3
 
 elseif ARGS[1] = 4:
 	BraQuality = 3
 	BraType = 2
 	BraFun = 1
 	BraThinness = 2
-	underwear['set'] = 4
+	underwear['pair'] = 4
 
 elseif ARGS[1] = 5:
 	BraQuality = 2
 	BraType = 3
 	BraFun = 1
 	BraThinness = 2
-	underwear['set'] = 5
+	underwear['pair'] = 5
 
 elseif ARGS[1] = 6:
 	BraQuality = 3
 	BraType = 1
 	BraFun = 1
 	BraThinness = 2
-	underwear['set'] = 6
+	underwear['pair'] = 6
 
 elseif ARGS[1] = 7:
 	BraQuality = 4
 	BraType = 9
 	BraFun = 1
 	BraThinness = 2
-	underwear['set'] = 7
+	underwear['pair'] = 7
 
 elseif ARGS[1] = 8:
 	BraQuality = 1
 	BraType = 4
 	BraFun = 1
 	BraThinness = 2
-	underwear['set'] = 8
+	underwear['pair'] = 8
 
 elseif ARGS[1] = 9:
 	BraQuality = 3
 	BraType = 3
 	BraFun = 1
 	BraThinness = 2
-	underwear['set'] = 9
+	underwear['pair'] = 9
 
 elseif ARGS[1] = 10:
 	BraQuality = 4
 	BraType = 9
 	BraFun = 1
 	BraThinness = 2
-	underwear['set'] = 10
+	underwear['pair'] = 10
 end
 
---- $_attributes_lusso_bra ---------------------------------
+--- $attributes_lusso_bra ---------------------------------
 

locations/_attributes_lusso_panties.qsrc

@@ -1,16 +1,10 @@
-# $_attributes_lusso_panties
+# $attributes_lusso_panties
 
 
 if ARGS[1] = 1:
-	BraQuality = 2
-	BraMaterial = 3
-	BraType = 6
-	BraFun = 1
+	PanType = 1
 	PanThinness = 6
-	BraThinness = 6
-	PanExpose = 4
-	PanButt = 4
-	underwear['set'] = 1
+	underwear['pair'] = 1
 
 elseif ARGS[1] = 2:
 	BraQuality = 3
@@ -20,7 +14,7 @@ elseif ARGS[1] = 2:
 	PanThinness = 5
 	BraThinness = 3
 	PanButt = 3
-	underwear['set'] = 1
+	underwear['pair'] = 2
 
 elseif ARGS[1] = 3:
 	BraQuality = 3
@@ -31,7 +25,7 @@ elseif ARGS[1] = 3:
 	BraThinness = 4
 	PanExpose = 1
 	PanButt = 2
-	underwear['set'] = 1
+	underwear['pair'] = 3
 
 elseif ARGS[1] = 4:
 	BraQuality = 3
@@ -42,7 +36,7 @@ elseif ARGS[1] = 4:
 	BraThinness = 4
 	PanExpose = 4
 	PanButt = 4
-	underwear['set'] = 1
+	underwear['pair'] = 4
 
 elseif ARGS[1] = 5:
 	BraQuality = 2
@@ -53,7 +47,7 @@ elseif ARGS[1] = 5:
 	BraThinness = 5
 	PanExpose = 4
 	PanButt = 4
-	underwear['set'] = 1
+	underwear['pair'] = 5
 
 elseif ARGS[1] = 6:
 	BraQuality = 3
@@ -64,7 +58,7 @@ elseif ARGS[1] = 6:
 	BraThinness = 6
 	PanExpose = 4
 	PanButt = 4
-	underwear['set'] = 1
+	underwear['pair'] = 6
 
 elseif ARGS[1] = 7:
 	BraQuality = 4
@@ -73,7 +67,7 @@ elseif ARGS[1] = 7:
 	PanThinness = 2
 	BraThinness = 3
 	PanButt = 4
-	underwear['set'] = 1
+	underwear['pair'] = 7
 
 elseif ARGS[1] = 8:
 	BraQuality = 1
@@ -83,7 +77,7 @@ elseif ARGS[1] = 8:
 	PanThinness = 6
 	BraThinness = 6
 	PanButt = 4
-	underwear['set'] = 1
+	underwear['pair'] = 8
 
 elseif ARGS[1] = 9:
 	BraQuality = 3
@@ -93,7 +87,7 @@ elseif ARGS[1] = 9:
 	PanThinness = 6
 	BraThinness = 6
 	PanButt = 4
-	underwear['set'] = 1
+	underwear['pair'] = 9
 
 elseif ARGS[1] = 10:
 	BraQuality = 4
@@ -103,8 +97,8 @@ elseif ARGS[1] = 10:
 	PanThinness = 6
 	BraThinness = 1
 	PanButt = 4
-	underwear['set'] = 1
+	underwear['pair'] = 10
 end
 
---- $_attributes_lusso_panties ---------------------------------
+--- $attributes_lusso_panties ---------------------------------
 

locations/bras.qsrc

@@ -107,18 +107,15 @@ if $ARGS[0] = 'view_bra_item':
 
 	cla
 	'<center><img src="<<FUNC(''$bra_image'',  $ARGS[2], ARGS[3])>>"></center>'
-!!	gs 'bra_attributes', $ARGS[2], ARGS[3]
+	gs 'underwear_attributes', $ARGS[2]+'_bras', ARGS[3]
 !!	$RESULT = FUNC('$short_description', $ARGS[2], CloStyle2)
 !!	$RESULT += '<<ARGS[3]>>'
 !!	'<<$RESULT>>'
-	gs 'bras', 'descriptions', $ARGS[2]
-	if underwear['set'] ! 0:
-		'This bra forms a set with panty #<<underwear[''set'']>>.'
-		if dyneval('RESULT = <<$ARGS[2]>>_panties[<<underwear[''set'']>>]') = 1:
-			'You own these panties and can wear this set.'
-		else
-			'You do not own these panties so you cannot wear this set.'
-		end
+	if BraQuality > 0:
+		gs 'underwear_descriptions', 'bras'
+		'This bra forms a set with panty #<<underwear[''pair'']>>.'
+	else
+		gs 'bras', 'descriptions', $ARGS[2]
 	end
 
 	if $ARGS[1] = 'shop':
@@ -149,32 +146,37 @@ if $ARGS[0] = 'view_bra_item':
 			else
 				'You do not have enough money in your bank to buy this bra.'
 			end
-			if dyneval('RESULT = <<$ARGS[2]>>_panties[<<underwear[''set'']>>]') = 0:
-				price_set = ARGS[4]*10/9
-				'price for set: <<price_set>> <b>₽</b>'
-				if money >= price_set:
-					act 'Buy (cash)':
-						money -= price_set
-						dynamic $ARGS[2] + '_bras[<<ARGS[3]>>] = 1'
-						dynamic $ARGS[2] + '_brasS[<<ARGS[3]>>] = 0'
-						dynamic $ARGS[2] + '_panties[<<underwear[''set'']>>] = 1'
-						dynamic $ARGS[2] + '_pantiesS[<<underwear[''set'']>>] = 0'
-						gt $loc, $loc_arg
-					end
+			if underwear['pair'] > 0:
+				if dyneval('RESULT = <<$ARGS[2]>>_panties[<<underwear[''pair'']>>]') = 1:
+					'You own the matching panties buying this bra will complete the set.'
 				else
-					'You do not have enough cash to buy this set.'
-				end
-				if karta + bankDebtLimit >= price_set:
-					act 'Buy (card)':
-						karta -= price_set
-						dynamic $ARGS[2] + '_bras[<<ARGS[3]>>] = 1'
-						dynamic $ARGS[2] + '_brasS[<<ARGS[3]>>] = 0'
-						dynamic $ARGS[2] + '_panties[<<underwear[''set'']>>] = 1'
-						dynamic $ARGS[2] + '_pantiesS[<<underwear[''set'']>>] = 0'
-						gt $loc, $loc_arg
+					'You do not own the matching panties, you can buy this bra and them as a set.'
+					price_set = ARGS[4]*18/10
+					'Price for set: <<price_set>> <b>₽</b>'
+					if money >= price_set:
+						act 'Buy set (cash)':
+							money -= price_set
+							dynamic $ARGS[2] + '_bras[<<ARGS[3]>>] = 1'
+							dynamic $ARGS[2] + '_brasS[<<ARGS[3]>>] = 0'
+							dynamic $ARGS[2] + '_panties[<<underwear[''pair'']>>] = 1'
+							dynamic $ARGS[2] + '_pantiesS[<<underwear[''pair'']>>] = 0'
+							gt $loc, $loc_arg
+						end
+					else
+						'You do not have enough cash to buy this set.'
+					end
+					if karta + bankDebtLimit >= price_set:
+						act 'Buy set (card)':
+							karta -= price_set
+							dynamic $ARGS[2] + '_bras[<<ARGS[3]>>] = 1'
+							dynamic $ARGS[2] + '_brasS[<<ARGS[3]>>] = 0'
+							dynamic $ARGS[2] + '_panties[<<underwear[''pair'']>>] = 1'
+							dynamic $ARGS[2] + '_pantiesS[<<underwear[''pair'']>>] = 0'
+							gt $loc, $loc_arg
+						end
+					else
+						'You do not have enough money in your bank to buy this set.'
 					end
-				else
-					'You do not have enough money in your bank to buy this set.'
 				end
 			end
 		end
@@ -235,99 +237,104 @@ if $ARGS[0] = 'view_bra_item':
 							end
 						end
 					end
-				end
-				if underwear['set'] ! 0 and dyneval('RESULT = <<$ARGS[2]>>_panties[<<underwear[''set'']>>]') = 1:
-					act 'Wear set':
-						if CloBra = 1:
-							msg'You cannot wear a bra with this top'
-						elseif CloPanties = 1:
-							msg'You cannot wear a panties with this outfit'
-						else
-							if hypnoBra > 0 and hypnoPanty > 0:
-								cla
-								*clr
-								'You pick up the bra and panties and think about trying them on... but you don''t really like wearing underwear.'
-								gs 'willpower', 'misc', 'resist'
-								will_cost += hypnoTime
-								if will_cost <= pcs_willpwr:
-									act 'Wear it anyway anyways (<<will_cost>> Willpower)':
-										gs 'willpower', 'pay', 'resist'
-										gs 'stat'
-										gs 'panties', 'wear', $ARGS[2], underwear['set']
-										gs 'bras', 'wear', $ARGS[2], ARGS[3]
-		
-										if $ARGS[1] = 'wardrobe':
+					if underwear['pair'] > 0:
+						if dyneval('RESULT = <<$ARGS[2]>>_panties[<<underwear[''pair'']>>]') = 1:
+							'You own these panties and can wear this set.'
+							act 'Wear set':
+								if CloBra = 1:
+									msg'You cannot wear a bra with this top'
+								elseif CloPanties = 1:
+									msg'You cannot wear a panties with this outfit'
+								else
+									if hypnoBra > 0 and hypnoPanty > 0:
+										cla
+										*clr
+										'You pick up the bra and panties and think about trying them on... but you don''t really like wearing underwear.'
+										gs 'willpower', 'misc', 'resist'
+										will_cost += hypnoTime
+										if will_cost <= pcs_willpwr:
+											act 'Wear it anyway anyways (<<will_cost>> Willpower)':
+												gs 'willpower', 'pay', 'resist'
+												gs 'stat'
+												gs 'panties', 'wear', $ARGS[2], underwear['pair']
+												gs 'bras', 'wear', $ARGS[2], ARGS[3]
+				
+												if $ARGS[1] = 'wardrobe':
+													gt 'wardrobe', 'main'
+												else
+													gt $loc, $loc_arg
+												end
+											end
+										else
+											act 'Wear it anyway anyways (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+										end
+										act 'Back':
 											gt 'wardrobe', 'main'
+										end
+									elseif hypnoBra > 0:
+										cla
+										*clr
+										'You pick up the bra and think about trying them on... but you don''t really like wearing bras.'
+										gs 'willpower', 'misc', 'resist', 'easy'
+										will_cost += hypnoTime
+										if will_cost <= pcs_willpwr:
+											act 'Put them on anyways (<<will_cost>> Willpower)':
+												gs 'willpower', 'pay', 'resist'
+												gs 'stat'
+												gs 'panties', 'wear', $ARGS[2], underwear['pair']
+												gs 'bras', 'wear', $ARGS[2], ARGS[3]
+				
+												if $ARGS[1] = 'wardrobe':
+													gt 'wardrobe', 'main'
+												else
+													gt $loc, $loc_arg
+												end
+											end
 										else
-											gt $loc, $loc_arg
+											act 'Put them on anyways (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 										end
-									end
-								else
-									act 'Wear it anyway anyways (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-								end
-								act 'Back':
-									gt 'wardrobe', 'main'
-								end
-							elseif hypnoBra > 0:
-								cla
-								*clr
-								'You pick up the bra and think about trying them on... but you don''t really like wearing bras.'
-								gs 'willpower', 'misc', 'resist', 'easy'
-								will_cost += hypnoTime
-								if will_cost <= pcs_willpwr:
-									act 'Put them on anyways (<<will_cost>> Willpower)':
-										gs 'willpower', 'pay', 'resist'
-										gs 'stat'
-										gs 'panties', 'wear', $ARGS[2], underwear['set']
-										gs 'bras', 'wear', $ARGS[2], ARGS[3]
-		
-										if $ARGS[1] = 'wardrobe':
+										act 'Back':
 											gt 'wardrobe', 'main'
+										end
+									elseif hypnoPanty > 0:
+										cla
+										*clr
+										'You pick up the panties and think about trying them on... but you don''t really like wearing panties.'
+										gs 'willpower', 'misc', 'resist', 'easy'
+										will_cost += hypnoTime
+										if will_cost <= pcs_willpwr:
+											act 'Put them on anyways (<<will_cost>> Willpower)':
+												gs 'willpower', 'pay', 'resist'
+												gs 'stat'
+												gs 'panties', 'wear', $ARGS[2], underwear['pair']
+												gs 'bras', 'wear', $ARGS[2], ARGS[3]
+					
+												if $ARGS[1] = 'wardrobe':
+													gt 'wardrobe', 'main'
+												else
+													gt $loc, $loc_arg
+												end
+											end
 										else
-											gt $loc, $loc_arg
+											act 'Put them on anyways (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 										end
-									end
-								else
-									act 'Put them on anyways (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-								end
-								act 'Back':
-									gt 'wardrobe', 'main'
-								end
-							elseif hypnoPanty > 0:
-								cla
-								*clr
-								'You pick up the panties and think about trying them on... but you don''t really like wearing panties.'
-								gs 'willpower', 'misc', 'resist', 'easy'
-								will_cost += hypnoTime
-								if will_cost <= pcs_willpwr:
-									act 'Put them on anyways (<<will_cost>> Willpower)':
-										gs 'willpower', 'pay', 'resist'
-										gs 'stat'
-										gs 'panties', 'wear', $ARGS[2], underwear['set']
-										gs 'panties', 'wear', $ARGS[2], ARGS[3]
-			
+										act 'Back':
+											gt 'wardrobe', 'main'
+										end
+									else
+										gs 'panties', 'wear', $ARGS[2], underwear['pair']
+										gs 'bras', 'wear', $ARGS[2], ARGS[3]
+
 										if $ARGS[1] = 'wardrobe':
 											gt 'wardrobe', 'main'
 										else
 											gt $loc, $loc_arg
 										end
 									end
-								else
-									act 'Put them on anyways (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-								end
-								act 'Back':
-									gt 'wardrobe', 'main'
-								end
-							else
-								gs 'panties', 'wear', $ARGS[2], underwear['set']
-								gs 'bras', 'wear', $ARGS[2], ARGS[3]
-
-								if $ARGS[1] = 'wardrobe':
-									gt 'wardrobe', 'main'
-								else
-									gt $loc, $loc_arg
 								end
 							end
+						else
+							'You do not own these panties so you cannot wear this set.'
 						end
 					end
 				end

locations/panties.qsrc

@@ -111,21 +111,18 @@ if $ARGS[0] = 'view_panty_item':
 	!! ARGS 4 - price for shop
 	cla
 	'<center><img src="<<FUNC(''$panty_image'',  $ARGS[2], ARGS[3])>>"></center>'
-!!	gs 'panty_attributes', $ARGS[2], ARGS[3]
+	gs 'underwear_attributes', $ARGS[2]+'_panties', ARGS[3]
 !!	$RESULT = FUNC('$short_description', $ARGS[2], CloStyle2)
 !!	$RESULT += '<<ARGS[3]>>'
 !!	'<<$RESULT>>'
-	gs 'panties', 'descriptions', $ARGS[2]
-	if underwear['set'] ! 0: 'These panties form a set with bra #<<underwear[''set'']>>.'
+	if BraQuality > 0:
+		gs 'underwear_descriptions', 'panties'
+		'This bra forms a set with bra #<<underwear[''pair'']>>.'
+	else
+		gs 'panties', 'descriptions', $ARGS[2]
+	end
 
 	if $ARGS[1] = 'shop':
-		if underwear['set'] ! 0:
-			if dyneval('RESULT = <<$ARGS[2]>>_bra[<<underwear[''set'']>>]') = 1:
-				'You own the matching bra for this set.'
-			else
-				'You do not own the matching bra for this set.'
-			end
-		end
 		if dyneval('RESULT = <<$ARGS[2]>>_panties[<<ARGS[3]>>]') = 1:
 			'You already own this item.'
 			act 'Leave': gt $loc, $loc_arg
@@ -153,37 +150,42 @@ if $ARGS[0] = 'view_panty_item':
 			else
 				'You do not have enough money in your bank to buy these panties.'
 			end
-			if dyneval('RESULT = <<$ARGS[2]>>_bras[<<underwear[''set'']>>]') = 0:
-				price_set = ARGS[4]*10/9
-				'price for set: <<price_set>> <b>₽</b>'
-				if money >= price_set:
-					act 'Buy (cash)':
-						money -= price_set
-						dynamic $ARGS[2] + '_panties[<<ARGS[3]>>] = 1'
-						dynamic $ARGS[2] + '_pantiesS[<<ARGS[3]>>] = 0'
-						dynamic $ARGS[2] + '_bras[<<underwear[''set'']>>] = 1'
-						dynamic $ARGS[2] + '_brasS[<<underwear[''set'']>>] = 0'
-						gt $loc, $loc_arg
-					end
+			if underwear['pair'] > 0:
+				if dyneval('RESULT = <<$ARGS[2]>>_panties[<<underwear[''pair'']>>]') = 1:
+					'You own the matching bra buying these panties will complete the set.'
 				else
-					'You do not have enough cash to buy this set.'
-				end
-				if karta + bankDebtLimit >= price_set:
-					act 'Buy (card)':
-						karta -= price_set
-						dynamic $ARGS[2] + '_panties[<<ARGS[3]>>] = 1'
-						dynamic $ARGS[2] + '_pantiesS[<<ARGS[3]>>] = 0'
-						dynamic $ARGS[2] + '_bras[<<underwear[''set'']>>] = 1'
-						dynamic $ARGS[2] + '_brasS[<<underwear[''set'']>>] = 0'
-						gt $loc, $loc_arg
+					'You do not own the matching bra, you can buy it and these panties together as a set.'
+					price_set = ARGS[4]*18/10
+					'Price for set: <<price_set>> <b>₽</b>'
+					if money >= price_set:
+						act 'Buy set (cash)':
+							money -= price_set
+							dynamic $ARGS[2] + '_panties[<<ARGS[3]>>] = 1'
+							dynamic $ARGS[2] + '_pantiesS[<<ARGS[3]>>] = 0'
+							dynamic $ARGS[2] + '_bras[<<underwear[''pair'']>>] = 1'
+							dynamic $ARGS[2] + '_brasS[<<underwear[''pair'']>>] = 0'
+							gt $loc, $loc_arg
+						end
+					else
+						'You do not have enough cash to buy this set.'
+					end
+					if karta + bankDebtLimit >= price_set:
+						act 'Buy set (card)':
+							karta -= price_set
+							dynamic $ARGS[2] + '_panties[<<ARGS[3]>>] = 1'
+							dynamic $ARGS[2] + '_pantiesS[<<ARGS[3]>>] = 0'
+							dynamic $ARGS[2] + '_bras[<<underwear[''pair'']>>] = 1'
+							dynamic $ARGS[2] + '_brasS[<<underwear[''pair'']>>] = 0'
+							gt $loc, $loc_arg
+						end
+					else
+						'You do not have enough money in your bank to buy this set.'
 					end
-				else
-					'You do not have enough money in your bank to buy this set.'
 				end
 			end
 		end
 	else
-		if underwear['set'] ! 0:
+		if underwear['pair'] ! 0:
 			if dyneval('RESULT = <<$ARGS[2]>>_bra[<<underwear[''set'']>>]') = 1:
 				'You own this bra and can wear this set.'
 			else
@@ -246,97 +248,100 @@ if $ARGS[0] = 'view_panty_item':
 							end
 						end
 					end
-				end
-				if underwear['set'] ! 0 and dyneval('RESULT = <<$ARGS[2]>>_bras[<<underwear[''set'']>>]') = 1:
-					act 'Wear set':
-						if CloBra = 1:
-							msg'You cannot wear a bra with this top'
-						elseif CloPanties = 1:
-							msg'You cannot wear a panties with this outfit'
-						else
-							if hypnoBra > 0 and hypnoPanty > 0:
-								cla
-								*clr
-								'You pick up the bra and panties and think about trying them on... but you don''t really like wearing underwear.'
-								gs 'willpower', 'misc', 'resist'
-								will_cost += hypnoTime
-								if will_cost <= pcs_willpwr:
-									act 'Wear it anyway anyways (<<will_cost>> Willpower)':
-										gs 'willpower', 'pay', 'resist'
-										gs 'stat'
-										gs 'panties', 'wear', $ARGS[2], ARGS[3]
-										gs 'bras', 'wear', $ARGS[2], underwear['set']
-		
-										if $ARGS[1] = 'wardrobe':
+					if underwear['pair'] > 0:
+						if dyneval('RESULT = <<$ARGS[2]>>_bras[<<underwear[''pair'']>>]') = 1:
+							'You own this bra and can wear this set.'
+							act 'Wear set':
+								if CloBra = 1:
+									msg'You cannot wear a bra with this top'
+								elseif CloPanties = 1:
+									msg'You cannot wear a panties with this outfit'
+								else
+									if hypnoBra > 0 and hypnoPanty > 0:
+										cla
+										*clr
+										'You pick up the bra and panties and think about trying them on... but you don''t really like wearing underwear.'
+										gs 'willpower', 'misc', 'resist'
+										will_cost += hypnoTime
+										if will_cost <= pcs_willpwr:
+											act 'Wear it anyway anyways (<<will_cost>> Willpower)':
+												gs 'willpower', 'pay', 'resist'
+												gs 'stat'
+												gs 'bras', 'wear', $ARGS[2], underwear['pair']
+												gs 'panties', 'wear', $ARGS[2], ARGS[3]
+				
+												if $ARGS[1] = 'wardrobe':
+													gt 'wardrobe', 'main'
+												else
+													gt $loc, $loc_arg
+												end
+											end
+										else
+											act 'Wear it anyway anyways (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+										end
+										act 'Back':
 											gt 'wardrobe', 'main'
+										end
+									elseif hypnoBra > 0:
+										cla
+										*clr
+										'You pick up the bra and think about trying them on... but you don''t really like wearing bras.'
+										gs 'willpower', 'misc', 'resist', 'easy'
+										will_cost += hypnoTime
+										if will_cost <= pcs_willpwr:
+											act 'Put them on anyways (<<will_cost>> Willpower)':
+												gs 'willpower', 'pay', 'resist'
+												gs 'stat'
+												gs 'bras', 'wear', $ARGS[2], underwear['pair']
+												gs 'panties', 'wear', $ARGS[2], ARGS[3]
+				
+												if $ARGS[1] = 'wardrobe':
+													gt 'wardrobe', 'main'
+												else
+													gt $loc, $loc_arg
+												end
+											end
 										else
-											gt $loc, $loc_arg
+											act 'Put them on anyways (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 										end
-									end
-								else
-									act 'Wear it anyway anyways (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-								end
-								act 'Back':
-									gt 'wardrobe', 'main'
-								end
-							elseif hypnoBra > 0:
-								cla
-								*clr
-								'You pick up the bra and think about trying them on... but you don''t really like wearing bras.'
-								gs 'willpower', 'misc', 'resist', 'easy'
-								will_cost += hypnoTime
-								if will_cost <= pcs_willpwr:
-									act 'Put them on anyways (<<will_cost>> Willpower)':
-										gs 'willpower', 'pay', 'resist'
-										gs 'stat'
-										gs 'panties', 'wear', $ARGS[2], ARGS[3]
-										gs 'bras', 'wear', $ARGS[2], underwear['set']
-		
-										if $ARGS[1] = 'wardrobe':
+										act 'Back':
 											gt 'wardrobe', 'main'
+										end
+									elseif hypnoPanty > 0:
+										cla
+										*clr
+										'You pick up the panties and think about trying them on... but you don''t really like wearing panties.'
+										gs 'willpower', 'misc', 'resist', 'easy'
+										will_cost += hypnoTime
+										if will_cost <= pcs_willpwr:
+											act 'Put them on anyways (<<will_cost>> Willpower)':
+												gs 'willpower', 'pay', 'resist'
+												gs 'stat'
+												gs 'bras', 'wear', $ARGS[2], underwear['pair']
+												gs 'panties', 'wear', $ARGS[2], ARGS[3]
+					
+												if $ARGS[1] = 'wardrobe':
+													gt 'wardrobe', 'main'
+												else
+													gt $loc, $loc_arg
+												end
+											end
 										else
-											gt $loc, $loc_arg
+											act 'Put them on anyways (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 										end
-									end
-								else
-									act 'Put them on anyways (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-								end
-								act 'Back':
-									gt 'wardrobe', 'main'
-								end
-							elseif hypnoPanty > 0:
-								cla
-								*clr
-								'You pick up the panties and think about trying them on... but you don''t really like wearing panties.'
-								gs 'willpower', 'misc', 'resist', 'easy'
-								will_cost += hypnoTime
-								if will_cost <= pcs_willpwr:
-									act 'Put them on anyways (<<will_cost>> Willpower)':
-										gs 'willpower', 'pay', 'resist'
-										gs 'stat'
+										act 'Back':
+											gt 'wardrobe', 'main'
+										end
+									else
+										gs 'bras', 'wear', $ARGS[2], underwear['pair']
 										gs 'panties', 'wear', $ARGS[2], ARGS[3]
-										gs 'panties', 'wear', $ARGS[2], underwear['set']
-			
+
 										if $ARGS[1] = 'wardrobe':
 											gt 'wardrobe', 'main'
 										else
 											gt $loc, $loc_arg
 										end
 									end
-								else
-									act 'Put them on anyways (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-								end
-								act 'Back':
-									gt 'wardrobe', 'main'
-								end
-							else
-								gs 'panties', 'wear', $ARGS[2], ARGS[3]
-								gs 'panties', 'wear', $ARGS[2], underwear['set']
-
-								if $ARGS[1] = 'wardrobe':
-									gt 'wardrobe', 'main'
-								else
-									gt $loc, $loc_arg
 								end
 							end
 						end

locations/underwear_attributes.qsrc

@@ -14,6 +14,11 @@
 !!							5 - vinyl
 !!							6 - lace
 !!
+!! PanType					Used for description of panties, could be useful for specific reactions
+!!							1 - panties
+!!							2 - boy shorts
+!!							3 - G-string
+!!
 !! BraType					Used for description of bra, could be useful for specific reactions
 !!							1 - balcony
 !!							2 - bandeau
@@ -83,12 +88,18 @@ BraThinness = 0
 PanExpose = 0
 PanButt = 0
 BraExpose = 0
-underwear['set'] = 0
+underwear['pair'] = 0
 
 
 if $ARGS[0] = 'lusso_bodysuits':
 	*P FUNC('$attributes_lusso_bodysuit', $ARGS[0], ARGS[1])
 end
+if $ARGS[0] = 'boutique_panties':
+	*P FUNC('$attributes_lusso_panties', $ARGS[0], ARGS[1])
+end
+if $ARGS[0] = 'boutique_bras':
+	*P FUNC('$attributes_lusso_bra', $ARGS[0], ARGS[1])
+end
 
 --- underwear_attributes ---------------------------------
 

locations/underwear_descriptions.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'panties':
 		$description += ' panties are'
 	elseif PanStyle = 2:
 		$description += ' boy shorts are'
-	elseif PanStyle = 1:
+	elseif PanStyle = 3:
 		$description += ' G-string is'
 	end
 
@@ -75,11 +75,11 @@ if $ARGS[0] = 'panties':
 
 	if PanButt = 1:
 		$description += 'Your butt can just about be seen in the right light.'
-	elseif PanButt = 1:
+	elseif PanButt = 2:
 		$description += 'Your butt is partly visible.'
-	elseif PanButt = 1:
+	elseif PanButt = 3:
 		$description += 'Your butt is clearly visible.'
-	elseif PanButt = 1:
+	elseif PanButt = 4:
 		$description += 'Your butt is not covered at all.'
 	end
 

locations/wardrobe.qsrc

@@ -208,15 +208,24 @@ $default_clothing_line = {
 	else
 		$RESULT +='<TD><img width="100" src="<<FUNC(''$clothing_image'', $defclothingtype[default_entry], defclothingnumber[default_entry])>>"></TD>'
 	end
-	if defbranumber[default_entry] = 0:
-		$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
-	else
-		$RESULT +='<TD><img width="100" src="<<FUNC(''$bra_image'',  $defbratype[default_entry], defbranumber[default_entry])>>"></TD>'
-	end
-	if defpantynumber[default_entry] = 0:
+	if defunderwear[default_entry] = 2:
+		if defbodysuitnumber[default_entry] = 0:
+			$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
+		else
+			$RESULT +='<TD><img width="100" src="<<FUNC(''$pcs_outfit_image'', $defbodysuittype[default_entry]+''_bodysuits'', defbodysuitnumber[default_entry])>>"></TD>'
+		end
 		$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
 	else
-		$RESULT +='<TD><img width="100" src="<<FUNC(''$panty_image'',  $defpantytype[default_entry], defpantynumber[default_entry])>>"></TD>'
+		if defbranumber[default_entry] = 0:
+			$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
+		else
+			$RESULT +='<TD><img width="100" src="<<FUNC(''$bra_image'',  $defbratype[default_entry], defbranumber[default_entry])>>"></TD>'
+		end
+		if defpantynumber[default_entry] = 0:
+			$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
+		else
+			$RESULT +='<TD><img width="100" src="<<FUNC(''$panty_image'',  $defpantytype[default_entry], defpantynumber[default_entry])>>"></TD>'
+		end
 	end
 	if defshoenumber[default_entry] = 0:
 		$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
@@ -256,15 +265,24 @@ $default_sports_line = {
 		$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD><TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
 	else
 		$RESULT +='<TD><img width="100" src="<<FUNC(''$clothing_image'', ''danilovich_outfits'', sportsclothingnumber[default_entry])>>"></TD>'
-		if sportsbranumber[default_entry] = 0:
-			$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
-		else
-			$RESULT +='<TD><img width="100" src="<<FUNC(''$bra_image'',  $sportsbratype[default_entry], sportsbranumber[default_entry])>>"></TD>'
-		end
-		if sportspantynumber[default_entry] = 0:
+		if sportsunderwear[default_entry] = 2:
+			if sportsbodysuitnumber[default_entry] = 0:
+				$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
+			else
+				$RESULT +='<TD><img width="100" src="<<FUNC(''$pcs_outfit_image'', $sportsbodysuittype[default_entry]+''_bodysuits'', sportsbodysuitnumber[default_entry])>>"></TD>'
+			end
 			$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
 		else
-			$RESULT +='<TD><img width="100" src="<<FUNC(''$panty_image'',  $sportspantytype[default_entry], sportspantynumber[default_entry])>>"></TD>'
+			if sportsbranumber[default_entry] = 0:
+				$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
+			else
+				$RESULT +='<TD><img width="100" src="<<FUNC(''$bra_image'',  $sportsbratype[default_entry], sportsbranumber[default_entry])>>"></TD>'
+			end
+			if sportspantynumber[default_entry] = 0:
+				$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
+			else
+				$RESULT +='<TD><img width="100" src="<<FUNC(''$panty_image'',  $sportspantytype[default_entry], sportspantynumber[default_entry])>>"></TD>'
+			end
 		end
 		if sportsshoenumber[default_entry] = 0:
 			$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
@@ -304,7 +322,7 @@ if $ARGS[0] = 'default':
 	gs 'stat'
 	
 	'<center><table><TH><a href="exec:gt ''wardrobe'', ''main''"><img src="images/system/icons/clothing/clothes.png" height="50"></a></TH><TH><B>Your Sets: Sport</B></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''"><img src="images/system/icons/clothing/organize.png" height="50"></a></TH></table></center>'
-	'<center><table><TH>Name</TH><TH>Outfit</TH><TH>Bra</TH><TH>Panties</TH><TH>Shoes</TH><TH>Coat</TH><TH>Purse</TH><TH></TH><TH></TH><TH></TH><TH></TH><TR>'
+	'<center><table><TH>Name</TH><TH>Outfit</TH><TH>Bra/Bodysuit</TH><TH>Panties</TH><TH>Shoes</TH><TH>Coat</TH><TH>Purse</TH><TH></TH><TH></TH><TH></TH><TH></TH><TR>'
 
 	default_entry = 0
 	:loopdefault_entry_sport_set
@@ -330,7 +348,7 @@ if $ARGS[0] = 'default_template':
 	gs 'stat'
 	
 	'<center><table><TH><a href="exec:gt ''wardrobe'', ''main''"><img src="images/system/icons/clothing/clothes.png" height="50"></TH><TH><B>Your Sets: <<$default_entry[2]>></B></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''"><img src="images/system/icons/clothing/organize.png" height="50"></TH><TR><TD></TD><TD><center><a href="exec: gs ''wardrobe'', ''default_set_name''">Rename set</a></center></TD></table></center>'
-	'<center><table><TH>Name</TH><TH>Outfit</TH><TH>Bra</TH><TH>Panties</TH><TH>Shoes</TH><TH>Coat</TH><TH>Purse</TH><TH></TH><TH></TH><TH></TH><TH></TH><TR>'
+	'<center><table><TH>Name</TH><TH>Outfit</TH><TH>Bra/Bodysuit</TH><TH>Panties</TH><TH>Shoes</TH><TH>Coat</TH><TH>Purse</TH><TH></TH><TH></TH><TH></TH><TH></TH><TR>'
 
 	temp = default_entry
 	:loopdefault_entry_set
@@ -485,22 +503,34 @@ if $ARGS[0] = 'default_entry_wear':
 		gs 'clothing', 'wear', $temp1, temp2
 	end
 
-	if dyneval('RESULT = <<$defbratype[default_entry]>>_bras[<<defbranumber[default_entry]>>]') = 0:
-		$defbratype[default_entry] = 'none' & defbranumber[default_entry] = 0
-	end
-	if $defbratype[default_entry] = 'none':
-		if $braworntype ! 'none': gs 'bras', 'remove'
+	if defunderwear[default_entry] = 2:
+		if dyneval('RESULT = <<$defbodysuittype[default_entry]>>_bodysuits[<<defbodysuitnumber[default_entry]>>]') = 0:
+			$defbodysuittype[default_entry] = 'none' & defbodysuitnumber[default_entry] = 0
+		end
+		if $defbodysuittype[default_entry] = 'none':
+			if $bodysuitworntype ! 'none': gs 'underwear_bodysuits', 'remove'
+		else
+			gs 'underwear_bodysuits', 'wear', $defbratype[default_entry], defbranumber[default_entry]
+		end
 	else
-		gs 'bras', 'wear', $defbratype[default_entry], defbranumber[default_entry]
+		if dyneval('RESULT = <<$defbratype[default_entry]>>_bras[<<defbranumber[default_entry]>>]') = 0:
+			$defbratype[default_entry] = 'none' & defbranumber[default_entry] = 0
+		end
+		if $defbratype[default_entry] = 'none':
+			if $braworntype ! 'none': gs 'bras', 'remove'
+		else
+			gs 'bras', 'wear', $defbratype[default_entry], defbranumber[default_entry]
+		end
 	end
 
-	if dyneval('RESULT = <<$defpantytype[default_entry]>>_panties[<<defpantynumber[default_entry]>>]') = 0:
-		$defpantytype[default_entry] = 'none' & defpantynumber[default_entry] = 0
-	end
-	if $defpantytype[default_entry] = 'none':
-		if $pantyworntype ! 'none': gs 'panties', 'remove'
-	else
-		gs 'panties', 'wear', $defpantytype[default_entry], defpantynumber[default_entry]
+	if defunderwear[default_entry] = 0:
+		if dyneval('RESULT = <<$defpantytype[default_entry]>>_panties[<<defpantynumber[default_entry]>>]') = 0:
+			$defpantytype[default_entry] = 'none' & defpantynumber[default_entry] = 0
+		elseif $defpantytype[default_entry] = 'none':
+			if $pantyworntype ! 'none': gs 'panties', 'remove'
+		else
+			gs 'panties', 'wear', $defpantytype[default_entry], defpantynumber[default_entry]
+		end
 	end
 
 	if dyneval('RESULT = <<$defshoetype[default_entry]>>_shoe[<<defshoenumber[default_entry]>>]') = 0:
@@ -595,10 +625,16 @@ if $ARGS[0] = 'default_entry_set':
 	i = ARGS[1]
 	$defclothingtype[i] = $clothingworntype
 	defclothingnumber[i] = clothingwornnumber
-	$defbratype[i] = $braworntype
-	defbranumber[i] = brawornnumber
-	$defpantytype[i] = $pantyworntype
-	defpantynumber[i] = pantywornnumber
+	defunderwear[i] = underwear['type']
+	if underwear['type'] = 2:
+		$defbodysuittype[i] = $bodysuitworntype
+		defbodysuitnumber[i] = bodysuitwornnumber
+	else
+		$defbratype[i] = $braworntype
+		defbranumber[i] = brawornnumber
+		$defpantytype[i] = $pantyworntype
+		defpantynumber[i] = pantywornnumber
+	end
 	$defshoetype[i] = $shoeworntype
 	defshoenumber[i] = shoewornnumber
 	if bag = 1:
@@ -646,10 +682,15 @@ if $ARGS[0] = 'default_entry_up':
 
 	$tempclothingworntype = $defclothingtype[i]
 	tempclothingwornnumber = defclothingnumber[i]
-	$tempbraworntype = $defbratype[i]
-	tempbrawornnumber = defbranumber[i]
-	$temppantyworntype = $defpantytype[i]
-	temppantywornnumber = defpantynumber[i]
+	if underwear['type'] = 2:
+		$tempbodysuittype[i] = $defbodysuittype[i]
+		tempbodysuitnumber[i] = defbodysuitnumber[i]
+	else
+		$tempbraworntype = $defbratype[i]
+		tempbrawornnumber = defbranumber[i]
+		$temppantyworntype = $defpantytype[i]
+		temppantywornnumber = defpantynumber[i]
+	end
 	$tempshoeworntype = $defshoetype[i]
 	tempshoewornnumber = defshoenumber[i]
 	$tempcurrentpursetype = $defpursetype[i]
@@ -660,6 +701,15 @@ if $ARGS[0] = 'default_entry_up':
 
 	$defclothingtype[i] = $defclothingtype[j]
 	defclothingnumber[i] = defclothingnumber[j]
+	if underwear['type'] = 2:
+		$defbodysuittype[i] = $defbodysuittype[j]
+		defbodysuitnumber[i] = defbodysuitnumber[j]
+	else
+		$defbratype[i] = $defbratype[j]
+		defbranumber[i] = defbranumber[j]
+		$defpantytype[i] = $defpantytype[j]
+		defpantynumber[i] = defpantynumber[j
+	end
 	$defbratype[i] = $defbratype[j]
 	defbranumber[i] = defbranumber[j]
 	$defpantytype[i] = $defpantytype[j]
@@ -674,10 +724,15 @@ if $ARGS[0] = 'default_entry_up':
 
 	$defclothingtype[j] = $tempclothingworntype
 	defclothingnumber[j] = tempclothingwornnumber
-	$defbratype[j] = $tempbraworntype
-	defbranumber[j] = tempbrawornnumber
-	$defpantytype[j] = $temppantyworntype
-	defpantynumber[j] = temppantywornnumber
+	if underwear['type'] = 2:
+		$defbodysuittype[j] = $tempbodysuittype
+		defbodysuitnumber[j] = tempbodysuitnumber
+	else
+		$defbratype[j] = $tempbraworntype
+		defbranumber[j] = tempbrawornnumber
+		$defpantytype[j] = $temppantyworntype
+		defpantynumber[j] = temppantywornnumber
+	end
 	$defshoetype[j] = $tempshoeworntype
 	defshoenumber[j] = tempshoewornnumber
 	$defpursetype[j] = $tempcurrentpursetype
@@ -749,6 +804,9 @@ if $ARGS[0] = 'default_entry_delete':
 	i = ARGS[1]
 	$defclothingtype[i] = ''
 	defclothingnumber[i] = ''
+	defunderwear[i] = ''
+	$defbodysuittype = ''
+	defbodysuitnumber = ''
 	$defbratype[i] = ''
 	defbranumber[i] = ''
 	$defpantytype[i] = ''
@@ -906,6 +964,9 @@ if $ARGS[0] = 'sports_entry_delete':
 	i = ARGS[1]
 	$sportsclothingtype[i] = ''
 	sportsclothingnumber[i] = ''
+	sportsunderwear[i] = ''
+	$sportsbodysuittype = ''
+	sportsbodysuitnumber = ''
 	$sportsbratype[i] = ''
 	sportsbranumber[i] = ''
 	$sportspantytype[i] = ''