Procházet zdrojové kódy

Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

Alaratt před 2 roky
rodič
revize
7630aa97f2
46 změnil soubory, kde provedl 544 přidání a 439 odebrání
  1. 1 0
      glife.qproj
  2. 1 2
      locations/FedorEv4.qsrc
  3. 3 8
      locations/HotelRoom.qsrc
  4. 1 2
      locations/LariskaHome.qsrc
  5. 1 3
      locations/MDressing.qsrc
  6. 2 1
      locations/albina_election_events.qsrc
  7. 3 3
      locations/alexandriaEv.qsrc
  8. 2 4
      locations/bedr.qsrc
  9. 1 2
      locations/bedr2x.qsrc
  10. 1 3
      locations/bedrPar.qsrc
  11. 0 1
      locations/bordel.qsrc
  12. 2 2
      locations/bras.qsrc
  13. 1 1
      locations/brothel.qsrc
  14. 1 1
      locations/changingroom.qsrc
  15. 1 3
      locations/city_sauna.qsrc
  16. 115 105
      locations/clothing.qsrc
  17. 68 216
      locations/clothing_QV.qsrc
  18. 2 2
      locations/coats.qsrc
  19. 1 3
      locations/dachain.qsrc
  20. 1 2
      locations/dom_gor.qsrc
  21. 1 2
      locations/dorm.qsrc
  22. 3 3
      locations/femcyc.qsrc
  23. 1 2
      locations/fit.qsrc
  24. 1 3
      locations/gdksport.qsrc
  25. 5 3
      locations/grades.qsrc
  26. 1 2
      locations/gschool_grounds.qsrc
  27. 1 2
      locations/gschool_lessons4.qsrc
  28. 1 1
      locations/lact_lib.qsrc
  29. 1 3
      locations/leonid.qsrc
  30. 1 3
      locations/mey_home.qsrc
  31. 1 3
      locations/nichBedroomServant.qsrc
  32. 2 2
      locations/panties.qsrc
  33. 2 0
      locations/pav_church.qsrc
  34. 7 1
      locations/pav_library.qsrc
  35. 251 0
      locations/pav_library_nerdstudy.qsrc
  36. 1 4
      locations/pav_shared_apt.qsrc
  37. 1 1
      locations/pav_train_market.qsrc
  38. 1 1
      locations/piercing_management.qsrc
  39. 2 2
      locations/purses.qsrc
  40. 1 1
      locations/sentence.qsrc
  41. 2 2
      locations/shoes.qsrc
  42. 1 3
      locations/shulgahall.qsrc
  43. 5 1
      locations/stat.qsrc
  44. 4 4
      locations/street_event.qsrc
  45. 1 3
      locations/stwork.qsrc
  46. 38 23
      locations/wardrobe.qsrc

+ 1 - 0
glife.qproj

@@ -691,6 +691,7 @@
 		<Location name="pav_commcenter"/>
 		<Location name="pav_commclubs"/>
 		<Location name="pav_library"/>
+		<Location name="pav_library_nerdstudy"/>
 		<Location name="gdksport"/>
 		<Location name="gdktoilet"/>
 		<Location name="gdktoilet_mens"/>

+ 1 - 2
locations/FedorEv4.qsrc

@@ -2517,7 +2517,6 @@ if $ARGS[0] = 'Hallway':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/hallway.jpg"></center>'
 	'This is the central hallway which connects the whole house. There is a <a href="exec:gt ''mirror'', ''start''">mirror</a>, a coat rack and multiple paintings on the walls.'
 	*nl
-	gs 'wardrobe', 'quickdress'
 
 	act'<b>Leave the house</b>':
 		if $clothingworntype = 'nude':
@@ -2568,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'', ''start''">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'', ''main''">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

+ 3 - 8
locations/HotelRoom.qsrc

@@ -18,10 +18,9 @@ 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'', ''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 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 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
-	gs 'wardrobe', 'quickdress'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0
@@ -55,10 +54,8 @@ 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'', ''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 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 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.', '.')
-	*nl
-	gs 'wardrobe', 'quickdress'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0
@@ -93,10 +90,8 @@ 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'', ''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 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 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.', '.')
-	*nl
-	gs 'wardrobe', 'quickdress'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0

+ 1 - 2
locations/LariskaHome.qsrc

@@ -510,13 +510,12 @@ 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'', ''start''">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'', ''main''">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
 		'Her bed sits directly on the floor, without space underneath.'
 	end
-	gs 'wardrobe', 'quickdress'
 	'<table><tr><td valign="top">Your <a href="exec:gt ''budilnik'', ''start''">phone alarm</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
 	if lariloc = 1:'<a href="exec:gt ''LariskaHome'', ''lariska_asleep_1''">Lariska</a> is sound asleep, curled up and wrapped in blankets.'

+ 1 - 3
locations/MDressing.qsrc

@@ -13,10 +13,8 @@ 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'', ''start''">wardrobes</a> (where you can choose outfits and organize your clothing).'
+'It contains several <a href="exec:gt ''wardrobe'', ''main''">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.'
-*nl
-gs 'wardrobe', 'quickdress'
 
 act 'Go to foyer': gt 'MHall', 'foyer'
 act 'Go to east wing hall': gt 'MHall', 'east'

+ 2 - 1
locations/albina_election_events.qsrc

@@ -2,8 +2,9 @@
 !!This is intended to happen during the election run, so should fire around the time that the "Vote Boris!" posters start appearing.
 !!Add trigger depending on whether or not Sveta gave a statement so Albina can talk about her choice later.
 
-AlbinaQW['RideDaystart'] = daystart + rand(2,5)
+
 if $ARGS[0] = 'start':
+	AlbinaQW['RideDaystart'] = daystart + rand(2,5)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
 	'A car suddenly pulls up next to you and a man wearing a nice suit and hat steps out and introduces himself. "Captain Chernov, State Security Service." he says and pulls out his badge. "Why are you here? What did I do? Am I under arrest?" you ask in panicked surprise. He ignores you and continues.' 

+ 3 - 3
locations/alexandriaEv.qsrc

@@ -462,7 +462,7 @@ if $ARGS[0] = 'kneel':
 	gs 'arousal', 'end'
 	if sound = 0:PLAY 'sound/sucking.mp3',20
 	gs 'stat'	
-	'<center><video autoplay loop src="images/city/ana/sex/bribex.mp4"></video></center>'
+	'<center><video autoplay loop src="images/characters/city/ana/sex/bribex.mp4"></video></center>'
 	
 	if pcs_throat = 0:
 	    'There is a pregnant silence, as you kneel and try to think what to do... until Mr.Kudashov, seeming tired of your indecision, sigh, and take out his <i>tool</i>... and you gasp... this guy is <i>big</i>, easily 25cm! and he doesn''t seemed in full swing!'
@@ -675,7 +675,7 @@ if $ARGS[0] = 'anachase2':
 	        gs 'fame', 'city', 'acting', 5
 	        AlexandriaMissionQW += 2 
 	        gs 'stat'
-            '<center><video autoplay loop src="images/city/ana/spellcraft.mp4"></video></center>'
+            '<center><video autoplay loop src="images/characters/city/ana/spellcraft.mp4"></video></center>'
 			'You look at Ana, then, slowly and deliberately, you invoke your magic through gestures, will, and words so she can see a true wizard in action. Around you, people look enthralled at your magical display their "Whoa!" filling your ears.'
 			'Finally, the spell is completed, and time seems to slow, as your brain capacity to process information is multiplied.'
 			'"EPP!!!" Ana, give a little yelp, surprise plastered all over her face, as you launch yourself after her. If she thinks that you are going to back off, she is going to be disappointed, and with the surprise on your side, you rush to grab the annoying nut.'
@@ -1161,7 +1161,7 @@ if $ARGS[0] = 'anachase6':
 		    gs 'sweat', 'add', 10
 	    end 
 	    gs 'stat'
-	    '<center><video autoplay loop src="images/city/ana/parkour.mp4"></video></center>'
+		'<center><video autoplay loop src="images/characters/city/ana/parkour.mp4"></video></center>'
 	    'You take some moments to stretch, and show off to a puzzled Ana, then... without hesitation, run towards a garbage container and using it as a trampoline, you jump towards her, grabbing the stairs'' railing and propelling behind a surprised Ana.'
         '"Sexy! <i>Eso mola</i>! But... two can play to that!"'
         'She then... give an inhuman-looking jump towards the opposite wall, latch at it like spider-man and continue with a series of acrobatics that put Ana two floors over you! There, she gives a bowing and begins to climb towards the rooftop.'

+ 2 - 4
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'', ''start''">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'', ''main''">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,11 +43,9 @@ 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'', ''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.'
+	'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.'
 end
 *nl
-gs 'wardrobe', 'quickdress' 
-*nl
 act 'The corridor':gt 'korr'
 
 if husbandrinkday = daystart:

+ 1 - 2
locations/bedr2x.qsrc

@@ -27,8 +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'', ''start''">wardrobe</a>.'
-gs 'wardrobe', 'quickdress'
+'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a>.'
 *nl
 'Against the wall is a table with a <a href="exec:gt ''mirror'',''start''">mirror</a> above it.'
 *nl

+ 1 - 3
locations/bedrPar.qsrc

@@ -79,12 +79,10 @@ 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'', ''start''">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'', ''main''">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
-		gs 'wardrobe', 'quickdress'
-		*nl
 		if ParrotQW['Owned2'] = 1:
 			'<a href="exec:gt ''popu'',''start2''"><<$ParrotQW[''Name2'']>></a> is sitting in his cage'
 			if daystart - ParrotQW['BuyDate'] <= 10: 

+ 0 - 1
locations/bordel.qsrc

@@ -101,7 +101,6 @@ if $ARGS[0] = 'dysh':
 	'The bathroom is well fitted and clean as customers can access it and hygiene is very important in a brothel.'
 	'Your room is so dedicated to its purpose that your clothes are stored in here.'
 	*nl
-	gs 'wardrobe', 'quickdress' 
 	
 	act 'Return to your room':gt 'bordel', 'brothel'
 

+ 2 - 2
locations/bras.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'view_bra_list':
 	end
 
 	if $ARGS[1] ! 'bathroom':
-		act 'Return': gt 'wardrobe', 'start'
+		act 'Return': gt 'wardrobe', 'main'
 	else
 		act 'Return': gt $loc, $loc_arg
 	end
@@ -196,7 +196,7 @@ if $ARGS[0] = 'view_bra_item':
 							gs 'bras', 'wear', $ARGS[2], ARGS[3]
 
 							if $ARGS[1] = 'wardrobe':
-								gt 'wardrobe', 'start'
+								gt 'wardrobe', 'main'
 							else
 								gt $loc, $loc_arg
 							end

+ 1 - 1
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', 'start'
+	act 'Change your clothes':gt 'wardrobe', 'main'
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if shampoo > 0:
 		act 'Have a shower':

+ 1 - 1
locations/changingroom.qsrc

@@ -89,7 +89,7 @@ if $ARGS[0] = 'view_swim_list':
 			gt $loc, $loc_arg
 		end
 	end
-	act 'Choose an outfit': gt 'wardrobe', 'start'
+	act 'Choose an outfit': gt 'wardrobe', 'main'
 end
 
 if $ARGS[0] = 'view_swim_item':

+ 1 - 3
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'', ''start''">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'', ''main''">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>.'
@@ -114,8 +114,6 @@ if $ARGS[0] = 'saunaroom':
 
 	'If you run out of personal hygeine or beauty products, you can ask for more at a cost.'
 	*nl
-	gs 'wardrobe', 'quickdress'
-	*nl
 	gs 'city_saunawhore','debtPay'
 	if workDolg > 0:'Your debt is <<workDolg>> <b>₽</b>'
 

+ 115 - 105
locations/clothing.qsrc

