Procházet zdrojové kódy

Merge branch 'master' of https://git.catrenelle.com/Jefke11/glife

julzor před 5 roky
rodič
revize
e090144e8e
2 změnil soubory, kde provedl 8 přidání a 7 odebrání
  1. 7 6
      locations/korrPar.qsrc
  2. 1 1
      locations/natbelEv.qsrc

+ 7 - 6
locations/korrPar.qsrc

@@ -57,11 +57,6 @@ act '<b>Leave and go to the courtyard</b>':
 	end
 end
 
-!! is this vacation check correct?
-if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0:
-	act 'Go pick up Natasha before school': gt 'natbelEv', 'carrybooks'
-end
-
 if blockBedrPar = 0:
 	if sisboyday + 1 = daystart and hour = 18 and sisboytrioQW = 1:
 		act 'Go to your room':gt 'sisterQW', 'sisboytrioQW_bedroom', 'start'
@@ -94,6 +89,12 @@ if nodimkaK >= rand(7,10) and DimkaWarnedToday = 0:
 	if hour >= 9 and hour < 24 and week >=6 and DimkaWarnedToday = 0: gt 'dimaEv', 'Dimka_warning'
 end
 
+!! is this vacation check correct?
+if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0:
+	*nl
+	'Go pick up <a href="exec:gt ''natbelEv'', ''carrybooks''">Natasha</a> before school.'
+end
+
 $korrParMomHeader = '<center><h1><font color="maroon"><<$npc_nickname[''A29'']>></font></h1></center><center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center><br />'
 
 if hour >= 16 and hour <= 20 and indorf = 0:
@@ -231,7 +232,7 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 				SchoolBlock = 1
 				schoolprogul = 0
 				pcs_grades = 0
-				'As you enter the hallway, you find your mother there waiting for you. You have never seen her this furious. "<<$pcs_nickname>>? I just got off the phone with the school, they told me you didn''t show up yet again and expelled you. I''m exrememly disappointed with you! I''ve warned you so many times! If you want to remain living in this house, you best start pulling your weight around here!". Right now I want you out of the house, go out and find some work! After that, she pushes you out the door and slams it shut in your face.'
+				'As you enter the hallway, you find your mother there waiting for you. You have never seen her this furious. "<<$pcs_nickname>>? I just got off the phone with the school, they told me you didn''t show up yet again and expelled you. I''m exrememly disappointed with you! I''ve warned you so many times! If you want to remain living in this house, you best start pulling your weight around here! Right now I want you out of the house, go out and find some work!" After that, she pushes you out the door and slams it shut in your face.'
 
 				act 'Leave':gt 'pavResidential'
 				exit

+ 1 - 1
locations/natbelEv.qsrc

@@ -166,7 +166,7 @@ if $ARGS[0] = 'laundry':
 	'<center><b><font color = maroon>Laundry room</font></b></center>'
 ! Needs image + description
 	
-	if NatashaLoc = 7 and HaveCucumber = 1 and NatashaQW >= 11:
+	if NatashaLoc = 7 and HaveCucumber = 1 and NatashaQW >= 10:
 		if NatashaQW = 10: NatashaQW = 11
 		HaveCucumber = 0
 		*clr & cla