Browse Source

[fixed] access to parents apartment and/or school no longer being reset when reloading game after being kicked out and/or expelled

sovietmercader 5 years ago
parent
commit
5cefc13161

+ 2 - 2
locations/gschool_grounds.qsrc

@@ -317,13 +317,13 @@ if $ARGS[0] = 'sports':
 		'With the school open you can go to the <a href="exec:gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
-	if week = 6 and schoolSorev = 2 and hour = 10:
+	if week = 6 and schoolSorev = 2 and hour = 10 and SchoolBlock = 0:
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 
 		act 'Participate in the 400m sprint event':gt 'gschool_grounds', 'SchoolRun2'
 	end
 
-	if week = 6 and schoolSorev = 1 and hour = 10:
+	if week = 6 and schoolSorev = 1 and hour = 10 and SchoolBlock = 0:
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 
 		act 'Participate in the 400m sprint race':gt 'gschool_grounds', 'SchoolRun'

+ 2 - 0
locations/korrPar.qsrc

@@ -216,8 +216,10 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 		elseif schoolPredupr = 2:
 			schoolPredupr = 3
 			SchoolBlock = 1
+			ParHomeBlock = 1
 			home_owned[2] = 0
 			schoolprogul = 0
+			pcs_grades = 0
 			if $clothingworntype = 'school' and clothingwornnumber = 6:gs 'clothing', 'strip'
 			'As you enter the hallway, you find your mother there waiting for you. You have never seen her this furious. "<<$pcs_nickname>>? I just got off the phone with the school, they told me you didn''t show up yet again and expelled you. I''ve had it with you! I''ve warned you so many times! Go ahead, live your irresponsible life the way you want. You''re no longer welcome here." She already packed up all your things from your room before you got home, and roughly shoves the bag into your hands. After that, she pushes you out the door and slams it shut in your face.'
 

+ 41 - 41
locations/mother.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = '':
 	if motherWorry = 1 and indorf = 0:
 		motherWorry = 0
 		npc_rel['A29'] -= 1
-		delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+		delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 		if $loc = 'gkafe':
 			'Your mother looks at you from across the cafe counter, "<<$pcs_firstname>> <<$pcs_lastname>>, Where the hell have you been! I have been worried sick!" You mother then looks around the small cafe and says with a frown, "We will talk about this when we get home."'
 		else
@@ -68,7 +68,7 @@ if $ARGS[0] = '':
 		if pcs_haircol ! nathcol and pcs_haircol <= 3 and npc_rel['A29'] < 60: 
 			$texthcol2 = 'says with a frown, "You should concentrate on your studies, not on how you look."'
 		elseif pcs_haircol ! nathcol and pcs_haircol > 3 and npc_rel['A29'] < 60:
-			delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+			delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 			$texthcol2 = 'then angrily grabs a handful of your hair. She holds it tightly but doesn''t quite pull it. "What a fool you are. Do you want to throw away your future? Get out of my sight!"'
 		else
 			$texthcol2 = 'says with a smile, "It looks nice on you. I''m sure the boys will like it too. Just make sure you keep your grades up."'
@@ -151,7 +151,7 @@ if $ARGS[0] = '':
 			act'Show her your pierced tongue':
 				cls
 				pirsAmother=1
-				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+				delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/pc/body/piercings/a<<pirsA>>.jpg" ></center>'
 				'You open your mouth and stick out your tongue, showing her your shiny new piercing.'
@@ -169,7 +169,7 @@ if $ARGS[0] = '':
 		act'I just think it looks pretty':
 			cls
 			pirsBmother=1
-			delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+			delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/pc/body/piercings/b<<pirsB>>.jpg" ></center>'
 			'You shrug and answer with a sweet smile on your face: "I like it, I think it looks cute. Don''t you agree?"'
@@ -188,14 +188,14 @@ if $ARGS[0] = '':
 	if pirsD > 0 and pirsD < 10000 and pirsDmother=0:
 		!!mother notices a nose ring
 		pirsDmother=1
-		delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+		delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 		'Your mother looks a bit shocked at your nose ring: "Jesus, <<$pcs_nickname>>, what is- why?! I understand putting a ring in a bull''s nose to lead them by, but on a person? There''s no reason to do that!"'
 	end
 
 	if pirsE > 0 and pirsE < 10000 and pirsEmother=0:
 		!!mother notices eyebrow piercing
 		pirsEmother=1
-		delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+		delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 		'Your mother doesn''t understand why you go an eyebrow piercing: "<<$pcs_nickname>>, why would you want that thing in your eyebrow?" She shakes her head in exasperation. "Kids these days..."'
 		''
 	end
@@ -479,7 +479,7 @@ if $ARGS[0] = '':
 			minut += 60
 			npc_rel['A29'] += rand(1, 5)
 			pcs_mood -= 10
-			delin_beh -= 1 &!counter for getting sent to Gadukino for the summer
+			delin_beh -= 1 &!counter for getting sent to Gadyukino for the summer
 			TotalMomPom += 1
 			MomPom += 1
 			gs 'stat'
@@ -549,7 +549,7 @@ if $ARGS[0] = '':
 				if npc_QW['A29'] = 0:npc_QW['A29'] = 1
 
 				if momslut < 2:
-					delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+					delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 					'Your mother is furious and grabs you by the ear, pulling you out of the clinic and onto the street. "Oh, you slut! Your father and I worked so hard to raise you as a decent person, hoping you would find a good husband some day... and now it turns out you''re a whore who has already put her pussy to work. Get out of my sight!" She storms off, leaving you to find your own way home. When you return home, you make sure you do it quietly so she can''t give you another earful.'
 				else
 					'Your mother shakes her head sadly when she reads the referral. "Well... I guess I shouldn''t be surprised."'
@@ -557,7 +557,7 @@ if $ARGS[0] = '':
 			elseif motherKnowWhore > 0 and npc_QW['A29'] < 2:
 				npc_rel['A29'] -= 10
 				motherKnowSpravka = 1
-				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+				delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 				if npc_QW['A29'] = 0:npc_QW['A29'] = 1
 				'Your mother reads the referral and closes her eyes for a second, trying to suppress her anger. "To be honest, it''s not even a surprise to me. Don''t think that I haven''t seen you sneaking around the house at weird times, and all the guys loitering near our apartment."'
 			elseif npc_QW['A29'] >= 2:
@@ -599,7 +599,7 @@ if $ARGS[0] = '':
 	if alko > 1 and alkomday ! daystart:
 		alkomday = daystart
 		npc_rel['A29'] -= 1
-		delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+		delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 		'Your mother can smell you have been drinking alcohol, and gives you a lecture: "<<$pcs_nickname>>, why do you smell of alcohol? You''re still too young to drink, you could get into all sorts of trouble!"'
 	end
 
@@ -611,7 +611,7 @@ if $ARGS[0] = '':
 			if motherKnowWhore = 0:motherKnowWhore = 1
 
 			if momslut < 2:
-				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+				delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 				'When you approach her, your mother looks concerned at you and then sighs exasperatedly, rolling her eyes in disgust. When you look down to see what got her so angry, you realize you forgot about the cum stains on your face. They''re quite large, and very recognizable as such.'
 				'"I tell everyone my daughter is decent, and meanwhile it turns out she fucks around like a common whore and then proudly displays the stains for the whole town to see. Slut! Get out of my sight!" You can tell your mother is struggling to resist the urge to slap you.'
 				'You try to calm her down and tell her that''s not true, but she''s too upset right now and not interested in listening to you.'
@@ -634,7 +634,7 @@ if $ARGS[0] = '':
 			if motherKnowWhore = 0:motherKnowWhore = 1
 
 			if momslut < 2:
-				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+				delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 				'Your mother glares at you. You realize she must have noticed the cum stains on your face, and feel terrible.'
 				'"Again, you fucking little whore? I was already so ashamed of you! Get out of my sight!"'
 				'Knowing there is nothing you can say to make it better right now, you simply mumble an apology and leave quickly.'
@@ -659,12 +659,12 @@ if $ARGS[0] = '':
 	if ($clothingworntype = 'formal' or $clothingworntype = 'expensive') and hour > 9:'Your mother looks a bit puzzled at your fancy clothes: "Well well, look at you... why are you so dressed up? Big plans today?"'
 
 	if week = 5 and dostupindorf = 1:
-		if hour > 9:'While your mother is working on some meals in the kitchen, she remembers something and looks at you: "Oh <<$pcs_nickname>>, while you''re here... we''re going to visit your grandparents in Gadukino tomorrow. We leave at noon (12:00) tomorrow, so if you want to come along you should meet me in the kitchen before then."'
+		if hour > 9:'While your mother is working on some meals in the kitchen, she remembers something and looks at you: "Oh <<$pcs_nickname>>, while you''re here... we''re going to visit your grandparents in Gadyukino tomorrow. We leave at noon (12:00) tomorrow, so if you want to come along you should meet me in the kitchen before then."'
 	elseif week = 6 and dostupindorf = 1:
 		if hour > 9 and hour < 12:
