[Fixed] The Albina storyline so that the starlets disband properly, regardless if the player joined them. Posters should display at the proper times, park rallies no longer require watching in order for content to cointinue.

locations/AlbStars.qsrc

@@ -281,10 +281,10 @@ if $ARGS[0] = 'starlets':
 		if AlbinaQW['ShowTriggerCount'] >= 6:
 
 			!! third rally in the park if sveta is dancing
-			if ((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['ParkRallyDay'] < daystart :  gt 'AlbStars', 'parkrally'
+			if ((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['ParkRallyDay'] < daystart :  gt 'AlbStars', 'parkrally'
 
-			if AlbinaQW['AlbFatherQW']  = 0 and AlbinaQW['StarletsWhore'] >= 8:
-				AlbinaQW['AlbFatherQW']  = 1
+			if AlbinaQW['AlbFatherQW'] = 0 and AlbinaQW['StarletsWhore'] >= 8:
+				AlbinaQW['AlbFatherQW'] = 1
 				'At the end of the session, Albina beckons you to her. "I''ve been told to tell you that you''re doing good <<$pcs_nickname>> and that the clients are saying that you''re their new favourite girl. You''re handling it all quite well, but it will all be over soon. He won''t get away with it much longer. I promise."'
 				'You raise an eyebrow at her, but she just pats you on the shoulder and walks away before you can ask her who or what she is talking about.'
 			end
@@ -1206,7 +1206,6 @@ end
 if $ARGS[0] = 'parkrally':
 	cla & *clr
 	AlbinaQW['ParkRally'] = 3
-	AlbinaQW['ParkRallyDay'] = daystart + 2
 	AlbinaQW['ShowTriggerCount'] = 0
 
 	'After practice, Albina walks up to the group, furious. "My stupid father wants us to perform at his rally! Using us to try and win back some of his supporters!" she huffs.'

locations/albinaRide.qsrc

@@ -3,6 +3,7 @@
 
 frost = 0
 menu_off = 1
+AlbinaQW['RideDaystart'] = 0
 AlbinaQW['albride'] = 1
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'

locations/albina_election_events.qsrc

@@ -63,7 +63,6 @@ $din_zajava_albfather = {
 		*clr & cla
 		menu_off = 1
 		minut += 1
-		AlbinaQW['AlbFatherQW']  = 2
 		AlbinaQW['Chernov'] = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
@@ -125,7 +124,6 @@ $din_zajava_albfather_no2 = {
 		*clr & cla
 		menu_off = 1
 		minut += 1
-		AlbinaQW['AlbFatherQW']  = -1
 		AlbinaQW['Chernov'] = 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'

locations/cikl.qsrc

@@ -1880,7 +1880,7 @@ cheerleaders_on = iif( ( (week = 5 and odd_week = 1) or (week = 2 or week = 4) )
 
 !!------------------------------------------------------------------------------------------------------------
 
-!!---------- Starlet Practice Check --------------------------------------------------------------------------
+!!---------- Starlet Content ---------------------------------------------------------------------------------
 if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0:
 	if starlets_practice = daystart - 1: 
 		starlets_missed = 1
@@ -1889,6 +1889,10 @@ if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_p
 	if starlets_on = 1: starlets_practice = daystart
 end
 
+if month = 9 and day = 16 and AlbinaQW['ParkRally'] = 0: AlbinaQW['ParkRally'] = 1
+if month = 10 and day = 16 and AlbinaQW['ParkRally'] = 1: AlbinaQW['ParkRally'] = 2
+if month  = 11 and day = 19 and (AlbinaQW['StarletsJoined'] <= 0 or (AlbinaQW['StarletsJoined'] = 1 and npc_pregtalk['A23'] = 1)) and AlbinaQW['StarletsShutDown'] = 0: AlbinaQW['StarletsShutDown'] = 1
+
 !!------------------------------------------------------------------------------------------------------------
 
 !!-------------Music career related variables and calculations------------------------------------------------

locations/gschool_grounds.qsrc

@@ -300,7 +300,7 @@ if $ARGS[0] = 'main':
 				'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 			end
 		end
-		if AlbinaQW['albride'] = 0 and AlbinaQW['RideDaystart'] <= daystart and AlbinaQW['AlbFatherQW']  >= 1 and AlbinaQW['ParkRally'] > 0 and AlbinaQW['Chernov'] > 0: 
+		if AlbinaQW['albride'] = 0 and AlbinaQW['RideDaystart'] <= daystart and AlbinaQW['Chernov'] > 0: 
 			'<a href="exec:minut += 15 & gt ''albinaRide''">Albina Barlovskaya</a> is waiting behind the wheel of a large black SUV, parked near the school.'
 		end
 

locations/pav_commercial.qsrc

@@ -55,13 +55,8 @@ end
 
 gs'street_event','pav_commercial', 'extras'
 
-if AlbinaQW['AlbFatherQW']  >= 1 and AlbinaQW['ParkRally'] > 0:
-	if AlbinaQW['ElectionCampaignTime'] = 0:AlbinaQW['ElectionCampaignTime'] = totminut + 2880
-
-	'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
-end
-
-if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['AlbFatherQW']  = 1:gt 'albina_election_events'
+if ((month = 9 and day > 16) or month >= 10) and (AlbinaQW['StarletsShutDown'] = 0 or AlbinaQW['Chernov'] = 0): 'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
+if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['Chernov'] = 0 and ((month = 11 and day > 18) or month = 12) and hour >= 14:gt 'albina_election_events'
 
 if StoryLine > 0 and hour < 4 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and home_owned[2] = 1:
 	motherWorry = 1

locations/pav_industrial.qsrc

@@ -47,13 +47,8 @@ end
 
 gs'street_event','pav_industrial', 'extras'
 
-if AlbinaQW['AlbFatherQW']  >= 1 and AlbinaQW['ParkRally'] > 0:
-	if AlbinaQW['ElectionCampaignTime'] = 0:AlbinaQW['ElectionCampaignTime'] = totminut + 2880
-
-	'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
-end
-
-if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['AlbFatherQW']  = 1:gt 'albina_election_events'
+if ((month = 9 and day > 16) or month >= 10) and (AlbinaQW['StarletsShutDown'] = 0 or AlbinaQW['Chernov'] = 0): 'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
+if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['Chernov'] = 0 and ((month = 11 and day > 18) or month = 12) and hour >= 14:gt 'albina_election_events'
 
 if rand(1,5) >= 4 and pav_slut >= 100:
 	if pav_slut < 150:

locations/pav_park.qsrc

@@ -100,9 +100,9 @@ if $ARGS[0] = 'start':
 	'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 = 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 = 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:
+	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:
 		'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 = 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:
+	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['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
 	
@@ -284,7 +284,6 @@ end
 if $ARGS[0] = 'alb_father_meeting_1':
 	cla & *clr
 	AlbinaQW['ParkRally'] = 1
-	AlbinaQW['ParkRallyDay'] = daystart + 2
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting1.jpg"></center>'
@@ -298,7 +297,6 @@ end
 if $ARGS[0] = 'alb_father_meeting_2':
 	cla & *clr
 	AlbinaQW['ParkRally'] = 2
-	AlbinaQW['ParkRallyDay'] = daystart + 2
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting2.jpg"></center>'
@@ -312,7 +310,6 @@ end
 if $ARGS[0] = 'alb_father_meeting_3':
 	cla & *clr
 	AlbinaQW['ParkRally'] = 3
-	AlbinaQW['ParkRallyDay'] = daystart + 2
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting3.jpg"></center>'

locations/pav_residential.qsrc

@@ -86,12 +86,8 @@ if pav_slut >= 250 and rand(1, 10) = 10 and pav_residential_prost_day ! daystart
 	exit
 end
 
-if AlbinaQW['AlbFatherQW']  >= 1 and AlbinaQW['ParkRally'] > 0:
-	if AlbinaQW['ElectionCampaignTime'] = 0:AlbinaQW['ElectionCampaignTime'] = totminut + 2880
-	'<br>You see election posters plastered on walls and trees all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?</br>'
-end
-
-if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['AlbFatherQW']  = 1:gt 'albina_election_events'
+if ((month = 9 and day > 16) or month >= 10) and (AlbinaQW['StarletsShutDown'] = 0 or AlbinaQW['Chernov'] = 0): 'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
+if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['Chernov'] = 0 and ((month = 11 and day > 18) or month = 12) and hour >= 14:gt 'albina_election_events'
 
 if rand(1, 5) >= 4 and pav_slut >= 150:
 	if pav_slut < 200:

locations/saveupdater.qsrc

@@ -926,6 +926,13 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	end
 
 	!!---------------------------------------------------------------
+	
+	!!Albina variables no longer needed, no sense in having them run in the background for nothing
+	if AlbinaQW['ParkRallyDay'] > 0:AlbinaQW['ParkRallyDay'] = 0
+	if AlbinaQW['ElectionCampaignTime'] > 0:AlbinaQW['ElectionCampaignTime'] = 0
+	if AlbinaQW['AlbFatherQW']  > 1:AlbinaQW['AlbFatherQW']  = 1
+	
+	!!---------------------------------------------------------------
 end