[added] Attributes for underwear now produces description much like clothing system and pairs for bras and panties shown for all stores now.

glife.qproj

@@ -204,7 +204,6 @@
 		<Location name="$attributes_lusso_bodysuit"/>
 		<Location name="$attributes_lusso_bra"/>
 		<Location name="$attributes_lusso_panties"/>
-		<Location name="$attributes_moncheri_bodysuit"/>
 		<Location name="$attributes_salacious_panties"/>
 		<Location name="$attributes_salacious_bra"/>
 		<Location name="$attributes_salacious_bodysuit"/>

locations/_bra_image.qsrc

@@ -3,19 +3,19 @@
 !! ARGS 0 - bra shop name
 !! ARGS 1 - bra index
 
-if $ARGS[0] = 'cheap':
+if $ARGS[0] = 'gm':
 	$RESULT = 'images/pc/items/gm/bras/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'boutique':
+elseif $ARGS[0] = 'lusso':
 	$RESULT = 'images/pc/items/lusso/bras/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'exhibitionist':
+elseif $ARGS[0] = 'salacious':
 	$RESULT = 'images/pc/items/salacious/bras/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'fashionista':
 	$RESULT = 'images/pc/items/fashionista/bras/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'cats':
 	$RESULT = 'images/pc/items/cats/bras/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'sexshop':
+elseif $ARGS[0] = 'eroto':
 	$RESULT = 'images/pc/items/eroto/bras/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'sport':
+elseif $ARGS[0] = 'danilovich':
 	$RESULT = 'images/pc/items/danilovich/bras/<<ARGS[1]>>.jpg'
 end
 

locations/_panty_image.qsrc

@@ -3,19 +3,19 @@
 !! ARGS 0 - panty shop name
 !! ARGS 1 - panty index
 
-if $ARGS[0] = 'cheap':
+if $ARGS[0] = 'gm':
 	$RESULT = 'images/pc/items/gm/panties/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'boutique':
+elseif $ARGS[0] = 'lusso':
 	$RESULT = 'images/pc/items/lusso/panties/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'exhibitionist':
+elseif $ARGS[0] = 'salacious':
 	$RESULT = 'images/pc/items/salacious/panties/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'fashionista':
 	$RESULT = 'images/pc/items/fashionista/panties/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'cats':
 	$RESULT = 'images/pc/items/cats/panties/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'sexshop':
+elseif $ARGS[0] = 'eroto':
 	$RESULT = 'images/pc/items/eroto/panties/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'sport':
+elseif $ARGS[0] = 'danilovich':
 	$RESULT = 'images/pc/items/danilovich/panties/<<ARGS[1]>>.jpg'
 end
 

locations/bras.qsrc

@@ -44,26 +44,26 @@ if $ARGS[0] = 'view_bra_list':
 	'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
 
 	i = 1
-	:loopcheapbras
-	if cheap_brasS[i] = metka_bras and cheap_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''cheap'', <<i>>"><img src="images/pc/items/gm/bras/<<i>>.jpg" 	height="150" /></a>'
+	:loopgmbras
+	if gm_brasS[i] = metka_bras and gm_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''gm'', <<i>>"><img src="images/pc/items/gm/bras/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
-	if i <= ARRSIZE('cheap_bras'):jump 'loopcheapbras'
+	if i <= ARRSIZE('gm_bras'):jump 'loopgmbras'
 
 	'<center><img src="images/locations/city/citycenter/mall/Lusso.png"></center>'
 
 	i = 1
-	:loopboutiquebras 
-	if boutique_brasS[i] = metka_bras and boutique_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''boutique'', <<i>>"><img src="images/pc/items/lusso/bras/<<i>>.jpg" 	height="150" /></a>'
+	:looplussobras 
+	if lusso_brasS[i] = metka_bras and lusso_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''lusso'', <<i>>"><img src="images/pc/items/lusso/bras/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
-	if i <= ARRSIZE('boutique_bras'):jump 'loopboutiquebras'
+	if i <= ARRSIZE('lusso_bras'):jump 'looplussobras'
 
 	'<center><img src="images/locations/pushkin/exhibitshop/shop_name.png"></center>'
 
 	i = 1
