7 Commits 8598ce3f1e ... e8657daeaa

Author SHA1 Message Date
  3xpurt e8657daeaa [fixed] redundant end 'saveupdater', corrected conditionals in 'clothing_qv', typo and EOL cleanup 'abina_chat' 1 year ago
  Kevin_Smarts 9755686356 [fixed[ More bra and panty variable name updates 1 year ago
  Kevin_Smarts 1c125bf0e6 [fixed] Worn underwear was wrong at start if it should have been GM 1 year ago
  Kevin_Smarts 5280121945 [fixed] Some underwear variables not updated and updater needed to be more dynamic 1 year ago
  Kevin_Smarts 1ea23b03b6 Merge remote-tracking branch 'Expurt/master' 1 year ago
  Kevin_Smarts 9a8d38f65c [fixed] Wrong variable check 1 year ago
  Kevin_Smarts d7c741cf58 [fixed] Npc data added earlier in intro so as to not overwrite changes made in setup 1 year ago

+ 2 - 2
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

+ 47 - 47
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

+ 1 - 1
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'

+ 90 - 90
locations/albina_chat.qsrc

@@ -40,28 +40,28 @@ if $ARGS[0] = 'small_talk2':
 			'"I don''t want to <i>work</i> for a living," she says, sending both of you into giggles.'
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		gs 'albina_chat2','first_model_talk1'
-		
+
 		if film > 0:
 			act 'Tell her you''ve shot porn': cla & gs 'albina_chat','pornstar_talk1'
 		end
-			
+
 		!!if masseuse['jobtype'] ! 0:
 			!!act 'I work as a masseuse':
 				!!cla & *nl
-				
+
 				!!gs 'albina_chat','small_talk'
 			!!end
 		!!end
-		
+
 		if stripdancesum > 0:
 			act 'I''m a stripper':
 				cla & *nl
-			    
+
 				gs 'albina_chat','stripper_talk1'
 			end
-		end}
+		end
 
 	elseif AlbinaQW['chat_rand'] = 2:
 !!		'Which girl do you think is the best dressed in our class?'
@@ -167,7 +167,7 @@ if $ARGS[0] = 'model_talk_shy2':
 			'You start beating her with a pillow as she cackles maniacally the whole time.'
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		act 'Yes':
 			cla & *nl
 			'"Y-yes... I''ve done a few..." you admit.'
@@ -200,7 +200,7 @@ if $ARGS[0] = 'model_talk_shy3':
 		'"Stop it!" you say, blushing even harder as you push push her backwards, but she doesn''t stop and you have to endure her teasing for several minutes longer.'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'For my career':
 		cla & *nl
 		'"I thought it would be good for my career," you sigh. "I didn''t <i>want</i> to, but everyone says that you have to bare it all at some point."'
@@ -208,7 +208,7 @@ if $ARGS[0] = 'model_talk_shy3':
 		'"Stop it!" you say, pushing her backwards with a mock shove.'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'I really needed the money (to buy)':
 		cla & *nl
 		'"I really needed the money," you say, embarrassedly. "I really wanted to buy something and I didn''t have enough and I just thought, <i>Well, I could just do a nude shoot...</i> They pay double for your nude debut."'
@@ -216,7 +216,7 @@ if $ARGS[0] = 'model_talk_shy3':
 		'"Stop it!" you say, pushing her backwards with a mock shove.'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'I really needed the money (to pay off)':
 		cla & *nl
 		'"I really needed the money," you say, uncomfortably. "I owed some people money and I was desperate. They pay double for your nude debut so I just thought..."'
@@ -224,7 +224,7 @@ if $ARGS[0] = 'model_talk_shy3':
 		'"Oh. That''s... I''m sorry <<$pcs_nickname>>." She looks away. "I shouldn''t have teased you. I didn''t... I didn''t realize it was like that..."'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	if foto['suborn'] > 0:
 		act 'I was pressured into it':
 			cla & *nl
@@ -241,7 +241,7 @@ if $ARGS[0] = 'model_talk_shy3':
 				'"Stop it!" you say, your face turning crimson as you try to push her away and she laughs aloud.'
 				gs 'albina_chat','small_talk'
 			end
-			
+
 			act 'Yes (thought I wanted it)':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -249,7 +249,7 @@ if $ARGS[0] = 'model_talk_shy3':
 				'Albina leans her head against your shoulder, saying nothing. The two of you sit in silence for a few more minutes.'
 				gs 'albina_chat','small_talk'
 			end
-			
+
 			act 'Yes (felt pressured)':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -293,7 +293,7 @@ if $ARGS[0] = 'stripper_talk1':
 			gs 'albina_chat','small_talk'
 		end
 	end
-	
+
 	act 'Nonchalant':
 		cla & *nl
 		'"I do some strip dancing in the city," you say casually.'
@@ -315,7 +315,7 @@ if $ARGS[0] = 'stripper_talk1':
 			gs 'albina_chat','small_talk'
 		end
 	end
-	
+
 	act 'Proud':
 		cla & *nl
 		'"I do some strip dancing in the city," you admit.'
@@ -327,7 +327,7 @@ if $ARGS[0] = 'stripper_talk1':
 				'"I got a fake passport that the club don''t really care to check," you state bluntly.'
 				'Albina grins. "Maybe I''ll come visit you at work one night..."'
 				'You smile. "I''m not giving you a free show!"'
-				'She smiles even wider. "Don''t worry, I''d happily pay to watch you shake that ass!"' 
+				'She smiles even wider. "Don''t worry, I''d happily pay to watch you shake that ass!"'
 				'She raises her arms in defence as you hit her with a pillow.'
 				gs 'albina_chat','small_talk'
 			end
@@ -360,7 +360,7 @@ if $ARGS[0] = 'pornstar_talk1':
 				'She manages to give you a weak smile.'
 				gs 'albina_chat','small_talk'
 			end
-			
+
 			act '"This isn''t exploitive"':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -378,7 +378,7 @@ if $ARGS[0] = 'pornstar_talk1':
 				gs 'albina_chat','small_talk'
 			end
 		end
-		
+
 		act 'Tell her you''ve shot porn (happy)':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -397,7 +397,7 @@ if $ARGS[0] = 'pornstar_talk1':
 				'She manages to give you a weak smile.'
 				gs 'albina_chat','small_talk'
 			end
-			
+
 			act '"This isn''t exploitive"':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -581,7 +581,7 @@ if $ARGS[0] = 'bj_fav':
 		'"Huh. Never thought of it like that..." she smirks back. "Still, can''t do anything about it when they cum in your mouth. I''d rather they just bend me over and blast my ass."'
 		gs 'albina_chat','spit_or_swallow'
 	end
-	
+
 	act 'I like being subservient':
 		cla & *nl
 		'"I think I''m just a bit of a sub," you shrug. "I like being on my knees, with his hand on my head, moving me up and down his cock."'
@@ -596,14 +596,14 @@ if $ARGS[0] = 'bj_fav':
 			gs 'albina_chat','sex_talk'
 		end
 	end
-	
+
 	act 'I like pleasing people':
 		cla & *nl
 		'"I like pleasing people," you shrug. "I love hearing a guy moan while I''m blowing him. It makes me feel so hot and sexy. And when he throbs in my mouth-" You stop, shivering at the thought and grin at Albina. "I could cum just thinking about it."'
 		'She smirks back at you. "I bet. But don''t you ever get tired of swallowing?"'
 		gs 'albina_chat','spit_or_swallow'
 	end
-	
+
 	act 'Oral fixation':
 		cla & *nl
 		'"I think I have some kind of oral fixation," you say. "The feeling of a cock in my mouth just turns me on. I can''t explain it. I like feeling it on my tongue, the taste, I think I even kind of like the way it makes my jaw ache after I''ve been blowing a guy for a long time."'
@@ -615,7 +615,7 @@ if $ARGS[0] = 'bj_fav':
 			'"Exactly," she grins.'
 			gs 'albina_chat','sex_talk'
 		end
-		
+
 		act 'I prefer creampies':
 			cla & *nl
 			'"I prefer creampies myself," you smirk. You''re about to continue when you notice the color drain from Albina''s face. "What?"'
@@ -626,7 +626,7 @@ if $ARGS[0] = 'bj_fav':
 				'She seems spooked for some reason, but you don''t want to make her uncomfortable so you decide to let it go.'
 				gs 'albina_chat','sex_talk'
 			end
-			
+
 			act 'Pursue it':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -639,7 +639,7 @@ if $ARGS[0] = 'bj_fav':
 			end
 		end
 	end
-	
+
 	act 'Everything!':
 		cla & *nl
 		if pcs_traits['cumeater'] = 1:
@@ -654,9 +654,9 @@ if $ARGS[0] = 'bj_fav':
 			'"Slut," Albina snickers back. "But don''t you ever get tired of swallowing?"'
 			gs 'albina_chat','spit_or_swallow'
 		end
-		
+
 	end
-	
+
 	if arrsize('$lover') > 0:
 		act 'I do it for my boyfriend':
 			cla & *nl
@@ -666,7 +666,7 @@ if $ARGS[0] = 'bj_fav':
 			'"But seriously. Don''t you ever get tired of swallowing?"'
 			gs 'albina_chat','spit_or_swallow'
 		end
-		
+
 		act 'I love my boyfriend':
 			cla & *nl
 			'"Because of my boyfriend," you say, involuntarily smiling as your thoughts drift towards him. "I love him so much and I love seeing the pleasure on his face when his cock is in my mouth. I want to spoil him, so I love giving him head."'
@@ -689,26 +689,26 @@ if $ARGS[0] = 'spit_or_swallow':
 			'"It tastes funny," you say matter of factly. "So I just spit it out."'
 			gs 'albina_chat','swallow_why'
 		end
-		
+
 		act 'It tastes gross':
 			cla & *nl
 			'"Ugh! No," you grimace in disgust. "It tastes so gross. I could never swallow that swill. I just spit."'
 			gs 'albina_chat','swallow_why'
 		end
-		
+
 		act 'It feels weird':
 			cla & *nl
 			'"It feels weird," you shrug. "The flavor is whatever but I can''t get over the texture. It''s like swallowing a load of snot. So I just spit."'
 			gs 'albina_chat','swallow_why'
 		end
-		
+
 		act 'Swallowing isn''t my thing':
 			cla & *nl
 			'"Eh, swallowing just isn''t really my thing," you shrug. "Never been into it. Avoid it when I can."'
 			gs 'albina_chat','swallow_why'
 		end
 	end
-	
+
 	act 'Not really':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -716,7 +716,7 @@ if $ARGS[0] = 'spit_or_swallow':
 		'"I guess," Albina sighs. "Well <i>I</i> get tired of it."'
 		gs 'albina_chat', 'sex_talk'
 	end
-	
+
 	act 'I got used to the taste':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -724,7 +724,7 @@ if $ARGS[0] = 'spit_or_swallow':
 		'"I guess I''m like that too," Albina sighs. "Still. It gets tiring if it''s all a guy wants to do though."'
 		gs 'albina_chat', 'sex_talk'
 	end
-	
+
 	act 'Spitters are quitters':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -732,7 +732,7 @@ if $ARGS[0] = 'spit_or_swallow':
 		'"Well you''ve got that much right," Albina laughs back.'
 		gs 'albina_chat', 'sex_talk'
 	end
-	
+
 	act 'I like the taste':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -744,7 +744,7 @@ if $ARGS[0] = 'spit_or_swallow':
 		'"Cause you''re <i>supposed</i> to? Duh."'
 		gs 'albina_chat', 'sex_talk'
 	end
-	
+
 	act 'Makes me feel sexy':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -764,7 +764,7 @@ if $ARGS[0] = 'swallow_why':
 		'<i>I''m the weird one here?</i> you think to yourself.'
 		gs 'albina_chat','sex_talk'
 	end
-	
+
 	act 'Do you like the taste?':
 		cla & *nl
 		'"Why?" you ask. "Do <i>you</i> like the taste?"'
@@ -789,21 +789,21 @@ if $ARGS[0] = 'birth_control_talk':
 				'"I get that," Albina replies, staring off into the corner for a few seconds before glancing back at you again.'
 				gs 'albina_chat','sex_talk'
 			end
-			
+
 			act 'I hate condoms too':
 				cla & *nl
 				'"Me too," you say. "I can''t <i>feel</i> anything when the guy''s wearing a rubber. I want skin on skin contact. I can''t wait to start going bareback."'
 				'"It''s way better," Albina grins. "You''re gonna love it."'
 				gs 'albina_chat','sex_talk'
 			end
-			
+
 			act 'I don''t want to worry':
 				cla & *nl
 				'"I just don''t want to worry about it," you sigh. "What if the guy doesn''t have one? What if I don''t have one? What if the condom breaks? He said he''s going to pull out, but what if he doesn''t? It''s too much stress. Easier to just take a pill every day."'
 				'"I would <i>never</i> let a guy to go bareback on me if I wasn''t on the pill," Albina says, looking horrified at you. "You can''t trust them with that shit. For fuck''s sake, I take it up the ass most of the time and I still don''t trust them not to cum in my pussy. You know what I mean?"'
 				gs 'albina_chat','sex_talk'
 			end
-			
+
 			act 'I love creampies':
 				cla & *nl
 				'"I <i>love</i> creampies," you gush. "Once the pill starts kicking in, I''ll be able to get all the creampies I want."'
@@ -826,7 +826,7 @@ if $ARGS[0] = 'birth_control_talk':
 					'"Don''t see the point?!" Albina sputters before she sighs and shakes her head. "I don''t understand you at all."'
 					gs 'albina_chat','sex_talk'
 				end
-				
+
 				act 'I want to have a baby':
 					cla & *nl
 					if npc_pregtalk['A23'] = 0:
@@ -836,7 +836,7 @@ if $ARGS[0] = 'birth_control_talk':
 						else
 							'"Seriously? You <i>want</i> to be a teen mom and fuck up your life?"'
 						end
-						
+
 						act 'I''ll be a great mom':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -848,13 +848,13 @@ if $ARGS[0] = 'birth_control_talk':
 							'"Mama had to put a lot of dreams on hold because she got pregnant with me. Because of my shitbag dad too, but because of me too. I love Mama, but it wasn''t until she didn''t have to take care of me anymore that she got to actually live her life. Try to remember that before you get pregnant."'
 							gs 'albina_chat','sex_talk'
 						end
-						
+
 						if pcs_lover - pcs_girlfriends > 0:
 							act 'I love my boyfriend':
 								cla & *clr
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 								'"But I love my boyfriend so much!" you say. "He''ll be a great dad, I know it."'
-								'"That''s what Mama thought," Albina says with a disapproving look. "Just because a guy seems nice now doesn''t mean he won''t turn into a total fuckbag the moment you''re knocked up. Try to remember that before you get pregnant."'								
+								'"That''s what Mama thought," Albina says with a disapproving look. "Just because a guy seems nice now doesn''t mean he won''t turn into a total fuckbag the moment you''re knocked up. Try to remember that before you get pregnant."'
 								gs 'albina_chat','sex_talk'
 							end
 						end
@@ -867,7 +867,7 @@ if $ARGS[0] = 'birth_control_talk':
 					end
 				end
 			end
-			
+
 			act 'Condoms':
 				cla & *nl
 				'"Just condoms," you shrug. "No medication though."'
@@ -880,13 +880,13 @@ if $ARGS[0] = 'birth_control_talk':
 					'"I prefer bareback," Albina says, before taking a deep breath and sighing. "But I also take my pill religiously. I set alarms and everything. I guess it''s better to use condoms if you don''t trust yourself to take the pill... Wait, why not get the shot instead?"'
 					gs 'albina_chat','sex_talk'
 				end
-				
+
 				gs 'albina_chat','birth_control_pill_hassle_condom_ver'
-				
+
 				gs 'albina_chat','birth_control_hormones'
 			end
-			
-			
+
+
 			act 'The pullout method':
 				cla & *nl
 				'"Does the pullout method count?" you grin. Albina looks at you like you just said you like fucking dogs.'
@@ -895,17 +895,17 @@ if $ARGS[0] = 'birth_control_talk':
 					cla & *nl
 					'"But condoms are the <i>worst!</i>" you moan. "I can''t <i>feel</i> anything when the guy''s wearing a rubber. I want skin on skin contact. It''s bareback or nothing."'
 					'"I hate condoms too, but that doesn''t explain why you won''t just get on the pill?"'
-					
+
 					gs 'albina_chat','birth_control_pill_hassle_no_condoms'
-					
+
 					gs 'albina_chat','birth_control_hormones'
 				end
-				
+
 				gs 'albina_chat','birth_control_pill_hassle_no_condoms'
-				
+
 				gs 'albina_chat','birth_control_hormones'
 			end
-			
+
 			act 'The calendar method and condoms':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -925,10 +925,10 @@ if $ARGS[0] = 'birth_control_talk':
 					gs 'albina_chat','birth_control_hormones'
 					gs 'albina_chat','birth_control_pill_problem'
 				end
-				
+
 				gs 'albina_chat','birth_control_pill_problem'
 			end
-			
+
 			act 'The calendar method (no condoms)':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -941,11 +941,11 @@ if $ARGS[0] = 'birth_control_talk':
 					cla & *nl
 					'"But condoms are the <i>worst!</i>" you moan. "I can''t <i>feel</i> anything when the guy''s wearing a rubber. I want skin on skin contact. It''s bareback or nothing."'
 					'"I hate condoms too, but that doesn''t explain why you won''t just get on the pill?"'
-					
+
 					gs 'albina_chat','birth_control_pill_hassle_no_condoms'
 					gs 'albina_chat','birth_control_hormones'
 				end
-				
+
 				gs 'albina_chat','birth_control_pill_hassle_no_condoms'
 			end
 		end
@@ -958,21 +958,21 @@ if $ARGS[0] = 'birth_control_talk':
 			'"I get that," Albina replies, staring off into the corner for a few seconds before glancing back at you again.'
 			gs 'albina_chat','sex_talk'
 		end
-		
+
 		act 'I hate condoms too':
 			cla & *nl
 			'"Me too," you say. "I can''t <i>feel</i> anything when the guy''s wearing a rubber. I want skin on skin contact. It''s so much better bareback."'
 			'"Damn straight," Albina grins, high-fiving you. "Condoms are fucking dumb."'
 			gs 'albina_chat','sex_talk'
 		end
-		
+
 		act 'I don''t want to worry':
 			cla & *nl
 			'"I just don''t want to worry about it," you sigh. "What if the guy doesn''t have one? What if I don''t have one? What if the condom breaks? He said he''s going to pull out, but what if he doesn''t? It''s too much stress. Easier to just take a pill every day."'
 			'"I would <i>never</i> let a guy to go bareback on me if I wasn''t on the pill," Albina says, looking horrified at you. "You can''t trust them with that shit. For fuck''s sake, I take it up the ass most of the time and I still don''t trust them not to cum in my pussy. You know what I mean?"'
 			gs 'albina_chat','sex_talk'
 		end
-		
+
 		act 'I love creampies':
 			cla & *nl
 			'"I <i>love</i> creampies," you gush. "Once the pill starts kicking in, I''ll be able to get all the creampies I want."'
@@ -1054,7 +1054,7 @@ if $ARGS[0] = 'anal':
 		'You''ve clearly hit a nerve and quickly back off, not wanting to get hit yourself.'
 		gs 'albina_chat','sex_talk'
 	end
-	
+
 	if stat['anal'] = 0:
 		act 'I want to try it (shy)':
 			cla & *clr
@@ -1066,7 +1066,7 @@ if $ARGS[0] = 'anal':
 			*nl
 			gs 'albina_chat','anal_questions_shy'
 		end
-		
+
 		act 'I want to try it (open)':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -1107,14 +1107,14 @@ if $ARGS[0] = 'anal_questions_shy':
 			'She nods. "Humble question. Good. Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
 			gs 'albina_chat','anal2'
 		end
-		
+
 		act 'What position?':
 			cla & *nl
 			'"What... position should I have my first time in?" you ask shyly.'
 			'"You''re getting way too far ahead of yourself, <<$pcs_nickname>>. Here''s my advice: Start small," she replies.'
 			gs 'albina_chat','anal2'
 		end
-		
+
 		act 'Does it hurt?':
 			cla & *nl
 			'"Does it hurt?" you ask shyly.'
@@ -1139,7 +1139,7 @@ if $ARGS[0] = 'anal_questions_open':
 			'She nods. "Humble question. Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
 			gs 'albina_chat','anal2'
 		end
-		
+
 		act 'What''s the best position?':
 			cla & *nl
 			'"What''s the best position to try it in?" you ask excitedly. "Cowgirl seems hard, but doggy seems like it could be rough. I was won-"'
@@ -1259,11 +1259,11 @@ if $ARGS[0] = 'lover_conversation':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'You shake your head. "Not really, no..."'
-		'She shakes her head and smiles. "Don''t worry <<$pcs_nickname>>, not everyone''s interested in dating."' 
+		'She shakes her head and smiles. "Don''t worry <<$pcs_nickname>>, not everyone''s interested in dating."'
 		act 'Stop talking': gt 'albinahome', 'bedroom'
 		act 'Change the subject': gt 'albina_chat', 'chat'
 	end
-	
+
 	if arrsize('$fuckbuddy') = 1:
 		act 'I have a fuckbuddy':
 			cla & *clr
@@ -1283,7 +1283,7 @@ if $ARGS[0] = 'lover_conversation':
 			act 'Change the subject': gt 'albina_chat', 'chat'
 		end
 	end
-	
+
 	if stat['hookup'] > 0:
 		act 'I hook up with random guys':
 			cla & *clr
@@ -1292,7 +1292,7 @@ if $ARGS[0] = 'lover_conversation':
 			'"Duh. I can''t go a day without some pervert catcalling me about my ass, trying to get me to go home with them."'
 			'"Sometimes I let them," you wink and Albina''s jaw drops.'
 			'"You slut!" she grins.'
-			'"Hey!" you say, shoving her back with both hands but laughing anyways.'	
+			'"Hey!" you say, shoving her back with both hands but laughing anyways.'
 			'"Ow! Come on! You know I''m kidding. But seriously, do you really get off on one night stands? I like fucking Lazar because he <i>knows</i> how to fuck me. He knows exactly what to do to drive me insane and I love it. Is fucking a random guy once enough for you?"'
 			act 'It''s hit or miss':
 				cla & *nl
@@ -1302,7 +1302,7 @@ if $ARGS[0] = 'lover_conversation':
 				act 'Stop talking': gt 'albinahome', 'bedroom'
 				act 'Change the subject': gt 'albina_chat', 'chat'
 			end
-			
+
 			act 'Absolutely':
 				cla & *nl
 				'"Absolutely," you grin. "I love trying new dicks! I think I''m up to <<stat[''vaginal'']>>."'
@@ -1313,7 +1313,7 @@ if $ARGS[0] = 'lover_conversation':
 			end
 		end
 	end
-	
+
 	if Rex_Love = 1 or artemQW['bf'] = 1 or kotovLoveQW = 1 or fedorKozlovQW or NikoVolkovQW >= 5 or pcs_lover > pcs_girlfriends:
 		act 'I have a boyfriend':
 			cla & *clr
@@ -1358,11 +1358,11 @@ if $ARGS[0] = 'lover_conversation':
 			if artemQW['bf'] = 1:
 				act 'Artem':
 					cla
-                    '"Artem," you reply and she arches a brow.'
-                    '"Artem? Geeky little Artem?" She stops and seems to consider it. "Well, I guess he is kind of cute... I bet you have him wrapped around your little finger and he does whatever you want, right?" she says with a sly smile.'
+					'"Artem," you reply and she arches a brow.'
+					'"Artem? Geeky little Artem?" She stops and seems to consider it. "Well, I guess he is kind of cute... I bet you have him wrapped around your little finger and he does whatever you want, right?" she says with a sly smile.'
 					'You shake your head. "He''s sweet, and really nice to me."'
 					'She laughs. "Yeah, I''m sure he is ''nice'' and ''sweet''. Does he rock your world though?" she asks with a grin."'
-					if ArtemQW['sex'] = 0 or ArtemQW['anal'] = 0:	
+					if ArtemQW['sex'] = 0 or ArtemQW['anal'] = 0:
 						'"We... haven''t had sex yet..." you reply and she frowns.'
 						'"Seriously? How far have you got?"'
 						if ArtemQW['hj'] >= 1:
@@ -1371,14 +1371,14 @@ if $ARGS[0] = 'lover_conversation':
 								'"That''s a good start," she says. "You''re not leaving him with blue balls at least, but he''s going to want you to jump on his cock at some point, <<$pcs_nickname>>."'
 								'She''s unashamedly crude, but has a point.'
 							end
-						elseif ArtemQW['bj'] >= 1:	
+						elseif ArtemQW['bj'] >= 1:
 							act 'Blowjobs':
 								'"I''ve sucked his dick, but I''m waiting for the right time for us to actually have sex."'
 								'She smiles. "I get that, but don''t wait too long or he might think it''s never happening. You could even let him fuck you in the ass to make up for his wait," she grins.'
 								'She''s unashamedly crude, but has a point.'
 							end
-						elseif ArtemQW['dryhump'] >= 1:	
-							act 'Dry humping':	
+						elseif ArtemQW['dryhump'] >= 1:
+							act 'Dry humping':
 								'"We''ve been dry humping and he cums on my ass," you reply and she looks bewildered.'
 								'"Dry humping? You''re telling me he''s been grinding his cock against you, but never once tried to shove it in you, not even up your ass?"'
 								'Yeah, what''s wrong with that?" you ask.'
@@ -1399,7 +1399,7 @@ if $ARGS[0] = 'lover_conversation':
 								'"You''d probably get a good facial from all the cum he''s built up."'
 							end
 						end
-					else	
+					else
 						'You disregard her comment. "There''s more to life than sex you know!" The amused look on her face tells you she isn''t buying it. "Okay fine, he''s pretty good at it... Good enough anyway."'
 						'She laughs at your comment. "I''m sure that feedback will boost his confidence. Does he fuck you in the ass at least?" she says with a grin.'
 						if ArtemQW['anal'] >= 1:
@@ -1444,7 +1444,7 @@ if $ARGS[0] = 'lover_conversation':
 			if albina['kolka_know'] = 0:
 				'"Well..." you say. "I''ve been doing stuff with Kolka lately."'
 				'"Kolka? Who''s Kolk-" She stops mid-sentence and her eyes go wide. "Wait, you mean your <i>brother</i>?!"'
-				
+
 				if brotherSex >= 5:
 					act 'It''s just handjobs':
 						cla & *nl
@@ -1460,8 +1460,8 @@ if $ARGS[0] = 'lover_conversation':
 						act 'Stop talking': gt 'albinahome', 'bedroom'
 						act 'Change the subject': gt 'albina_chat', 'chat'
 					end
-				end	
-				
+				end
+
 				if brotherSex >= 6:
 					act 'It''s just blowjobs':
 						cla & *nl
@@ -1477,8 +1477,8 @@ if $ARGS[0] = 'lover_conversation':
 						act 'Stop talking': gt 'albinahome', 'bedroom'
 						act 'Change the subject': gt 'albina_chat', 'chat'
 					end
-				end	
-				
+				end
+
 				if brotherSex = 9:
 					act 'It''s just casual':
 						cla & *nl
@@ -1492,8 +1492,8 @@ if $ARGS[0] = 'lover_conversation':
 						act 'Stop talking': gt 'albinahome', 'bedroom'
 						act 'Change the subject': gt 'albina_chat', 'chat'
 					end
-				end	
-				
+				end
+
 				if brotherSex = 10:
 					act 'I love him':
 						cla & *nl
@@ -1507,7 +1507,7 @@ if $ARGS[0] = 'lover_conversation':
 						act 'Stop talking': gt 'albinahome', 'bedroom'
 						act 'Change the subject': gt 'albina_chat', 'chat'
 					end
-				end	
+				end
 			else
 				'"Well, still mostly Kolka, but-"'
 				'Albina shoves her hand directly into your face and clamps it over your mouth, glaring at you.'
@@ -1530,7 +1530,7 @@ if $ARGS[0] = 'zoya_conversation':
 			act 'Continue':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-				'"It made her uncomfortable and after she ended up pregnant with me, things just got worse. My father never wanted children, so they argued constantly after I was born. She ended up divorcing him when I was 8 years old after she found out about the 18 year old gold digging stripper whore who was sucking his dick every chance she got. She stormed out on him and never looked back. Being forced to leave me behind broke her heart and she''s still feeling guilty about it, so please don''t mention anything about it to her."' 
+				'"It made her uncomfortable and after she ended up pregnant with me, things just got worse. My father never wanted children, so they argued constantly after I was born. She ended up divorcing him when I was 8 years old after she found out about the 18 year old gold digging stripper whore who was sucking his dick every chance she got. She stormed out on him and never looked back. Being forced to leave me behind broke her heart and she''s still feeling guilty about it, so please don''t mention anything about it to her."'
 				'"Anyway, she went to Moscow and finally got into university, where she earned her degree before she moved back here and got her dream job working at a hospital in the city, right under his nose. She''s looking into getting me into uni myself," she says with a warm smile and a twinkle in her eye. You''ve never seen her look so... happy before.'
 				'She turns to you. "So what about you? What do you want to do after school?" she asks warmly.'
 				act 'I don''t know':
@@ -1560,7 +1560,7 @@ if $ARGS[0] = 'zoya_conversation':
 				if loverGender[i] ! 1: dynamic '	act ''Get married to <<$npc_usedname["<<$lover[i]>>"]>>'': gt ''albina_chat'', ''telling_marrige_dreams'', $npc_usedname["<<$lover[i]>>"]'
 				i +=1
 				if i < ARRSIZE('lover'): jump 'marrid_looop'
-				Killvar 'i'				
+				Killvar 'i'
 			end
 		end
 	end

+ 2 - 2
locations/budgetclothes.qsrc

@@ -533,7 +533,7 @@ if $ARGS[0] = 'panties':
 
 	i = 1
 	:looppanties
-		if cheap_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 cheap_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

+ 1 - 1
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>'

+ 1 - 1
locations/clothing.qsrc

@@ -1358,7 +1358,7 @@ if $ARGS[0] = 'clothing_list':
 end
 
 if $ARGS[0] = 'clothinglist_header':
-	'<table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Strength</TH><TH>Hip size</TH><TH>Description</TH><TH>Specials</TH><TH></TH><TH>Storage</TH><TH></TH><TH>Attempt Repair (0:30)</TH><TH>Resize(0:30)</TH>'
+	'<table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Strength</TH><TH>Hip size</TH><TH>Description</TH><TH>Specials</TH><TH>Wardrobe</TH><TH>Storage</TH><TH>Unwanted (Sell)</TH><TH>Attempt Repair (0:30)</TH><TH>Resize(0:30)</TH><TH>Throw Out</TH>'
 end
 
 if $ARGS[0] = 'clothwidth':

+ 3 - 3
locations/clothing_QV.qsrc

@@ -30,11 +30,11 @@ if $ARGS[0] = 'list':
 
 	if ARRSIZE('gm_school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_school''"><img src="images/pc/items/gm/school.png"></a></center>'
  
-	if ARRSIZE('gm_office'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_office''"><img src="images/pc/items/gm/officewear.png"></a></center>'
+	if ARRSIZE('gm_office') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_office''"><img src="images/pc/items/gm/officewear.png"></a></center>'
 
-	if ARRSIZE('gm_maid'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_maid''"><img src="images/pc/items/gm/maid.png"></a></center>'
+	if ARRSIZE('gm_maid') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_maid''"><img src="images/pc/items/gm/maid.png"></a></center>'
 
-	if ARRSIZE('gm_server'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_server''"><img src="images/pc/items/gm/server.png"></a></center>'
+	if ARRSIZE('gm_server') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_server''"><img src="images/pc/items/gm/server.png"></a></center>'
 
 	if ARRSIZE('cats_outfits') > 0 or ARRSIZE('cats_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''cats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
 

+ 9 - 9
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'

+ 10 - 10
locations/exhibitionistshop.qsrc

@@ -162,21 +162,21 @@ if $ARGS[0] = 'panties':
 
 	i = 2
 
-	:loopexhibitionist_panties
-		if exhibitionist_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''panties2''"><img src="images/pc/items/salacious/panties/<<i>>.jpg" height="150" /></a> '
+	:loopsalacious_panties
+		if salacious_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''panties2''"><img src="images/pc/items/salacious/panties/<<i>>.jpg" height="150" /></a> '
 		i += 1
-	if i <= 59:jump 'loopexhibitionist_panties'
+	if i <= 59:jump 'loopsalacious_panties'
 end
 
 if $ARGS[0] = 'panties2':
 	cla
 	
-	if exhibitionist_panties[i] ! 0:
+	if salacious_panties[i] ! 0:
 		msg 'You already own these panties.'
 		gt 'exhibitionistshop', 'panties'
 	end
 
-	gt 'panties', 'view_panty_item', 'shop', 'exhibitionist',i, 600
+	gt 'panties', 'view_panty_item', 'shop', 'salacious',i, 600
 
 end
 
@@ -194,21 +194,21 @@ if $ARGS[0] = 'bras':
 
 	i = 2
 
-	:loopexhibitionist_bras
-		if exhibitionist_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''bras2''"><img src="images/pc/items/salacious/bras/<<i>>.jpg" height="150" /></a> '
+	:loopsalacious_bras
+		if salacious_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''bras2''"><img src="images/pc/items/salacious/bras/<<i>>.jpg" height="150" /></a> '
 		i += 1
-	if i <= 37:jump 'loopexhibitionist_bras'
+	if i <= 37:jump 'loopsalacious_bras'
 end
 
 if $ARGS[0] = 'bras2':
 	cla
 	
-	if exhibitionist_bras[i] ! 0:
+	if salacious_bras[i] ! 0:
 		msg 'You already own these bras.'
 		gt 'exhibitionistshop', 'bras'
 	end
 
-	gt 'bras', 'view_bra_item', 'shop', 'exhibitionist',i, 600
+	gt 'bras', 'view_bra_item', 'shop', 'salacious',i, 600
 
 end
 

+ 8 - 8
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:

+ 1 - 1
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.

+ 1 - 1
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.'

+ 7 - 0
locations/intro_city_select.qsrc

@@ -89,6 +89,13 @@ if $ARGS[0] = 'start':
 	killvar 'class_list_institution'
 	killvar 'class_list_name'
 
+	gs 'npcstatic1'
+	gs 'npcstatic2'
+	gs 'npcstatic3'
+	gs 'npcstatic4'
+	gs 'npcstatic5'
+	gs 'npcstatic6'
+
 	!!Default Names
 	$pcs_firstname = 'Svetlana'
 	$pcs_lastname = 'Lebedev'

+ 20 - 27
locations/intro_initialization.qsrc

@@ -174,13 +174,6 @@ else
 	cyccustom = 1
 end
 
-gs 'npcstatic1'
-gs 'npcstatic2'
-gs 'npcstatic3'
-gs 'npcstatic4'
-gs 'npcstatic5'
-gs 'npcstatic6'
-
 pcs_horny = 0
 killvar 'opPRE'
 killvar 'tgs_skipinto'
@@ -196,11 +189,11 @@ $coatworntype = 'none'
 coatwornnumber = 0
 
 if $ARGS[1] ! 'CSB' and school_clothing ! 1:
-	cheap_panties[1] = 1
-	cheap_bras[1] = 1
-	$pantyworntype = 'cheap'
+	gm_panties[1] = 1
+	gm_bras[1] = 1
+	$pantyworntype = 'gm'
 	pantywornnumber = 1
-	$braworntype = 'cheap'
+	$braworntype = 'gm'
 	brawornnumber = 1
 	gm_shoe[6] = 1
 	danilovich_shoe[21] = 1
@@ -231,11 +224,11 @@ if school_clothing = 1:
 	sportsclothingnumber = 80
 	gs 'clothing', 'wear', 'dolls_outfits', 37
 elseif $ARGS[1] = 'CSB':
-	cheap_panties[12] = 1
-	cheap_bras[12] = 1
-	$pantyworntype = 'cheap'
+	gm_panties[12] = 1
+	gm_bras[12] = 1
+	$pantyworntype = 'gm'
 	pantywornnumber = 12
-	$braworntype = 'cheap'
+	$braworntype = 'gm'
 	brawornnumber = 12
 	danilovich_outfits[81] = 1
 	danilovich_outfits_h[81] = 100
@@ -404,13 +397,13 @@ if school_clothing = 1:
 	dolls_outfits[29] = 1
 	dolls_outfits_h[29] = 120
 	dolls_outfits_b[29] = pcs_hips
-	sport_bras[3] = 1
-	sport_brasS[3] = 0
-	$sportsbratype = 'sport'
+	danilovich_bras[3] = 1
+	danilovich_brasS[3] = 0
+	$sportsbratype = 'danilovich'
 	sportsbranumber = 3
-	sport_panties[3] = 1
-	sport_pantiesS[3] = 0
-	$sportspantytype = 'sport'
+	danilovich_panties[3] = 1
+	danilovich_pantiesS[3] = 0
+	$sportspantytype = 'danilovich'
 	sportspantynumber = 3
 	dolls_coats[19] = 1
 	dolls_coats_h[19] = 200
@@ -425,13 +418,13 @@ else
 	coatwornnumber = 12
 	$sportscoattype = 'gm'
 	sportscoatnumber = 12
-	sport_bras[1] = 1
-	sport_brasS[1] = 0
-	$sportsbratype = 'sport'
+	danilovich_bras[1] = 1
+	danilovich_brasS[1] = 0
+	$sportsbratype = 'danilovich'
 	sportsbranumber = 1
-	sport_panties[1] = 1
-	sport_pantiesS[1] = 0
-	$sportspantytype = 'sport'
+	danilovich_panties[1] = 1
+	danilovich_pantiesS[1] = 0
+	$sportspantytype = 'danilovich'
 	sportspantynumber = 1
 	if school_clothing = 2:
 		gm_school[49] = 1

+ 6 - 13
locations/intro_initialization_city.qsrc

@@ -183,13 +183,6 @@ else
 	cyccustom = 1
 end
 
-gs 'npcstatic1'
-gs 'npcstatic2'
-gs 'npcstatic3'
-gs 'npcstatic4'
-gs 'npcstatic5'
-gs 'npcstatic6'
-
 pcs_horny = 0
 killvar 'opPRE'
 killvar 'tgs_skipinto'
@@ -201,11 +194,11 @@ showobjs 0
 !!Clothing has to run last so that hip size is set
 !! Adding underwear and default shoes and assigning them
 
-cheap_panties[1] = 1
-cheap_bras[1] = 1
-$pantyworntype = 'cheap'
+gm_panties[1] = 1
+gm_bras[1] = 1
+$pantyworntype = 'gm'
 pantywornnumber = 1
-$braworntype = 'cheap'
+$braworntype = 'gm'
 brawornnumber = 1
 gm_shoe[6] = 1
 $shoeworntype = 'gm'
@@ -216,8 +209,8 @@ coatwornnumber = 1
 
 
 !!	Starting clothing set
-cheap_panties[12] = 1
-cheap_bras[12] = 1
+gm_panties[12] = 1
+gm_bras[12] = 1
 danilovich_outfits[81] = 1
 danilovich_outfits_h[81] = 100
 danilovich_shoe[21] = 1

+ 7 - 0
locations/intro_sg_select.qsrc

@@ -44,6 +44,13 @@ if $ARGS[0] = 'start':
 	brothersawpirsF = 0
 	dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
 
+	gs 'npcstatic1'
+	gs 'npcstatic2'
+	gs 'npcstatic3'
+	gs 'npcstatic4'
+	gs 'npcstatic5'
+	gs 'npcstatic6'
+
 	if $start_type[1] ! 'tg':
 		!!Default Names
 		$pcs_firstname = 'Svetlana'

+ 5 - 5
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':
@@ -573,10 +573,10 @@ if $ARGS[0] = 'date':
 							'Tanya beams at you as the both of you put your clothes back on.'
 							'Tanya pays for the bra and also buys the matching panties for you.'
 							'After spending another few minutes visiting another shop the two of you head back to the apartment.'
-							boutique_bras[19] = 1
-							boutique_brasS[19] = 0
-							boutique_panties[31] = 1
-							boutique_pantiesS[31] = 0
+							lusso_bras[19] = 1
+							lusso_brasS[19] = 0
+							lusso_panties[31] = 1
+							lusso_pantiesS[31] = 0
 							cla
 							act 'Return to the apartment':
 								gt 'nichBedroomTanja'

+ 1 - 1
locations/panties.qsrc

@@ -148,7 +148,7 @@ if $ARGS[0] = 'view_panty_item':
 				'You do not have enough money in your bank to buy these panties.'
 			end
 			if underwear['pair'] > 0:
-				if dyneval('RESULT = <<$ARGS[2]>>_panties[<<underwear[''pair'']>>]') = 1:
+				if dyneval('RESULT = <<$ARGS[2]>>_bra[<<underwear[''pair'']>>]') = 1:
 					'You own the matching bra buying these panties will complete the set.'
 				else
 					'You do not own the matching bra, you can buy it and these panties together as a set.'

+ 2 - 2
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)

+ 1 - 1
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.

+ 113 - 87
locations/saveupdater.qsrc

@@ -5,7 +5,7 @@
 !! Then at the bottom of this file just after the last end add the following line:
 !! if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < "new version number":
 !! where "new version number" should be as instructed in the start of saveg.qsrc
-!! Then add you replacement of variables after this line. You can see how this is done by looking through this file. 
+!! Then add you replacement of variables after this line. You can see how this is done by looking through this file.
 
 !! When you do this you should always commit this file and saveg.qsrc at the same time.
 
@@ -247,7 +247,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 		killvar 'alko_trait_counter'
 		killvar 'alko_trait'
 	end
-	
+
 	if trt_cumeater = 1:pcs_traits['cumeater'] = 1 & trt_cumeater = 7
 
 	!! ----- Other bug fixes and cleanup ----- 0.8.0
@@ -259,7 +259,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	mastrOnce = 0
 	!! ----- Other bug fixes and cleanup ----- 0.8.0
 end
-	
+
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080001:
 	!!--------0.8.0.1---school social group adjustment
 	if gruptipe[9000] = 0:
@@ -333,14 +333,14 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 		anastasia['sex'] = anastasiasex
 		anastasia['saveupdate'] = 1
 	end
-	
+
 	if foto_models['emily'] > 0 and emily['status'] = 0 and emily['saveupdate'] = 0:
 		emily['status'] = foto_models['emily']
 		emily['hate'] = emily_hate
 		emily['model_exp'] = emily_model_exp
 		emily['saveupdate'] = 1
 	end
-	
+
 	if jeff > 0 and jeff['status'] = 0 and jeff['saveupdate'] = 0:
 		jeff['status'] = jeff
 		jeff['grope'] = jeff_grope
@@ -348,13 +348,13 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 		jeff['model_exp'] = jeff_model_exp
 		jeff['saveupdate'] = 1
 	end
-	
+
 	if krystal > 0 and krystal['status'] = 0 and krystal['saveupdate'] = 0:
 		krystal['status'] = krystal['talk']
-		
+
 		krystal['saveupdate'] = 1
 	end
-		
+
 	if mari > 0 and mari['status'] = 0 and mari['saveupdate'] = 0:
 		mari['status'] = mari
 		mari['busy'] = mari_busy
@@ -367,7 +367,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 		mari['fakepassport'] = mari_fakepassport
 		mari['saveupdate'] = 1
 	end
-	
+
 	if $model['firstname'] = '':
 		$model['firstname'] = $pcs_firstname
 		$model['nickname'] = $pcs_nickname
@@ -665,12 +665,12 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	end
 
 	!!---------------------------------------------------------------
-	
+
 	!!Albina variables no longer needed, no sense in having them run in the background for nothing
 	if AlbinaQW['ParkRallyDay'] > 0:AlbinaQW['ParkRallyDay'] = 0
 	if AlbinaQW['ElectionCampaignTime'] > 0:AlbinaQW['ElectionCampaignTime'] = 0
 	if AlbinaQW['AlbFatherQW']  > 1:AlbinaQW['AlbFatherQW']  = 1
-	
+
 	!!---------------------------------------------------------------
 end
 
@@ -752,10 +752,10 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	:fametownloop
 
 	$fameact = 'acting'
-	
+
 	:fameactloop
 
-	if dyneval('RESULT = <<$fametown>>_<<$fameact>>') < 400: 
+	if dyneval('RESULT = <<$fametown>>_<<$fameact>>') < 400:
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>_core''] = <<$fametown>>_<<$fameact>>'
 	elseif dyneval('RESULT = <<$fametown>>_<<$fameact>>') < 1100:
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>_core''] = 400 + (<<$fametown>>_<<$fameact>>-400)/3'
@@ -784,35 +784,35 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 		jump 'fameactloop'
 	elseif $fameact = 'modelling':
 		$fameact = 'porn'
-		jump 'fameactloop'		
+		jump 'fameactloop'
 	elseif $fameact = 'porn':
 		$fameact = 'stripping'
-		jump 'fameactloop'		
+		jump 'fameactloop'
 	elseif $fameact = 'stripping':
 		$fameact = 'kickboxing'
-		jump 'fameactloop'		
+		jump 'fameactloop'
 	elseif $fameact = 'kickboxing':
 		$fameact = 'running'
-		jump 'fameactloop'		
+		jump 'fameactloop'
 	elseif $fameact = 'running':
 		$fameact = 'volleyball'
-		jump 'fameactloop'				
+		jump 'fameactloop'
 	elseif $fameact = 'volleyball':
 		$fameact = 'chess'
-		jump 'fameactloop'			
+		jump 'fameactloop'
 	elseif $fameact = 'chess':
 		$fameact = 'teaching'
-		jump 'fameactloop'			
+		jump 'fameactloop'
 	elseif $fameact = 'teaching':
 		$fameact = 'media'
 		jump 'fameactloop'
 	end
-		
+
 	$fameact = 'sex'
 
 	:fameactloop2
 
-	if dyneval('RESULT = <<$fametown>>_<<$fameact>>') < 400: 
+	if dyneval('RESULT = <<$fametown>>_<<$fameact>>') < 400:
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>''] = <<$fametown>>_<<$fameact>>'
 	elseif dyneval('RESULT = <<$fametown>>_<<$fameact>>') < 1100:
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>''] = 400 + (<<$fametown>>_<<$fameact>>-400)/3'
@@ -822,12 +822,12 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>''] = 1000 +(<<$fametown>>_<<$fameact>> -2900)/10'
 	end
 	killvar '<<$fametown>>_<<$fameact>>'