@@ -15,9 +15,9 @@ $clothing_list_line = {
 	if Enable_clothwidth > 0:
 		clothing_temp = Enable_clothwidth - 1
 	else
-		clothing_temp = 150 & !clothing widdefault to 150
+		clothing_temp = 100 & !clothing widdefault to 100
 	end
-	$RESULT +='<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>" width="<<clothing_temp>>"><p><<$ARGS[1]>> outfit</p></a></TD>'
+	$RESULT +='<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$clothing_image'', $ARGS[1], ARGS[2])>>" width="<<clothing_temp>>"></a></TD>'
 	killvar 'clothing_temp'
 	$swimwear_description = ''
 	gs 'clothing_attributes', $ARGS[1], ARGS[2]
@@ -38,7 +38,7 @@ $clothing_list_line = {
 		$RESULT += '<TD>A hessian sack the hunters gave you.</TD>'
 	elseif $swimwear_description = '':
 		gs 'clothing_descriptions'
-		$RESULT += '<TD><<FUNC(''$short_description'', $ARGS[1])>> <<ARGS[2]>><br/><br/><<$description>></TD>'
+		$RESULT += '<TD><<FUNC(''$short_description'', $ARGS[1])>> <<ARGS[2]>><BR/><<$description>></TD>'
 	else
 		$RESULT += '<TD>' + $swimwear_description + '</TD>'
 	end
@@ -55,32 +55,48 @@ $clothing_list_line = {
 		$RESULT += '<TD>No</TD>'
 	end
 
-	$RESULT += '<TD><a href="exec:gt ''clothing'', ''view_clothing_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a>'
+	if $ARGS[0] ! 'resize':
 
-	if $ARGS[0] ! 'sell' and $ARGS[0] ! 'resize':
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $ARGS[1] = 'gm_school' and ARGS[2] = 6:
-			$RESULT += ' <a href="exec:gs ''clothing'', ''wear'', ''<<$ARGS[1]>>'', <<ARGS[2]>> & gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Wear</a></TD>'
-		elseif $ARGS[2] ! 'danilovich_swimsuit' and $ARGS[2] ! 'scandalicious_bikinis' and $ARGS[2] ! 'scandalicious_swimsuit' and $ARGS[2] ! 'allure_bikinis' and $ARGS[2] ! 'allure_bikinis' and $ARGS[2] ! 'nerdvana_bikinis' and $ARGS[2] ! 'nerdvana_swimsuit' and dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') > 0:
-			if $ARGS[1] ! 'danilovich_outfits' and CloStyle ! 5 and (dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') < (pcs_hips - 8) or dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') > (pcs_hips + 8)) or (ARRPOS('$CloLosTyp', $ARGS[1]) ! -1 and ARRPOS('CloLosNum',ARGS[2]) ! -1):
-				$RESULT += '</TD>'
-			else
-				$RESULT += ' <a href="exec:gs ''clothing'', ''wear'', ''<<$ARGS[1]>>'', <<ARGS[2]>> & gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Wear</a></TD>'
-			end
+		if dyneval('RESULT = <<$ARGS[1]>>_s[<<ARGS[2]>>]') = 0:
+			$RESULT += '<TD><center><img src="images/system/icons/clothing/wardrobe.png"></center></TD>'
+		else
+			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''dest0'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/wardrobe_off.png"></a></center></TD>'
+		end
+		if dyneval('RESULT = <<$ARGS[1]>>_s[<<ARGS[2]>>]') = 1:
+			$RESULT += '<TD><center><img src="images/system/icons/clothing/storage.png"></center></TD>'
+		else
+			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''dest1'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/storage_off.png"></a></center></TD>'
+		end
+		if dyneval('RESULT = <<$ARGS[1]>>_s[<<ARGS[2]>>]') = 2:
+			$RESULT += '<TD><center><img src="images/system/icons/clothing/unwanted.png"></center></TD>'
+		else
+			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''dest2'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/unwanted_off.png"></a></center></TD>'
+		end
+		
+		if ($ARGS[1] ! 'gm_school' or ARGS[2] ! 6) and dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') <= 0 and pcs_sewng >= 60 and tkan > 0:
+			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''qrepair'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/repair.png"></a></center></TD>'
+		else
+			$RESULT += '<TD><center><img src="images/system/icons/clothing/repair_off.png"></center></TD>'
+		end
+		
+		if pcs_sewng >= 50 and money >= 500 and (dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') < pcs_hips - 8 or dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') > pcs_hips + 8):
+			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''qresize'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/resize.png"></a></center></TD>'
 		else
-			$RESULT += '</TD>'
+			$RESULT += '<TD><center><img src="images/system/icons/clothing/resize_off.png"></center></TD>'
 		end
 
-		$RESULT += '<TD>'
-		if cloc ! 1:$RESULT += ' <a href="exec:gt ''clothing'', ''dest1'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> ">Storage</a><BR>'
-		if cloc ! 0:$RESULT += ' <a href="exec:gt ''clothing'', ''dest0'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> ">Wardrobe</a><BR>'
-		if $ARGS[1] ! 'gm_school' or ARGS[2] ! 6:
-			if cloc ! 2:$RESULT += ' <a href="exec:gt ''clothing'', ''dest2'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> ">Unwanted</a>'
+	else
+		$RESULT += '<TD></TD><TD></TD><TD></TD><TD></TD>'
+		if pcs_sewng >= 50 and tkan > 0 and (dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') < pcs_hips - 8 or dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') > pcs_hips + 8):
+			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''tresize'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/resize.png"></a></center></TD>'
+		else
+			$RESULT += '<TD><center><img src="images/system/icons/clothing/resize_off.png"></center></TD>'
 		end
-		$RESULT += '</TD>'
+
 	end
 }
 
-!!cloc, 0 = wardrobe, 1 = storage, 2 = unwanted
+!!_s, 0 = wardrobe, 1 = storage, 2 = unwanted
 
 
 if $ARGS[0] = 'dest0':
@@ -101,13 +117,42 @@ if $ARGS[0] = 'dest2':
 	gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 end
 
+if $ARGS[0] = 'qresize':
+	*clr
+	tkan -= 1
+	minut += 30
+	dynamic '<<$ARGS[2]>>_b[<<ARGS[3]>>] = pcs_hips'
+	gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
+end
+
+if $ARGS[0] = 'qrepair':
+	*clr
+	if rand (1, 100) < 30:
+		tkan -= 1
+		minut += 30
+		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] += 30'
+	else
+		tkan += 3
+		minut += 30
+		dynamic $ARGS[2] + '[<<ARGS[3]>>] = 0'
+	end
+	gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
+end
+
+if $ARGS[0] = 'tresize':
+	*clr
+	minut += 5
+	money -= 500
+	dynamic '<<$ARGS[2]>>_b[<<ARGS[3]>>] = pcs_hips'
+	gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
+end
 
 if $ARGS[0] = 'view_clothing_list':
 	!! ARGS 0 - view_clothing_list
-	!! ARGS 1 - action type (wardrobe, sell, resize, store, unwanted)
-	!! ARGS 2 - Shop name (kats, moncheri, gm, fashionista, sexshop, exhibitshop, dolls, sports)
+	!! ARGS 1 - action type (wardrobe, resize)
+	!! ARGS 2 - Shop name (kats, moncheri, gm, etc)
 	
-	if $pursepantytype ! '' or $pursebratype ! '' and $ARGS[1] ! 'resize' and $ARGS[1] ! 'sell':
+	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'
@@ -116,15 +161,9 @@ if $ARGS[0] = 'view_clothing_list':
 	if $ARGS[1] = 'wardrobe':
 		$ward_list_page = $ARGS[1]
 		'<h3><center><b><font color="maroon">Wardrobe list</font></b></center></h3>'
-	elseif $ARGS[1] = 'store':
-		$ward_list_page = $ARGS[1]
-		'<h3><center><b><font color="maroon">Stored clothing list</font></b></center></h3>'
-	elseif $ARGS[1] = 'unwanted':
-		$ward_list_page = $ARGS[1]
-		'<h3><center><b><font color="maroon">Unwanted clothing list</font></b></center></h3>'
-	elseif $ARGS[1] = 'sell':
+	elseif $ARGS[1] = 'resize':
 		$ward_list_page = $ARGS[1]
-		'<h3><center><b><font color="maroon">Choose an item to sell</font></b></center></h3>'
+		'<h3><center><b><font color="maroon">Choose item/s to resize</font></b></center></h3>'
 	end
 
 	if $ARGS[2] = 'gm' or $ARGS[2] = 'gm_outfits' or $ARGS[2] = 'gm_dress' or $ARGS[2] = 'gm_office' or $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_maid' or $ARGS[2] = 'gm_server':
@@ -168,8 +207,8 @@ if $ARGS[0] = 'view_clothing_list':
 		'<center><b><font color="maroon">Click on a shop name to view clothes from that shop</font></b></center>'
 
 		if $wloc = 'wardrobe':
-			act 'Return': killvar '$ward_list_store' & gt 'wardrobe', 'start'
-		elseif $ARGS[1] = 'sell' or $ARGS[1] = 'resize':
+			act 'Return': killvar '$ward_list_store' & gt 'wardrobe', 'main'
+		elseif $ARGS[1] = 'resize':
 			act 'Leave': killvar '$ward_list_store' & gt $loc, $loc_arg
 		else
 			act 'Leave': killvar '$ward_list_store' & gt $loc, $loc_arg			
@@ -177,23 +216,6 @@ if $ARGS[0] = 'view_clothing_list':
 	end
 	*nl
 
-	if $ARGS[1] ! 'sell':
-		$clothing_header = '<center><table border=1>'
-		if $ARGS[1] ! 'wardrobe': $clothing_header += '<TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH>'
-		$clothing_header += '<TH><a href="exec:gt ''clothing_QV'', ''list'', ''<<$ward_list_store>>''">Switch to icons</a></TH>'
-		if $ARGS[1] ! 'store': $clothing_header += '<TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH>'
-		if $ARGS[1] ! 'unwanted': $clothing_header += '<TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></center>'
-
-		$clothing_header
-		if $ARGS[1] = 'wardrobe':
-			'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		elseif $ARGS[1] = 'store':
-			'<center>These are the clothes you have stored that do not show up in your wardrobe list and cannot be sold at the market.</center><br>'
-		elseif $ARGS[1] = 'unwanted':
-			'<center>These are the clothes you''ve marked to be sold at the market.</center><br>'
-		end
-	end
-
 	if $ARGS[2] = '':
 		if ARRSIZE('gm_outfits') > 0 or ARRSIZE('gm_dress') > 0:'<center><a href="exec:$ward_list_store = ''gm'' & gt ''clothing'', ''view_clothing_list'', ''<<$ARGS[1]>>'', ''gm''"><img src="images/locations/city/citycenter/mall/gm.png"></a></center>'
 
@@ -245,32 +267,20 @@ if $ARGS[0] = 'view_clothing_list':
 
 		$bgcolor='#f3f4ee'
 
-		if $ARGS[1] = 'sell':
-			'<table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Strength</TH><TH>Hip size</TH><TH>Description</TH><TH>Bimbo</TH><TH>Prostitute</TH><TH>Actions</TH>'
-		else
-			'<table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Strength</TH><TH>Hip size</TH><TH>Description</TH><TH>Bimbo</TH><TH>Prostitute</TH><TH>Actions</TH><TH>Move to</TH>'
-		end
-
-		if $ARGS[1] = 'store':
-			cloc = 1
-		elseif $ARGS[1] = 'unwanted':
-			cloc = 2
-		else
-			cloc = 0
-		end
+		'<table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Strength</TH><TH>Hip size</TH><TH>Description</TH><TH>Bimbo</TH><TH>Prostitute</TH><TH></TH><TH>Storage</TH><TH></TH><TH>Attempt Repair (0:30)</TH><TH>Resize(0:30)</TH>'
 
 		if $ARGS[2] = 'gm':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopgm_outfits
-				if gm_outfits[i] = 1 and gm_outfits_s[i] = cloc and ($clothingworntype ! 'gm_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_outfits', i)
+				if gm_outfits[i] = 1 and ($clothingworntype ! 'gm_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_outfits', i)
 				i += 1
 			if i <= ARRSIZE('gm_outfits'):jump 'loopgm_outfits'
 
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopgm_dress
-				if gm_dress[i] = 1 and gm_dress_s[i] = cloc and ($clothingworntype ! 'gm_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_dress', i)
+				if gm_dress[i] = 1 and ($clothingworntype ! 'gm_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_dress', i)
 				i += 1
 			if i <= ARRSIZE('gm_dress'):jump 'loopgm_dress'
 
