[fixed] a gazillion dead ends in pavtrain_market

locations/pavtrain_market.qsrc

@@ -239,8 +239,8 @@ if $ARGS[0] = 'events':
 	gs 'stat'
 	rinevrand = rand(1,19)
 
-	act 'Wander around the market': gt 'pavtrain_market','events'
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if rand(0,3) ! 0: 
 		gs 'pavtrain_market', rinevrand
 	else
@@ -273,6 +273,7 @@ if ARGS[0] = 1:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/poproshaika2.jpg"></center>'
 		'You ignore the beggar and pretend not to hear him.'
+		act 'Stop wandering': gt 'pavtrain_market', 'start'
 		act 'Wander around the market': gt 'pavtrain_market','events'
 	end
 	act 'Give some money': 
@@ -283,6 +284,7 @@ if ARGS[0] = 1:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/podaet.jpg"></center>'
 		'You give the beggar a few rubles which he kindly thanks you for.'
+		act 'Stop wandering': gt 'pavtrain_market', 'start'
 		act 'Wander around the market': gt 'pavtrain_market','events'
 	end
 end
@@ -294,6 +296,8 @@ if ARGS[0] = 2:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dedgitara.jpg"></center>'
 	'You see an old man playing the guitar. He''s trying to avert as much attention as he can to himself.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 3:
@@ -306,10 +310,11 @@ if ARGS[0] = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/book.jpg"></center>'
 	end
 	'You find a stall selling various books, there are fantasy books, science fiction and romance novels, all of which costs only 350 <b>₽</b> each.'
-	act 'Leave':gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= 350:
 		act 'Buy a fantasy book (350 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			money -= 350
 			f_book += 1
@@ -320,7 +325,7 @@ if ARGS[0] = 3:
 	end
 	if money >= 350:
 		act 'Buy a science fiction book (350 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			money -= 350
 			f_book += 1
@@ -331,7 +336,7 @@ if ARGS[0] = 3:
 	end
 	if money >= 350:
 		act 'Buy a romance novel (350 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			money -= 350
 			w_book += 1
@@ -348,10 +353,11 @@ if ARGS[0] = 4:
 	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.'
-	act 'Leave':gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= 699 and card < 2:
 		act 'Buy cards (699 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 5
 			money -= 699
 			card = 2
@@ -367,7 +373,7 @@ if ARGS[0] = 4:
 	if porndeal = 1:
 		if money >= 400:
 			act 'Buy a porn magazine for the Chinese boy (400 <b>₽</b>)':
-				cls
+				*clr & cla
 				minut += 5
 				money -= 400
 				haveporn = 1
@@ -380,7 +386,7 @@ if ARGS[0] = 4:
 		end
 	else
 		act 'Browse the porn magazines':
-			cls
+			*clr & cla
 			pcs_horny += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
@@ -394,7 +400,7 @@ if ARGS[0] = 4:
 					act 'Leave':gt 'pavtrain_market', 'start'
 					act 'Look for something else':gt 'pavtrain_market', 4
 					act 'Ask for the price':
-						cls
+						*clr & cla
 						minut += 5
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
@@ -403,7 +409,7 @@ if ARGS[0] = 4:
 						act 'Look for something else':gt 'pavtrain_market', 4
 						if money >= 400:
 							act 'Buy magazine (400 <b>₽</b>)':
-								cls
+								*clr & cla
 								minut += 5
 								money -= 400
 								pornMagazine = 40
@@ -426,7 +432,7 @@ if ARGS[0] = 4:
 					act 'Look for something else':gt 'pavtrain_market', 4
 					if money >= 400:
 						act 'Buy magazine (400 <b>₽</b>)':
-							cls
+							*clr & cla
 							minut += 5
 							money -= 400
 							pornMagazine = 40
@@ -448,7 +454,7 @@ if ARGS[0] = 4:
 					act 'Look for something else':gt 'pavtrain_market', 4
 					if money >= 400:
 						act 'Buy magazine (400 <b>₽</b>)':
-							cls
+							*clr & cla
 							minut += 5
 							money -= 400
 							pornMagazine = 40
@@ -465,7 +471,7 @@ if ARGS[0] = 4:
 		end
 	end
 	act 'Ask to see the sex toys':
-		cls
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/sextoys.jpg"></center>'
 		'He lets you step behind the counter so you can get a better look, as you do he says. "Take a look and let me know what you would like." You see several 15cm dildos. Each with a tag, "Only 700 <b>₽</b> each." You also see a small selection of vibrators in various colors, mostly pink. "Only 700 <b>₽</b> each." To one side you see many butt plugs, rubber and metal. "Only 700 <b>₽</b>each." Near the bottom is several strapon harnesses. "Only 1000 <b>₽</b>each."'
@@ -549,6 +555,8 @@ if ARGS[0] = 5:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dedgitara.jpg"></center>'
 	'You see an old man playing the guitar. He''s trying to avert as much attention as he can to himself.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 6:
@@ -558,7 +566,8 @@ if ARGS[0] = 6:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/nenavizublyadcigan.jpg"></center>'
 	'You meet a Gypsy woman. She offers to tell your fortune.'
