[fixed[ More bra and panty variable name updates

locations/ApperanceSystem.qsrc

@@ -245,13 +245,13 @@ if $ARGS[0] = 'CalcAccessoriesBonus':
 	shoesQualityBonus = ARGS[2] & !! PShoQuality
 
 	!!bonuses for certain underwear
-	if $pantyworntype = 'boutique':
+	if $pantyworntype = 'lusso':
 		pantyBonus = 4
 	elseif $pantyworntype = 'fashionista':
 		pantyBonus = 2
 	end
 
-	if $braworntype = 'boutique':
+	if $braworntype = 'lusso':
 		braBonus = 4
 	elseif $braworntype = 'fashionista':
 		braBonus = 2

locations/UnitAppearance.qsrc

@@ -179,8 +179,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -217,8 +217,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -255,8 +255,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -293,8 +293,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -331,8 +331,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -369,8 +369,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 0
@@ -407,8 +407,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -445,8 +445,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -483,8 +483,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -521,8 +521,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -559,8 +559,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -597,8 +597,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -635,8 +635,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -673,8 +673,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -711,8 +711,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -749,8 +749,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -787,8 +787,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -825,7 +825,7 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
+    $unitpantyworntype = 'gm'
     $unitbraworntype = 'none'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
@@ -863,8 +863,8 @@ if $ARGS[0] = 'GenerateSvetas':
     $unitclothingworntype = 'gm_outfits'
     unitbonusZ = 0
     unitPShoQuality = 0
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
     unitpcs_lipbalm = 0
     unitmopkoef = 0
     unitpcs_hairbsh = 1
@@ -909,8 +909,8 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPCloQuality = 7
     unitbonusZ = 5
     unitPShoQuality = 7
-    $unitpantyworntype = 'boutique'
-    $unitbraworntype = 'boutique'
+    $unitpantyworntype = 'lusso'
+    $unitbraworntype = 'lusso'
 
     $svetadesc = 'Max morbidly obese'
     unitsalo = 220
@@ -981,8 +981,8 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPCloQuality = 1
     unitbonusZ = 0
     unitPShoQuality = 1
-    $unitpantyworntype = 'cheap'
-    $unitbraworntype = 'cheap'
+    $unitpantyworntype = 'gm'
+    $unitbraworntype = 'gm'
 
     $svetadesc = 'morbidly obese'
     unitsalo = 220
@@ -1053,8 +1053,8 @@ if $ARGS[0] = 'GenerateSvetas':
     unitPCloQuality = 7
     unitbonusZ = 0
     unitPShoQuality = 7
-    $unitpantyworntype = 'boutique'
-    $unitbraworntype = 'boutique'
+    $unitpantyworntype = 'lusso'
+    $unitbraworntype = 'lusso'
 
     $svetadesc = 'morbidly obese'
     unitsalo = 220
@@ -1183,8 +1183,8 @@ if $ARGS[0] = 'GenerateSvetaOptions':
     $unitclothingworntype = ''
     unitbonusZ = 5
     unitPShoQuality = 7
-    $unitpantyworntype = 'boutique'
-    $unitbraworntype = 'boutique'
+    $unitpantyworntype = 'lusso'
+    $unitbraworntype = 'lusso'
     gs 'UnitAppearance', 'calcHotcat', $svetadesc
     gs 'UnitAppearance', 'RestoreBase'
 
@@ -1194,8 +1194,8 @@ if $ARGS[0] = 'GenerateSvetaOptions':
     $unitclothingworntype = ''
     unitbonusZ = 5
     unitPShoQuality = 7
-    $unitpantyworntype = 'boutique'
-    $unitbraworntype = 'boutique'
+    $unitpantyworntype = 'lusso'
+    $unitbraworntype = 'lusso'
     unitpcs_teeth = -1
     unitpcs_skin = 100
     unitpcs_lashes = 5

locations/Zvereva_events.qsrc

@@ -80,7 +80,7 @@ if $ARGS[0] = 'christina_bu_2':
 			christinaQW['bully'] -= 2
 			cla
 			'Your face burns as you imagine everybody in school looking at a picture of your panties, and can''t stop yourself from saying "You pervert. Do you get off looking at girls panties?"'
-			'Christina just shrugs and responds with "You''re the one showing them to the world. I bet you did it on purpose so people could see your'+iif($pantyworntype = 'cheap', ' ugly',' cute')+' panties, slut." She finishes sending the picture, gives you a smirk, and walks away.'
+			'Christina just shrugs and responds with "You''re the one showing them to the world. I bet you did it on purpose so people could see your'+iif($pantyworntype = 'gm', ' ugly',' cute')+' panties, slut." She finishes sending the picture, gives you a smirk, and walks away.'
 			'All you can do at this point is gather your fallen stuff and head out.'
 
 			act 'Leave': gt 'gschool_grounds', 'main'

locations/budgetclothes.qsrc

@@ -533,7 +533,7 @@ if $ARGS[0] = 'panties':
 
 	i = 1
 	:looppanties
-		if gm_panties[i] = 0:*p '<a href="exec: gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', <<i>>, 300"><img src="images/pc/items/gm/panties/<<i>>.jpg" 	height="150" /></a>'
+		if gm_panties[i] = 0:*p '<a href="exec: gt ''panties'', ''view_panty_item'', ''shop'', ''gm'', <<i>>, 300"><img src="images/pc/items/gm/panties/<<i>>.jpg" 	height="150" /></a>'
 		i += 1
 		if i = 7: i = 8
 		if i = 9: i = 10
@@ -559,7 +559,7 @@ if $ARGS[0] = 'bras':
 
 	i = 1
 	:loopbras
-		if gm_bras[i] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''cheap'', <<i>>, 300"><img src="images/pc/items/gm/bras/<<i>>.jpg" 	height="150" /></a>'
+		if gm_bras[i] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''gm'', <<i>>, 300"><img src="images/pc/items/gm/bras/<<i>>.jpg" 	height="150" /></a>'
 		i += 1
 		if i = 11: i = 13
 		if i = 16: i = 17

locations/casting.qsrc

@@ -201,7 +201,7 @@ if $ARGS[0] = 'DildoGirl':
 	audition['roletype'] = 3
 	$audition['type'] = 'titty'
 	$costuming['type'] = 'panties'
-	$costuming['panties'] = 'cheap'
+	$costuming['panties'] = 'gm'
 	costuming['pantynumber'] = 31
 	acting['pay'] = (audition['roletype'] + 1) * 800 + (15*rand(0,roletype))
 	'Big boobed girl wanted for the role of <b>Dildo Girl.</b>'

locations/costuming.qsrc

@@ -226,13 +226,13 @@ if $ARGS[0] = 'panty_costume':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/costuming.jpg"></center>'
 	if $pantyworntype = 'none' and costuming['check'] < 1:
 		if costuming['pantynumber'] = '':
-			if $costuming['panties'] = 'cheap':
+			if $costuming['panties'] = 'gm':
 				gs 'panties','wear', $costuming['panties'],rand(1,37)
 			elseif $costuming['panties'] = 'cats':
 				gs 'panties','wear', $costuming['panties'],rand(1,79)
 			elseif $costuming['panties'] = 'fashionista':
 				gs 'panties','wear', $costuming['panties'],rand(1,79)
-			elseif $costuming['panties'] = 'sexshop':
+			elseif $costuming['panties'] = 'eroto':
 				gs 'panties','wear', $costuming['panties'],rand(1,43)
 			end
 		else
@@ -262,13 +262,13 @@ if $ARGS[0] = 'panty_costume':
 			elseif CloSkirtShortness > 0:
 				'A girl passes by and you try to catch her attention. She turns towards you, you call out, "Hey can I borrow some panties? I''m supposed to wear some for the scene but I didn''t put any on today," you grin as you slide your skirt off and bare your pussy to the room.'
 			end
-			if $costuming['panties'] = 'cheap':
+			if $costuming['panties'] = 'gm':
 				'Many of the older women in the room look at you with disgust but the girl just gives you an amused look and reaches into a nearby drawer, selects a cheap looking pair and hands it to you.'
 			elseif $costuming['panties'] = 'cats':
 				'Many of the older women in the room look at you with disgust but the girl just gives you an amused look and reaches into a nearby drawer, selects a cute looking pair and hands it to you.'
 			elseif $costuming['panties'] = 'fashionista':
 				'Many of the older women in the room look at you with disgust but the girl just gives you an amused look and reaches into a nearby drawer, selects a nice looking pair and hands it to you.'
-			elseif $costuming['panties'] = 'sexshop':
+			elseif $costuming['panties'] = 'eroto':
 				'Many of the older women in the room look at you with disgust but the girl just gives you an amused look and reaches into a nearby drawer, selects a sexy thong and hands it to you.'
 			end
 			
@@ -326,8 +326,8 @@ if $ARGS[0] = 'panty_costume':
 		if $costuming['panties'] = $pantyworntype and (costuming['pantynumber'] = '' or costuming['pantynumber'] = pantywornnumber):
 			'You strip down to your panties as an attendant comes to check that you match the costuming notes. She decides that what you''re currently wearing is fine for your role and sends you back to makeup.'
 			act'Back to makeup':gt'costuming','costume_end'
-		elseif $costuming['panties'] = 'cheap':
-			if $pantyworntype = 'sexshop':
+		elseif $costuming['panties'] = 'gm':
+			if $pantyworntype = 'eroto':
 				'You strip down to your panties as an attendant comes to check that you match the costuming notes. She looks at your panties and tells you to take them off because they''re too sexy for your scene. While you slip them off she rummages through a drawer full of panties, pulling out a cute looking pair she trades to you for the ones you were just recently wearing. You slip them on and she checks you off her list before sending you back to makeup.'
 				gs 'panties','wear', $costuming['panties'],rand(1,37)
 				act'Back to makeup':gt'costuming','costume_end'
@@ -338,7 +338,7 @@ if $ARGS[0] = 'panty_costume':
 			end
 		elseif $costuming['panties'] = 'fashionista' or $costuming['panties'] = 'cats':
 			act'Back to makeup':gt'costuming','costume_end'
-			if $pantyworntype = 'sexshop':
+			if $pantyworntype = 'eroto':
 				'You strip down to your panties as an attendant comes to check that you match the costuming notes. She looks at your panties and tells you to take them off because they''re too sexy for your scene. While you slip them off she rummages through a drawer full of panties, pulling out a cute pair she trades to you for the ones you were recently wearing. You slip them on and she checks you off her list before sending you back to makeup.'
 			else
 				'You strip down to your panties as an attendant comes to check that you match the costuming notes. She looks at your panties and tells you to take them off because they aren''t cute enough for your scene. While you slip them off she rummages through a drawer full of panties, pulling out a <i>very</i> cute pair she trades to you for the ones you were  recently wearing. You slip them on and she checks you off her list before sending you back to makeup.'
@@ -348,11 +348,11 @@ if $ARGS[0] = 'panty_costume':
 			else
 				gs 'panties','wear', $costuming['panties'],rand(1,72)
 			end
-		elseif $costuming['panties'] = 'sexshop':
+		elseif $costuming['panties'] = 'eroto':
 			'You strip down to your panties as an attendant comes to check that you match the costuming notes. She looks at your panties and tells you to take them off because the notes say you should be wearing something much sluttier instead. While you slip them off, she opens a drawer full of skimpy panties and thongs and rummages through it for a bit. After inspecting several, she pulls out one she deems appropriate and trades it to you for your removed panties. She checks you off on her list, collects the rest of your clothes, and moves off. As you pull the thong up around your hips a girl comes by with a robe and hands it to you.'
 			gs 'panties','wear', $costuming['panties'],rand(1,43)
 			act'Back to makeup':gt'costuming','costume_end'
-		elseif $costuming['pantytype'] = 'thong' and $pantyworntype ! 'sexshop':
+		elseif $costuming['pantytype'] = 'thong' and $pantyworntype ! 'eroto':
 			'You strip down to your panties as an attendant comes to check that you match the costuming notes. She looks at your panties and tells you to take them off because the notes say you should be wearing a thong instead. While you slip them off, she opens a drawer full of thongs and rummages through it for a bit. After inspecting several, she pulls out one she deems appropriate and trades it to you for your removed panties. She checks you off on her list, collects the rest of your clothes, and moves off. As you pull the thong up around your hips a girl comes by with a robe and hands it to you.'
 			gs 'panties','wear', $costuming['panties'],costuming['pantynumber']
 			act'Back to makeup':gt'costuming','costume_end'

locations/exhibitionistshop.qsrc

@@ -176,7 +176,7 @@ if $ARGS[0] = 'panties2':
 		gt 'exhibitionistshop', 'panties'
 	end
 
-	gt 'panties', 'view_panty_item', 'shop', 'exhibitionist',i, 600
+	gt 'panties', 'view_panty_item', 'shop', 'salacious',i, 600
 
 end
 
@@ -208,7 +208,7 @@ if $ARGS[0] = 'bras2':
 		gt 'exhibitionistshop', 'bras'
 	end
 
-	gt 'bras', 'view_bra_item', 'shop', 'exhibitionist',i, 600
+	gt 'bras', 'view_bra_item', 'shop', 'salacious',i, 600
 
 end
 

locations/fame_events.qsrc

@@ -55,10 +55,10 @@ if $ARGS[0] = 'boy':
 	'<center><img <<$set_imgh>> src="images/locations/shared/fame/boyapproaching1.jpg"></center>'
 	if stat_visible_cum = 1:
 		'"Excuse me! <<$pcs_firstname>> <<$pcs_lastname>>?" you hear from behind you. Turning around, you see an excited boy few years younger than yourself coming towards you. "<<$pcs_firstname>> <<$pcs_lastname>>! The <<$fame[''noun'']>>? It is you, isn''t it! You''re so... uhh..." his voice falters as he notices the cum on you. He then gathers his courage and continues "so... uhh... cool!"'
-	elseif CloThinness = 6 and ($braworntype = 'exhibitionist' or $braworntype = 'none'):
+	elseif CloThinness = 6 and ($braworntype = 'salacious' or $braworntype = 'none'):
 		'"Excuse me! <<$pcs_firstname>> <<$pcs_lastname>>?" you hear from behind you. Turning around, you see an excited boy few years younger than yourself coming towards you. "<<$pcs_firstname>> <<$pcs_lastname>>! The <<$fame[''noun'']>>? It is you, isn''t it! You''re so... uhh..." He trails off when he realizes that he can practically see straight through your top to your your breasts. His cheeks flush and he gulps heavily before managing to continue on in a stammer. "Uhh... great at, uh, <<$fame[''activity'']>>..."'
 		'He smiles genuinely, but hesitantly and you can tell he''s having a really hard time maintaining eye contact with you now. In fact, he''s failing quite frequently.'
-	elseif CloThinness = 5 and ($braworntype = 'exhibitionist' or $braworntype = 'none'):
+	elseif CloThinness = 5 and ($braworntype = 'salacious' or $braworntype = 'none'):
 		'"Excuse me! <<$pcs_firstname>> <<$pcs_lastname>>?" you hear from behind you. Turning around, you see an excited boy few years younger than yourself coming towards you. "<<$pcs_firstname>> <<$pcs_lastname>>! The <<$fame[''noun'']>>? It is you, isn''t it! You''re so..." He trails off for a brief moment and you see his eyes flicker downward for a moment before snapping back up. It was just a small twitch, but you suddenly feel very aware of how thin your top is and how certain things might be "poking" out.'
 		'"Sorry," he stammers on, clearly embarrassed that you noticed his glance. "I just wanted to say that you''re so cool!"'
 	elseif CloThinness = 6:
@@ -100,10 +100,10 @@ if $ARGS[0] = 'boy':
 			if stat_visible_cum = 1:
 				gs 'fame', '<<$ARGS[1]>>', 'sex', 'small'
 				'You sidle up to him and give a big smile into his camera phone. It''s only when you see yourself reflected in the viewfinder that you think maybe this isn''t such a great idea. You can clearly see the cum from your last sexual encounter on you. If this kind of thing gets posted on social media, what will people think? Before you can come up with an excuse to back out, the phone makes an artificial shuttering sound and the picture is taken.'
-			elseif CloThinness = 6 and ($braworntype = 'exhibitionist' or $braworntype = 'none'):
+			elseif CloThinness = 6 and ($braworntype = 'salacious' or $braworntype = 'none'):
 				gs 'fame', '<<$ARGS[1]>>', 'sex', 'small'
 				'You sidle up to him and give a big smile into his camera phone. It''s only when you see yourself reflected in the viewfinder that you think maybe this isn''t such a great idea. Your breasts are <i>fully</i> visible, nipples and everything. If this kind of thing gets posted on social media, what will people think? Before you can come up with an excuse to back out, the phone makes an artificial shuttering sound and the picture is taken.'
-			elseif CloThinness = 5 and ($braworntype = 'exhibitionist' or $braworntype = 'none'):
+			elseif CloThinness = 5 and ($braworntype = 'salacious' or $braworntype = 'none'):
 				gs 'fame', '<<$ARGS[1]>>', 'sex', 'tiny'
 				'You sidle up to him, giving a big smile into his camera phone. After a few moments, the boy manages to thumb the button and an artificial shuttering sound goes off. He immediately pulls it up for review and you take a look at it with him. It''s a cute picture, the two of you together, though you notice just now that you can totally see your nipples are poking through your top and it''s totally visible. Oh well, that''s hardly the worst thing someone''s seen of a female celebrity on the internet. But he clearly doesn''t mind.'
 			elseif CloThinness = 6:
@@ -150,10 +150,10 @@ if $ARGS[0] = 'girl':
 	gs 'stat'
 	if stat_visible_cum = 1:
 		'"Excuse me! <<$pcs_firstname>> <<$pcs_lastname>>?" you hear from behind you. Turning around, you see an excited girl few years younger than yourself coming towards you. "<<$pcs_firstname>> <<$pcs_lastname>>! The <<$fame[''noun'']>>? It is you, isn''t it! You''re so... uhh..." her voice falters as she notices the cum on you. She then gathers her courage and continues "so... uhh... cool..."'
-	elseif CloThinness = 6 and ($braworntype = 'exhibitionist' or $braworntype = 'none'):
+	elseif CloThinness = 6 and ($braworntype = 'salacious' or $braworntype = 'none'):
 		'"Excuse me! <<$pcs_firstname>> <<$pcs_lastname>>?" you hear from behind you. Turning around, you see an excited girl few years younger than yourself coming towards you. "<<$pcs_firstname>> <<$pcs_lastname>>! The <<$fame[''noun'']>>? It is you, isn''t it! You''re so... uhh..." She trails off when she realizes that she can practically see straight through your top. Her cheeks flush and she gulps heavily before managing to continue on in a stammer. "Uhh... great at, uh, <<$fame[''activity'']>>..."'
 		'Her blush deepens even more, very pointedly staring at your face, seemingly trying to pretend she doesn''t notice your breasts fully on display in front of her face.'
-	elseif CloThinness = 5 and ($braworntype = 'exhibitionist' or $braworntype = 'none'):
+	elseif CloThinness = 5 and ($braworntype = 'salacious' or $braworntype = 'none'):
 		'"Excuse me! <<$pcs_firstname>> <<$pcs_lastname>>?" you hear from behind you. Turning around, you see an excited girl few years younger than yourself coming towards you. "<<$pcs_firstname>> <<$pcs_lastname>>! The <<$fame[''noun'']>>? It is you, isn''t it! You''re so..." She trails off for a brief moment and you see her eyes flicker downward for a moment before snapping back up. It was just a small twitch, but you suddenly feel very aware of how thin your top is and how certain things might be "poking" out.'
 		'"Sorry," she stammers on, clearly embarrassed that you noticed her glance. "I just wanted to say that you''re so cool!"'
 	elseif CloThinness = 6:
@@ -193,10 +193,10 @@ if $ARGS[0] = 'girl':
 			if stat_visible_cum = 1:
 				gs 'fame', '<<$ARGS[1]>>', 'sex', 'small'
 				'You sidle up to her and give a big smile into her camera phone. It''s only when you see yourself reflected in the viewfinder that you think maybe this isn''t such a great idea. You can clearly see the cum from your last sexual encounter on you. If this kind of thing gets posted on social media, what will people think? Before you can come up with an excuse to back out, the phone makes an artificial shuttering sound and the picture is taken.'
-			elseif CloThinness = 6 and ($braworntype = 'exhibitionist' or $braworntype = 'none'):
+			elseif CloThinness = 6 and ($braworntype = 'salacious' or $braworntype = 'none'):
 				gs 'fame', '<<$ARGS[1]>>', 'sex', 'small'
 				'You sidle up to her and give a big smile into her camera phone. It''s only when you see yourself reflected in the viewfinder that you think maybe this isn''t such a great idea. Your breasts are <i>fully</i> visible, nipples and everything. If this kind of thing gets posted on social media, what will people think? Before you can come up with an excuse to back out, the phone makes an artificial shuttering sound and the picture is taken.'
-			elseif CloThinness = 5 and ($braworntype = 'exhibitionist' or $braworntype = 'none'):
+			elseif CloThinness = 5 and ($braworntype = 'salacious' or $braworntype = 'none'):
 				gs 'fame', '<<$ARGS[1]>>', 'sex', 'tiny'
 				'You sidle up to her, giving a big smile into her camera phone. After a few moments, the girl manages to thumb the button and an artificial shuttering sound goes off. She immediately pulls it up for review and you take a look at it with her. It''s a cute picture, the two of you together, though you notice just now that you can totally see your nipples are poking through your top and it''s totally visible. Oh well, that''s hardly the worst thing someone''s seen of a female celebrity on the internet. But she clearly doesn''t mind.'
 			elseif CloThinness = 6:

locations/gadprostitutes.qsrc

@@ -296,7 +296,7 @@ if $ARGS[0] = 'work_alone':
 	'<center><video autoplay src="images/shared/prostitution/car/normal/negotiation/search.mp4"></video></center>'
 	
 	!! TODO: Need to rewrite this to reflect the Gadukino location
-	!!'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pirsA > 0 and pirsA < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'sexshop' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
+	!!'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pirsA > 0 and pirsA < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'eroto' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
 
 	!! TODO: The enema thing should be aligned with the rest of the game. 
 	!! NOTE The enema is called klisma (?) that needs to be cleaned up too.

locations/gas_station_gp_117.qsrc

@@ -406,7 +406,7 @@ if $ARGS[0] = 'work':
 	end
 
 	'<center><video autoplay src="images/shared/prostitution/car/normal/negotiation/search.mp4"></video></center>'
-	'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pirsA > 0 and pirsA < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'sexshop' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
+	'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pirsA > 0 and pirsA < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'eroto' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
 
 	if klismaday ! daystart: '<br>Nearly all men won''t like dirty anal sex, even with a condom, and it''s probably a safe bet that they won''t pay a lot for it. You should start giving yourself an enema before going to work.'
 	if mesec > 0: '<br>You are having your period, most men will pay less for vaginal sex during that time of the month.'

locations/intro_initialization.qsrc

@@ -399,11 +399,11 @@ if school_clothing = 1:
 	dolls_outfits_b[29] = pcs_hips
 	danilovich_bras[3] = 1
 	danilovich_brasS[3] = 0
-	$sportsbratype = 'sport'
+	$sportsbratype = 'danilovich'
 	sportsbranumber = 3
 	danilovich_panties[3] = 1
 	danilovich_pantiesS[3] = 0
-	$sportspantytype = 'sport'
+	$sportspantytype = 'danilovich'
 	sportspantynumber = 3
 	dolls_coats[19] = 1
 	dolls_coats_h[19] = 200
@@ -420,11 +420,11 @@ else
 	sportscoatnumber = 12
 	danilovich_bras[1] = 1
 	danilovich_brasS[1] = 0
-	$sportsbratype = 'sport'
+	$sportsbratype = 'danilovich'
 	sportsbranumber = 1
 	danilovich_panties[1] = 1
 	danilovich_pantiesS[1] = 0
-	$sportspantytype = 'sport'
+	$sportspantytype = 'danilovich'
 	sportspantynumber = 1
 	if school_clothing = 2:
 		gm_school[49] = 1

locations/nichTanya.qsrc

@@ -549,7 +549,7 @@ if $ARGS[0] = 'date':
 			'The two of you visit various shops in the mall. The last shop is an expensive boutique.'
 			'Tanya goes straight to the lingerie department. She collects some items, then she takes you by the hand and leads you to a changing room.'
 			'She strips down and puts the bra and the panties she took on.'
-			if $braworntype = 'boutique' and brawornnumber = 19:
+			if $braworntype = 'lusso' and brawornnumber = 19:
 				'"Hey, I think I took the same bra you are wearing right now. We really have very much in common." She smiles at you.'
 				'After she is done trying out some other clothes she pays for the ones she wants to buy and the two ouf you head back home.'
 				act 'Return to the apartment':

locations/prostitution_functions.qsrc

@@ -567,7 +567,7 @@ if $ARGS[0] = 'parameters':
 	!!---- Chance to find a client --------------------------------------------------------------------------------	
 
 	prostitute['client_chance'] = hotcat * 10 + prostitute['regular_chance'] * 5 + rand(1,100) + prostitute['pity_counter']
-	if $pantyworntype = 'sexshop' and CloSkirtShortness > 4: prostitute['client_chance'] += 10
+	if $pantyworntype = 'eroto' and CloSkirtShortness > 4: prostitute['client_chance'] += 10
 
 	!!---- Client ------------------------------------------------------------------------------------------------	
 
@@ -671,7 +671,7 @@ if $ARGS[0] = 'payment':
 
 	prostitute['payment_mod'] += pcs_mood - 50
 
-	if $pantyworntype = 'sexshop' and CloSkirtShortness > 4: prostitute['payment_mod'] += 50
+	if $pantyworntype = 'eroto' and CloSkirtShortness > 4: prostitute['payment_mod'] += 50
 
 	if prostitute['vidage_mod'] = 1:
 		prostitute['payment_mod'] += 50 * (18 - vidage)

locations/road_prostitution.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'work':
 	'<center><video autoplay src="images/shared/prostitution/car/normal/negotiation/search.mp4"></video></center>'
 
 	!! TODO: Need to rewrite this to reflect the Pavlovsk - St Petersburg road locations
-	!!'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pirsA > 0 and pirsA < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'sexshop' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
+	!!'You are walking near the gas station waiting for a client. On a scale from 1 to 10 you look like a <<hotcat>>. A good looking girl will always earn more money.'+iif(pcs_makeup < 2, ' You should '+iif(pcs_makeup = 0, 'fix your make-up', 'wear make-up')+' to increase your earnings.', ' Wearing make-up is a good way to increase your earnings.')+iif(pirsA > 0 and pirsA < 10000, ' Your tongue piercing will make a blowjob more enjoyable for most men, that could bring in a small bonus.', '')+iif($pantyworntype = 'eroto' and CloSkirtShortness > 4, ' Wearing such a short skirt reveals your slutty panties to your potential customers.', '')+iif(pcs_apprnc = -10, ' You don''t look healthy and should seek treatment for your STD. There is a high chance that a guy won''t touch you without a condom.', '')
 	gs 'road_prostitution', 'road_segment'
 
 	!! TODO: The enema thing should be aligned with the rest of the game.

locations/sexshop.qsrc

@@ -374,7 +374,7 @@ if $ARGS[0] = 'panties2':
 		gt 'sexshop', 'panties'
 	end
 
-	gt 'panties', 'view_panty_item', 'shop', 'sexshop',i, 500
+	gt 'panties', 'view_panty_item', 'shop', 'eroto',i, 500
 end
 
 if $ARGS[0] = 'bras':
@@ -404,7 +404,7 @@ if $ARGS[0] = 'bras2':
 		gt 'sexshop', 'bras'
 	end
 
-	gt 'bras', 'view_bra_item', 'shop', 'sexshop',i, 500
+	gt 'bras', 'view_bra_item', 'shop', 'eroto',i, 500
 
 end
 

locations/shop.qsrc

@@ -525,16 +525,16 @@ if $shoplocation = 'underwear':
 	$loc = 'shop'
 	'<center><B>Click on an item to view details</B></center>'
 
-	if gm_panties[7] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', 7, 300"><img src="images/pc/items/gm/panties/7.jpg" 	height="150" /></a>'
-	if gm_panties[9] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', 9, 300"><img src="images/pc/items/gm/panties/9.jpg" 	height="150" /></a>'
-	if gm_panties[12] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', 12, 300"><img src="images/pc/items/gm/panties/12.jpg" 	height="150" /></a>'
-	if gm_panties[21] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', 21, 300"><img src="images/pc/items/gm/panties/21.jpg" 	height="150" /></a>'
-	if gm_panties[37] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', 37, 300"><img src="images/pc/items/gm/panties/37.jpg" 	height="150" /></a>'
+	if gm_panties[7] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''gm'', 7, 300"><img src="images/pc/items/gm/panties/7.jpg" 	height="150" /></a>'
+	if gm_panties[9] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''gm'', 9, 300"><img src="images/pc/items/gm/panties/9.jpg" 	height="150" /></a>'
+	if gm_panties[12] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''gm'', 12, 300"><img src="images/pc/items/gm/panties/12.jpg" 	height="150" /></a>'
+	if gm_panties[21] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''gm'', 21, 300"><img src="images/pc/items/gm/panties/21.jpg" 	height="150" /></a>'
+	if gm_panties[37] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''gm'', 37, 300"><img src="images/pc/items/gm/panties/37.jpg" 	height="150" /></a>'
 	*nl
-	if gm_bras[11] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''cheap'', 11, 300"><img src="images/pc/items/gm/bras/11.jpg" 	height="150" /></a>'
-	if gm_bras[12] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''cheap'', 12, 300"><img src="images/pc/items/gm/bras/12.jpg" 	height="150" /></a>'
-	if gm_bras[16] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''cheap'', 16, 300"><img src="images/pc/items/gm/bras/16.jpg" 	height="150" /></a>'
-	if gm_bras[18] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''cheap'', 18, 300"><img src="images/pc/items/gm/bras/18.jpg" 	height="150" /></a>'
+	if gm_bras[11] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''gm'', 11, 300"><img src="images/pc/items/gm/bras/11.jpg" 	height="150" /></a>'
+	if gm_bras[12] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''gm'', 12, 300"><img src="images/pc/items/gm/bras/12.jpg" 	height="150" /></a>'
+	if gm_bras[16] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''gm'', 16, 300"><img src="images/pc/items/gm/bras/16.jpg" 	height="150" /></a>'
+	if gm_bras[18] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''gm'', 18, 300"><img src="images/pc/items/gm/bras/18.jpg" 	height="150" /></a>'
 
 	act 'Return':
 		$loc = $loc_bak

locations/sportShop.qsrc

@@ -216,7 +216,7 @@ if $ARGS[0] = 'panties2':
 		gt 'sportShop', 'panties'
 	end
 
-	gt 'panties', 'view_panty_item', 'shop', 'sport',i, 1000
+	gt 'panties', 'view_panty_item', 'shop', 'danilovich',i, 1000
 
 end
 
@@ -248,7 +248,7 @@ if $ARGS[0] = 'bras2':
 		gt 'sportShop', 'bras'
 	end
 
-	gt 'bras', 'view_bra_item', 'shop', 'sport',i, 1000
+	gt 'bras', 'view_bra_item', 'shop', 'danilovich',i, 1000
 
 end
 

locations/stat.qsrc

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

locations/stat_display.qsrc

@@ -435,7 +435,7 @@ if $clothingworntype ! 'nude':
 		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 = 'exhibitionist':
+		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':
@@ -449,7 +449,7 @@ if $clothingworntype ! 'nude':
 		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 = 'exhibitionist':
+		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':
@@ -482,7 +482,7 @@ if $clothingworntype ! 'nude':
 		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 = 'exhibitionist':
+		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':
@@ -577,7 +577,7 @@ if $pantyworntype = 'none' and PCloswimwear = 0 and PCloPanties = 0:
 	elseif $clothingworntype ! 'nude':
 		$stat_panty_msg = 'You are not wearing panties.'
 	end
-elseif $pantyworntype = 'exhibitionist' and PCloswimwear = 0:
+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>'
@@ -600,12 +600,12 @@ $stat_clothes_msg = ''
 $stat_clothes_text = ''
 
 if $clothingworntype = 'nude':
-	if $pantyworntype = 'exhibitionist':
+	if $pantyworntype = 'salacious':
 		if $braworntype = 'none':
 			$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 = 'exhibitionist':
+		elseif $braworntype = 'salacious':
 			$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.'
@@ -619,7 +619,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 = 'exhibitionist':
+		elseif $braworntype = 'salacious':
 			$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.'

locations/underwear_bodysuits.qsrc

@@ -200,12 +200,8 @@ end
 
 if $ARGS[0] = 'sum':
 	$t[0] = 'lusso'
-	$t[1] = 'cats'
-	$t[2] = 'exhibitionist'
-	$t[3] = 'fashionista'
-	$t[4] = 'cheap'
-	$t[5] = 'sexshop'
-	$t[6] = 'sport'
+	$t[1] = 'salacious'
+	$t[2] = 'scandalicious'
 	result = 0
 	i = 0
 	:loopsumbodysuits_i

locations/unused/body.qsrc

@@ -2543,13 +2543,13 @@ if $ARGS[0] = 'calcAccessoriesBonus':
 	$tempbraworntype = $ARGS[4] & !! $braworntype
 	
 	!!bonuses for certain underwear
-	if $temppantyworntype = 'boutique':
+	if $temppantyworntype = 'lusso':
 		temppantybounus = 4
 	elseif $temppantyworntype = 'fashionista':
 		temppantybounus = 2
 	end
 
-	if $tempbraworntype = 'boutique':
+	if $tempbraworntype = 'lusso':
 		tempbrabounus = 4
 	elseif $tempbraworntype = 'fashionista':
 		tempbrabounus = 2