@@ -282,7 +292,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopoffice
-				if gm_office[i] = 1 and gm_office_s[i] = cloc and ($clothingworntype ! 'gm_office' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_office', i)
+				if gm_office[i] = 1 and ($clothingworntype ! 'gm_office' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_office', i)
 				i += 1
 			if i <= ARRSIZE('gm_office'):jump 'loopoffice'
 
@@ -297,7 +307,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 			i = 1
 			:loopschool
-				if gm_school[i] = 1 and gm_school_s[i] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_school', i)
+				if gm_school[i] = 1 and ($clothingworntype ! 'gm_school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_school', i)
 				i += 1
 				if i = 6: i = 7
 			if i <= ARRSIZE('gm_school'):jump 'loopschool'
@@ -310,7 +320,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopgm_maid
-				if gm_maid[i] = 1 and gm_maid_s[i] = cloc and ($clothingworntype ! 'gm_maid' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_maid', i)
+				if gm_maid[i] = 1 and ($clothingworntype ! 'gm_maid' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_maid', i)
 				i += 1
 			if i <= ARRSIZE('gm_maid'):jump 'loopgm_maid'
 
@@ -322,7 +332,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopgm_server
-				if gm_server[i] = 1 and gm_server_s[i] = cloc and ($clothingworntype ! 'gm_server' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_server', i)
+				if gm_server[i] = 1 and ($clothingworntype ! 'gm_server' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'gm_server', i)
 				i += 1
 			if i <= ARRSIZE('gm_server'):jump 'loopgm_server'
 
@@ -334,7 +344,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopmisc_outfits
-				if misc_outfits[i] = 1 and misc_outfits_s[i] = cloc and ($clothingworntype ! 'misc_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'misc_outfits', i)
+				if misc_outfits[i] = 1 and ($clothingworntype ! 'misc_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'misc_outfits', i)
 				i += 1
 			if i <= ARRSIZE('misc_outfits'):jump 'loopmisc_outfits'
 
@@ -346,13 +356,13 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopcats_dress
-				if cats_dress[i] = 1 and cats_dress_s[i] = cloc and ($clothingworntype ! 'cats_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'cats_dress', i)
+				if cats_dress[i] = 1 and ($clothingworntype ! 'cats_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'cats_dress', i)
 				i += 1
 			if i <= ARRSIZE('cats_dress'):jump 'loopcats_dress'
 
 			i = 1
 			:loopcats_outfits
-				if cats_outfits[i] = 1 and cats_outfits_s[i] = cloc and ($clothingworntype ! 'cats_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'cats_outfits', i)
+				if cats_outfits[i] = 1 and ($clothingworntype ! 'cats_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'cats_outfits', i)
 				i += 1
 			if i <= ARRSIZE('cats_outfits'):jump 'loopcats_outfits'
 
@@ -364,13 +374,13 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopflamingos_dress
-				if flamingos_dress[i] = 1 and flamingos_dress_s[i] = cloc and ($clothingworntype ! 'flamingos_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'flamingos_dress', i)
+				if flamingos_dress[i] = 1 and ($clothingworntype ! 'flamingos_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'flamingos_dress', i)
 				i += 1
 			if i <= ARRSIZE('flamingos_dress'):jump 'loopflamingos_dress'
 
 			i = 1
 			:loopflamingos_outfits
-				if flamingos_outfits[i] = 1 and flamingos_outfits_s[i] = cloc and ($clothingworntype ! 'flamingos_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'flamingos_outfits', i)
+				if flamingos_outfits[i] = 1 and ($clothingworntype ! 'flamingos_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'flamingos_outfits', i)
 				i += 1
 			if i <= ARRSIZE('flamingos_outfits'):jump 'loopflamingos_outfits'
 
@@ -382,13 +392,13 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopcoco_dress
-				if coco_dress[i] = 1 and coco_dress_s[i] = cloc and ($clothingworntype ! 'coco_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'coco_dress', i)
+				if coco_dress[i] = 1 and ($clothingworntype ! 'coco_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'coco_dress', i)
 				i += 1
 			if i <= ARRSIZE('coco_dress'):jump 'loopcoco_dress'
 
 			i = 1
 			:loopcoco_outfits
-				if coco_outfits[i] = 1 and coco_outfits_s[i] = cloc and ($clothingworntype ! 'coco_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'coco_outfits', i)
+				if coco_outfits[i] = 1 and ($clothingworntype ! 'coco_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'coco_outfits', i)
 				i += 1
 			if i <= ARRSIZE('coco_outfits'):jump 'loopcoco_outfits'
 
@@ -400,7 +410,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopfashionista
-				if fashionista[i] = 1 and fashionista_s[i] = cloc and ($clothingworntype ! 'fashionista' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fashionista', i)
+				if fashionista[i] = 1 and ($clothingworntype ! 'fashionista' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fashionista', i)
 				i += 1
 			if i <= ARRSIZE('fashionista'):jump 'loopfashionista'
 
@@ -409,7 +419,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 			i = 1
 			:loopfashionista_outfits
-				if fashionista_outfits[i] = 1 and fashionista_outfits_s[i] = cloc and ($clothingworntype ! 'fashionista_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fashionista_outfits', i)
+				if fashionista_outfits[i] = 1 and ($clothingworntype ! 'fashionista_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fashionista_outfits', i)
 				i += 1
 			if i <= ARRSIZE('fashionista_outfits'):jump 'loopfashionista_outfits'
 
@@ -421,13 +431,13 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopmoncheri_dress
-				if moncheri_dress[i] = 1 and moncheri_dress_s[i] = cloc and ($clothingworntype ! 'moncheri_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'moncheri_dress', i)
+				if moncheri_dress[i] = 1 and ($clothingworntype ! 'moncheri_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'moncheri_dress', i)
 				i += 1
 			if i <= ARRSIZE('moncheri_dress'):jump 'loopmoncheri_dress'
 
 			i = 1
 			:loopmoncheri_gown
-				if moncheri_gown[i] = 1 and moncheri_gown_s[i] = cloc and ($clothingworntype ! 'moncheri_gown' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'moncheri_gown', i)
+				if moncheri_gown[i] = 1 and ($clothingworntype ! 'moncheri_gown' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'moncheri_gown', i)
 				i += 1
 			if i <= ARRSIZE('moncheri_gown'):jump 'loopmoncheri_gown'
 
@@ -439,13 +449,13 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopscandalicious_dress
-				if scandalicious_dress[i] = 1 and scandalicious_dress_s[i] = cloc and ($clothingworntype ! 'scandalicious_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'scandalicious_dress', i)
+				if scandalicious_dress[i] = 1 and ($clothingworntype ! 'scandalicious_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'scandalicious_dress', i)
 				i += 1
 			if i <= ARRSIZE('scandalicious_dress'):jump 'loopscandalicious_dress'
 
 			i = 1
 			:loopscandalicious_outfits
-				if scandalicious_outfits[i] = 1 and scandalicious_outfits_s[i] = cloc and ($clothingworntype ! 'scandalicious_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'scandalicious_outfits', i)
+				if scandalicious_outfits[i] = 1 and ($clothingworntype ! 'scandalicious_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'scandalicious_outfits', i)
 				i += 1
 			if i <= ARRSIZE('scandalicious_outfits'):jump 'loopscandalicious_outfits'
 
@@ -457,14 +467,14 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopscandalicious_bikinis
-				if scandalicious_bikinis[i] = 1 and scandalicious_bikinis_s[i] = cloc and ($clothingworntype ! 'scandalicious_bikinis' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'scandalicious_bikinis', i)
+				if scandalicious_bikinis[i] = 1 and ($clothingworntype ! 'scandalicious_bikinis' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'scandalicious_bikinis', i)
 				i += 1
 			if i <= ARRSIZE('scandalicious_bikinis'):jump 'loopscandalicious_bikinis'
 
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopscandalicious_swimsuit
-				if scandalicious_swimsuit[i] = 1 and scandalicious_swimsuit_s[i] = cloc and ($clothingworntype ! 'scandalicious_swimsuit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'scandalicious_swimsuit', i)
+				if scandalicious_swimsuit[i] = 1 and ($clothingworntype ! 'scandalicious_swimsuit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'scandalicious_swimsuit', i)
 				i += 1
 			if i <= ARRSIZE('scandalicious_swimsuit'):jump 'loopscandalicious_swimsuit'
 
@@ -476,14 +486,14 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopallure_bikinis
-				if allure_bikinis[i] = 1 and allure_bikinis_s[i] = cloc and ($clothingworntype ! 'allure_bikinis' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'allure_bikinis', i)
+				if allure_bikinis[i] = 1 and ($clothingworntype ! 'allure_bikinis' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'allure_bikinis', i)
 				i += 1
 			if i <= ARRSIZE('allure_bikinis'):jump 'loopallure_bikinis'
 
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopallure_swimsuit
-				if allure_swimsuit[i] = 1 and allure_swimsuit_s[i] = cloc and ($clothingworntype ! 'allure_swimsuit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'allure_swimsuit', i)
+				if allure_swimsuit[i] = 1 and ($clothingworntype ! 'allure_swimsuit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'allure_swimsuit', i)
 				i += 1
 			if i <= ARRSIZE('allure_swimsuit'):jump 'loopallure_swimsuit'
 
@@ -495,21 +505,21 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:looperoto_dress
-				if eroto_dress[i] = 1 and eroto_dress_s[i] = cloc and ($clothingworntype ! 'eroto_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'eroto_dress', i)
+				if eroto_dress[i] = 1 and ($clothingworntype ! 'eroto_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'eroto_dress', i)
 				i += 1
 			if i <= ARRSIZE('eroto_dress'):jump 'looperoto_dress'
 
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:looperoto_outfits
-				if eroto_outfits[i] = 1 and eroto_outfits_s[i] = cloc and ($clothingworntype ! 'eroto_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'eroto_outfits', i)
+				if eroto_outfits[i] = 1 and ($clothingworntype ! 'eroto_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'eroto_outfits', i)
 				i += 1
 			if i <= ARRSIZE('eroto_outfits'):jump 'looperoto_outfits'
 
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:looperoto_strip
-				if eroto_strip[i] = 1 and eroto_strip_s[i] = cloc and ($clothingworntype ! 'eroto_strip' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'eroto_strip', i)
+				if eroto_strip[i] = 1 and ($clothingworntype ! 'eroto_strip' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'eroto_strip', i)
 				i += 1
 			if i <= ARRSIZE('eroto_strip'):jump 'looperoto_strip'
 
@@ -521,14 +531,14 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopsalacious_dress
-				if salacious_dress[i] = 1 and salacious_dress_s[i] = cloc and ($clothingworntype ! 'salacious_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'salacious_dress', i)
+				if salacious_dress[i] = 1 and ($clothingworntype ! 'salacious_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'salacious_dress', i)
 				i += 1
 			if i <= ARRSIZE('salacious_dress'):jump 'loopsalacious_dress'
 
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopsalacious_outfits
-				if salacious_outfits[i] = 1 and salacious_outfits_s[i] = cloc and ($clothingworntype ! 'salacious_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'salacious_outfits', i)
+				if salacious_outfits[i] = 1 and ($clothingworntype ! 'salacious_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'salacious_outfits', i)
 				i += 1
 			if i <= ARRSIZE('salacious_outfits'):jump 'loopsalacious_outfits'
 
@@ -540,7 +550,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopfancy_burlesque
-				if fancy_burlesque[i] = 1 and fancy_burlesque_s[i] = cloc and ($clothingworntype ! 'fancy_burlesque' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fancy_burlesque', i)
+				if fancy_burlesque[i] = 1 and ($clothingworntype ! 'fancy_burlesque' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fancy_burlesque', i)
 				i += 1
 			if i <= ARRSIZE('fancy_burlesque'):jump 'loopfancy_burlesque'
 
@@ -553,14 +563,14 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopdolls_outfits
-				if dolls_outfits[i] = 1 and dolls_outfits_s[i] = cloc and ($clothingworntype ! 'dolls_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'dolls_outfits', i)
+				if dolls_outfits[i] = 1 and ($clothingworntype ! 'dolls_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'dolls_outfits', i)
 				i += 1
 			if i <= ARRSIZE('dolls_outfits'):jump 'loopdolls_outfits'
 
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopdolls_dress
-				if dolls_dress[i] = 1 and dolls_dress_s[i] = cloc and ($clothingworntype ! 'dolls_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'dolls_dress', i)
+				if dolls_dress[i] = 1 and ($clothingworntype ! 'dolls_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'dolls_dress', i)
 				i += 1
 			if i <= ARRSIZE('dolls_dress'):jump 'loopdolls_dress'
 
@@ -573,13 +583,13 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopbomba_outfits
-				if bomba_outfits[i] = 1 and bomba_outfits_s[i] = cloc and ($clothingworntype ! 'bomba_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'bomba_outfits', i)
+				if bomba_outfits[i] = 1 and ($clothingworntype ! 'bomba_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'bomba_outfits', i)
 				i += 1
 			if i <= ARRSIZE('bomba_outfits'):jump 'loopbomba_outfits'
 
 			i = 1
 			:loopbomba_dress
-				if bomba_dress[i] = 1 and bomba_dress_s[i] = cloc and ($clothingworntype ! 'bomba_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'bomba_dress', i)
+				if bomba_dress[i] = 1 and ($clothingworntype ! 'bomba_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'bomba_dress', i)
 				i += 1
 			if i <= ARRSIZE('bomba_dress'):jump 'loopbomba_dress'
 
@@ -592,13 +602,13 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopnerdvana_outfits
-				if nerdvana_outfits[i] = 1 and nerdvana_outfits_s[i] = cloc and ($clothingworntype ! 'nerdvana_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'nerdvana_outfits', i)
+				if nerdvana_outfits[i] = 1 and ($clothingworntype ! 'nerdvana_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'nerdvana_outfits', i)
 				i += 1
 			if i <= ARRSIZE('nerdvana_outfits'):jump 'loopnerdvana_outfits'
 
 			i = 1
 			:loopnerdvana_cosplay
-				if nerdvana_cosplay[i] = 1 and nerdvana_cosplay_s[i] = cloc and ($clothingworntype ! 'nerdvana_cosplay' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'nerdvana_cosplay', i)
+				if nerdvana_cosplay[i] = 1 and ($clothingworntype ! 'nerdvana_cosplay' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'nerdvana_cosplay', i)
 				i += 1
 			if i <= ARRSIZE('nerdvana_cosplay'):jump 'loopnerdvana_cosplay'
 
@@ -607,14 +617,14 @@ if $ARGS[0] = 'view_clothing_list':
 
 			i = 1
 			:loopnerdvana_bikinis
-				if nerdvana_bikinis[i] = 1 and nerdvana_bikinis_s[i] = cloc and ($clothingworntype ! 'nerdvana_bikinis' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'nerdvana_bikinis', i)
+				if nerdvana_bikinis[i] = 1 and ($clothingworntype ! 'nerdvana_bikinis' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'nerdvana_bikinis', i)
 				i += 1
 			if i <= ARRSIZE('nerdvana_bikinis'):jump 'loopnerdvana_bikinis'
 
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopnerdvana_swimsuit
-				if nerdvana_swimsuit[i] = 1 and nerdvana_swimsuit_s[i] = cloc and ($clothingworntype ! 'nerdvana_swimsuit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'nerdvana_swimsuit', i)
+				if nerdvana_swimsuit[i] = 1 and ($clothingworntype ! 'nerdvana_swimsuit' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'nerdvana_swimsuit', i)
 				i += 1
 			if i <= ARRSIZE('nerdvana_swimsuit'):jump 'loopnerdvana_swimsuit'
 
@@ -626,13 +636,13 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopdanilovich_outfits
-				if danilovich_outfits[i] = 1 and danilovich_outfits_s[i] = cloc and ($clothingworntype ! 'danilovich_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'danilovich_outfits', i)
+				if danilovich_outfits[i] = 1 and ($clothingworntype ! 'danilovich_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'danilovich_outfits', i)
 				i += 1
 			if i <= ARRSIZE('danilovich_outfits'):jump 'loopdanilovich_outfits'
 
 			i = 1
 			:loopdanilovich_swimsuit
-				if danilovich_swimsuit[i] = 1 and danilovich_swimsuit_s[i] = cloc :*P dyneval($clothing_list_line, $ARGS[1], 'danilovich_swimsuit', i)
+				if danilovich_swimsuit[i] = 1:*P dyneval($clothing_list_line, $ARGS[1], 'danilovich_swimsuit', i)
 				i += 1
 			if i <= ARRSIZE('danilovich_swimsuit'):jump 'loopdanilovich_swimsuit'
 
@@ -644,7 +654,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopmarket_outfits
-				if market_outfits[i] = 1 and market_outfits_s[i] = cloc and ($clothingworntype ! 'market_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'market_outfits', i)
+				if market_outfits[i] = 1 and ($clothingworntype ! 'market_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'market_outfits', i)
 				i += 1
 			if i <= ARRSIZE('market_outfits'):jump 'loopmarket_outfits'
 
@@ -656,7 +666,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopmaterinstvo_dress
-				if materinstvo_dress[i] = 1 and materinstvo_dress_s[i] = cloc and ($clothingworntype ! 'materinstvo_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'materinstvo_dress', i)
+				if materinstvo_dress[i] = 1 and ($clothingworntype ! 'materinstvo_dress' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'materinstvo_dress', i)
 				i += 1
 			if i <= ARRSIZE('materinstvo_dress'):jump 'loopmaterinstvo_dress'
 

+ 68 - 216
locations/clothing_QV.qsrc

@@ -4,10 +4,10 @@ menu_off = 1
 
 if $ARGS[0] = 'list':
 	'<h3><center><b><font color="maroon">Wardrobe - Brand Selection</font></b></center></h3>'
-	'<center><b><font color="maroon">click on a shop name to view clothes from that shop</font></b></center>'
+	'<center><b><font color="maroon">Choose to view all or select by shop</font></b></center>'
 	$regularwornclothingtype = ''
 	*nl
-	'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
+	'<center><table border=1><TH><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''all''">View all outfits</a></TH></table></center>'
 	*nl
 	! '<center>These are the clothes that are currently available for you to wear.</center><br>'
 	! *nl
@@ -21,61 +21,55 @@ if $ARGS[0] = 'list':
 	else
 		act 'Return':
 			killvar '$ward_list_store'
-			gt 'wardrobe', 'start'
+			gt 'wardrobe', 'main'
 		end
 	end
 
-	if ARRSIZE('gm_outfits') > 0 or ARRSIZE('gm_dress'):'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm''"><img src="images/locations/city/citycenter/mall/gm.png"></a></center>'
+	if ARRSIZE('gm_outfits') > 0 or ARRSIZE('gm_dress'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm''"><img src="images/locations/city/citycenter/mall/gm.png"></a></center>'
 
-	if ARRSIZE('gm_school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_school''"><img src="images/pc/items/gm/school.png"></a></center>'
+	if ARRSIZE('gm_school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_school''"><img src="images/pc/items/gm/school.png"></a></center>'
  
-	if ARRSIZE('gm_office'):'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_office''"><img src="images/pc/items/gm/officewear.png"></a></center>'
+	if ARRSIZE('gm_office'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_office''"><img src="images/pc/items/gm/officewear.png"></a></center>'
 
-	if ARRSIZE('gm_maid'):'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_maid''"><img src="images/pc/items/gm/maid.png"></a></center>'
+	if ARRSIZE('gm_maid'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_maid''"><img src="images/pc/items/gm/maid.png"></a></center>'
 
-	if ARRSIZE('gm_server'):'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_server''"><img src="images/pc/items/gm/server.png"></a></center>'
+	if ARRSIZE('gm_server'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_server''"><img src="images/pc/items/gm/server.png"></a></center>'
 
-	if ARRSIZE('cats_outfits') > 0 or ARRSIZE('cats_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
+	if ARRSIZE('cats_outfits') > 0 or ARRSIZE('cats_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
 
-	if ARRSIZE('flamingos_outfits') > 0 or ARRSIZE('flamingos_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''flamingos''"><img src="images/locations/city/island/flamingos/shop_name.png"></a></center>'
+	if ARRSIZE('flamingos_outfits') > 0 or ARRSIZE('flamingos_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''flamingos''"><img src="images/locations/city/island/flamingos/shop_name.png"></a></center>'
 
-	if ARRSIZE('coco_outfits') > 0 or ARRSIZE('coco_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''coco''"><img src="images/locations/pavlovsk/coco/shop_name.png"></a></center>'
+	if ARRSIZE('coco_outfits') > 0 or ARRSIZE('coco_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''coco''"><img src="images/locations/pavlovsk/coco/shop_name.png"></a></center>'
 
-	if ARRSIZE('fashionista') > 0 or ARRSIZE('fashionista_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''fashionista''"><img src="images/locations/city/citycenter/mall/fashionista.png"></a></center>'
+	if ARRSIZE('fashionista') > 0 or ARRSIZE('fashionista_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''fashionista''"><img src="images/locations/city/citycenter/mall/fashionista.png"></a></center>'
 
-	if ARRSIZE('moncheri_gown') > 0 or ARRSIZE('moncheri_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''moncheri''"><img src="images/locations/city/citycenter/mall/moncheri.png"></a></center>'
+	if ARRSIZE('moncheri_gown') > 0 or ARRSIZE('moncheri_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''moncheri''"><img src="images/locations/city/citycenter/mall/moncheri.png"></a></center>'
 
-	if ARRSIZE('scandalicious_outfits') > 0 or ARRSIZE('scandalicious_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''scandalicious''"><img src="images/locations/city/citycenter/mall/scandalicious.png"></a></center>'
+	if ARRSIZE('scandalicious_outfits') > 0 or ARRSIZE('scandalicious_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''scandalicious''"><img src="images/locations/city/citycenter/mall/scandalicious.png"></a></center>'
 
-	if ARRSIZE('fancy_burlesque') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''fancypancy''"><img src="images/locations/pushkin/fancypancy/shop_name.png"></a></center>'
+	if ARRSIZE('fancy_burlesque') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''fancypancy''"><img src="images/locations/pushkin/fancypancy/shop_name.png"></a></center>'
 
-	if ARRSIZE('eroto_dress') > 0 or ARRSIZE('eroto_outfits') > 0 or ARRSIZE('eroto_strip') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sexshop''"><img src="images/locations/city/redlight/erotomaniac/shop_name.png"></a></center>'
+	if ARRSIZE('eroto_dress') > 0 or ARRSIZE('eroto_outfits') > 0 or ARRSIZE('eroto_strip') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''sexshop''"><img src="images/locations/city/redlight/erotomaniac/shop_name.png"></a></center>'
 
-	if ARRSIZE('salacious_outfits') > 0 or ARRSIZE('salacious_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''exhibitshop''"><img src="images/locations/pushkin/exhibitshop/shop_name.png"></a></center>'
+	if ARRSIZE('salacious_outfits') > 0 or ARRSIZE('salacious_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''exhibitshop''"><img src="images/locations/pushkin/exhibitshop/shop_name.png"></a></center>'
 
-	if ARRSIZE('dolls_outfits') > 0 or ARRSIZE('dolls_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''dolls''"><img src="images/locations/city/island/dolls/shop_name.png"></a></center>'
+	if ARRSIZE('dolls_outfits') > 0 or ARRSIZE('dolls_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''dolls''"><img src="images/locations/city/island/dolls/shop_name.png"></a></center>'
 
-	if ARRSIZE('bomba_outfits') > 0 or ARRSIZE('bomba_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''bomba''"><img src="images/locations/pushkin/bomba/shop_name.png"></a></center>'
+	if ARRSIZE('bomba_outfits') > 0 or ARRSIZE('bomba_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''bomba''"><img src="images/locations/pushkin/bomba/shop_name.png"></a></center>'
 
-	if ARRSIZE('nerdvana_cosplay') > 0 or ARRSIZE('nerdvana_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''nerdvana''"><img src="images/locations/city/island/nerdvana/shop_name.png"></a></center>'
+	if ARRSIZE('nerdvana_cosplay') > 0 or ARRSIZE('nerdvana_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''nerdvana''"><img src="images/locations/city/island/nerdvana/shop_name.png"></a></center>'
 
-	if ARRSIZE('danilovich_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
+	if ARRSIZE('danilovich_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
-	if ARRSIZE('loopmaterinstvo_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''materinstvo''"><img src="images/locations/city/citycenter/mall/mommy.png"></a></center>'
+	if ARRSIZE('loopmaterinstvo_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''materinstvo''"><img src="images/locations/city/citycenter/mall/mommy.png"></a></center>'
 
-	if ARRSIZE('loopmarket_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''market''">Clothing from the market</a></center>'
+	if ARRSIZE('loopmarket_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''market''">Clothing from the market</a></center>'
+end
 
-	if $ARGS[1] = 'gm':
-		$ward_list_store = $ARGS[1]
-		*clr & cla
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+if $ARGS[0] = 'clothing_list':
+	if $ARGS[1] = 'gm' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
-		'<center>Regular G&M clothing</center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopgm_outfits
@@ -112,19 +106,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'gm_office':
-		$ward_list_store = $ARGS[1]
-		*clr & cla
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'gm_office' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/pc/items/gm/officewear.png"></center>'
-		'<center>Office wear from G&M</center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
-
-		*nl
 		i = 1
 		:loopoffice
 		if gm_office[i] = 1:
@@ -139,19 +123,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'gm_maid':
-		$ward_list_store = $ARGS[1]
-		*clr & cla
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'gm_maid' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/pc/items/gm/maid.png"></center>'
-		'<center>Maid outfits from G&M</center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
-
-		*nl
 		i = 1
 		:loopgm_maid
 		if gm_maid[i] = 1:
@@ -166,19 +140,10 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'gm_server':
-		$ward_list_store = $ARGS[1]
-		*clr & cla
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'gm_server' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/pc/items/gm/server.png"></center>'
-		'<center>Server uniforms from G&M</center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
-		*nl
 		i = 1
 		:loopgm_server
 		if gm_server[i] = 1:
@@ -193,17 +158,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'gm_school':
-		$ward_list_store = $ARGS[1]
-		*clr & cla
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'gm_school' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/pc/items/gm/school.png"></center>'
-		'<center>School uniforms</center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the school uniforms you own that are currently available for you to wear.</center><br>'
-		*nl
 
 		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', 6"><img src="images/pc/items/gm/school/6.jpg" 	height="250" /></a>'
 
@@ -222,16 +179,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'kats':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'kats' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/city/citycenter/mall/pussycat.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopcats_outfits
@@ -266,16 +216,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'flamingos':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'flamingos' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/city/island/flamingos/shop_name.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopflamingos_outfits
@@ -310,16 +253,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'coco':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'coco' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/pavlovsk/coco/shop_name.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopcoco_outfit
@@ -354,16 +290,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'fashionista':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'fashionista' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/city/citycenter/mall/fashionista.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopfashionista
@@ -398,16 +327,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'moncheri':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'moncheri' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/city/citycenter/mall/moncheri.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopmoncheri_gown
@@ -434,16 +356,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'scandalicious':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'scandalicious' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/city/citycenter/mall/scandalicious.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopscandalicious_outfits
@@ -478,16 +393,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'fancypancy':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'fancypancy' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/pushkin/fancypancy/shop_name.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopburlesque
@@ -502,16 +410,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'sexshop':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'sexshop' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/city/redlight/erotomaniac/shop_name.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:looperoto_dress
@@ -549,16 +450,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'exhibitshop':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'exhibitshop' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/pushkin/exhibitshop/shop_name.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopsalacious_dress
@@ -585,16 +479,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'dolls':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'dolls' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/city/island/dolls/shop_name.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopdolls_outfits
@@ -629,16 +516,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'bomba':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'bomba' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/pushkin/bomba/shop_name.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopbomba_outfits
@@ -673,16 +553,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'nerdvana':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'nerdvana' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/city/island/nerdvana/shop_name.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopnerdvana_outfits
@@ -717,16 +590,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'sports':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'sports' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopdanilovich_outfits
@@ -742,16 +608,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'market':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+	if $ARGS[1] = 'market' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
 		'<center>Clothing from the market</center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
 
 		i = 1
 		:loopmarket_outfits
@@ -767,16 +626,9 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'materinstvo':
-		*clr & cla
-		$ward_list_store = $ARGS[1]
-		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
-		'<center>Clothing from Materinstvo</center>'
-		*nl
-		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
-		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
-		*nl
+	if $ARGS[1] = 'materinstvo' or $ARGS[1] = 'all':
+		if $args[1] ! 'all': $ward_list_store = $ARGS[1]
+		'<center><img src="images/locations/city/citycenter/mall/mommy.png"></center>'
 
 		i = 1
 		:loopmaterinstvo_dress
@@ -917,7 +769,7 @@ if $ARGS[0] = 'change':
 			'<font color="red">This uniform makes a mockery of the school uniform regulations. Everybody in school apart from the gopniks will think that you''re a slut.</font>'
 		end
 	end
-	act 'Return':gt 'clothing_QV', 'list', '<<$ward_list_store>>'
+	act 'Return':gt 'clothing_QV', 'clothing_list', '<<$ward_list_store>>'
 
 	if $clothingworntype = $ARGS[1] and clothingwornnumber = ARGS[2]:
 		'You are wearing this outfit.'
@@ -933,7 +785,7 @@ if $ARGS[0] = 'change':
 			gs 'clothing', 'wear', $ARGS[1], ARGS[2]
 
 			if $regularwornclothingtype = '':
-				gt 'wardrobe', 'start'
+				gt 'wardrobe', 'main'
 			else
 				gt 'clothing_QV', 'gym'
 			end

+ 2 - 2
locations/coats.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'view_coat_list':
 
 	act 'Return': 
 		if $ARGS[1] = 'wardrobe':
-			gt 'wardrobe', 'start'
+			gt 'wardrobe', 'main'
 		else
 			gt $loc, $loc_arg
 		end
@@ -183,7 +183,7 @@ if $ARGS[0] = 'view_coat_item':
 						gs 'coats', 'wear', $ARGS[2], ARGS[3]
 
 						if $ARGS[1] = 'wardrobe':
-							gt 'wardrobe', 'start'
+							gt 'wardrobe', 'main'
 						else
 							gt $loc, $loc_arg
 						end

+ 1 - 3
locations/dachain.qsrc

@@ -26,9 +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'', ''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
-	gs 'wardrobe', 'quickdress' 
+	'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>'
 	*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

+ 1 - 2
locations/dom_gor.qsrc

@@ -12,9 +12,8 @@ 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'', ''start''">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'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing), and a small TV.'
 *nl
-gs 'wardrobe', 'quickdress'
 
 if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and teachlevel > 20 and parkrunday ! daystart and hour < 21 and hour > 6:
 	act 'Go for a jog around the park (1:00)':

+ 1 - 2
locations/dorm.qsrc

@@ -626,12 +626,11 @@ 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'', ''start''">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'', ''main''">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.'
 	*nl
-	gs 'wardrobe', 'quickdress'
 	gs 'exercise', 'start'
 	if hour > 14 and hour < func('bordel', 'open_hour'):
 		vika_sleep = 0

+ 3 - 3
locations/femcyc.qsrc

@@ -302,9 +302,9 @@ if $ARGS[0] = '':
 		killvar 'succycletmp'
 	end
 
-	cumarrtemp = 0
-	cumcondslip = 0
-	cumcondslip_aware = 0
+	!!cumarrtemp = 0
+	!!cumcondslip = 0
+	!!cumcondslip_aware = 0
 	if arrsize('sparrvol') > 0:
 		:cumspaloop
 		!!Succubus absorption for internal locations other than womb

+ 1 - 2
locations/fit.qsrc

@@ -99,7 +99,6 @@ if $ARGS[0] = 'dressing room':
 	'Recruiting girls for local track team, the winners will receive cash prizes.'
 	'Attention, visitors to the sports section must wear sports outfits and shoes when using the facilities.'
 	*nl
-	gs 'wardrobe', 'quickdress'
 
 	if nichTanyaKnown = 0 and (rand(1,100) <= 20 or nichDebug = 1):
 		'In the locker room you notice <a href="exec:gt ''fit'', ''fitgirl''">a cute girl</a>.'
@@ -147,7 +146,7 @@ if $ARGS[0] = 'dressing room':
 
 	act 'Change outfit':
 		cla
-		gt 'wardrobe', 'start'
+		gt 'wardrobe', 'main'
 	end
 
 	if PCloswimwear = 1:

+ 1 - 3
locations/gdksport.qsrc

@@ -20,8 +20,6 @@ if $ARGS[0] = 'start':
 	*nl
 	'In the locker room is a <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.'
 	*nl
-	gs 'wardrobe', 'quickdress'
-	*nl
 	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and cheerleaders_on = 1: 'Albina is at cheerleading, so there is no Starlets training today.'
 
 	if kotovLoveQW > 0 and hour = 16:
@@ -77,7 +75,7 @@ if $ARGS[0] = 'start':
 
 	act 'Change outfit in the locker room':
 		cla
-		gt 'wardrobe', 'start'
+		gt 'wardrobe', 'main'
 	end
 
 	gs 'wardrobe', 'sports_outfit'

+ 5 - 3
locations/grades.qsrc

@@ -34,8 +34,8 @@
 !! 'institution' is which institution this is for.
 !! 'use of computer' is 'yes' if a computer was available for doing the homework and 'no' if not.
 !!	'number of homeworks' is the number of gomework assignments you want to do whit this one call. Remember to make sure that this number is not greater than lernHome.
-!! 'joint' 0 if you do the homework alone, 1 if you do it together with an npc, 2 if a npc does the homework for you.
-!! 'npc identifier' the npc identifier from npcstatic in the for A(number) for the npc helping/doing for you.
+!! 'joint' 0 if you do the homework alone, 1 if you do it together with an npc, 2 if a npc does the homework for you, 3 use a modifier equal to the numbe set as the next argument.
+!! 'npc identifier' the npc identifier from npcstatic in the for A(number) for the npc helping/doing for you. If 'joint' = 3 then the number set here will be used as the modifier for doing the homework 
 
 !!For a class where there is optional opportunities to study outside class that can effect the characters grade ther is th following three calls.
 !! gs 'grades', 'optional_activity', 'institution', 'name', 'use of computer'
@@ -182,11 +182,13 @@ end
 if $ARGS[0] = 'homework':
 !!For doing the daily homowork.
 	lernHome -= ARGS[3]
-	!!The modifier for doing home work is the characters intelligence if that do it alone, the intelligence of the npc that make it for them (but at least 50), or the maximum of the intelligence of the character and the npc the are doing it together with, with a small bonus if the there intelligence is close.
+	!!The modifier for doing home work is the characters intelligence if that do it alone, the intelligence of the npc that make it for them (but at least 50), or the maximum of the intelligence of the character and the npc the are doing it together with, with a small bonus if the there intelligence is close, or the value set as ARGs[5].
 	if ARGS[4] = 2:
 		modifier = dyneval('RESULT = max(npc_intel[''<<$ARGS[5]>>''], 50)')
 	elseif ARGS[4] = 1:
 		modifier = dyneval('RESULT = max(npc_intel[''<<$ARGS[5]>>''], pcs_intel) + (max(10+min(npc_intel[''<<$ARGS[5]>>''] -pcs_intel, pcs_intel -npc_intel[''<<$ARGS[5]>>'']),0)*(100 - max(npc_intel[''<<$ARGS[5]>>''], pcs_intel)))/50')
+	elseif ARGS[4] = 3:
+		modifier = ARGS[5]
 	else
 		modifier = pcs_intel
 	end

+ 1 - 2
locations/gschool_grounds.qsrc

@@ -755,7 +755,6 @@ if $ARGS[0] = 'change_room':
 	*nl
 	'The locker room is accessed through the school gym, and is left unlocked until 18:30 each day for the use of students using the sports ground for training and events outside school hours. The room is cold, damp and filled with lockers, benches and not much else. You can <a href="exec: gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here'+iif(pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0, ', and <a href="exec:dynamic $pirManage">manage your piercings</a>', '.')+''
 	*nl
-	gs 'wardrobe', 'quickdress'
 
 	if (hour = 18 and minut >= 30) or hour > 18:
 		'The school is closing for the night and you have to leave before you get locked in.'
@@ -765,7 +764,7 @@ if $ARGS[0] = 'change_room':
 	gs 'wardrobe', 'sports_outfit'
 	act 'Change your outfit':
 		cla
-		gt 'wardrobe', 'start'
+		gt 'wardrobe', 'main'
 	end
 	dynamic $publicpan
 	act 'Look in the mirror': gt 'mirror', 'start'

+ 1 - 2
locations/gschool_lessons4.qsrc

@@ -1924,7 +1924,6 @@ if $ARGS[0] = 'post_dress':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
 	*nl
-	'You can access your <a href="exec:postphys_event = daystart & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	act 'Leave school':
 		if $clothingworntype = 'nude':
@@ -1934,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', 'start'
+	act 'Choose a different outfit':postphys_event = daystart & gt 'wardrobe', 'main'
 	if siga >= 1:
 		act 'Smoke a cigarette':
 			*clr & cla

+ 1 - 1
locations/lact_lib.qsrc

@@ -710,7 +710,7 @@ if $ARGS[0] = 'get_suckflowrate':
 		result = 5000
 	elseif ARGS[1] = 8:
 		!!	'manual stimulation during sex/sex play'
-		result = 6000
+		result = 15000
 	else
 		!!	'suck flow else branch'
 		result = 10000

+ 1 - 3
locations/leonid.qsrc

@@ -843,8 +843,6 @@ if $ARGS[0] = 'toilet':
 	'<center><h4>Office toilet</h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/toilet.jpg"></center>'
 	'You are in an office toilet.'
-	*nl
-	gs 'wardrobe', 'quickdress'
 
 	if CloStyle3 ! 4:
 		'<b style="color: #FF00000">You are at work, so you need to be dressed as a secretary!</b>'
@@ -852,7 +850,7 @@ if $ARGS[0] = 'toilet':
 
 	act 'Leave the restroom':gt 'leonid', 'office'
 	
-	act 'Change your clothes':gt 'wardrobe', 'start'
+	act 'Change your clothes':gt 'wardrobe', 'main'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'

+ 1 - 3
locations/mey_home.qsrc

@@ -224,14 +224,12 @@ 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'', ''start''">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'', ''main''">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
 	'A <a href="exec:gt ''mirror'', ''start''">mirror</a> hangs on the wall near the front door.'
 	if komp = 1:'Your <a href="exec:gt ''Komp'',''start''">laptop</a> is on the desk.'
-	*nl
-	gs 'wardrobe', 'quickdress'
 
 	act 'Return to the hallway':
 		if ($clothingworntype = 'nude' or PCloswimwear = 1):

+ 1 - 3
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'', ''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.'
+	'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.'
 	if komp = 1:
 		$komp = ' with your <a href="exec:gt ''Komp'', ''start''">laptop</a>.'
 	else
@@ -41,8 +41,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	if bookYog > 0:'A yoga mat is rolled up in a corner next to the wardrobe. '
 
 	if mishka > 0:'On one of the shelves, you''ve placed your <<mishka>> teddy bear'+iif(mishka = 1, '', 's')+'.'
-	*nl
-	gs 'wardrobe', 'quickdress'
 
 	gs 'exercise', 'start'
 

+ 2 - 2
locations/panties.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'view_panty_list':
 	end
 
 	if $ARGS[1] ! 'bathroom':
-		act 'Return': gt 'wardrobe', 'start'
+		act 'Return': gt 'wardrobe', 'main'
 	else
 		act 'Return': gt $loc, $loc_arg
 	end
@@ -199,7 +199,7 @@ if $ARGS[0] = 'view_panty_item':
 						gs 'panties', 'wear', $ARGS[2], ARGS[3]
 
 						if $ARGS[1] = 'wardrobe':
-							gt 'wardrobe', 'start'
+							gt 'wardrobe', 'main'
 						else
 							gt $loc, $loc_arg
 						end

+ 2 - 0
locations/pav_church.qsrc

@@ -292,6 +292,8 @@ if $ARGS[0] = 'reducepavrep':
 	else
 		gs 'fame', 'pav', 'prostitute', -pavsextreshold
 	end
+	killvar 'pavsextreshold'
+	killvar 'pavsexreduction'
 end
 
 if $ARGS[0] = 'Narthex':

+ 7 - 1
locations/pav_library.qsrc

@@ -1,5 +1,5 @@
 # pav_library
-!2021/04/26
+!2021/10/05
 $loc_arg = ''
 $loc = 'pav_library'
 $location_type = 'public_indoors'
@@ -17,6 +17,9 @@ gs 'themes', 'indoors'
 if lernHome > 0:
 'You could do your homework with the help of one of the computers'
 end
+if 	storyline = 1 and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
+	'The nerd''s are siting at a table studying togheter'
+end
 
 act 'Leave': gt 'pav_commcenter'
 
@@ -145,6 +148,9 @@ if hour >= 8 and hour < 18:
 	elseif lernHome > 0 and will_cost > pcs_willpwr:
 		act 'Do your homework (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	if storyline = 1 and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
+		act 'Join the nerd''s study goup': gt 'pav_library_nerdstudy', 'nerd_study_night'
+	end
 else
 	'The library is closed.'
 end

+ 251 - 0
locations/pav_library_nerdstudy.qsrc

@@ -0,0 +1,251 @@
+# pav_library_nerdstudy
+!2021/10/05
+
+if $ARGS[0] = 'nerd_study_night':
+	*clr & cla
+	gs 'stat'
+	nerdstudynight['start_time'] = totminut
+	nerdstudynight['day'] = daystart
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/nerdsstudy/nerds_study' + rand(1,5) + '.jpg"></center>'
+	if grupTipe = 3:
+		'You arrive at the library and see all of your fellow nerds have already gathered around one of the tables. Some are grabbing some books or looking up things on their laptop, while others are sitting and chatting before the study session begins. You sit down with your fellow students and start studying.'
+	elseif grupTipe = 5:
+		'You arrive at the library and see the nerds have already gathered around one of the tables. Some are grabbing some books or looking up things on their laptop, while others are sitting and chatting before the study session begins. When they see you, they all go quiet, they look back and forth a bit and finally Feofan speaks up. "Do you need something?"'
+		'You smile to him and the rest. "My grades are not as good as I would like, so I thought I would come study with the smartest kids in school."'
+		'They exchange looks again and this time Artem speaks up. "Yeah ok, but we are here to study." Then they go back to studying among each other.'
+	elseif fame['pav_slut'] >= 250:
+		'You arrive at the library and see the nerds have already gathered around one of the tables. Some are grabbing some books or looking up things on their laptop, while others are sitting and chatting before the study session begins. When they see you, they all go quiet, they look back and forth a bit and finally Feofan speaks up. "Do you need something?"'
+		'You smile to him and the rest. "My grades are not as good as I would like, so I thought I would come study with the smartest kids in school."'
+		'They exchange looks again and this time they huddle up a bit and start whispering back and forth it seems like they are arguing but finally Artem looks up at you and says. "Yeah ok, we know your reputation and we want no part of it, we are here to study and thats it, so no funny business." Then they go back to studying among each other.'
+	else
+		'You arrive at the library and see the nerds have already gathered around one of the tables. Some are grabbing some books or looking up things on their laptop, while others are sitting and chatting before the study session begins. When they see you, they all go quiet, they look back and forth a bit and finally Feofan speaks up. "Do you need something?"'
+		'You smile to him and the rest. "My grades are not as good as I would like, so I thought I would come study with the smartest kids in school."'
+		'They exchange looks again and this time Artem speaks up. "We don''t want any trouble."'
+		'You give them a reassuring smile. "I promise I am not here to cause problems, I just need help with my school work."'
+		'They exchange looks and a few of them nod before Feofan speaks up again. "Ok sure you can study with us."'
+	end
+	act 'Leave': gt 'pav_library'
+	act 'Study': gt 'pav_library_nerdstudy', 'nerd_study_night1'
+	act 'Chat': gt 'pav_library_nerdstudy', 'nerd_study_night2'
+end
+
+if $ARGS[0] = 'nerd_study_night1':
+	*clr & cla
+	menu_off = 1
+	grupvalue[3] += 3
+	gs 'stat'
+	if totminut < nerdstudynight['start_time'] + 25:
+		lern += rand(4, 8)
+		intel_exp += rand(1, 2)
+		prcptn_exp += rand(0,1)
+		if lernHome > 1:
+			gs 'grades', 'homework', 'school', 'yes', 2, 3, 100
+		elseif lernHome = 1:
+			gs 'grades', 'homework', 'school', 'yes', 1, 3, 100
+		end
+	elseif totminut < nerdstudynight['start_time'] + 45:
+		lern += rand(2, 4)
+		intel_exp += rand(0, 1)		
+		prcptn_exp += rand(0,1)
+		if lernHome >= 1:
+			gs 'grades', 'homework', 'school', 'yes', 1, 3, 100
+		end	
+	else
+		lern += rand(1, 2)
+		intel_exp += rand(0, 1)	
+	end
+	if (totminut - nerdstudynight['start_time']) < 60: minut += (60 -totminut + nerdstudynight['start_time'])
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/nerdsstudy/nerds_study' + rand(1,5) + '.jpg"></center>'
+	'You help each other out, debate topics and discuss answers. You have a very enjoyable time and feel like you''ve learned a fair bit about your subject.'
+	act 'Pack up': gt 'pav_library_nerdstudy', 'nerd_study_night_over'
+end
+
+if $ARGS[0] = 'nerd_study_night2':
+	*clr & cla
+	$loc_arg = 'nerd_study_night2'
+	$loc = 'pav_library_nerdstudy'
+	$location_type = 'public_indoors'
+	$menu_loc = 'pav_library_nerdstudy'
+	$menu_arg = 'nerd_study_night2'
+	menu_off = 0
+	gs 'stat'
+	if totminut >= nerdstudynight['start_time'] +60: gt 'pav_library_nerdstudy', 'nerd_study_night_over'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/nerdsstudy/nerds_study' + rand(1,5) + '.jpg"></center>'
+	'You can''t help but be a little distracted. You''re not sure why, but you''re just not feeling the desire to study. Maybe one of your fellow nerds would like to chat instead?'
+	act 'Study': gt 'pav_library_nerdstudy', 'nerd_study_night1'
+	if nerdstudynight['Feofan'] = 0:
+		act 'Chat to Feofan':
+			*clr & cla
+			minut += 5
+			nerdstudynight['Feofan'] = 1
+			gs 'npc_relationship', 'modify', 'A152', 'like'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big152.jpg"></center>'
+			if npc_rel['A152'] >= 60 and grupTipe = 3:
+				'You talk to Feofan about a variety of topics but soon it turns into talking about the game night and him teasing you with some of the stuff he has planned. After a while, he talks about an upcoming convention he wants to go to and cosplay at. The conversation soon comes to an end as he returns to his studies.'
+			elseif npc_rel['A152'] <= 20 or fame['pav_slut'] >= 250:
+				'Feofan isn''t really interested in talking to you, but you insist and try to keep up a conversation until he finally stops you. "Hey, I''ve gotta finish this homework." he says awkwardly and focuses on studying while ignoring you.'
+			else
+				'You strike up a conversation with Feofan. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+			end
+			act 'Start studying': gt 'pav_library_nerdstudy', 'nerd_study_night1'
+			act 'Chat to someone else': gt 'pav_library_nerdstudy', 'nerd_study_night2'
+		end
+	end
+	if nerdstudynight['Artem'] = 0:
+		act 'Chat to Artem':
+			*clr & cla
+			minut += 5
+			nerdstudynight['Artem'] = 1
+			gs 'npc_relationship', 'modify', 'A2', 'like'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
+			if artembf = 1:
+				'Artem scoots his chair over closer to you. "I was worried you wouldn''t show up today." he jokes, but you can tell there''s a part of him that was being sincere. Artem isn''t one for public affection, but he still can''t go without some kind of physical contact with you, which leaves him sitting close enough to you that your legs bump and rub against each other under the table as you talk.'
+			elseif npc_rel['A2'] >= 60 and grupTipe = 3:
+				'"There you are <<$pcs_nickname>>. How''s it going?" Artem greets you. "I figure we can get a head-start on Yenotin''s lesson while we talk." he says, moving the textbook towards you so you can look at it. While you work, Artem keeps up a lively conversation, talking about a range of different topics.'
+			elseif npc_rel['A2'] <= 20 or fame['pav_slut'] >= 250:
+				'You try to chat with Artem, but he doesn''t seem all that interested in the conversation. His answers are short and he doesn''t even bother to stop writing in his notebook as you talk.'
+			else
+				'You strike up a conversation with Artem. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+			end
+			act 'Start studying': gt 'pav_library_nerdstudy', 'nerd_study_night1'
+			act 'Chat to someone else': gt 'pav_library_nerdstudy', 'nerd_study_night2'
+		end
+	end
+	if nerdstudynight['Zinaida'] = 0:
+		act 'Chat to Zinaida':
+			*clr & cla
+			minut += 5
+			nerdstudynight['Zinaida'] = 1
+			gs 'npc_relationship', 'modify', 'A142', 'like'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big142.jpg"></center>'
+			if npc_rel['A142'] >= 60 and grupTipe = 3:
+				'You chat about the latest video games with Zinaida. "Hey, look at this. I got into the top ten with my last score." With a small smile, Zinaida shows you her phone, and sure enough she''s number five on the leaderboard. You congratulate her, which causes her cheeks to flush slightly as she tries to downplay it. The two of you go back to some idle chatter about video games.'
+			elseif npc_rel['A142'] <= 20 or fame['pav_slut'] >= 250:
+				'Zinadia is focused on studying the book in front of her and taking notes, so she rarely says anything back as you try and talk to her. "I''d like to talk, but I''m busy trying to study. I need to finish this." she says quietly while looking up at you through her messy hair that hangs down onto her face. She resumes her studying while ignoring you.'
+			else
+				'You strike up a conversation with Zinaida. She seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+			end
+			act 'Start studying': gt 'pav_library_nerdstudy', 'nerd_study_night1'
+			act 'Chat to someone else': gt 'pav_library_nerdstudy', 'nerd_study_night2'
+		end
+	end
+	if nerdstudynight['Gerasim'] = 0:
+		act 'Chat to Gerasim':
+			*clr & cla
+			minut += 5
+			nerdstudynight['Gerasim'] = 1
+			gs 'npc_relationship', 'modify', 'A153', 'like'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big153.jpg"></center>'
+			if npc_rel['A153'] >= 60 and grupTipe = 3:
+				'You greet Gerasim with a smile and make a point to ask him how his day is going, subtly hinting to the fact that you know other students like to make him do their school work. With a shy smile, Gerasim shrugs his shoulders. "I''m fine." he says, his smile growing. "Thanks for worrying about me though <<$pcs_nickname>>." You engage in some idle banter for a while.'
+			elseif npc_rel['A153'] <= 20 or fame['pav_slut'] >= 250:
+				'Gerasim isn''t really interested in talking to you, but you insist and try to keep up a conversation until he finally stops you. "Hey, I really need to study. Maybe we can talk some other time?" he says halfheartedly with an awkward laugh, then focuses on studying.'
+			else
+				'You strike up a conversation with Gerasim. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+			end
+			act 'Start studying': gt 'pav_library_nerdstudy', 'nerd_study_night1'
+			act 'Chat to someone else': gt 'pav_library_nerdstudy', 'nerd_study_night2'
+		end
+	end
+	if nerdstudynight['Julia'] = 0:
+		act 'Chat to Julia':
+			*clr & cla
+			minut += 5
+			nerdstudynight['Julia'] = 1
+			gs 'npc_relationship', 'modify', 'A12', 'like'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
+			if npc_rel['A12'] >= 60 and grupTipe = 3:
+				'Usually, Julia is quiet and lets others do most of the talking, but with you, she participates more in the conversation with some friendly banter.'
+			elseif npc_rel['A12'] <= 20 or fame['pav_slut'] >= 250:
+				'You try to talk to Julia, but the conversation becomes completely one-sided, with you doing all the talking while Julia busies herself with schoolwork.'
+			else
+				'You strike up a conversation with Julia. She seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+			end
+			act 'Start studying': gt 'pav_library_nerdstudy', 'nerd_study_night1'
+			act 'Chat to someone else': gt 'pav_library_nerdstudy', 'nerd_study_night2'
+		end
+	end
+	if nerdstudynight['Petka'] = 0:
+		act 'Chat to Petka':
+			*clr & cla
+			minut += 5
+			nerdstudynight['Petka'] = 1
+			gs 'npc_relationship', 'modify', 'A6', 'like'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big6.jpg"></center>'
+			if npc_rel['A6'] >= 60 and grupTipe = 3:
+				'"You really have to read this book <<$pcs_nickname>>! I''m pretty sure it''s one you''d enjoy." Petka says excitedly. He starts to tell you about an interesting part he just read, but stops himself with a laugh. "Don''t worry, I won''t spoil it for you." The two of you chat about some recent books you have read.'
+			elseif npc_rel['A6'] <= 20 or fame['pav_slut'] >= 250:
+				'"Can we talk later? I really want to finish studying this chapter before we call it a night." Petka says, only briefly looking up from his book to address you before burying his nose right back into it.'
+			else
+				'You strike up a conversation with Petka. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+			end
+			act 'Start studying': gt 'pav_library_nerdstudy', 'nerd_study_night1'
+			act 'Chat to someone else': gt 'pav_library_nerdstudy', 'nerd_study_night2'
+		end
+	end
+	if nerdstudynight['Natasha'] = 0:
+		act 'Chat to Natasha':
+			*clr & cla
+			minut += 5
+			nerdstudynight['Natasha'] = 1
+			gs 'npc_relationship', 'modify', 'A16', 'like'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big16.jpg"></center>'
+			if npc_rel['A16'] >= 60 and grupTipe = 3:
+				'"Hey <<$pcs_nickname>>! Have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can''t afford nice things like this and this ends up bringing her down. You quickly change the subject and start complimenting her on her sense of style and grades and reminding her she''s a top student in school, which brings a smile to her face.'
+			elseif npc_rel['A16'] <= 20 or fame['pav_slut'] >= 250:
+				'Natasha isn''t really interested in talking to you, but you persist in trying to keep up a conversation for awhile before she says. "Hey, I''ve got to... study. Maybe we can talk later?" she says halfheartedly and goes back to studying.'
+			else
+				'You strike up a conversation with Natasha. She seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+			end
+			act 'Start studying': gt 'pav_library_nerdstudy', 'nerd_study_night1'
+			act 'Chat to someone else': gt 'pav_library_nerdstudy', 'nerd_study_night2'
+		end
+	end
+	if nerdstudynight['Evgeny'] = 0:
+		act 'Chat to Evgeny':
+			*clr & cla
+			minut += 5
+			nerdstudynight['Evgeny'] = 1
+			gs 'npc_relationship', 'modify', 'A151', 'like'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big151.jpg"></center>'
+			if npc_rel['A151'] >= 60 and grupTipe = 3:
+				'You strike up a conversation with Evgeny, mostly about school work at first as he is focused on it, but eventually it drifts over to talking about chess before he abruptly stops talking and focuses on studying again.'
+			elseif npc_rel['A151'] <= 20 or fame['pav_slut'] >= 250:
+				'You try talking to Evgeny, but it''s very one-sided with you doing all of the talking until he finally speaks up. "I don''t want to sound rude, but we''re not really friends so I''m not sure why you''d want to talk to me." he says quietly. "Anyways, I''ve got to finish studying, so if you don''t mind..." He goes back to studying while ignoring you.'
+			else
+				'You strike up a conversation with Evgeny. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
+			end
+			act 'Start studying': gt 'pav_library_nerdstudy', 'nerd_study_night1'
+			act 'Chat to someone else': gt 'pav_library_nerdstudy', 'nerd_study_night2'
+		end
+	end
+end
+
+if $ARGS[0] = 'nerd_study_night_over':
+	*clr & cla
+	menu_off = 1
+	nerdstudynight['Feofan'] = 0
+	nerdstudynight['Artem'] = 0
+	nerdstudynight['Zinaida'] = 0
+	nerdstudynight['Gerasim'] = 0
+	nerdstudynight['Julia'] = 0
+	nerdstudynight['Petka'] = 0
+	nerdstudynight['Natasha'] = 0
+	nerdstudynight['Evgeny'] = 0
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/nerdsstudy/nerds_study' + rand(1,5) + '.jpg"></center>'
+	'After an hour, everyone starts packing up and talking about heading home. A few text their parents to let them know they''re leaving the library. You gather up your stuff and leave with the group.'
+	act 'Leave': gt 'pav_library'
+end
+	
+--- pav_library_nerdstudy ---------------------------------
+	

+ 1 - 4
locations/pav_shared_apt.qsrc

@@ -293,10 +293,9 @@ 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'', ''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.'
+		'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.'
 		*nl
 		if servitudeLvl >= 1:'A computer printed <a href="exec:gt ''pav_shared_apt'', ''list''">list</a> hangs on the exit door.' & *nl
-		gs 'wardrobe', 'quickdress'
 		act 'Go to your room':gt 'pav_shared_apt', 'pcsRoom'
 		act 'Go to the bathroom':gt 'pav_shared_apt', 'bathroom'
 		act 'Go to the kitchen':gt 'pav_shared_apt', 'kitchen'
@@ -716,8 +715,6 @@ if $ARGS[0] = 'pcsRoom':
 	if TV = 1:$TV = 'an old CRT <a href="exec:gt ''TV'', ''start''">TV</a> sits on the shelf'
 	'There is an wall unit at the other side of the room, <<$TV>>. Everyone in the household spends their time in their own rooms, so there was never a reason to use the living room for its intended purpose.'
 	*nl
-	'On the other side of the sofa bed are your old <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">suitcases</a>, which you could use to store the clothes you don''t often wear.'
-	*nl
 	if stol = 0:$stol = 'an old scratched <a href="exec:gt ''stol'', ''start''">table</a>'
 	'In the corner there is <<$stol>>.'
 	*nl

+ 1 - 1
locations/pav_train_market.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'This small open air market is located near the train station.'
 	*nl
-	'On one of the stalls has a sign "Cash paid for secondhand clothes", here you can <a href="exec:cloc=2 & gt ''clothing'', ''view_clothing_list'', ''sell''">sell individual items</a> or <a href="exec:gs ''portnoi''">all of your unwanted clothes</a>.'
+	'On one of the stalls has a sign "Cash paid for secondhand clothes", here you can sell <a href="exec:gs ''portnoi''">all of your unwanted clothes</a>.'
 	
 	
 	if arturQW = 1 and (week = 6 or week = 7) and hour < 12: act 'Wait for Arthur to arrive':hour = 12 & gt 'pav_train_market', 'start'

+ 1 - 1
locations/piercing_management.qsrc

@@ -39,7 +39,7 @@ If $ARGS[0] = 'main':
 	'</center></TD><TR><TD><center>'
 	if pirsA = 0:
 		'Not pierced'
-	elseif pirsA <= 10000:ii
+	elseif pirsA <= 10000:
 		'<a href="exec:pirsA = 10000 & pierWearCount -= 1 & gt ''piercing_management'', ''main''">Remove</a>'
 	else
 		'Remove'

+ 2 - 2
locations/purses.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'view_purse_list':
 		ploc = 2
 	end
 
-	act 'Return' :gt 'wardrobe', 'start'
+	act 'Return' :gt 'wardrobe', 'main'
 	
 	$clothing_header = '<center><table border=1>'
 	if $ARGS[1] ! 'wardrobe': $clothing_header += '<TH><a href="exec:gt ''purses'', ''view_purse_list'', ''wardrobe''">Switch to wardrobe list</a></TH>'
@@ -173,7 +173,7 @@ if $ARGS[0] = 'view_purse_item':
 					currentpursenumber = ARGS[3]
 					bag = 1
 
-					gt 'wardrobe', 'start'
+					gt 'wardrobe', 'main'
 				end
 			elseif ploc = 1:
 				'This purse is in storage.'

+ 1 - 1
locations/sentence.qsrc

@@ -58,7 +58,7 @@ if $ARGS[0] = 'start':
 	
 	if AlexandriaQW = 13: 
         act 'Look for Filipp Kudashov''s office.': gt 'alexandriaEv', 'filipp'
-    elseif $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pregchem > 1800 and AlexandriaQW = 15:
+    elseif $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pregchem < 1800 and AlexandriaQW = 15:
         act 'You found Ana': gt 'alexandriaEv', 'anachase1'
     end
 end

+ 2 - 2
locations/shoes.qsrc

@@ -70,7 +70,7 @@ if $ARGS[0] = 'view_shoe_list':
 
 	$regularwornshoetype = ''
 
-	act 'Return':gt 'wardrobe', 'start'
+	act 'Return':gt 'wardrobe', 'main'
 
 	if $ARGS[1] ! 'sell' :'<center><table border=1><TH><a href="exec:gt ''shoes'', ''view_shoe_list'', ''wardrobe''">Wardrobe </a></TH><TH><a href="exec:gt ''shoes'', ''view_shoe_list'', ''store''">Storage</a></TH><TH><a href="exec:gt ''shoes'', ''view_shoe_list'', ''unwanted''">Unwanted</a></TH></table></center>'
 
@@ -266,7 +266,7 @@ if $ARGS[0] = 'view_shoe_item':
 			gs 'shoes', 'wear', $ARGS[2], ARGS[3]
 
 			if $regularwornshoetype = '':
-				gt 'wardrobe', 'start'
+				gt 'wardrobe', 'main'
 			else
 				gt 'shoes', 'gym'
 			end

+ 1 - 3
locations/shulgahall.qsrc

@@ -29,9 +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'', ''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.'
-		*nl
-		gs 'wardrobe', 'quickdress'
+		'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.'
 	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

+ 5 - 1
locations/stat.qsrc

@@ -436,7 +436,11 @@ if minut >= 60:
 	hour += 1
 	minut -= 60
 
-	if SbrosNerdism = 1:pcs_nerd = pcs_sprt / 10 - orgasm
+	if SbrosNerdism = 1 and orgasm ! 10:
+		pcs_nerd = pcs_sprt / 10 - orgasm
+	else
+		pcs_nerd = pcs_sprt / 9 - orgasm
+	end
 	if pcs_nerd < 0:pcs_nerd = 0
 	if obkvsdam > 0:obkvsdam = rand(2, 5)
 

+ 4 - 4
locations/street_event.qsrc

@@ -1292,7 +1292,7 @@ if $ARGS[1] = 'main':
 								gs 'stat'
 								'<<$streetev_title>>'
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
-								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tall him that tonight they will sleep indoors and eat.'
+								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
 							end
 						end
@@ -1316,7 +1316,7 @@ if $ARGS[1] = 'main':
 								money -= 5000
 								pcs_mood += 50
 								gs 'stat'
-								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tall him that tonight they will sleep indoors and eat.'
+								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
 							end
 						end
@@ -1340,7 +1340,7 @@ if $ARGS[1] = 'main':
 								gs 'stat'
 								'<<$streetev_title>>'
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
-								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tall him that tonight they will sleep indoors and eat.'
+								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
 							end
 						end
@@ -1364,7 +1364,7 @@ if $ARGS[1] = 'main':
 								gs 'stat'
 								'<<$streetev_title>>'
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
-								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tall him that tonight they will sleep indoors and eat.'
+								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
 							end
 						end

+ 1 - 3
locations/stwork.qsrc

@@ -28,8 +28,6 @@ if $ARGS[0] = 'start':
 	end
 	'Near the exit door is a vending machine selling '+iif(money >= 100,'<a href="exec:money -= 100 & gt ''food'', ''snack''">snacks</a>','snacks')+' and a <a href="exec:gt ''beverage'', ''bev_wat''">water cooler</a>, which is heavily used by staff after coming off stage'
 	'A wooden door leads to the <a href="exec:gt ''stwork'', ''toilet''">staff bathroom</a>.'
-	*nl
-	gs 'wardrobe', 'quickdress'
 
 	! Tattoos increase your desireability as a stripper
 	if tatlech > 0:stripKoef1 = rand(1, 3)
@@ -54,7 +52,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	act 'Go to the staff bathroom':gt 'stwork', 'toilet'
-	act 'Change your clothes':gt 'wardrobe', 'start'
+	act 'Change your clothes':gt 'wardrobe', 'main'
 	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'

+ 38 - 23
locations/wardrobe.qsrc

@@ -1,6 +1,24 @@
 # wardrobe
 
 if $ARGS[0] = 'start':
+	'<center><font color="maroon">Please select an option</font></center>'
+	*nl
+	*nl
+	*nl
+	'<center><a href="exec:gt ''wardrobe'', ''main''"><img src="images/system/icons/clothing/clothes.png"></a></center>'
+	*nl
+	*nl
+	*nl
+	'<center><a href="exec:gt ''wardrobe'', ''default''"><img src="images/system/icons/clothing/default.png"></a></center>'
+	*nl
+	*nl
+	*nl
+	'<center><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''"><img src="images/system/icons/clothing/organize.png"></a></center>'
+end
+
+
+
+if $ARGS[0] = 'main':
 	PShoQuality = ShoQuality
 	PShoHeels = ShoHeels
 	PShoCut = ShoCut
@@ -32,19 +50,19 @@ if $ARGS[0] = 'start':
 	end
 	'</center></TD><TR><TD><center>'
 	if $braworntype ! 'none':
-		'<a href="exec:gs ''bras'', ''remove'' & gt ''wardrobe'', ''start''">Remove</a>'
+		'<a href="exec:gs ''bras'', ''remove'' & gt ''wardrobe'', ''main''">Remove</a>'
 	else
 		'Remove'
 	end
 	'</center></TD><TD><center>'
 	if $clothingworntype ! 'nude':
-		'<a href="exec:gs ''clothing'', ''strip'' & gt ''wardrobe'', ''start''">Remove</a>'
+		'<a href="exec:gs ''clothing'', ''strip'' & gt ''wardrobe'', ''main''">Remove</a>'
 	else
 		'Remove'
 	end
 	'</center></TD><TD><center>'
 	if $coatworntype ! 'none':
-		'<a href="exec:gs ''coats'', ''remove'' & gt ''wardrobe'', ''start''">Remove</a>'
+		'<a href="exec:gs ''coats'', ''remove'' & gt ''wardrobe'', ''main''">Remove</a>'
 	else
 		'Remove'
 	end
@@ -59,25 +77,25 @@ if $ARGS[0] = 'start':
 	end
 	'</center></TD><TR><TD><center>'
 	if $pantyworntype ! 'none':
-		'<a href="exec:gs ''panties'', ''remove'' & gt ''wardrobe'', ''start''">Remove</a>'
+		'<a href="exec:gs ''panties'', ''remove'' & gt ''wardrobe'', ''main''">Remove</a>'
 	else
 		'Remove'
 	end
 	'</center></TD><TD><center>'
 	if $shoeworntype ! 'none':
-		'<a href="exec:gs ''shoes'', ''strip'' & gt ''wardrobe'', ''start''">Remove</a>'
+		'<a href="exec:gs ''shoes'', ''strip'' & gt ''wardrobe'', ''main''">Remove</a>'
 	else
 		'Remove'
 	end
 	'</center></TD><TD><center>'
 	if bag = 1:
-		'<a href="exec:gs ''purses'', ''remove'' & gt ''wardrobe'', ''start''">Remove</a>'
+		'<a href="exec:gs ''purses'', ''remove'' & gt ''wardrobe'', ''main''">Remove</a>'
 	else
 		'Remove'
 	end
 	'</center></TD><TR><TD><TD><center>'
 	if ($clothingworntype ! 'nude' and ($coatworntype ! 'none' or bag > 0)) or ($coatworntype ! 'none' and bag > 0):
-		'<a href="exec:gs ''wardrobe'', ''removeall'' & gt ''wardrobe'', ''start''">Remove all items</a>'
+		'<a href="exec:gs ''wardrobe'', ''removeall'' & gt ''wardrobe'', ''main''">Remove all items</a>'
 	else
 		'Remove all items'
 	end
@@ -91,7 +109,7 @@ if $ARGS[0] = 'start':
 		gs 'clothing', 'strip'
 		gs 'panties', 'remove'
 		gs 'shoes', 'strip'
-		gt 'wardrobe', 'start'
+		gt 'wardrobe', 'main'
 	end
 
 	act 'Organise your wardrobe': org_loc = 1 & gt 'clothing', 'view_clothing_list', 'wardrobe'
@@ -105,7 +123,7 @@ if $ARGS[0] = 'start':
 		elseif ward_img_hgt > 500:
 			ward_img_hgt = 500
 		end
-		gt 'wardrobe', 'start'
+		gt 'wardrobe', 'main'
 	end
 end
 
@@ -150,15 +168,12 @@ if $ARGS[0] = 'default':
 			killvar 'quick_dress'
 			gt $loc, $loc_arg
 		else
-			gt 'wardrobe', 'start'
+			gt $loc, $loc_arg
 		end
 	end
 	act 'Add as a new custom set': gt 'wardrobe', 'default_entry_set', ARRSIZE('defclothingnumber')
 	'<center>Note: Selecting an outfit will show the bonus for equipped shoes, this is only applied when outside.</center>'
 	
-	'<center><table width="600">'
-	if quickdress = 0:'Display clothing set shortcuts: Currently OFF - <a href="exec:quickdress = 1 & gt ''wardrobe'', ''default''">Turn ON</a>'
-	if quickdress = 1:'Display clothing set shortcuts: Currently ON - <a href="exec:quickdress = 0 & gt ''wardrobe'', ''default''">Turn OFF</a>'
 	'</table></center>'
 end
 
@@ -223,7 +238,7 @@ if $ARGS[0] = 'default_entry_wear':
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		act 'Return':
 			if $wloc = 'wardrobe':
-				gt 'wardrobe', 'start'
+				gt 'wardrobe', 'main'
 			elseif $wloc = 'workout':
 				gt 'exercise', 'workout'
 			else
@@ -239,7 +254,7 @@ if $ARGS[0] = 'default_entry_wear':
 			gs 'clothing', 'strip'
 			killvar 'default_entry'
 			gs 'stat'
-			gt 'wardrobe', 'start'
+			gt 'wardrobe', 'main'
 		end
 	!! strength of clothing is less than or equal to 0
 	elseif dyneval('RESULT = <<$defclothingtype[default_entry]>>_h[<<defclothingnumber[default_entry]>>]') <= 0:
@@ -250,7 +265,7 @@ if $ARGS[0] = 'default_entry_wear':
 			gs 'clothing', 'strip'
 			killvar 'default_entry'
 			gs 'stat'
-			gt 'wardrobe', 'start'
+			gt 'wardrobe', 'main'
 		end
 	!! clothing exhibition is greater than player exhibition
 	elseif CloInhibit > pcs_inhib:
@@ -261,7 +276,7 @@ if $ARGS[0] = 'default_entry_wear':
 			gs 'clothing', 'strip'
 			killvar 'default_entry'
 			gs 'stat'
-			gt 'wardrobe', 'start'
+			gt 'wardrobe', 'main'
 		end
 	!! not exercise clothing, and not loose fitting
 	elseif $defclothingtype[default_entry] ! 'danilovich_outfits' and CloStyle ! 5:
@@ -275,7 +290,7 @@ if $ARGS[0] = 'default_entry_wear':
 				gs 'clothing', 'strip'
 				killvar 'default_entry'
 				gs 'stat'
-				gt 'wardrobe', 'start'
+				gt 'wardrobe', 'main'
 			end
 		!! clothing ok to wear after passing hip check
 		else
@@ -284,7 +299,7 @@ if $ARGS[0] = 'default_entry_wear':
 			'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 			act 'Return':
 				if $wloc = 'wardrobe':
-					gt 'wardrobe', 'start'
+					gt 'wardrobe', 'main'
 				elseif $wloc = 'workout':
 					gt 'exercise', 'workout'
 				else
@@ -299,7 +314,7 @@ if $ARGS[0] = 'default_entry_wear':
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
 		act 'Return':
 			if $wloc = 'wardrobe':
-				gt 'wardrobe', 'start'
+				gt 'wardrobe', 'main'
 			elseif $wloc = 'workout':
 				gt 'exercise', 'workout'
 			else
@@ -488,7 +503,7 @@ if $ARGS[0] = 'sports_entry_set':
 	gs 'stat'
 	if $clothingworntype ! 'danilovich_outfits' OR $shoeworntype ! 'danilovich':
 		MSG 'The sports outfit needs to include exercise clothes and training shoes'
-		gt 'wardrobe', 'start'
+		gt 'wardrobe', 'main'
 	else
 		gs 'stat'
 		$sportsclothingtype = $clothingworntype
@@ -593,7 +608,7 @@ if $ARGS[0] = 'sports_entry_wear':
 	
 	act 'Return':
 		if $wloc = 'wardrobe':
-			gt 'wardrobe', 'start'
+			gt 'wardrobe', 'main'
 		elseif $wloc = 'workout':
 			gt 'exercise', 'workout'
 		else
@@ -620,7 +635,7 @@ if $ARGS[0] = 'sports_outfit_remove':
 	'You change out of your sports outfit and back into your regular clothes.'
 	act 'Return':
 		if $wloc = 'wardrobe':
-			gt 'wardrobe', 'start'
+			gt 'wardrobe', 'main'
 		else
 			gt $loc, $loc_arg
 		end