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

locations/gdksport.qsrc

@@ -253,7 +253,7 @@ if $ARGS[0] = 'dance2':
 	else
 		'There is nothing you can learn from this dance class with your current skill. You need to find a new teacher or travel to the city to find better dance classes if you wish to improve further.'
 
-		if AlbinaQW['StarletsJoined'] = 0 and StoryLine ! 0:
+		if AlbinaQW['StarletsJoined'] = 0 and StoryLine ! 0 and ( month < 10 or ( month = 10 and day < 18 )):
 			if alterstrtimg = 13:
 				gt 'AlbStars', 'albina3'
 			elseif grupTipe = 1 or grupTipe = 2:

locations/pav_park.qsrc

@@ -98,11 +98,11 @@ if $ARGS[0] = 'start':
 
 	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
 	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pav_commercial''">commercial</a> the other to the <a href="exec:minut += 5 & gt ''pav_residential''">residential</a> area.'
-	if ((month > 7 and day > 20) or (month = 9 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 0: 
+	if ((month = 8 and day > 20) or (month = 9 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 0: 
 		'<br>You overhear someone speaking in front of a crowd. The crowd is quite rowdy, with lots of yelling and clapping throughout the <a href="exec: minut += 2 & gt ''pav_park'', ''alb_father_meeting_1''">meeting</a>.'
-	elseif ((month > 8 and day > 20) or (month = 10 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 1 and AlbinaQW['StarletsShutDown'] = 0 and AlbinaQW['ParkRallyDay'] < daystart:
+	elseif ((month = 9 and day > 20) or (month = 10 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 1 and AlbinaQW['StarletsShutDown'] = 0 and AlbinaQW['ParkRallyDay'] < daystart:
 		'Once again a large crowd has gathered in the town center. You can hear Albina''s father holding a public <a href="exec: minut += 2 & gt ''pav_park'', ''alb_father_meeting_2''">meeting</a>.'
-	elseif ((month > 9 and day > 20) or (month = 11 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 2 and AlbinaQW['StarletsShutDown'] = 0 and AlbinaQW['ParkRallyDay'] < daystart and AlbinaQW['StarletsJoined'] = 0:
+	elseif ((month = 10 and day > 20) or (month = 11 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 2 and AlbinaQW['StarletsShutDown'] = 0 and AlbinaQW['ParkRallyDay'] < daystart and AlbinaQW['StarletsJoined'] = 0:
 		'By this time you''re well aware that it''s Albina''s father that is holding a <a href="exec: minut += 2 & gt ''pav_park'', ''alb_father_meeting_3''">meeting</a>, this time though they have erected a big stage.'
 	end