[fixed] Some underwear variables not updated and updater needed to be more dynamic

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'', ''cheap'', <<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'', ''cheap'', <<i>>, 300"><img src="images/pc/items/gm/bras/<<i>>.jpg" 	height="150" /></a>'
 		i += 1
 		if i = 11: i = 13
 		if i = 16: i = 17

locations/exhibitionistshop.qsrc

@@ -162,16 +162,16 @@ 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
@@ -194,16 +194,16 @@ 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

locations/intro_initialization.qsrc

@@ -189,8 +189,8 @@ $coatworntype = 'none'
 coatwornnumber = 0
 
 if $ARGS[1] ! 'CSB' and school_clothing ! 1:
-	cheap_panties[1] = 1
-	cheap_bras[1] = 1
+	gm_panties[1] = 1
+	gm_bras[1] = 1
 	$pantyworntype = 'cheap'
 	pantywornnumber = 1
 	$braworntype = 'cheap'
@@ -224,8 +224,8 @@ if school_clothing = 1:
 	sportsclothingnumber = 80
 	gs 'clothing', 'wear', 'dolls_outfits', 37
 elseif $ARGS[1] = 'CSB':
-	cheap_panties[12] = 1
-	cheap_bras[12] = 1
+	gm_panties[12] = 1
+	gm_bras[12] = 1
 	$pantyworntype = 'cheap'
 	pantywornnumber = 12
 	$braworntype = 'cheap'
@@ -397,12 +397,12 @@ 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
+	danilovich_bras[3] = 1
+	danilovich_brasS[3] = 0
 	$sportsbratype = 'sport'
 	sportsbranumber = 3
-	sport_panties[3] = 1
-	sport_pantiesS[3] = 0
+	danilovich_panties[3] = 1
+	danilovich_pantiesS[3] = 0
 	$sportspantytype = 'sport'
 	sportspantynumber = 3
 	dolls_coats[19] = 1
@@ -418,12 +418,12 @@ else
 	coatwornnumber = 12
 	$sportscoattype = 'gm'
 	sportscoatnumber = 12
-	sport_bras[1] = 1
-	sport_brasS[1] = 0
+	danilovich_bras[1] = 1
+	danilovich_brasS[1] = 0
 	$sportsbratype = 'sport'
 	sportsbranumber = 1
-	sport_panties[1] = 1
-	sport_pantiesS[1] = 0
+	danilovich_panties[1] = 1
+	danilovich_pantiesS[1] = 0
 	$sportspantytype = 'sport'
 	sportspantynumber = 1
 	if school_clothing = 2:

locations/intro_initialization_city.qsrc

@@ -194,8 +194,8 @@ 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
+gm_panties[1] = 1
+gm_bras[1] = 1
 $pantyworntype = 'cheap'
 pantywornnumber = 1
 $braworntype = 'cheap'
@@ -209,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

locations/nichTanya.qsrc

@@ -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'

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,114 @@ 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 +1671,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

locations/sexshop.qsrc

@@ -360,16 +360,16 @@ 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
@@ -390,16 +390,16 @@ 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

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'', ''cheap'', 7, 300"><img src="images/pc/items/gm/panties/7.jpg" 	height="150" /></a>'
+	if gm_panties[9] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', 9, 300"><img src="images/pc/items/gm/panties/9.jpg" 	height="150" /></a>'
+	if gm_panties[12] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', 12, 300"><img src="images/pc/items/gm/panties/12.jpg" 	height="150" /></a>'
+	if gm_panties[21] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', 21, 300"><img src="images/pc/items/gm/panties/21.jpg" 	height="150" /></a>'
+	if gm_panties[37] = 0:*p '<a href="exec:gt ''panties'', ''view_panty_item'', ''shop'', ''cheap'', 37, 300"><img src="images/pc/items/gm/panties/37.jpg" 	height="150" /></a>'
 	*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'', ''cheap'', 11, 300"><img src="images/pc/items/gm/bras/11.jpg" 	height="150" /></a>'
+	if gm_bras[12] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''cheap'', 12, 300"><img src="images/pc/items/gm/bras/12.jpg" 	height="150" /></a>'
+	if gm_bras[16] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''cheap'', 16, 300"><img src="images/pc/items/gm/bras/16.jpg" 	height="150" /></a>'
+	if gm_bras[18] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''cheap'', 18, 300"><img src="images/pc/items/gm/bras/18.jpg" 	height="150" /></a>'
 
 	act 'Return':
 		$loc = $loc_bak

locations/sportShop.qsrc

@@ -202,16 +202,16 @@ 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
@@ -234,16 +234,16 @@ 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