1
0
Quellcode durchsuchen

[fixed] Corrected wardrobe access and fixed the dresses and panties in Fashionista

Kevin_Smarts vor 3 Jahren
Ursprung
Commit
176c204e5b

+ 1 - 1
locations/FedorEv4.qsrc

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

+ 3 - 3
locations/HotelRoom.qsrc

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

+ 1 - 1
locations/LariskaHome.qsrc

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

+ 1 - 1
locations/MDressing.qsrc

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

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

+ 1 - 1
locations/bedr2x.qsrc

@@ -27,7 +27,7 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 'The room is dominated by <a href="exec:gt ''bed'',''start''">full sized bed</a>'
 '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>.')
 	'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
 *nl
-'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a>.'
+'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 *nl
 *nl
 'Against the wall is a table with a <a href="exec:gt ''mirror'',''start''">mirror</a> above it.'
 'Against the wall is a table with a <a href="exec:gt ''mirror'',''start''">mirror</a> above it.'
 *nl
 *nl

+ 1 - 1
locations/bedrPar.qsrc

@@ -79,7 +79,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
 		! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
 		*nl
 		*nl
-		'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> where you can choose outfits and organise your clothing.'
+		'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 		*nl
 		*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.'
 		'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
 		*nl

+ 1 - 1
locations/brothel.qsrc

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

+ 1 - 1
locations/city_mansion_residence_1.qsrc

@@ -89,7 +89,7 @@ if $ARGS[0] = 'ybedroom':
 		*nl
 		*nl
 		'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
 		'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
 		*nl
 		*nl
-		'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a>.'
+		'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 	end
 	end
 end
 end
 
 

+ 1 - 1
locations/city_sauna.qsrc

@@ -102,7 +102,7 @@ if $ARGS[0] = 'saunaroom':
 	'<center><b><font color="maroon">Room</font></b></center>'
 	'<center><b><font color="maroon">Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunaroom.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunaroom.jpg"></center>'
 	*nl
 	*nl
-	'<br>The room has a thread bare <a href="exec:minut += 1 & gt ''bed2''">bed</a> and a cheap <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> where you can choose outfits and organize your clothing.'
+	'<br>The room has a thread bare <a href="exec:minut += 1 & gt ''bed2''">bed</a> and a cheap <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organize your clothing.'
 	*nl
 	*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>.'
 	'<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>.'

+ 1 - 1
locations/dachain.qsrc

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

+ 1 - 1
locations/dom_gor.qsrc

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

+ 1 - 1
locations/dorm.qsrc

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

+ 1 - 1
locations/fit.qsrc

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

+ 1 - 1
locations/gdksport.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 
 
 	act 'Change outfit in the locker room':
 	act 'Change outfit in the locker room':
 		cla
 		cla
-		gt 'wardrobe', 'main'
+		gt 'wardrobe', 'start'
 	end
 	end
 
 
 	gs 'wardrobe', 'sports_outfit'
 	gs 'wardrobe', 'sports_outfit'

+ 1 - 1
locations/gschool_grounds.qsrc

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

+ 1 - 1
locations/gschool_lessons4.qsrc

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

+ 1 - 1
locations/leonid.qsrc

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

+ 1 - 1
locations/mey_home.qsrc

@@ -224,7 +224,7 @@ if $ARGS[0] = '3':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/guestroom.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/guestroom.jpg"></center>'
 	*nl
 	*nl
 	'It feels and looks like a standard room in a hotel.'
 	'It feels and looks like a standard room in a hotel.'
-	'There is a <a href="exec:gt ''bed'', ''start''">bed</a>, a small <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gt ''stol'' ,''stolPar''">desk</a>.'
+	'There is a <a href="exec:gt ''bed'', ''start''">bed</a>, a small <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing), and a <a href="exec:gt ''stol'' ,''stolPar''">desk</a>.'
 	*nl
 	*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>.')
 	'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
 	*nl

+ 1 - 1
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>'
 	'<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>.'
 	'Your bedroom is fairly large, considering you''re only an employee. There is a small <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
-	'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a> (where you can choose outfits and organize your clothing). There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> next to it.'
+	'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> next to it.'
 	if komp = 1:
 	if komp = 1:
 		$komp = ' with your <a href="exec:gt ''Komp'', ''start''">laptop</a>.'
 		$komp = ' with your <a href="exec:gt ''Komp'', ''start''">laptop</a>.'
 	else
 	else

+ 1 - 1
locations/pav_shared_apt.qsrc

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

+ 12 - 1
locations/shop_fashionista.qsrc

@@ -163,6 +163,17 @@ if $ARGS[0] = 'dressingclothes':
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end
 end
 
 
+if $ARGS[0] = 'dressingclothes2':
+	cla
+	
+	if fashionista[i] ! 0:
+		msg 'You already own these clothes.'
+		gt 'shop_fashionista', 'clothes'
+	end
+
+	gt 'clothing', 'view_clothing_item', 'shop', 'fashionista',i, 8000
+end
+
 if $ARGS[0] = 'dressingoutfits':
 if $ARGS[0] = 'dressingoutfits':
 	*clr & cla
 	*clr & cla
 	$loc_arg = 'dressingoutfits'
 	$loc_arg = 'dressingoutfits'
@@ -282,7 +293,7 @@ if $ARGS[0] = 'dressingpanties2':
 		gt 'shop_fashionista', 'dressingpanties'
 		gt 'shop_fashionista', 'dressingpanties'
 	end
 	end
 
 
-	gt 'panties', 'view_panty_item', 'shop', 'shop_fashionista',i, 750
+	gt 'panties', 'view_panty_item', 'shop', 'fashionista',i, 750
 end
 end
 
 
 
 

+ 1 - 1
locations/shulgahall.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = '':
 	*nl
 	*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.'
 	'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:
 	if home_owned[2] = 0:
-		'There are several <a href="exec:gt ''wardrobe'', ''main''">closets</a> in the hall, which Sergey said you can use to store your clothes while you''re staying here</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
+		'There are several <a href="exec:gt ''wardrobe'', ''start''">closets</a> in the hall, which Sergey said you can use to store your clothes while you''re staying here</a>, and a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> on one of the doors.'
 	else
 	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.'
 		'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
 	end

+ 1 - 1
locations/stwork.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = 'start':
 		end
 		end
 	end
 	end
 	act 'Go to the staff bathroom':gt 'stwork', 'toilet'
 	act 'Go to the staff bathroom':gt 'stwork', 'toilet'
-	act 'Change your clothes':gt 'wardrobe', 'main'
+	act 'Change your clothes':gt 'wardrobe', 'start'
 	act 'Look in the mirror': gt 'mirror', 'start'
 	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'
 	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'
 	act 'Have a cup of water (0:05)':gs 'beverage', 'bev_wat'