Browse Source

[changed] ordering of various menus to have exits at the top as per normal game formatting:
brothel, burger, cafe_parco, gkafe, kafe, lakecafe, liamelkafe, ParkKafe, restoran.
[changed] renamed "Eat and run" to "Order take-out" to better define what the action is.
[changed] food_menu browsing now takes 5 minutes.
[changed] restored gkafe to charge for take-out, as only eat-in food is free, to encourage menu use and balance with the other restaurants.
[added] more descriptions to gkafe to show when you can eat for free.
[changed] the actions so it's possible to exit the random event, or continue to order food and ignore it, when sitting at the table of kafe.
[changed] renamed some actions in Kafe and gkafe to either shorten or better explain events.
[changed] parkkafe events now only show after order, as it used to be prior to menu introduction.

3xpurt 5 years ago
parent
commit
8cebb98ea2

+ 12 - 13
locations/ParkKafe.qsrc

@@ -9,26 +9,25 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	'<center><B><font color=maroon>Park Cafe</font></B></center>'
-	*nl
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/parkcafe.jpg"></center>'
+	*nl
+
+	act 'Leave the cafe': killvar 'pk_rand' & minut += 5 & gt 'park', 'start'
 
-	act 'See the menu':gs 'food_menu'
+	act 'Order from the menu (0:05)':pk_rand = rand(1, 7) & gs 'food_menu'
 	if money >= 350:
-		act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
+		act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 	'Whilst sitting and eating in the summer cafe. You take a moment and enjoy the beautiful scenery.'
 
-	arand = rand(1, 7)
+	if pk_rand = 1:'You look around and notice the cafe visitors, strolling past is a <a href="exec:gt ''ParkKafe'', ''youth''">Youth</a>.'
+	if pk_rand = 2:'You look around and notice the cafe visitors, sitting alone is a young <a href="exec:gt ''ParkKafe'', ''the_boy''">Man</a>.'
+	if pk_rand = 3:'You are watching the world go by, when you see some <a href="exec:gt ''ParkKafe'', ''negros''">Africans</a>.'
+	if pk_rand = 4:'You are watching the world go by, when you see a <a href="exec:gt ''ParkKafe'', ''woman''">woman</a> looking imperious.'
+	if pk_rand = 5:'You look around and notice the cafe visitors, you see a solid older <a href="exec:gt ''ParkKafe'', ''man''">man</a>.'
+	if pk_rand = 6:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''Armenians''">Armenians</a> sitting at a table.'
+	if pk_rand = 7:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''guys''">sporty guys</a> sitting at a table and drinking beer.'
 
-	if arand = 1:'You look around and notice the cafe visitors, strolling past is a <a href="exec:gt ''ParkKafe'', ''youth''">Youth</a>.'
-	if arand = 2:'You look around and notice the cafe visitors, sitting alone is a young <a href="exec:gt ''ParkKafe'', ''the_boy''">Man</a>.'
-	if arand = 3:'You are watching the world go by, when you see some <a href="exec:gt ''ParkKafe'', ''negros''">Africans</a>.'
-	if arand = 4:'You are watching the world go by, when you see a <a href="exec:gt ''ParkKafe'', ''woman''">woman</a> looking imperious.'
-	if arand = 5:'You look around and notice the cafe visitors, you see a solid older <a href="exec:gt ''ParkKafe'', ''man''">man</a>.'
-	if arand = 6:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''Armenians''">Armenians</a> sitting at a table.'
-	if arand = 7:'You are watching the cafe visitors and notice two <a href="exec:gt ''ParkKafe'', ''guys''">sporty guys</a> sitting at a table and drinking beer.'
-
-	act 'Leave': minut += 5 & gt 'park', 'start'
 end
 
 if $ARGS[0] = 'guys':

+ 7 - 7
locations/brothel.qsrc

@@ -66,9 +66,9 @@ if $ARGS[0] = 'lobby':
 	*nl
 	'Alongside the windows are tables, each for about four to six people.'
 	nroad = 20