-			'Your mother is finishing up on some meals before leaving for Gadukino and puts down her work for a second. "<<$pcs_nickname>>, well? Do you want to come with us to Gadukino or would you rather stay home with Anya?"'
+			'Your mother is finishing up on some meals before leaving for Gadyukino and puts down her work for a second. "<<$pcs_nickname>>, well? Do you want to come with us to Gadyukino or would you rather stay home with Anya?"'
 
-			act 'Go to Gadukino':hour = 12 & minut = 0 & indorf = 1 & gt 'famdorfride'
+			act 'Go to Gadyukino':hour = 12 & minut = 0 & indorf = 1 & gt 'famdorfride'
 		end
 	end
 end	
@@ -693,7 +693,7 @@ if $ARGS[0] = 'pregreact':
 				npc_rel['A29'] -= 20
 				pregTalkFamily = 1
 				pregtalkmom = 1
-				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+				delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 				if motherKnowSpravka = 0:motherKnowSpravka = 1
 				gs 'stat'
 				'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
@@ -713,7 +713,7 @@ if $ARGS[0] = 'pregreact':
 				npc_rel['A29'] -= 20
 				pregTalkFamily = 1
 				pregtalkmom = 1
-				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
+				delin_beh += 1 &!counter for getting sent to Gadyukino for the summer
 				if motherKnowSpravka = 0:motherKnowSpravka = 1
 				gs 'stat'
 				'<center><b><font color="maroon">Your mother, Natasha <<$pcs_lastname>></font></b></center>'
@@ -836,11 +836,11 @@ if $ARGS[0] = 'pregreactbrother':
 		if hour < 19:
 			'You decide to go apartment hunting.'
 
-			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		else
 			'You decide to look for a place to sleep tonight. Tomorrow, you’ll need to go apartment shopping.'
 
-			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
 	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and pregtalkbrother = 1 and brothersecret = 0:
 		'Before you can even finish the second syllable of your brother''s name, you see the rage building in your mother''s face. She balls her fists and visibly shakes, making it clear that she is using all of her strength to stop herself from transferring that strength from her open palm to your face.. '
@@ -855,11 +855,11 @@ if $ARGS[0] = 'pregreactbrother':
 		if hour < 19:
 			'You decide to go apartment hunting.'
 
-			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		else
 			'You decide to look for a place to sleep tonight. Tomorrow, you’ll need to go apartment shopping.'
 
-			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
 	elseif npc_rel['A29'] > 80 and pregtalkbrother = 1 and brothersecret = 0:
 		'Your mother stares in stunned silence as you utter Kolka''s name. Her knees seem to give out, and she barely manages to hold herself up by leaning on the counter.'
@@ -884,11 +884,11 @@ if $ARGS[0] = 'pregreactbrother':
 		if hour < 19:
 			'You decide to go apartment hunting.'
 
-			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		else
 			'You decide to look for a place to sleep tonight. Tomorrow, you’ll need to go apartment shopping.'
 
-			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
 	elseif npc_rel['A29'] < 60 and (pregtalkbrother = 0 or brothersecret = 1):
 		'As soon as your brother''s name crosses your lips, your mother''s face visibly reddens. Her mouth curls into a snarl and she reaches up and grips you by your hair. '
@@ -904,11 +904,11 @@ if $ARGS[0] = 'pregreactbrother':
 		'Eventually, you get up, wipe your face.'
 		if hour < 19:
 			'You decide to go apartment hunting.'
-			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		else
 			'You decide to look for a place to sleep tonight. Tomorrow, you’ll need to go apartment shopping.'
 
-			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
 	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and (pregtalkbrother = 0 or brothersecret = 1):
 		'Before you can even finish the second syllable of your brother''s name, you see the rage building in your mother''s face. She balls her fists and visibly shakes, making it clear that she is using all of her strength to stop herself from transferring that strength from her open palm to your face.. '
@@ -922,11 +922,11 @@ if $ARGS[0] = 'pregreactbrother':
 		if hour < 19:
 			'You decide to go apartment hunting.'
 
-			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		else
 			'You decide to look for a place to sleep tonight. Tomorrow, you’ll need to go apartment shopping.'
 
-			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
 	elseif npc_rel['A29'] > 80 and (pregtalkbrother = 0 or brothersecret = 1):
 		'Your mother stares in stunned silence as you utter Kolka''s name. Her knees seem to give out, and she barely manages to hold herself up by leaning on the counter.'
@@ -946,11 +946,11 @@ if $ARGS[0] = 'pregreactbrother':
 		if hour < 19:
 			'You decide to go apartment hunting.'
 
