소스 검색

Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'

Kevin_Smarts 2 년 전
부모
커밋
3ac4e3c744
1개의 변경된 파일7개의 추가작업 그리고 0개의 파일을 삭제
  1. 7 0
      locations/gschool_chats1.qsrc

+ 7 - 0
locations/gschool_chats1.qsrc

@@ -1537,11 +1537,16 @@ if $ARGS[0] = 'ivan':
 			'You nod at what Ivan says. "Sure Ivan I understand, I am OK with just being friends, really close friends who sometimes fool around in the shower." you say in your best sexy voice with a wink.'
 			'You nod at what Ivan says. "Sure Ivan I understand, I am OK with just being friends, really close friends who sometimes fool around in the shower." you say in your best sexy voice with a wink.'
 			'He gives you a one armed hug. "<<$pcs_nickname>> you''re the best! Not only are you smoking hot, but you are a super cool chick too! If you want to hang out some time, you can stop by my place." He pauses a moment and then looks around and leans in close. "Or if you get a little bored during lunch break, you can let me know too." he says with a suggestive tone and waggled eyebrows.'
 			'He gives you a one armed hug. "<<$pcs_nickname>> you''re the best! Not only are you smoking hot, but you are a super cool chick too! If you want to hang out some time, you can stop by my place." He pauses a moment and then looks around and leans in close. "Or if you get a little bored during lunch break, you can let me know too." he says with a suggestive tone and waggled eyebrows.'
 			'You laugh at his silly antics. It is nice to have found a fun guy to hang out with. Perhaps you will stop by his place, or maybe even take him up on his offer to make lunch break less boring. "Sure Ivan, I''ll think about it."'
 			'You laugh at his silly antics. It is nice to have found a fun guy to hang out with. Perhaps you will stop by his place, or maybe even take him up on his offer to make lunch break less boring. "Sure Ivan, I''ll think about it."'
+			
+			if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
+
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			act 'Tell him you''re bored right now':gt 'gdksport', 'Ivan_bored'
 			act 'Tell him you''re bored right now':gt 'gdksport', 'Ivan_bored'
 		end
 		end
 	elseif IvanShowerQW = 11 and IvanShowerYes = 1:
 	elseif IvanShowerQW = 11 and IvanShowerYes = 1:
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+		if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
+
 		if rand(0,4) = 0:
 		if rand(0,4) = 0:
 			'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
 			'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/school/ivan2.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/school/ivan2.jpg"></center>'
@@ -1567,6 +1572,7 @@ if $ARGS[0] = 'ivan':
 		end
 		end
 	elseif npc_rel['A3'] >= 50 and fame['pav_slut'] < 250:
 	elseif npc_rel['A3'] >= 50 and fame['pav_slut'] < 250:
 		npc_rel['A3'] += 1
 		npc_rel['A3'] += 1
+		if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
 		if grupTipe = 2:
 		if grupTipe = 2:
 			'"Hi, Ivan. I wanted to ask you if you could show me some boxing pointers some day?" you ask.'
 			'"Hi, Ivan. I wanted to ask you if you could show me some boxing pointers some day?" you ask.'
 			'"I guess, but you better be ready. I''m a tough coach." You notice a little smile.'
 			'"I guess, but you better be ready. I''m a tough coach." You notice a little smile.'
@@ -1587,6 +1593,7 @@ if $ARGS[0] = 'ivan':
 		end
 		end
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	elseif fame['pav_slut'] >= 250:
 	elseif fame['pav_slut'] >= 250:
+		if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
 		'"So hold up Ivan. I need to talk to you..." You step in front of him.'
 		'"So hold up Ivan. I need to talk to you..." You step in front of him.'
 		'Ivan stops and gives you a confused look. "Why are you talking to me? I don''t really have anything to say to you."'
 		'Ivan stops and gives you a confused look. "Why are you talking to me? I don''t really have anything to say to you."'
 		'"Come on, don''t be like that... I thought we could have some fun..." You give him a wink.'
 		'"Come on, don''t be like that... I thought we could have some fun..." You give him a wink.'