.gitignore

@@ -5,7 +5,7 @@ mod/
 .*
 *.qsp
 *.sav
-qqsp.ini
+*.ini
 glife.txt
 qgen.cfg
 qspgui.cfg

glife.qproj

@@ -1148,7 +1148,6 @@
 		<Location name="city_suburbs"/>
 		<Location name="din_pav"/>
 		<Location name="shop_fancy_pancy"/>
-		<Location name="shop_skuas"/>
 		<Location name="shop_tsar_bomba"/>
 	</Folder>
 	<Folder name="OldTownHome">

locations/FedorEv4.qsrc

@@ -2567,7 +2567,7 @@ if $ARGS[0] = 'Bedroom':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/bedroom.jpg"></center>'
-	'Fedor''s bedroom is very neat, it has a bed, a computer desk with a chair and a <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a>, where you can choose outfits and organize your clothing.'
+	'Fedor''s bedroom is very neat, it has a bed, a computer desk with a chair and a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>, where you can choose outfits and organize your clothing.'
 	if FedorLove = 1:
 		'Fedor has a <a href="exec:gt ''FedorEv4'', ''Picture''">framed picture</a> by his bed.'
 	end

locations/HotelRoom.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'normal':
 	'<center><b><font color = maroon>Your normal hotel room</font></b></center>'
 	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	*nl
 	act'Go to the hotel lobby':
@@ -54,7 +54,7 @@ if $ARGS[0] = 'better':
 	'<center><b><font color = maroon>Your luxury room</font></b></center>'
 	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
@@ -90,7 +90,7 @@ if $ARGS[0] = 'best':
 	'<center><b><font color = maroon>Your royal suite</font></b></center>'
 	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'
-	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
 	'Your hotel room also has a huge flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':

locations/LariskaHome.qsrc

@@ -510,7 +510,7 @@ if $ARGS[0] = 'lariska_bedroom':
 	*clr & cla
 	'<center><b><font color="DeepSkyBlue">Lariska''s Bedroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_bedroom.jpg"></center>'
-	'The bedroom has hints of japanese style, although not as overwhelming as the rest of the apartment. Against the wall is a <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> where you can choose outfits and organise your clothing.'
+	'The bedroom has hints of japanese style, although not as overwhelming as the rest of the apartment. Against the wall is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 	if lariskalove >= 12:
 		'Her <a href="exec:gt ''bed2''">bed</a> sits directly on the floor, without space underneath.'
 	else

locations/MDressing.qsrc

@@ -13,7 +13,7 @@ cls
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/dressingroom.jpg"></center>'
 'A huge dressing room. Mostly used by submissives to dress as staff and because of this, it is a safe space and games are not allowed.'
-'It contains several <a href="exec:gt ''wardrobe'', ''main''">wardrobes</a> (where you can choose outfits and organize your clothing).'
+'It contains several <a href="exec:gt ''wardrobe'', ''start''">wardrobes</a> (where you can choose outfits and organize your clothing).'
 'There are whole cabinets filled with designer clothing belonging to various club members and plenty of <a href="exec:gt ''mirror'',''start''">mirrors</a> you can use.'
 
 act 'Go to foyer': gt 'MHall', 'foyer'

locations/bedr.qsrc

@@ -31,7 +31,7 @@ if rembedr = 0:
 	
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 	*nl
-	'An old wooden <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> stands near the door to the corridor.The windows are closed with faded, heavy curtains.'
+	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor.The windows are closed with faded, heavy curtains.'
 else
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
 	*nl
@@ -43,7 +43,7 @@ else
 		'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''<<$loc>>''">on</a>.'
 	end
 	*nl
-	'A modern <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the door to the corridor. Against the wall, stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
+	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the door to the corridor. Against the wall, stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
 end
 *nl
 act 'The corridor':gt 'korr'

locations/bedr2x.qsrc

@@ -27,7 +27,7 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 'The room is dominated by <a href="exec:gt ''bed'',''start''">full sized bed</a>'
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 *nl
-'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a>.'
+'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 *nl
 'Against the wall is a table with a <a href="exec:gt ''mirror'',''start''">mirror</a> above it.'
 *nl

locations/bedrPar.qsrc

@@ -79,7 +79,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
 		*nl
-		'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> where you can choose outfits and organise your clothing.'
+		'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 		*nl
 		'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
 		*nl

locations/brothel.qsrc

@@ -548,7 +548,7 @@ if $ARGS[0] = 'section1_dressingroom':
 	*nl
 	act 'Have a snack (0:15)': gs 'food', 'snack'
 	act 'Have a glass of water (0:05)':gs 'beverage', 'bev_wat'
-	act 'Change your clothes':gt 'wardrobe', 'main'
+	act 'Change your clothes':gt 'wardrobe', 'start'
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if shampoo > 0:
 		act 'Have a shower':

locations/budgetclothes.qsrc

@@ -100,7 +100,7 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing G&M outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -108,8 +108,9 @@ if $ARGS[0] = 'clothes':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_outfits_filter
 
 		if Clothingstock - 16 > 0:
 			i = 1
@@ -124,16 +125,22 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'gm_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_outfits''"><img src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_outfits''"><img src="images/pc/items/gm/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 
 			if i = 414:i = 415
 		if i <= 150:jump 'loopgm_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'gm_outfits':
@@ -144,7 +151,7 @@ if $ARGS[0] = 'gm_outfits':
 		gt 'budgetclothes', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_outfits',i, 1000
+	gt 'clothing', 'view_clothing_item', 'gm_outfits',i, 1000, 'shop'
 end
 
 if $ARGS[0] = 'dresses':
@@ -158,7 +165,7 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing G&M dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -166,8 +173,9 @@ if $ARGS[0] = 'dresses':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality1
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_dress_filter
 
 		if Clothingstock - 16 > 0:
 			i = 1
@@ -182,14 +190,20 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'gm_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_dress''"><img src="images/pc/items/gm/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_dress''"><img src="images/pc/items/gm/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 150:jump 'loopgm_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality1'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'gm_dress':
@@ -200,7 +214,7 @@ if $ARGS[0] = 'gm_dress':
 		gt 'budgetclothes', 'dresses'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_dress',i, 1000
+	gt 'clothing', 'view_clothing_item', 'gm_dress',i, 1000, 'shop'
 end
 
 if $ARGS[0] = 'office':
@@ -214,7 +228,7 @@ if $ARGS[0] = 'office':
 	'<center><b><font color="maroon">Viewing G&M office clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -222,29 +236,31 @@ if $ARGS[0] = 'office':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
-!!		if Clothingstock > 15:
-!!			i = 3
-!!		elseif Clothingstock > 7:
-!!			i = 2
-!!		else
-			i = 1
-!!		end
+	!!To filter just this set
+	clo_i = 0
+	:loopoffice_filter
+
+		i = 1
 
 		:loopoffice
 			if gm_office[i] = 0:
 				gs 'clothing_attributes', 'gm_office', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''officeclo''"><img src="images/pc/items/gm/office/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''officeclo''"><img src="images/pc/items/gm/office/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 40:jump 'loopoffice'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopoffice_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopoffice_filter'
+	end
 end
 
 if $ARGS[0] = 'officeclo':
@@ -255,7 +271,7 @@ if $ARGS[0] = 'officeclo':
 		gt 'budgetclothes', 'office'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_office',i, 2000
+	gt 'clothing', 'view_clothing_item',, 'gm_office',i, 2000 'shop'
 end
 
 if $ARGS[0] = 'gm_maid':
@@ -269,7 +285,7 @@ if $ARGS[0] = 'gm_maid':
 	'<center><b><font color="maroon">Viewing G&M maid outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -277,8 +293,10 @@ if $ARGS[0] = 'gm_maid':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_maid
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_maid_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -290,17 +308,23 @@ if $ARGS[0] = 'gm_maid':
 				gs 'clothing_attributes', 'gm_maid', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_maidclo''"><img src="images/pc/items/gm/maid/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_maidclo''"><img src="images/pc/items/gm/maid/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 40:jump 'loopgm_maid'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_maid'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_maid_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_maid_filter'
+	end
 end
 
-if $ARGS[0] = 'gm_maidclo': gt 'clothing', 'view_clothing_item', 'shop', 'gm_maid',i, 2000
+if $ARGS[0] = 'gm_maidclo': gt 'clothing', 'view_clothing_item', 'gm_maid',i, 2000, 'shop'
 
 if $ARGS[0] = 'gm_server':
 	$menu_loc = 'budgetclothes'
@@ -313,7 +337,7 @@ if $ARGS[0] = 'gm_server':
 	'<center><b><font color="maroon">Viewing G&M server uniforms</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -321,8 +345,10 @@ if $ARGS[0] = 'gm_server':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_server
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_server_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -334,17 +360,23 @@ if $ARGS[0] = 'gm_server':
 				gs 'clothing_attributes', 'gm_server', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_serverclo''"><img src="images/pc/items/gm/server/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''gm_serverclo''"><img src="images/pc/items/gm/server/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 30:jump 'loopgm_server'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_server'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_server_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_server_filter'
+	end
 end
 
-if $ARGS[0] = 'gm_serverclo': gt 'clothing', 'view_clothing_item', 'shop', 'gm_server',i, 2000
+if $ARGS[0] = 'gm_serverclo': gt 'clothing', 'clothing_item', 'gm_server',i, 2000, 'shop'
 
 if $ARGS[0] = 'school':
 	$menu_loc = 'budgetclothes'
@@ -357,7 +389,7 @@ if $ARGS[0] = 'school':
 	'<center><b><font color="maroon">Viewing G&M school uniforms</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -365,8 +397,10 @@ if $ARGS[0] = 'school':
 		gt 'budgetclothes', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality4
+	!!To filter just this set
+	clo_i = 0
+	:loopgm_school_filter
+
 		if Clothingstock > 15:
 			i = 1
 		elseif Clothingstock > 7:
@@ -380,15 +414,21 @@ if $ARGS[0] = 'school':
 				gs 'clothing_attributes', 'gm_school', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''schoolclo''"><img src="images/pc/items/gm/school/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''schoolclo''"><img src="images/pc/items/gm/school/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 			if i = 6:i = 9
 		if i <= 60:jump 'loopschool'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality4'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopgm_school_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopgm_school_filter'
+	end
 end
 
 if $ARGS[0] = 'schoolclo':
@@ -399,7 +439,7 @@ if $ARGS[0] = 'schoolclo':
 		gt 'budgetclothes', 'school'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'gm_school',i, 1500
+	gt 'clothing', 'view_clothing_item', 'gm_school',i, 1500, 'shop'
 end
 
 if $ARGS[0] = 'shoes':

locations/city_industrial_train.qsrc

@@ -187,7 +187,7 @@ end
 
 if $ARGS[0] = 'centre':
 	$loc = 'city_train'
-	$loc_arg = 'inside'
+	$loc_arg = 'start'
 	menu_off = 1
 	*clr & cla
 	minut += 5

locations/city_mansion_residence_1.qsrc

@@ -89,7 +89,7 @@ if $ARGS[0] = 'ybedroom':
 		*nl
 		'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
 		*nl
-		'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a>.'
+		'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 	end
 end
 
@@ -122,7 +122,7 @@ if $ARGS[0] = 'ybathroom':
 	if ymanrem[5] = 2:
 		'The ornate room holds a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a bath tub.'
 		
-		gs' selfplay', 'suction_dildo'
+		gs 'selfplay', 'suction_dildo'
 		*nl
 		gs 'din_van', 'private'
 		gs 'din_van', 'misery_2'

locations/city_market.qsrc

@@ -193,11 +193,30 @@ if $ARGS[0] = 'clo':
 		gt 'city_market', 'start'
 	end
 
