[fixed] wrong or missing menu_variables, missing willpower, moved decline options to the top in taxi and trashplace, fixed wrong exit location in trashplace

locations/taxi.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = '':
 		cla & *clr
 		$menu_loc = 'taxi'
 		$menu_arg = ''
-		menu_off = 0
+		menu_off = 1
 		minut += 5
 		'<center><img <<$set_imgh>> src="images/locations/shared/taxi/taxi.base0,'+rand(1,4)+'.jpg"></center>'
 		'Seeing a taxi coming down the road you raise your arm and wave him down, as he stops you get in.'

locations/trashplace.qsrc

@@ -1,11 +1,26 @@
 # trashplace
 $location_type = 'public_outdoors'
+
 $bomzstartqwestdi = {
-		'"Okay. I see you''re a good girl, but with finance problems. I''m here and have several times seen and heard this said about you."'
+	menu_off = 1
+	gs 'stat'
+	'"Okay. I see you''re a good girl, but with finance problems. I''m here and have several times seen and heard this said about you."'
 	'"I know one part time job. Work is not dirty, but a bit risky. I can''t say much here, but do you have a passport and local residence permit?'
 
+	gs 'willpower', 'misc', 'resist'
+	if will_cost <= pcs_willpwr:
+		act 'No it seems wrong (<<will_cost>> Willpower)': 
+			bomzQW = -1
+			minut += 1
+			gs 'willpower', 'pay', 'resist'
+			gt $loc, $metka
+		end
+	else
+		act 'No it seems wrong (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	
 	act 'Yes':
-		cls
+		*clr & cla
 		minut += 15
 		gs 'stat'
 		'"Yes, I have them here. So when are you going to tell me about this job?"'
@@ -17,7 +32,7 @@ $bomzstartqwestdi = {
 		'"No problem, just don''t tell anyone." She says, winking.'
 
 		act 'Enter subway':
-			cls
+			*clr & cla
 			minut += 15
 			gs 'stat'
 			'You descended into the subway and go to the industrial area. You are lead to the porn studio.'
@@ -34,7 +49,7 @@ $bomzstartqwestdi = {
 			end
 
 			act 'See the manager':
-				cls
+				*clr & cla
 				minut += 15
 
 				if pornstudio = 0:pornstudio = 1
@@ -53,13 +68,24 @@ $bomzstartqwestdi = {
 				'"Here''s her passport, I''m sure you can make some inquires."'
 
 				act 'What kind of work?':
-					cls
+					*clr & cla
 					minut += 15
 					gs 'stat'
 					'"Transportation of goods, good pay. Show your passport and come next Thursday. If all goes well, we will discuss the details."'
-
+					
+					gs 'willpower', 'misc', 'resist'
+					if will_cost <= pcs_willpwr:
+						act 'Refuse and leave (<<will_cost>> Willpower)':
+							bomzQW = -1
+							gs 'willpower', 'pay', 'resist'
+							gt 'Nord'
+						end
+					else
+						act 'Refuse and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					
 					act 'Show your passport':
-						cls
+						*clr & cla
 						minut += 15
 						gs 'stat'
 
@@ -73,10 +99,15 @@ $bomzstartqwestdi = {
 								'The manager seems surprised, he looks at you and says,'
 								'"We seem to have one more issue. Suspicions that you are not quite... as feminine as you appear.'
 
-								act 'How dare you? (Leave)':gt 'Nord'
+								gs 'willpower', 'exhib', 'resist'
+								if will_cost <= pcs_willpwr:
+									act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'Nord'
+								else
+									act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+								end
 
 								act 'Show pussy':
-									cls
+									*clr & cla
 									gs 'stat'
 
 									if PCloSkirt > 0:
@@ -130,33 +161,39 @@ $bomzstartqwestdi = {
 						gs 'stat'
 						act 'Leave':bomzQW = 1 & gt 'Nord'
 					end
-
-					act 'Thanks, but I refuse (leave)':bomzQW = -1 & gt 'Nord'
 				end
 			end
 		end
 	end
-
-	act 'No it seems wrong':bomzQW = -1 & minut += 1 & gt 'street'
 }
 
 $workbomzdi = {
-	cls
+	*clr & cla
 	minut += 15
+	menu_off = 1
 	gs 'stat'
 	'We made inquiries about you, and everything seems in order. Essentially, we give you a thumb drive, you deliver it to the sauna, they give you an envelope and you bring it to us. Immediately.'
-	'Upon delivery of envolope you get 5000 <b>₽</b>. You do deliveries every Friday, after the studio has opened. If you agree, then visit any Friday, choose a safe mode of transport.'
-
-	act 'No, I don''t think it''s for me (leave)':bomzQW = -1 & gt 'Nord'
-
+	'Upon delivery of envolope you get 5,000 <b>₽</b>. You do deliveries every Friday, after the studio has opened. If you agree, then visit any Friday, choose a safe mode of transport.'
+	
+	gs 'willpower', 'misc', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act 'No, I don''t think it''s for me (<<will_cost>> Willpower)':
+			bomzQW = -1
+			gs 'willpower', 'pay', 'resist'
+			gt 'Nord'
+		end
+	else
+		act 'No, I don''t think it''s for me (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	
 	act 'Agree to work':
-		cls
+		*clr & cla
 		minut += 15
 		gs 'stat'
 		'Just this time, we will take you. In the future you''ll have to make your onwn way, because Fridays are getting risky for us, but we need to intruduce you to our colleagues.'
 
 		act 'Let''s go':
-			cls
+			*clr & cla
 			workDisk = 1
 			minut += 15
 			gs 'stat'
@@ -173,7 +210,7 @@ $workbomzdi = {
 			'You go to the sauna, and you''re introduced to the local managers. it is explained to you who you need to deliver to, and reminded that it is necessary to return the envelope the same day you receive it.'
 			'"Don''t forget to use secure transport. We''ll see you on Fridays and don''t fuck up."'
 
-			act 'Leave':bomzQW = 2 & minut += 1 & gt 'street'
+			act 'Leave':bomzQW = 2 & minut += 1 & gt $loc, $metka
 		end
 	end
 }
@@ -186,7 +223,8 @@ gs'stat'
 'A long line of trash cans for all the local apartments, shamefully hidden behind a corrugated iron fence.'
 
 if bumtolik = 2 and rand(0, 1) = 1:
-	cls
+	*clr & cla
+	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/musorka.jpg"></center>'
 	'You see the homeless person who you gave money to last time. He smiles, waving at you to stay and he comes up to you to say something.'
@@ -196,7 +234,8 @@ if bumtolik = 2 and rand(0, 1) = 1:
 end
 
 if bumtolik = 3 and hour >= 6 and hour <= 20 and rand(0, 1) = 1:
-	cls
+	*clr & cla
+	menu_off = 1
 	gs'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/bumt2.jpg"></center>'
@@ -210,19 +249,19 @@ end
 
 if musor > 3:
 	act 'Take out the trash':
-		cls
+		*clr & cla
 		musor = 0
-
+		menu_off = 1
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/musorka.jpg"></center>'
 		'You throw your trash into one of the bins.'
 		
-		if bomjqw>0:
-		'"Hey, babe, come over here, show an old man some service!" you hear in an impudent rattle.'
-		'This is an old homeless man, you saw him last time.'
+		if bomjqw > 0:
+			'"Hey, babe, come over here, show an old man some service!" you hear in an impudent rattle.'
+			'This is an old homeless man, you saw him last time.'
 			act 'See the homeless man':gt'musorkaexh','pos10'
 		end
 			
-
 		if bumtolik = 0:
 			'"Hey, there!" You hear from the bins.'
 			'You are scared and surprised.'
@@ -235,32 +274,32 @@ if musor > 3:
 			act 'Listen to the homeless man':gt'musorkaexh','pos3'
 		end
 
-		act 'Move away from the tank':gt $CURLOC
+		act 'Move away from the tank':gt $loc, $metka
 	end
 end
 
 if bomzQW = 0 and rand(1, 10) >= 8 and hour <= 16 and week ! 4:
-	cls
+	*clr & cla
+	menu_off = 1
 	gs'stat'
-
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/bum.jpg"></center>'
 	'When you start to move away from the bins, a man comes up to you and drunkenly croaks,'
 	'"Girl, it''s national give 300 <b>₽</b> to a bum day, so come on then.'
 
 	if money >= 300:
 		act 'Yeah, that''s a thing':
-			cls
+			*clr & cla
 			money -= 300
 			gs'stat'
 
 			'You give money to the homeless man, and he walks away thanking you. He also appears to be laughing.'
 
-			act 'Leave': minut += 1 & gt'street'
+			act 'Leave': minut += 1 & gt $loc, $metka
 		end
 	end
 
 	act 'No':
-		cls
+		*clr & cla
 		gs 'stat'
 
 		if storyline = 0:
@@ -269,7 +308,7 @@ if bomzQW = 0 and rand(1, 10) >= 8 and hour <= 16 and week ! 4:
 				'"Are you alright?" He looks you up and down.'
 
 				act 'No':
-					cls
+					*clr & cla
 					gs'stat'
 					podozrenie += 1
 
@@ -284,21 +323,20 @@ if bomzQW = 0 and rand(1, 10) >= 8 and hour <= 16 and week ! 4:
 				dynamic $bomzstartqwestdi
 			end
 		else
-				'"I''m sorry mister, but I don''t have that kind of money."'
+			'"I''m sorry mister, but I don''t have that kind of money."'
 
-				dynamic $bomzstartqwestdi
+			dynamic $bomzstartqwestdi
 		end
-
 	end
 	act 'Get lost':
-		cls
+		*clr & cla
 		bomzQW = -10
 		gs'stat'
 
 		'"You should not be so rude to me. I meet a lot of people, and I know a lot of things. This may come back to haunt you, when you least expect it.'
 		'With these words, the man leaves.'
 
-		act 'Leave': minut += 1 & gt'street'
+		act 'Leave': minut += 1 & gt $loc, $metka
 	end
 	exit
 end
@@ -372,14 +410,14 @@ if sub >= 80 and rand(0,5) = 0:
 					'"I think it''s time to give our little bitch a reward" one of them pants, and they all agree, they casually pull out from your abused holes and force you on your knees before removing your bonds, then they all stand up in circle around you and all start stroking themselves to orgasm.'
 					'Before long, the four hobos are all breathing heavily and you see their cocks twitching in their hands, they all start to orgasm, one of them aims for the inside of your mouth while the others shoot their disgusting loads all over your face.'
 					'"Holy Filicophyte" exclaims one of them as you gulp down the disgusting sperm that ended in your mouth, you have no idea what that means, but you don''t bother asking. As soon as they''re done painting your face with their cum, they hand you your clothes and get dressed before returning to their cans of beer. "We hope you will show us more respect in the future, slut, now leave.", you quickly get dressed and stumble without a word towards the street.'
-					act 'Leave': minut += 1 & gt 'street'
+					act 'Leave': minut += 1 & gt $loc, $metka
 				end
 			end
 		end
 	end
 end
 
-act 'Leave': minut += 1 & gt'street'
+act 'Leave': minut += 1 & gt $loc, $metka
 
 --- trashplace ---------------------------------