-	act 'Hotel bar': gt 'brothel', 'bar'
-	act 'Lobby bathroom': gt 'brothel', 'lobby:toilet'
-	act 'Leave':gt 'road'
+	act 'Leave the hotel':gt 'road'
+	act 'Visit the Hotel bar': gt 'brothel', 'bar'
+	act 'Visit the bathroom': gt 'brothel', 'lobby:toilet'
 end
 
 if $ARGS[0] = 'lobby:toilet':
@@ -87,7 +87,7 @@ if $ARGS[0] = 'lobby:toilet':
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/hoteltoilet.jpg"></center>'
 	*nl
 
-	act 'Leave':gt 'brothel', 'lobby'
+	act 'Return to the lobby':gt 'brothel', 'lobby'
 
 	act 'Look into the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
@@ -123,9 +123,9 @@ if $ARGS[0] = 'bar':
 		*nl
 		'<font color=#<<$red_font>>>You are wasted. Lying your head on the bar, barely keeping awake. The barman starts to be nervous, probably afraid of scaring away the regular guests.</font>'
 	end
+	act 'Leave the bar':gt 'brothel', 'lobby'
 	act 'Order something':gt 'brothel', 'bar:order'
 	act 'Just sit here':gt 'brothel', 'bar:sit'
-	act 'Leave the bar':gt 'brothel', 'lobby'
 end
 
 if $ARGS[0] = 'bar:sit':
@@ -184,8 +184,8 @@ if $ARGS[0] = 'bar:order':
 		! if hotelWhore = 1:
 			! act 'Order a Blue-blooded Russian.':gt 'brothel','bar:order:password'
 		! end
-		act 'See the menu': gs 'food_menu'
-		act 'Return':gt 'brothel', 'bar'
+		act 'Cancel order':gt 'brothel', 'bar'
+		act 'Order from the menu (0:05)': gs 'food_menu'
 	end
 end
 

+ 3 - 3
locations/burger.qsrc

@@ -18,15 +18,15 @@ if $ARGS[0] = 'start':
 
 	if BistroBoss > 0:'<a href="exec:gt ''burger'', ''boss''">The Office of the Director</a> Anatoly Borisovich'
 
-	act 'Leave':
+	act 'Leave the diner':
 		cla
 		minut += 1
 		gt 'down'
 	end
 
-	act 'See the menu':gs 'food_menu'
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if money >= 315:
-		act 'Eat and run (0:20) (315 <b>₽</b>)':money -= 315 & gt 'food', 'f_food'
+		act 'Order take-out (0:20) (315<b>₽</b>)':money -= 315 & gt 'food', 'f_food'
 	end
 
 	if IvanPodstavaQW = 2:

+ 6 - 6
locations/cafe_parco.qsrc

@@ -11,9 +11,9 @@ if $args[0]= 'start':
 	'The newly opened cafe "Del Parco", with its striking facade, there are lots of tables and a summer terrace. Opening hours between 14.00 to 21.00.'
 
 	if hour >= 14 and hour < 21:
-		act 'Enter': gt 'cafe_parco', 'inner'
+		act 'Enter the cafe': gt 'cafe_parco', 'inner'
 	end
-	act 'Go back to the square': gt 'gskver', 'start'
+	act 'Return to the square': gt 'gskver', 'start'
 end
 
 if $args[0]= 'inner':
@@ -24,13 +24,13 @@ if $args[0]= 'inner':
 	$loc = 'cafe_parco'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/cafe/caffe_del_parco_in.jpg"></center>'
 
-	act 'See the menu':gs 'food_menu'
+	act 'Exit the cafe': gt 'gskver', 'start'
+
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if money >= 350:
-		act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
+		act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 
-	act 'Go back outside': gt 'gskver', 'start'
-
 	gs 'family'
 
 	if (sunWeather = 0 or temper < 5) and week mod 2 = 0 and (hour >= 14 and hour < 20) and mey_vika_qw_day ! daystart:

+ 7 - 3
locations/food_menu.qsrc

@@ -4,8 +4,12 @@ food_loc = 1
 gs 'themes', 'food_menu'
 
 *clr & cla
-act 'Back':killvar 'food_loc' & gt $loc, $metka
-
+act 'Return':
+	killvar 'food_loc'
+	minut += 5
+	gs 'stat'
+	gt $loc, $metka
+end
 killvar '$_drink'
 killvar '$_eat'
 if $loc = 'burger':
