Browse Source

[changed] put the gate for Albina's home in the albinahome file
[removed] the 36 line file that existed solely for Albina's gate

hornguy6 3 years ago
parent
commit
ffedc55414
3 changed files with 36 additions and 38 deletions
  1. 34 1
      locations/albinahome.qsrc
  2. 0 35
      locations/albinaporog.qsrc
  3. 2 2
      locations/pav_residential.qsrc

+ 34 - 1
locations/albinahome.qsrc

@@ -1,7 +1,40 @@
 # albinahome
 !2020/10/16
 CLOSE ALL
-
+	
+if $ARGS[0] = 'gate':
+	gs 'stat'
+	if hour >= 17 and week < 6 and kanikuli = 0 and hour < 20 or hour >= 9 and week >= 6 and kanikuli = 0 and hour < 20 or hour >= 9 and kanikuli > 0 and hour < 20:
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome.jpg"></center>'
+		if AlbinaQW['StarletsShutDown'] = 0:
+			'You push a button on the intercom and a deep voice crackles through the speaker, asking you to state your name and purpose of your visit.'
+			'You say that you''re here to visit Albina and after a brief wait, the gate opens. "A friend of Albina''s is <i>always</i> welcome here." the voice says with an unsettling chuckle. "Albina is in her room."'
+			act 'Enter the house':gt 'albinahome', 'start'
+		elseif AlbinaQW['AfterFatherCheck'] = 0:
+			!!The first time after Albina exposes her father
+			AlbinaQW['AfterFatherCheck'] = 1
+			'You push a button on the intercom and you''re surprised to hear a somewhat cautious sounding female voice crackle through the speaker as you hear Albina in the background.'
+			'The strange voice asks who you are and when she says your name to Albina, Albina gleefully tells you to excuse her mother''s caution and invites you in. The voice apologises to you as the gate slowly opens.'
+			act 'Enter the house':gt 'albinahome', 'start'
+		else
+			!!From then on
+			'You push a button on the intercom and you hear the familiar voice of Albina''s mother on the other end. You tell her it''s you and she opens the gate.'
+			'"She really enjoys having you come round and visit her you know? It''s good for her to have such a dependable friend to rely on after everything she''s been through." she adds.'
+			act 'Enter the house':gt 'albinahome', 'start'
+		end
+	else
+		if AlbinaQW['StarletsShutDown'] = 0:
+			if hour >= 9:'You push a button on the intercom and the deep voice booms through from the other end. You say that you''re here to visit Albina. "She isn''t here. Come back later." he abruptly replies in an annoyed tone before hanging up.'
+			if hour < 9:'You push a button on the intercom and the voice at the other end says "It''s too early to visit. Come back later."'
+		else
+			!!After Albina exposes her father
+			if hour >= 9:'You push a button on the intercom and a female voice comes through asking who it is. When you say you''re here to see Albina, she tells you that Albina is currently unavailable and you should come back later.'
+			if hour < 9:'You push a button on the intercom and a female voice blasts through. "What kind of ungodly hour do you call this?! Come back later for a social call!" That must have been her mother.'   
+		end
+		act 'Leave':gt 'pav_residential'
+	end
+end
+	
 if $ARGS[0] = 'start':
 	if AlbinaQW['KnowsHouse'] = 0:AlbinaQW['KnowsHouse'] = 1
 	*clr & cla

+ 0 - 35
locations/albinaporog.qsrc

