[added/changed/removed] removed `bankloc` and `alurepos` in favor of `$region` checks. Removed `$postloc` in favor of `$ARGS[1]`. Added mail support and a blackmailer act

locations/bank.qsrc

@@ -1,5 +1,13 @@
 # bank
 
+if $ARGS[0] = 'leave':
+	if $region = 'city':
+		gt 'city_center'
+	else
+		gt 'pav_commercial'
+	end
+end
+
 if $ARGS[0] = 'start':
 	*clr & cla
 	$loc = 'bank'
@@ -80,7 +88,7 @@ if $ARGS[0] = 'start':
 
 			if bankDebtLimitRaised = 0 and karta >= 10000:
 				act 'See about increasing your credit limit':
-					if bankloc = 1:
+					if $region = 'city':
 						gt 'bank', 'loan_officer', 'start'
 					else
 						'You approach the teller and say, “Hello, I’d like to talk to someone about increasing my credit limit.”'
@@ -100,14 +108,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Leave':
-		minut += 2
-		if bankloc = 1:
-			gt 'city_center'
-		else
-			gt 'pav_commercial'
-		end
-	end
+	act 'Leave': minut += 2 & gt 'bank', 'leave'
 
 	if BurgerQW['BankTask'] = 1 and BurgerQW['BankTaskDay'] = daystart:
 		act 'Show documents':
@@ -118,14 +119,7 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			'You went to the office and showed the required documents to the manager.'
 
-			act 'Leave':
-				minut += 5
-				if bankloc = 1:
-					gt 'city_center'
-				else
-					gt 'pav_commercial'
-				end
-			end
+			act 'Leave': minut += 5 & gt 'bank', 'leave'
 		end
 	end
 	gs 'stat'
@@ -133,7 +127,7 @@ end
 
 if $ARGS[0] = 'loan_officer':
 	if $ARGS[1] = 'start':
-	   *clr & cla
+		*clr & cla
 		menu_off = 1
 		minut += 15
 		gs 'stat'

locations/city_center.qsrc

@@ -20,8 +20,6 @@ if sound = 0:
 	end
 end
 
-!!sets return location when visiting the bank or post office
-bankloc = 1
 gs 'stat'
 
 !call random events from [street_events], and display them before show location.

locations/city_lake.qsrc

@@ -23,9 +23,6 @@ if $ARGS[0] = 'start':
 
 	gs 'stat'
 	
-	!!Sets return location for Allure swimwear store
-	allure_pos = 0
-
 	'<center><h2>Lake</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/lake2.jpg"></center>'
 

locations/pav_commercial.qsrc

@@ -25,10 +25,6 @@ cla
 litltown = 1
 alkoblock = 0
 boynumBlock = 0
-!!sets the return location for bank and post office
-bankloc = 0
-!!sets the return location for allure swimwear store
-allure_pos = 1
 
 !call random events from [street_events], and display them before show location.
 if streetevent_hour + 2 < hour:gt'street_event','pav_commercial', 'main'

locations/post_office.qsrc

@@ -1,14 +1,22 @@
 # post_office
 
+if $ARGS[1] = 'leave':
+	if $region = 'city':
+		gt 'city_center'
+	else
+		gt 'pav_commercial'
+	end
+end
+
+
 if $ARGS[0] = 'start':
 	*clr & cla
 	$menu_loc = 'post_office'
 	$menu_arg = 'start'
 	menu_off = 0
 	gs 'stat'
-	$postloc = ''
 
-	act 'Leave': $postloc = 'leave' & gt 'post_office'
+	act 'Leave': minut += 3 & gt 'post_office', 'leave'
 
 	if (hour >= 9 and hour <= 10) or (hour >= 15 and hour <=16):
 
@@ -20,7 +28,7 @@ if $ARGS[0] = 'start':
 			cla
 			minut += 30
 			gs 'stat'
-			$postloc = 'counter' & gt 'post_office'
+			gt 'post_office', 'counter'
 		end
 
 		if exhibitionist_lvl > 2:
@@ -34,7 +42,7 @@ if $ARGS[0] = 'start':
 					gs 'flash', 'full', 'inside', 1
 					gs 'stat'
 
-					act 'Go to the counter': $postloc = 'counter' & gt 'post_office'
+					act 'Go to the counter': gt 'post_office', 'counter'
 				end
 			else
 				act 'Flash both your tits and your pussy to skip the line (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -52,7 +60,7 @@ if $ARGS[0] = 'start':
 					gs 'flash', 'pussy', 'inside', 1
 					gs 'stat'
 
-					act 'Go to the counter': $postloc = 'counter' & gt 'post_office'
+					act 'Go to the counter': gt 'post_office', 'counter'
 				end
 			else
 				act 'Flash your pussy to skip the line (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -70,7 +78,7 @@ if $ARGS[0] = 'start':
 					gs 'flash', 'tits', 'inside', 1
 					gs 'stat'
 
-					act 'Go to the counter': $postloc = 'counter' & gt 'post_office'
+					act 'Go to the counter': gt 'post_office', 'counter'
 				end
 			else
 				act 'Flash your tits to skip the line (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -111,7 +119,7 @@ if $ARGS[0] = 'start':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Go to the counter': $postloc = 'counter' & gt 'post_office'
+							act 'Go to the counter': gt 'post_office', 'counter'
 						end
 
 						act 'Cum in your mouth':
@@ -122,23 +130,18 @@ if $ARGS[0] = 'start':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Go to the counter': $postloc = 'counter' & gt 'post_office'
+							act 'Go to the counter': gt 'post_office', 'counter'
 						end
 
 					else
+						minut += 5
+						gs 'pain', 4, 'tummy', 'hit'
+						gs 'stat'
 						'<center><video autoplay loop src="images/locations/shared/postoffice/punch.mp4"></video></center>'
 						'The man punches you in the gut. "Go away bitch, your face is covered in cum!"' 
 						'You quickly stagger away.'
-						minut += 120
-						gs 'pain', 4, 'tummy', 'hit'
 
-						act 'Recover':
-							if bankloc = 1:
-								gt 'city_center'
-							else
-								gt 'pav_commercial'
-							end
-						end
+						act 'Recover': minut += rand(3, 5) & gt 'post_office', 'leave'
 					end
 				end
 			else
@@ -151,14 +154,14 @@ if $ARGS[0] = 'start':
 		'It is currently quiet and you can walk straight up to the counter.'
 
 		act 'Go to the counter':
-			$postloc = 'counter' & gt 'post_office'
+			gt 'post_office', 'counter'
 		end
 	end
 
-	if bankloc = 0: act 'Go to the Postmaster''s office': gt 'post_master', 'start'
+	if $region = 'pav': act 'Go to the Postmaster''s office': gt 'post_master', 'start'
 end
 
-if $postloc = 'counter':
+if $ARGS[1] = 'counter':
 	*clr & cla
 	$menu_loc = 'post_office'
 	$menu_arg = 'counter'
@@ -167,7 +170,7 @@ if $postloc = 'counter':
 	'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/counter.jpg"></center>'
 	'There''s nothing interesting happening. It''s rather boring here.'
 
-	act 'Leave': $postloc = 'leave' & gt 'post_office'
+	act 'Leave': minut += 3 & gt 'post_office', 'leave'
 
 	if bankAccount = 1 and money > 0:
 		act 'Deposit money into your bank account':
@@ -188,8 +191,8 @@ if $postloc = 'counter':
 
 			'"Is there anything else I can do for you?"'
 
-			act 'Leave the post office': $postloc = 'leave' & gt 'post_office'
-			act 'Yes': $postloc = 'counter' & gt 'post_office'
+			act 'Leave the post office': minut += 3 & gt 'post_office', 'leave'
+			act 'Yes': gt 'post_office', 'counter'
 		end
 	end
 
@@ -232,7 +235,7 @@ if $postloc = 'counter':
 				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/counter.jpg"></center>'
 				'You pay the full amount of your outstanding fine(s) to the cashier and they print out a receipt to say that it''s paid off.'
 