@@ -52,7 +56,7 @@ if $loc = 'gkafe':
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
-	if storyline > 0 and SchoolBlock = 0:
+	if home_owned[2] = 1 or SchoolBlock = 0:
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
 		$_eat['0,price'] = 'Free'

+ 25 - 12
locations/gkafe.qsrc

@@ -12,12 +12,14 @@ if $ARGS[0] = '':
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
+	*nl
 	'A small cafe, attached to the train station. It looks rather shabby.'
 	'The cafe is closed right now, it''s usually open between 8:00 and 20:00.'
 
 	if mother_go = 1 and hour = 16 and indorf = 0:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe.jpg"></center>'
+		*nl
 		'A small cafe, attached to the train station. It looks rather shabby.'
 		'The door is currently locked, and the sign on the door says "Closed". That''s strange, the cafe is supposed to be open at this time.'
 
@@ -32,6 +34,7 @@ if $ARGS[0] = '':
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/event/momslut.jpg"></center>'
+				*nl
 
 				if momslut >= 1:
 					'You carefully climb on top of the boxes, and stand on your toes to reach the small window. It gives you a view into the back room of the cafe. Through the window you see your mother on her knees, giving the cafe owner a blowjob. She''s very enthusiastic about it, and alternates between sucking his dick and licking his balls. Then she begins to deepthroat him, sliding his dick further and further down her mouth until his balls rest on her chin.'
@@ -46,6 +49,7 @@ if $ARGS[0] = '':
 					mother_go = 0
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/event/momslut2.jpg"></center>'
+					*nl
 					'The cafe owner abruptly pulls his groin away from your mother''s mouth, a string of saliva still attached to his dick as he roughly pulls your mother up by her shoulders and tells her to lean against the wall. You can''t hear them talking but he definitely seems to be in charge, and your mother is all too willing in following up his every demand. Your mother lewdly turns her back to him and gently wiggles her ass, and he immediately drove his cock in her pussy. His thrusting is fast and furious and you figure he doesn''t intend to stay here much longer, knowing he has to open the cafe again before too many people notice. Your mother is moaning loudly as she is getting her pussy roughly pounded by her boss, you can easily hear it despite the window between you and them. And sure enough, a few moments later he grabs her ass as his body spasms, dumping his load deep inside her. Your mother drops to her knees quickly without needing a prompt and cleans him up with her tongue, after which he pulls up his pants and goes to re-open the cafe. Your mother sits on the ground for a while to recuperate, licking her lips with a dreamy look in her eyes. You quickly get off the crates, before she sees you.'
 
 					act 'Go back to the train station':gt 'pavtrain'
@@ -59,9 +63,22 @@ if $ARGS[0] = '':
 		if hour >= 8 and hour <= 19:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe2.jpg"></center>'
+			*nl
 			'A small cafe, attached to the train station. It looks rather shabby.'
 
-			if StoryLine > 0:'Since your <<$npc_nickname[''A29'']>> works here, you can eat here for free.'
+			act 'Leave the cafe':gt 'pavtrain'
+			
+			gs 'gkafe', 'menu'
+
+			if StoryLine > 0 and home_owned[2] = 1 and SchoolBlock = 0:
+				'Since your <<$npc_nickname[''A29'']>> works here at the cafe, you can eat-in for free.'
+			elseif StoryLine > 0 and home_owned[2] = 0 and SchoolBlock = 0:
+				'Since your <<$npc_nickname[''A29'']>> kicked you out of home, you can no longer eat here for free.'
+			elseif StoryLine > 0 and home_owned[2] = 1 and SchoolBlock = 0:
+				'Since you got kicked out of school, you can no longer eat here for free, your <<$npc_nickname[''A29'']>> wants you to earn a living.'
+			elseif StoryLine > 0 and home_owned[2] = 0 and SchoolBlock = 1:
+				'Since you got kicked out of school and your <<$npc_nickname>> kicked you out of home, you can no longer eat here for free.'
+			end
 
 			if week < 6:
 				if hour >= 6 and hour < 16 and StoryLine > 0:
