[fixed] Some things weren't stopped from displaying adn proccessing when Sveta is expelled, from julzor

locations/cikl.qsrc

@@ -1344,7 +1344,7 @@ if storyline = 1:
 	if sisboyparty = 2 and sisboyparty_day + 1 < daystart: sisboyparty = 3
 
 
-	if SchoolAtestat = 0:
+	if SchoolAtestat = 0 and SchoolBlock = 0:
 		if month = 12 and day > 25:
 			if day < 31:
 				$holyday = '<b>Winter Break in <<32-day>> days.</b>'

locations/stat_display.qsrc

@@ -290,31 +290,33 @@ else
 	$stat_sick_msg = ''
 end
 
-if week = 1:
-	$stat_school_schedule = ' Today you have the following lessons math, russian, literature, art, biology and P.E.'
-elseif week = 2:
-	$stat_school_schedule = ' Today you have the following lessons english, geography, science, shop, computer, music.'
-elseif week = 3:
-	$stat_school_schedule = ' Today you have the following lessons math, russian, biology, history, computer and P.E.'
-elseif week = 4:
-	$stat_school_schedule = ' Today you have the following lessons english, geography, science, shop, computer and music.'
-elseif week = 5:
-	$stat_school_schedule = ' Today you have the following lessons math, russian, literature, art, history and P.E.'
-else
-	$stat_school_schedule = ''	
-end
+if SchoolBlock = 0:
+	if week = 1:
+		$stat_school_schedule = ' Today you have the following lessons math, russian, literature, art, biology and P.E.'
+	elseif week = 2:
+		$stat_school_schedule = ' Today you have the following lessons english, geography, science, shop, computer, music.'
+	elseif week = 3:
+		$stat_school_schedule = ' Today you have the following lessons math, russian, biology, history, computer and P.E.'
+	elseif week = 4:
+		$stat_school_schedule = ' Today you have the following lessons english, geography, science, shop, computer and music.'
+	elseif week = 5:
+		$stat_school_schedule = ' Today you have the following lessons math, russian, literature, art, history and P.E.'
+	else
+		$stat_school_schedule = ''	
+	end
 
-if StoryLine = 1 and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
-	$stat_school_msg = 'You have to be at school before 07:55 if you don''t want to be late.'
-	$stat_school_tooltip = 'School starts at 07:55.'
-elseif StoryLine = 1 and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
-	$stat_school_msg = 'You have detention this morning and must be at school before 09:00.'
-	$stat_school_tooltip = 'Detention starts at 09:00.'
-else
-	$stat_school_msg = ''
-	$stat_school_icon_msg = ''
+	if StoryLine = 1 and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
+		$stat_school_msg = 'You have to be at school before 07:55 if you don''t want to be late.'
+		$stat_school_tooltip = 'School starts at 07:55.'
+	elseif StoryLine = 1 and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
+		$stat_school_msg = 'You have detention this morning and must be at school before 09:00.'
+		$stat_school_tooltip = 'Detention starts at 09:00.'
+	else
+		$stat_school_msg = ''
+		$stat_school_icon_msg = ''
+	end
+	if $stat_school_msg ! '': $stat_school_icon_msg = $stat_school_msg + $stat_school_schedule
 end
-if $stat_school_msg ! '': $stat_school_icon_msg = $stat_school_msg + $stat_school_schedule
 
 $stat_bra_msg = ''
 $stat_bra_text = ''
@@ -997,7 +999,7 @@ if cheatStatusIcons = 0:
 	
 	if $stat_court_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_court_msg"><img title="<<$stat_court_tooltip>>" height = <<set_siconht>> src="images/system/icon/status_icons/court.png"></a></td>'
 
-	if $stat_school_icon_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_school_icon_msg"><img title="<<$stat_school_tooltip>>" height = <<set_siconht>> src="images/system/icon/status_icons/school.png"></a></td>'
+	if $stat_school_icon_msg ! '' and SchoolBlock = 0: $statusIconBarTab += '<td><a href="exec:msg $stat_school_icon_msg"><img title="<<$stat_school_tooltip>>" height = <<set_siconht>> src="images/system/icon/status_icons/school.png"></a></td>'
 
 	if work > 0: $statusIconBarTab += '<td><a href="exec: gt ''journal'', ''records''"><img title="You have a job. Click to find out more." height = <<set_siconht>> src="images/system/icon/status_icons/work.png"></a></td>'
 	
@@ -1616,10 +1618,12 @@ if enable_extra_msg = 1:
 	$stat_msg += $stat_panty_text
 	$stat_msg += $stat_clothes_text
 	
-	if $stat_school_msg ! '' and StoryLine = 1 and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
-		$stat_msg += '<BR><b><<$stat_school_msg>></b>'
-	elseif $stat_school_msg ! '' and StoryLine = 1 and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
-		$stat_msg += '<BR><b><<$stat_school_msg>></b>'
+	if SchoolBlock = 0:
+		if $stat_school_msg ! '' and StoryLine = 1 and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
+			$stat_msg += '<BR><b><<$stat_school_msg>></b>'
+		elseif $stat_school_msg ! '' and StoryLine = 1 and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
+			$stat_msg += '<BR><b><<$stat_school_msg>></b>'
+		end
 	end
 end