+	!!To filter just this set
+	clo_i = 0
+	:loopmarket_outfits_filter
+
 	i = 1
 	:loopmarket_outfits
-	if market_outfits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
+		if loopmarket_outfits[i] = 0:
+			gs 'clothing_attributes', 'loopmarket_outfits', i
+			gs 'clothing_QV', 'shop_filter'
+
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:*p '<a href="exec: i = <<i>> & gt ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
+			end
+		end
 	i += 1
 	if i <= 20:jump 'loopmarket_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmarket_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmarket_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'marketclo':
@@ -208,7 +227,7 @@ if $ARGS[0] = 'marketclo':
 		gt 'city_market', 'clo'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'market_outfits',i, 750
+	gt 'clothing', 'view_clothing_item', 'market_outfits',i, 750, 'shop'
 
 end
 

locations/city_sauna.qsrc

@@ -102,7 +102,7 @@ if $ARGS[0] = 'saunaroom':
 	'<center><b><font color="maroon">Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunaroom.jpg"></center>'
 	*nl
-	'<br>The room has a thread bare <a href="exec:minut += 1 & gt ''bed2''">bed</a> and a cheap <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> where you can choose outfits and organize your clothing.'
+	'<br>The room has a thread bare <a href="exec:minut += 1 & gt ''bed2''">bed</a> and a cheap <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organize your clothing.'
 	*nl
 
 	'<br>Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>. The floor is littered with dozens of porn magazines and a selection of sex toys are scattered throughout the room. There''s so much stuff lying around, there''s barely enough space to do some basic <a href="exec:gt ''city_sauna'', ''saunafitness''">exercise</a>.'

locations/dachain.qsrc

@@ -26,7 +26,7 @@ if $args[0] = '':
 	end
 	'Your favorite summer residence.'
 	*nl
-	'There is a <a href="exec:gt ''bed'', ''start''">bed</a> against one wall. Next to it is a <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing). On the other side of the bed is a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a>'
+	'There is a <a href="exec:gt ''bed'', ''start''">bed</a> against one wall. Next to it is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). On the other side of the bed is a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a>'
 	*nl
 	'There is a sofa in front of the fireplace, a kitchen alcove opposite the bed and the door to the bathroom next to that.'
 	*nl

locations/dom_gor.qsrc

@@ -12,7 +12,7 @@ gs 'stat'
 gs 'themes', 'indoors'
 '<center><b><font color="maroon">Your room</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/vitekhome/kotovkom.jpg"></center>'
-'Your room in a hostel. The room is small, leaving only the bare minimum. 2 <a href="exec:gt ''bed'', ''start''">beds</a>, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, a <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing), and a small TV.'
+'Your room in a hostel. The room is small, leaving only the bare minimum. 2 <a href="exec:gt ''bed'', ''start''">beds</a>, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a small TV.'
 *nl
 
 if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and teachlevel > 20 and parkrunday ! daystart and hour < 21 and hour > 6:

locations/dorm.qsrc

@@ -631,7 +631,7 @@ if $ARGS[0] = 'dorm_room':
 	'<center><b>Your room</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obroom.jpg"></center>'
 	'This is your room which you share with another girl named Vika Kirilova.'
-	'At the right of the entrance, you find an old <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing).'
+	'At the right of the entrance, you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
 	'There''s a <a href="exec:gt ''mirror'',''start''">mirror</a> hanging on the wall.'
 	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room.'
 	if komp = 1:'There''s a <a href="exec:gt ''Komp'',''start''">laptop</a> lying on your bed.'

locations/exhibitionistshop.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Salacious outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -65,8 +65,10 @@ if $ARGS[0] = 'outfits':
 		gt 'exhibitionistshop', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopsalacious_outfits_filter
+
 		i = 1
 
 		:loopsalacious_outfits
@@ -74,17 +76,23 @@ if $ARGS[0] = 'outfits':
 				gs 'clothing_attributes', 'salacious_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''salacious_outfits''"><img <<$set_imgh>> src="images/pc/items/salacious/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''salacious_outfits''"><img <<$set_imgh>> src="images/pc/items/salacious/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 20:jump 'loopsalacious_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopsalacious_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopsalacious_outfits_filter'
+	end
 end
 
-if $ARGS[0] = 'salacious_outfits': gt 'clothing', 'view_clothing_item', 'shop', 'salacious_outfits',i, 1000
+if $ARGS[0] = 'salacious_outfits': gt 'clothing', 'view_clothing_item', 'salacious_outfits',i, 1000, 'shop'
 
 if $ARGS[0] = 'dresses':
 	$loc_arg = 'dresses'
@@ -94,7 +102,7 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Salacious dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -102,8 +110,10 @@ if $ARGS[0] = 'dresses':
 		gt 'exhibitionistshop', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopsalacious_dress_filter
+
 		if Clothingstock >= 18:
 			i = 1
 		elseif Clothingstock >= 12:
@@ -119,17 +129,23 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'salacious_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''salacious_dress''"><img <<$set_imgh>> src="images/pc/items/salacious/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''salacious_dress''"><img <<$set_imgh>> src="images/pc/items/salacious/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 4
 		if i <= 150:jump 'loopsalacious_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopsalacious_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopsalacious_dress_filter'
+	end
 end
 
-if $ARGS[0] = 'salacious_dress': gt 'clothing', 'view_clothing_item', 'shop', 'salacious_dress',i, 1000
+if $ARGS[0] = 'salacious_dress': gt 'clothing', 'view_clothing_item', 'salacious_dress',i, 1000, 'shop'
 
 if $ARGS[0] = 'panties':
 	$loc_arg = 'panties'

locations/fit.qsrc

@@ -146,7 +146,7 @@ if $ARGS[0] = 'dressing room':
 
 	act 'Change outfit':
 		cla
-		gt 'wardrobe', 'main'
+		gt 'wardrobe', 'start'
 	end
 
 	if PCloswimwear = 1:

locations/gdksport.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 
 	act 'Change outfit in the locker room':
 		cla
-		gt 'wardrobe', 'main'
+		gt 'wardrobe', 'start'
 	end
 
 	gs 'wardrobe', 'sports_outfit'
@@ -263,7 +263,7 @@ if $ARGS[0] = 'dance2':
 
 		act 'Leave':
 			if rand (0,4):
-				if AlbinaQW['StarletsJoined'] = 0 and StoryLine ! 0 and ( month < 10 or ( month = 10 and day < 18 )):
+				if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and StoryLine ! 0 and ( month < 10 or ( month = 10 and day < 18 )):
 					if alterstrtimg = 13:
 						gt 'AlbStars', 'albina3'
 					elseif grupTipe = 1 or grupTipe = 2:

locations/gschool_grounds.qsrc

@@ -764,7 +764,7 @@ if $ARGS[0] = 'change_room':
 	gs 'wardrobe', 'sports_outfit'
 	act 'Change your outfit':
 		cla
-		gt 'wardrobe', 'main'
+		gt 'wardrobe', 'start'
 	end
 	dynamic $publicpan
 	act 'Look in the mirror': gt 'mirror', 'start'

locations/gschool_lessons4.qsrc

@@ -1933,7 +1933,7 @@ if $ARGS[0] = 'post_dress':
 			gt 'gschool_lessons', 'short_break'
 		end
 	end
-	act 'Choose a different outfit':postphys_event = daystart & gt 'wardrobe', 'main'
+	act 'Choose a different outfit':postphys_event = daystart & gt 'wardrobe', 'start'
 	if siga >= 1:
 		act 'Smoke a cigarette':
 			*clr & cla

locations/kinosvid.qsrc

@@ -9,36 +9,36 @@ if $ARGS[0] = '':
 	gs 'stat'
 	'<center><b>Cinema</b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/0.jpg"></center>'
-	'You and <<$telsob>> buy your tickets, drinks, and popcorn. With some playful flirting, you settle into your seats ready to watch the movie.'
+	'You and <<$telsob>> buy your tickets, drinks, and popcorn. With that done you head into the theater where your movie is showing.'
 
 	act 'Watch the movie':
 		if $telsob = 'Alla':
 			alla += 1
 			if alla >= 20:
-				kisvrand = rand(0, 10)
-				if kisvrand > 0 and kisvrand < 3:gt 'kinosvid', '1'
-				if kisvrand > 2 and kisvrand < 5:gt 'kinosvid', '2'
-				if kisvrand = 0 or kisvrand > 4:gt 'kinosvid', '3'
+				kisvrand = rand(0, 20)
+				if kisvrand =< 4:gt 'kinosvid', '1'
+				if kisvrand = 5:gt 'kinosvid', '2'
+				if kisvrand >= 6:gt 'kinosvid', '3'
 			else
 				gt 'kinosvid', '3'
 			end
 		elseif $telsob = 'Masha':
 			masha += 1
 			if masha >= 20:
-				kisvrand = rand(0, 10)
-				if kisvrand > 0 and kisvrand < 3:gt 'kinosvid', '1'
-				if kisvrand > 2 and kisvrand < 5:gt 'kinosvid', '2'
-				if kisvrand = 0 or kisvrand > 4:gt 'kinosvid', '3'
+				kisvrand = rand(0, 20)
+				if kisvrand =< 4:gt 'kinosvid', '1'
+				if kisvrand = 5:gt 'kinosvid', '2'
+				if kisvrand >= 6:gt 'kinosvid', '3'
 			else
 				gt 'kinosvid', '3'
 			end
 		elseif $telsob = 'Kate':
 			npc_rel['A219'] += 1
 			if npc_rel['A219'] >= 20:
-				kisvrand = rand(0, 10)
-				if kisvrand > 0 and kisvrand < 3:gt 'kinosvid', '1'
-				if kisvrand > 2 and kisvrand < 5:gt 'kinosvid', '2'
-				if kisvrand = 0 or kisvrand > 4:gt 'kinosvid', '3'
+				kisvrand = rand(0, 20)
+				if kisvrand =< 4:gt 'kinosvid', '1'
+				if kisvrand = 5:gt 'kinosvid', '2'
+				if kisvrand >= 6:gt 'kinosvid', '3'
 			else
 				gt 'kinosvid', '3'
 			end
@@ -46,10 +46,10 @@ if $ARGS[0] = '':
 			!! date with girlfriend	
 			loverrelation[lover_number] += 1		
 			if loverrelation[lover_number] >= 20:
-				kisvrand = rand(0, 10)
-				if kisvrand > 0 and kisvrand < 3:gt 'kinosvid', '1'
-				if kisvrand > 2 and kisvrand < 5:gt 'kinosvid', '2'
-				if kisvrand = 0 or kisvrand > 4:gt 'kinosvid', '3'
+				kisvrand = rand(0, 20)
+				if kisvrand =< 4:gt 'kinosvid', '1'
+				if kisvrand = 5:gt 'kinosvid', '2'
+				if kisvrand >= 6:gt 'kinosvid', '3'
 			else
 				gt 'kinosvid', '3'
 			end
@@ -60,7 +60,7 @@ end
 if $ARGS[0] = '1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/1.jpg"></center>'
-	'While you''re engrossed in the movie, <<$telsob>> takes the opportunity to "accidentally" drop some popcorn down your top.'
+	'With some playful flirting, you settle into your seats ready to watch the movie and notice it is almost completely empty. While you''re engrossed in the movie, <<$telsob>> takes the opportunity to "accidentally" drop some popcorn down your top.'
 
 	act 'Oh, my':
 		*clr & cla
@@ -233,62 +233,188 @@ end
 if $ARGS[0] = '2':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/0.jpg"></center>'
-	'<<$telsob>> says: "I have to use the little girls room. I''ll be right back."'
-
+	'With some playful flirting, you settle into your seats ready to watch the movie and notice it is almost completely empty, just a few people spread out watching the movie. The two of you watch the movie for awhile before,<<$telsob>> reaches over and slides her hands between your legs and starts rubbing your crotch. Just as it is really starting to feel good, she says: "I have to use the little girls room. I''ll be right back."'
+	gs 'arousal', 'foreplay', 10, 'lesbian'
+	gs 'stat'
 	act 'Wait':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/20.jpg"></center>'
