Przeglądaj źródła

[changed] combined food and beverage menus. Menus now return to the menu after eating/drinking.
[changed] brothel now offers the blue-blooded Russian from the drinks menu, only after unlocking.
[Added] fast food option to diners and cafes.

3xpurt 5 lat temu
rodzic
commit
8339faa20f

+ 0 - 1
glife.qproj

@@ -213,7 +213,6 @@
 		<Location name="bed1"/>
 		<Location name="bed2"/>
 		<Location name="beverage"/>
-		<Location name="beverage_menu"/>
 		<Location name="dreams"/>
 		<Location name="budilnik"/>
 		<Location name="divan"/>

+ 1 - 2
locations/ParkKafe.qsrc

@@ -12,8 +12,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/parkcafe.jpg"></center>'
 
-	act 'Order food':gs 'food_menu'
-	act 'Order drinks':gs 'beverage_menu'
+	act 'See the menu':gs 'food_menu'
 	'Whilst sitting and eating in the summer cafe. You take a moment and enjoy the beautiful scenery.'
 
 	arand = rand(1, 7)

+ 69 - 13
locations/beverage.qsrc

@@ -23,7 +23,11 @@ if $ARGS[0] = 'bev_kva':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bev_jui':
@@ -50,7 +54,11 @@ if $ARGS[0] = 'bev_jui':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bev_mil':
@@ -76,7 +84,11 @@ if $ARGS[0] = 'bev_mil':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bev_wat':
@@ -100,7 +112,11 @@ if $ARGS[0] = 'bev_wat':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bev_cof':
@@ -126,7 +142,11 @@ if $ARGS[0] = 'bev_cof':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bev_tea':
@@ -152,7 +172,11 @@ if $ARGS[0] = 'bev_tea':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bev_vod':
@@ -179,7 +203,11 @@ if $ARGS[0] = 'bev_vod':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bev_bla':
@@ -206,7 +234,11 @@ if $ARGS[0] = 'bev_bla':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bev_sco':
@@ -233,7 +265,11 @@ if $ARGS[0] = 'bev_sco':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bev_win':
@@ -260,7 +296,11 @@ if $ARGS[0] = 'bev_win':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bev_mar':
@@ -287,7 +327,11 @@ if $ARGS[0] = 'bev_mar':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bev_cha':
@@ -314,7 +358,11 @@ if $ARGS[0] = 'bev_cha':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bev_bee':
@@ -341,7 +389,15 @@ if $ARGS[0] = 'bev_bee':
 	gs 'stat'
 	killvar '$_drink'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
+end
+
+if $ARGS[0] = 'bev_bbr':
+	food_loc = 0 & gt 'brothel','bar:order:password'
 end
 
 if $ARGS[0] = 'afteralcohol':

+ 0 - 262
locations/beverage_menu.qsrc

