[fixes] moving to the pharmacy and ending up in gaptek

locations/gaptek.qsrc

@@ -1,7 +1,7 @@
 # gaptek
 $location_type = 'public_indoors'
 
-if $ARGS[0] = 'start' or gaptek_loc = 1 or $message ! '':
+if $ARGS[0] = 'start' or $message ! '':
 	CLOSE ALL
 	*clr & cla
 	$loc = 'gaptek'
@@ -40,8 +40,8 @@ if $ARGS[0] = 'start' or gaptek_loc = 1 or $message ! '':
 	*nl
 	
 	if Olu_pay > 0 and gaptek_aunt_hours = 1:
-		minut += RAND(5,10)
-		money += Olu_pay * RAND(500,700)
+		minut += rand(5,10)
+		money += Olu_pay * rand(500,700)
 		Olu_pay = 0
 
 		'You go back to the pharmacy, and wait for a slow moment so you can talk to your aunt undisturbed.'
@@ -166,7 +166,7 @@ if $ARGS[0] = 'garden':
 				'You intently stare at the items, avoiding her gaze as you mutter: "Thank you, Aunt..."'
 				'"No problem, <<$pcs_nickname>>. But seriously, tell Natasha she shouldn''t spend so much time gardening. We keep running low on stock."'
 			else
-				minut += RAND(5,15)
+				minut += rand(5,15)
 				'You linger around the pharmacy, waiting for your aunt to become available. However, as time passes the pharmacy only becomes more and more crowded, and your aunt has a long line of customers to deal with. You decide you''ve wasted enough time, and to try again later.'
 			end
 		end
@@ -174,28 +174,28 @@ if $ARGS[0] = 'garden':
 		gt 'motherQW','motherQW_3'
 	elseif npc_QW['A29'] >= 3 and galubri = 0:
 		if gaprezikday ! daystart or gatabletkiday ! daystart or gabotmedday ! daystart or gabotsmlday ! daystart or gapregday ! daystart:
-			minut += RAND(5,15)
+			minut += rand(5,15)
 			gs'stat'
-			if RAND(0,5) = 0 and oluuosegunday ! daystart:
+			if rand(0,5) = 0 and oluuosegunday ! daystart:
 				gt 'motherQW','olu'
 			else
 				'You wait for your turn and move to the counter, discretely nodding at the counter with the contraceptives. Your aunt gives you a small smile and asks what she can do for you today.'
 			end
 		elseif gaprezikday = daystart and gatabletkiday = daystart:
-			minut += RAND(5,15)
+			minut += rand(5,15)
 
 			'You wait for your turn and move up to the counter, discretely nodding at the counter with the contraceptives. She apologizes: "I''m sorry <<$pcs_nickname>>, those are all sold out." With some malice in her voice, she whispers: "Your stud will have to wait until tomorrow, unless you plan on entertaining him in some other way." Giving you a lewd grin, she ushers you away from the counter so she can help the next customer.'
 		end
 	elseif npc_QW['A29'] >= 3 and galubri = 1:
 		if gaprezikday ! daystart or gatabletkiday ! daystart or gabotmedday ! daystart or gabotsmlday ! daystart or gapregday ! daystart:
-			minut += RAND(5,15)
-			if RAND(0,5) = 0 and oluuosegunday ! daystart and tetyafirst < 3:
+			minut += rand(5,15)
+			if rand(0,5) = 0 and oluuosegunday ! daystart and tetyafirst < 3:
 				gt 'motherQW','olu'
 			else
 				'You wait for your turn and move to the counter, discretely nodding at the counter with the contraceptives. Your aunt gives you a small smile and asks what she can do for you today.'
 			end
 		elseif gaprezikday = daystart and gatabletkiday = daystart and galubriday = daystart:
-			minut += RAND(5,15)
+			minut += rand(5,15)
 
 			'You wait for your turn and move up to the counter, discretely nodding at the counter with the contraceptives. She apologizes: "I''m sorry <<$pcs_nickname>>, those are all sold out." With some malice in her voice, she whispers: "Your stud will have to wait until tomorrow, unless you plan on entertaining him in some other way." Giving you a lewd grin, she ushers you away from the counter so she can help the next customer.'
 		end

locations/pharmacy.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/aptekabusy<<people>>.jpg"></center>'
 		*nl
 		'When you go up to check out their is <<people>> ' + iif(people < 2 or people > 4, 'people' , 'man' ) + ' in line before you.'
-		act 'Leave the pharmacy': minut += 5 & gt $loc, $metka
+		act 'Leave the pharmacy': minut += 5 & gt 'street'
 		act 'Wait for your turn' :
 			minut += rand(1,4) * people
 			people = 0
@@ -27,6 +27,8 @@ end
 if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	*clr & cla
 	$location_type = 'public_indoors'
+	$loc = 'pharmacy'
+	$metka = 'shop'
 	$menu_loc = 'pharmacy'
 	$menu_arg = 'shop'
 	menu_off = 0
@@ -50,7 +52,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 		'<center>Their is a young woman behind the counter in a white coat,as you approach she asks. "Hello, what can I help you with?"</center>'
 	end
 	
-	act 'Leave the pharmacy': minut += 5 & gt $loc, $metka
+	act 'Leave the pharmacy': minut += 5 & gt 'street'
 
 	!! output for purchased item
 	iif($ARGS[1] = '', '', '<center><<$ARGS[1]>></center>')
@@ -77,7 +79,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	if pcs_knows_nipplecream > 0:
 		*P FUNC ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', $CURLOC, $ARGS[0])
 	end
-	*P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $CURLOC, $ARGS[0], StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''gaptek'', ''buy_antifungal''">buy</a>','')+'')
+	*P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $CURLOC, $ARGS[0], StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''pharmacy'', ''buy_antifungal''">buy</a>','')+'')
 	*P '</table></center>'
 end