@@ -1,35 +0,0 @@
-# albinaporog
-gs 'stat'
-menu_off = 1
-
-if hour >= 17 and week < 6 and kanikuli = 0 and hour < 20 or hour >= 9 and week >= 6 and kanikuli = 0 and hour < 20 or hour >= 9 and kanikuli > 0 and hour < 20:
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome.jpg"></center>'
-	if AlbinaQW['StarletsShutDown'] = 0:
-		'You push a button on the intercom and a deep voice crackles through the speaker, asking you to state your name and purpose of your visit.'
-		'You say that you''re here to visit Albina and after a brief wait, the gate opens. "A friend of Albina''s is <i>always</i> welcome here." the voice says with an unsettling chuckle. "Albina is in her room."'
-		act 'Enter the house':gt 'albinahome', 'start'
-	elseif AlbinaQW['AfterFatherCheck'] = 0:
-    	!!The first time after Albina exposes her father
-		AlbinaQW['AfterFatherCheck'] = 1
-		'You push a button on the intercom and you''re surprised to hear a somewhat cautious sounding female voice crackle through the speaker as you hear Albina in the background.'
-		'The strange voice asks who you are and when she says your name to Albina, Albina gleefully tells you to excuse her mother''s caution and invites you in. The voice apologises to you as the gate slowly opens.'
-		act 'Enter the house':gt 'albinahome', 'start'
-	else
-		!!From then on
-		'You push a button on the intercom and you hear the familiar voice of Albina''s mother on the other end. You tell her it''s you and she opens the gate.'
-		'"She really enjoys having you come round and visit her you know? It''s good for her to have such a dependable friend to rely on after everything she''s been through." she adds.'
-		act 'Enter the house':gt 'albinahome', 'start'
-	end
-else
-	if AlbinaQW['StarletsShutDown'] = 0:
-		if hour >= 9:'You push a button on the intercom and the deep voice booms through from the other end. You say that you''re here to visit Albina. "She isn''t here. Come back later." he abruptly replies in an annoyed tone before hanging up.'
-		if hour < 9:'You push a button on the intercom and the voice at the other end says "It''s too early to visit. Come back later."'
-	else
-		!!After Albina exposes her father
-		if hour >= 9:'You push a button on the intercom and a female voice comes through asking who it is. When you say you''re here to see Albina, she tells you that Albina is currently unavailable and you should come back later.'
-		if hour < 9:'You push a button on the intercom and a female voice blasts through. "What kind of ungodly hour do you call this?! Come back later for a social call!" That must have been her mother.'   
-	end
-	act 'Leave':gt 'pav_residential'
-end
-
---- albinaporog ---------------------------------

+ 2 - 2
locations/pav_residential.qsrc

@@ -122,14 +122,14 @@ if Enable_tablemap = 0:
 	if IgorLoverQW > 0 and IdorBlock = 0:'<a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>, one of your classmates, lives in one of the fancier houses in town.'
 	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: 'Nearby is a large house where the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a> live.'
 	if LariskaQW['story'] >= 6: '<a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''">Lariska Gruzdev</a>, one of your classmates, lives about 10 minutes away from your parents.'
-	if AlbinaQW['KnowsHouse'] = 1:'<a href="exec:minut += 10 & gt ''albinaporog''">Albina Barlovskaya</a>, one of your classmates, lives in one of the few luxurious mansions Pavlovsk has to offer.'
+	if AlbinaQW['KnowsHouse'] = 1:'<a href="exec:minut += 10 & gt ''albinahome'',''gate''">Albina Barlovskaya</a>, one of your classmates, lives in one of the few luxurious mansions Pavlovsk has to offer.'
 else
 	st_count=0 & $show_table=''
 	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''dimaHome'', ''home''">Dimka Nosov</a>','3'
 	if IgorLoverQW > 0 and IdorBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>', '3'
 	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: gs'show_table','The house of the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a>','3'
 	if LariskaQW['story'] >= 6:gs'show_table','House of <a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''" >Lariska Gruzdev</a> in the richer part of town','3'
-	if AlbinaQW['KnowsHouse'] = 1:gs'show_table','A luxurious mansion that''s home to <a href="exec:minut += 10 & gt ''albinaporog''">Albina Barlovskaya</a>','3'
+	if AlbinaQW['KnowsHouse'] = 1:gs'show_table','A luxurious mansion that''s home to <a href="exec:minut += 10 & gt ''albinahome'',''gate''">Albina Barlovskaya</a>','3'
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 !!end of code changes.