Browse Source

[fixed] Igor study reconected and coded so study is added by nutluck

Kevin_Smarts 3 years ago
parent
commit
471c6842cd
2 changed files with 83 additions and 83 deletions
  1. 69 65
      locations/gschool_chats1.qsrc
  2. 14 18
      locations/igorhome.qsrc

+ 69 - 65
locations/gschool_chats1.qsrc

@@ -1,5 +1,5 @@
 # gschool_chats1
-!2021/05/02
+!2021/06/17
 	
 if $ARGS[0] = 'dimka':
 	*clr & cla
@@ -176,14 +176,13 @@ if $ARGS[0] = 'igor':
 	if IgorloverQW > 0:
 		npc_rel['A4'] += 1
 		'When Igor sees you, his face lights up and he smiles warmly. "I was hoping I''d see you. I, uh, kinda missed you..." he says shyly and it makes you giggle. While you talk with each other, his warm hand finds yours.'
-
-		!!act 'Help with homework':
-		!!	*clr & cla
-		!!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
-		!!	'Igor is almost offended that you''d even have to ask that. "What kind of boyfriend would I be if I didn''t help my girlfriend?" he chuckles. "Of course I''ll help you."'
-		!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-		!!end
-		
+		act 'Help with homework':
+			*clr & cla
+			igor_history = 1
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
+			'Igor is almost offended that you''d even have to ask that. "What kind of boyfriend would I be if I didn''t help my girlfriend?" he chuckles. "Of course I''ll help you."'
+			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+		end
 		if igorstrap = 1:
 			act 'Tease him':
 				*clr & cla
@@ -204,14 +203,15 @@ if $ARGS[0] = 'igor':
 					'You pat him on the cheek. "Trust me, I know a place and no one will ever find out." He thinks on it for a moment and then finally nods.'
 					act 'Take him somewhere private': gt 'gschool_chats1', 'igor_peg'
 				end
-				!!act 'Help with homework':
-				!!	*clr & cla
-				!!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
-				!!	'"Oh... yeah I can help you with your homework..." Igor smiles but glances down and shuffles a bit restlessly.'
-				!!	'You smirk and lean in closer. "Don''t look so disappointed. Who knows, the quicker we finish with that, the more time we have for <i>other</i> things."'
-				!!	'Hearing this, Igor''s eyes widen and his cheeks flush as he tries to play it cool, but you notice how he''s suddenly more excited.'
-				!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-				!!end
+				act 'Help with homework':
+					*clr & cla
+					igor_history = 1
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
+					'"Oh... yeah I can help you with your homework..." Igor smiles but glances down and shuffles a bit restlessly.'
+					'You smirk and lean in closer. "Don''t look so disappointed. Who knows, the quicker we finish with that, the more time we have for <i>other</i> things."'
+					'Hearing this, Igor''s eyes widen and his cheeks flush as he tries to play it cool, but you notice how he''s suddenly more excited.'
+					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+				end
 			end
 		else
 			'You remain holding hands and chatting until break is over. With a smile, you give him a quick kiss goodbye.'
@@ -222,21 +222,23 @@ if $ARGS[0] = 'igor':
 		if grupTipe = 1:
 			'You know he doesn''t have many friends, so he''s more than happy that you want to hang out with him. Unlike most boys, Igor is really attentive and listens to everything you say, even taking an interest in the more "girly" topics.'
 			'"Oh, it''s not that weird." Igor blushes a bit. "I have a sister, so I hear about these things all the time..."'
-			!!act 'Help with homework':
-			!!	*clr & cla
-			!!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
-			!!	'Igor''s face lights up. "Yeah, of course I''ll help you."'
-			!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			!!end
+			act 'Help with homework':
+				*clr & cla
+				igor_history = 1
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
+				'Igor''s face lights up. "Yeah, of course I''ll help you."'
+				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			end
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		else
 			'As usual, Igor is hanging around Dimka, but he pays closer attention to you. With a smile, he asks you how your day has been so far and before long you''re talking about all kinds of things, even taking an interest in the more "girly" topics.'
-			!!act 'Help with homework':
-			!!	*clr & cla
-			!!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
-			!!	'"Oh, you need my help?" Igor asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I''ll help you."'
-			!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			!!end
+			act 'Help with homework':
+				*clr & cla
+				igor_history = 1
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
+				'"Oh, you need my help?" Igor asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I''ll help you."'
+				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			end
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif npc_rel['A4'] >= 50 and pav_slut < 200:
@@ -244,65 +246,67 @@ if $ARGS[0] = 'igor':
 		if grupTipe = 1:
 			'You know he doesn''t have many friends, so he''s more than happy that you want to hang out with him. Unlike most boys, Igor is really attentive and listens to everything you say, even taking an interest in the more "girly" topics.'
 			'"Oh, it''s not that weird." Igor blushes a bit. "I have a sister, so I hear about these things all the time..."'
-			!!act 'Help with homework':
-			!!	*clr & cla
-			!!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
-			!!	'Igor''s face lights up. "Yeah, of course I''ll help you."'
-			!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			!!end
+			act 'Help with homework':
+				*clr & cla
+				igor_history = 1
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
+				'Igor''s face lights up. "Yeah, of course I''ll help you."'
+				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			end
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		else
 			'As usual, Igor is hanging around Dimka, but he pays closer attention to you. With a smile, he asks you how your day has been so far and before long you''re talking about all kinds of things, even taking an interest in the more "girly" topics.'
-			!!act 'Help with homework':
-			!!	*clr & cla
-			!!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
-			!!	'"Oh, you need my help?" Igor asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I''ll help you."'
-			!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			!1end
+			act 'Help with homework':
+				*clr & cla
+				igor_history = 1
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
+				'"Oh, you need my help?" Igor asks curiously, a bit surprised that you would ask him of all people. After a moment, he smiles and nods. "Yeah, of course I''ll help you."'
+				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			end
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif npc_rel['A4'] <= 20 and pav_slut < 200:
 		npc_rel['A4'] += 1
 		if grupTipe = 1:
 			'The conversation feels forced as Igor makes almost no effort to talk to you. You get the feeling he''s just doing this as a courtesy since you''re in the same clique.'
-			!!act 'Help with homework':
-			!!	*clr & cla
-			!!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
-			!!	'Igor hesitates, making the whole encounter extremely awkward. "I would... but I can''t. I''ve got... other things I need to do."'
-			!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			!!end
+			act 'Help with homework':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
+				'Igor hesitates, making the whole encounter extremely awkward. "I would... but I can''t. I''ve got... other things I need to do."'
+				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			end
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		else
 			npc_rel['A4'] += 1
 			'"Uh, hello?" Igor is unamused to see you and completely ignores you as you try to keep a one-sided conversation going. Eventually, he just walks away without saying a word.'
-			!!act 'Help with homework':
-			!!	*clr & cla
-			!!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
-			!!	'"No." Igor says flatly as he slams his locker closed and walks away.'
-			!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			!!end
+			act 'Help with homework':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
+				'"No." Igor says flatly as he slams his locker closed and walks away.'
+				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			end
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif pav_slut >= 200:
 		'Igor is hanging with Dimka, Stasya, and Bella when you approach. The others are quick to throw some insults your way, but Igor hesitates. It isn''t until Stasya puts him on the spot for being so silent that he finally speaks up to agree with the rest of the group. "I''m surprised the gopniks are finished with her so early. Must have had another cocksleeve waiting for them, or maybe she''s just gotten too loose."'
-		!!act 'Help with homework':
-		!!	*clr & cla
-		!!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
-		!!	'Igor can''t help but laugh a bit at your request. "Of course you''re behind on your work. Maybe if you spent less time whoring around..." He doesn''t finish the sentence before walking away with a look of disgust.'
-		!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-		!!end
+		act 'Help with homework':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
+			'Igor can''t help but laugh a bit at your request. "Of course you''re behind on your work. Maybe if you spent less time whoring around..." He doesn''t finish the sentence before walking away with a look of disgust.'
+			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+		end
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	else 
 		npc_rel['A4'] += 1
 		'"Hey Igor, what are you doing?" you ask as you see him looking around for someone.'
 		'Igor kind of shrugs. "Just waiting for Dimka."'
 		'The two of you spend some time chatting while he waits for Dimka. Eventually he shows up and Igor is ready to leave. "Maybe we can talk some other time?" he says with a small smile as he waves goodbye.'
