Merge remote-tracking branch '3xpurt/master'

locations/Gadhouse.qsrc

@@ -4,6 +4,9 @@ if $ARGS[0]='' or $ARGS[0] = 'Start':
 	$location_type = 'indoors'
 	$metka = ''
 	$loc = 'Gadhouse'
+	$menu_loc = 'Gadhouse'
+	$menu_arg = ''
+	menu_off = 0
 	$locclass = 'singleroom'
 	curr_home = 2
 	cla
@@ -123,6 +126,9 @@ if $ARGS[0] = 'Main':
 	$metkaM = 'Main'
 	$locM = 'Gadhouse'
 	$locclass = 'livingr'
+	$menu_loc = 'Gadhouse'
+	$menu_arg = 'livingr'
+	menu_off = 0
 	*clr
 	cla
 	gs 'stat'
@@ -196,42 +202,6 @@ if $ARGS[0] = 'Main':
 		if staygad ! daystart: gs 'gadukino_event', 'go_home'
 	end
 
-	if gobelen>0:'You have <<gobelen>> completed tapestries.'
-	if pcs_sewng >= 40 and tkan > 0:'You have enough fabric for <<tkan>> lessons.'
-	if pcs_sewng >= 40 and tkan <= 0:'You do not have any fabric.'
-	if pcs_sewng >= 80:
-		if newgobelen = 0 and tkan > 0:
-			act'Start a new tapestry':
-				*clr & cla
-				tkan -= 1
-				newgobelen = 1
-				minut += 15
-				gs'stat'
-				'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-				act'Set the tapestry aside':gt 'Gadhouse', 'Main'
-			end
-		end
-		if newgobelen >= 1:
-			'Your tapestry is <<newgobelen/10>> percent finished.'
-			act'Work on the tapestry for an hour':
-				*clr & cla
-				minut += 60
-				sewng_exp += rand(pcs_intel/10, pcs_intel/5)
-				gobramax = (pcs_sewng - 70) * 6
-				gobramin = (pcs_sewng - 70) * 2
-				newgobelen += rand(gobramin,gobramax)
-				gs'stat'
-				if newgobelen < 1000:'You spent an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-					if newgobelen >= 1000:
-					newgobelen = 0
-					gobelen+=1
-					'Your work on the tapestry is done.'
-				end
-				act'Set the tapestry aside':gt 'Gadhouse', 'Main'
-			end
-		end
-	end
-
 	act 'Go outside':
 		if $clothingworntype ! 'nude':
 			minut += 1 & gt 'Gaddvor'
@@ -388,12 +358,49 @@ if $ARGS[0] = 'Main':
 
 	gs 'events', 'read'
 	gs 'subkid'
+	
+	if gobelen>0:'You have <<gobelen>> completed tapestries.'
+	if pcs_sewng >= 40 and tkan > 0:'You have enough fabric for <<tkan>> lessons.'
+	if pcs_sewng >= 40 and tkan <= 0:'You do not have any fabric.'
+	if pcs_sewng >= 80:
+		if newgobelen = 0 and tkan > 0:
+			act'Start a new tapestry':
+				*clr & cla
+				tkan -= 1
+				newgobelen = 1
+				minut += 15
+				gs'stat'
+				'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
+				act'Set the tapestry aside':gt 'Gadhouse', 'Main'
+			end
+		end
+		if newgobelen >= 1:
+			'Your tapestry is <<newgobelen/10>> percent finished.'
+			act'Work on the tapestry for an hour':
+				*clr & cla
+				minut += 60
+				sewng_exp += rand(pcs_intel/10, pcs_intel/5)
+				gobramax = (pcs_sewng - 70) * 6
+				gobramin = (pcs_sewng - 70) * 2
+				newgobelen += rand(gobramin,gobramax)
+				gs'stat'
+				if newgobelen < 1000:'You spent an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
+					if newgobelen >= 1000:
+					newgobelen = 0
+					gobelen+=1
+					'Your work on the tapestry is done.'
+				end
+				act'Set the tapestry aside':gt 'Gadhouse', 'Main'
+			end
+		end
+	end
 
 	if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 end
 
 if $ARGS[0]='grandma':
 	*clr & cla
+	menu_off = 1
 	minut += 2
 	if grandmatalkday ! daystart: grandmatalk = 0
 	gs 'stat'
