Преглед изворни кода

[change] Your mother has your diploma if you don't get it yourself. If she has thrown you out it will arrive via mail.

Christine пре 5 година
родитељ
комит
7354ff8936
3 измењених фајлова са 30 додато и 20 уклоњено
  1. 13 10
      locations/cikl.qsrc
  2. 0 8
      locations/korrPar.qsrc
  3. 17 2
      locations/mother.qsrc

+ 13 - 10
locations/cikl.qsrc

@@ -1252,14 +1252,6 @@ if storyline = 1:
 
 	if sisboyparty = 2 and sisboyparty_day + 1 < daystart: sisboyparty = 3
 
-!!missed graduation
-	if month = 5 and day = 26:
-		if school_year = 2001 and year = 2018 and kanikuli ! 7:
-			grad_miss = daystart + 1
-		elseif school_year = 2000 and year = 2017 and kanikuli ! 7:
-			grad_miss = daystart + 1
-		end
-	end
 
 	if SchoolAtestat = 0:
 		if month = 12 and day > 25:
@@ -1293,13 +1285,24 @@ if storyline = 1:
 				end
 			end
 		elseif month = 5:
-			if ( (school_year = 2000 and year = 2017) or (school_year = 2001 and year = 2018) ) and day >= 19 and day <= 25:
+			if ( (school_year = 2000 and year = 2017) or (school_year = 2001 and year = 2018) ):
 				if day = 25:
 					kanikuli = 6
 					$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>'
-				else
+                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
 			elseif day >= 25:

+ 0 - 8
locations/korrPar.qsrc

@@ -328,14 +328,6 @@ if hour >= 10 and hour <= 23 and pav_slut >= 125 and podwhoreQW >= 3:
 	end
 end
 
-if grad_miss ! 0 and grad_miss <= daystart:
-	SchoolAtestat = 1
-	intel_exp += 10
-	grad_miss = 0
-	gs 'stat'
-	'Your diploma from school has arrived in the post.'
-end
-
 if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
 --- korrPar ---------------------------------

+ 17 - 2
locations/mother.qsrc

@@ -214,10 +214,25 @@ if $ARGS[0] = '':
 		end
 	end
 
-    if SchoolAtestat = 1:
+    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.'
+        end
+        SchoolAtestat = 1
+        intel_exp += 10
+        grad_miss = 0
+        kanikuli = 7
+        gs 'stat'
+    end
+    
+    if SchoolAtestat = 1 and SAtestatGift = 0:
 		if pcs_grades >= 90:
 			npc_rel['A29']+=40
-			'Your mother is delighted you graduated. "I''m so proud right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. And you outdid all my expectations. When the school director mentioned you being the best student of the year I could not have been happier. Your stepfather and I saved some money to reward you for your efforts. Please, take these 10000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
+			'Your mother is delighted you graduated. "I''m so proud right now <<$pcs_nickname>>! All I want to do is see you succeed in life, and graduating from high school is a very important step. And you outdid all my expectations. When the Principal mentioned you being the best student of the year I could not have been happier. Your stepfather and I saved some money to reward you for your efforts. Please, take these 10000 <b>₽</b>. Go buy yourself something nice, you''ve earned it." You thank her and give her a hug.'
 			gs 'stat'
             SAtestatGift = 10000
 		elseif pcs_grades >= 70: