소스 검색

[fixed] Nat meeting in the morning available earlier
[fixed] Set the check the wrong way around for Anya missing dinner if Roma is around

KevinSmarts 4 년 전
부모
커밋
e2a11831f6
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      locations/korrPar.qsrc
  2. 1 1
      locations/kuhrPar.qsrc

+ 1 - 1
locations/korrPar.qsrc

@@ -154,7 +154,7 @@ if nodimkaK >= rand(7,10) and DimkaWarnedToday = 0 and DimaRudeBlock = 0:
 	if hour >= 9 and hour < 24 and week >=6 and DimkaWarnedToday = 0: gt 'dimaEv', 'Dimka_warning'
 end
 
-if NatbelQW['QWstage'] >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1):
+if NatbelQW['QWstage'] >= 4 and week < 6 and (hour = 6 or hour = 7) and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1):
 	*nl
 	'You could go to Natasha''s apartment and get her to carry your books to school.'
 	act 'Go to Natasha''s apartment':gt 'natbelEv', 'carrybooks'

+ 1 - 1
locations/kuhrPar.qsrc

@@ -49,7 +49,7 @@ if hour = 7 and week < 6 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. You could sit down and join them for breakfast or just grab something and go.'
 elseif hour = 7 and week > 5 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. It seems your sister is sleeping in again. You could sit down and join them for breakfast or just grab something and go.'
-elseif hour = 18 and minut <= 30 and indorf = 0 and anyaloc = 25:
+elseif hour = 18 and minut <= 30 and indorf = 0 and anyaloc ! 25:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
 elseif hour = 18 and minut <= 30 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'