[added] goto the book and porn stall, [fixed] arthurs name, moved the leave option to the top and several smaller other changes in pavtrain_market

locations/pavtrain_market.qsrc

@@ -1,11 +1,5 @@
 # pavtrain_market
 
-!{change log
-March 31, 2016
-Added rice wine quest
-April 20, 2016
-Fixed Rice wine event
-}
 $location_type = 'public_outdoors'
 if $ARGS[0] = 'start':
 	$metka = 'start'
@@ -34,41 +28,40 @@ if $ARGS[0] = 'start':
 	end
 	*nl
 	'This small open air market is located near the train station.'
-	if arturQW = 1 and (week = 6 or week = 7) and hour < 12:
-		act 'Wait for Aurel to arrive':hour = 12 & gt 'pavtrain_market', 'start'
-	end
+	if arturQW = 1 and (week = 6 or week = 7) and hour < 12: act 'Wait for Arthur to arrive':hour = 12 & gt 'pavtrain_market', 'start'
 	*nl
 	if hour >= 8 and hour <= 18:
 		'The market stalls are buzzing with shoppers. Everyone seems to be in a good mood and you can hear back and forth bargaining as you pass by.'
 		if pav_slut >= 50 and rand(0,9) = 0:
+			menu_off = 1
+			gs 'stat'
 			'An Armenian man comes up to you and in broken Russian says, "You girl who like men, no? Come meet real men have good time."'
-			act 'Go with him':gt 'gevent', '3'
 			act 'Reject him':
-				menu_off = 1
 				*clr & cla
 				'You pretend not to understand what he is saying, smiling and shaking your head as you move away from him.'
 				act 'Return':gt 'pavtrain_market', 'start'
 			end
+			act 'Go with him':gt 'gevent', '3'
 			
 			exit
 		end
 		
-		act 'Wander through the market': gt 'pavtrain_market','events'
 		act 'Go back to the station': minut += 3 & gt 'pavtrain'
-		
-		!expand market events from 1.2.4
+		act 'Wander through the market': gt 'pavtrain_market','events'
+		if pavtrain_book = 1: act 'Go to the book stall': minut += 5 & gt 'pavtrain_hall', 3
+		if pavmarket_porn = 1: act 'Go to the porn stall': minut += 5 & gt 'pavtrain_market', 4
 
 		if arturKnow = 1 and arturQW = 0:
-			act 'Look for Aurel':gt 'arturRinok', 'start'
+			act 'Look for Arthur':gt 'arturRinok', 'start'
 		elseif arturQW = 1 and (week = 6 or week = 7):
 			if hour = 12 or hour = 13:
-				act 'Look for Aurel':gt 'arturRinok', 'work_1'
+				act 'Look for Arthur':gt 'arturRinok', 'work_1'
 			end
 		elseif arturQW = 2:
 			if hour = 16 and minut <= 30:
-				act 'Look for Aurel':gt 'arturRinok', 'work_2'
+				act 'Look for Arthur':gt 'arturRinok', 'work_2'
 			elseif hour < 16:
-				act 'Wait for Aurel to arrive':hour = 16 & minut = 0 & gt 'pavtrain_market', 'start'
+				act 'Wait for Arthur to arrive':hour = 16 & minut = 0 & gt 'pavtrain_market', 'start'
 			end
 		end
 
@@ -83,9 +76,7 @@ if $ARGS[0] = 'start':
 				'Not wanting to get into trouble, you pack your stuff away. The man was already gone, but you saw which direction he went and he should be easy to find.'
 				act 'Leave':gt 'pavtrain_market', 'start'
 			end
-		end
-
-		if gobelen > 0 and gobQW >= 1:
+		elseif gobelen > 0 and gobQW >= 1:
 			act'Sell ​​tapestry':
 				menu_off = 1
 				*clr & cla
@@ -94,12 +85,12 @@ if $ARGS[0] = 'start':
 				'You go to the man who offered to buy your tapestries for 1000 <b>₽</b>. You find him by his stall, smiling.'
 				if gobQW = 2:
 					'Roman welcomes you. He is interested and businesslike as he asks what you have for sale.'