@@ -78,12 +95,12 @@ if $ARGS[0] = '':
 					''
 					'A male figure walks closely by your table. You look up and recognize uncle Misha, your neighbor. He stops and recognizes you as well, and sits down with you. He gives you a friendly smile as he says: "Oh, <<$pcs_nickname>>, hello. Listen, me and your stepfather were working late in the garage yesterday, and went for a nightcap at my place when we were finished. When your stepfather left, he accidentally left some of his tools behind. I''m fairly sure he needs them again today, and I could use a hand bringing them back to the garage. Could you help me out? I''ll give you money so you can get some ice cream for your troubles."'
 
-					act 'Agree to help uncle Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1'
+					act 'Go help uncle Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1'
 				elseif razvrand > 7 and hour > 16 and hour < 20 and dyadyamishaevent = 1 and dmishaday ! daystart:
 					''
 					'Suddenly, a man slides in the seat next to you while you eat your meal. You look up and see it''s uncle Misha. He has a greedy look in his eyes, the kind that is already stripping you naked in his thoughts. His eyes are fixated on your boobs as he says: "Hey, <<$pcs_nickname>>. Would you like to join me for some tea at my place? We can have a bit of fun just like last time, and you can earn some more money..."'
 
-					act 'Agree to go ''drink tea'' with uncle Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1-1'
+					act '"Drink tea" with uncle Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1-1'
 				end
 			end
 			if StoryLine = 1 and SchoolAtestat = 0:
@@ -91,8 +108,6 @@ if $ARGS[0] = '':
 					'You see your classmates <a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> sitting at a table in the far corner, drinking beer.'
 			end
 		end
-		act 'Leave':gt 'pavtrain'
-		if hour >= 8 and hour <= 19:gs 'gkafe', 'menu'
 	end
 end
 
@@ -100,12 +115,9 @@ if $ARGS[0] = 'menu':
 	menu_off = 1
 	$loc = 'gkafe'
 	$metka = ''
-	act 'See the menu':gs 'food_menu'
-	if (StoryLine = 0 or (StoryLine > 0 and SchoolBlock = 1)) and money >= 350:
-		act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
-	end
-	if storyline > 0 and SchoolBlock = 0:
-		act 'Eat and run (0:20)': gt 'food', 'f_food'
+	act 'Order from the menu (0:05)':gs 'food_menu'
+	if money >= 350:
+		act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 	end
 end
 
@@ -113,9 +125,10 @@ if $ARGS[0] = 'boris':
 	menu_off = 1
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/cafe/Borislav.jpg"></center>'
+	*nl
 	'The owner of the cafe, called Borislav. He is a tall, thin man in his forties. Most people call him Slava.'
 
-	act 'Leave':gt 'gkafe'
+	act 'Return':gt 'gkafe'
 end
 
 --- gkafe ---------------------------------

+ 18 - 16
locations/kafe.qsrc

@@ -17,15 +17,14 @@ if $ARGS[0] = 'start':
 	'Sitting at one end of the bar, you see <a href="exec:gt ''kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
 	*nl
 	'They serve American style meals'
+
+	act 'Leave the diner': minut += 5 & gt 'street'
+
 	if QWdogReiq = 3 and week = 7 and hour >= 12:
-		act 'Sit down at the table and wait for Margaret':gt 'kafe2', 'margo'
+		act 'Sit down and wait for Margaret':gt 'kafe2', 'margo'
 	end
 
-	!!act 'Agree':gt 'cafe3', 'wc'
-
 	act 'Sit down at a table': gt 'kafe', 'table'
-
-	act 'Leave': minut += 5 & gt 'street'
 end
 
 if $ARGS[0] = 'table':
@@ -43,14 +42,15 @@ if $ARGS[0] = 'table':
 	'Sitting at one end of the bar, you see <a href="exec:gt ''kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
 	*nl
 	'They serve American style meals'
-	act 'See the menu':gs 'food_menu'
+
+	act 'Get up from the table':gt 'kafe', 'start'
+
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if rand(1, 10) > 5:
 		gs 'boy'
 		'A man comes over to your table <<$boybody>> <<$boybod>> <<$boyface>> introducing himself as <<$boydesc>>.'
 		xgt 'kafe', 'razvod'
 	end