-
-		if kendra = 0:'While she is gone, a rude black chick sits down beside you, and forces her hand between your legs. Too stunned to say anything, you just sit there as she works her hand deeper between your thighs.<br>You''re all wet, sugar", she says with a little smirk.<br>Before you can figure out what to do or say, <<$telsob>> grabs her by the ear, and pulls the strange woman out of her seat. She doesn''t put up a fight, and even starts laughing as she goes.<br>The strange women calls back to you before she exits: "If you ever get a taste for dark chocolate come see me at the dorm. I know you want to." She leaves licking her still wet fingers.<br>Furious, <<$telsob>> throws her a parting shot: "Get the fuck gone you crazy black bitch! <<$pcs_nickname>> is my girl." She says the last part so only you can hear, as she sits back down.'
-		if kendra > 0:'While she is gone, Kendra plops right down in the chair next to you. She puts a hand between your legs, and she looks at you like a piece of property. "Oh, are you all wet for me <<$pcs_nickname>>, or are you hot for that skinny white bitch?", she says while roughly fingering your pussy.<br>Frozen, you have no idea what to do when you are saved by <<$telsob>>. She grabs Kendra by the ear and pulls her out of her seat. She doesn''t put a fight, and even starts laughing as she goes.<br>Kendra calls back to you before she exits: "Come see me when you get tired of that skinny white bitch. I know what you really want <<$pcs_nickname>>." Kendra leaves giving you a wink, while licking her still wet fingers.<br>Furious, <<$telsob>> throws her a parting shot: "Get the fuck gone you crazy black bitch! <<$pcs_nickname>> is my girl." She says the last part so only you can hear, as she sits back down.'
-
-		gs 'arousal', 'vaginal_finger', 10, 'lesbian'
-		gs 'stat'
-	
-		act 'Wait':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/21.jpg"></center>'
-			'When <<$telsob>> has calmed down a little, she looks at you with hunger in her eyes. You were so shocked by the encounter that you were still sitting there legs spread. <<$telsob>> reaches over and starts to unbutton your top too. It looks like she intends to claim her prize.'
-
-			act 'Let her':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/22.jpg"></center>'
-				'<<$telsob>> gives you a slow deep kiss, as she works two fingers into your pussy. She curls her fingers up, and gives a firm tug. "This is mine", she whispers against your lips.'
-				'All you can do is whimper, "Yes."'
-
-				$orgasm_or = 'yes'
-				gs 'arousal', 'vaginal_finger', 5, 'lesbian', 'sub'
-				gs 'stat'
-	
-				act 'Submit':
+		if hotcat >= 5:
+			'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater1.jpg"></center>'
+			if kendra_theater = 0:
+				if meet_kendra = 1:
+					'While she is gone, Kendra plops right down in the chair next to you. She starts eating your popcorn and places a hand on your knee. Too stunned to say anything, you just sit there a few moments as she rubs your knee and eats the popcorn. "Hello again <<$pcs_nickname>>, so what are you doing." She says as she looks at you like a piece of property.'
+				else
+					'While she is gone, a black girl sits down beside you, starts eating your popcorn and places a hand on your knee. Too stunned to say anything, you just sit there a few moments as she rubs your knee and eats the popcorn. "So whats your name?" She asks.'
+				end
+				act 'On a date':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/23.jpg"></center>'
-					'You obediently roll over to your knees, when <<$telsob>> tells you to. She gets to work, stretching your little pussy with finger after finger. She isn''t rough, but she leaves no doubt about who is in charge.'
-					'"I want you to cum for me now, <<$pcs_nickname>>", she says, in a firm voice.'
-					'You do.'
-					
-					$orgasm_or = 'yes'
-					gs 'arousal', 'vaginal_finger', 5, 'lesbian'
-					gs 'stat'
-	
-					act 'Pleasure her':
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater5.jpg"></center>'
+					if meet_kendra = 1:
+						'You explain you are on a date. "Uh... sorry but I am already on a date. She should be back any moment."'
+						'The Kendra snorts. "Yeah I seen that white bitch you was with, you could do way better."'
+						'Before she can say more <<$telsob>> comes back and grabs her by the arm and pulls her up out of the chair. "She''s with me, get out of here."'
+						'The Kendra jerks her arm free and then laughs at <<$telsob>>, before walking off. <<$telsob>> is very agitated for awhile as the two of you watch the movie complaining about the black girl that was just here, eventually she calms down and the two of you watch the rest of the movie in peace.'
+					else
+						'You explain you are on a date. "Uh... sorry but I am already on a date. She should be back any moment."'
+						'The black girl snorts. "Yeah I seen that white bitch you was with, you could do better."'
+						'Before she can say more <<$telsob>> comes back and grabs her by the arm and pulls her up out of the chair. "She''s with me, get out of here."'
+						'The black girl jerks her arm free and then laughs at <<$telsob>>, before walking off. <<$telsob>> is very agitated for awhile as the two of you watch the movie complaining about the black girl that was just here, eventually she calms down and the two of you watch the rest of the movie in peace.'
+					end
+					act 'Finish':gt 'kinosvid', '3'
+				end
+				act 'Harmless flirting':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater1.jpg"></center>'
+					if meet_kendra = 1:
+						'You explain you are on a date. "Uh... sorry but I am already on a date. She should be back any moment."'
+						'Then Kendra snorts. "Yeah I seen that white bitch you was with, you could do way better."'
+						'You blush a little at the compliment, there is just something about this girl. She just oozes confidence and authority, you get the feeling she is use to always getting her way, just by the way she acts and says things and she seems interested in you. "Thanks" You tell her not sure what more to say, this is a awkward situation, on a date with a girl while another girl flirts with you.'
+						'"Want some popcorn." Then she pops a few in her mouth, one held by her lips, you know she is planning to feed you it with a kiss if you say yes.'
+					else
+						meet_kendra = 1
+						npc_rel['A84'] = 40
+						'"<<$pcs_nickname>>." You tell her and then explain you are on a date. "Uh... sorry but I am already sorta on a date. She should be back any moment."'
+						'Then black girl snorts. "Yeah I seen that white bitch you was with, you could do better."'
+						'You blush a little at the compliment, there is just something about this girl. She just oozes confidence and authority, you get the feeling she is use to always getting her way, just by the way she acts and says things and she seems interested in you. "Thanks" You tell her not sure what more to say, this is a awkward situation, on a date with a girl while another girl flirts with you.'
+						'"By the way my name is Kendra." She says and before you can respond she adds to it. "Want some popcorn." Then she pops a few in her mouth, one held by her lips, you know she is planning to feed you it with a kiss if you say yes.'
+					end
+					act 'No thanks':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/24.jpg"></center>'
-						'<<$telsob>> gets into position, and guides your hand between her legs. "Do it to me now, sweetie", she tells you. You slowly do the same thing that she has just done to you, slowly stretching her until you get four fingers inside her. After a short time <<$telsob>> bucks wildly against your hand, as she climaxes. When she recovers she gives you a little kiss on the cheek, and goes back to watching the movie, without a word.'
-
-						gs 'arousal', 'vaginal_finger_give', 5, 'lesbian'
-						gs 'stat'
-	
+						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater5.jpg"></center>'
+						'You shake your head no. "No thanks, like I said my date should be back any moment."'
+						'The Kendra snorts. "You afraid of what she might do if she see''s you with someone better than her?"'
+						'Before you can answer <<$telsob>> comes back and grabs Kendra by the arm and pulls her up out of the chair. "She''s with me, get out of here."'
+						'The Kendra jerks her arm free and then laughs at <<$telsob>>, before walking off. <<$telsob>> is very agitated for awhile as the two of you watch the movie complaining about the black girl that was just here, eventually she calms down and the two of you watch the rest of the movie in peace.'
 						act 'Finish':gt 'kinosvid', '3'
 					end
+					act 'Yes':
+						*clr & cla
+						gs 'npc_relationship', 'modify', 'A84', 'like'
+						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater2.jpg"></center>'
+						'You just nod your head and then she leans in and places the piece of popcorn in your mouth, you swallow it and soon the two of you are kissing. She taste like candy and popcorn, she is a very good kisser. You don''t know how long the two of you kiss, a couple of minutes at least but it was so good it felt like forever and no time at all, at the same time. When the kiss finally breaks she says. "I saw her rubbing you all over your pussy, show me your wet little pussy."'
+						gs 'arousal', 'kiss', 2, 'lesbian'
+						gs 'stat'
+						act 'No':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater5.jpg"></center>'
+							'You shake your head no. "No I can''t, not to mention my date should be back any moment."'
+							'The Kendra snorts. "You afraid of what she might do if she see''s you with someone better than her?"'
+							'Before you can answer <<$telsob>> comes back and grabs Kendra by the arm and pulls her up out of the chair. "She''s with me, get out of here."'
+							'The Kendra jerks her arm free and then laughs at <<$telsob>>, before walking off. <<$telsob>> is very agitated for awhile as the two of you watch the movie complaining about the black girl that was just here, eventually she calms down and the two of you watch the rest of the movie in peace.'
+							act 'Finish':gt 'kinosvid', '3'
+						end
+						act 'Show her':
+							*clr & cla
+							kendra_theater = 1
+							gs 'npc_relationship', 'modify', 'A84', 'like'
+							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater3.jpg"></center>'
+							'You pulls your clothes aside until you can bare your pussy to her. As she looks down at your pussy she licks her lips. "You are all shinny and wet." After a few moments she reaches over and starts to rub your thigh gently. Her hand starts sliding up your thigh to your pussy.'
+							gs 'arousal', 'flash', 2, 'lesbian'
+							gs 'stat'
+							act 'Let her':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater4.jpg"></center>'
+								'Her fingers trail up your thigh and over to your pussy, she starts rubbing your clit for a moment, "You''re all wet, sugar." she says, then her fingers slide down to your slit and inside of your wet pussy. For several minutes she alternates between fingering you, rubbing your clit and just teasing you by rubbing your inner thigh.'
+								gs 'arousal', 'vaginal_finger', 3, 'lesbian'
+								gs 'stat'
+								act 'girl interrupted':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater5.jpg"></center>'
+									'Just as it is starting to really feel good, <<$telsob>> shows up and grabs Kendra by the arm yanking her up. Kendra doesn''t put up a fight, and even starts laughing as she goes. Kendra calls back to you before she walks off: "If you ever get a taste for dark chocolate come see me at the dorm, ask for me by name. I know you want to." She leaves licking her still wet fingers.'
+									*nl
+									'Furious, <<$telsob>> throws her a parting shot: "Get the fuck out of here you crazy black bitch! <<$pcs_nickname>> is my girl." She says the last part so only you can hear, as she sits back down.'
+									act 'Wait':gt 'kinosvid', '23'
+								end
+							end
+						end
+					end
+				end
+			else
+				'While she is gone, Kendra plops right down in the chair next to you. She starts eating your popcorn and places a hand on your knee. Too stunned to say anything, you just sit there a few moments as she rubs your knee and eats the popcorn. "Hello again <<$pcs_nickname>>, I bet your all wet for me again." She says as she looks at you like a piece of property.'
+				act 'On a date':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater5.jpg"></center>'
+					'You explain you are on a date. "Uh... sorry but I am already on a date, like last time. She should be back any moment."'
+					'The Kendra snorts. "Yeah I seen that white bitch you was with, you could do way better and you know it."'
+					'Before she can say more <<$telsob>> comes back and grabs her by the arm and pulls her up out of the chair. "She''s with me, get out of here."'
+					'The Kendra jerks her arm free and then laughs at <<$telsob>>, before walking off. <<$telsob>> is very agitated for awhile as the two of you watch the movie complaining about the black girl that was just here, eventually she calms down and the two of you watch the rest of the movie in peace.'
+					act 'Finish':gt 'kinosvid', '3'
+				end
+				act 'Smile to her':
+					*clr & cla
+					kendra = 1
+					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater1.jpg"></center>'
+					'You explain you are on a date. "Uh... sorry but I am already on a date. She should be back any moment."'
+					'Then Kendra snorts. "Yeah I seen that white bitch you was with, you could do way better."'
+					'You blush a little at the compliment, there is just something about this girl. She just oozes confidence and authority, you get the feeling she is use to always getting her way, just by the way she acts and says things and she seems interested in you. "Thanks" You tell her as you lay your head on her shoulder.'
+					'"Show me your pussy." Kendra says to you.'
+					act 'Show her':
+						*clr & cla
+						gs 'npc_relationship', 'modify', 'A84', 'like'
+						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater3.jpg"></center>'
+						'You pulls your clothes aside until you can bare your pussy to her. As she looks down at your pussy she licks her lips. "Oh, are you all wet for me <<$pcs_nickname>>, or are you hot for that white bitch?" After a few moments she reaches over and starts to rub your thigh gently. Her hand starts sliding up your thigh to your pussy.'
+						gs 'arousal', 'flash', 2, 'lesbian'
+						gs 'stat'
+						act 'Let her':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater4.jpg"></center>'
+							'Her fingers trail up your thigh and over to your pussy, she starts rubbing your clit for a moment, "Look how wet that pussy gets at my touch, I know that white bitch doesn''t get you this hot." she says, then her fingers slide down to your slit and inside of your wet pussy. For several minutes she alternates between fingering you, rubbing your clit and just teasing you by rubbing your inner thigh.'
+							gs 'arousal', 'vaginal_finger', 3, 'lesbian'
+							gs 'stat'
+							act 'girl interrupted':
+								*clr & cla
+								npc_rel['A84'] = 40
+								'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/theater/theater5.jpg"></center>'
+								'Just as it is starting to really feel good, <<$telsob>> shows up and grabs Kendra by the arm yanking her up. Kendra doesn''t put up a fight, and even starts laughing as she goes. Kendra calls back to you before she walks off: "Come see me when you get tired of that white bitch. I know what you really want <<$pcs_nickname>>." She leaves licking her still wet fingers.'
+								*nl
+								'Furious, <<$telsob>> throws her a parting shot: "Get the fuck out of here you crazy black bitch! <<$pcs_nickname>> is my girl." She says the last part so only you can hear, as she sits back down.'
+								act 'Wait':gt 'kinosvid', '23'
+							end
+						end
+					end
 				end