@@ -526,6 +533,7 @@ end
 
 if $ARGS[0]='grandpa':
 	*clr & cla
+	menu_off = 1
 	minut += 2
 	if grandpatalkday ! daystart:grandpatalk = 0
 	gs 'stat'
@@ -587,6 +595,7 @@ end
 
 if $ARGS[0]='villagecat':
 	*clr & cla
+	menu_off = 1
 	minut += 2
 	gs 'stat'
 

locations/ParkKafe.qsrc

@@ -13,6 +13,9 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/parkcafe.jpg"></center>'
 
 	act 'See the menu':gs 'food_menu'
+	if money >= 300:
+		act 'Eat and run (0:20) (300₽)':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)

locations/burger.qsrc

@@ -33,6 +33,9 @@ if $ARGS[0] = 'start':
 	end
 
 	act 'See the menu':gs 'food_menu'
+	if money >= 300:
+		act 'Eat and run (0:20) (300₽)':gt 'food', 'f_food'
+	end
 
 	if IvanPodstavaQW = 2:
 		act 'Go into the office to Anatoly Borisovich':gt 'burger', 'office'

locations/cafe_parco.qsrc

@@ -25,6 +25,9 @@ if $args[0]= 'inner':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/cafe/caffe_del_parco_in.jpg"></center>'
 
 	act 'See the menu':gs 'food_menu'
+	if money >= 300:
+		act 'Eat and run (0:20) (300₽)':gt 'food', 'f_food'
+	end
 
 	act 'Go back outside': gt 'gskver', 'start'
 

locations/fight.qsrc

@@ -1,5 +1,6 @@
 # fight
 if $ARGS[0] = 'start':
+	menu_off = 1
 	cla
 	inFight = 1
 	if night_mode = 1:
@@ -306,6 +307,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'sta':
+	menu_off = 1
 	cla
 	damTip = 0
 	damTipM = 0

locations/food_menu.qsrc

@@ -19,9 +19,6 @@ act 'Back':killvar 'food_loc' & gt $loc, $metka
 killvar '$_drink'
 killvar '$_eat'
 if $loc = 'burger':
-	if money >= 100:
-		act 'Eat and run (0:20) (100₽)':gt 'food', 'f_food'
-	end
 	'<center><b><font color="maroon">Diner Bystroeshka</font></b></center>'
 	*nl
 	!'<center><img <<$set_imgh>> src="images/shared/menus/burger.png"</center><br>'
@@ -62,7 +59,6 @@ if $loc = 'burger':
 	$_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/drinks/cafedrinks.jpg"</center><br>'
@@ -174,7 +170,6 @@ if $loc = 'brothel':
 	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/drinks/cafedrinks.jpg"</center><br>'
@@ -214,7 +209,6 @@ if $loc = 'cafe_parco':
 	$_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/drinks/dinerdrinks.jpg"</center><br>'
@@ -254,7 +248,6 @@ if $loc = 'kafe':
 	$_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/drinks/cafedrinks.jpg"</center><br>'
@@ -294,7 +287,6 @@ if $loc = 'lakecafe':
 	$_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/drinks/cafedrinks.jpg"</center><br>'
@@ -334,7 +326,6 @@ if $loc = 'liamelkafe':
 	$_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/drinks/cafedrinks.jpg"</center><br>'

locations/gkafe.qsrc

@@ -109,6 +109,9 @@ if $ARGS[0] = 'menu':
 	$loc = 'gkafe'
 	$metka = ''
 	act 'See the menu':gs 'food_menu'
+	if money >= 300:
+		act 'Eat and run (0:20) (300₽)':gt 'food', 'f_food'
+	end
 end
 
 if $ARGS[0] = 'boris':

locations/lakecafe.qsrc

@@ -67,6 +67,9 @@ 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'
+		if money >= 300:
+			act 'Eat and run (0:20) (300₽)':gt 'food', 'f_food'
+		end
 	end
 
 	if LCwork2 >= 1 and LCwork2day ! daystart and hour = 18:

locations/pavResidential.qsrc

@@ -4,6 +4,9 @@ music_loop = 0
 CLOSE ALL
 $metka = ''
 $loc = 'pavResidential'
+$menu_loc = 'pavResidential'
+$menu_arg = ''
+menu_off = 0
 $metkaStreet = ''
 $locStreet = 'pavResidential'
 $location_type = 'public_outdoors'