Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/anushapt.qsrc

@@ -1374,6 +1374,7 @@ if $ARGS[0] = 'livingroom':
 				'"Can''t really say that about the rest of them. That Arkadi kid reminds me of a friend I used to know when I was younger. He had some temper problems and would often get in fights. Don''t get me started on Radomir, that good for nothing lout. I''m glad you''re standing up to him though, Nush." The last bit he says to his daughter before turning his attention back to you.'
 				'He looks you over for a moment, but not in a lustful way. He''s looking to see what kind of person you are. "You go to school with my daughter." he asks.'
 			end
+			seenEd = 1
 			act 'Yes':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/eduard.jpg"></center>'

locations/gschool_lessonsev1.qsrc

@@ -1184,12 +1184,12 @@ if $ARGS[0] = 'computer':
 					'You sit next to Zinaida. She avoids making eye contact with you and instead focuses on playing a game on her phone before class starts.'
 				else
 					if grupTipe = 3:
-						npc_rel['A16'] += 1
+						gs 'npc_relationship', 'modify', 'A142', 'like'
 						'You sit next to Zinaida and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Ivanov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
 					elseif grupTipe = 5:
 						'You sit next to Zinaida, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
 					else
-						npc_rel['A16'] += 1
+						gs 'npc_relationship', 'modify', 'A142', 'like'
 						'You sit next to Zinaida. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Ivanov asks you to be quiet.'
 					end
 				end

locations/gschool_lessonsev3.qsrc

@@ -1593,12 +1593,12 @@ if $ARGS[0] = 'art':
 					'You sit next to Zinaida. She avoids making eye contact with you and instead focuses on playing a game on her phone before class starts.'
 				else
 					if grupTipe = 3:
-						npc_rel['A16'] += 1
+						gs 'npc_relationship', 'modify', 'A142', 'like'
 						'You sit next to Zinaida and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
 					elseif grupTipe = 5:
 						'You sit next to Zinaida, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
 					else
-						 npc_rel['A16'] += 1
+						 gs 'npc_relationship', 'modify', 'A142', 'like'
 						 'You sit next to Zinaida. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Vasilyev asks you to be quiet.'
 					end
 				end

locations/sister_chat.qsrc

@@ -500,6 +500,7 @@ if $ARGS[0] = 'sister_chat':
 					act 'Move away': gt $loc, $loc_arg
 				end
 			end
+			act 'Move away': gt $loc, $loc_arg
 		elseif npc_rel['A33'] < 40:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
 			'You try to talk to your sister, but she just cuts you off bluntly.'
@@ -513,6 +514,7 @@ if $ARGS[0] = 'sister_chat':
 					act 'Move away': gt $loc, $loc_arg
 				end
 			end
+			act 'Move away': gt $loc, $loc_arg
 		!! If you have piercings in that your sister doesn''t know about:
 		elseif pirsA > 0 and pirsA < 10000 and sisterQW['pirsA'] = 0 and sisterpirsadaytalk ! daystart and $loc = 'bedrPar':
 			sisterpirsadaytalk = daystart