-			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		else
 			'You decide to look for a place to sleep tonight. Tomorrow, you’ll need to go apartment shopping.'
 
-			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsKolka = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
 	end
 end
@@ -976,10 +976,10 @@ if $ARGS[0] = 'pregreactstepdad':
 		'Eventually, you get up and wipe your face. You have no choice but to fend for yourself now.'
 		if hour < 19:
 			'As there is still some time left of the day you decide to go apartment hunting. You need to find somewhere to stay as soon as possible.'
-			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		else
 			'It''s too late to look for an apartment today. Instead you decide to look for a place to sleep tonight. You''ll need to go apartment hunting first thing tomorrow.'
-			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
 	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and pregtalkbrother = 1 and brothersecret = 0:
 		'Before you''re able to finish the second syllable of your step-father''s name, you see the rage building in your mother''s face. She tightens her fist and is visibly shaking, making it clear that she is using all of her might to hinder herself from attacking you...'
@@ -994,10 +994,10 @@ if $ARGS[0] = 'pregreactstepdad':
 		'Eventually, you get up and wipe your face. You have no choice but to fend for yourself now.'
 		if hour < 19:
 			'As there is still some time left of the day you decide to go apartment hunting. You need to find somewhere to stay as soon as possible.'
-			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		else
 			'It''s too late to look for an apartment today. Instead you decide to look for a place to sleep tonight. You''ll need to go apartment hunting first thing tomorrow.'
-			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
 	elseif npc_rel['A29'] > 80 and pregtalkstepdad = 1 and stepdadSecret = 0:
 		'Your mother stares at you in stunned silence as you utter Vladimir''s name. Her knees seem to give out, as she barely manages to hold herself up by leaning on the counter.'
@@ -1023,10 +1023,10 @@ if $ARGS[0] = 'pregreactstepdad':
 		'Eventually, you get up and wipe your face. You have no choice but to fend for yourself now.'
 		if hour < 19:
 			'As there is still some time left of the day you decide to go apartment hunting. You need to find somewhere to stay as soon as possible.'
-			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		else
 			'It''s too late to look for an apartment today. Instead you decide to look for a place to sleep tonight. You''ll need to go apartment hunting first thing tomorrow.'
-			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
 	elseif npc_rel['A29'] < 60 and (pregtalkstepdad = 0 or stepdadSecret = 1):
 		'As soon as your step-father''s name crosses your lips, your mother''s face visibly reddens. Her mouth curls into a snarl and she reaches up and grips you by your hair and starts draging you around.'
@@ -1047,10 +1047,10 @@ if $ARGS[0] = 'pregreactstepdad':
 		'Eventually, you get up and wipe your face. You have no choice but to fend for yourself now.'
 		if hour < 19:
 			'As there is still some time left of the day you decide to go apartment hunting. You need to find somewhere to stay as soon as possible.'
-			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		else
 			'It''s too late to look for an apartment today. Instead you decide to look for a place to sleep tonight. You''ll need to go apartment hunting first thing tomorrow.'
-			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
 	elseif npc_rel['A29'] >= 60 and npc_rel['A29'] <= 80 and (pregtalkstepdad = 0 or stepdadSecret = 1):
 		'Before you''re able to finish the second syllable of your step-father''s name, you see the rage building in your mother''s face. She tightens her fist and is visibly shaking, making it clear that she is using all of her might to hinder herself from attacking you...'
@@ -1065,10 +1065,10 @@ if $ARGS[0] = 'pregreactstepdad':
 		'Eventually, you get up and wipe your face. You have no choice but to fend for yourself now.'
 		if hour < 19:
 			'As there is still some time left of the day you decide to go apartment hunting. You need to find somewhere to stay as soon as possible.'
-			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		else
 			'It''s too late to look for an apartment today. Instead you decide to look for a place to sleep tonight. You''ll need to go apartment hunting first thing tomorrow.'
-			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
 	elseif npc_rel['A29'] > 80 and (pregtalkstepdad = 0 or stepdadSecret = 1):
 		'Your mother stares at you in stunned silence as you utter Vladimir''s name. Her knees seem to give out, as she barely manages to hold herself up by leaning on the counter.'
@@ -1094,10 +1094,10 @@ if $ARGS[0] = 'pregreactstepdad':
 		'Eventually, you get up and wipe your face. You have no choice but to fend for yourself now.'
 		if hour < 19:
 			'As there is still some time left of the day you decide to go apartment hunting. You need to find somewhere to stay as soon as possible.'
