[changed] follow up to last commit

locations/JuliaMilHome.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'home':
 		NatashaLoc = 0
 	end
 
-	if BeInJulMilHome = 0: BeInJulMilHome = 1
+	if juliaQW['home_unlocked'] = 0: juliaQW['home_unlocked'] = 1
 
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptdoor.jpg"></center>'
@@ -351,7 +351,7 @@ if $ARGS[0] = 'julia_room':
 	minut += 1
 	gs 'stat'
 
-	if BeInJulMilHome = 0: BeInJulMilHome = 1
+	if juliaQW['home_unlocked'] = 0: juliaQW['home_unlocked'] = 1
 
 	*clr & cla
 	'<center><b><font color="maroon">Julia''s Room</font></b></center>'
@@ -722,7 +722,7 @@ if $ARGS[0] = 'julia_go':
 	'As you approach Julia after school, she smiles at you and asks, "Hi <<$pcs_nickname>>! Want to go to my place? We can do our homework together, and maybe grab a bite to eat?"'
 
 	act 'Go with Julia':
-		if BeInJulMilHome = 0: BeInJulMilHome = 1
+		if juliaQW['home_unlocked'] = 0: juliaQW['home_unlocked'] = 1
 		minut += 15
 		gs 'stat'
 

locations/gschool_grounds.qsrc

@@ -246,7 +246,7 @@ if $ARGS[0] = 'main':
 			if anushkaFirstvisit = 0 and meet_after_school = 1: '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka</a> is leaning against a tree just in front of the school.'
 			if LariskaQW['story'] >= 5 and cheerleaders_on = 0: 'You see <a href="exec:minut += 1 & gt ''LariskaGo''">Lariska</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
 			if christinaQW['subpath'] >= 4 and cheerleaders_on = 0: '<a href="exec:minut += 1 & gt ''Zvereva_house_events'', ''Chris_walk_home''">Christina Zvereva</a> is walking across the school courtyard, looking irritated.'
-			if JuliaMilLernQW >= 1: '<a href="exec:minut += 1 & gt ''JuliaMilHome'', ''julia_go''">Julia</a> is sitting out on the courtyard, reading a book.'
+			if juliaQW['study_unlocked'] >= 1: '<a href="exec:minut += 1 & gt ''JuliaMilHome'', ''julia_go''">Julia</a> is sitting out on the courtyard, reading a book.'
 			if NatbelQW['QWstage'] > 0: '<a href="exec:minut += 1 & gt ''natbelEv'', ''natbel_go''">Natasha</a> is standing in a corner.'
 			if artemLernQW >= 1 and artemVitokQW ! 2 and artemQW['artemblok'] = 0 and artemQW['artlie'] ! 2 and artemQW['artembrokenheart'] ! 1: '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem</a> is waiting for you near the school entrance.'
 			if katjaQW['afterschool_hangout_day'] ! daystart and katjaQW['QWstage'] >= 1 and locat['katja'] = 6: '<a href="exec:minut += 15 & gt ''katjaEv''">Katja</a> is walking across the school courtyard, getting ready to go home.'
@@ -275,7 +275,7 @@ if $ARGS[0] = 'main':
 			if anushkaFirstvisit = 0 and meet_after_school = 1: gs 'show_table', '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a>', '5'
 			if LariskaQW['story'] >= 5 and cheerleaders_on = 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>', '5'
 			if christinaQW['subpath'] >= 4 and cheerleaders_on = 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''Zvereva_house_events'', ''Chris_walk_home''">Christina Zvereva</a>', '5'
-			if JuliaMilLernQW >= 1: gs 'show_table', '<a href="exec:minut += 1 & gt ''JuliaMilHome'', ''julia_go''">Julia Milova</a>', '5'
+			if juliaQW['study_unlocked'] >= 1: gs 'show_table', '<a href="exec:minut += 1 & gt ''JuliaMilHome'', ''julia_go''">Julia Milova</a>', '5'
 			if NatbelQW['QWstage'] > 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''natbelEv'', ''natbel_go''">Natasha Belova</a>', '5'
 			if artemLernQW >= 1 and artemVitokQW ! 2 and artemQW['artemblok'] = 0 and artemQW['artlie'] ! 2 and artemQW['artembrokenheart'] ! 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem Chebotarev</a>', '5'
 			if katjaQW['afterschool_hangout_day'] ! daystart and katjaQW['QWstage'] >= 1 and locat['katja'] = 6: gs 'show_table', '<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a>', '5'

locations/gschool_nerd_chats.qsrc

@@ -149,8 +149,8 @@ if $ARGS[0] = 'julia':
 	gs 'npc_relationship', 'modify', 'A12', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-	if JuliaMilLernQW = 0 and npc_rel['A12'] >= 60:
-		JuliaMilLernQW = 1
+	if juliaQW['study_unlocked'] = 0 and npc_rel['A12'] >= 60:
+		juliaQW['study_unlocked'] = 1
 		if fame['pav_slut'] >= 175:
 			'You approach Julia and explain how you''re struggling in school and could really use her help studying. She obliquely comments on your damaged reputation at school, but agrees to help you anyway. She doesn''t seem to care much either way as long as you don''t tell anyone.'
 		else