-
-				act 'Pleasure her':gt 'kinosvid', '22'
 			end
-
-			act 'Pleasure her':gt 'kinosvid', '21'
+		else
+			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/0.jpg"></center>'
+			'You watch the movie while she is gone, you sit and watch the movie. About ten minutes later she comes back and sits back down next to you.'
+			act 'Finish':gt 'kinosvid', '3'
+		end
+	end
+end
+			
+if $ARGS[0] = '23':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/21.jpg"></center>'
+	'When <<$telsob>> has calmed down a little, she looks at you with hunger in her eyes. You were so shocked by the encounter that you were still sitting there legs spread. <<$telsob>> reaches over and starts to unbutton your top too. It looks like she intends to claim her prize.'
+	act 'Let her':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/22.jpg"></center>'
+		'<<$telsob>> gives you a slow deep kiss, as she works two fingers into your pussy. She curls her fingers up, and gives a firm tug. "This is mine", she whispers against your lips.'
+		'All you can do is whimper, "Yes."'
+		$orgasm_or = 'yes'
+		gs 'arousal', 'vaginal_finger', 5, 'lesbian', 'sub'
+		gs 'stat'
+		act 'Submit':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/23.jpg"></center>'
+			'You obediently roll over to your knees, when <<$telsob>> tells you to. She gets to work, stretching your little pussy with finger after finger. She isn''t rough, but she leaves no doubt about who is in charge.'
+			'"I want you to cum for me now, <<$pcs_nickname>>", she says, in a firm voice.'
+			'You do.'
+			$orgasm_or = 'yes'
+			gs 'arousal', 'vaginal_finger', 5, 'lesbian'
+			gs 'stat'
+			act 'Pleasure her':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/24.jpg"></center>'
+				'<<$telsob>> gets into position, and guides your hand between her legs. "Do it to me now, sweetie", she tells you. You slowly do the same thing that she has just done to you, slowly stretching her until you get four fingers inside her. After a short time <<$telsob>> bucks wildly against your hand, as she climaxes. When she recovers she gives you a little kiss on the cheek, and goes back to watching the movie, without a word.'
+				gs 'arousal', 'vaginal_finger_give', 5, 'lesbian'
+				gs 'stat'
+				act 'Finish':gt 'kinosvid', '3'
+			end
 		end
+		act 'Pleasure her':gt 'kinosvid', '22'
 	end
+	act 'Pleasure her':gt 'kinosvid', '21'
 end
 
 if $ARGS[0] = '21':
@@ -331,6 +457,7 @@ if $ARGS[0] = '3':
 	gs 'stat'
 	gs 'arousal', 'end'
 	'<center><img <<$set_imgh>> src="images/characters/city/boyfriend/sex/event/cinema/0.jpg"></center>'
+	'With some playful flirting, you settle into your seats ready to watch the movie and notice the theater is packed, you struggle to find a pair of empty seats next to each other.'
 
 	if $telsob = $loverdesc[lover_number]:
 		'When the movie ends, <<$telsob>> looks at you and waits for your next move.'

locations/leonid.qsrc

@@ -850,7 +850,7 @@ if $ARGS[0] = 'toilet':
 
 	act 'Leave the restroom':gt 'leonid', 'office'
 	
-	act 'Change your clothes':gt 'wardrobe', 'main'
+	act 'Change your clothes':gt 'wardrobe', 'start'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'

locations/mey_home.qsrc

@@ -224,7 +224,7 @@ if $ARGS[0] = '3':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/guestroom.jpg"></center>'
 	*nl
 	'It feels and looks like a standard room in a hotel.'
-	'There is a <a href="exec:gt ''bed'', ''start''">bed</a>, a small <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gt ''stol'' ,''stolPar''">desk</a>.'
+	'There is a <a href="exec:gt ''bed'', ''start''">bed</a>, a small <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gt ''stol'' ,''stolPar''">desk</a>.'
 	*nl
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc, $loc_arg">ON</a>.')
 	*nl

locations/moncheri.qsrc

@@ -69,12 +69,14 @@ if $ARGS[0] = 'gowns':
 	'<center><b><font color="maroon">Viewing Mon Chéri outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopmoncheri_gown_filter
+
 		if Clothingstock > 7:
 			i = 1
 		elseif Clothingstock > 15:
@@ -88,17 +90,23 @@ if $ARGS[0] = 'gowns':
 				gs 'clothing_attributes', 'moncheri_gown', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_gown''"><img src="images/pc/items/moncheri/gown/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_gown''"><img src="images/pc/items/moncheri/gown/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 160:jump 'loopmoncheri_gown'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmoncheri_gown_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmoncheri_gown_filter'
+	end
 end
 
-if $ARGS[0] = 'moncheri_gown':gt 'clothing', 'view_clothing_item', 'shop', 'moncheri_gown',i, 20000
+if $ARGS[0] = 'moncheri_gown':gt 'clothing', 'view_clothing_item', 'moncheri_gown',i, 20000, 'shop'
 
 if $ARGS[0] = 'dresses':
 	$loc_arg = 'dresses'
@@ -111,12 +119,14 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Mon Chéri outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopmoncheri_dress_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -128,17 +138,23 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'moncheri_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_dress''"><img src="images/pc/items/moncheri/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_dress''"><img src="images/pc/items/moncheri/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 80:jump 'loopmoncheri_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmoncheri_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmoncheri_dress_filter'
+	end
 end
 
-if $ARGS[0] = 'moncheri_dress': gt 'clothing', 'view_clothing_item', 'shop', 'moncheri_dress',i, 20000
+if $ARGS[0] = 'moncheri_dress': gt 'clothing', 'view_clothing_item', 'moncheri_dress',i, 20000, 'shop'
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = $ARGS[0]

locations/nichBedroomServant.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/bedroomServant.jpg"></center>'
 
 	'Your bedroom is fairly large, considering you''re only an employee. There is a small <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
-	'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing). There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> next to it.'
+	'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> next to it.'
 	if komp = 1:
 		$komp = ' with your <a href="exec:gt ''Komp'', ''start''">laptop</a>.'
 	else

locations/nyp_school.qsrc

@@ -169,10 +169,41 @@ if $ARGS[0] = 'cool jocks':
 	end
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/hangout.jpg"></center>'
 	'The next half hour passes by very slowly and is uneventful. The boys gather in a group together and talk about whatever it is boys talk about, most likely the girls. The girls mill around in a group and discuss the problems with makeup and skin care. Everyone grabs a drink just to feel a little buzz, with no one wanting to get too drunk. Andrey and Stasya spend the whole time dancing together. They look very happy and cute together. Some of the other girls occasionally agree to dance with one of the boys or often dance in a group.'
-	if IgorLove > 0:
-		!!If dating Igor this happens
-		'While you are hanging out with the girls and chatting, Igor walks over and offers you his hand. "Come dance with me <<$pcs_nickname>>."'
+	if fedorKozlovQW >= 10:
+		'While you are hanging out with the girls chatting, Fedor walks over and offers you his hand. "Come dance with me <<$pcs_nickname>>."'
 
+		act 'Don''t dance with Fedor':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
+			'You slightly lower your head as you say "I would love to, but I''m really tired and just want to chat with my friends for a bit. Maybe next time." You can see Fedor look noticeably sad as he responds "Alright, I didn''t mean to interrupt your chat. I''ll just go..." Not wanting Fedor to be sad, you give him a smile as you approach him then lean forward, planting a soft kiss on his cheek before saying "Awww, don''t give me that sad puppy face. How about a kiss instead?"' 
+			*nl
+			'Fedor chuckles before nodding and giving you a passionate kiss before saying "Alright <<$pcs_nickname>>, have a good time and I''ll see you later." You wave to Fedor as he walks away.'
+			act 'Hang out until the party ends':gt 'nyp_school', 'end'
+		end
+
+		act 'Dance with Fedor':
+			cla & *clr 
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/kiss.mp4"></center>'
+			'You place your hand on top of Fedor''s as you reply "I would love to dance with you." Fedor gives your hand a light kiss as he wraps his arm around your waist, pulling you toward him. You give Fedor a smile as you both begin swaying to the music, feeling Fedor''s strong arm around your waist, keeping your sway in sync with his, as you both stare into each other''s eyes.'
+			*nl
+			'As you are both gazing longingly into each other''s eyes, you lean forward and give Fedor a gentle, loving kiss, enjoying the warmth of his lips pressed against yours and his embrace, as he firmly holds you close to him. The kiss lasts for what feels like a minute before you slowly break it off and continue dancing slowly to the music while staring directly into Fedor''s eyes.'
+			act 'Dance until the party ends':
+				cla & *clr 
+				minut += 30
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/fedordance.jpg"></center>'
+				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops before you hear one of the teachers say "Okay everyone, it is time to go home. I hope that you have had a great time and I wish you all a happy and safe holiday. We will see everyone back at school once the winter break is over."'
+				*nl
+				'The students begin to pick up their stuff and head for the door, while you and Fedor walk together hand in hand. All of a sudden, you hear Dimka yell out. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at 18:00 on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is." he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia. You may come. I''m sure you''ll show your gratitude in one way or another."'
+				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor as he begins to talk. "<<$pcs_nickname>>, you and I have had some disagreements before. I sincerely apologize for my behavior and I hope you will still come to my party."'
+				InvitationToDimkaNYparty = 1
+				'Everyone then slowly makes their way out of the school.'
+
+				act 'Leave':gt 'gschool_grounds', 'main'
+			end
+		end
+	elseif IgorLove > 0:
+		'While you are hanging out with the girls and chatting, Igor walks over and offers you his hand. "Come dance with me <<$pcs_nickname>>."'
 		act 'Don''t dance with Igor':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/talk.jpg"></center>'