-
-	act 'Get up from the table':gt 'kafe', 'start'
 end
 
 if $ARGS[0] = 'vlad':
@@ -851,43 +851,45 @@ if $ARGS[0] = 'razvod':
 	menu_off = 0
 	$location_type = 'event'
 	cla
-	!!*clr
-	!!act 'Get up from the table':gt 'kafe', 'start'
+	act 'Get up from the table':gt 'kafe', 'start'
+
+	act 'Order from the menu (0:05)':gs 'food_menu'
+
 	deyst = rand(0, 3)
 	if deyst = 0:
 		'<<$boydesc>> invites you to dance.'
-		act 'Dance':gt 'cafe2', 'dance'
+		act 'Dance with him':gt 'cafe2', 'dance'
 		if pcs_horny < 75:
 			act 'Leave': minut += 5 & gt 'street'
 		end
 	elseif deyst = 1:
 		'<<$boydesc>> asks permission to sit down at the same table as you.'
-		act 'Drink':gt 'cafe2', 'booze'
+		act 'Drink with him':gt 'cafe2', 'booze'
 		if pcs_horny < 75:
 			act 'Leave': minut += 5 & gt 'street'
 		end
 	elseif deyst = 2:
 		'<<$boydesc>> invites you to a nearby party which he is going to.'
-		act 'Agree':gt 'cafe2', 'kompashka'
+		act 'Agree to party':gt 'cafe2', 'kompashka'
 		if pcs_horny < 75:
 			act 'Leave': minut += 5 & gt 'street'
 		end
 	elseif deyst = 3:
 		'<<$boydesc>> is incredibly drunk and you feel tipsy just from the smell of booze on him. "Hey baby, got some spare time? Come have fun in the outhouse."'
-		act 'Agree':gt 'cafe3', 'toilet'
+		act 'Meet in bathroom':gt 'cafe3', 'toilet'
 		if pcs_horny < 95:
 			act 'Leave':
 				cla
 				if rand(0, 400) < pcs_apprnc:
 					'"Come on, baby, I will give you two thousand <b>₽</b>. Daddy wants to have fun."'
-					act 'Agree':
+					act 'Meet in bathroom':
 						money += 2000
 						gt 'cafe3', 'toilet'
 					end
 				else
 					'"Well, okay, get out of here, you are ugly anyway."'
 				end
-				act 'Fuck you': minut += 5 & gt 'street'
+				act 'Tell him to fuck off': minut += 5 & gt 'street'
 			end
 		end
 	end

+ 7 - 7
locations/lakecafe.qsrc

@@ -18,6 +18,8 @@ if $ARGS[0] = 'main':
 	'Opening hours: 14:00 to 04:00'
 	*nl
 
+	act 'Leave the cafe':minut += 2 & gt 'nord'
+
 	if hour >= 14 or hour < 4:
 		if npc_Qstlvl['A89'] = 0:
 			if barrnd = 1:'Behind the bar you see a smiling <a href="exec:gt ''lakecafe'', ''barmensha''">barmaid</a>, who is currently polishing some glasses.'
@@ -60,17 +62,15 @@ if $ARGS[0] = 'main':
 
 		'The diner has a single <a href="exec:gt ''laketoilet'', ''main''">toilet</a> available, for both males and females.'
 
-		act 'See the menu':gs 'food_menu'
+		act 'Order from the menu (0:05)':gs 'food_menu'
 		if money >= 350:
-			act 'Eat and run (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
+			act 'Order take-out (0:20) (350 <b>₽</b>)':money -= 350 & gt 'food', 'f_food'
 		end
 	end
 
 	if LCwork2 >= 1 and LCwork2day ! daystart and hour = 18:
-		act 'Offer to help out the kitchen (1:30)':gt 'LCwork', 'Kitchen'
+		act 'Help out the kitchen (1:30)':gt 'LCwork', 'Kitchen'
 	end
-
-	act 'Leave':minut += 2 & gt 'nord'
 end
 
 if $ARGS[0] = 'barmensha':