-	act 'Agree':
+	act 'Decline': gt 'pavtrain_market', 'start'
+	act 'Accept':
 		*clr & cla
 		minut += 5
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/gadaet'+rand(1,2)+'.jpg"></center>'
@@ -571,8 +580,7 @@ if ARGS[0] = 6:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pusto.jpg"></center>'
 			'With a sneaking suspicion you start looking through your stuff. Your wallet is nowhere to be found!'
 			act 'Find the Gypsy':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/okliknut.jpg"></center>'
 				'You search the area hoping to find the thief, but she has already disappeared into the crowd.'
 				act 'Back': gt 'pavtrain_market', 'start'
@@ -589,13 +597,13 @@ if ARGS[0] = 7:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/kosmetic.jpg"></center>'
 	tovpay = 800
 	'You see some cosmetics on sale for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy the cosmetics (800 <b>₽</b>)':
-			cls
 			minut += 15
 			money -= tovpay
 			kosmetica += 50
-			gs 'stat'
 			gt 'pavtrain_market', 'start'
 		end
 	end
@@ -609,9 +617,10 @@ if ARGS[0] = 8:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/vitaminki.jpg"></center>'
 	tovpay = 105
 	'You see some vitamins on sale for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy vitamins (105 <b>₽</b>)':
-			cls
 			minut += 15
 			vitamin += 20
 			money -= tovpay
@@ -628,14 +637,15 @@ if ARGS[0] = 9:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/condoms.jpg"></center>'
 	tovpay = 80
 	'You see a booth selling condoms for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy condoms (80 <b>₽</b>)':
-			cls
 			minut += 15
 			prezik += 5
 			i = 5
 			:cndmlp
-				if rand(0,49)-6*(8-tovpay/10) <= 0:badprezik += 1
+			if rand(0,49)-6*(8-tovpay/10) <= 0:badprezik += 1
 			if i > 0: i-= 1 & jump 'cndmlp'
 			killvar 'i'
 			money -= tovpay
@@ -652,9 +662,11 @@ if ARGS[0] = 10:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/balzam.jpg"></center>'
 	tovpay = 100
 	'There is lip balm on sale for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy lip balm (100 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			lipbalm += 30
 			money -= tovpay
@@ -684,10 +696,11 @@ if ARGS[0] = 12:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/cheburek.jpg"></center>'
 	'Walking through the market, you came across an old woman selling pies.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if pcs_energy <= 80:
 		act 'Buy a pie for 20 <b>₽</b>':
-			cla
-			*clr
+			*clr & cla
 			fat+=3
 			frost = 0
 			pcs_health += 5
@@ -713,7 +726,6 @@ if ARGS[0] = 13:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dropwallet.jpg"></center>'
 	'You see a wallet fall out of a woman''s purse.'
-	cla
 	act 'Tell her':
 		*clr & cla
 		minut += 2
@@ -730,10 +742,9 @@ if ARGS[0] = 13:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/zaglanut.jpg"></center>'
 		'You open the wallet and you see that there''s <<i>> <b>₽</b>'
 		act 'Take the money and throw away the wallet':
-			*clr & cla
 			money += i
 			pcs_mood += 10
-			gs 'stat'
+			killvar 'i'
 			gt 'pavtrain_market', 'start'
 		end
 		act 'Catch up with the woman and return her purse':
@@ -742,7 +753,8 @@ if ARGS[0] = 13:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/proverka.jpg"></center>'
 			'You catch up with the woman and telling her she dropped something you hand her the purse. The woman checks her money is still there and seeing that everything is in place, she thanks you and walked away.'
-			act 'Continue walking through the market': gt 'pavtrain_market','events'
+			act 'Stop wandering': gt 'pavtrain_market', 'start'
+			act 'Wander around the market': gt 'pavtrain_market','events'
 		end
 	end
 end
@@ -754,6 +766,8 @@ if ARGS[0] = 14:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/rebenok.jpg"></center>'
 	'You see a young mother and her crying baby.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 15:
@@ -763,6 +777,8 @@ if ARGS[0] = 15:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/rezba.jpg"></center>'
 	'You find a stall with beautiful things carved out of wood and metal.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 16:
@@ -772,6 +788,8 @@ if ARGS[0] = 16:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/gruzchik.jpg"></center>'
 	'Looking around, you almost collide with a man pulling a small cart.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 17:
@@ -781,6 +799,8 @@ if ARGS[0] = 17:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/meatlavka.jpg"></center>'
 	'You wander past a the meet seller and see a butcher working with an axe.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 end
 
 if ARGS[0] = 18:
@@ -790,6 +810,8 @@ if ARGS[0] = 18:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dirka.jpg"></center>'
 	'As you walk past a stall you notice a small hole torn in the canvas.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	act 'Look through the hole':
 		*clr & cla
 		if girl > 1: pcs_horny += 5
@@ -807,9 +829,11 @@ if ARGS[0] = 19:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/birthcontrolpills.jpg"></center>'
 	tovpay = 1500
 	'You see a booth selling birth control pills for <<tovpay>> <b>₽</b>.'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
 	if money >= tovpay:
 		act 'Buy birth control pills (1500 <b>₽</b>)':
-			cls
+			*clr & cla
 			minut += 15
 			tabletki += 1
 			if rand(0,49) - (6*(8-tovpay/50)) <= 0: