Browse Source

(Fixes) Could wonder market long after it had shut and could get phone out of bag in class when you had no bag. Spotted by Robgor95

KevinSmarts 4 years ago
parent
commit
1a42671a93
2 changed files with 58 additions and 20 deletions
  1. 1 1
      locations/gschool_lessonsev3.qsrc
  2. 57 19
      locations/pavtrain_market.qsrc

+ 1 - 1
locations/gschool_lessonsev3.qsrc

@@ -1297,7 +1297,7 @@ if $ARGS[0] = 'art':
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
-		elseif scooltiperand = 8:
+		elseif scooltiperand = 8 and bag = 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/dickpic.jpg"></center>'
 			'You get an alert on your phone. You pull it out of your purse and put it in your lap. You glance down and see someone has sent you an image. Opening the image you see a picture of someone''s dick. You hear some snickering and look up to see who it was, but you can''t tell where it came from. Unsure what to do, you don''t want to be caught looking at it, so you delete the image.'
 			gs 'arousal', 'voyeur', 5

+ 57 - 19
locations/pavtrain_market.qsrc

@@ -228,7 +228,9 @@ if $ARGS[0] = 'events':
 	'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 hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	
 	if rand(0,3) = 0: gt 'pavtrain_market', rand(1,19)
 end
@@ -245,7 +247,9 @@ if ARGS[0] = 1:
 		'<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'
+		if hour >= 8 and hour <= 18:
+			act 'Wander around the market': gt 'pavtrain_market','events'
+		end
 	end
 	act 'Give some money': 
 		*clr & cla
@@ -255,7 +259,9 @@ if ARGS[0] = 1:
 		'<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'
+		if hour >= 8 and hour <= 18:
+			act 'Wander around the market': gt 'pavtrain_market','events'
+		end
 	end
 end
 
@@ -267,7 +273,9 @@ if ARGS[0] = 2:
 	'<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'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 end
 
 if ARGS[0] = 3:
@@ -282,7 +290,9 @@ if ARGS[0] = 3:
 	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 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= 350:
 		act 'Buy a fantasy book (350 <b>₽</b>)':
 			*clr & cla
@@ -329,7 +339,9 @@ if ARGS[0] = 4:
 	'<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 'Stop wandering': gt 'pavtrain_market', 'start'
-	act 'Wander around the market': gt 'pavtrain_market','events'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= 699 and card < 2:
 		act 'Buy cards (699 <b>₽</b>)':
 			*clr & cla
@@ -563,7 +575,9 @@ if ARGS[0] = 5:
 	'<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'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 end
 
 if ARGS[0] = 6:
@@ -605,7 +619,9 @@ if ARGS[0] = 7:
 	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 hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= tovpay:
 		act 'Buy the cosmetics (800 <b>₽</b>)':
 			minut += 15
@@ -625,7 +641,9 @@ if ARGS[0] = 8:
 	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 hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= tovpay:
 		act 'Buy vitamins (105 <b>₽</b>)':
 			minut += 15
@@ -645,7 +663,9 @@ if ARGS[0] = 9:
 	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 hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= tovpay:
 		act 'Buy condoms (80 <b>₽</b>)':
 			minut += 15
@@ -670,7 +690,9 @@ if ARGS[0] = 10:
 	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 hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= tovpay:
 		act 'Buy lip balm (100 <b>₽</b>)':
 			*clr & cla
@@ -705,7 +727,9 @@ if ARGS[0] = 12:
 	'<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 hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if pcs_energy <= 80:
 		act 'Buy a pie for 20 <b>₽</b>':
 			*clr & cla
@@ -773,7 +797,9 @@ if ARGS[0] = 13:
 			'<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 'Stop wandering': gt 'pavtrain_market', 'start'
-			act 'Wander around the market': gt 'pavtrain_market','events'
+			if hour >= 8 and hour <= 18:
+				act 'Wander around the market': gt 'pavtrain_market','events'
+			end
 		end
 	end
 end
@@ -786,7 +812,9 @@ if ARGS[0] = 14:
 	'<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'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 end
 
 if ARGS[0] = 15:
@@ -797,7 +825,9 @@ if ARGS[0] = 15:
 	'<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'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 end
 
 if ARGS[0] = 16:
@@ -808,7 +838,9 @@ if ARGS[0] = 16:
 	'<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'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 end
 
 if ARGS[0] = 17:
@@ -819,7 +851,9 @@ if ARGS[0] = 17:
 	'<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'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 end
 
 if ARGS[0] = 18:
@@ -830,7 +864,9 @@ if ARGS[0] = 18:
 	'<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'
+	if hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	gs 'willpower', 'voyeur', 'self', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Look through the hole (<<will_cost>> Willpower)':
@@ -856,7 +892,9 @@ if ARGS[0] = 19:
 	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 hour >= 8 and hour <= 18:
+		act 'Wander around the market': gt 'pavtrain_market','events'
+	end
 	if money >= tovpay:
 		act 'Buy birth control pills (1500 <b>₽</b>)':
 			*clr & cla