Merge remote-tracking branch 'julzor/master'

locations/pavtrain_market.qsrc

@@ -219,16 +219,18 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'events':
-	if rand(0,3) = 0: gt 'pavtrain_market', rand(1,19)
-	'<center><h2>Market</h2></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/brodit'+rand(1,8)+'.jpg"></center>'
-	'You wander around the market taking in the sounds and colours but nothing catches your eye.'
 	*clr & cla
 	minut += 10
 	menu_off = 1
 	gs 'stat'
+	'<center><h2>Market</h2></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/brodit'+rand(1,8)+'.jpg"></center>'
+	'You wander around the market taking in the sounds and colours but nothing catches your eye.'
+	
 	act 'Stop wandering': gt 'pavtrain_market', 'start'
 	act 'Wander around the market': gt 'pavtrain_market','events'
+	
+	if rand(0,3) = 0: gt 'pavtrain_market', rand(1,19)
 end
 
 if ARGS[0] = 1:
@@ -743,23 +745,23 @@ if ARGS[0] = 13:
 	act 'Look through the purse':
 		*clr & cla
 		minut += 5
-		gs 'stat'
 		i = rand(40,200)
-		gs 'willpower', 'resist'
+		gs 'stat'
 		'<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>'
 
+		gs 'willpower', 'misc', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
 			act 'Take the money and throw away the wallet (<<will_cost>> Willpower)':
-				gs 'willpower', 'pay', 'resist'
 				*clr & cla
-				gs 'stat'
-				'You just need the money.':
 				money += i
 				pcs_mood += 10
-				gs stat
 				killvar 'i'
-				gt 'pavtrain_market','start'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				'You just need the money.'
+				
+				act 'Continue': gt 'pavtrain_market','start'
 			end
 		else
 			act 'Take the money and throw away the wallet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -829,24 +831,19 @@ if ARGS[0] = 18:
 	'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 (<<will_cost>> Willpower)':
-		gs 'stat'
-		gs 'willpower', 'resist'
-		if will_cost <= pcs_willpwr:
+	gs 'willpower', 'voyeur', 'self', 'easy'
+	if will_cost <= pcs_willpwr:
+		act 'Look through the hole (<<will_cost>> Willpower)':
 			*clr & cla
-			if girl > 1: pcs_horny += 5
+			gs 'arousal', 'voyeur', 2
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			'Oh...'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pereodev'+rand(1,15)+'.jpg"></center>'
 			'You look inside the tent and see ' + $pavtrain_marketrandtext[rand(3,7)]
 			act 'Leave': gt 'pavtrain_market', 'start'
-		else
-			cla
-			'You cannot bring yourself to look through the whole (Not enough willpower)'
-			act 'Stop wandering': gt 'pavtrain_market', 'start'
-			act 'Wander around the market': gt 'pavtrain_market','events'
 		end
+	else
+		act 'Look through the hole (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end