Browse Source

[fixed] Changed the order of acts even though I shouldn't.

anjuna krokus 4 months ago
parent
commit
0f6c6bfd34
3 changed files with 29 additions and 32 deletions
  1. 8 9
      locations/city_library.qsrc
  2. 9 11
      locations/pav_library.qsrc
  3. 12 12
      locations/uni_library.qsrc

+ 8 - 9
locations/city_library.qsrc

@@ -13,9 +13,10 @@ if $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/library/downlibint.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/library/downlibint.jpg"></center>'
 	'A huge library with thousands upon thousands of books. You could spend years in here and probably still wouldn''t be able to read it all.'
 	'A huge library with thousands upon thousands of books. You could spend years in here and probably still wouldn''t be able to read it all.'
 
 
+	act 'Leave': minut += 5 & gt 'city_center'
+
 	if hour <= 7 or hour >= 19:
 	if hour <= 7 or hour >= 19:
 		'The library is closed.'
 		'The library is closed.'
-		act 'Leave': minut += 5 & gt 'city_center'
 		exit
 		exit
 	end
 	end
 
 
@@ -56,36 +57,34 @@ if $ARGS[0] = '':
 	end
 	end
 
 
 	gs 'camera', 'check_location'
 	gs 'camera', 'check_location'
-
-	act 'Leave': minut += 5 & gt 'city_center'
 end
 end
 
 
 if $ARGS[0] = 'read':
 if $ARGS[0] = 'read':
 	gs 'shortgs', 'setloc', 'city_library', 'read'
 	gs 'shortgs', 'setloc', 'city_library', 'read'
 
 
+	act 'Leave': minut += 5 & gt 'city_center'
+
 	if hour <= 7 or hour >= 19:
 	if hour <= 7 or hour >= 19:
 		'The library is closed.'
 		'The library is closed.'
-		act 'Leave': minut += 5 & gt 'city_center'
 		exit
 		exit
 	end
 	end
 
 
-	gs 'library_functions', 'set_read_acts'
 	act 'Go back': gt 'city_library'
 	act 'Go back': gt 'city_library'
-	act 'Leave': minut += 5 & gt 'city_center'
+	gs 'library_functions', 'set_read_acts'
 end
 end
 
 
 if $ARGS[0] = 'loan':
 if $ARGS[0] = 'loan':
 	gs 'shortgs', 'setloc', 'city_library', 'loan'
 	gs 'shortgs', 'setloc', 'city_library', 'loan'
 
 
+	act 'Leave': minut += 5 & gt 'city_center'
+
 	if hour <= 7 or hour >= 19:
 	if hour <= 7 or hour >= 19:
 		'The library is closed.'
 		'The library is closed.'
-		act 'Leave': minut += 5 & gt 'city_center'
 		exit
 		exit
 	end
 	end
 
 
-	gs 'library_functions', 'set_loan_acts'
 	act 'Go back': gt 'city_library'
 	act 'Go back': gt 'city_library'
-	act 'Leave': minut += 5 & gt 'city_center'
+	gs 'library_functions', 'set_loan_acts'
 end
 end
 
 
 --- city_library ---------------------------------
 --- city_library ---------------------------------

+ 9 - 11
locations/pav_library.qsrc

@@ -31,13 +31,14 @@ if $ARGS[0] = '':
 		end
 		end
 	end
 	end
 
 
+	act 'Leave': gt 'pav_commcenter'
+	act 'Go to the toilets': gt 'gdktoilet', 'start'
+
 	if nerd_game['game_day'] = daystart and hour = 19: act 'Wait for game night to start': minut = 60 & gt 'pav_library'
 	if nerd_game['game_day'] = daystart and hour = 19: act 'Wait for game night to start': minut = 60 & gt 'pav_library'
 	if nerd_game['game_day'] = daystart and hour = 20: act 'Join the nerds': gt 'nerd_game_night', 'game'
 	if nerd_game['game_day'] = daystart and hour = 20: act 'Join the nerds': gt 'nerd_game_night', 'game'
 
 
 	if hour <= 7 or hour >= 18:
 	if hour <= 7 or hour >= 18:
 		'The library is closed.'
 		'The library is closed.'
