[changed] Get diploma from pricipal

In case you missed your graduation.
Introduced SchoolAtestat = -1 which means you finished school but don't have your diploma yet.
This value is only set once => if you already missed your graduation and didnt retrieve your diploma yet you need to use the console.

locations/cikl.qsrc

@@ -1285,23 +1285,13 @@ if storyline = 1:
 				end
 			end
 		elseif month = 5:
-			if ( (school_year = 2000 and year = 2017) or (school_year = 2001 and year = 2018) ):
+			if (school_year = 2000 and year = 2017) or (school_year = 2001 and year = 2018):
 				if day = 25:
 					kanikuli = 6
+                    SchoolAtestat = -1
 					$holyday = '<b>Your graduation is today. Be there by 8:00.</b>'
 				elseif day = 24:
 					$holyday = '<b>Your graduation is tomorrow. Be there by 8:00.</b>'
-                elseif day > 25:
-                    if ParHomeBlock = 1:
-                        $holyday = '<b>Your diploma arrived in the mail today.</b>'
-                        SchoolAtestat = 1
-                        intel_exp += 10
-                        grad_miss = 0
-                        kanikuli = 7
-                        gs 'stat'
-                    else
-                        $holyday = '<b>You missed your graduation. Maybe your mother retrieved your diploma.</b>'
-                    end
 				elseif day >= 19
 					$holyday = '<b>Your graduation is in <<26-day>> days.</b>'
 				end
@@ -1341,6 +1331,12 @@ if storyline = 1:
 				$holyday = '<b>Last day of Autumn Break.</b>'
 			end
 		end
+    elseif SchoolAtestat = -1:
+        if ParHomeBlock = 1:
+            $holyday = '<b>You missed your graduation. You could pick up your diploma at the school.</b>'
+        else
+            $holyday = '<b>You missed your graduation. Maybe your mother picked up your diploma.</b>'
+        end
 	end
 	!!Brother''s dick growth as he gets older
 	kolka_dick_month = daystart/30

locations/gschool_grounds.qsrc

@@ -49,12 +49,17 @@ if $ARGS[0] = 'main':
 			kanikuli = 7
 			gs 'stat'
             
-            'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. You turn your head and see your mother and your brother sitting among them.'
+            if ParHomeBlock = 1:
+                'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. Nobody from your family showed up.'
+            else
+                'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. You turn your head and see your mother and your brother sitting among them.'
+            end
             
 			'Your Principial begins calling your classmates in alphabetical order. Finally it''s your turn.'
             
             if pcs_grades >= 90:
-                'You go up to the podium. As the Principal shakes your hand she announces "As every year I''d like to honor our best student of the year. Miss <<$pcs_lastname>> here performed exceptionally well in her studies and I think that deserves some recognition." She starts applaude and the auditorium quickly joins in the applause. As you return to your place you see your mother smiling brightly.'
+                'You go up to the podium. As the Principal shakes your hand she announces "As every year I''d like to honor our best student of the year. Miss <<$pcs_lastname>> here performed exceptionally well in her studies and I think that deserves some recognition." She starts applaude and the auditorium quickly joins in the applause.'
+                if ParHomeBlock = 0:'As you return to your place you see your mother smiling brightly.'
             elseif pcs_grades >= 70:
                 'You go up to the podium. The Principal shakes your hand and gives you your diploma. "Well done, Miss <<$pcs_lastname>>!" she says before you return to your place.'
             else
@@ -85,6 +90,28 @@ if $ARGS[0] = 'main':
 	exit
 	end
 
+    if SchoolAtestat = -1:
+        if week < 6 and hour >= 6 and hour < 14:
+            act 'Get your diploma':
+                *clr & cla
+                menu_off = 1
+                minut += 20
+                SchoolAtestat = 1
+                intel_exp += 10
+                kanikuli = 7
+                gs 'stat'
+                if pcs_grades >= 70:
+                    'The Principal hands you your diploma. "Well done, Miss <<$pcs_lastname>>! Good luck in your future!" she says as she shakes your hand.'
+                else 
+                    'The Principal hands you your diploma. "Good luck in your future!" she says as she shakes your hand.'
+                end
+                
+                act 'Return to town': minut += 2 & gt 'pavResidential'
+                
+            end
+        end
+    end
+    
 !!	act 'Go to old school building': gt
 
 !!	act 'Go to the Principals Office': gt

locations/mother.qsrc

@@ -214,19 +214,23 @@ if $ARGS[0] = '':
 		end
 	end
 
-    if ((school_year = 2001 and year = 2018) or (school_year = 2000 and year = 2017)) and SchoolAtestat ! 1:
-        if month = 5 and day = 25 and hour > 8:
-            '"<<$pcs_nickname>>, where have you been? You have missed your graduation today! I told everybody that you''re sick and so your Principal gave me your diploma." She hands it to you.'
-        elseif month = 5 and day = 26:
-            '"<<$pcs_nickname>>, where have you been? You have missed your graduation yesterday! I told everybody that you''re sick and so your Principal gave me your diploma." She hands it to you.'
-        elseif (month = 5 and day > 26) or month > 5:
-            '"<<$pcs_nickname>>, where have you been? You have missed your graduation! I told everybody that you''re sick and so your Principal gave me your diploma." She hands it to you.'
+    if SchoolAtestat = -1:
+        if month = 5 and day = 25 and hour <= 8:
+            '"<<$pcs_nickname>>, make sure you don''t miss your graduation today. Your brother and I will also be there to watch you getting your diploma."'
+        else
+            if month = 5 and day = 25 and hour > 8:
+                '"<<$pcs_nickname>>, where have you been? You have missed your graduation today! I told everybody that you''re sick. So your Principal gave me your diploma." She hands it to you.'
+            elseif month = 5 and day = 26:
+                '"<<$pcs_nickname>>, where have you been? You have missed your graduation yesterday! I told everybody that you''re sick. So your Principal gave me your diploma." She hands it to you.'
+            elseif (month = 5 and day > 26) or month > 5:
+                '"<<$pcs_nickname>>, where have you been? You have missed your graduation! I told everybody that you''re sick. So your Principal gave me your diploma." She hands it to you.'
+            end
+            SchoolAtestat = 1
+            intel_exp += 10
+            grad_miss = 0
+            kanikuli = 7
+            gs 'stat'
         end
-        SchoolAtestat = 1
-        intel_exp += 10
-        grad_miss = 0
-        kanikuli = 7
-        gs 'stat'
     end
     
     if SchoolAtestat = 1 and SAtestatGift = 0:

locations/stat_display.qsrc

@@ -162,7 +162,7 @@ if Enable_statfsize>0:$stat_msg = '<font size=<<Enable_statfsize>>><<$stat_msg>>
 $stat_msg += '<BR><<$stat_android>> <<$week[week]>> <<day>> <<$month>> <<year>>'
 $stat_android += '<<$week[week]>> <<day>>/<<month>>, <<money>> ₽, <a href="exec:clr & pl $stat_android">Status</a>'
 ! $stat_android for short desc in android mode, $stat_msg for status bar.
-if StoryLine > 0 and SchoolAtestat = 0 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'
+if StoryLine > 0 and SchoolAtestat ! 1 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'
 if birthday = day and birthmonth = month: $stat_msg += '<BR><b>Today is your birthday.</b>' & $stat_msg += '<BR>'
 
 !New icon based menu.