Merge remote-tracking branch 'origin/master'

locations/NikoPayback.qsrc

@@ -780,7 +780,7 @@ end
 
 if $ARGS[0] = 'Albina Help':
     *clr & cla
-	AlbVsNiko = 2 
+	AlbinaQW['niko_help'] = 2 
 	NikoPayback = 3
 	minut += 5
 	gs 'stat'

locations/albina_chat.qsrc

@@ -1591,15 +1591,16 @@ if $ARGS[0] = 'clothing_conversation':
 	!!end
 end
 
-if NikoPayback = 2 and AlbVsNiko = 0:
+if NikoPayback = 2 and AlbinaQW['niko_help'] = 0:
 	act 'Ask for help with Niko':
 	cla & *clr
-	AlbVsNiko = 1
+	AlbinaQW['niko_help'] = 1
 	minut += 30
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-	'You feel Albina wrap an arm around you. "What''s wrong <<$pcs_nickname>>? You''re looking pretty glum."'
+	'You feel Albina wrap an arm around you. "What''s up, <<$pcs_nickname>>? You''re looking pretty glum."'
 	'You collect your thoughts before replying. "Ever since I broke up with Niko, he''s been raping me at lunchtime and I..."'
-	'Her face contorts in rage. "That slimy motherfucker! Don''t worry, I''ll sort him out..." She doesn''t eleborate on what she''s planning when you ask, but you give her a tight hug. "Thanks Albina, I just don''t know what to do!"'
+	'Her face contorts in rage. "That slimy little motherfucker''s been doing WHAT?! Don''t worry, I''ll sort him out..."' 
+	'She doesn''t eleborate on what she''s planning when you ask, but you give her a tight hug. "Thanks Albina, I just don''t know what to do!"'
 	'She holds you tight and comforts you as tears run down your cheeks. "Don''t worry <<$pcs_nickname>>. I''ll make it all go away... How about we do something to take your mind off it?"'
 	act 'Continue': gt 'albinahome','bedroom'
 	end

locations/gschool_lunch.qsrc

@@ -152,7 +152,7 @@ if $ARGS[0] = 'break':
 			gt 'NikoPayback', 'Ivan Help 2'
 		elseif NikoPayback = 2 and anushkaQW['vs_niko'] = 1:
 			gt 'NikoPayback', 'Nush Help'
-		elseif NikoPayback = 2 and AlbVsNiko = 1:
+		elseif NikoPayback = 2 and AlbinaQW['niko_help'] = 1:
 			gt 'NikoPayback', 'Albina Help'
 		elseif NikoPayback = 1 and NikoPayback_Day ! daystart:
 			gt 'NikoPayback', 'Payback'

locations/saveupdater.qsrc

@@ -188,6 +188,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if alb_father_day > 0:     AlbinaQW['ParkRallyDay'] = alb_father_day & killvar 'alb_father_day'
 	if AlbFaterBlackTime > 0:  AlbinaQW['ElectionCampaignTime'] = AlbFaterBlackTime & killvar 'AlbFaterBlackTime'
 	if startletsday > 0:       AlbinaQW['startletsday'] = startletsday & killvar 'startletsday'
+	if AlbVsNiko > 0:		   AlbinaQW['niko_help'] = AlbVsNiko & killvar 'AlbVsNiko'
 	! ----- Albina story variables migrated to array
 
 	!! Updating npc_bust[] array to the new values ----- 0.8.0