Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/city_kafe.qsrc

@@ -124,7 +124,7 @@ if $ARGS[0] = 'fabi':
 	'His smile broadens and he looks a little less tired. "Ah, so you want to work here? Well why wouldn''t you? Rockabilly music, the greaser subculture, Cadillacs and motorcycles and hamburgers! I love this period of American culture, it''s so vibrant and exciting! I''ve put every ruble I have into making this place the perfect recreation of an American diner from 1958. Who doesn''t love that?"'
 	*nl
 	'A glance around the place shows you that the diner is barely half full, and most of those dining are eating Russian food rather than American. Fabi is still raving about America in the 1950s, talking about Elvis Presley, someone called Carl Perkins and cheeseburgers and French fries. His enthusiasm is honest and infectious, but you came here for a reason, so you clear your throat. "Fabi? About the job?"'
-	'He grins sheepishly. "Sorry, I get carried away sometimes. So, you want to work here. Let me tell you about the job. We''re open every day from 12:00 to 20:00. You''d be working five days a week, Monday through Friday. You''d be expected to arrive between 11:00 and 12:00, before we open, to help get the place ready – if you''re late you don''t work that day. You don''t work, you don''t get paid. Pay is 600 rubles per shift plus whatever you get in tips, and you get paid on the 25th of each month."'
+	'He grins sheepishly. "Sorry, I get carried away sometimes. Let me tell you about the job. We''re open every day except Monday from 12:00 to 20:00 and you''d be working five days a week, Tuesday through Saturday. You''ll be expected to arrive between 11:00 and 12:00 to help get the place ready – if you''re late then you won''t work that day. You don''t work, you don''t get paid. Pay is 600 rubles per shift plus whatever you get in tips, and you get paid on the 25th of each month."'
 	'"Oh, and local regulations say I have to hold your work book as long as you''re employed here," he adds. "So... Are you interested?"'
 
 	act 'Yes':

locations/city_residential.qsrc

@@ -136,25 +136,25 @@ elseif military = 1:
 	'The military bus will wait between 06:00 and 09:00 on Saturdays.'
 end
 if hour >= 8 and hour <= 14 and week ! 1:
-	'You could go shopping at the noisy local <a href="exec: minut += 10 & gt ''city_market'', ''start''">marketplace</a>.'
+	'You could go shopping at the local <a href="exec: minut += 10 & gt ''city_market'', ''start''">marketplace</a>.'
 else
-	'You could go shopping at the noisy local marketplace, but it''s '+iif(week = 1, 'closed on Mondays.', 'only open between 08:00 and 15:00.')
+	'You could go shopping at the local marketplace, but it''s '+iif(week = 1, 'closed on Mondays.', 'only open between 08:00 and 15:00.')
 end
 if hour >= 8 and hour <= 15 and week < 6:
 	'Near the market is a <a href="exec: minut += 10 & gt ''city_market'', ''tailor''">tailor shop</a> where you can get your clothes resized if needed.'
 else	
 	'Near the market is a tailor shop where you can get your clothes resized if needed. '+iif(week < 6, 'It closes at 16:00.', 'It''s closed on weekends.')
 end
-if hour >= 11 and hour < 12 and week > 1 and week < 5 and workKafe['job'] = 1:
-	'The side door of <a href="exec: minut += 1 & gt ''city_kafe'', ''work''">"The Roadhouse"</a> is open, allowing employees to enter to begin their shift.'
-elseif hour >= 12 and hour <= 22 and week ! 1:
-	'In a side alley, next to the uniquely styled diner <a href="exec: minut += 1 & gt ''city_kafe'', ''start''">"The Roadhouse"</a>, you can hear some <a href="exec: minut += 1 & gt ''gopnew'', ''start''">gopniks</a> swearing and laughing.'
-elseif hour > 22 or hour <= 3:
-	'You can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">gopniks</a> in the parking lot of "The Roadhouse" diner.'
+if hour >= 11 and hour < 12 and week > 1 and week < 7 and workKafe['job'] = 1:
+	'The side door of <a href="exec: minut += 1 & gt ''city_kafe'', ''work''">The Roadhouse</a> diner is open, allowing you to enter and start your shift.'
+elseif hour >= 12 and hour <= 20 and week ! 1:
+	'You can hear some <a href="exec: minut += 1 & gt ''gopnew'', ''start''">gopniks</a> laughing and swearing in a side alley next to <a href="exec: minut += 1 & gt ''city_kafe'', ''start''">The Roadhouse</a> diner.'
+elseif hour > 20 and hour <= 3:
+	'You can hear some <a href="exec:gt ''gopnew'', ''start''">gopniks</a> laughing and swearing in the parking lot of The Roadhouse diner. The diner itself is currently closed.'
 else
-	'The Roadhouse diner is closed right now. It''s open between 12:00 and 23:00 every day except Monday.'
+	'The Roadhouse diner is currently closed. It''s open between 12:00 and 20:00 every day except Monday.'
 end
-if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building where a <a href="exec: minut += 1 & gt ''city_smalloffice'', ''start''">cleaning lady</a> is needed.'
+if clener >= 1 and hour >= 7 and hour <= 22: 'There''s a small office building where a <a href="exec: minut += 1 & gt ''city_smalloffice'', ''start''">cleaning lady</a> is needed.'
 
 'The city''s large <a href="exec:minut += 20 & gt ''city_park'', ''start''">central park</a> is a 20 minute walk away.'
 'The city''s only <a href="exec:minut += 40 & gt ''city_lake'', ''start''">lake</a> is a 40 minute walk away.'