-	:loopexhibitionistbras 
-	if exhibitionist_brasS[i] = metka_bras and exhibitionist_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''exhibitionist'', <<i>>"><img src="images/pc/items/salacious/bras/<<i>>.jpg" 	height="150" /></a>'
+	:loopsalaciousbras 
+	if salacious_brasS[i] = metka_bras and salacious_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''salacious'', <<i>>"><img src="images/pc/items/salacious/bras/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
-	if i <= ARRSIZE('exhibitionist_bras'):jump 'loopexhibitionistbras'
+	if i <= ARRSIZE('salacious_bras'):jump 'loopsalaciousbras'
 
 	'<center><img src="images/locations/city/citycenter/mall/fashionista.png"></center>'
 
@@ -84,18 +84,18 @@ if $ARGS[0] = 'view_bra_list':
 	'<center><img src="images/locations/city/redlight/erotomaniac/shop_name.png"></center>'
 
 	i = 1
-	:loopsexshopbras 
-	if sexshop_brasS[i] = metka_bras and sexshop_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''sexshop'', <<i>>"><img src="images/pc/items/eroto/bras/<<i>>.jpg" 	height="150" /></a>'
+	:looperotobras 
+	if eroto_brasS[i] = metka_bras and eroto_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''eroto'', <<i>>"><img src="images/pc/items/eroto/bras/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
-	if i <= ARRSIZE('sexshop_bras'):jump 'loopsexshopbras'
+	if i <= ARRSIZE('eroto_bras'):jump 'looperotobras'
 
 	'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
 
 	i = 1
-	:loopsportbras 
-	if sport_brasS[i] = metka_bras and sport_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''sport'', <<i>>"><img src="images/pc/items/danilovich/bras/<<i>>.jpg" 	height="150" /></a>'
+	:loopdanilovichbras 
+	if danilovich_brasS[i] = metka_bras and danilovich_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''danilovich'', <<i>>"><img src="images/pc/items/danilovich/bras/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
-	if i <= ARRSIZE('sport_bras'):jump 'loopsportbras'
+	if i <= ARRSIZE('danilovich_bras'):jump 'loopdanilovichbras'
 end
 
 if $ARGS[0] = 'view_bra_item':
@@ -111,12 +111,9 @@ if $ARGS[0] = 'view_bra_item':
 !!	$RESULT = FUNC('$short_description', $ARGS[2], CloStyle2)
 !!	$RESULT += '<<ARGS[3]>>'
 !!	'<<$RESULT>>'
-	if BraQuality > 0:
-		gs 'underwear_descriptions', 'bras'
-		'This bra forms a set with panty #<<underwear[''pair'']>>.'
-	else
-		gs 'bras', 'descriptions', $ARGS[2]
-	end
+	
+	gs 'underwear_descriptions', 'bras'
+	if underwear['pair'] > 0: 'This bra forms a set with panty #<<underwear[''pair'']>>.'
 
 	if $ARGS[1] = 'shop':
 		if dyneval('RESULT = <<$ARGS[2]>>_bras[<<ARGS[3]>>]') = 1:
@@ -374,32 +371,15 @@ if $ARGS[0] = 'dest2':
 	gt 'bras', 'view_bra_item', $ARGS[1], $ARGS[2], ARGS[3]
 end
 
-if $ARGS[0] = 'descriptions':
-	if $ARGS[1] = 'cheap':
-		'Cheap bra with no redeeming features.'
-	elseif $ARGS[1] = 'boutique':
-		'This bra is so beautifully made that your posture and confidence is improved wearing it boosting your appearance even when fully clothed.'
-	elseif $ARGS[1] = 'exhibitionist':
-		'This bra is so revealing that it is more exciting than not wearing one and you''ll always feel horny wearing it.'
-	elseif $ARGS[1] = 'fashionista':
-		'This bra is well made improving your posture and confidence and slightly boosting your appearance even when fully clothed.'
-	elseif $ARGS[1] = 'cats':
-		'This bra feels reassuring and wear it gives your mood a lift.'
-	elseif $ARGS[1] = 'sexshop':
-		'Tacky and cheap this bra makes you look like a hooker, this could be a bonus if working as one.'
-	elseif $ARGS[1] = 'sport':
-		'This bra is designed for physical exercises to make them less tiring.'
-	end
-end
 
 if $ARGS[0] = 'sum':
-	$t[0] = 'boutique'
+	$t[0] = 'lusso'
 	$t[1] = 'cats'
-	$t[2] = 'exhibitionist'
+	$t[2] = 'salacious'
 	$t[3] = 'fashionista'
