1
0
Переглянути джерело

[fixes] dead in the tailor after resizing your clothes.

julzor 5 роки тому
батько
коміт
ecbe1b138f
2 змінених файлів з 21 додано та 23 видалено
  1. 19 20
      locations/Gshveyfab.qsrc
  2. 2 3
      locations/pavIndustrial.qsrc

+ 19 - 20
locations/Gshveyfab.qsrc

@@ -3,8 +3,7 @@
 $location_type = 'public_outdoors'
 
 if $ARGS[0] = 'tailor':
-	cla
-	*clr
+	*clr & cla
 	$metka = 'tailor'
 	$loc = 'Gshveyfab'
 	$menu_loc = 'Gshveyfab'
@@ -15,10 +14,11 @@ if $ARGS[0] = 'tailor':
 	'Behind the counter an elderly man is inspecting some repaired clothes, he stops and smiles gently, greeting you.'
 	'"Hello there young lady, do you want to adjust some of your clothing? It''ll cost you 500 <b>₽</b> per item."'
 
+	act 'Leave': gt 'pavIndustrial'
+	
 	if money >= 500:
 		act 'Resize the clothes you''re wearing (500 <b>₽</b>)':
-			cla
-			*clr
+			*clr & cla
 			minut += 15
 			if CloStyle = 5 or $clothingworntype = 'exercise':
 				'The tailor is looking irritatingly at you, "Why are you wasting my time with exercise clothing? That type of clothing does not need to be resized..."'
@@ -29,19 +29,18 @@ if $ARGS[0] = 'tailor':
 				'You are handed your clothes back and quickly get dressed. You''re pleased with the job that the tailor has done.'
 			end
 
-			act 'Leave': minut += 5 & gt 'Gshveyfab', 'start'
+			act 'Leave': minut += 5 & gt 'pavIndustrial'
 		end
 
 		act 'Resize your other clothes':gt 'clothing', 'view_clothing_list', 'resize'
 		act 'Resize all your clothes':gt 'portnoi2'
 	end
-	act 'Leave': gt 'pavIndustrial'
+
 end
 
 if $ARGS[0] = 'enter':
-CLOSE ALL
-	cla
-	*clr
+	CLOSE ALL
+	*clr & cla
 	$metka = 'tailor'
 	$loc = 'Gshveyfab'
 	$menu_loc = 'Gshveyfab'
@@ -55,9 +54,11 @@ CLOSE ALL
 	'First shift - 08:00 to 16:00.'
 	'Second shift - 16:00 to 20:00.'
 	*nl
-	if workFabrika = 0 and age >= 16 and age < 18:'You can apply for a <a href="exec:minut += 15 & GT ''Gshveyfab'', ''job_start''">part-time job</a> here.'
-	if work = 0 and workFabrika = 0 and age >= 18:'You can apply for a <a href="exec:minut += 15 & GT ''Gshveyfab'', ''job_start''">full-time job</a> here.'
+	if workFabrika = 0 and age >= 16 and age < 18:'You can apply for a <a href="exec:minut += 15 & gt ''Gshveyfab'', ''job_start''">part-time job</a> here.'
+	if work = 0 and workFabrika = 0 and age >= 18:'You can apply for a <a href="exec:minut += 15 & gt ''Gshveyfab'', ''job_start''">full-time job</a> here.'
 
+	act 'Leave': minut += 5 & gt 'pavIndustrial'
+	
 	if workFabrika = 1 and week >= 1 and week <= 5 and hour >= 8 and hour < 9 and age >= 18:
 		'Your shift is starting now.'
 		act 'Start shift': gt'Gshveyfab','job'
@@ -87,12 +88,10 @@ CLOSE ALL
 			gt 'Gshveyfab','enter'
 		end
 	end
-	act 'Leave': minut += 5 & gt 'pavIndustrial'
 end
 
 if $ARGS[0] = 'job_start':
-	cla
-	*clr
+	*clr & cla
 	$metka = 'tailor'
 	$loc = 'Gshveyfab'
 	$menu_loc = 'Gshveyfab'
@@ -102,6 +101,9 @@ if $ARGS[0] = 'job_start':
 	'<center><B>FOREMAN''S OFFICE</B></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/stepan/nachalnik.jpg" ></center>'
 	'You head into the factory foreman, Stepan Sergeyevich office, and ask him if there''s an available job.'
+	
+	act 'Leave': gt'Gshveyfab', 'enter'
+	
 	if age >= 16 and age < 18 and workFabrika = 0:
 		'"Sure, have a seat," he says. "Now, the work is difficult and meticulous, but doesn''t require any special knowledge. You should catch on pretty quick. Since you are not an adult yet, you can only work half-time, and the pay is 105 <b>₽</b> per hour. Once you become an adult, we can transfer you to full-time. Naturally, as this is a state-recognized company, we do require all the appropriate documentation. The main shift is on weekdays from 08:00 to 16:00, but you will be working the second shift, from 16:00 to 20:00.'
 		'But beware, if you miss more than three days of work in a single month, you will be fired. You will be paid at the end of the month and getting fired before then will forfeit any pay not yet received. So, is that okay?"'
@@ -116,7 +118,7 @@ if $ARGS[0] = 'job_start':
 			FabrikaProgul = 0
 			'You hand him over your documents, which he takes and then reminds you to come in on every weekday, at 16:00.'
 
-			act 'Leave':gt'Gshveyfab', 'enter'
+			act 'Leave': gt'Gshveyfab', 'enter'
 		end
 
 	elseif age >= 18 and workFabrika = 0:
@@ -133,16 +135,13 @@ if $ARGS[0] = 'job_start':
 			FabrikaProgul = 0
 			'You hand him your documents, which he takes and then reminds you to come in on every weekday, at 08:00.'
 
-			act 'Leave':gt'Gshveyfab', 'enter'
+			act 'Leave': gt'Gshveyfab', 'enter'
 		end
 	end
-
-	act 'Leave':gt'Gshveyfab', 'enter'
 end
 
 if $ARGS[0] = 'job':
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
 	FabrikaProgul -= 1
 	if FabrikaProgul < 0: FabrikaProgul = 0

+ 2 - 3
locations/pavIndustrial.qsrc

@@ -21,8 +21,7 @@ if sound = 0:
 	end
 end
 
-cla
-*clr
+*clr & cla
 litltown = 1
 alkoblock = 0
 boynumBlock = 0
@@ -38,7 +37,7 @@ if streetevent_hour + 2 < hour:gt'street_event','pavIndustrial', 'main'
 'This area is dominated by one biggest employers in Pavlovsk, the local textile factory. It''s owned by G&M who opened up a store opposite.'
 
 if hour >= 8 and hour < 20 and week >= 1 and week <= 5:
-	'Behind the security checkpoint you can see the <a href="exec:minut += 5 & GT ''Gshveyfab'', ''enter''">entrance</a> that every employee passes through.'
+	'Behind the security checkpoint you can see the <a href="exec:minut += 5 & gt ''Gshveyfab'', ''enter''">entrance</a> that every employee passes through.'
 elseif hour < 8 or hour > 20 or week > 5:
 	'The factory is currently closed.'
 end