Merge remote-tracking branch 'Anya/master'

locations/gschool_chats1.qsrc

@@ -1,5 +1,5 @@
 # gschool_chats1
-!2021/05/02
+!2021/06/17
 	
 if $ARGS[0] = 'dimka':
 	*clr & cla
@@ -170,19 +170,18 @@ if $ARGS[0] = 'igor':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
-	!!act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-	!! The event is confusing because it has no effect. 
-	!!Somebody really wanted Igor to help with homework. This whole conversation chain could use a revamp. - Alaratt 2/14/2021
+	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	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':
@@ -204,106 +203,102 @@ 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.'
-			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif npc_rel['A4'] >= 50 and trait['loveable_slut'] > 0:
 		npc_rel['A4'] += 1
 		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 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			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
 		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 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			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
 		end
 	elseif npc_rel['A4'] >= 50 and fame['pav_slut'] < 200:
 		npc_rel['A4'] += 1
 		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 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			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
 		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 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			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
 		end
 	elseif npc_rel['A4'] <= 20 and fame['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 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			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
 		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 'Time for the next class': gt 'gschool_lessons', 'short_break'
+			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
 		end
 	elseif fame['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 'Time for the next class': gt 'gschool_lessons', 'short_break'
+		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
 	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 'Time for the next class': gt 'gschool_lessons', 'short_break'
+		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
 	end
 end
 
@@ -538,50 +533,57 @@ if $ARGS[0] = 'Katjaproblems':
 end
 
 
-
-
 if $ARGS[0] = 'albina':
 	*clr & cla
 	menu_off = 1
+	temp = rand(1, 5)
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0:
-		'Albina offers you a friendly smile. "<<$pcs_nickname>>! You''re progressing very well in your training. Don''t forget to keep attending practice!"'
-	end
-	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-	if AlbinaQW['Friends'] = 1:
-		AlbinaQW['Friends'] = 2
-		npc_rel['A23'] = 100
-		'Albina smiles gratefully at you. "I just wanted to thank you again <<$pcs_nickname>>. It''s like they say, ''a friend in need is a friend indeed'' or something stupid like that. I''m letting you know that I''m disbanding the Starlets as well. Too many bad memories you know?" You tell her you understand and she embraces you in a tight hug before composing herself, staring down anyone looking at her with a cold glare.'
-	elseif npc_rel['A23'] >= 50 and fame['pav_slut'] < 200:
-		npc_rel['A23'] += 1
-		if AlbinaQW['Friends'] = 2:
-		    'You have a pleasant conversation with Albina where you both talk about almost anything, but you are careful not to bring up the Starlets or anything else that might upset her. The conversation ends with Albina embracing you in a tight and extended hug.'
-		elseif grupTipe = 1 or grupTipe = 2:
-			'Albina has a somewhat friendly, yet awkward conversation with you. You both talk about your shared interests, but when you bring up family life she fiercely avoids the subject, eventually refusing to speak with you anymore and storming off.'
+	if AlbinaQW['Friends'] = 2 and npcsex['A23'] = >= 1 and albina_schoolsex ! daystart and temp = 5:
+		albina_schoolsex = daystart
+		if school_period = 2:
+			gt 'albina_school_sex', 'break_fun_1'
 		else
-			'Albina spends a lot of the conversation with her arms crossed and makes no effort to hide her boredom. She doesn''t dislike you, but you think she''s just tolerating your presence and humouring you with conversation.'
+			gt 'albina_school_sex', 'lunch_fun_1'
 		end
-	elseif npc_rel['A23'] <= 20 and fame['pav_slut'] < 200:	
-		npc_rel['A23'] += 1
-		if grupTipe = 1 or grupTipe = 2:
-			'"Hey Albina, how are things?" you ask her with a smile.'
-			'Albina just rolls her eyes. "Like you actually care." she says before shoving you aside and walking away. You swear you hear her calling you a ''fake bitch'' under her breath.'
-		else
-			'"Hey Albina, how are things?" you ask her with a smile.'
-			'"Is this some kind of fucking joke?" she growls before she grabs you, shoves you against one of the lockers and glares at you. "Who put you up to this!?" she snarls. The rest of the group watch, stunned by her outburst.'
-			'"No... Nobody? I just wanted to talk..." you sheepishly reply, but her tightening grip on you and her angry demeanor tell you that she doesn''t believe you. You try buttering her up with compliments, but she isn''t interested in your grovelling. She gets up in your face and tells you to stay away from her before releasing you and storming off, the others being smart enough not to follow her.' 
+	else
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
+		if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0:
+			'Albina offers you a friendly smile. "<<$pcs_nickname>>! You''re progressing very well in your training. Don''t forget to keep attending practice!"'
+		end
+		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+		if AlbinaQW['Friends'] = 1:
+			AlbinaQW['Friends'] = 2
+			npc_rel['A23'] = 100
+			'Albina smiles gratefully at you. "I just wanted to thank you again <<$pcs_nickname>>. It''s like they say, ''a friend in need is a friend indeed'' or something stupid like that. I''m letting you know that I''m disbanding the Starlets as well. Too many bad memories you know?" You tell her you understand and she embraces you in a tight hug before composing herself, staring down anyone looking at her with a cold glare.'
+		elseif npc_rel['A23'] >= 50 and fame['pav_slut'] < 200:
+			npc_rel['A23'] += 1
+			if AlbinaQW['Friends'] = 2:
+				'You have a pleasant conversation with Albina where you both talk about almost anything, but you are careful not to bring up the Starlets or anything else that might upset her. The conversation ends with Albina embracing you in a tight and extended hug.'
+			elseif grupTipe = 1 or grupTipe = 2:
+				'Albina has a somewhat friendly, yet awkward conversation with you. You both talk about your shared interests, but when you bring up family life she fiercely avoids the subject, eventually refusing to speak with you anymore and storming off.'
+			else
+				'Albina spends a lot of the conversation with her arms crossed and makes no effort to hide her boredom. She doesn''t dislike you, but you think she''s just tolerating your presence and humouring you with conversation.'
+			end
+		elseif npc_rel['A23'] <= 20 and fame['pav_slut'] < 200:	
+			npc_rel['A23'] += 1
+			if grupTipe = 1 or grupTipe = 2:
+				'"Hey Albina, how are things?" you ask her with a smile.'
+				'Albina just rolls her eyes. "Like you actually care." she says before shoving you aside and walking away. You swear you hear her calling you a ''fake bitch'' under her breath.'
+			else
+				'"Hey Albina, how are things?" you ask her with a smile.'
+				'"Is this some kind of fucking joke?" she growls before she grabs you, shoves you against one of the lockers and glares at you. "Who put you up to this!?" she snarls. The rest of the group watch, stunned by her outburst.'
+				'"No... Nobody? I just wanted to talk..." you sheepishly reply, but her tightening grip on you and her angry demeanor tell you that she doesn''t believe you. You try buttering her up with compliments, but she isn''t interested in your grovelling. She gets up in your face and tells you to stay away from her before releasing you and storming off, the others being smart enough not to follow her.' 
+			end
+		elseif fame['pav_slut'] >= 150:
+			'Albina just stares at you in disbelief. "There''s some <i>nasty</i> rumors about you going around school. Everyone is saying you''re a cock hungry whore! How can you live like that - just letting guys... use you like that?"'
+			'You are about to speak up, but she shakes her head and walks away. You can''t tell if she was feeling disgusted or disappointed at you. She might even have been both.'
+		else 
+			npc_rel['A23'] += 1
+			'Your conversation, if you can call it that, with Albina is shallow and is over after only a minute or two as she excuses herself.'
+			'"You know my... father... cares... a lot..." She trails off before walking away. You''re certain that you hear her holding back tears as she does, but you don''t want to push it and anger her.'
+			'She outright refuses to speak about her home life, her father in particular, and more than a few people have been on the receiving end of her wrath when they press her about the subject.'
 		end
-	elseif fame['pav_slut'] >= 150:
-		'Albina just stares at you in disbelief. "There''s some <i>nasty</i> rumors about you going around school. Everyone is saying you''re a cock hungry whore! How can you live like that - just letting guys... use you like that?"'
-		'You are about to speak up, but she shakes her head and walks away. You can''t tell if she was feeling disgusted or disappointed at you. She might even have been both.'
-	else 
-		npc_rel['A23'] += 1
-		'Your conversation, if you can call it that, with Albina is shallow and is over after only a minute or two as she excuses herself.'
-		'"You know my... father... cares... a lot..." She trails off before walking away. You''re certain that you hear her holding back tears as she does, but you don''t want to push it and anger her.'
-		'She outright refuses to speak about her home life, her father in particular, and more than a few people have been on the receiving end of her wrath when they press her about the subject.'
 	end
-	
 end
 
 if $ARGS[0] = 'lizaveta':