@@ -214,7 +245,7 @@ if $ARGS[0] = 'cool jocks':
 		act 'Dance with Marcus':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/marcusdance.jpg"></center>'
-			'Smiling, you answer. "Of course, I would love to dance with you Marcus." He takes you by the hand and leads you out onto the dance floor. The songs vary a lot. Some are fast and get you both really moving around, while others are slow, in which case you slow dance together. You are really enjoying dancing in front of everyone with your boyfriend.'
+			'Smiling, you answer. "Of course, I would love to dance with you Marcus." He takes you by the hand and leads you out onto the dance floor. The songs vary a lot. Some are fast and get you both really moving around, while others are slow, in which case you slow dance together. You are really enjoying dancing in front of everyone with Marcus.'
 
 			act 'Dance until the party ends':
 				*clr & cla
@@ -227,40 +258,6 @@ if $ARGS[0] = 'cool jocks':
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
 
-				act 'Leave':gt 'gschool_grounds', 'main'
-			end
-		end
-	elseif fedorKozlovQW >= 10:
-		!!If dating Fedor this happens
-		'While you are hanging out with the girls chatting, Fedor walks over and offers you his hand. "Come dance with me <<$pcs_nickname>>."'
-
-		act 'Don''t dance with Fedor':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
-			'You slightly lower your head as you say "I would love to, but I''m really tired and just want to chat with my friends for a bit. Maybe next time." You can see Fedor look noticeably sad as he responds "Alright, I didn''t mean to interrupt your chat. I''ll just go..." Not wanting Fedor to be sad, you give him a smile as you approach him then lean forward, planting a soft kiss on his cheek before saying "Awww, don''t give me that sad puppy face. How about a kiss instead?"' 
-			*nl
-			'Fedor chuckles before nodding and giving you a passionate kiss before saying "Alright <<$pcs_nickname>>, have a good time and I''ll see you later." You wave to Fedor as he walks away.'
-			act 'Hang out until the party ends':gt 'nyp_school', 'end'
-		end
-
-		act 'Dance with Fedor':
-			cla & *clr 
-			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/kiss.mp4"></center>'
-			'You place your hand on top of Fedor''s as you reply "I would love to dance with you." Fedor gives your hand a light kiss as he wraps his arm around your waist, pulling you toward him. You give Fedor a smile as you both begin swaying to the music, feeling Fedor''s strong arm around your waist, keeping your sway in sync with his, as you both stare into each other''s eyes.'
-			*nl
-			'As you are both gazing longingly into each other''s eyes, you lean forward and give Fedor a gentle, loving kiss, enjoying the warmth of his lips pressed against yours and his embrace, as he firmly holds you close to him. The kiss lasts for what feels like a minute before you slowly break it off and continue dancing slowly to the music while staring directly into Fedor''s eyes.'
-			act 'Dance until the party ends':
-				cla & *clr 
-				minut += 30
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/fedordance.jpg"></center>'
-				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops before you hear one of the teachers say "Okay everyone, it is time to go home. I hope that you have had a great time and I wish you all a happy and safe holiday. We will see everyone back at school once the winter break is over."'
-				*nl
-				'The students begin to pick up their stuff and head for the door, while you and Fedor walk together hand in hand. All of a sudden, you hear Dimka yell out. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at 18:00 on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is." he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia. You may come. I''m sure you''ll show your gratitude in one way or another."'
-				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor as he begins to talk. "<<$pcs_nickname>>, you and I have had some disagreements before. I sincerely apologize for my behavior and I hope you will still come to my party."'
-				InvitationToDimkaNYparty = 1
-				'Everyone then slowly makes their way out of the school.'
-
 				act 'Leave':gt 'gschool_grounds', 'main'
 			end
 		end

locations/obj_din.qsrc

@@ -318,7 +318,7 @@ if $ARGS[0] = 'skills':
 	if pcs_photoskl > 0: 'Photography - <<pcs_photoskl>>'
 	if pcs_artskls > 0: 'Artistic Skills - <<pcs_artskls>>'
 	if pcs_perform > 0: 'Performance - <<pcs_perform>>'
-	if pcs_musicprod > 0: 'Music Production - <<pcs_pcs_musicprodperform>>'
+	if pcs_musicprod > 0: 'Music Production - <<pcs_musicprod>>'
 
 	'</td><td width="25%" cellspacing="0" cellpadding="10" valign="top">'
 	'<b>Job Skills</b>'

locations/pav_shared_apt.qsrc

@@ -293,7 +293,7 @@ if $ARGS[0] = 'start':
 		'The last doors lead to the <a href="exec:gt ''pav_shared_apt'', ''pcsRoom''">room</a> you have rented.'
 		*nl
 		!! Wardrobe is here, because Sveta''s bedroom is actually the unused living room, with no wardrobe, so she is using the hall cupboard.
-		'There are no cupboards in your livingroom cum bedroom, but there are several hall <a href="exec:gt ''wardrobe'', ''main''">closets</a>, that you can use to store your clothes</a>, with a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> attached.'
+		'There are no cupboards in your livingroom cum bedroom, but there are several hall <a href="exec:gt ''wardrobe'', ''start''">closets</a>, that you can use to store your clothes</a>, with a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> attached.'
 		*nl
 		if servitudeLvl >= 1:'A computer printed <a href="exec:gt ''pav_shared_apt'', ''list''">list</a> hangs on the exit door.' & *nl
 		act 'Go to your room':gt 'pav_shared_apt', 'pcsRoom'

locations/pav_train_hall.qsrc

@@ -341,7 +341,7 @@ end
 
 if $ARGS[0] = 'centre':
 	$loc = 'city_train'
-	$loc_arg = 'inside'
+	$loc_arg = 'start'
 	menu_off = 1
 	minut += 40
 	if rand(1, 100) < 15: gt 'train', 'private'

locations/pav_train_market.qsrc

@@ -243,11 +243,30 @@ if $ARGS[0] = 'clo':
 		gt 'pav_train_market', 'start'
 	end
 
+	!!To filter just this set
+	clo_i = 0
+	:loopmarket_outfits_filter
+
 	i = 1
 	:loopmarket_outfits
-	if market_outfits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''pav_train_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
+		if loopmarket_outfits[i] = 0:
+			gs 'clothing_attributes', 'loopmarket_outfits', i
+			gs 'clothing_QV', 'shop_filter'
+
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:*p '<a href="exec: i = <<i>> & gt ''pav_train_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/items/market/clothes/<<i>>.jpg" 	height="250" /></a>'
+			end
+		end
 	i += 1
 	if i <= 20:jump 'loopmarket_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmarket_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmarket_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'marketclo':
@@ -258,7 +277,7 @@ if $ARGS[0] = 'marketclo':
 		gt 'pav_train_market', 'clo'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'market_outfits',i, 750
+	gt 'clothing', 'view_clothing_item', 'market_outfits',i, 750, 'shop'
 
 end
 

locations/scandalicious.qsrc

@@ -61,7 +61,7 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Scandalicious outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -69,8 +69,10 @@ if $ARGS[0] = 'clothes':
 		gt 'scandalicious', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopscandalicious_outfits_filter
+
 	i = 1
 
 		:loopscandalicious_outfits
@@ -78,15 +80,21 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'scandalicious_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''scandalicious_outfits''"><img src="images/pc/items/scandalicious/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''scandalicious_outfits''"><img src="images/pc/items/scandalicious/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 
 		if i <= 20:jump 'loopscandalicious_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopscandalicious_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopscandalicious_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'scandalicious_outfits':
@@ -97,7 +105,7 @@ if $ARGS[0] = 'scandalicious_outfits':
 		gt 'scandalicious', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_outfits',i, 1500
+	gt 'clothing', 'view_clothing_item', 'scandalicious_outfits',i, 1500, 'shop'
 end
 
 if $ARGS[0] = 'dresses':
@@ -111,7 +119,7 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Scandalicious dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -119,8 +127,10 @@ if $ARGS[0] = 'dresses':
 		gt 'scandalicious', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality1
+	!!To filter just this set
+	clo_i = 0
+	:loopscandalicious_dress_filter
+
 	i = 1
 
 		:loopscandalicious_dress
@@ -128,14 +138,20 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'scandalicious_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''scandalicious_dress''"><img src="images/pc/items/scandalicious/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''scandalicious'', ''scandalicious_dress''"><img src="images/pc/items/scandalicious/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 100:jump 'loopscandalicious_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality1'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopscandalicious_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopscandalicious_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'scandalicious_dress':
@@ -146,7 +162,7 @@ if $ARGS[0] = 'scandalicious_dress':
 		gt 'scandalicious', 'dresses'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_dress',i, 1500
+	gt 'clothing', 'view_clothing_item', 'scandalicious_dress',i, 1500, 'shop'
 end
 
 if $ARGS[0] = 'shoes':
@@ -178,7 +194,7 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimsuits - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -205,7 +221,7 @@ if $ARGS[0] = 'swim':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_swimsuit',i, 1750
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'scandalicious_swimsuit',i, 1750, 'shop'
 
 if $ARGS[0] = 'bikinis':
 	$loc_arg = 'bikinis'
@@ -215,7 +231,7 @@ if $ARGS[0] = 'bikinis':
 	'<center><b><font color="maroon">Bikinis - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -242,7 +258,7 @@ if $ARGS[0] = 'bikinis':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'shop', 'scandalicious_bikinis',i, 1750
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'scandalicious_bikinis',i, 1750, 'shop'
 
 --- scandalicious ---------------------------------
 

locations/sexshop.qsrc

@@ -646,12 +646,13 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Fetish dresses - for all your personal needs</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:looperoto_dress_filter
 
 		if Clothingstock > 11:
 			i = 1
@@ -664,17 +665,23 @@ if $ARGS[0] = 'dress':
 				gs 'clothing_attributes', 'eroto_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-					
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_dress''"><img <<$set_imgh>> src="images/pc/items/eroto/dress/<<i>>.jpg"	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_dress''"><img <<$set_imgh>> src="images/pc/items/eroto/dress/<<i>>.jpg"	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 120:jump 'looperoto_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'looperoto_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'looperoto_dress_filter'
+	end
 end
 
-if $ARGS[0] = 'eroto_dress': gt 'clothing', 'view_clothing_item', 'shop', 'eroto_dress',i, 1000
+if $ARGS[0] = 'eroto_dress': gt 'clothing', 'view_clothing_item', 'eroto_dress',i, 1000, 'shop'
 
 if $ARGS[0] = 'outfits':
 	$loc_arg = 'outfits'
@@ -687,12 +694,13 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Fetish outfits - for all your personal needs</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:looperoto_outfits_filter
 
 		if Clothingstock > 11:
 			i = 1
@@ -705,17 +713,23 @@ if $ARGS[0] = 'outfits':
 				gs 'clothing_attributes', 'eroto_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-					
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_outfits''"><img <<$set_imgh>> src="images/pc/items/eroto/outfits/<<i>>.jpg"	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_outfits''"><img <<$set_imgh>> src="images/pc/items/eroto/outfits/<<i>>.jpg"	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 100:jump 'looperoto_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'looperoto_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'looperoto_outfits_filter'
+	end
 end
 
