浏览代码

[fixed] blocked school for non-school starts

julzor 5 年之前
父节点
当前提交
325dcf1ea3
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 1 1
      locations/pavComplex.qsrc
  2. 5 3
      locations/pavResidential.qsrc

+ 1 - 1
locations/pavComplex.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if StoryLine > 0 and hour < 4 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and home_owned[2] = 1: motherWorry = 1
+	if StoryLine > 0 and hour < 5 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and home_owned[2] = 1: motherWorry = 1
 
 	if  ((minut + 60*(hour+daystart*24) - pavcomplexevent_time) > 60) or ((daystart+1)*1440 < pavcomplexevent_time):
 		pavcomplexevent_time = minut + 60*(hour+daystart*24)

+ 5 - 3
locations/pavResidential.qsrc

@@ -88,8 +88,6 @@ if AlbFaterBlackTime > 0 and AlbFaterBlackTime <= totminut and hour >= 14 and Al
 
 if hour >= 14 and hour <= 22 and AlbFather = 2 and AlbZaDay + 30 < daystart and year > 2015: gt 'AlbStarsEnd'
 
-if hour < 4 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and home_owned[2] = 1: motherWorry = 1
-
 if rand(1, 5) >= 4 and pav_slut >= 75:
 	if pav_slut < 100:
 		'<br>You catch people staring at you intently, as if they''re supposed to know who you are but can''t quite remember why. You sincerely hope they don''t realize your promiscuous adventures are the reason why. The occasional person chuckling and pointing at you crushes those hopes, and you quickly keep walking before they get a chance to say anything.'
@@ -108,7 +106,11 @@ if fedorKozlovQW >= 20 and FedorKozHome = 1 or fedorKozlovQW = -15 and FedorKozH
 
 if hour >= 8 and hour <= 22:'<br>At the end of the street, there''s a small <a href="exec:$locM = ''pavResidential'' & gt ''kiosk'', ''start''">kiosk</a> selling a variety of items such as cigarettes, magazines, snacks, drinks and even themes for your phone.'
 
-$schoolname = 'the <a href="exec: minut += 2 & gt ''gschool_grounds'', ''main''">local school</a>.'
+if StoryLine > 0:
+	$schoolname = 'the <a href="exec: minut += 2 & gt ''gschool_grounds'', ''main''">local school</a>.'
+else
+	$schoolname = 'the local school.'
+end	
 
 '<br>In the center of Pavlovsk is the town square, which features the popular <a href="exec: minut += 2 & gt ''gdk''">community center</a>, a hotspot for the local teenagers to hangout at after a long day at <<$schoolname>></b> Connected to the town center is the old palace grounds which have now been turned into a large <a href="exec:minut += 5 & gt ''gskver'', ''start''">public park</a>. With the <a href="exec: minut += 5 & gt ''glake''">lake</a> nearby, the area can get quite busy, especially during the summer and winter when people can swim or skate at the lake.'