locations/journal_quests.qsrc

@@ -137,13 +137,13 @@ if $ARGS[0] = 'start':
 		*nl
 		if fame['pav_slut'] < 200:
 			if npc_rel['A12'] >= 60:
-				if JuliaMilLernQW = 1:
-					if BeInJulMilHome = 1:
+				if juliaQW['study_unlocked'] = 1:
+					if juliaQW['home_unlocked'] = 1:
 						if wine = 1:
-							if JulMilBestFrend >= 5:
-								if SexTalkJulia >= 4:
+							if juliaQW['JulMilBestFrend'] >= 5:
+								if juliaQW['SexTalkJulia'] >= 4:
 									'Julia and I are in a sexual relationship now.'
-								elseif SexTalkJulia > 0:
+								elseif juliaQW['SexTalkJulia'] > 0:
 									'I should try getting Julia to tell me more about her sexual adventures.'
 								else
 									'I should try talking to Julia about sex.'

locations/pav_complex.qsrc

@@ -91,7 +91,7 @@ if $ARGS[0] = 'start':
 	if Enable_tablemap = 0:
 		if npc_rel['A112'] >=70 or (week < 6 and hour >= 14 and hour <= 23) or (week >= 6 and hour >= 10 and hour < 14) or (hour >= 0 and hour < 2):'<a href="exec:minut += 15 & gt ''vasilyhome'', ''home''">The Shulgin family</a> live in the apartment above your parents.'
 		if ArtemBeInHome > 0 and artemQW['artemblok'] = 0:'<a href="exec:minut += 15 & gt ''artemhome'', ''home''">Artem Chebotarev</a>, one of your classmates, lives in the same apartment building as your parents, on the first floor.'
-		if BeInJulMilHome = 1:
+		if juliaQW['home_unlocked'] = 1:
 			if (hour >= 15 and hour <= 20 and week < 6) or (hour >= 8 and hour <= 20 and week >= 6):
 				'<a href="exec:minut += 15 & gt ''JuliaMilHome'', ''home''">Julia Milova</a>, one of your classmates, lives in the same apartment building as your parents, on the third floor.'
 			else
@@ -114,7 +114,7 @@ if $ARGS[0] = 'start':
 			gs'show_table','Apartment of Uncle Shulgin.','3'
 		end
 		if ArtemBeInHome > 0 and artemQW['artemblok'] = 0:gs'show_table','Apartment of <a href="exec:minut += 15 & gt ''artemhome'', ''home''">Artem Chebotarev</a>.','3'
-		if BeInJulMilHome = 1:
+		if juliaQW['home_unlocked'] = 1:
 			if (hour >= 15 and hour <= 20 and week < 6) or (hour >= 8 and hour <= 20 and week >= 6):
 				gs'show_table','Apartment of <a href="exec:minut += 15 & gt ''JuliaMilHome'', ''home''">Julia Milova</a>.','3'
 			else

locations/pod_ezd.qsrc

@@ -184,7 +184,7 @@ if $ARGS[0] = 'etaj_3':
 	act 'Go down to the second floor': minut += 1 & gt 'pod_ezd','etaj_2'
 	act 'Go up to the fourth floor': minut += 1 & gt 'pod_ezd','etaj_4'
 	act 'Apartment 13: Vasily and Sergei Shulgin': gt 'vasilyhome', 'home'
-	if BeInJulMilHome = 1: act 'Apartment 15: Julia Milova': gt 'JuliaMilHome', 'home'
+	if juliaQW['home_unlocked'] = 1: act 'Apartment 15: Julia Milova': gt 'JuliaMilHome', 'home'
 	act 'Take the elevator': gt 'pod_ezd','lift','etaj_3'
 end
 

locations/saveupdater.qsrc

@@ -1279,6 +1279,14 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if artsveslut > 0: artemQW['sveslut'] = artsveslut & killvar 'artsveslut'
 	if metArtemMom > 0: artemQW['metArtemMom'] = metArtemMom & 'metArtemMom'
 	if artdimhelp > 0: artemQW['dimkahelp'] = artdimhelp & killvar 'artdimhelp'
+	
+	!! update Julia to an array
+	if JulMilBestFrend > 0: juliaQW['JulMilBestFrend'] = JulMilBestFrend & killvar 'JulMilBestFrend'
+	if eatJulMilDay: juliaQW['eatJulMilDay'] = eatJulMilDay & killvar 'eatJulMilDay'
+	if SexTalkJulia: juliaQW['SexTalkJulia'] = SexTalkJulia & killvar 'SexTalkJulia'
+	if BeInJulMilHome: juliaQW['home_unlocked'] = BeInJulMilHome & killvar 'BeInJulMilHome'
+	if JuliaMilLernQW: juliaQW['study_unlocked'] = JuliaMilLernQW & killvar 'JuliaMilLernQW'
+	
 end
 
 gs 'saveg'