@@ -1,262 +0,0 @@
-# beverage_menu
-menu_off = 1
-
-if night_mode = 1:
-	$fcolor1 = '#FFFFFF'
-	$bcolor1 = '#202020'
-	$bcolor2 = '#303030'
-else
-	$fcolor1 = '#000000'
-	$bcolor1 = '#FFFFFF'
-	$bcolor2 = '#e6f2ff'
-end
-
-*clr & cla
-act 'Back':gt $loc, $metka
-killvar '$_drink'
-if $loc = 'burger':
-	'<center><b><font color="maroon">Diner Bystroeshka</font></b></center>'
-	*nl
-	!'<center><img <<$set_imgh>> src="images/shared/menus/burger.png"</center><br>'
-	'<center><img <<$set_imgh>> src="images/shared/drinks/dinerdrinks.jpg"</center><br>'
-	$_drink['0,name'] = 'Water'
-	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
-	$_drink['1,name'] = 'Kvass'
-	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 55
-	$_drink['2,name'] = 'Juice'
-	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 70
-	$_drink['3,name'] = 'Spiced Tea'
-	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 110
-	$_drink['4,name'] = 'Black Coffee'
-	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 120
-	$_drink['5,name'] = 'Milkshake'
-	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 180
-end
-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>'
-	$_drink['0,name'] = 'Water'
-	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
-	$_drink['1,name'] = 'Kvass'
-	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 'Free'
-	$_drink['2,name'] = 'Juice'
-	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 'Free'
-	$_drink['3,name'] = 'Spiced Tea'
-	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 'Free'
-	$_drink['4,name'] = 'Black Coffee'
-	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 'Free'
-	$_drink['5,name'] = 'Milkshake'
-	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 'Free'
-end
-if $loc = 'brothel':
-	'<center><h3>Hotel Bar</h3></center>'
-	*nl
-	'<center><img <<$set_imgh>> src="images/shared/drinks/bardrinks.jpg"</center><br>'
-	$_drink['0,name'] = 'Water'
-	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
-	$_drink['1,name'] = 'Beer on tap'
-	$_drink['1,type'] = 'bev_bee'
-	$_drink['1,price'] = 60
-	$_drink['2,name'] = 'Vodka'
-	$_drink['2,type'] = 'bev_vod'
-	$_drink['2,price'] = 120
-	$_drink['3,name'] = 'Scotch'
-	$_drink['3,type'] = 'bev_sco'
-	$_drink['3,price'] = 140
-	$_drink['4,name'] = 'Glass of Wine'
-	$_drink['4,type'] = 'bev_win'
-	$_drink['4,price'] = 160
-	$_drink['5,name'] = 'Black Russian'
-	$_drink['5,type'] = 'bev_bla'
-	$_drink['5,price'] = 250
-end
-if $loc = 'cafe_parco':
-	'<center><h4><font color="maroon">Cafe "Del Parco"</font></h4></center>'
-	*nl
-	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
-	$_drink['0,name'] = 'Water'
-	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
-	$_drink['1,name'] = 'Kvass'
-	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 60
-	$_drink['2,name'] = 'Juice'
-	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 80
-	$_drink['3,name'] = 'Spiced Tea'
-	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 120
-	$_drink['4,name'] = 'Black Coffee'
-	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 130
-	$_drink['5,name'] = 'Milkshake'
-	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 200
-end
-if $loc = 'kafe':
-	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
-	*nl
-	'<center><img <<$set_imgh>> src="images/shared/drinks/dinerdrinks.jpg"</center><br>'
-	$_drink['0,name'] = 'Water'
-	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
-	$_drink['1,name'] = 'Kvass'
-	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 55
-	$_drink['2,name'] = 'Juice'
-	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 70
-	$_drink['3,name'] = 'Spiced Tea'
-	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 110
-	$_drink['4,name'] = 'Black Coffee'
-	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 120
-	$_drink['5,name'] = 'Milkshake'
-	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 180
-end
-if $loc = 'lakecafe':
-	'<center><B><font color=maroon>The Lake Cafe</font></B></center>'
-	*nl
-	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
-	$_drink['0,name'] = 'Water'
-	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
-	$_drink['1,name'] = 'Kvass'
-	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 60
-	$_drink['2,name'] = 'Juice'
-	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 80
-	$_drink['3,name'] = 'Spiced Tea'
-	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 120
-	$_drink['4,name'] = 'Black Coffee'
-	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 130
-	$_drink['5,name'] = 'Milkshake'
-	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 200
-end
-if $loc = 'liamelkafe':
-	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
-	*nl
-	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
-	$_drink['0,name'] = 'Water'
-	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
-	$_drink['1,name'] = 'Kvass'
-	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 60
-	$_drink['2,name'] = 'Juice'
-	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 80
-	$_drink['3,name'] = 'Spiced Tea'
-	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 120
-	$_drink['4,name'] = 'Black Coffee'
-	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 130
-	$_drink['5,name'] = 'Milkshake'
-	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 200
-end
-if $loc = 'ParkKafe':
-	'<center><B><font color=maroon>Park Cafe</font></B></center>'
-	*nl
-	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
-	$_drink['0,name'] = 'Water'
-	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
-	$_drink['1,name'] = 'Kvass'
-	$_drink['1,type'] = 'bev_kva'
-	$_drink['1,price'] = 60
-	$_drink['2,name'] = 'Juice'
-	$_drink['2,type'] = 'bev_jui'
-	$_drink['2,price'] = 80
-	$_drink['3,name'] = 'Spiced Tea'
-	$_drink['3,type'] = 'bev_tea'
-	$_drink['3,price'] = 120
-	$_drink['4,name'] = 'Black Coffee'
-	$_drink['4,type'] = 'bev_cof'
-	$_drink['4,price'] = 130
-	$_drink['5,name'] = 'Milkshake'
-	$_drink['5,type'] = 'bev_mil'
-	$_drink['5,price'] = 200
-end
-if $loc = 'qwBarPolet':
-	'<center><b><font color="maroon">Bar "Rabotnik"</font></b></center>'
-	*nl
-	'<center><img <<$set_imgh>> src="images/shared/drinks/bardrinks.jpg"</center><br>'
-	$_drink['0,name'] = 'Water'
-	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
-	$_drink['1,name'] = 'Beer on tap'
-	$_drink['1,type'] = 'bev_bee'
-	$_drink['1,price'] = 60
-	$_drink['2,name'] = 'Vodka'
-	$_drink['2,type'] = 'bev_vod'
-	$_drink['2,price'] = 120
-	$_drink['3,name'] = 'Scotch'
-	$_drink['3,type'] = 'bev_sco'
-	$_drink['3,price'] = 140
-	$_drink['4,name'] = 'Glass of Wine'
-	$_drink['4,type'] = 'bev_win'
-	$_drink['4,price'] = 160
-	$_drink['5,name'] = 'Black Russian'
-	$_drink['5,type'] = 'bev_bla'
-	$_drink['5,price'] = 250
-end
-if $loc = 'restoran':
-	'<center><b><font color="maroon">Babel</font></b></center>'
-	*nl
-	'<center><img <<$set_imgh>> src="images/shared/drinks/fancydrinks.jpg"</center><br>'
-	$_drink['0,name'] = 'Spring Water'
-	$_drink['0,type'] = 'bev_wat'
-	$_drink['0,price'] = 'Free'
-	$_drink['1,name'] = 'Imported Tea'
-	$_drink['1,type'] = 'bev_tea'
-	$_drink['1,price'] = 180
-	$_drink['2,name'] = 'Imported Beer'
-	$_drink['2,type'] = 'bev_bee'
-	$_drink['2,price'] = 200
-	$_drink['3,name'] = 'Vodka Martini'
-	$_drink['3,type'] = 'bev_mar'
-	$_drink['3,price'] = 400
-	$_drink['4,name'] = 'Glass of Wine'
-	$_drink['4,type'] = 'bev_win'
-	$_drink['4,price'] = 800
-	$_drink['5,name'] = 'Glass of Champagne'
-	$_drink['5,type'] = 'bev_cha'
-	$_drink['5,price'] = 900
-end
-$_str = '<table border="0" width="400" cellpadding="0" cellspacing="1">'
-i = 0
-:loop_diner_drinks
-$_str += '<tr bgcolor='+iif(i mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+'><td height="30" width="80%" align="center"><font color="<<$fcolor1>>">'+$_drink['<<i>>,name']+'</td><td height="30" width="20%" align="right">'+iif(money >= val($_drink['<<i>>,price']),'<a href="exec:gt''beverage'',$_drink[''<<i>>,type''],<<i>>">'+$_drink['<<i>>,price']+'</a>',$_drink['<<i>>,price'])+'<font color="<<$fcolor1>>"><b> ₽. </b></td></tr>'
-i += 1
-if i < arrsize('$_drink')/3:jump 'loop_diner_drinks'
-$_str += '</table></center></font>'
-'Your drinks order:<br><br>'+$_str
-killvar '$_str'
-killvar '$fcolor1'
-killvar '$bcolor1'
-killvar '$bcolor2'
-
---- beverage_menu ---------------------------------
-

+ 4 - 5
locations/brothel.qsrc

@@ -181,11 +181,10 @@ if $ARGS[0] = 'bar:order':
 		'On the way you briefly regain consciousness from time to time, realizing that you are carried somewhere upstairs to what seems as one of the hotel rooms.'
 		act 'Continue':gt 'brothel', 'abducted'
 	else
-		if hotelWhore = 1:
-			act 'Order a Blue-blooded Russian.':gt 'brothel','bar:order:password'
-		end
-		act 'Order a snack': gs 'food_menu'
-		act 'Order a drink': gs 'beverage_menu'
+		! 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'
 	end
 end

+ 1 - 2
locations/burger.qsrc

@@ -32,8 +32,7 @@ if $ARGS[0] = 'start':
 		gt 'down'
 	end
 
-	act 'Order food':gs 'food_menu'
-	act 'Order drinks':gs 'beverage_menu'
+	act 'See the menu':gs 'food_menu'
 
 	if IvanPodstavaQW = 2:
 		act 'Go into the office to Anatoly Borisovich':gt 'burger', 'office'

+ 1 - 2
locations/cafe_parco.qsrc

@@ -24,8 +24,7 @@ if $args[0]= 'inner':
 	$loc = 'cafe_parco'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/cafe/caffe_del_parco_in.jpg"></center>'
 
-	act 'Order food':gs 'food_menu'
-	act 'Order drinks':gs 'beverage_menu'
+	act 'See the menu':gs 'food_menu'
 
 	act 'Go back outside': gt 'gskver', 'start'
 

+ 125 - 25
locations/food.qsrc

@@ -30,7 +30,11 @@ if $ARGS[0] = 'pirosh':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish': gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'golub':
@@ -56,7 +60,11 @@ if $ARGS[0] = 'golub':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'pozhar':
@@ -82,7 +90,11 @@ if $ARGS[0] = 'pozhar':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'reuben':
@@ -108,7 +120,11 @@ if $ARGS[0] = 'reuben':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'blini':
@@ -134,7 +150,11 @@ if $ARGS[0] = 'blini':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'varenfan':
@@ -159,7 +179,11 @@ if $ARGS[0] = 'varenfan':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'salfan':
@@ -185,7 +209,11 @@ if $ARGS[0] = 'salfan':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'strofan':
@@ -211,7 +239,11 @@ if $ARGS[0] = 'strofan':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'borfan':
@@ -237,7 +269,11 @@ if $ARGS[0] = 'borfan':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'blifan':
@@ -263,7 +299,11 @@ if $ARGS[0] = 'blifan':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'ryesna':
@@ -289,7 +329,11 @@ if $ARGS[0] = 'ryesna':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'crisps':
@@ -315,7 +359,11 @@ if $ARGS[0] = 'crisps':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'onring':
@@ -341,7 +389,11 @@ if $ARGS[0] = 'onring':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'vegburg':
@@ -367,7 +419,11 @@ if $ARGS[0] = 'vegburg':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'turburg':
@@ -393,7 +449,11 @@ if $ARGS[0] = 'turburg':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'batfish':
@@ -419,7 +479,11 @@ if $ARGS[0] = 'batfish':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'cheburg':
@@ -445,7 +509,11 @@ if $ARGS[0] = 'cheburg':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'snack':
@@ -465,7 +533,11 @@ if $ARGS[0] = 'snack':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Return':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'f_food':
@@ -490,7 +562,11 @@ if $ARGS[0] = 'f_food':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 's_meal':
@@ -515,7 +591,11 @@ if $ARGS[0] = 's_meal':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'm_meal':
@@ -541,7 +621,11 @@ if $ARGS[0] = 'm_meal':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'l_meal':
@@ -567,7 +651,11 @@ if $ARGS[0] = 'l_meal':
 	killvar '$_eat'
 	if plcooked = 1: killvar 'plcooked'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'bag_lunch':
@@ -592,7 +680,11 @@ if $ARGS[0] = 'bag_lunch':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':  gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'h_food':
@@ -619,7 +711,11 @@ if $ARGS[0] = 'h_food':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish':gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'h_meal':
@@ -644,7 +740,11 @@ if $ARGS[0] = 'h_meal':
 	gs 'stat'
 	killvar '$_eat'
 
-	act 'Finish': gt $loc, $metka
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $metka
+	end
 end
 
 if $ARGS[0] = 'aftermeal':

+ 226 - 20
locations/food_menu.qsrc

@@ -1,6 +1,6 @@
 # food_menu
 menu_off = 1
-
+food_loc = 1
 if night_mode = 1:
 	$fcolor1 = '#FFFFFF'
 	$bcolor1 = '#202020'
@@ -12,13 +12,16 @@ else
 end
 
 *clr & cla
-act 'Back':gt $loc, $metka
+act 'Back':killvar 'food_loc' & gt $loc, $metka
+
+killvar '$_drink'
 killvar '$_eat'
 if $loc = 'burger':
+	act 'Eat and run (0:20) (100₽)':gt 'food', 'f_food'
 	'<center><b><font color="maroon">Diner Bystroeshka</font></b></center>'
 	*nl
-	!'<center><img <<$set_imgh>> src="images/shared/food/dinerfood.jpg"</center><br>'
-	'<center><img <<$set_imgh>> src="images/shared/food/dinerfood.jpg"</center><br>'
+	!'<center><img <<$set_imgh>> src="images/shared/menus/burger.png"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/drinks/dinerdrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Onion Rings'
 	$_eat['0,type'] = 'onring'
 	$_eat['0,price'] = 80
@@ -34,11 +37,31 @@ if $loc = 'burger':
 	$_eat['4,name'] = 'Cheeseburger & Fries'
 	$_eat['4,type'] = 'cheburg'
 	$_eat['4,price'] = 310
+
+	$_drink['0,name'] = 'Water'
+	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Kvass'
+	$_drink['1,type'] = 'bev_kva'
+	$_drink['1,price'] = 55
+	$_drink['2,name'] = 'Juice'
+	$_drink['2,type'] = 'bev_jui'
+	$_drink['2,price'] = 70
+	$_drink['3,name'] = 'Spiced Tea'
+	$_drink['3,type'] = 'bev_tea'
+	$_drink['3,price'] = 110
+	$_drink['4,name'] = 'Black Coffee'
+	$_drink['4,type'] = 'bev_cof'
+	$_drink['4,price'] = 120
+	$_drink['5,name'] = 'Milkshake'
+	$_drink['5,type'] = 'bev_mil'
+	$_drink['5,price'] = 180
 end
 if $loc = 'gkafe':
+	act 'Eat and run':gt 'food', 'f_food'
 	'<center><b><font color="maroon">Borislav''s cafe</font></b></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/food/cafefood.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
 	$_eat['0,price'] = 'Free'
@@ -54,22 +77,66 @@ if $loc = 'gkafe':
 	$_eat['4,name'] = 'Rueben Sandwich'
 	$_eat['4,type'] = 'reuben'
 	$_eat['4,price'] = 'Free'
+
+	$_drink['0,name'] = 'Water'
+	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Kvass'
+	$_drink['1,type'] = 'bev_kva'
+	$_drink['1,price'] = 'Free'
+	$_drink['2,name'] = 'Juice'
+	$_drink['2,type'] = 'bev_jui'
+	$_drink['2,price'] = 'Free'
+	$_drink['3,name'] = 'Spiced Tea'
+	$_drink['3,type'] = 'bev_tea'
+	$_drink['3,price'] = 'Free'
+	$_drink['4,name'] = 'Black Coffee'
+	$_drink['4,type'] = 'bev_cof'
+	$_drink['4,price'] = 'Free'
+	$_drink['5,name'] = 'Milkshake'
+	$_drink['5,type'] = 'bev_mil'
+	$_drink['5,price'] = 'Free'
 end
 if $loc = 'brothel':
 	'<center><h3>Hotel Bar</h3></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/food/barfood.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/drinks/bardrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Toasted rye snacks'
 	$_eat['0,type'] = 'ryesna'
 	$_eat['0,price'] = 30
 	$_eat['1,name'] = 'Bowl of flavoured crisps'
 	$_eat['1,type'] = 'crisps'
 	$_eat['1,price'] = 40
+
+	$_drink['0,name'] = 'Water'
+	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Beer on tap'
+	$_drink['1,type'] = 'bev_bee'
+	$_drink['1,price'] = 60
+	$_drink['2,name'] = 'Vodka'
+	$_drink['2,type'] = 'bev_vod'
+	$_drink['2,price'] = 120
+	$_drink['3,name'] = 'Scotch'
+	$_drink['3,type'] = 'bev_sco'
+	$_drink['3,price'] = 140
+	$_drink['4,name'] = 'Glass of Wine'
+	$_drink['4,type'] = 'bev_win'
+	$_drink['4,price'] = 160
+	$_drink['5,name'] = 'Black Russian'
+	$_drink['5,type'] = 'bev_bla'
+	$_drink['5,price'] = 250
+	if hotelWhore = 1:
+		$_drink['6,name'] = 'Blue-blooded Russian'
+		$_drink['6,type'] = 'bev_bbr'
+		$_drink['6,price'] = 'Free'
+	end
 end
 if $loc = 'cafe_parco':
+	act 'Eat and run':gt 'food', 'f_food'
 	'<center><h4><font color="maroon">Cafe "Del Parco"</font></h4></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/food/cafefood.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
 	$_eat['0,price'] = 100
@@ -85,11 +152,31 @@ if $loc = 'cafe_parco':
 	$_eat['4,name'] = 'Rueben Sandwich'
 	$_eat['4,type'] = 'reuben'
 	$_eat['4,price'] = 340
+
+	$_drink['0,name'] = 'Water'
+	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Kvass'
+	$_drink['1,type'] = 'bev_kva'
+	$_drink['1,price'] = 60
+	$_drink['2,name'] = 'Juice'
+	$_drink['2,type'] = 'bev_jui'
+	$_drink['2,price'] = 80
+	$_drink['3,name'] = 'Spiced Tea'
+	$_drink['3,type'] = 'bev_tea'
+	$_drink['3,price'] = 120
+	$_drink['4,name'] = 'Black Coffee'
+	$_drink['4,type'] = 'bev_cof'
+	$_drink['4,price'] = 130
+	$_drink['5,name'] = 'Milkshake'
+	$_drink['5,type'] = 'bev_mil'
+	$_drink['5,price'] = 200
 end
 if $loc = 'kafe':
+	act 'Eat and run':gt 'food', 'f_food'
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/food/dinerfood.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/drinks/dinerdrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Onion Rings'
 	$_eat['0,type'] = 'onring'
 	$_eat['0,price'] = 80
@@ -105,11 +192,32 @@ if $loc = 'kafe':
 	$_eat['4,name'] = 'Cheeseburger & Fries'
 	$_eat['4,type'] = 'cheburg'
 	$_eat['4,price'] = 310
+
+	$_drink['0,name'] = 'Water'
+	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Kvass'
+	$_drink['1,type'] = 'bev_kva'
+	$_drink['1,price'] = 55
+	$_drink['2,name'] = 'Juice'
+	$_drink['2,type'] = 'bev_jui'
+	$_drink['2,price'] = 70
+	$_drink['3,name'] = 'Spiced Tea'
+	$_drink['3,type'] = 'bev_tea'
+	$_drink['3,price'] = 110
+	$_drink['4,name'] = 'Black Coffee'
+	$_drink['4,type'] = 'bev_cof'
+	$_drink['4,price'] = 120
+	$_drink['5,name'] = 'Milkshake'
+	$_drink['5,type'] = 'bev_mil'
+	$_drink['5,price'] = 180
 end
 if $loc = 'lakecafe':
+	act 'Eat and run':gt 'food', 'f_food'
 	'<center><B><font color=maroon>The Lake Cafe</font></B></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/food/cafefood.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
+
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
 	$_eat['0,price'] = 100
@@ -125,11 +233,31 @@ if $loc = 'lakecafe':
 	$_eat['4,name'] = 'Rueben Sandwich'
 	$_eat['4,type'] = 'reuben'
 	$_eat['4,price'] = 340
+
+	$_drink['0,name'] = 'Water'
+	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Kvass'
+	$_drink['1,type'] = 'bev_kva'
+	$_drink['1,price'] = 60
+	$_drink['2,name'] = 'Juice'
+	$_drink['2,type'] = 'bev_jui'
+	$_drink['2,price'] = 80
+	$_drink['3,name'] = 'Spiced Tea'
+	$_drink['3,type'] = 'bev_tea'
+	$_drink['3,price'] = 120
+	$_drink['4,name'] = 'Black Coffee'
+	$_drink['4,type'] = 'bev_cof'
+	$_drink['4,price'] = 130
+	$_drink['5,name'] = 'Milkshake'
+	$_drink['5,type'] = 'bev_mil'
+	$_drink['5,price'] = 200
 end
 if $loc = 'liamelkafe':
+	act 'Eat and run':gt 'food', 'f_food'
 	'<center><B><font color=maroon>Tiny Cafe</font></B></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/food/dinerfood.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Onion Rings'
 	$_eat['0,type'] = 'onring'
 	$_eat['0,price'] = 80
@@ -145,11 +273,31 @@ if $loc = 'liamelkafe':
 	$_eat['4,name'] = 'Cheeseburger & Fries'
 	$_eat['4,type'] = 'cheburg'
 	$_eat['4,price'] = 310
+
+	$_drink['0,name'] = 'Water'
+	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Kvass'
+	$_drink['1,type'] = 'bev_kva'
+	$_drink['1,price'] = 60
+	$_drink['2,name'] = 'Juice'
+	$_drink['2,type'] = 'bev_jui'
+	$_drink['2,price'] = 80
+	$_drink['3,name'] = 'Spiced Tea'
+	$_drink['3,type'] = 'bev_tea'
+	$_drink['3,price'] = 120
+	$_drink['4,name'] = 'Black Coffee'
+	$_drink['4,type'] = 'bev_cof'
+	$_drink['4,price'] = 130
+	$_drink['5,name'] = 'Milkshake'
+	$_drink['5,type'] = 'bev_mil'
+	$_drink['5,price'] = 200
 end
 if $loc = 'ParkKafe':
+	act 'Eat and run':gt 'food', 'f_food'
 	'<center><B><font color=maroon>Park Cafe</font></B></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/food/cafefood.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
 	$_eat['0,type'] = 'pirosh'
 	$_eat['0,price'] = 100
@@ -165,22 +313,60 @@ if $loc = 'ParkKafe':
 	$_eat['4,name'] = 'Rueben Sandwich'
 	$_eat['4,type'] = 'reuben'
 	$_eat['4,price'] = 340
+
+	$_drink['0,name'] = 'Water'
+	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Kvass'
+	$_drink['1,type'] = 'bev_kva'
+	$_drink['1,price'] = 60
+	$_drink['2,name'] = 'Juice'
+	$_drink['2,type'] = 'bev_jui'
+	$_drink['2,price'] = 80
+	$_drink['3,name'] = 'Spiced Tea'
+	$_drink['3,type'] = 'bev_tea'
+	$_drink['3,price'] = 120
+	$_drink['4,name'] = 'Black Coffee'
+	$_drink['4,type'] = 'bev_cof'
+	$_drink['4,price'] = 130
+	$_drink['5,name'] = 'Milkshake'
+	$_drink['5,type'] = 'bev_mil'
+	$_drink['5,price'] = 200
 end
 if $loc = 'qwBarPolet':
 	'<center><b><font color="maroon">Bar "Rabotnik"</font></b></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/food/barfood.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/drinks/bardrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Toasted rye snacks'
 	$_eat['0,type'] = 'ryesna'
 	$_eat['0,price'] = 30
 	$_eat['1,name'] = 'Bowl of flavoured crisps'
 	$_eat['1,type'] = 'crisps'
 	$_eat['1,price'] = 40
+
+	$_drink['0,name'] = 'Water'
+	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Beer on tap'
+	$_drink['1,type'] = 'bev_bee'
+	$_drink['1,price'] = 60
+	$_drink['2,name'] = 'Vodka'
+	$_drink['2,type'] = 'bev_vod'
+	$_drink['2,price'] = 120
+	$_drink['3,name'] = 'Scotch'
+	$_drink['3,type'] = 'bev_sco'
+	$_drink['3,price'] = 140
+	$_drink['4,name'] = 'Glass of Wine'
+	$_drink['4,type'] = 'bev_win'
+	$_drink['4,price'] = 160
+	$_drink['5,name'] = 'Black Russian'
+	$_drink['5,type'] = 'bev_bla'
+	$_drink['5,price'] = 250
 end
 if $loc = 'restoran':
 	'<center><b><font color="maroon">Babel</font></b></center>'
 	*nl
-	'<center><img <<$set_imgh>> src="images/shared/food/fancyfood.jpg"</center><br>'
+	'<center><img <<$set_imgh>> src="images/shared/drinks/fancydrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vareniki with Potatoes'
 	$_eat['0,type'] = 'varenfan'
 	$_eat['0,price'] = 760
@@ -196,16 +382,36 @@ if $loc = 'restoran':
 	$_eat['4,name'] = 'Red Caviar Blinchiki'
 	$_eat['4,type'] = 'blifan'
 	$_eat['4,price'] = 1360
+
+	$_drink['0,name'] = 'Spring Water'
+	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Imported Tea'
+	$_drink['1,type'] = 'bev_tea'
+	$_drink['1,price'] = 180
+	$_drink['2,name'] = 'Imported Beer'
+	$_drink['2,type'] = 'bev_bee'
+	$_drink['2,price'] = 200
+	$_drink['3,name'] = 'Vodka Martini'
+	$_drink['3,type'] = 'bev_mar'
+	$_drink['3,price'] = 400
+	$_drink['4,name'] = 'Glass of Wine'
+	$_drink['4,type'] = 'bev_win'
+	$_drink['4,price'] = 800
+	$_drink['5,name'] = 'Glass of Champagne'
+	$_drink['5,type'] = 'bev_cha'
+	$_drink['5,price'] = 900
 end
-$_str = '<table border="0" width="400" cellpadding="0" cellspacing="1">'
-i = 0
-:loop_diner_food
-$_str += '<tr bgcolor='+iif(i mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+'><td height="30" width="80%" align="center"><font color="<<$fcolor1>>">'+$_eat['<<i>>,name']+'</td><td height="30" width="20%" align="right">'+iif(money >= val($_eat['<<i>>,price']),'<a href="exec:gt''food'',$_eat[''<<i>>,type''],<<i>>">'+$_eat['<<i>>,price']+'</a>',$_eat['<<i>>,price'])+'<font color="<<$fcolor1>>"><b> ₽. </b></td></tr>'
-i += 1
-if i < arrsize('$_eat')/3:jump 'loop_diner_food'
+$_str = '<table border="0" width="800" cellpadding="0" cellspacing="1">'
+food_loop = 0
+:loop_diner_drinks
+$_str += '<tr><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="40%" align="center"><font color="<<$fcolor1>>">'+$_eat['<<food_loop>>,name']+'</td><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="10%" align="right">'+iif(money >= val($_eat['<<food_loop>>,price']),'<a href="exec:gt''food'',$_eat[''<<food_loop>>,type''],<<food_loop>>">'+$_eat['<<food_loop>>,price']+'</a>',$_eat['<<food_loop>>,price'])+''+iif($_eat['<<food_loop>>,price'] ! '','<font color="<<$fcolor1>>"><b> ₽. </b>','')+'</td><td bgcolor='+iif(night_mode = 1,'#000000','#FFFFFF')+' border="0" width="50" cellpadding="0" cellspacing="0" ></td><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="40%" align="center"><font color="<<$fcolor1>>">'+$_drink['<<food_loop>>,name']+'</td><td bgcolor='+iif(food_loop mod 2 = 0,'<<$bcolor1>>','<<$bcolor2>>')+' height="30" width="10%" align="right">'+iif(money >= val($_drink['<<food_loop>>,price']),'<a href="exec:gt''beverage'',$_drink[''<<food_loop>>,type''],<<food_loop>>">'+$_drink['<<food_loop>>,price']+'</a>',$_drink['<<food_loop>>,price'])+'<font color="<<$fcolor1>>"><b> ₽. </b></td></tr>'
+food_loop += 1
+if food_loop < arrsize('$_drink')/3:jump 'loop_diner_drinks'
 $_str += '</table></center></font>'
-'Your food order:<br><br>'+$_str
+'Please place your order:<br><br>'+$_str
 killvar '$_str'
+killvar 'food_loop'
 killvar '$fcolor1'
 killvar '$bcolor1'
 killvar '$bcolor2'

+ 1 - 2
locations/gkafe.qsrc

@@ -108,8 +108,7 @@ if $ARGS[0] = 'menu':
 	menu_off = 1
 	$loc = 'gkafe'
 	$metka = ''
-	act 'Order food':gs 'food_menu'
-	act 'Order drinks':gs 'beverage_menu'
+	act 'See the menu':gs 'food_menu'
 end
 
 if $ARGS[0] = 'boris':

+ 1 - 2
locations/kafe.qsrc

@@ -43,8 +43,7 @@ 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 'Order food':gs 'food_menu'
-	act 'Order drinks':gs 'beverage_menu'
+	act 'See the menu':gs 'food_menu'
 	if rand(1, 10) > 5:
 		gs 'boy'
 		'A man comes over to your table <<$boybody>> <<$boybod>> <<$boyface>> introducing himself as <<$boydesc>>.'

+ 1 - 2
locations/lakecafe.qsrc

@@ -66,8 +66,7 @@ if $ARGS[0] = 'main':
 
 		'The diner has a single <a href="exec:gt ''laketoilet'', ''main''">toilet</a> available, for both males and females.'
 
-		act 'Order food':gs 'food_menu'
-		act 'Order drinks':gs 'beverage_menu'
+		act 'See the menu':gs 'food_menu'
 	end
 
 	if LCwork2 >= 1 and LCwork2day ! daystart and hour = 18:

+ 1 - 2
locations/liamelkafe.qsrc

@@ -32,8 +32,7 @@ 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 'Order food':gs 'food_menu'
-	act 'Order drinks':gs 'beverage_menu'
+	act 'See the menu':gs 'food_menu'
 	if stallionQ = 2:
 		if FocH > (Foch_Max - 10): 
 			stallionQ = 3

+ 3 - 3
locations/qwBarPolet.qsrc

@@ -400,14 +400,14 @@ if $ARGS[0] = 'Ordering':
 			'At the very least, it seems like Martin is willing to return to that, because he says, "Welcome back."'
 			'It''s probably going to take a while to recover from this, but the first big step is done.'
 			'"Now, what shall I bring you?" The bartender asks.'
-			gs 'beverage_menu'
+			gs 'food_menu'
 
 		elseif fakepassport = 1 or age >= 18:
 			orderDrink = 1
 			*nl
 			'Nodding, you take out your ID and show it to him. He eyes it suspiciously and gives you a stern look... but then nods and hands it back to you.'
 			'"What can I bring you?"'
-			gs 'beverage_menu'
+			gs 'food_menu'
 
 		else
 			*nl
@@ -422,7 +422,7 @@ if $ARGS[0] = 'Ordering':
 	else
 		'Martin nods. "Sure. What are you having?"'
 		orderDrink = 1
-		gs 'beverage_menu'
+		gs 'food_menu'
 	end
 end
 

+ 2 - 4
locations/restoran.qsrc

@@ -108,8 +108,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 'Order food': gs 'food_menu'
-	act 'Order drinks': gs 'beverage_menu',
+	act 'See the menu': gs 'food_menu'
 
 	act 'Get up from the table': gt 'restoran', 'zal'
 end
@@ -125,8 +124,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 'Order food': gs 'food_menu'
-	act 'Order drinks': gs 'beverage_menu'
+	act 'See the menu': gs 'food_menu'
 
 	act 'Get up from the table': gt 'restoran', 'vip'
 end