[fixes] moved the leave option to the top, added loc and metka so the new menu works and you can now pay the first rent with your bank account or with cash

locations/Mirafather.qsrc

@@ -15,9 +15,12 @@ if npc_QW['A64'] < 10:'<center><b><font color = maroon>Father Miroslava</font></
 if npc_QW['A64'] >= 10:'<center><b><font color = maroon>Afanasiy</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirafather.jpg"></center>'
 'Mira''s father, <<boyage>> years old. After his wife died, he drank heavily and looks much older than he actually is. He is still in good shape for a man his age.'
+
+act 'Leave':gt 'miroslavahome', 'start'
+
 if MiraFather ! daystart:
 	MiraFather = daystart
-
+	
 	act 'Greet':
 		*clr & cla
 		if npc_QW['A64'] < 10:npc_QW['A64'] += 1
@@ -185,12 +188,8 @@ if MiraFather ! daystart:
 				act 'Leave': gt 'miroslavahome', 'start'
 			end
 		end
-	end
-
-	act 'Leave':gt 'miroslavahome', 'start'
+	end	
 end
 
-act 'Leave': gt 'miroslavahome', 'start'
-
 --- Mirafather ---------------------------------
 

locations/agentned.qsrc

@@ -1,10 +1,12 @@
 # agentned
 
 if $ARGS[0] = 'start':
-	cla
-	*clr
 	CLOSE ALL
-	frost = 0
+	
+	*clr & cla
+	$loc = $curloc
+	$metka = $ARGS[0]
+	$location_type = 'indoors'
 	gs'stat'
 	gs'dina'
 	gs 'housing', 'rent'
@@ -36,24 +38,29 @@ if $ARGS[0] = 'start':
 		'We are at your service if you decide to <a href="exec:GT ''agentned'',''sell''">sell</a>.'
 	end
 
-	act 'View rentals': gt 'agentned', 'rent'
-	act 'View properties for sale': gt 'agentned', 'buy'
-
-	act '<B>Leave</B>':
+	act 'Leave':
 		minut += 5
 		gt'down'
 	end
+	
+	act 'View rentals': gt 'agentned', 'rent'
+	act 'View properties for sale': gt 'agentned', 'buy'
 end
 
 if $ARGS[0] = 'buy':
-	cla
-	*clr
+	*clr & cla
+	$loc = $curloc
+	$metka = $ARGS[0]
+	$location_type = 'indoors'
 	gs 'housing', 'sale'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
 	*nl
 	minut += 5
 	gs 'stat'
+	
+	act 'Return':gt'agentned', 'start'
+	
 	if home_owned[1] = 0 or home_owned[3] = 0 or home_owned[4] = 0 or home_owned[5] = 0:
 		if home_owned[1] = 0:
 			'There is an apartment in the city residential area available for <<$home_value_txt[1]>> <b>₽</b>.'
@@ -79,16 +86,20 @@ if $ARGS[0] = 'buy':
 	else
 		'We currently have no properties listed for sale.'
 	end
-	act 'Return':gt'agentned', 'start'
 end
 
 if $ARGS[0] = 'sell':
-	cla
-	*clr
+	*clr & cla
+	$loc = $curloc
+	$metka = $ARGS[0]
+	$location_type = 'indoors'
 	gs 'housing', 'sale'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
 	*nl
+	
+	act 'Return':gt'agentned', 'start'
+	
 	if home_owned[1] = 2 and rembedr = 1 and remsitr = 1 and remkorr = 1 and remvanr = 1 and remkuhr = 1:
 		!Renovated city residential apartment
 		home_value1 = ((home_value[1] + 250000) + rand(-100000, 100000)) 
@@ -202,17 +213,21 @@ if $ARGS[0] = 'sell':
 	if home_owned[1] = 0 and home_owned[3] = 0 and home_owned[4] = 0 and home_owned[5] = 0:
 		'You don''t currently own any property.'
 	end
-	act 'Return':gt'agentned', 'start'
 end
 
 if $ARGS[0] = 'rent':
-	cla
-	*clr
+	*clr & cla
+	$loc = $curloc
+	$metka = $ARGS[0]
+	$location_type = 'indoors'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
 	*nl
 	minut += 5
 	gs 'stat'
+	
+	act 'Return':gt'agentned', 'start'
+	
 	if home_owned[1] > 0 and home_owned[4] > 0:
 		'We currently have no properties for rent.'
 
