Merge remote-tracking branch 'upstream/master' into minor-fixes

locations/AlbStars.qsrc

@@ -288,8 +288,8 @@ if $ARGS[0] = 'starlets':
 			!! 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 AlbinaQW['albina_election_events']  = 0 and AlbinaQW['StarletsWhore'] >= 8:
-				AlbinaQW['albina_election_events']  = 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

locations/Snpc.qsrc

@@ -227,7 +227,7 @@ if numnpc = 23:
 	! 	AlbinaQW['Friends'] = 2
 	! 	npc_rel['A23'] = 100
 	! 	'Albina smiles gratefully at you as she says: "Thank you <<$pcs_nickname>>! Like they say... a friend in need is a friend indeed. Your timely warning saved me, I had just enough time to get rid of all the evidence! Unfortunately we do have to stop with Albina''s Starlets, to keep ourselves out of trouble."'
-	! elseif AlbinaQW['albina_election_events']  = 2 and AlbEnemy = 0:
+	! elseif AlbinaQW['AlbFatherQW']  = 2 and AlbEnemy = 0:
 	! 	npc_rel['A23'] = 0
 	! 	AlbEnemy = 1
 	! 	'Albina angrily glares at you as she talks: "Cut the crap, bitch... I know what you did. You''ll regret this!"'

locations/albina_election_events.qsrc

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

locations/brother.qsrc

@@ -644,7 +644,6 @@ if $ARGS[0] = 'sleepsexcum':
 
 	pose = 0
 	if sexcontra > 0: sexcontra = 0
-	$risk_boy = ''
 
 	gs 'stat'
 
@@ -838,6 +837,7 @@ if $ARGS[0] = 'fuckvaginal':
 	gs 'dinsex','sexcum'
 
 	gs 'brother', 'brotherSexEnd'
+	killvar '$risk_boy'
 end
 
 if $ARGS[0] = 'fuckanal':
@@ -1084,7 +1084,6 @@ end
 if $ARGS[0] = 'brother_sex_end':
 	*clr & cla
 	menu_off = 1
-	$risk_boy = ''
 	gs 'stat'
 	minut += rand(2,5)
 	'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/shower.mp4"></center>'

locations/gschool_grounds.qsrc

@@ -302,7 +302,7 @@ if $ARGS[0] = 'main':
 				'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 			end
 		end
-		if AlbinaQW['albride'] = 0 and AlbinaQW['RideDaystart'] <= daystart and AlbinaQW['albina_election_events']  >= 1 and AlbinaQW['ParkRally'] > 0 and AlbinaQW['Chernov'] > 0: 
+		if AlbinaQW['albride'] = 0 and AlbinaQW['RideDaystart'] <= daystart and AlbinaQW['AlbFatherQW']  >= 1 and AlbinaQW['ParkRally'] > 0 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/gschool_lessons4.qsrc

@@ -1290,8 +1290,8 @@ if $ARGS[0] = 'shower2':
 				'As a large group of girls gather around to watch and film the show, you spot Christina trying to quietly slip out with the group of girls. She sees you looking at her and she stops in her tracks, her eyes fearfully pleading with you. You ignore her and mercilessly drag her into the middle of the room and throw her down next to Sonia. "I brought an extra bitch to the party!" you say mockingly to the laughter of the others. You waste no time and immediately present your pussy to Christina, spreading yourself wide and exposing your clit. She looks at you scornfully, but knowing that she has no choice, she reluctantly starts eating you out. "Come on slut, you can do better than that!" you say before you grab her hair and start grinding against her, smearing her face with your wetness as she keeps licking away at your clit. She seems to put more effort in and you slowly feel your orgasm building within you.'
 				$orgasm_txt = 'Just as you are about to climax, you pull her face out of your crotch and quickly rub your engorged clit, bringing yourself to an explosive orgasm as you spray a fountain of pussy juice across Christina''s face, much to the amazement and amusement of the other girls present.'
 				$orgasm_or = 'custom'
