Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'

locations/katja_lake.qsrc

@@ -2,7 +2,7 @@
 !!2022/28/01
 !!This file include the activities that Katja and the player character can do when hanging out at the pavlovsk lake.
 
-if ARGS[0] = 'start':
+if $ARGS[0] = 'start':
 	*clr & cla
 	$loc = 'katja_lake'
 	$loc_arg = 'start'

locations/pav_beach_chat.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0] = 'beach_hangout':
 
 		i = 1
 		:beachjock_loop
-			if npc_grupTipe['A<<i>>'] = 2:
+			if npc_grupTipe['A<<i>>'] = 2 and i ! 141:
 				if i2 = 0: '<tr>'
 				i2 += 1
 				'<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_beach_chat'', ''jocks_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A<<i>>'']>></td></tr></table></td>'
@@ -263,6 +263,7 @@ if $ARGS[0] = 'albina':
 	minut += 20
 	gs 'npc_relationship', 'modify', 'A23', 'like'
 	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/beach_chat.jpg"></center>'
 	if AlbinaQW['Friends'] = 1:
 		AlbinaQW['Friends'] = 2
 		gs 'npc_relationship', 'set', 'A23', 100
@@ -300,6 +301,7 @@ if $ARGS[0] = 'albina':
 			'"I just wanted to talk is all," you reply and she sighs and begrudgingly starts chatting with you. She spends a lot of the conversation with her arms crossed and makes no effort to hide her boredom. It''s obvious that she''s just tolerating your presence and humouring you with a conversation she doesn''t actually care about.'
 		end
 	end
+	act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
 end
 
 if $ARGS[0] = 'lina':
@@ -420,7 +422,6 @@ if $ARGS[0] = 'dimka':
 	gs 'npc_relationship', 'modify', 'A1', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/beach_chat.jpg"></center>'
-	act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
 	if grupTipe = 1:
 		if npc_rel['A1'] >= 50:
 			'"Just the person I was hoping to see!" he smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would''ve loved it out there. It really made me realize we''re wasting away out here in a place like this." You then chat about the other places he has visited.'
@@ -465,6 +466,7 @@ if $ARGS[0] = 'dimka':
 			'He looks around like this is a common burden. "Of course you did, everyone does. Now that I''ve made your day you can go do... whatever it is you people do." You try talking to him, but he acts like he is barely tolerating you, like a Tsar might a peasant in his court.'
 		end
 	end
+	act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
 end
 
 if $ARGS[0] = 'igor':
@@ -475,7 +477,6 @@ if $ARGS[0] = 'igor':
 	gs 'npc_relationship', 'modify', 'A4', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/beach_chat.jpg"></center>'
-	act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
 	if IgorLoverQW > 0:
 		'When Igor sees you, his face lights up and he smiles warmly. "I was hoping I''d see you. I, uh, kind of missed you..." he says shyly and it makes you giggle. While you talk with each other, his warm hand finds yours.'
 		act 'Just chat with him':
@@ -532,6 +533,7 @@ if $ARGS[0] = 'igor':
 			'He swallows and looks a little afraid. "No... no of course not." You talk for a few minutes, but you can tell he is afraid of you, like he is expecting you to bully him in some manner. He looks relived upon seeing Dimka and rushes over to him. "Uh, I''ve got to go. See you later."'
 		end
 	end
+	act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
 end
 
 if $ARGS[0] = 'katja':
@@ -542,7 +544,6 @@ if $ARGS[0] = 'katja':
 	gs 'npc_relationship', 'modify', 'A14', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/beach_chat.jpg"></center>'
-	act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
 	if katjaQW['drunk_help'] = 1:
 		act 'Thank her for taking you home':
 			*clr & cla
@@ -592,6 +593,7 @@ if $ARGS[0] = 'katja':
 			'With Katja being a quiet girl, she doesn''t do much talking and often avoids eye contact with you. You get the feeling she''d open up more if you were closer, but for now you''ll have to settle with this.'
 		end
 	end
+	act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
 end
 
 if $ARGS[0] = 'bella':
@@ -748,7 +750,6 @@ if $ARGS[0] = 'andrey':
 	gs 'npc_relationship', 'modify', 'A147', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/andrey/beach_chat.jpg"></center>'
-	act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
 	if grupTipe = 1:
 		if npc_rel['A147'] >= 50:
 			'"Do you think Stasya will ever get over this whole... jealousy thing she has for Marcus?" Andrey confides in you with a look of exhaustion.'
@@ -802,6 +803,7 @@ if $ARGS[0] = 'andrey':
 			'He gives you a slightly confused look as to why you''re talking to him. "Why are you talking to me? We''re not friends, so go bother someone else." He proceeds to ignore you and you can feel everyone else staring at you.'
 		end
 	end
+	act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
 end
 
 if $ARGS[0] = 'mefodiy':
@@ -912,7 +914,7 @@ if $ARGS[0] = 'stasya':
 	act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
 end
 
-if $ARGS[0] = 'irina':
+if $ARGS[0] = 'inna':
 	*clr & cla
 	menu_off = 1
 	minut += 20