-if $ARGS[0] = 'eroto_outfits': gt 'clothing', 'view_clothing_item', 'shop', 'eroto_outfits',i, 1000
+if $ARGS[0] = 'eroto_outfits': gt 'clothing', 'view_clothing_item', 'eroto_outfits',i, 1000, 'shop'
 
 if $ARGS[0] = 'strip':
 	$loc_arg = 'strip'
@@ -728,12 +742,14 @@ if $ARGS[0] = 'strip':
 	'<center><b><font color="maroon">eroto_strip clothing - for all your personal needs</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:looperoto_strip_filter
+
 		i = 1
 
 		:looperoto_strip
@@ -741,17 +757,23 @@ if $ARGS[0] = 'strip':
 				gs 'clothing_attributes', 'eroto_strip', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-					
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_strip''"><img <<$set_imgh>> src="images/pc/items/eroto/strip/<<i>>.jpg"	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_strip''"><img <<$set_imgh>> src="images/pc/items/eroto/strip/<<i>>.jpg"	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 30:jump 'looperoto_strip'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'looperoto_strip_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'looperoto_strip_filter'
+	end
 end
 
-if $ARGS[0] = 'eroto_strip': gt 'clothing', 'view_clothing_item', 'shop', 'eroto_strip',i, 1000
+if $ARGS[0] = 'eroto_strip': gt 'clothing', 'view_clothing_item', 'eroto_strip',i, 1000, 'shop'
 
 
 if $ARGS[0] = 'shoes':

locations/shop_allure.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimsuits - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -78,7 +78,7 @@ if $ARGS[0] = 'swim':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'allure_swimsuit',i, 1750
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'allure_swimsuit',i, 1750, 'shop'
 
 if $ARGS[0] = 'bikinis':
 	$loc_arg = 'bikinis'
@@ -88,7 +88,7 @@ if $ARGS[0] = 'bikinis':
 	'<center><b><font color="maroon">Bikinis - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -115,7 +115,7 @@ if $ARGS[0] = 'bikinis':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'shop', 'allure_bikinis',i, 1750
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'allure_bikinis',i, 1750, 'shop'
 
 --- shop_allure ---------------------------------
 

locations/shop_coco_carmen.qsrc

@@ -36,12 +36,14 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Viewing Coco Carmen dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
+	!!To filter just this set
+	clo_i = 0
+	:loopcoco_dress_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -53,14 +55,20 @@ if $ARGS[0] = 'dress':
 				gs 'clothing_attributes', 'coco_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_dress''"><img src="images/pc/items/coco/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_dress''"><img src="images/pc/items/coco/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 100:jump 'loopcoco_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopcoco_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopcoco_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'coco_dress':
@@ -71,7 +79,7 @@ if $ARGS[0] = 'coco_dress':
 		gt 'shop_coco_carmen', 'dress'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'coco_dress',i, 3000
+	gt 'clothing', 'view_clothing_item', 'coco_dress',i, 3000, 'shop'
 end
 
 if $ARGS[0] = 'outfits':
@@ -85,12 +93,14 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Viewing Coco Carmen outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_outfits
+	!!To filter just this set
+	clo_i = 0
+	:loopcoco_outfits_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -102,14 +112,20 @@ if $ARGS[0] = 'outfits':
 				gs 'clothing_attributes', 'coco_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_outfits''"><img src="images/pc/items/coco/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_outfits''"><img src="images/pc/items/coco/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 100:jump 'loopcoco_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopcoco_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopcoco_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'coco_outfits':
@@ -120,7 +136,7 @@ if $ARGS[0] = 'coco_outfits':
 		gt 'shop_coco_carmen', 'outfits'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'coco_outfits',i, 3000
+	gt 'clothing', 'view_clothing_item', 'coco_outfits',i, 3000, 'shop'
 
 end
 

locations/shop_dolls.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Viewing Patchwork Dolls dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -83,8 +83,10 @@ if $ARGS[0] = 'dress':
 		gt 'shop_dolls', 'browse'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
+	!!To filter just this set
+	clo_i = 0
+	:loopdolls_dress_filter
+
 		if Clothingstock > 15:
 			i = 1
 		elseif Clothingstock > 7:
@@ -98,14 +100,20 @@ if $ARGS[0] = 'dress':
 				gs 'clothing_attributes', 'dolls_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_dress''"><img src="images/pc/items/dolls/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_dress''"><img src="images/pc/items/dolls/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 110:jump 'loopdolls_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopdolls_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopdolls_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'dolls_dress':
@@ -116,7 +124,7 @@ if $ARGS[0] = 'dolls_dress':
 		gt 'shop_dolls', 'dress'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'dolls_dress',i, 3500
+	gt 'clothing', 'view_clothing_item', 'dolls_dress',i, 3500, 'shop'
 
 end
 
@@ -131,7 +139,7 @@ if $ARGS[0] = 'clothing':
 	'<center><b><font color="maroon">Viewing Patchwork Dolls clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -139,8 +147,10 @@ if $ARGS[0] = 'clothing':
 		gt 'shop_dolls', 'browse'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopdolls_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -152,14 +162,20 @@ if $ARGS[0] = 'clothing':
 				gs 'clothing_attributes', 'dolls_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_outfits''"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_outfits''"><img src="images/pc/items/dolls/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 50:jump 'loopdolls'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopdolls_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopdolls_filter'
+	end
 end
 
 if $ARGS[0] = 'dolls_outfits':
@@ -170,7 +186,7 @@ if $ARGS[0] = 'dolls_outfits':
 		gt 'shop_dolls', 'clothing'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'dolls_outfits',i, 3500
+	gt 'clothing', 'view_clothing_item', 'dolls_outfits',i, 3500, 'shop'
 
 end
 

locations/shop_fancy_pancy.qsrc

@@ -36,12 +36,14 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Fancy Pancy outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_fancy_pancy', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopfancy_burlesque_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -53,14 +55,20 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'fancy_burlesque', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fancy_pancy'', ''fancy_burlesque''"><img src="images/pc/items/fancy/burlesque/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fancy_pancy'', ''fancy_burlesque''"><img src="images/pc/items/fancy/burlesque/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 40:jump 'loopfancy_burlesque'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopfancy_burlesque_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopfancy_burlesque_filter'
+	end
 end
 
 if $ARGS[0] = 'fancy_burlesque':
@@ -71,7 +79,7 @@ if $ARGS[0] = 'fancy_burlesque':
 		gt 'shop_fancy_pancy', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'fancy_burlesque',i, 20000
+	gt 'clothing', 'view_clothing_item', 'fancy_burlesque',i, 20000, 'shop'
 
 end
 

locations/shop_fashionista.qsrc

@@ -126,41 +126,64 @@ if $ARGS[0] = 'dressingclothes':
 	$loc_arg = 'dressingclothes'
 	$loc = 'shop_fashionista'
 	!clorand = rand(1,ARRSIZE('fashionista'))
-	!gt 'clothing', 'view_clothing_item', 'shop', 'fashionista', clorand, 8000
+	!gt 'clothing', 'view_clothing_item', 'fashionista', clorand, 8000, 'shop'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
 	'<center><b><font color="maroon">Viewing shop_fashionista clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		minut += 1
 		gt 'shop_fashionista', 'changingroom'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		i = Clothingstock +1
-
-		if Clothingstock - 12 > 0:i -= 12
-		i += 1
-		i = i/2
+	!!To filter just this set
+	clo_i = 0
+	:loopfashionista_filter
+
+		if Clothingstock >= 18:
+			i = 1
+		elseif Clothingstock >= 12:
+			i = 2
+		elseif Clothingstock >= 6:
+			i = 3
+		else
+			i = 4
+		end
 
 		:loopfashionista2
 			if fashionista[i] = 0:
 				gs 'clothing_attributes', 'fashionista', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingshmotmag''"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>  '
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingclothes2''"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>  '
 				end
 			end
-			i += 12
+			i += 4
 		if i <= 200:jump 'loopfashionista2'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopfashionista_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopfashionista_filter'
+	end
+end
+
+if $ARGS[0] = 'dressingclothes2':
+	cla
+	
+	if fashionista[i] ! 0:
+		msg 'You already own these clothes.'
+		gt 'shop_fashionista', 'clothes'
+	end
+
+	gt 'clothing', 'view_clothing_item', 'fashionista',i, 8000, 'shop'
 end
 
 if $ARGS[0] = 'dressingoutfits':
@@ -168,37 +191,45 @@ if $ARGS[0] = 'dressingoutfits':
 	$loc_arg = 'dressingoutfits'
 	$loc = 'shop_fashionista'
 	!clorand = rand(1,ARRSIZE('fashionista'))
-	!gt 'clothing', 'view_clothing_item', 'shop', 'fashionista', clorand, 8000
+	!gt 'clothing', 'view_clothing_item', 'fashionista', clorand, 8000, 'shop'
 	menu_off = 1
 	*clr & cla
 	gs'stat'
 	'<center><b><font color="maroon">Viewing shop_fashionista clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		minut += 1
 		gt 'shop_fashionista', 'changingroom'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopfashionista_outfits_filter
 
-		:loopfashionistaoutfits
-			if fashionista[i] = 0:
-				gs 'clothing_attributes', 'fashionista', i
-				gs 'clothing_QV', 'shop_filter'
+	i = 1
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
+	:loopfashionista_outfits
+		if fashionista[i] = 0:
+			gs 'clothing_attributes', 'fashionista', i
+			gs 'clothing_QV', 'shop_filter'
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingoutfits2''"><img src="images/pc/items/fashionista/outfits/<<i>>.jpg" 	height="250" /></a>  '
-				end
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''dressingoutfits2''"><img src="images/pc/items/fashionista/outfits/<<i>>.jpg" 	height="250" /></a>  '
 			end
-			i += 1
-		if i <= 20:jump 'loopfashionistaoutfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+		end
+		i += 1
+	if i <= 20:jump 'loopfashionista_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopfashionista_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopfashionista_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'dressingoutfits2':
@@ -209,7 +240,7 @@ if $ARGS[0] = 'dressingoutfits2':
 		gt 'shop_fashionista', 'dressingclothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'fashionista_outifits',i, 8000
+	gt 'clothing', 'view_clothing_item', 'fashionista_outifits',i, 8000, 'shop'
 end
 
 if $ARGS[0] = 'dressingbra':
@@ -282,121 +313,10 @@ if $ARGS[0] = 'dressingpanties2':
 		gt 'shop_fashionista', 'dressingpanties'
 	end
 