-				'When you finish cumming, you force her head back into your crotch, making her lick up every last drop of your juices. When you''re done, you pat her on the head and throw her to the floor for the other girls to have some fun with her. When everyone has had a turn, Sonia and Christina are both drenched in sticky girl cum. Christina is furious, but Sonia doesn''t care, instead focusing on fingering herself. You give Christina a mocking smile and leave her sitting there as you join the others in returning to the locker room to get dressed. She doesn''t resist, instead just sitting on the floor, dejected and defeated. She hasn''t returned to the locker room by the time you finish getting dressed and leave.'   
 				gs 'arousal', 'cuni', -8, 'lesbian', 'dom'
+				'When you finish cumming, you force her head back into your crotch, making her lick up every last drop of your juices. When you''re done, you pat her on the head and throw her to the floor for the other girls to have some fun with her. When everyone has had a turn, Sonia and Christina are both drenched in sticky girl cum. Christina is furious, but Sonia doesn''t care, instead focusing on fingering herself. You give Christina a mocking smile and leave her sitting there as you join the others in returning to the locker room to get dressed. She doesn''t resist, instead just sitting on the floor, dejected and defeated. She hasn''t returned to the locker room by the time you finish getting dressed and leave.'   
 				gs 'stat'
 				'You can choose another outfit while you''re here.'
 				act 'Finish dressing':

locations/pav_commercial.qsrc

@@ -55,13 +55,13 @@ end
 
 gs'street_event','pav_commercial', 'extras'
 
-if AlbinaQW['albina_election_events']  >= 1 and AlbinaQW['ParkRally'] > 0:
+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['albina_election_events']  = 1:gt 'albina_election_events'
+if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['AlbFatherQW']  = 1: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,13 @@ end
 
 gs'street_event','pav_industrial', 'extras'
 
-if AlbinaQW['albina_election_events']  >= 1 and AlbinaQW['ParkRally'] > 0:
+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['albina_election_events']  = 1:gt 'albina_election_events'
+if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['AlbFatherQW']  = 1:gt 'albina_election_events'
 
 if rand(1,5) >= 4 and pav_slut >= 100:
 	if pav_slut < 150:

locations/pav_residential.qsrc

@@ -86,12 +86,12 @@ if pav_slut >= 250 and rand(1, 10) = 10 and pav_residential_prost_day ! daystart
 	exit
 end
 
-if AlbinaQW['albina_election_events']  >= 1 and AlbinaQW['ParkRally'] > 0:
+if AlbinaQW['AlbFatherQW']  >= 1 and AlbinaQW['ParkRally'] > 0:
 	if AlbinaQW['ElectionCampaignTime'] = 0:AlbinaQW['ElectionCampaignTime'] = totminut + 2880
 	'<br>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?</br>'
 end
 
-if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['albina_election_events']  = 1:gt 'albina_election_events'
+if AlbinaQW['ElectionCampaignTime'] > 0 and AlbinaQW['ElectionCampaignTime'] <= totminut and hour >= 14 and AlbinaQW['AlbFatherQW']  = 1:gt 'albina_election_events'
 
 if rand(1, 5) >= 4 and pav_slut >= 150:
 	if pav_slut < 200:

locations/saveupdater.qsrc

@@ -494,7 +494,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	! ----- Diner Bystroeshka (burger) story variables migrated to array
 
 	! ----- Albina story variables migrated to array
-	if AlbFather > 0:          AlbinaQW['albina_election_events'] = AlbFather & killvar 'AlbFather'
+	if AlbFather > 0:          AlbinaQW['AlbFatherQW'] = AlbFather & killvar 'AlbFather'
 	if AlbFrend > 0:           AlbinaQW['Friends'] = AlbFrend & killvar 'AlbFrend'
 	if ZvezdEnd > 0:           AlbinaQW['StarletsShutDown'] = ZvezdEnd & killvar 'ZvezdEnd'
 	if DanceWhore > 0:         AlbinaQW['StarletsWhore'] = DanceWhore & killvar 'DanceWhore'