-		
+
 	if $fameact = 'sex':
 		$fameact = 'prostitute'
-		jump 'fameactloop2'		
+		jump 'fameactloop2'
 	end
-		
+
 	if $fametown = 'pav':
 		$fametown = 'city'
 		jump 'fametownloop'
@@ -877,7 +877,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 		if modelfoto_nip > 0: modelfoto['nip'] = modelfoto_nip
 		if modelfoto_pussy > 0: modelfoto['pussy'] = modelfoto_pussy
 		if modelfoto_asshole > 0: modelfoto['asshole'] = modelfoto_asshole
-		
+
 		modelfoto['saveupdater'] = 1
 
 	end
@@ -900,7 +900,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	gs 'grades', 'createclass', 'school', 'mus', 2, 2, 'yes', 'no', 0, 0
 	gs 'grades', 'createclass', 'school', 'his', 2, 2, 'yes', 'yes', 0, 0
 
-	!!Convert the old grade attribute into the new individual grades. 
+	!!Convert the old grade attribute into the new individual grades.
 	gs 'grades', 'grade_award', 'school', 'math', pcs_grades
 	gs 'grades', 'grade_award', 'school', 'rus', pcs_grades
 	gs 'grades', 'grade_award', 'school', 'lit', pcs_grades
@@ -935,7 +935,7 @@ end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080307:
 	!!Moving some string variables to more appropriate numerical variables in the camera files.
