Merge remote-tracking branch 'Colwyvern/tour-guide'

locations/journal.qsrc

@@ -80,6 +80,7 @@ if $ARGS[0] = 'records':
 	if (work = 1 or cheatWork = 1) and young_shop_work1 = 1:'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Saturday and Sunday. The salary shall be issued once a week, on Fridays.'
 	if (work = 1 or cheatWork = 1) and young_shop_work2 = 1:'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Monday through Friday. The salary shall be issued once a week, on Fridays.'
 	if (work = 1 or cheatWork = 1) and workFabrika = 1:'You work as a seamstress in the factory in Pavlovsk. Work is every weekday, with weekends off. Salary is automatically transferred on the 25th of each month.'
+	if (work = 1 or cheatWork = 1) and TourGuide = 1:'You work as a tour guide in the Pavlovsk park. Work is any day during the summer holidays for 6 hours, starting between 08:00 and 12:00. Salary is 1,000 <b>₽</b> .'
 	if workrin = 1:'You are working at the market in Arthur''s tent as a clothing saleswoman. You work on Tuesday, Thursday and Saturday with a start time of 08:00. Salary depends on sales.'
 	if maidqw = 1:
 		'You work in the Pavlovsk hotel as a maid. Your work schedule is every day from 16:00 to 19:00 and your salary is 250 <b>₽</b> plus tips.'

locations/pav_park.qsrc

@@ -217,18 +217,20 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if month >= 6 and month <=8 and TourGuide = 0 and (work = 0 or cheatWork = 1):
+	if month >= 6 and month <= 8 and TourGuide = 0 and (work = 0 or cheatWork = 1):
 		if hour >= 8 and hour <= 18:
 			act 'Apply for the Tour Guide job (0:30)':gt 'tour_guide', 'tourstart'
 		end
-	elseif month >= 6 and month <=8 and TourGuide = 1:
+	elseif month >= 6 and month <= 8 and TourGuide = 1:
 		if hour >= 8 and hour <= 12:
 			act 'Work as Tour Guide (6:00)':gt 'tour_guide', 'tourstart'
 		end
-	elseif month >= 9 and month <= 5 and TourGuide = 1:
+	elseif (month >= 9 or month <= 5) and TourGuide = 1:
+		'Your work as a tour guide has finished now that it is no longer the summer holidays.'
 		TourGuide = 0
 		work = 0
-	elseif month >= 9 and month <= 5 and TourGuide = 3:
+	elseif (month >= 9 or month <= 5) and TourGuide = 3:
+		!! already resigned from working as a tour guide
 		TourGuide = 0
 	end