Selaa lähdekoodia

Update location to use new wardrobe clothes picker.

KevinSmarts 9 vuotta sitten
vanhempi
commit
a075852f49

+ 1 - 1
locations/Gadhouse

@@ -136,7 +136,7 @@ $villagecat = {
 
 '<center><H4>Cottage</H4></center>'
 '<center><img src="images/qwest/gadukino/izba.jpg"></center>'
-'Simple village hut. In a small room is <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">cupboard</a> and <a href="exec:gad = 1 & gt ''bed2''">bed</a> where you can sleep. In a large room is <a href="exec:gt ''tvPar''">tv_set</a>. TV stands next to an ancient <a href="exec:gt ''mirror'', ''start''">trellis</a>'
+'Simple village hut. In a small room is a wardrobe (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>) and <a href="exec:gad = 1 & gt ''bed2''">bed</a> where you can sleep. In a large room is <a href="exec:gt ''tvPar''">tv_set</a>. TV stands next to an ancient <a href="exec:gt ''mirror'', ''start''">trellis</a>'
 if catday = daystart:
 	'On the table by the window lazily lying cat <a href="exec: dynamic $villagecat ">Boniface</a>.'
 else

+ 3 - 3
locations/HotelRoom

@@ -13,7 +13,7 @@ $loc = $CURLOC
 	'<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 src="images/nigma/gor/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 ''clothing'', ''view_clothing_list'', ''wardrobe''">closet</a> for your clothes 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 wardrobe (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>) 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>.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
@@ -41,7 +41,7 @@ $loc = $CURLOC
 	'<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 src="images/nigma/gor/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 ''clothing'', ''view_clothing_list'', ''wardrobe''">closet</a> for your clothes 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 wardrobe (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>) 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>, right across the bed.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
@@ -66,7 +66,7 @@ $loc = $CURLOC
 	'<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 src="images/nigma/gor/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 ''clothing'', ''view_clothing_list'', ''wardrobe''">closet</a> for your clothes 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 wardrobe (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>) 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>, right across the bed.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':

+ 1 - 1
locations/MDressing

@@ -7,7 +7,7 @@ cls
 gs 'stat'
 '<center><img src="images/BDSM_Club/Hallways/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 ''clothing'', ''view_clothing_list'', ''wardrobe''">wardrobes</a> where you can change your clothes.'
+'It contains several wardrobes (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>).'
 
 act 'Go to foyer': gt 'MHall', 'foyer'
 act 'Goto east wing hall': gt 'MHall', 'east'

+ 1 - 1
locations/bedr

@@ -27,7 +27,7 @@ if magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt 'tobiQW', 'start'
 if rembedr = 0:
 	'<center><img src="images/etogame/bedr.jpg"></center>'
 	'A tight, little room with a <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.' 
-	'An old wooden wardrobe (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>)stands near the door to the corridor, on top of it there''s a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">suitcase</a> you can store some clothes in. The windows are closed with faded, heavy curtains.'
+	'An old wooden wardrobe (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>) stands near the door to the corridor, on top of it there''s a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">suitcase</a> you can store some clothes in. The windows are closed with faded, heavy curtains.'
 else
 	'<center><img src="images/etogame/bedr2.jpg"></center>'
 	'A bright and beautiful room, with a large, kingsized <a href="exec:gt ''bed'', ''start''">double bed</a>.'

+ 1 - 1
locations/bedrPar

@@ -18,7 +18,7 @@ if sisboyday + 1 = daystart and hour = 18:gt'sisterQW','sisboyQW_expel'
 '<center><b><font color="maroon">Your bedroom</font></b></center>'
 ! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
 '<center><img src="images/qwest/alter/bedrPar.jpg"></center>'
-'A small room in which you and your sister live. It contains a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">wardrobe</a> for your clothes, your <a href="exec:gt ''bed2''">bed</a>, a <a href="exec:gt ''stol'' ,''stolPar''">desk</a> and your sister''s bed. You hide your birth control in a drawer in your desk.'
+'A small room in which you and your sister live. It contains a wardrobe (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>), on top of it there''s a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">suitcase</a> you can store some clothes in. Also your <a href="exec:gt ''bed2''">bed</a>, a <a href="exec:gt ''stol'' ,''stolPar''">desk</a> and your sister''s bed. You hide your birth control in a drawer in your desk.'
 if komp = 1:'Your <a href="exec:gorodokKomp = 1 & GT ''Komp'',''start''">laptop</a> is on the desk.'
 gorodokKomp = 0
 

+ 2 - 2
locations/bordel

@@ -79,8 +79,8 @@ if $ARGS[0] = 'dysh':
 		borMir = 1
 		gt 'mirror', 'start'
 	end
-	act 'Clothes locker':
-		gt 'clothing', 'view_clothing_list', 'wardrobe', 'brothel'
+	act 'Change your clothes':
+		gt 'clothing_QV', 'list'
 	end
 end
 

+ 1 - 1
locations/dom_gor

@@ -12,7 +12,7 @@ bcolor = rgb(255, 255, 255)
 lcolor = rgb(106, 90, 205)
 '<center><b><font color="maroon">Your room</font></b></center>'
 '<center><img src="images/etogame/kom_gor.jpg"></center>'
-'Your room in a hostel. The room is small, there is only the minimum necessary. 2 <a href="exec:gt ''bed'', ''start''">beds</a>, a <a href="exec:gt ''gor_mirror'', ''start''">mirror</a>, <a href="exec:gt ''clothing'', a ''view_clothing_list'', ''wardrobe''">wardrobe</a> for your clothes and a small TV.'
+'Your room in a hostel. The room is small, there is only the minimum necessary. 2 <a href="exec:gt ''bed'', ''start''">beds</a>, a <a href="exec:gt ''gor_mirror'', ''start''">mirror</a>, a wardrobe (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>) and a small TV.'
 
 if $clothingworntype = 'exercise' and teachlevel > 20 and parkrunday ! daystart and hour < 21 and hour > 6:
 	act 'Go for a jog around the Square (1:00)':

+ 2 - 2
locations/fit

@@ -119,9 +119,9 @@ if $ARGS[0] = 'dressing room':
 		gt 'mirror', 'start'
 	end
 
-	act 'Check clothes in locker':
+	act 'Change clothes':
 		cla
-		gt 'clothing', 'view_clothing_list', 'wardrobe'
+		gt 'clothing_QV', 'list'
 	end
 
 	if razdtumbler = 1 and $clothingworntype = 'exercise':

+ 3 - 3
locations/gdksport

@@ -47,9 +47,9 @@ if $ARGS[0] = 'start':
 			gt 'gdksport', 'start'
 		end
 	end
-	if albinaQWdance > 0 or gsAboDance > 0 or gsAboBeg > 0 or gsAboVolley > 0:
-		act 'Change clothes in the locker room':gt 'clothing', 'view_clothing_list', 'wardrobe'
-	end	
+
+	act 'Change clothes in the locker room':gt 'clothing_QV', 'list'
+
 	if  $clothingworntype ! 'exercise' and (albinaQWdance > 0 or gsAboDance > 0 or gsAboBeg > 0 or gsAboVolley > 0):'You are not dressed in sports clothes.'
 	if sweat >= 0:
 		act 'Wash in the shower':gt 'gdksport', 'shower'

+ 1 - 1
locations/korr

@@ -63,7 +63,7 @@ if remkorr = 0:
 	'In the hallway wallpaper which where moved away from the walls, and has long faded. A <a href="exec:gt ''cloakroom'', ''view_coat_list''">coat rack</a> and a shelf for shoes are near the entrance. A <a href="exec:gt ''mirror'', ''start''">mirror</a> hangs on the wall.'
 else
 	'<center><img src="images/etogame/korr2.jpg"></center>'
-	'Modern hall with stylish furniture, a wall-mounted <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
+	'Modern hall with stylish furniture, a wall-mounted <a href="exec:gt ''mirror'', ''start''">mirror</a>. A <a href="exec:gt ''cloakroom'', ''view_coat_list''">coat rack</a> and a shelf for shoes are near the entrance.'
 end
 
 if suhbelo > 0:'Drying on the clothesline are <<suhbelo>> laundry items.'

+ 1 - 1
locations/obroom

@@ -13,7 +13,7 @@ if $ARGS[0] = 'start':
 	'<center><b>Your room</b></center>'
 	'<center><img src="images/img/centr/obroom.jpg"></center>'
 	'This is your room, with you in it lives another girl Vika'
-	'Right next door is the old <a href="exec:GT ''clothing'', ''view_clothing_list'', ''wardrobe''">cupboard</a>.'
+	'Right next to the door is an old wardrobe (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>), on top of it there''s a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">suitcase</a> you can store some clothes in.'
 	'On the wall, near the hanging cabinet <a href="exec:GT ''mirror'',''start''">mirror</a>.'
 	'Near the wall is your <a href="exec:GT ''bed'',''start''">bed</a>.'
 	if komp = 1:'On your bed lying <a href="exec:GT ''Komp'',''start''">notebook</a>.'

+ 1 - 1
locations/saunaroom

@@ -8,7 +8,7 @@ $locM = $CURLOC
 saunaYouRoom = 1
 '<center><b><font color="maroon">Room</font></b></center>'
 '<center><img src="images/etogame/saunaroom.jpg"></center>'
-'The room has a thread bare <a href="exec:sec += 30 & gt ''saunabed''">bed</a> and a cheap <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">wardrobe</a>.'
+'The room has a thread bare <a href="exec:sec += 30 & gt ''saunabed''">bed</a> and a cheap wardrobe (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>).'
 'Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>'
 
 if money > 0 and workDolg > 0:workDolg -= money & money = 0

+ 1 - 1
locations/spalnya

@@ -13,7 +13,7 @@ gs 'stat'
 '<center><img src="images/img/centr/spaln.jpg"></center>'
 
 'The room is a very good size, there is  a <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
-'Also, an expensive <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">wardrobe</a> standing against a wall, bestide which stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
+'Also, an expensive wardrobe (where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>) stands against a wall, beside which stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
 if komp = 1:
 	$komp = ' with your <a href="exec:gt ''Komp'', ''start''">laptop</a> on it'
 else

+ 1 - 1
locations/ybedr

@@ -11,7 +11,7 @@ gs 'stat'
 if ymanrem[4] = 0:'<center><img src="images/etogame/ynill.jpg"></center>'
 if ymanrem[4] = 1:'<center><img src="images/etogame/yrem.jpg"></center>'
 if ymanrem[4] = 2:'<center><img src="images/etogame/ybedr.jpg"></center>'
-if ymanrem[4] = 2:'Bright and beautiful room, with a nice <a href="exec:gt ''bed'', ''start''">double bed</a>. Near the entrance is a modern <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">wardrobe</a>. Against the wall are a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a>'
+if ymanrem[4] = 2:'Bright and beautiful room, with a nice <a href="exec:gt ''bed'', ''start''">double bed</a>. Near the entrance is a modern wardrobe(where you can <a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe''">organize your clothes</a> or <a href="exec:gt ''clothing_QV'', ''list''">pick something to wear</a>). You have a <a href="exec:gt ''clothing'', ''view_clothing_list'', ''store''">chest</a> at the end of your bed where you can store some clothes.. Against the wall are a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a>'
 
 act 'Leave the room':minut += 1 & gt 'ymans'