-				end
-				if gobQW = 1:
+				elseif gobQW = 1:
 					gobQW = 2
 					minute + 5
 					'The man greets you and introduces himself as Roman, you tell him that your name is <<$pcs_nickname>>. After a brief chat Roman says that he is interested in seeing what you have for sale.'
 				end
+				act 'Leave':gt 'pavtrain_market', 'start'
 				act'Show your tapestry':
 					*clr & cla
 					gobelen -= 1
@@ -111,16 +102,13 @@ if $ARGS[0] = 'start':
 				if gobelen > 1:
 					act'Sell all of your tapestries':
 						*clr & cla
-						kolgob = gobelen
+						'You show Roman your tapestries and he gives you <<gobelen * 1000>> <b>₽</b> for them. You take the money and give him the tapestries.'
+						money += gobelen * 1000
 						gobelen = 0
-						moneyGob = kolgob*1000
-						money += moneyGob
 						gs'stat'
-						'You show Roman your tapestries and he gives you <<moneyGob>> <b>₽</b> for them. You take the money and give him the tapestries.'
 						act 'Leave':gt 'pavtrain_market', 'start'
 					end
 				end
-				act 'Leave':gt 'pavtrain_market', 'start'
 			end
 		end
 		if ShowerIvan = 5 and porndeal = 0 and rand(1,10) <= 4 and lookwine ! daystart:
@@ -173,12 +161,11 @@ if $ARGS[0] = 'start':
 						'"How about we make a deal." he says, "Go to the porn dealer and buy me a porn magazine and I''ll get you the wine."'
 						if pornmarkonce = 0: pornmarkonce = 1 & '"Where can I find the porn dealer?" you ask and he happily gives you directions.'
 						
-						act 'Agree': porndeal = 1 & gt 'pavtrain_market', 4
-						
 						act 'Refuse':
 							'You decline his offer as he upsettingly walks away.'
 							act 'Leave': gt 'pavtrain_market', 'start'
 						end
+						act 'Agree': porndeal = 1 & gt 'pavtrain_market', 4
 					end
 				end
 			end
@@ -215,8 +202,7 @@ if $ARGS[0] = 'start':
 				'You tell him that you haven''t had time to pick up the magazine yet but you were working on it.'
 				act 'Leave': gt 'pavtrain_market', 'start'
 			end 
-		end
-		if porndeal = 1 and porndealday = daystart and lookboy = 0:
+		elseif porndeal = 1 and porndealday = daystart and lookboy = 0:
 			*clr & cla
 			menu_off = 1
 			gs 'stat'
@@ -226,8 +212,8 @@ if $ARGS[0] = 'start':
 			act 'Leave': gt 'pavtrain_market', 'start'
 		end
 	else
-		act 'Wander through the market': gt 'pavtrain_market','events'
 		act 'Go back to the station': minut += 3 & gt 'pavtrain'
+		act 'Wander through the market': gt 'pavtrain_market','events'
 	end
 end
 
@@ -303,6 +289,7 @@ end
 if ARGS[0] = 3:
 	*clr & cla
 	menu_off = 1
+	pavtrain_book = 1
 	gs 'stat'
 	if month >= 11 or month <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/bookw.jpg"></center>'
@@ -350,6 +337,7 @@ end
 if ARGS[0] = 4:
 	*clr & cla
 	menu_off = 1
+	pavmarket_porn = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 	'You find a small stall that has many shelves with a large variety of porn magazines, a pack of brand new porn playing cards, and you can see several sex toys just behind the counter. The salesman watches over his stall with shifty eyes.'
@@ -685,7 +673,7 @@ if ARGS[0] = 11:
 		act 'Look': gt 'arturRinok','start'
 	else
 		'Someone suddenly calls out to you, "Hey <<$pcs_nickname>>, do you want a fresh, juicy tangerine?"'
-		act 'Go and see Aurel': gt 'arturRinok','start'
+		act 'Go and see Arthur': gt 'arturRinok','start'
 	end
 end