-		act 'Go to the toilets': gt 'gdktoilet', 'start'
-		act 'Leave': gt 'pav_commcenter'
 		exit
 		exit
 	end
 	end
 
 
@@ -90,9 +91,6 @@ if $ARGS[0] = '':
 	and (class['school_grades_above_40'] + class['school_grades_above_70'] + class['school_grades_above_90'] <= 20 or grupTipe = 3):
 	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'
 		act 'Join the nerd''s study group': gt 'pav_library_nerdstudy', 'nerd_study_night'
 	end
 	end
-
-	act 'Go to the toilets': gt 'gdktoilet', 'start'
-	act 'Leave': gt 'pav_commcenter'
 end
 end
 
 
 if $ARGS[0] = 'read':
 if $ARGS[0] = 'read':
@@ -101,16 +99,16 @@ if $ARGS[0] = 'read':
 	'<center><b><font color="maroon">Community center library</font></b></center>'
 	'<center><b><font color="maroon">Community center library</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
 
 
+	act 'Leave': gt 'pav_commcenter'
+
 	if hour >= 18:
 	if hour >= 18:
 		!! Note find stern librarian image
 		!! Note find stern librarian image
 		'The librarian finds you still reading and shooshes you out of the library'
 		'The librarian finds you still reading and shooshes you out of the library'
-		act 'Leave': gt 'pav_commcenter'
 		exit
 		exit
 	end
 	end
 
 
-	gs 'library_functions', 'set_read_acts'
 	act 'Go back': gt 'pav_library'
 	act 'Go back': gt 'pav_library'
-	act 'Leave': gt 'pav_commcenter'
+	gs 'library_functions', 'set_read_acts'
 end
 end
 
 
 if $ARGS[0] = 'loan':
 if $ARGS[0] = 'loan':
@@ -119,15 +117,15 @@ if $ARGS[0] = 'loan':
 	'<center><b><font color="maroon">Community center library</font></b></center>'
 	'<center><b><font color="maroon">Community center library</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
 
 
+	act 'Leave': gt 'pav_commcenter'
+
 	if hour >= 18:
 	if hour >= 18:
 		'The library is closing for the night.'
 		'The library is closing for the night.'
-		act 'Leave': gt 'pav_commcenter'
 		exit
 		exit
 	end
 	end
 
 
-	gs 'library_functions', 'set_loan_acts'
 	act 'Go back': gt 'pav_library'
 	act 'Go back': gt 'pav_library'
-	act 'Leave': gt 'pav_commcenter'
+	gs 'library_functions', 'set_loan_acts'
 end
 end
 
 
 --- pav_library ---------------------------------
 --- pav_library ---------------------------------

+ 12 - 12
locations/uni_library.qsrc

@@ -227,16 +227,16 @@ if $ARGS[0] = 'studying_exam':
 	killvar 'study_mod'
 	killvar 'study_mod'
 	killvar 'nod_study'
 	killvar 'nod_study'
 
 
+	act 'Leave': minut += 5 & gt 'uni_grounds', 'main'
+
 	if (week >= 6 and hour = 23) or hour < 8:
 	if (week >= 6 and hour = 23) or hour < 8:
 		'The library is closing for the night.'
 		'The library is closing for the night.'
-		act 'Leave': minut += 5 & gt 'uni_grounds', 'main'
 		exit
 		exit
 	end
 	end
 
 
+	act 'Return to the entrance': minut += 2 & gt 'uni_library', 'start'
 	act 'Keep studying': gt 'uni_library', 'study'
 	act 'Keep studying': gt 'uni_library', 'study'
 	act 'Wander around': gt 'uni_library', 'wander'
 	act 'Wander around': gt 'uni_library', 'wander'