-				act 'Done': $postloc = 'counter' & gt 'post_office'
+				act 'Done': gt 'post_office', 'counter'
 			end
 		end
 	end
@@ -248,7 +251,7 @@ if $postloc = 'counter':
 			else
 				'Unfortunately, you have no money to submit the test. They would just throw it out without the receipt of payment.'
 			end
-			act 'Done': $postloc = 'counter' & gt 'post_office'
+			act 'Done': gt 'post_office', 'counter'
 		end
 	end
 
@@ -257,16 +260,17 @@ if $postloc = 'counter':
 		menu_off = 1
 		gs 'stat'
 		minut += 5
-		if mail <= 0:
+		if mail[$region] <= 0 and mail['all'] <= 0:
 			'You have no mail.'
 		else
 			'You have mail.'
+			act 'Pickup your mail': gt 'post_office', 'pickup_mail'
 		end
 
 		'"Is there anything else I can do for you?"'
 
-		act 'Yes': $postloc = 'counter' & gt 'post_office'
-		act 'Leave the post office': $postloc = 'leave' & gt 'post_office'
+		act 'Yes': gt 'post_office', 'counter'
+		act 'Leave the post office': minut += 3 & gt 'post_office', 'leave'
 	end
 
 	i = 0
@@ -310,11 +314,11 @@ if $postloc = 'counter':
 
 			if obmennik <= 0:
 				'<center><br><b>Invalid operation.</b></center>'
-				act 'Return': $postloc = 'counter' & gt 'post_office'
+				act 'Return': gt 'post_office', 'counter'
 			else
 				if money < obmennik:
 					'<center><br>You do not have <b><<obmennik>></b> <b>₽</b>.</center>'
-					act 'Return': $postloc = 'counter' & gt 'post_office'
+					act 'Return': gt 'post_office', 'counter'
 				end
 
 				if money >= obmennik:
@@ -326,15 +330,15 @@ if $postloc = 'counter':
 
 					'"Is there anything else I can do for you?"'
 
-					act 'Yes': $postloc = 'counter' & gt 'post_office'
-					act 'Leave the post office': $postloc = 'leave' & gt 'post_office'
+					act 'Yes': gt 'post_office', 'counter'
+					act 'Leave the post office': gt 'post_office', 'counter'
 				end
 			end
 		end
 	end
 }
 !!{	Might use for the city branch, but seems ott for Pav
-	if askWork = 0 and bankloc = 0:
+	if askWork = 0 and $region = 'pav':
 		act 'Ask for work':
 			*clr & cla
 			askWork += 1
@@ -348,18 +352,27 @@ if $postloc = 'counter':
 }
 end
 
-if $postloc = 'leave':
-	minut += 3
-	killvar '$postloc'
-	if bankloc = 1:
-		gt 'city_center'
+if $ARGS[0] = 'pickup_mail':
+	'<center><img src="images/locations/shared/postoffice/worker.jpg"></center>'
+
+	if mail[$region] > 0 or mail['all'] > 0:
+		'You have <<mail[$region] + mail[''all'']>> pieces of mail left to pickup.'
 	else
-		gt 'pav_commercial'
+		'You have collected all your mail.'
 	end
+
+	gs 'blackmailer', 'set_post_act'
+
+	act 'Go back': gt 'post_office', 'counter'
+	act 'Leave': minut += 3 & gt 'post_office', 'leave'
+
 end
 
+
+
 !! Not used for Pav, maybe use for city?
-if $postloc = 'post_off':
+!! Not used currently
+if $ARGS[1] = 'post_off':
 	*clr & cla
 	menu_off = 1
 	minut += 30

locations/shop_allure.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">shop_allure</font></b></center>'
-	if allure_pos = 1:
+	if $region = 'pav':
 		'<center><img src="images/locations/pavlovsk/commercial/allure/shop.jpg"></center>'
 	else
 		'<center><img src="images/locations/city/residential/lake/allure/shop.jpg"></center>'
@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 	act 'Leave':
 		cla
 		minut += 3
-		if allure_pos = 1:
+		if $region = 'pav':
 			minut += 3
 			gt 'pav_commercial'
 		else