-	$t[4] = 'cheap'
-	$t[5] = 'sexshop'
-	$t[6] = 'sport'
+	$t[4] = 'gm'
+	$t[5] = 'eroto'
+	$t[6] = 'danilovich'
 	result = 0
 	i = 0
 	:loopsumbras_i

locations/lusso.qsrc

@@ -39,21 +39,21 @@ if $ARGS[0] = 'panties':
 
 	i = 1
 
-	:loopboutique_panties
-		if boutique_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''panties2''"><img src="images/pc/items/lusso/panties/<<i>>.jpg" 	height="150" /></a> '
+	:looplusso_panties
+		if lusso_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''panties2''"><img src="images/pc/items/lusso/panties/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 82:jump 'loopboutique_panties'
+	if i <= 82:jump 'looplusso_panties'
 end
 
 if $ARGS[0] = 'panties2':
 	cla
 	menu_off = 1
-	if boutique_panties[i] ! 0:
+	if lusso_panties[i] ! 0:
 		msg 'You already own these panties.'
 		gt 'lusso', 'panties'
 	end
 
-	gt 'panties', 'view_panty_item', 'shop', 'boutique',i, 1000
+	gt 'panties', 'view_panty_item', 'shop', 'lusso',i, 1000
 
 end
 
@@ -70,21 +70,21 @@ if $ARGS[0] = 'bras':
 
 	i = 1
 
-	:loopboutique_bras
-		if boutique_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bras2''"><img src="images/pc/items/lusso/bras/<<i>>.jpg" 	height="150" /></a> '
+	:looplusso_bras
+		if lusso_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bras2''"><img src="images/pc/items/lusso/bras/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 33:jump 'loopboutique_bras'
+	if i <= 33:jump 'looplusso_bras'
 end
 
 if $ARGS[0] = 'bras2':
 	cla
 	menu_off = 1
-	if boutique_bras[i] ! 0:
+	if lusso_bras[i] ! 0:
 		msg 'You already own these bras.'
 		gt 'lusso', 'bras'
 	end
 
-	gt 'bras', 'view_bra_item', 'shop', 'boutique',i, 1000
+	gt 'bras', 'view_bra_item', 'shop', 'lusso',i, 1000
 
 end
 
@@ -102,7 +102,7 @@ if $ARGS[0] = 'bodysuit':
 	i = 1
 
 	:looplusso_bodysuit
