Browse Source

[fixes] missing cla in kotovtalker and some small edits

julzor 5 years ago
parent
commit
bd96a2d455
4 changed files with 10 additions and 7 deletions
  1. 0 1
      locations/FedorEv4.qsrc
  2. 8 5
      locations/ParChurch.qsrc
  3. 1 0
      locations/kotovtalker.qsrc
  4. 1 1
      locations/pavResidential.qsrc

+ 0 - 1
locations/FedorEv4.qsrc

@@ -3531,7 +3531,6 @@ if $ARGS[0] =  'Home Entrance':
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Home Entrance'
 	menu_off = 0
-	minut += 5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/house.jpg"></left>'
 	'Fedor''s house is a bit weathered but still looks quite lovely. This house is but a short walk away from my parents apartment.'

+ 8 - 5
locations/ParChurch.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 		cla
 		'The priest would probably still be mad at you. You decide to avoid him and leave.'
 		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the high street':minut += 10 & gt 'pavCommercial'
+		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
 	exit
 
 	elseif Churchbad = 3 and Churchbadtime <= daystart:
@@ -50,7 +50,7 @@ if $ARGS[0] = 'start':
 	end
 	
 	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the high street':minut += 10 & gt 'pavCommercial'
+	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
 end
 
 if $ARGS[0] = 'vigil':
@@ -152,21 +152,24 @@ if $ARGS[0] = 'liturgy':
 end
 	
 if $ARGS[0] = 'Narthex':
-	*clr & cla
 	CLOSE ALL
-	menu_off = 1
+	$menu_loc = 'ParChurch'
+	$menu_arg = 'Narthex'
+	menu_off = 0
+	*clr & cla
 	gs 'stat'
 	PLAY 'sound/church/76139__dkustic__090227-01-people-church-concert.wav',30
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/enterchurch.jpg"></center>'
 	'You enter the church and the scent of insense and beeswax fills your lungs. Your eyes are drawn past the Narthex into the Nave with its walls covered in lovingly painted icons while a thousand points of light dance in joy throughout God''s house from the magnificent chandelier that hangs from the ceiling.'
 	'To your left as you enter, there is a counter where a deacon sells candles, icons, and prayer books. He smiles and nods at you absently. acknowledging your presence without really seeing you.'
 	
+	act 'Leave the Church': gt 'ParChurch' , 'start'
 	if ((week <= 5 and hour >= 7 and hour < 9) or (hour >= 16 and hour < 18)) and confessday ! daystart:
 		act 'Go to confession': confessday = daystart & gt 'Parchurch2', 'confession'
 	end
 	act 'Light a candle': gt 'ParChurch' , 'candle'
 	act 'Pray': gt 'ParChurch' , 'pray'
-	act 'Leave the Church': gt 'ParChurch' , 'start'
+	
 end
 
 if $ARGS[0] = 'candle':

+ 1 - 0
locations/kotovtalker.qsrc

@@ -86,6 +86,7 @@ if numnpc = 9 and pav_slut < 100 and kotovLoveQW >= 0 and (npc_rel[$static_num]
 			end
 		end
 	else
+		cla
 		'<<$npc_firstname[$static_num]>> "Hey <<$pcs_nickname>>, I''m busy. I''ll catch up with you later." He says as he turns back to talk to his friends.'
 		act 'Continue': gt 'gschool_lessons', 'short_break'
 	end

+ 1 - 1
locations/pavResidential.qsrc

@@ -104,7 +104,7 @@ gs 'stat'
 
 if car > 0 and cardrive = 20: 'Your <a href="exec:gs ''carF'', ''start''">car<<$car>></a> is parked in the street.'
 
-if fedorKozlovQW >= 20 and FedorKozHome = 1 or fedorKozlovQW = -15 and FedorKozHome = 1: '<a href="exec: minut += 5 & gt ''FedorEv4'', ''Home Entrance''">Fedor</a> lives in a house nearby.'
+if fedorKozlovQW >= 20 and FedorKozHome = 1 or fedorKozlovQW = -15 and FedorKozHome = 1: '<br><a href="exec: minut += 5 & gt ''FedorEv4'', ''Home Entrance''">Fedor</a> lives in a house nearby.'
 
 if hour >= 8 and hour <= 22:'<br>At the end of the street, there''s a small <a href="exec:$locM = ''pavResidential'' & gt ''kiosk'', ''start''">kiosk</a> selling a variety of items such as cigarettes, magazines, snacks, drinks and even themes for your phone.'