-	act 'Return to the entrance': minut += 2 & gt 'uni_library', 'start'
-	act 'Leave': minut += 5 & gt 'uni_grounds', 'main'
 end
 end
 
 
 if $ARGS[0] = 'wander':
 if $ARGS[0] = 'wander':
@@ -301,15 +301,15 @@ if $ARGS[0] = 'wander':
 		'You wander around the library for a while, looking at all the books. You pass by several of your fellow students, some quietly studying, reading or just looking through the bookshelves. You don''t come across anything of interest.'
 		'You wander around the library for a while, looking at all the books. You pass by several of your fellow students, some quietly studying, reading or just looking through the bookshelves. You don''t come across anything of interest.'
 	end
 	end
 
 
+	act 'Leave': minut += 5 & gt 'uni_grounds', 'main'
+
 	if (week >= 6 and hour = 23) or hour < 8:
 	if (week >= 6 and hour = 23) or hour < 8:
 		'The library is closing for the night.'
 		'The library is closing for the night.'
-		act 'Leave': minut += 5 & gt 'uni_grounds', 'main'
 		exit
 		exit
 	end
 	end
 
 
-	act 'Wander around': gt 'uni_library', 'wander'
 	act 'Return to the entrance': minut += 2 & gt 'uni_library', 'start'
 	act 'Return to the entrance': minut += 2 & gt 'uni_library', 'start'
-	act 'Leave': minut += 5 & gt 'uni_grounds', 'main'
+	act 'Wander around': gt 'uni_library', 'wander'
 end
 end
 
 
 if $ARGS[0] = 'read':
 if $ARGS[0] = 'read':
@@ -318,15 +318,15 @@ if $ARGS[0] = 'read':
 	'<center><b><font color="maroon">The University Library</font></b></center>'
 	'<center><b><font color="maroon">The University Library</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/library.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/library.jpg"></center>'
 
 
+	act 'Leave': minut += 5 & gt 'uni_grounds', 'main'
+
 	if (week >= 6 and hour = 23) or hour < 8:
 	if (week >= 6 and hour = 23) or hour < 8:
 		'The library is closing for the night.'
 		'The library is closing for the night.'
-		act 'Leave': minut += 5 & gt 'uni_grounds', 'main'
 		exit
 		exit
 	end
 	end
 
 
-	gs 'library_functions', 'set_read_acts'
 	act 'Go back': gt 'uni_library', 'start'
 	act 'Go back': gt 'uni_library', 'start'
-	act 'Leave': minut += 5 & gt 'uni_grounds', 'main'
+	gs 'library_functions', 'set_read_acts'
 end
 end
 
 
 if $ARGS[0] = 'loan':
 if $ARGS[0] = 'loan':
@@ -335,15 +335,15 @@ if $ARGS[0] = 'loan':
 	'<center><b><font color="maroon">The University Library</font></b></center>'
 	'<center><b><font color="maroon">The University Library</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/library.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/library.jpg"></center>'
 
 
+	act 'Leave': minut += 5 & gt 'uni_grounds', 'main'
+
 	if (week >= 6 and hour = 23) or hour < 8:
 	if (week >= 6 and hour = 23) or hour < 8:
 		'The library is closing for the night.'
 		'The library is closing for the night.'
-		act 'Leave': minut += 5 & gt 'uni_grounds', 'main'
 		exit
 		exit
 	end
 	end
 
 
-	gs 'library_functions', 'set_loan_acts'
 	act 'Go back': gt 'uni_library', 'start'
 	act 'Go back': gt 'uni_library', 'start'
-	act 'Leave': minut += 5 & gt 'uni_grounds', 'main'
+	gs 'library_functions', 'set_loan_acts'
 end
 end
 
 
 if $ARGS[0] = 'kendra':
 if $ARGS[0] = 'kendra':