Ver código fonte

[fixed] school schedule in stat_display and journal

julzor 4 anos atrás
pai
commit
0972b5c23e
2 arquivos alterados com 7 adições e 15 exclusões
  1. 5 11
      locations/journal.qsrc
  2. 2 4
      locations/stat_display.qsrc

+ 5 - 11
locations/journal.qsrc

@@ -328,17 +328,11 @@ if $ARGS[0] = 'school':
 	
 	'<center><h2>Class schedule</h2></center>'
 	
-	if week = 1:
-		'Monday: Math, Russian, Literature, Art, Biology, P.E'
-	elseif week = 2:
-		'Tuesday: English, Geography, Science, Shop, Computer, Music'
-	elseif week = 3:
-		'Wednesday: Math, Russian, Biology, History, Computer and P.E.'
-	elseif week = 4:
-		'Thursday: English, Geography, Science, Shop, Computer, Music'
-	elseif week = 5:
-		'Friday: Math, Russian, Literature, Art, History and P.E.'	
-	end
+	'Monday: Math, Russian, Literature, Art, Biology, P.E'
+	'Tuesday: English, Geography, Science, Shop, Computer, Music'
+	'Wednesday: Math, Russian, Biology, History, Computer and P.E.'
+	'Thursday: English, Geography, Science, Shop, Computer, Music'
+	'Friday: Math, Russian, Literature, Art, History and P.E.'	
 	
 	'<center><h2>Students & Teachers</h2></center>'
 	

+ 2 - 4
locations/stat_display.qsrc

@@ -548,10 +548,7 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 		$stat_school_schedule = ''	
 	end
 
-	if $stat_school_msg ! '': 
-		$stat_school_msg += $stat_school_schedule
-		$statusIconBarTab += '<td><a href="exec:msg $stat_school_msg"><img title="<<$stat_school_tooltip>>" height = 54 src="images/system/icon/status_icons/school.png"></a></td>'
-	end
+	if $stat_school_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_school_msg"><img title="<<$stat_school_tooltip>>" height = 54 src="images/system/icon/status_icons/school.png"></a></td>'
 
 	if work > 0 or model > 0 or pornstack > 0: $statusIconBarTab += '<td><a href="exec: gt ''journal'', ''records''"><img title="You have a job. Click to find out more." height = 54 src="images/system/icon/status_icons/work.png"></a></td>'
 	
@@ -1953,6 +1950,7 @@ elseif StoryLine = 1 and SchoolAtestat = 0 and week = 6 and hour < 9 and detenti
 	$stat_school_msg = 'You have detention this morning and must be at school before 09:00.'
 	$stat_school_tooltip = 'Detention starts at 09:00.'
 end
+if $stat_school_msg ! '': $stat_school_msg += $stat_school_schedule
 
 !!------------------ Things without an icon (Start) -------------------