[fixed] Correction for living at home check in your bedroom at parent's house

locations/bedrPar.qsrc

@@ -17,7 +17,7 @@ gs 'family_schedule'
 if ml_performance['max_perform_minutes'] = 0: ml_performance['max_perform_minutes'] = pcs_instrmusic + pcs_vokal
 
 if $ARGS[0] = '' or $ARGS[0] = 'start':
-	if locat['Mother'] = 26 and fromoutside and SchoolAtestat = 0:
+	if locat['Mother'] = 26 and fromoutside and $home['current'] = 'parents_home':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		if prezik > 0 and rand(1,3) = 1:
 			gt 'mother', 'condom_find'
@@ -34,7 +34,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 			act 'Leave': gt 'korrPar'
 		end
-	elseif ParrotQW['Level'] = 2 and SchoolAtestat = 0:
+	elseif ParrotQW['Level'] = 2 and $home['current'] = 'parents_home':
 		*clr & cla
 		menu_off = 1
 		'As soon as you enter the room you rush over to <<$ParrotQW[''Name'']>>''s cage and pour the contents of the vial into his water bowl.'
@@ -43,7 +43,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		ParrotQW['Day'] = 3
 		
 		act 'Continue':gt $loc, $loc_arg
-	elseif ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1 and SchoolAtestat = 0:
+	elseif ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1 and $home['current'] = 'parents_home':
 		*clr & cla
 		menu_off = 1
 		'When you enter the room, you notice <<$ParrotQW[''Name'']>>''s cage is open and he is gone.'
@@ -55,13 +55,13 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		gs 'stat'
 		
 		act 'Continue':gt $loc, $loc_arg
-	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and locat['Anya_inroom'] = 0 and SchoolAtestat = 0:
+	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and locat['Anya_inroom'] = 0 and $home['current'] = 'parents_home':
 		gt 'tobiQW', 'start'
 		
-	elseif locat['Anya'] = 11 and SchoolAtestat = 0: 
+	elseif locat['Anya'] = 11 and $home['current'] = 'parents_home': 
 		gt 'sisterQW', 'sisboyQW_expel'
 		
-	elseif locat['Anya_inroom'] = 1 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0 and SchoolAtestat = 0:
+	elseif locat['Anya_inroom'] = 1 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0 and $home['current'] = 'parents_home':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
@@ -81,7 +81,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		act 'Leave': gt 'korrPar'
 	else
-		if SchoolAtestat = 0:
+		if $home['current'] = 'parents_home':
 			'<center><h1><font color="maroon">Your bedroom</font></h1></center>'
 		else
 			'<center><h1><font color="maroon">Your old bedroom</font></h1></center>'
@@ -89,7 +89,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
 		*nl
-		if SchoolAtestat = 0:
+		if$home['current'] = 'parents_home':
 			'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
 			*nl
 			'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
@@ -99,7 +99,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		*nl
 		if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 
-		if ParrotQW['Owned2'] = 1 and SchoolAtestat = 0:
+		if ParrotQW['Owned2'] = 1 and $home['current'] = 'parents_home':
 			'<a href="exec:gt ''popu'',''start2''"><<$ParrotQW[''Name2'']>></a> is sitting in his cage'
 			if daystart - ParrotQW['BuyDate'] <= 10: 
 				'<<$ParrotQW[''Name2'']>> starts squawking at you when you enter the room.'
@@ -136,7 +136,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			*nl
 		end
 
-		if SchoolAtestat = 0:
+		if $home['current'] = 'parents_home':
 			'<table><tr><td valign="top">Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 
 			if tabletki > 0 and prezik + prezikcount + preziksabo > 0:
@@ -147,7 +147,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 				'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
 			end
 			
-			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and SchoolAtestat = 0 and detention_warning ! daystart:
+			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and detention_warning ! daystart:
 				detention_warning = daystart
 				msg 'You have detention this morning and must be at school before 09:00.'
 			end
@@ -191,7 +191,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			gt 'korrPar'
 		end
 
-		if SchoolAtestat = 0:
+		if $home['current'] = 'parents_home':
 			act 'Relax on your bed': gt 'bed', 'start'
 
 			act 'Open wardrobe': gt 'wardrobe', 'start'
@@ -298,11 +298,11 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		end
 
 		'</td><td width = "100" valign="top"></td><td>'
-		if SchoolAtestat = 0: gs 'subkid'
+		if $home['current'] = 'parents_home': gs 'subkid'
 		'</td></tr></table>'
 
 		!! NOTE: This has to go here, otherwise gs 'subkid' removes the icon. 
-		if SchoolAtestat = 0: gs 'music_actions', 'music_icon'
+		if $home['current'] = 'parents_home': gs 'music_actions', 'music_icon'
 	end
 end