Преглед изворни кода

[Fixed] Bugs reported on TFGS about jobs being available when they should/shouldn't and added a resign for the rest of the summer option for the tour guide job.

Alaratt пре 3 година
родитељ
комит
ca7e6d7b0d
3 измењених фајлова са 35 додато и 4 уклоњено
  1. 1 0
      locations/andrey.qsrc
  2. 4 2
      locations/pav_park.qsrc
  3. 30 2
      locations/tour_guide.qsrc

+ 1 - 0
locations/andrey.qsrc

@@ -65,6 +65,7 @@ if $ARGS[0] = 'apply':
 			end
 			act 'Take the weekend job':
 				cla
+				work = 1
 				young_shop_work1 = 1
 				minut += 5
 				*nl

+ 4 - 2
locations/pav_park.qsrc

@@ -209,7 +209,7 @@ if $ARGS[0] = 'start':
 		end		
 	end
 
-	if month >= 6 and month <=8 and TourGuide = 0 and work = 0:
+	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
@@ -217,9 +217,11 @@ if $ARGS[0] = 'start':
 		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 and work = 1:
+	elseif month >= 9 and month <= 5 and TourGuide = 1:
 		TourGuide = 0
 		work = 0
+	elseif month >= 9 and month <= 5 and TourGuide = 3:
+		TourGuide = 0
 	end
 
 	if mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:

+ 30 - 2
locations/tour_guide.qsrc

@@ -18,7 +18,16 @@ if $ARGS[0] = 'tourstart':
 		*nl
 		'You answer a few questions the management team asks you and are offered a summer position at 100 <b>₽</b> an hour, 6 hours a day. Fresh uniforms are provided daily and training will be you shadowing another guide for the first couple of days to make sure you know the details required to lead your groups.'
 		'Like any teenager your only questions are about breaks and days off. The manager smiles, not surprised, and tells you that working is voluntary. If you do not show up then obviously you will not make any money that day, but otherwise no daily commitment is required from you. Breaks will be allowed if there are no groups to lead at that time and you will be given a small lunch everyday that you choose to work.'
-		act 'Accept the position':TourGuide = 1 & work = 1 & gt 'pav_park', 'start'
+		act 'Accept the position':
+			if cheatWork = 1:
+				TourGuide = 1
+				gt 'pav_park', 'start'
+			else
+				TourGuide = 1
+				work = 1
+				gt 'pav_park', 'start'
+			end
+		end
 		act 'Change your mind': gt 'pav_park', 'start'
 	elseif TourGuide = 1:
 		*clr & cla
@@ -301,8 +310,23 @@ if $ARGS[0] = 'toursdone':
 		'Walking into the tour office, you find your boss waiting for you. "Follow me, <<$pcs_firstname>>," he says with an unpleasant look on his face, and heads to a room way in the back.'
 		act 'Follow him': gt 'tour_guide', 'backroom'
 	else
-		act 'Done for the day': gt 'pav_park', 'start'
+		act 'Done for the day':gt 'pav_park', 'start'
+		act 'Resign from your job':gt 'tour_guide', 'resign'
+	end
+end
+
+if $ARGS[0] = 'resign':
+	$location_type = 'indoors'
+	menu_off = 1
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/palace/office/angry_boss.jpg"></center>'
+	'You let your boss know you have decided to quit your job for the rest of the summer. He is not pleased about you quitting, but manages to keep his temper and lets you know if you want to come back next summer he will at least consider it.'
+	act 'Resign':
+		TourGuide = 3
+		work = 0
+		gt 'pav_park', 'start'
 	end
+	act 'Change your mind':gt 'pav_park', 'start'
 end
 
 if $ARGS[0] = 'backroom':
@@ -316,6 +340,7 @@ if $ARGS[0] = 'backroom':
 		act 'Take your punishment': gt 'tour_guide', 'spank'
 		act 'Quit your job':
 			TourGuide = 2
+			work = 0
 			killvar 'riverbusted'
 			pcs_mood -= 25
 			gs 'stat'
@@ -328,6 +353,7 @@ if $ARGS[0] = 'backroom':
 		act 'Take your punishment': gt 'tour_guide', 'spank'
 		act 'Quit your job':
 			TourGuide = 2
+			work = 0
 			killvar 'riverbusted'
 			pcs_mood -= 25
 			gs 'stat'
@@ -343,6 +369,7 @@ if $ARGS[0] = 'backroom':
 		act 'Take your punishment': gt 'tour_guide', 'spank'
 		act 'Quit your job':
 			TourGuide = 2
+			work = 0
 			killvar 'riverbusted'
 			pcs_mood -= 25
 			gs 'stat'
@@ -358,6 +385,7 @@ if $ARGS[0] = 'backroom':
 		act 'Take your punishment': gt 'tour_guide', 'spank'
 		act 'Quit your job':
 			TourGuide = 2
+			work = 0
 			killvar 'riverbusted'
 			pcs_mood -= 25
 			gs 'stat'