Просмотр исходного кода

[fixed] Tour guide 'apply' action was showing in place of the 'start job' action and allowed Sveta to start work much later in the day

Kevin_Smarts 10 месяцев назад
Родитель
Сommit
c6643b260b
2 измененных файлов с 10 добавлено и 8 удалено
  1. 9 7
      locations/pav_park.qsrc
  2. 1 1
      locations/tour_guide.qsrc

+ 9 - 7
locations/pav_park.qsrc

@@ -231,13 +231,15 @@ if $ARGS[0] = 'start':
 
 	gs 'music_actions', 'music_icon'
 
-	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 emp_job_status[1] = 1 and (emp_job_status[1] ! 4 or emp_job_status[1] ! 5):
-		if hour >= 8 and hour <= 12:
-			act 'Work as Tour Guide (8:00)':gt 'tour_guide', 'tourstart'
+	if month >= 6 and month <=8:
+		if (emp_job_status[1] = 0  or emp_job_status[1] = 4) 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 emp_job_status[1] = 1:
+			if hour >= 8 and hour <= 12:
+				act 'Work as Tour Guide (8:00)':gt 'tour_guide', 'tourstart'
+			end
 		end
 	elseif emp_job_status[1] = 1:
 		!! out of season

+ 1 - 1
locations/tour_guide.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'tourstart':
 	menu_off = 1
 	cla & *clr
 	!! TourGuide = 0
-	if (emp_job_status[1] = 0  or emp_job_status[1] =4) and emp_job_status[1] ! 5:
+	if emp_job_status[1] = 0  or emp_job_status[1] =4:
 		minut += 30
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/palace/office/tour_office.jpg"></center>'