@@ -232,27 +247,27 @@ if $ARGS[0] = 'rent':
 		'There is a property for rent in the old town of Pushkin'
 		act 'View the Pushkin apartment details': gt 'agentned', 'rent_pushkin'
 	end
-
-	act 'Return':gt'agentned', 'start'
 end
 
 if $ARGS[0] = 'rent_cityres':
-	cla
-	*clr
+	*clr & cla
 	gs 'housing', 'rent'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
 	*nl
 	'“We have a flat available right now in the residential area of St. Petersburg.” The receptionist says as he starts pulling out the paperwork. “Rent is <<$home_rent_txt[1]>> ₽ and leases have to be renewed every 30 days, which can be taken automatically from your account or you can come in and pay directly. Last but not least, you have to make your first payment up front at signing.”'
 	'<br>He pulls out a pen and slides the paperwork onto the counter. “Interested? We can get you moved in right away.”'
-
-	if money >= home_rent[1]:
+	
+	if money >= home_rent[1] or karta >= home_rent[1]:
 		act 'Agree and pay':
-			cla
-			*clr
+			*clr & cla
 			cls
 			minut += 30
-			money -= home_rent[1]
+			if money >= home_rent[1]: 
+				money -= home_rent[1]
+			else
+				karta >= -= home_rent[1]
+			end
 			home_owned[1] = 1
 			if ARRSIZE('home_owned') = 0: gs 'set_home', 1
 			ArendHouseSL += ArendHouseSL_due
@@ -266,12 +281,11 @@ if $ARGS[0] = 'rent_cityres':
 		end
 	else
 		*nl
-		'You do not have enough money with you to rent this now.'
+		'You do not have enough money with you or in your bank account to rent this.'
 	end
-
+	
 	act 'Decline':
-		cla
-		*clr
+		*clr & cla
 		minut += 5
 		'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
@@ -284,21 +298,23 @@ if $ARGS[0] = 'rent_cityres':
 end
 
 if $ARGS[0] = 'rent_pushkin':
-	cla
-	*clr
+	*clr & cla
 	gs 'housing', 'rent'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
 	*nl
 	'“We have a small apartment available right now in Pushkin’s city center. It’s a little bit pricey, but it’s been recently renovated to be more modern, and it looks quite nice. You won’t find a place like that outside of Pushkin.” The receptionist says as he starts pulling out the paperwork. “Rent is <<$home_rent_txt[4]>> ₽ and leases have to be renewed every 30 days, which can be taken automatically from your account or you can come in and pay directly. Last but not least, you have to make your first payment up front at signing.”'
 	'<br>He pulls out a pen and slides the paperwork onto the counter. “Interested? We can get you moved in right away.”'
-
-	if money >= home_rent[4]:
+	
+	if money >= home_rent[4] or karta >= home_rent[4]:
 		act 'Agree and pay':
-			cla
-			*clr
+			*clr & cla
 			minut += 30
-			money -= home_rent[4]
+			if money >= home_rent[4]: 
+				money -= home_rent[4]
+			else
+				karta >= -= home_rent[4]
+			end
 			home_owned[4] = 1
 			if ARRSIZE('home_owned') = 0: gs 'set_home', 4
 			ArendHouseSL4 += ArendHouseSL_due
@@ -312,12 +328,11 @@ if $ARGS[0] = 'rent_pushkin':
 		end
 	else
 		*nl
-		'You do not have enough money with you to rent this now.'
+		'You do not have enough money with you or in your bank account to rent this.'
 	end
-
+	
 	act 'Decline':
-		cla
-		*clr
+		*clr & cla
 		minut += 5
 		gs 'stat'
 		'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
@@ -331,8 +346,7 @@ if $ARGS[0] = 'rent_pushkin':
 end
 
 if $ARGS[0] = 'buy_cityres':
-	cla
-	*clr
+	*clr & cla
 	gs 'housing', 'sale'
 	minut += 30
 	karta -= home_value[1]
@@ -348,8 +362,7 @@ if $ARGS[0] = 'buy_cityres':
 end
 
 if $ARGS[0] = 'buy_dacha':
-	cla
-	*clr
+	*clr & cla
 	gs 'housing', 'sale'
 	minut += 30
 	karta -= home_value[3]
@@ -366,8 +379,7 @@ if $ARGS[0] = 'buy_dacha':
 end
 
 if $ARGS[0] = 'buy_Mansion':
-	cla
-	*clr
+	*clr & cla
 	gs 'housing', 'sale'
 	minut += 30
 	karta -= home_value[5]