-			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		else
 			'It''s too late to look for an apartment today. Instead you decide to look for a place to sleep tonight. You''ll need to go apartment hunting first thing tomorrow.'
-			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & minut += 15 & gt 'pod_ezd', 'etaj_2'
+			act 'Continue':momKnowsVladimir = 1 & home_owned[2] = 0 & ParHomeBlock = 1 & minut += 15 & gt 'pod_ezd', 'etaj_2'
 		end
 	end
 end

+ 5 - 5
locations/pavResidential.qsrc

@@ -141,11 +141,11 @@ end
 
 if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''pavResidential'' & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 
-if SchoolBlock = 0:
+!if SchoolBlock = 0:
 	$schoolname = ' and the local <a href="exec: minut += 1 & gt ''gschool_grounds'', ''main''">school</a>.'
-else
-	'.'
-end
+!else
+!	'.'
+!end
 
 'The town surrounds the old palace grounds which are now a large <a href="exec:minut += 5 & gt ''gskver'', ''start''">public park</a>, close to the residential area is the <a href="exec:gt ''glake''">lake</a>.'
 
@@ -179,7 +179,7 @@ else
 end
 !!end of code changes.
 
-if kanikuli = 0 and StoryLine > 0 and SchoolAtestat = 0 and week < 6 and hour >= 4 and hour < 9: act '<font color = green><b>Go to school</b></font>': minut += 1 & gt 'gschool_grounds', 'main'
+if kanikuli = 0 and StoryLine > 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9: act '<font color = green><b>Go to school</b></font>': minut += 1 & gt 'gschool_grounds', 'main'
 
 act 'Go to the high street':minut += 5 & gt 'pavCommercial'
 if home_owned[2] = 1: act '<b>GO HOME</b> (Parents'' Apartment)': minut += 4 & GT 'korrPar'

+ 7 - 7
locations/pod_ezd.qsrc

@@ -1099,8 +1099,8 @@ $housemates = {
 	gs 'stat'
 	 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/housemates.jpg"></center>'
 	'Floor 1 - Apartment number 2: Artem Chebotarev'
-	'Floor 2 - Apartment number 7: your parents								Apartment number 9: Uncle Misha'
-	'Floor 3 - Apartment number 13: Sergey and Vasily Shulgin	 	Apartment number 14: Julia Milova'
+	'Floor 2 - Apartment number 7: your parents							Apartment number 9: Uncle Misha'
+	'Floor 3 - Apartment number 13: Sergey and Vasily Shulgin	 		Apartment number 15: Julia Milova'
 	'Floor 4 - Apartment number 19: Natasha Belova						Apartment number 21: Aunt Luda'
 	'Floor 5'
 	act 'Leave': gt 'pod_ezd', 'etaj_1'
@@ -1178,7 +1178,7 @@ if $ARGS[0] = 'etaj_2':
 	if home_owned[2] = 1:
 		act '<font color = maroon>Your apartment</font>':gt 'korrPar'
 	end
-	act 'Apartment 7: Uncle Misha':
+	act 'Apartment 9: Uncle Misha':
 		cla
 		if hour >= 0 and hour < 5:
 			'It''s too late to visit uncle Misha, he''s probably sleeping now.'
@@ -1218,9 +1218,9 @@ if $ARGS[0] = 'etaj_3':
 	'<<$etaj3_smoke_rnd>>'
 	'<<$pod_ev_rnd>>'
 
-	act 'Apartment number 11: Vasily and Sergei Shulgin':gt 'shulgahome'
+	act 'Apartment number 13: Vasily and Sergei Shulgin':gt 'shulgahome'
 	if BeInJulMilHome = 1: 
-		act 'Apartment number 12: Julia Milova': gt 'JuliaMilVhod'
+		act 'Apartment number 15: Julia Milova': gt 'JuliaMilVhod'
 	end
 	act 'Go down to the second floor': gt 'pod_ezd','etaj_2'
 	act 'Go up to the fourth floor': gt 'pod_ezd','etaj_4'
@@ -1238,10 +1238,10 @@ if $ARGS[0] = 'etaj_4':
 	'<<$pod_ev_rnd2>>'
 	
 	if BeInNatBelHome = 1: 
-		act 'Apartment number 14: Natasha Belova': gt 'NatBelVhod'
+		act 'Apartment number 19: Natasha Belova': gt 'NatBelVhod'
 	end
 
-	act 'Apartment number 16: Aunt Luda': 
+	act 'Apartment number 21: Aunt Luda': 
 		*clr & cla
 		minut +=1
 		gs 'stat'