-	gt 'panties', 'view_panty_item', 'shop', 'shop_fashionista',i, 750
-end
-
-
-!! Old code
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing shop_fashionista clothing</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-	
-	i = Clothingstock +1
-
-	if Clothingstock - 12 > 0:i -= 12
-	i += 1
-	i = i/2
-	
-	:loopfashionista
-		if fashionista[i] = 0:
-			gs 'clothing_attributes', 'fashionista', i
-			gs 'clothing_QV', 'shop_filter'
-				
-			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''shmotmag''"><img src="images/pc/items/fashionista/dress/<<i>>.jpg" 	height="250" /></a>'
-		end
-		i += 6
-	if i <= 200:jump 'loopfashionista'
-end
-
-if $ARGS[0] = 'shmotmag':
-	cla
-	
-	if fashionista[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_fashionista', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'fashionista',i, 8000
-end
-
-if $ARGS[0] = 'panties':
-	$loc_arg = 'panties'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-
-	i = 1
-
-	:loopfashionista_panties
-		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''panties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 79:jump 'loopfashionista_panties'
-end
-
-if $ARGS[0] = 'panties2':
-	cla
-	
-	if fashionista_panties[i] ! 0:
-		msg 'You already own these panties.'
-		gt 'shop_fashionista', 'panties'
-	end
-
 	gt 'panties', 'view_panty_item', 'shop', 'fashionista',i, 750
-
-end
-
-if $ARGS[0] = 'bras':
-	$loc_arg = 'bras'
-	$loc = 'shop_fashionista'
-	menu_off = 1
-	*clr & cla
-	gs'stat'
-
-	act 'Return':
-		cla
-		minut += 1
-		gt 'shop_fashionista', 'start'
-	end
-
-	i = 1
-
-	:loopfashionista_bras
-		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''bras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 42:jump 'loopfashionista_bras'
-end
-
-if $ARGS[0] = 'bras2':
-	cla
-	
-	if fashionista_bras[i] ! 0:
-		msg 'You already own this bra.'
-		gt 'shop_fashionista', 'bras'
-	end
-
-	gt 'bras', 'view_bra_item', 'shop', 'fashionista',i, 750
 end
 
+!!only items not in dressing room
 if $ARGS[0] = 'purses':
 	$loc_arg = 'purses'
 	$loc = 'shop_fashionista'

locations/shop_flamingos.qsrc

@@ -36,12 +36,14 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Flamingo''s dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_flamingos', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
+	!!To filter just this set
+	clo_i = 0
+	:loopflamingos_dress_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -53,14 +55,20 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'flamingos_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_dress''"><img src="images/pc/items/flamingos/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_dress''"><img src="images/pc/items/flamingos/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 90:jump 'loopflamingos_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopflamingos_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopflamingos_dress_filter'
+	end
 end
 
 if $ARGS[0] = 'flamingos_dress':
@@ -71,7 +79,7 @@ if $ARGS[0] = 'flamingos_dress':
 		gt 'shop_flamingos', 'dresses'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'flamingos_dress',i, 3000
+	gt 'clothing', 'view_clothing_item', 'flamingos_dress',i, 3000, 'shop'
 end
 
 if $ARGS[0] = 'clothes':
@@ -85,12 +93,14 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Flamingo''s outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_flamingos', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopflamingos_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -102,14 +112,20 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'flamingos_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_outfits''"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_flamingos'', ''flamingos_outfits''"><img src="images/pc/items/flamingos/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 50:jump 'loopflamingos'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopflamingos_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopflamingos_filter'
+	end
 end
 
 if $ARGS[0] = 'flamingos_outfits':
@@ -120,7 +136,7 @@ if $ARGS[0] = 'flamingos_outfits':
 		gt 'shop_flamingos', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'flamingos_outfits',i, 3000
+	gt 'clothing', 'view_clothing_item', 'flamingos_outfits',i, 3000, 'shop'
 
 end
 

locations/shop_materinstvo.qsrc

@@ -59,12 +59,14 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Mommy Style clothing</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_materinstvo', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopmaterinstvo_filter
+
 		i = 1
 
 		:loopmaterinstvo
@@ -72,17 +74,23 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'materinstvo_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_materinstvo'', ''materinstvo_dress''"><img src="images/pc/items/mommy/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_materinstvo'', ''materinstvo_dress''"><img src="images/pc/items/mommy/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 1
 		if i <= 10:jump 'loopmaterinstvo'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopmaterinstvo_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopmaterinstvo_filter'
+	end
 end
 
-if $ARGS[0] = 'materinstvo_dress': gt 'clothing', 'view_clothing_item', 'shop', 'materinstvo_dress',i, 2000
+if $ARGS[0] = 'materinstvo_dress': gt 'clothing', 'view_clothing_item', 'materinstvo_dress',i, 2000, 'shop'
 
 --- shop_materinstvo ---------------------------------
 

locations/shop_nerdvana.qsrc

@@ -38,12 +38,14 @@ if $ARGS[0] = 'cosplay':
 	'<center><b><font color="maroon">Viewing Nerdvana Cosplay Outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_cosplay
+	!!To filter just this set
+	clo_i = 0
+	:loopnerdvana_cosplay_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -55,14 +57,20 @@ if $ARGS[0] = 'cosplay':
 				gs 'clothing_attributes', 'nerdvana_cosplay', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_nerdvana'', ''nerdvana_cosplay''"><img src="images/pc/items/nerdvana/cosplay/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_nerdvana'', ''nerdvana_cosplay''"><img src="images/pc/items/nerdvana/cosplay/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 60:jump 'loopnerdvana_cosplay'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_cosplay'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopnerdvana_cosplay_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopnerdvana_cosplay_filter'
+	end
 end
 
 if $ARGS[0] = 'nerdvana_cosplay':
@@ -73,7 +81,7 @@ if $ARGS[0] = 'nerdvana_cosplay':
 		gt 'shop_nerdvana', 'cosplay'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'nerdvana_cosplay',i, 3000
+	gt 'clothing', 'view_clothing_item', 'nerdvana_cosplay',i, 3000, 'shop'
 end
 
 if $ARGS[0] = 'outfits':
@@ -87,12 +95,14 @@ if $ARGS[0] = 'outfits':
 	'<center><b><font color="maroon">Viewing Nerdvana outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_outfits
+	!!To filter just this set
+	clo_i = 0
+	:loopnerdvana_outfits_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -104,14 +114,20 @@ if $ARGS[0] = 'outfits':
 				gs 'clothing_attributes', 'nerdvana_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_nerdvana'', ''nerdvana_outfits''"><img src="images/pc/items/nerdvana/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_nerdvana'', ''nerdvana_outfits''"><img src="images/pc/items/nerdvana/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 60:jump 'loopnerdvana_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_outfits'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopnerdvana_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopnerdvana_outfits_filter'
+	end
 end
 
 if $ARGS[0] = 'nerdvana_outfits':
@@ -122,7 +138,7 @@ if $ARGS[0] = 'nerdvana_outfits':
 		gt 'shop_nerdvana', 'outfits'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'nerdvana_outfits',i, 3000
+	gt 'clothing', 'view_clothing_item', 'nerdvana_outfits',i, 3000, 'shop'
 
 end
 
@@ -134,7 +150,7 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimsuits - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
@@ -157,7 +173,7 @@ if $ARGS[0] = 'swim':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'nerdvana_swimsuit',i, 1750
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'nerdvana_swimsuit',i, 1750, 'shop'
 
 if $ARGS[0] = 'bikinis':
 	$loc_arg = 'bikinis'
@@ -167,7 +183,7 @@ if $ARGS[0] = 'bikinis':
 	'<center><b><font color="maroon">Bikinis - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_nerdvana', 'start'
 
@@ -190,7 +206,7 @@ if $ARGS[0] = 'bikinis':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality3'
 end
 
-if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'shop', 'nerdvana_bikinis',i, 1750
+if $ARGS[0] = 'bikini1': gt 'clothing', 'view_clothing_item', 'nerdvana_bikinis',i, 1750, 'shop'
 
 
 --- shop_nerdvana ---------------------------------

locations/shop_pussycats.qsrc

@@ -1042,7 +1042,7 @@ if $ARGS[0] = 'dress':
 	'<center><b><font color="maroon">Viewing Pussy Kats dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -1050,8 +1050,10 @@ if $ARGS[0] = 'dress':
 		gt 'shop_pussycats', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dress
+	!!To filter just this set
+	clo_i = 0
+	:loopcats_dress_filter
+
 		i = Clothingstock + 1
 
 		if Clothingstock > 15:
@@ -1067,17 +1069,23 @@ if $ARGS[0] = 'dress':
 				gs 'clothing_attributes', 'cats_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo_dress''"><img <<$set_imgh>> src="images/pc/items/cats/dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo_dress''"><img <<$set_imgh>> src="images/pc/items/cats/dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 110:jump 'loopcats_dress'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dress'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopcats_dress_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopcats_dress_filter'
+	end
 end
 
-if $ARGS[0] = 'yshopclo_dress': gt 'clothing', 'view_clothing_item', 'shop', 'cats_dress',i, 3000
+if $ARGS[0] = 'yshopclo_dress': gt 'clothing', 'view_clothing_item', 'cats_dress',i, 3000, 'shop'
 
 if $ARGS[0] = 'clothes':
 	$loc_arg = 'clothes'
@@ -1087,7 +1095,7 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Pussy Kats outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -1095,8 +1103,10 @@ if $ARGS[0] = 'clothes':
 		gt 'shop_pussycats', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopcats_outfits_filter
+
 		i = Clothingstock + 1
 
 		if Clothingstock > 15:
@@ -1112,17 +1122,23 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'cats_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo_outfit''"><img <<$set_imgh>> src="images/pc/items/cats/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''yshopclo_outfit''"><img <<$set_imgh>> src="images/pc/items/cats/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 100:jump 'loopcats_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopcats_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopcats_outfits_filter'
+	end
 end
 
-if $ARGS[0] = 'yshopclo_outfit': gt 'clothing', 'view_clothing_item', 'shop', 'cats_outfits',i, 3000
+if $ARGS[0] = 'yshopclo_outfit': gt 'clothing', 'view_clothing_item', 'cats_outfits',i, 3000, 'shop'
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = 'shoes'

locations/shop_skuas.qsrc

@@ -1,76 +0,0 @@
-# shop_skuas
-
-if $ARGS[0] = 'start':
-	$loc_arg = $ARGS[0]
-	$loc = 'shop_skuas'
-    $location_type = 'public_indoors'
-	$menu_loc = 'shop_skuas'
-	$menu_arg = 'start'
-	menu_off = 0
-	*clr & cla
-	mag = 1
-	gs 'stat'
-	gs 'themes', 'indoors'
-	'<center><b><font color="maroon">Skuas</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/boutique/butik.jpg"></center>'
-	*nl
-	'This exclusive boutique stands out amongst the rest of Pushkin''s small shops mostly just selling crap to tourists. It shows reverence the each outfit, displaying them with no petty concerns like fitting in more stock or speeding up the selling process. It is beautiful and every outfit is a labour of love. It''s going to cost you plenty to shop here.'
-
-	act 'Leave the boutique': minut += 3 & gt 'torgcentr'
-	
-	!!act 'View clothing': minut += 5 & gt 'shop_skuas', 'clothes'
-
-end
-
-if $ARGS[0] = 'clothes':
-	$loc_arg = 'clothes'
-	$loc = 'shop_skuas'
-	$menu_loc = 'shop_skuas'
-	$menu_arg = 'clothes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><b><font color="maroon">Viewing Skuas outfits</font></b></center>'
-	*nl
-
-	gs 'clothing_QV', 'shop_header'
-
-	act 'Return': minut += 1 & gt 'shop_skuas', 'start'
-
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
-		if Clothingstock > 11:
-			i = 1
-		else
-			i = 2
-		end
-
-		:loopskuas
-			if skuas[i] = 0:
-				gs 'clothing_attributes', 'skuas', i
-				gs 'clothing_QV', 'shop_filter'
-
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_skuas'', ''skuas''"><img src="images/pc/items/skuas/<<i>>.jpg" 	height="250" /></a>'
-				end
-			end
-			i += 2
-		if i <= 185:jump 'loopskuas'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
-end
-
-if $ARGS[0] = 'skuas':
-	cla
-	menu_off = 1
-	if skuas[i] ! 0:
-		msg 'You already own these clothes.'
-		gt 'shop_skuas', 'clothes'
-	end
-
-	gt 'clothing', 'view_clothing_item', 'shop', 'skuas',i, 20000
-
-end
-
---- shop_skuas ---------------------------------
-

locations/shop_tsar_bomba.qsrc

@@ -41,12 +41,14 @@ if $ARGS[0] = 'dresses':
 	'<center><b><font color="maroon">Viewing Tsar Bomba dresses</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_tsar_bomba', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality_dresses
+	!!To filter just this set
+	clo_i = 0
+	:loopbomba_dresses_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -58,14 +60,20 @@ if $ARGS[0] = 'dresses':
 				gs 'clothing_attributes', 'bomba_dress', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_dresses''"><img src="images/pc/items/bomba/goth_dress/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_dresses''"><img src="images/pc/items/bomba/goth_dress/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 70:jump 'loopbomba_dresses'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality_dresses'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopbomba_dresses_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopbomba_dresses_filter'
+	end
 end
 
 if $ARGS[0] = 'bomba_dresses':
@@ -76,7 +84,7 @@ if $ARGS[0] = 'bomba_dresses':
 		gt 'shop_tsar_bomba', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'bomba_dress',i, 3500
+	gt 'clothing', 'view_clothing_item', 'bomba_dress',i, 3500, 'shop'
 end
 
 if $ARGS[0] = 'clothes':
@@ -90,12 +98,14 @@ if $ARGS[0] = 'clothes':
 	'<center><b><font color="maroon">Viewing Tsar Bomba outfits</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'shop_tsar_bomba', 'start'
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality
+	!!To filter just this set
+	clo_i = 0
+	:loopbomba_filter
+
 		if Clothingstock > 11:
 			i = 1
 		else
@@ -107,14 +117,20 @@ if $ARGS[0] = 'clothes':
 				gs 'clothing_attributes', 'bomba_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
-				
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_outfits''"><img src="images/pc/items/bomba/goth_outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_outfits''"><img src="images/pc/items/bomba/goth_outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 2
 		if i <= 50:jump 'loopbomba'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopbomba_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopbomba_filter'
+	end
 end
 
 if $ARGS[0] = 'bomba_outfits':
@@ -125,7 +141,7 @@ if $ARGS[0] = 'bomba_outfits':
 		gt 'shop_tsar_bomba', 'clothes'
 	end
 
-	gt 'clothing', 'view_clothing_item', 'shop', 'bomba_outfits',i, 3500
+	gt 'clothing', 'view_clothing_item', 'bomba_outfits',i, 3500, 'shop'
 end
 
 if $ARGS[0] = 'purses':

locations/shortgs.qsrc

@@ -739,7 +739,7 @@ if $ARGS[0] = 'clothing_state':
 		'You are naked.'
 	elseif clothing = 'nude' and bra = 'none':
 		'You are just wearing panties.'
-	elseif clothing = 'nude' and `panties = 'none':
+	elseif clothing = 'nude' and panties = 'none':
 		'You are just wearing a bra.'
 	elseif clothing = 'nude':
 		'You are in your underwear.'

locations/shulgahall.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = '':
 	*nl
 	'The hallway of Uncle Sergey''s one bedroom apartment is similar to every other apartment in the complex. There are several doors leading to the various rooms. The bedroom is Uncle Sergey''s. There''s also the kitchen, bathroom, and finally the livingroom, which Vasily uses for a bedroom.'
 	if home_owned[2] = 0:
-		'There are several <a href="exec:gt ''wardrobe'', ''main''">closets</a> in the hall, which Sergey said you can use to store your clothes while you''re staying here</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
+		'There are several <a href="exec:gt ''wardrobe'', ''start''">closets</a> in the hall, which Sergey said you can use to store your clothes while you''re staying here</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
 	else
 		'There are several closets in the hall</a> and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
 	end

locations/sportShop.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'clo':
 	'<center><b><font color="maroon">Sportswear - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -103,8 +103,10 @@ if $ARGS[0] = 'clo':
 		gt 'sportshop', 'start'
 	end
 
-	clothingfilter['qualitycheck'] = 7
-	:loopquality2
+	!!To filter just this set
+	clo_i = 0
+	:loopdanilovich_outfits_filter
+
 		if Clothingstock > 16:
 			i = 1
 		elseif Clothingstock > 8:
@@ -117,18 +119,24 @@ if $ARGS[0] = 'clo':
 			if danilovich_outfits[i] = 0:
 				gs 'clothing_attributes', 'danilovich_outfits', i
 				gs 'clothing_QV', 'shop_filter'
-					
-				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sportshop'', ''danilovich''"><img src="images/pc/items/danilovich/outfits/<<i>>.jpg" 	height="250" /></a>'
+				!!sort by filter
+				if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
+					if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1: *p '<a href="exec: i = <<i>> & gt ''sportshop'', ''danilovich''"><img src="images/pc/items/danilovich/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
 		if i <= 160:jump 'loopdanilovich_outfits'
-	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopdanilovich_outfits_filter'
+	elseif clothingfilter['inhibition'] = 0 and clo_i <= 40:
+		jump 'loopdanilovich_outfits_filter'
+	end
 end
 
-if $ARGS[0] = 'danilovich': gt 'clothing', 'view_clothing_item', 'shop', 'danilovich_outfits',i, 2000
+if $ARGS[0] = 'danilovich': gt 'clothing', 'view_clothing_item', 'danilovich_outfits',i, 2000, 'shop'
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = 'shoes'
@@ -149,7 +157,7 @@ if $ARGS[0] = 'shoes':
 	if i <= 40:jump 'loopdanilovich_shoes'
 end
 
-if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'danilovich',i, 1500
+if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'danilovich',i, 1500, 'shop'
 
 if $ARGS[0] = 'swim':
 	$loc_arg = 'swim'
@@ -159,7 +167,7 @@ if $ARGS[0] = 'swim':
 	'<center><b><font color="maroon">Swimwear - one size fits all</font></b></center>'
 	*nl
 
-	gs 'clothing_QV', 'shop_header'
+	gs 'clothing_QV', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -187,7 +195,7 @@ if $ARGS[0] = 'swim':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end
 
-if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'shop', 'danilovich_swimsuit',i, 1750
+if $ARGS[0] = 'swim1': gt 'clothing', 'view_clothing_item', 'danilovich_swimsuit',i, 1750, 'shop'
 
 if $ARGS[0] = 'panties':
 	$loc_arg = 'panties'

locations/stwork.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	act 'Go to the staff bathroom':gt 'stwork', 'toilet'
-	act 'Change your clothes':gt 'wardrobe', 'main'
+	act 'Change your clothes':gt 'wardrobe', 'start'
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if money >= 100: act 'Have a snack (0:15) (100 <b>₽</b>)': money -= 100 & gs 'food', 'snack'
 	act 'Have a cup of water (0:05)':gs 'beverage', 'bev_wat'

locations/train.qsrc

@@ -87,7 +87,7 @@ end
 if $ARGS[0] = 'communal_centre':
 	minut += 15
 	$loc = 'city_train'
-	$loc_arg = 'inside'
+	$loc_arg = 'start'
 	$menu_loc = 'city_train'
 	$menu_arg = 'communal_centre'
 	menu_off = 0
@@ -238,7 +238,7 @@ end
 
 if $ARGS[0] = 'village_centre':
 	$loc = 'city_train'
-	$loc_arg = 'inside'
+	$loc_arg = 'start'
 	menu_off = 1
 	minut += 25
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
@@ -318,7 +318,7 @@ if $ARGS[0] = 'weed':
 	train_event = 1
 	menu_off = 1
 	$loc = 'city_train'
-	$loc_arg = 'inside'
+	$loc_arg = 'start'
 	*clr & cla
 	gs 'stat'
 	'<center><h4>Pavlovsk Station</h4></center>'

locations/wardrobe.qsrc

@@ -1,6 +1,7 @@
 # wardrobe
 
 if $ARGS[0] = 'start':
+	killvar 'clothingfilter'
 	'<center><font color="maroon">Please select an option</font></center>'
 	*nl
 	*nl
@@ -14,6 +15,13 @@ if $ARGS[0] = 'start':
 	*nl
 	*nl
 	'<center><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''"><img src="images/system/icons/clothing/organize.png"></a></center>'
+
+	if $pursepantytype ! '' or $pursebratype ! '':
+		'<center><b>You put the '+iif($pursepantytype ! '','panties','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','bra','')+' from your purse back in the wardrobe.</b></center><br>'
+		killvar '$pursepantytype' & killvar 'pursepantynumber'
+		killvar '$pursebratype' & killvar 'pursebranumber'
+	end
+
 end
 
 

qqsp.ini

@@ -1,30 +0,0 @@
-[mainWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\xff\xff\xff\xff\xff\xff\xff\xda\0\0\a\x80\0\0\x3\xe9\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x4\x5\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\a\x7f\0\0\x3\xe8)
-windowState=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\x2\0\0\a\x80\0\0\x3\xcf\xfc\x2\0\0\0\x1\xfc\0\0\0\x1a\0\0\x3\xcf\0\0\0\x8e\0\xff\xff\xff\xfc\x1\0\0\0\x2\xfc\0\0\0\0\0\0\a\x80\0\0\0_\0\xff\xff\xff\xfc\x2\0\0\0\x2\xfb\0\0\0\x1e\0_\0m\0\x61\0i\0n\0\x44\0\x65\0s\0\x63\0W\0i\0\x64\0g\0\x65\0t\x1\0\0\0\x1a\0\0\x1\xa8\0\0\0\x1a\0\xff\xff\xff\xfc\0\0\x1\xc7\0\0\x2\"\0\0\0o\0\xff\xff\xff\xfc\x1\0\0\0\x3\xfb\0\0\0\x1c\0_\0\x61\0\x63\0t\0i\0o\0n\0s\0W\0i\0\x64\0g\0\x65\0t\x1\0\0\0\0\0\0\a\x80\0\0\0_\0\xff\xff\xff\xfb\0\0\0\x1c\0_\0o\0\x62\0j\0\x65\0\x63\0t\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\x5S\0\0\0_\0\0\0_\0\xff\xff\xff\xfb\0\0\0\x1c\0_\0i\0m\0g\0V\0i\0\x65\0w\0W\0i\0\x64\0g\0\x65\0t\0\0\0\x5\x35\0\0\0}\0\0\0_\0\xff\xff\xff\xfb\0\0\0\x16\0_\0\x64\0\x65\0s\0\x63\0W\0i\0\x64\0g\0\x65\0t\0\0\0\x5\xb7\0\0\x1\xc9\0\0\0_\0\xff\xff\xff\0\0\0\x3\0\0\a\x80\0\0\0q\xfc\x2\0\0\0\x1\xfb\0\0\0\x18\0_\0i\0n\0p\0u\0t\0W\0i\0\x64\0g\0\x65\0t\0\0\0\x3\x95\0\0\0q\0\0\0q\0\xff\xff\xff\0\0\a\x80\0\0\0\0\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x1\0\0\0\x16\0m\0\x61\0i\0n\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
-isMaximized=true
-isFullScreen=false
-showCaptions=true
-
-[application]
-isShowPlainText=false
-lastPath=C:/Data/Tegneserier/Games/Girl Life/Cumputer Saves
-perGameConfig=true
-isUseFontSize=false
-fontSize=12
-isUseFont=false
-font=@Variant(\0\0\0@\0\0\0\f\0T\0\x61\0h\0o\0m\0\x61@(\0\0\0\0\0\0\xff\xff\xff\xff\0\x1\0\x32\x10)
-isUseBackColor=false
-isUseLinkColor=false
-isUseFontColor=false
-backColor=@Variant(\0\0\0\x43\x1\xff\xff\xe0\xe0\xe0\xe0\xe0\xe0\0\0)
-linkColor=@Variant(\0\0\0\x43\x1\xff\xff\0\0\0\0\xff\xff\0\0)
-fontColor=@Variant(\0\0\0\x43\x1\xff\xff\0\0\0\0\0\0\0\0)
-disableVideo=false
-videoFix=false
-lastGame=C:/Data/Tegneserier/Games/Girl Life/Repo/glife.qsp
-autostartLastGame=false
-volume=@Variant(\0\0\0\x87?\x80\0\0)
-isShowHotkeys=false
-isAllowHTML5Extras=true
-useCaseInsensitiveFilePath=true
-language=da_DK