-	
+
 	i = 0
 	:camera_update_loop
 	camera_found[i] = 1
@@ -943,7 +943,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if ARRSIZE('camera_found') > i: jump 'camera_update_loop'
 
 	!!Moved Igor''s quest to use daystart.
-	
+
 	if igor_DimaNos = 2 or igor_DimaNos = 3:
 		if $igor_DimaNos_day > 5:
 			igor_DimaNos_day = daystart
@@ -964,7 +964,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	i +=1
 	if i < ARRSIZE('lover'): jump 'girlfriend_looop'
 	Killvar 'i'
-	
+
 	if analorgasm > 0: orgasm_anal += analorgasm
 end
 
@@ -1066,7 +1066,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	end
 	i += 1
 	if i < barraynumber: jump 'saveupdaterloop852_2'
-	
+
 end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080503:
@@ -1099,7 +1099,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 
 	!!Christinas chat have to stay in the jocks file even if she is an outcast
 	$npcGoSchool['A18'] = '<a href="exec:gt ''gschool_jock_chats'', ''' + $lcase($npc_usedname['A18']) + '''"><<$npc_usedname["A18"]>></a>'
-	
+
 	if storyline = 1 and MagikDostup = 1:
 		$start_type = 'sg'
 		$start_type[1] = 'nomagic'
@@ -1127,7 +1127,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080700:
-	
+
 	!!name fix from kats to cats
 	i = 1
 	:loopcatsbrassave
@@ -1137,10 +1137,10 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	end
 	i += 1
 	if i <= ARRSIZE('kats_bras'):jump 'loopcatsbrassave'
-	
+
 	killvar 'kats_brasS'
 	killvar 'kats_bras'
-	
+
 	i = 1
 	:loopcatspantiessave
 	if kats_panties[i] = 1:
@@ -1149,16 +1149,16 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	end
 	i += 1
 	if i <= ARRSIZE('kats_panties'):jump 'loopcatspantiessave'
-	
+
 	killvar 'kats_pantiesS'
 	killvar 'kats_panties'
-	
+
 	!!Christina variable update
 	if AvelinaQW['encourage'] = 1: AvelinaQW['encourage'] = 0
 
 	if lariskaQwestDay < 0 or lariskaQwestDay > 0: killvar 'lariskaQwestDay'
 	if LariskaQW['LariskaHelp'] < 0 or LariskaQW['LariskaHelp'] > 0: LariskaQW['LariskaHelp'] = 0
-	if LariskaQW['LariskaHelpEnd'] = 1: LariskaQW['LariskaHelpEnd'] = 0 
+	if LariskaQW['LariskaHelpEnd'] = 1: LariskaQW['LariskaHelpEnd'] = 0
 
 	if npc_grupTipe['A18'] = 5: npc_grupTipe['A18'] = 2
 
@@ -1170,7 +1170,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 			christinaQW['dompath'] = 0
 		end
 	end
-	
+
 	if christinaQW['set_bully'] = 0:
 		if (christinaQW['blackmail'] > 0 or christinaQW['pre_bm'] > 0 or christinaQW['pre_fight'] > 0 or christinaQW['fight'] > 0) and christinaQW['set_bully'] = 0:
 			christinaQW['set_bully'] = 1
@@ -1198,7 +1198,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	killvar 'm_day'
 	killvar 'mother_go'
 	killvar 'ocpd_room'
-	
+
 	if indorf > 0:
 		locat['Fam_inGad'] = indorf
 	end
@@ -1264,7 +1264,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if $wloc = 'default':$wloc = 'default1'
 
 	!! new teeth variables
-	if pcs_teeth >= 0: 
+	if pcs_teeth >= 0:
 		pcs_missing_teeth = pcs_teeth
 		pcs_teeth = 0
 	end
@@ -1288,14 +1288,14 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if artsveslut > 0: artemQW['sveslut'] = artsveslut & killvar 'artsveslut'
 	if metArtemMom > 0: artemQW['metArtemMom'] = metArtemMom & 'metArtemMom'
 	if artdimhelp > 0: artemQW['dimkahelp'] = artdimhelp & killvar 'artdimhelp'
-	
+
 	!! update Julia to an array
 	if JulMilBestFrend > 0: juliaQW['JulMilBestFrend'] = JulMilBestFrend & killvar 'JulMilBestFrend'
 	if eatJulMilDay: juliaQW['eatJulMilDay'] = eatJulMilDay & killvar 'eatJulMilDay'
 	if SexTalkJulia: juliaQW['SexTalkJulia'] = SexTalkJulia & killvar 'SexTalkJulia'
 	if BeInJulMilHome: juliaQW['home_unlocked'] = BeInJulMilHome & killvar 'BeInJulMilHome'
 	if JuliaMilLernQW: juliaQW['study_unlocked'] = JuliaMilLernQW & killvar 'JuliaMilLernQW'
-		
+
 end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080802:
@@ -1347,11 +1347,11 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 
 	!! Transferring the owned, rented, accessible properties
 	! city apartment
-	if home_owned[1] = 1 or owned_property['city_apartment'] = 1: 
+	if home_owned[1] = 1 or owned_property['city_apartment'] = 1:
 		gs 'homes_properties', 'rent_property', 'city_apartment', ArendHouseSL
-	elseif home_owned[1] = 2 or owned_property['city_apartment'] = 2: 
+	elseif home_owned[1] = 2 or owned_property['city_apartment'] = 2:
 		gs 'homes_properties', 'buy_property', 'city_apartment'
-	elseif home_owned[1] = 3 or owned_property['city_apartment'] = 3: 
+	elseif home_owned[1] = 3 or owned_property['city_apartment'] = 3:
 		gs 'homes_properties', 'tenants_move_in', 'city_apartment',sdaday, sdamonth
 	end
 
@@ -1400,7 +1400,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 	!! Setting the current home and fixing potential missing access issues
 	if curr_home > 0 and $home['current'] = '': gs 'homes_properties', 'set_home', '', STR(curr_home)
 	if $home['current'] = 'parents_home' and accessible_property['parents_home'] = 0: gs 'homes_properties', 'give_access', 'parents_home'
- 
+
 	killvar 'home_owned' & killvar 'curr_home' & killvar 'ArendHouseSL' & killvar 'ArendHouseSL4'
 	killvar 'home_rent_txt' & killvar 'home_value' & killvar 'home_value_txt'
 	killvar 'sdaday' & killvar 'sdamonth' & killvar 'owned_property'
@@ -1421,11 +1421,11 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 	!! Setting the internet
 	if internet > 0:
 		old_internet_value = 10*internet
-		if $home['internet_enabled'] = 1: 
-			gs 'internet_mobile', 'buy_subscription', $home['current'], 900			
+		if $home['internet_enabled'] = 1:
+			gs 'internet_mobile', 'buy_subscription', $home['current'], 900
 			if (old_internet_value - 900) >= 0: money += (old_internet_value - 900)
 		else
-			if old_internet_value >= 1200: 
+			if old_internet_value >= 1200:
 				gs 'internet_mobile', 'buy_subscription', 'mobile', 1200
 				if (old_internet_value - 1200) > 0: money += (old_internet_value - 1200)
 			else
@@ -1437,11 +1437,11 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 
 	!! Setting the mobile phone calls and texts
 	if balans > 0:
-		if (balans - 800) >= 0: 
+		if (balans - 800) >= 0:
 			gs 'internet_mobile', 'buy_subscription', 'monthly_calls', 800
 			money += (balans - 800)
 		else
-			if balans >= 225: 
+			if balans >= 225:
 				temp_phone_mult = balans/225
 				temp_phone_rem = balans MOD 225
 				new_balans = temp_phone_mult * 240
@@ -1455,14 +1455,14 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 				 temp_phone_rem = balans MOD 115
 				 gs 'internet_mobile', 'top_up_metered', 'metered_calls', 120
 				 if temp_phone_rem > 0: money += temp_phone_rem
-			elseif balans >= 60: 
+			elseif balans >= 60:
 				 temp_phone_rem = balans MOD 60
 				 gs 'internet_mobile', 'top_up_metered', 'metered_calls', 60
 				 if temp_phone_rem > 0: money += temp_phone_rem
 			else
 				gs 'internet_mobile', 'top_up_metered', 'metered_calls', balans
 			end
-		end	
+		end
 		killvar 'balans' & killvar 'temp_phone_rem' & killvar 'temp_phone_mult' & killvar 'new_balans'
 	end
 
@@ -1504,7 +1504,7 @@ end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080900:
 	if $wardrobeDefaultPagePref = 'savedOutfits':$wardrobeDefaultPagePref = 'default1'
-	
+
 	if nichTanyaKnown = 1:
 		nichTanya['Known'] = nichTanyaKnown
 		nichTanya['Relationship'] = nichTanyaRelationship
@@ -1526,7 +1526,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 		nichTanya['Room'] = nichTanyaRoom
 		nichTanya['PropSex'] = nichTanyaPropSex
 		nichTanya['PropDate'] = nichTanyaPropDate
-		
+
 		killvar 'nichTanyaKnown'
 		killvar 'nichTanyaRelationship'
 		killvar 'nichTanyaRelationshipState'
@@ -1552,84 +1552,110 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 		killvar 'nichTanyaPropDate'
 	end
 
-	i = 1
-	:loopboutiquepanties 
-	if boutique_panties[i] = 1: lusso_panties[i] = 1 & lusso_pantiesS[i] = boutique_pantiesS[i]
+	i = 0
+	:loopboutiquepanties
 	i += 1
+	if boutique_panties[i] = 1:
+		dynamic 'lusso_panties[i] = 1'
+		dynamic 'lusso_pantiesS[i] = boutique_pantiesS[i]'
+	end
 	if i <= ARRSIZE('boutique_panties'):jump 'loopboutiquepanties'
 	killvar 'boutique_panties'
 
-	i = 1
+	i = 0
 	:loopboutiquebra
-	if boutique_bra[i] = 1: lusso_bra[i] = 1 & lusso_braS[i] = boutique_braS[i]
 	i += 1
+	if boutique_bra[i] = 1:
+		dynamic 'lusso_bra[i] = 1'
+		dynamic 'lusso_braS[i] = boutique_braS[i]'
+	end
 	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 = 0
+	:loopcheappanties
 	i += 1
+	if cheap_panties[i] = 1:
+		dynamic 'gm_panties[i] = 1'
+		dynamic 'gm_pantiesS[i] = cheap_pantiesS[i]'
+	end
 	if i <= ARRSIZE('cheap_panties'):jump 'loopcheappanties'
 	killvar 'cheap_panties'
 
-	i = 1
+	i = 0
 	:loopcheapbra
-	if boutique_bra[i] = 1: gm_bra[i] = 1 & gm_braS[i] = cheap_braS[i]
 	i += 1
+	if cheap_bra[i] = 1:
+		dynamic 'gm_bra[i] = 1'
+		dynamic 'gm_braS[i] = cheap_braS[i]'
+	end
 	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 = 0
+	:loopexhibitionistpanties
 	i += 1
+	if exhibitionist_panties[i] = 1:
+		dynamic 'salacious_panties[i] = 1'
+		dynamic 'salacious_pantiesS[i] = exhibitionist_pantiesS[i]'
+	end
 	if i <= ARRSIZE('exhibitionist_panties'):jump 'loopexhibitionistpanties'
 	killvar 'exhibitionist_panties'
 
-	i = 1
+	i = 0
 	:loopexhibitionistbra
-	if exhibitionist_bra[i] = 1: salacious_bra[i] = 1 & salacious_braS[i] = exhibitionist_braS[i]
 	i += 1
+	if exhibitionist_bra[i] = 1:
+		dynamic 'salacious_bra[i] = 1'
+		dynamic 'salacious_braS[i] = exhibitionist_braS[i]'
+	end
 	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 = 0
+	:loopsexshoppanties
 	i += 1
+	if sexshop_panties[i] = 1:
+		dynamic 'eroto_panties[i] = 1'
+		dynamic 'eroto_pantiesS[i] = sexshop_pantiesS[i]'
+	end
 	if i <= ARRSIZE('sexshop_panties'):jump 'loopsexshoppanties'
 	killvar 'sexshop_panties'
 
-	i = 1
+	i = 0
 	:loopsexshopbra
-	if sexshop_bra[i] = 1: eroto_bra[i] = 1 & eroto_braS[i] = sexshop_braS[i]
 	i += 1
+	if sexshop_bra[i] = 1:
+		dynamic 'eroto_bra[i] = 1'
+		dynamic 'eroto_braS[i] = sexshop_braS[i]'
+	end
 	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 = 0
+	:loopsportpanties
 	i += 1
+	if sport_panties[i] = 1:
+		dynamic 'danilovich_panties[i] = 1'
+		dynamic 'danilovich_pantiesS[i] = sport_pantiesS[i]'
+	end
 	if i <= ARRSIZE('sport_panties'):jump 'loopsportpanties'
 	killvar 'sport_panties'
 
-	i = 1
+	i = 0
 	:loopsportbra
-	if sport_bra[i] = 1: danilovich_bra[i] = 1 & danilovich_braS[i] = sport_braS[i]
 	i += 1
+	if sport_bra[i] = 1:
+		dynamic 'danilovich_bra[i] = 1'
+		dynamic 'danilovich_braS[i] = sport_braS[i]'
+	end
 	if i <= ARRSIZE('sport_bra'):jump 'loopsportbra'
 	killvar 'sport_bra'
 end
 
-	
-	
-	
-end
 
 if traits > 0 or trait > 0:
-	
+
 	pcs_traits['nerd_status'] = traits['nerd_status']
 	pcs_traits['cumeater'] = trait['cumeater']
 	pcs_traits['commando_lvl'] = trait['commando_lvl']
@@ -1641,7 +1667,7 @@ if traits > 0 or trait > 0:
 	pcs_traits['nerd_lernHome'] = traits['nerd_lernHome']
 	pcs_traits['nerd_points'] = traits['nerd_points']
 	pcs_traits['nerd_lessons'] = traits['nerd_lessons']
-	
+
 	killvar 'traits'
 	killvar 'trait'
 end

+ 10 - 10
locations/sexshop.qsrc

@@ -360,21 +360,21 @@ if $ARGS[0] = 'panties':
 
 	i = 1
 
-	:loopsexshop_panties
-		if sexshop_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''panties2''"><img src="images/pc/items/eroto/panties/<<i>>.jpg"	height="150" /></a> '
+	:looperoto_panties
+		if eroto_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''panties2''"><img src="images/pc/items/eroto/panties/<<i>>.jpg"	height="150" /></a> '
 		i += 1
-	if i <= 43:jump 'loopsexshop_panties'
+	if i <= 43:jump 'looperoto_panties'
 end
 
 if $ARGS[0] = 'panties2':
 	cla
 
-	if sexshop_panties[i] ! 0:
+	if eroto_panties[i] ! 0:
 		msg 'You already own these panties.'
 		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':
@@ -390,21 +390,21 @@ if $ARGS[0] = 'bras':
 
 	i = 1
 
-	:loopsexshop_bras
-		if sexshop_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''bras2''"><img src="images/pc/items/eroto/bras/<<i>>.jpg"	height="150" /></a> '
+	:looperoto_bras
+		if eroto_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''bras2''"><img src="images/pc/items/eroto/bras/<<i>>.jpg"	height="150" /></a> '
 		i += 1
-	if i <= 27:jump 'loopsexshop_bras'
+	if i <= 27:jump 'looperoto_bras'
 end
 
 if $ARGS[0] = 'bras2':
 	cla
 
-	if sexshop_bras[i] ! 0:
+	if eroto_bras[i] ! 0:
 		msg 'You already own this bra.'
 		gt 'sexshop', 'bras'
 	end
 
-	gt 'bras', 'view_bra_item', 'shop', 'sexshop',i, 500
+	gt 'bras', 'view_bra_item', 'shop', 'eroto',i, 500
 
 end
 

+ 9 - 9
locations/shop.qsrc

@@ -525,16 +525,16 @@ if $shoplocation = 'underwear':
 	$loc = 'shop'
 	'<center><B>Click on an item to view details</B></center>'
 
-	if cheap_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 cheap_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 cheap_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 cheap_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 cheap_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 cheap_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 cheap_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 cheap_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 cheap_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

+ 10 - 10
locations/sportShop.qsrc

@@ -202,21 +202,21 @@ if $ARGS[0] = 'panties':
 
 	i = 1
 
-	:loopsport_panties
-		if sport_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''panties2''"><img src="images/pc/items/danilovich/panties/<<i>>.jpg" 	height="150" /></a> '
+	:loopdanilovich_panties
+		if danilovich_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''panties2''"><img src="images/pc/items/danilovich/panties/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 8:jump 'loopsport_panties'
+	if i <= 8:jump 'loopdanilovich_panties'
 end
 
 if $ARGS[0] = 'panties2':
 	cla
 	
-	if sport_panties[i] ! 0:
+	if danilovich_panties[i] ! 0:
 		msg 'You already own these panties.'
 		gt 'sportShop', 'panties'
 	end
 
-	gt 'panties', 'view_panty_item', 'shop', 'sport',i, 1000
+	gt 'panties', 'view_panty_item', 'shop', 'danilovich',i, 1000
 
 end
 
@@ -234,21 +234,21 @@ if $ARGS[0] = 'bras':
 
 	i = 1
 
-	:loopsport_bras
-		if sport_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''bras2''"><img src="images/pc/items/danilovich/bras/<<i>>.jpg" 	height="150" /></a> '
+	:loopdanilovich_bras
+		if danilovich_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''bras2''"><img src="images/pc/items/danilovich/bras/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 8:jump 'loopsport_bras'
+	if i <= 8:jump 'loopdanilovich_bras'
 end
 
 if $ARGS[0] = 'bras2':
 	cla
 	
-	if sport_bras[i] ! 0:
+	if danilovich_bras[i] ! 0:
 		msg 'You already own this bra.'
 		gt 'sportShop', 'bras'
 	end
 
-	gt 'bras', 'view_bra_item', 'shop', 'sport',i, 1000
+	gt 'bras', 'view_bra_item', 'shop', 'danilovich',i, 1000
 
 end
 

+ 2 - 2
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
 

+ 7 - 7
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.'

+ 2 - 6
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

+ 2 - 2
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