-		!!act 'Help with homework':
-		!!	*clr & cla
-		!!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
-		!!	'Igor smiles apologetically. "I would but I''ve kinda got my hands full at the moment. Maybe some other time?"'
-		!!	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-		!!end
+		act 'Help with homework':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
+			'Igor smiles apologetically. "I would but I''ve kinda got my hands full at the moment. Maybe some other time?"'
+			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+		end
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	end
 end

+ 14 - 18
locations/igorhome.qsrc

@@ -1,5 +1,5 @@
 # igorhome
-!2021/05/02
+!2021/06/17
 !!Igor = A4
 close all
 if $ARGS[0] = 'entrance':
@@ -46,19 +46,18 @@ if $ARGS[0] = 'entrance':
 		'As you walk towards Igor''s house, he starts having second thoughts "<<$pcs_firstname>>, you know I love you very much, but we don''t know each other well enough, so I''m wondering if we should let it be."'
 		act 'Leave': gt 'pav_residential'
 	end
-	!!this one is if Igor is a tutor in history
-	! if igor_history = 1:
-		! 'Igor is waiting for you after school. As you approach he asks you, "You ready to go?"'
-		! act 'Go to Igor''s house':
-			! cls
-			! minut += 15
-			! gs 'stat'
-			! '<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homeb1.jpg"></center>'
-			! 'You follow Igor home. Once you get to his place, he unlocks the door and invites you in.'
-			! act 'Walk around his home': gt 'igorhome','hallway'
-			! act 'Go to his room': gt 'igorhome', 'igorroom'
-		! end
-	! end
+	if igor_history = 1:
+		'Igor is waiting for you after school. As you approach he asks you, "You ready to go?"'
+		act 'Go to Igor''s house':
+			cls
+			minut += 15
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_homeb1.jpg"></center>'
+			'You follow Igor home. Once you get to his place, he unlocks the door and invites you in.'
+			act 'Walk around his home': gt 'igorhome','hallway'
+			act 'Go to his room': gt 'igorhome', 'igorroom'
+		end
+	end
 end
 
 if $ARGS[0] = 'hallway':
@@ -80,7 +79,6 @@ if $ARGS[0] = 'hallway':
 	act 'Living Room': gt 'igorhome','livingroom'
 	act 'Kitchen': gt 'igorhome','kitchen'
 	act 'Parents Room': gt 'igorhome','igorparents'
-!!going to add the parents bedroom, living room and kitchen. They will be down below, they will need to be moved where you want and coded of course.
 end
 
 if $ARGS[0] = 'bathroom':
@@ -117,9 +115,7 @@ if $ARGS[0] = 'igorroom':
 	'The room is surprisingly clean and organized for a boys room. It is fairly tastefully decorated. In the center of the room against one wall is a single narrow bed. Against the opposite wall is a desk and a chair, with a computer sitting on the desk. Next to the desk is a book shelf with a fairly large collection of books, just below the shelves leaning against the wall rests a guitar.'
 
 	act 'Leave Igor''s room': gt 'igorhome','hallway'
-	!!This one I think is if he is dating Dima, not sure.
-	if DimaLoveIgor > 1:'Sitting on the bed is a Teddy Bear with a red heart in its little hands.'
-	!!if igor is home the following is added.
+	if DimaLoveIgor > 1:'Sitting on the bed is a Teddy Bear with a red heart in its little hands.'.
 	'You see Igor sitting on the edge of his bed.'
 	act 'Excuse yourself': gt 'igorhome','hallway'
 	act 'Study': gt 'igorhome','study'