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

[fixed] pav_library work hours

Lusticon 5 місяців тому
батько
коміт
58832f2517
2 змінених файлів з 9 додано та 15 видалено
  1. 2 2
      locations/gdktoilet.qsrc
  2. 7 13
      locations/pav_library.qsrc

+ 2 - 2
locations/gdktoilet.qsrc

@@ -76,8 +76,8 @@ if $ARGS[0] = 'start':
 		CLOSE ALL
 	end
 
-	if hour >= 8 and hour <= 18: act 'Go to the library': gt 'pav_library'
-	if hour >= 12 and hour <= 20: act 'Go upstairs to the hobby clubs': gt 'pav_commclubs'
+	if hour >= 8 and hour < 18: act 'Go to the library': gt 'pav_library'
+	if hour >= 12 and hour < 20: act 'Go upstairs to the hobby clubs': gt 'pav_commclubs'
 	if (week < 6 and hour >= 14 and hour < 20) or (week >= 6 and hour >= 9 and hour < 20): act 'Go to the gym': gt 'gdksport', 'start'
 	act 'Change outfit in the locker room': gt 'wardrobe', 'start'
 end

+ 7 - 13
locations/pav_library.qsrc

@@ -15,10 +15,6 @@ gs 'themes', 'indoors'
 '<center><b><font color="maroon">Community center library</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
 'For such a small town, the library is surprisingly large, containing many interesting books on a wide variety of subjects.'
-'Between the bookshelves are some tables which can be used for studying. Some of them have <a href="exec: gs ''internet_mobile'', ''get_access'', ''free'', ''noporn'',''nocamshow'' & gs ''internet_mobile'', ''add_limitation'', ''general-text'', ''On this public computer all adult content sites are blocked'' & gt ''Komp'',''start''">computers</a> for public use.'
-if lernHome > 0:
-	'You could do your homework with the help of one of the computers.'
-end
 
 if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14 and SchoolAtestat = 0:
 	'The nerds are sitting at a table studying together.'
@@ -58,13 +54,11 @@ $downlibrary['read'] = {
 }
 
 if hour >= 8 and hour < 18:
-	act 'Read a book':
-		gt 'pav_library', 'read'	
-	end
-	
-	act 'Borrow a book':
-		gt 'pav_library', 'loan'
-	end
+	'Between the bookshelves are some tables which can be used for studying. Some of them have <a href="exec: gs ''internet_mobile'', ''get_access'', ''free'', ''noporn'',''nocamshow'' & gs ''internet_mobile'', ''add_limitation'', ''general-text'', ''On this public computer all adult content sites are blocked'' & gt ''Komp'',''start''">computers</a> for public use.'
+	if lernHome > 0: 'You could do your homework with the help of one of the computers.'
+
+	act 'Read a book': gt 'pav_library', 'read'	
+	act 'Borrow a book': gt 'pav_library', 'loan'
 
 	act 'Study for an hour':
 		dynamic $downlibrary['read']
@@ -98,8 +92,8 @@ if hour >= 8 and hour < 18:
 		act 'Do your homework (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	
-	if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14 and SchoolAtestat = 0 and SchoolBlock = 0 and _
-	(class['school_grades_above_40'] + class['school_grades_above_70'] + class['school_grades_above_90'] <= 20 or grupTipe = 3):
+	if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14 and SchoolAtestat = 0 and SchoolBlock = 0 _ 
+	and (class['school_grades_above_40'] + class['school_grades_above_70'] + class['school_grades_above_90'] <= 20 or grupTipe = 3):
 		act 'Join the nerd''s study group': gt 'pav_library_nerdstudy', 'nerd_study_night'
 	end
 else