@@ -104,6 +104,8 @@ if $ARGS[0] = 'barmensha':
 		'Eugene smiles as she sees you approach the bar, and says cheerfully: "Hi, <<$pcs_nickname>>! What''s up?"'
 	end
 
+	act 'Leave Eugene so she can work':gt 'lakecafe', 'main'
+
 	if hour >= 14 or hour < 4:
 		if npc_Qstlvl['A89'] = 0:
 			act 'Chat with the barmaid (0:30)':
@@ -329,8 +331,6 @@ if $ARGS[0] = 'barmensha':
 		end
 	end
 
-	act 'Leave Eugene so she can work':gt 'lakecafe', 'main'
-
 	if npc_horny['A89'] > 50:
 		'Eugene smiles at you, with a glimmer in her eye.'
 		if LCEugenefirst > 0:

+ 9 - 5
locations/liamelkafe.qsrc

@@ -9,7 +9,11 @@ if $ARGS[0] = 'start':
 	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/cafe/larek.jpg" ></center>'
+	*nl
 	'You enter a tiny cafe, consisting of very little floor space packed with small tables.'
+
+	act 'Leave the cafe':gt 'liames'
+
 	if hour > 11 and hour < 13:
 		'The cafe is packed with people eating their afternoon meal.'
 		if stallionQ = 1: stallionQ = 2
@@ -20,7 +24,6 @@ if $ARGS[0] = 'start':
 	if money > 45:
 		act 'Sit down for a meal': money -= 45 & gt 'liamelkafe', 'food'
 	end
-	act 'Leave':gt 'liames'
 end
 
 if $ARGS[0] = 'food':
@@ -32,9 +35,11 @@ if $ARGS[0] = 'food':
 	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/cafe/larek.jpg" ></center>'
-	act 'See the menu':gs 'food_menu'
+
+	act 'Leave the table':gt 'liamelkafe', 'start'
+	act 'Order from the menu (0:05)':gs 'food_menu'
 	if stallionQ = 2:
-		if FocH > (Foch_Max - 10): 
+		if FocH > (Foch_Max - 10):
 			stallionQ = 3
 			FocH = Foch_Max
 			EggRH += 300
@@ -44,8 +49,7 @@ if $ARGS[0] = 'food':
 	end
 	'The tiny cafe is wonderfully situated and you enjoy the beautiful scenery as you eat.'
 	if stallionQ = 0: StallionQ = 1
-	
-	act 'Leave the table':gt 'liamelkafe', 'start'
+
 end
 
 --- liamelkafe ---------------------------------

+ 4 - 3
locations/restoran.qsrc

@@ -15,8 +15,9 @@ if $ARGS[0] = 'start':
 
 	if vladimirday = daystart and vladimirQW = 21 and hour = 20: gt 'qwmeet'
 
-	act 'Approach the maître d'' ': gt 'restoran', 'maitred'
 	act 'Leave the restaurant': minut += 5 & gt 'down'
+
+	act 'Approach the maître d'' ': gt 'restoran', 'maitred'
 end
 
 if $ARGS[0] = 'maitred':
@@ -108,7 +109,7 @@ if $ARGS[0] = 'comtable':
 	'<center><b><font color="maroon">Babel, Common Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/maitredseat.jpg"></center>'
 	'You are escorted to your seat by the maître d''. You sit and and prepare to order a wonderful meal in the busy restaurant.'
-	act 'See the menu': gs 'food_menu'
+	act 'Order from the menu (0:05)': gs 'food_menu'
 
 	act 'Get up from the table': gt 'restoran', 'zal'
 end
@@ -124,7 +125,7 @@ if $ARGS[0] = 'viptable':
 	'<center><b><font color="maroon">Babel, VIP room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/chefrecommends.jpg"></center>'
 	'You sit and prepare to order a wonderful meal, recommended by the chef. You''ll be dining with pleasure in the peaceful and luxurious VIP Room.'
-	act 'See the menu': gs 'food_menu'
+	act 'Order from the menu (0:05)': gs 'food_menu'
 
 	act 'Get up from the table': gt 'restoran', 'vip'
 end