-		if boutique_bodysuit[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bodysuit2''"><img src="images/pc/items/lusso/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		if lusso_bodysuit[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bodysuit2''"><img src="images/pc/items/lusso/bodysuits/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 90:jump 'looplusso_bodysuit'
 end
@@ -110,7 +110,7 @@ end
 if $ARGS[0] = 'bodysuit2':
 	cla
 	menu_off = 1
-	if boutique_bodysuit[i] ! 0:
+	if lusso_bodysuit[i] ! 0:
 		msg 'You already own this bodysuit.'
 		gt 'lusso', 'bodysuit'
 	end

locations/panties.qsrc

@@ -49,26 +49,26 @@ if $ARGS[0] = 'view_panty_list':
 	'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
 
 	i = 1
-	:loopcheappanties 
-	if cheap_pantiesS[i] = metka_panties and cheap_panties[i] = 1:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''<<$ARGS[1]>>'', ''cheap'', <<i>>"><img src="images/pc/items/gm/panties/<<i>>.jpg" 	height="150" /></a>'
+	:loopgmpanties 
+	if gm_pantiesS[i] = metka_panties and gm_panties[i] = 1:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''<<$ARGS[1]>>'', ''gm'', <<i>>"><img src="images/pc/items/gm/panties/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
-	if i <= ARRSIZE('cheap_panties'):jump 'loopcheappanties'
+	if i <= ARRSIZE('gm_panties'):jump 'loopgmpanties'
 
 	'<center><img src="images/locations/city/citycenter/mall/Lusso.png"></center>'
 
 	i = 1
-	:loopboutiquepanties 
-	if boutique_pantiesS[i] = metka_panties and boutique_panties[i] = 1:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''<<$ARGS[1]>>'', ''boutique'', <<i>>"><img src="images/pc/items/lusso/panties/<<i>>.jpg" 	height="150" /></a>'
+	:looplussopanties 
+	if lusso_pantiesS[i] = metka_panties and lusso_panties[i] = 1:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''<<$ARGS[1]>>'', ''lusso'', <<i>>"><img src="images/pc/items/lusso/panties/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
-	if i <= ARRSIZE('boutique_panties'):jump 'loopboutiquepanties'
+	if i <= ARRSIZE('lusso_panties'):jump 'looplussopanties'
 
 	'<center><img src="images/locations/pushkin/exhibitshop/shop_name.png"></center>'
 
 	i = 1
-	:loopexhibitionistpanties 
-	if exhibitionist_pantiesS[i] = metka_panties and exhibitionist_panties[i] = 1:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''<<$ARGS[1]>>'', ''exhibitionist'', <<i>>"><img src="images/pc/items/salacious/panties/<<i>>.jpg" 	height="150" /></a>'
+	:loopsalaciouspanties 
+	if salacious_pantiesS[i] = metka_panties and salacious_panties[i] = 1:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''<<$ARGS[1]>>'', ''salacious'', <<i>>"><img src="images/pc/items/salacious/panties/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
-	if i <= ARRSIZE('exhibitionist_panties'):jump 'loopexhibitionistpanties'
+	if i <= ARRSIZE('salacious_panties'):jump 'loopsalaciouspanties'
 
 	'<center><img src="images/locations/city/citycenter/mall/fashionista.png"></center>'
 
@@ -89,18 +89,18 @@ if $ARGS[0] = 'view_panty_list':
 	'<center><img src="images/locations/city/redlight/erotomaniac/shop_name.png"></center>'
 
 	i = 1
-	:loopsexshoppanties 
-	if sexshop_pantiesS[i] = metka_panties and sexshop_panties[i] = 1:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''<<$ARGS[1]>>'', ''sexshop'', <<i>>"><img src="images/pc/items/eroto/panties/<<i>>.jpg" 	height="150" /></a>'
+	:looperotopanties 
+	if eroto_pantiesS[i] = metka_panties and eroto_panties[i] = 1:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''<<$ARGS[1]>>'', ''eroto'', <<i>>"><img src="images/pc/items/eroto/panties/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
-	if i <= ARRSIZE('sexshop_panties'):jump 'loopsexshoppanties'
+	if i <= ARRSIZE('eroto_panties'):jump 'looperotopanties'
 
 	'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
 
 	i = 1
-	:loopsportpanties 
-	if sport_pantiesS[i] = metka_panties and sport_panties[i] = 1:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''<<$ARGS[1]>>'', ''sport'', <<i>>"><img src="images/pc/items/danilovich/panties/<<i>>.jpg" 	height="150" /></a>'
+	:loopdanilovichpanties 
+	if danilovich_pantiesS[i] = metka_panties and danilovich_panties[i] = 1:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''<<$ARGS[1]>>'', ''danilovich'', <<i>>"><img src="images/pc/items/danilovich/panties/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
-	if i <= ARRSIZE('sport_panties'):jump 'loopsportpanties'
+	if i <= ARRSIZE('danilovich_panties'):jump 'loopdanilovichpanties'
 end
 
 if $ARGS[0] = 'view_panty_item':
@@ -115,12 +115,9 @@ if $ARGS[0] = 'view_panty_item':
 !!	$RESULT = FUNC('$short_description', $ARGS[2], CloStyle2)
 !!	$RESULT += '<<ARGS[3]>>'
 !!	'<<$RESULT>>'
-	if BraQuality > 0:
-		gs 'underwear_descriptions', 'panties'
-		'These panties form a set with bra #<<underwear[''pair'']>>.'
-	else
-		gs 'panties', 'descriptions', $ARGS[2]
-	end
+
+	gs 'underwear_descriptions', 'panties'
+	if underwear['pair'] > 0: 'These panties form a set with bra #<<underwear[''pair'']>>.'
 
 	if $ARGS[1] = 'shop':
 		if dyneval('RESULT = <<$ARGS[2]>>_panties[<<ARGS[3]>>]') = 1:
@@ -378,32 +375,14 @@ if $ARGS[0] = 'dest2':
 	gt 'panties', 'view_panty_item', $ARGS[1], $ARGS[2], ARGS[3]
 end
 
-if $ARGS[0] = 'descriptions':
-	if $ARGS[1] = 'cheap':
-		'Cheap panties with no redeeming features.'
-	elseif $ARGS[1] = 'boutique':
-		'These panties are so beautifully made that your posture and confidence is improved wearing them boosting your appearance even when fully clothed.'
-	elseif $ARGS[1] = 'exhibitionist':
-		'These panties are so revealing that they are more exciting than not wearing any and you''ll always feel horny wearing them.'
-	elseif $ARGS[1] = 'fashionista':
-		'These panties are well made improving your posture and confidence and slightly boosting your appearance even when fully clothed.'
-	elseif $ARGS[1] = 'cats':
-		'These panties feel reassuring and wear them gives your mood a lift.'
-	elseif $ARGS[1] = 'sexshop':
-		'Tacky and cheap these panties make you look like a hooker, this could be a bonus if working as one.'
-	elseif $ARGS[1] = 'sport':
-		'These panties are designed for physical exercises to make them less tiring.'
-	end
-end
-
 if $ARGS[0] = 'sum':
-	$t[0] = 'boutique'
+	$t[0] = 'lusso'
 	$t[1] = 'cats'
-	$t[2] = 'exhibitionist'
+	$t[2] = 'salacious'
 	$t[3] = 'fashionista'
-	$t[4] = 'cheap'
-	$t[5] = 'sexshop'
-	$t[6] = 'sport'
+	$t[4] = 'gm'
+	$t[5] = 'eroto'
+	$t[6] = 'danilovich'
 	result = 0
 	i = 0
 	:loopsumpanties_i

locations/saveupdater.qsrc

@@ -1551,6 +1551,81 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 		killvar 'nichTanyaPropSex'
 		killvar 'nichTanyaPropDate'
 	end
+
+	i = 1
+	:loopboutiquepanties 
+	if boutique_panties[i] = 1: lusso_panties[i] = 1 & lusso_pantiesS[i] = boutique_pantiesS[i]
+	i += 1
+	if i <= ARRSIZE('boutique_panties'):jump 'loopboutiquepanties'
+	killvar 'boutique_panties'
+
+	i = 1
+	:loopboutiquebra
+	if boutique_bra[i] = 1: lusso_bra[i] = 1 & lusso_braS[i] = boutique_braS[i]
+	i += 1
+	if i <= ARRSIZE('boutique_bra'):jump 'loopboutiquebra'
+	killvar 'boutique_bra'
+
+	i = 1
+	:loopcheappanties 
+	if cheap_panties[i] = 1: gm_panties[i] = 1 & gm_pantiesS[i] = cheap_pantiesS[i]
+	i += 1
+	if i <= ARRSIZE('cheap_panties'):jump 'loopcheappanties'
+	killvar 'cheap_panties'
+
+	i = 1
+	:loopcheapbra
+	if boutique_bra[i] = 1: gm_bra[i] = 1 & gm_braS[i] = cheap_braS[i]
+	i += 1
+	if i <= ARRSIZE('cheap_bra'):jump 'loopcheapbra'
+	killvar 'cheap_bra'
+
+	i = 1
+	:loopexhibitionistpanties 
+	if exhibitionist_panties[i] = 1: salacious_panties[i] = 1 & salacious_pantiesS[i] = exhibitionist_pantiesS[i]
+	i += 1
+	if i <= ARRSIZE('exhibitionist_panties'):jump 'loopexhibitionistpanties'
+	killvar 'exhibitionist_panties'
+
+	i = 1
+	:loopexhibitionistbra
+	if exhibitionist_bra[i] = 1: salacious_bra[i] = 1 & salacious_braS[i] = exhibitionist_braS[i]
+	i += 1
+	if i <= ARRSIZE('exhibitionist_bra'):jump 'loopexhibitionistbra'
+	killvar 'exhibitionist_bra'
+
+	i = 1
+	:loopsexshoppanties 
+	if sexshop_panties[i] = 1: eroto_panties[i] = 1 & eroto_pantiesS[i] = sexshop_pantiesS[i]
+	i += 1
+	if i <= ARRSIZE('sexshop_panties'):jump 'loopsexshoppanties'
+	killvar 'sexshop_panties'
+
+	i = 1
+	:loopsexshopbra
+	if sexshop_bra[i] = 1: eroto_bra[i] = 1 & eroto_braS[i] = sexshop_braS[i]
+	i += 1
+	if i <= ARRSIZE('sexshop_bra'):jump 'loopsexshopbra'
+	killvar 'sexshop_bra'
+
+	i = 1
+	:loopsportpanties 
+	if sport_panties[i] = 1: danilovich_panties[i] = 1 & danilovich_pantiesS[i] = sport_pantiesS[i]
+	i += 1
+	if i <= ARRSIZE('sport_panties'):jump 'loopsportpanties'
+	killvar 'sport_panties'
+
+	i = 1
+	:loopsportbra
+	if sport_bra[i] = 1: danilovich_bra[i] = 1 & danilovich_braS[i] = sport_braS[i]
+	i += 1
+	if i <= ARRSIZE('sport_bra'):jump 'loopsportbra'
+	killvar 'sport_bra'
+end
+
+	
+	
+	
 end
 
 if traits > 0 or trait > 0:

locations/underwear_attributes.qsrc

@@ -30,7 +30,7 @@
 !!							7 - shelf
 !!							8 - open
 !!							9 - under wire
-!!							9 - bikini top
+!!							10 - bikini top
 !!
 !! BraType					Used for description of bodysuit with same variable that bra uses, could be useful for specific reactions
 !!							1 - Full
@@ -93,15 +93,42 @@ BraCover = 0
 underwear['pair'] = 0
 
 
-if $ARGS[0] = 'lusso_bodysuits':
+if $ARGS[0] = 'lusso_bodysuit':
 	*P FUNC('$attributes_lusso_bodysuit', $ARGS[0], ARGS[1])
-end
-if $ARGS[0] = 'boutique_panties':
+elseif $ARGS[0] = 'lusso_panties':
 	*P FUNC('$attributes_lusso_panties', $ARGS[0], ARGS[1])
-end
-if $ARGS[0] = 'boutique_bras':
+elseif $ARGS[0] = 'lusso_bras':
 	*P FUNC('$attributes_lusso_bra', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'scandalicious_bodysuit':
+	*P FUNC('$attributes_scandalicious_bodysuit', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'salacious_bodysuit':
+	*P FUNC('$attributes_salacious_bodysuit', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'salacious_panties':
+	*P FUNC('$attributes_salacious_panties', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'salacious_bras':
+	*P FUNC('$attributes_salacious_bra', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'fashionista_panties':
+	*P FUNC('$attributes_fashionista_panties', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'fashionista_bras':
+	*P FUNC('$attributes_fashionista_bra', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'danilovich_panties':
+	*P FUNC('$attributes_danilovich_panties', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'danilovich_bras':
+	*P FUNC('$attributes_danilovich_bra', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'eroto_panties':
+	*P FUNC('$attributes_eroto_panties', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'eroto_bras':
+	*P FUNC('$attributes_eroto_bra', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'cats_panties':
+	*P FUNC('$attributes_cats_panties', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'cats_bras':
+	*P FUNC('$attributes_cats_bra', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'gm_panties':
+	*P FUNC('$attributes_gm_panties', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'gm_bras':
+	*P FUNC('$attributes_gm_bra', $ARGS[0], ARGS[1])
 end
 
+
 --- underwear_attributes ---------------------------------
 

locations/underwear_bodysuits.qsrc

@@ -55,12 +55,6 @@ if $ARGS[0] = 'view_bodysuit_list':
 	i += 1
 	if i <= ARRSIZE('lusso_bodysuits'):jump 'looplussobodysuits'
 	
-	i = 1
-	:loopmoncheribodysuits 
-	if moncheri_bodysuits_s[i] = metka_bodysuits and moncheri_bodysuits[i] = 1:*p '<a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_item'', ''<<$ARGS[1]>>'', ''moncheri'', <<i>>"><img src="images/pc/items/moncheri/bodysuits/<<i>>.jpg" 	height="150" /></a>'
-	i += 1
-	if i <= ARRSIZE('moncheri_bodysuits'):jump 'loopmoncheribodysuits'
-	
 	i = 1
 	:loopsalaciousbodysuits 
 	if salacious_bodysuits_s[i] = metka_bodysuits and salacious_bodysuit[i] = 1:*p '<a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_item'', ''<<$ARGS[1]>>'', ''salacious'', <<i>>"><img src="images/pc/items/salacious/bodysuits/<<i>>.jpg" 	height="150" /></a>'
@@ -205,7 +199,7 @@ if $ARGS[0] = 'dest2':
 end
 
 if $ARGS[0] = 'sum':
-	$t[0] = 'boutique'
+	$t[0] = 'lusso'
 	$t[1] = 'cats'
 	$t[2] = 'exhibitionist'
 	$t[3] = 'fashionista'

locations/underwear_descriptions.qsrc

@@ -3,28 +3,26 @@
 
 $description = ''
 if $ARGS[0] = 'panties':
-	if PanStyle = 1:
-		$description += 'These'
-	elseif PanStyle = 2:
-		$description += 'These'
-	elseif PanStyle = 1:
+	if PanType = 3 or PanType = 4:
 		$description += 'This'
+	else
+		$description += 'These'
 	end
 
 	if PanQuality = 1:
-		$description = ' crappy quality'
+		$description += ' crappy quality'
 	elseif PanQuality = 2:
-		$description = ' very low quality'
+		$description += ' very low quality'
 	elseif PanQuality = 3:
-		$description = ' low quality'
+		$description += ' low quality'
 	elseif PanQuality = 4:
-		$description = ' average quality'
+		$description += ' average quality'
 	elseif PanQuality = 5:
-		$description = ' reasonable quality'
+		$description += ' reasonable quality'
 	elseif PanQuality = 6:
-		$description = ' good quality'
+		$description += ' good quality'
 	elseif PanQuality = 7:
-		$description = ' outstanding quality'
+		$description += ' outstanding quality'
 	end
 
 	if PanMaterial = 1:
@@ -37,50 +35,60 @@ if $ARGS[0] = 'panties':
 		$description += ', fishnet'
 	elseif PanMaterial = 5:
 		$description += ', vinyl'
-	elseif BraMaterial = 7:
+	elseif BraMaterial = 6:
 		$description += ', lace'
 	end
 
-	if PanStyle = 1:
-		$description += ' panties are'
-	elseif PanStyle = 2:
-		$description += ' boy shorts are'
-	elseif PanStyle = 3:
-		$description += ' G-string is'
+	if PanType = 1:
+		$description += ' panties'
+	elseif PanType = 2:
+		$description += ' boy shorts'
+	elseif PanType = 3:
+		$description += ' G-string'
+	elseif PanType = 3:
+		$description += ' C-string'
+	elseif PanType = 3:
+		$description += ' French knickers'
 	end
 
-	if PanThinness = 1:
-		$description += ', transparent.'
-	elseif PanThinness = 2:
-		$description += ', semi-transparent.'
-	elseif PanThinness = 3:
-		$description += ', slightly transparent.'
-	elseif PanThinness = 4:
-		$description += ', thin.'
+	if PanType = 3 or PanType = 4:
+		$description += ' is '
+	else
+		$description += ' are '
+	end
+
+	if PanThinness = 6:
+		$description += 'transparent.'
 	elseif PanThinness = 5:
-		$description += ' not particularly thick or thin.'
-	elseif PanThinness = 6:
-		$description += ', thick.'
+		$description += 'semi-transparent.'
+	elseif PanThinness = 4:
+		$description += 'slightly transparent.'
+	elseif PanThinness = 3:
+		$description += 'thin.'
+	elseif PanThinness = 2:
+		$description += 'not particularly thick or thin.'
+	elseif PanThinness = 1:
+		$description += 'thick.'
 	end
 
 	if PanCoverFront = 1:
-		$description += 'Your pussy can just about be seen in the right light.'
+		$description += ' Your pussy can just about be seen in the right light.'
 	elseif PanCoverFront = 2:
-		$description += 'Your pussy is partly visible.'
+		$description += ' Your pussy is partly visible.'
 	elseif PanCoverFront = 3:
-		$description += 'Your pussy is clearly visible.'
+		$description += ' Your pussy is clearly visible.'
 	elseif PanCoverFront = 4:
-		$description += 'Your pussy is not covered at all.'
+		$description += ' Your pussy is not covered at all.'
 	end
 
 	if PanCoverBack = 1:
-		$description += 'Your butt can just about be seen in the right light.'
+		$description += ' Your butt can just about be seen in the right light.'
 	elseif PanCoverBack = 2:
-		$description += 'Your butt is partly visible.'
+		$description += ' Your butt is partly visible.'
 	elseif PanCoverBack = 3:
-		$description += 'Your butt is clearly visible.'
+		$description += ' Your butt is clearly visible.'
 	elseif PanCoverBack = 4:
-		$description += 'Your butt is not covered at all.'
+		$description += ' Your butt is not covered at all.'
 	end
 
 
@@ -129,32 +137,38 @@ elseif $ARGS[0] = 'bras':
 		$description += ' sports'
 	elseif BraType = 7:
 		$description += ' shelf'
+	elseif BraType = 8:
+		$description += ' open'
+	elseif BraType = 9:
+		$description += ' under wire'
+	elseif BraType = 10:
+		$description += ' bikini'
 	end
 
-	$description += ' bra is'
+	$description += ' bra is '
 
-	if BraThinness = 1:
-		$description += ', transparent.'
-	elseif BraThinness = 2:
-		$description += ', semi-transparent.'
-	elseif BraThinness = 3:
-		$description += ', slightly transparent.'
-	elseif BraThinness = 4:
-		$description += ', thin.'
+	if BraThinness = 6:
+		$description += 'transparent.'
 	elseif BraThinness = 5:
-		$description += ' not particularly thick or thin.'
-	elseif BraThinness = 6:
-		$description += ', thick.'
+		$description += 'semi-transparent.'
+	elseif BraThinness = 4:
+		$description += 'slightly transparent.'
+	elseif BraThinness = 3:
+		$description += 'thin.'
+	elseif BraThinness = 2:
+		$description += 'not particularly thick or thin.'
+	elseif BraThinness = 1:
+		$description += 'thick.'
 	end
 
 	if BraCover = 1:
-		$description += 'Your breasts can just about be seen in the right light.'
+		$description += ' Your breasts can just about be seen in the right light.'
 	elseif BraCover = 2:
-		$description += 'Your breasts are partly visible.'
+		$description += ' Your breasts are partly visible.'
 	elseif BraCover = 3:
-		$description += 'Your breasts are easily visible.'
+		$description += ' Your breasts are easily visible.'
 	elseif BraCover = 4:
-		$description += 'Your breasts are not covered at all.'
+		$description += ' Your breasts are not covered at all.'
 	end
 
 elseif $ARGS[0] = 'bodysuit':
@@ -207,23 +221,23 @@ elseif $ARGS[0] = 'bodysuit':
 		$description += ' romper'
 	end
 
-	$description += ' bodysuit is'
+	$description += ' bodysuit is '
 
 	if BraThinness = 1:
-		$description += ' transparent'
+		$description += 'transparent'
 	elseif BraThinness = 2:
-		$description += ' semi-transparent'
+		$description += 'semi-transparent'
 	elseif BraThinness = 3:
-		$description += ' slightly transparent'
+		$description += 'slightly transparent'
 	elseif BraThinness = 4:
-		$description += ' thin'
+		$description += 'thin'
 	elseif BraThinness = 5:
-		$description += ' not particularly thick or thin'
+		$description += 'not particularly thick or thin'
 	elseif BraThinness = 6:
-		$description += ' thick'
+		$description += 'thick'
 	end
 
-	$description += ' on top and'
+	$description += ' on top and '
 
 	if PanThinness = 1:
 		$description += ' transparent'
@@ -239,36 +253,36 @@ elseif $ARGS[0] = 'bodysuit':
 		$description += ' thick'
 	end
 
-	$description += ' on the bottom. '
+	$description += ' on the bottom.'
 
 	if PanCoverFront = 1:
-		$description += 'Your pussy can just about be seen in the right light. '
+		$description += ' Your pussy can just about be seen in the right light.'
 	elseif PanCoverFront = 2:
-		$description += 'Your pussy is partly visible. '
+		$description += ' Your pussy is partly visible.'
 	elseif PanCoverFront = 3:
-		$description += 'Your pussy is clearly visible. '
+		$description += ' Your pussy is clearly visible.'
 	elseif PanCoverFront = 4:
-		$description += 'Your pussy is not covered at all. '
+		$description += ' Your pussy is not covered at all.'
 	end
 
 	if PanCoverBack = 1:
-		$description += 'Your butt can just about be seen in the right light. '
+		$description += ' Your butt can just about be seen in the right light.'
 	elseif PanCoverBack = 1:
-		$description += 'Your butt is partly visible. '
+		$description += ' Your butt is partly visible.'
 	elseif PanCoverBack = 1:
-		$description += 'Your butt is clearly visible. '
+		$description += ' Your butt is clearly visible.'
 	elseif PanCoverBack = 1:
-		$description += 'Your butt is not covered at all. '
+		$description += ' Your butt is not covered at all.'
 	end
 
 	if BraCover = 1:
-		$description += 'Your breasts can just about be seen in the right light.'
+		$description += ' Your breasts can just about be seen in the right light.'
 	elseif BraCover = 2:
-		$description += 'Your breasts are partly visible.'
+		$description += ' Your breasts are partly visible.'
 	elseif BraCover = 3:
-		$description += 'Your breasts are easily visible.'
+		$description += ' Your breasts are easily visible.'
 	elseif BraCover = 4:
-		$description += 'Your breasts are not covered at all.'
+		$description += ' Your breasts are not covered at all.'
 	end
 end