Merge branch 'master' into Edited-QSP9

locations/FedorMisc.qsrc

@@ -72,7 +72,7 @@ if $ARGS[0] = 'Fedor Chat':
 	else
 		act 'Move away': gt 'pav_disco_classmates', 'classmates'
 	end
-	
+
 	act 'Chat':
 		*clr & cla
 		npc_rel['A5'] += rand(5,10)
@@ -552,14 +552,14 @@ if $ARGS[0] = 'Fedor Workout':
 	gs 'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/gym/fedor.jpg"></center>'
-	if $ARGS[1] = 'workout_date': 
+	if $ARGS[1] = 'workout_date':
 		'Fedor gives you a warm smile after he has finished his warm up. "What do you want to do?."'
 	else
 		'You can see Fedor on his phone by some of the punching bags and as you approach, he lowers his phone then he flashes you a warm smile. "<<$pcs_firstname>> It''s always good to see you. Are you here to workout? or are you waiting for someone?" You reply, "I''m just keeping fit. I wanna look good for my handsome boyfriend." Fedor gives you a warm smile as he responds, "I''ve just been doing some warm ups. You can join me for some workouts, if you like."'
 
 		act 'I can''t right now but maybe later':gt 'gdksport', 'start'
 	end
-	
+
 	act 'Build strength':
 		*clr & cla
 		FedorWorkout = 1
@@ -597,7 +597,7 @@ if $ARGS[0] = 'Fedor Workout':
 			end
 		end
 	end
-	
+
 	act 'Increase endurance':
 		*clr & cla
 		FedorWorkout = 3
@@ -841,7 +841,7 @@ if $ARGS[0] = 'Outcast Intro':
 				minut += 5
 				FedorOutcast = 1
 				fedormasha = 0
-				$npc_notes[5] = 'Ever since Fedor gave Vasily a blowjob in the school courtyard, everyone calls him Masha but to you, he will always be Fedor.'
+				$npc_notes['A5'] = 'Ever since Fedor gave Vasily a blowjob in the school courtyard, everyone calls him Masha but to you, he will always be Fedor.'
 				gs 'stat'
 				'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/Outcast/outcast2.jpg"></center>'
@@ -880,7 +880,7 @@ if $ARGS[0] = 'Outcast':
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/Outcast/outcast1.jpg"></center>'
 			'You walk up to Fedor and he immediately turns to face you with a very welcoming smile on his face. "Hello <<$pcs_firstname>>, I''ve been reflecting on what we spoke about last time and I really need to thank you for cheering me up. I really needed that." You place your hand on his shoulder. "It was the least I can do Fedor." Fedor rubs your hand on his shoulder while still keeping his welcoming smile intact as he asks "So, is there anything I can do for you?" You wrap your fingers around his as you reply, "Fedor I... I just... I can''t stop thinking of you Fyodor. I need you in my life. Will you please take me back." Fedor replies with a shocked look on his face "If we hooked up again then Viktor will tear me apart. I''m just not strong enough to deal with him. I''m sorry."'
-			
+
 			act 'Continue':
 				*clr & cla
 				gs 'stat'
@@ -907,7 +907,7 @@ if $ARGS[0] = 'Outcast':
 				end
 				act 'I need some time to think about it':gt 'pav_park', 'start'
 			end
-		end	
+		end
 	elseif fedorKozlovQW = -15:
 		act 'Ask out on a date':
 			*clr & cla

locations/NikoEv.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'Intro':
 		NikoIntro = 1
 		gs'stat'
 		'As you are walking out of school, you bump into one of your schoolmates Niko Volkov, who immediately gives you a warm smile. "Hello there, My name is Niko Volkov, may I ask you your name?"'
-		act 'I am <<$pcs_firstname>>':	
+		act 'I am <<$pcs_firstname>>':
 			*clr & cla
 			if npc_rel['A189'] < 50:npc_rel['A189'] = 50
 			NikoLuv += 2
@@ -26,9 +26,9 @@ if $ARGS[0] = 'Intro':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'
-			'You return the smile as you reply. "Hello yourself, my name is <<$pcs_firstname>>. Nice to meet you." Niko responds "Ahh <<$pcs_firstname>> what a beautiful name, very suitable for you. I need to get going but I am always available at lunchtime and would be very grateful, if you would grace me with your presence." He then gently grabs onto your fingers then raises it to his face before giving your hand a gentlkiss. "Goodbye for now <<$pcs_firstname>>, I look forward to seeing you again." Niko then waves to you as he walks away.'		
+			'You return the smile as you reply. "Hello yourself, my name is <<$pcs_firstname>>. Nice to meet you." Niko responds "Ahh <<$pcs_firstname>> what a beautiful name, very suitable for you. I need to get going but I am always available at lunchtime and would be very grateful, if you would grace me with your presence." He then gently grabs onto your fingers then raises it to his face before giving your hand a gentlkiss. "Goodbye for now <<$pcs_firstname>>, I look forward to seeing you again." Niko then waves to you as he walks away.'
 
-			act 'Leave':gt 'gschool_grounds', 'main'	
+			act 'Leave':gt 'gschool_grounds', 'main'
 		end
 		act 'Beat it!':
 			*clr & cla
@@ -38,10 +38,10 @@ if $ARGS[0] = 'Intro':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'
-			'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. "Why was he so calm? What is it with that guy?" Before shaking your head and walking away.'	
+			'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. "Why was he so calm? What is it with that guy?" Before shaking your head and walking away.'
 			act 'Leave':gt 'gschool_grounds', 'main'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'Lunch Intro':
@@ -70,11 +70,11 @@ if $ARGS[0] = 'Lunch Intro':
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'You sit down next to Niko and you both spend the next few minutes, getting to know each other.'
-			
+
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
-		end	
+		end
 	end
-	
+
 	act 'Beat it!':
 		*clr & cla
 		if npc_rel['A189'] > 25:npc_rel['A189'] = 25
@@ -83,10 +83,10 @@ if $ARGS[0] = 'Lunch Intro':
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
-		'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. '+$OpenInnerThought+'Why was he so calm? What is it with that guy?'+$CloseInnerThought+' Before shaking your head and walking away.'	
-		
+		'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. '+$OpenInnerThought+'Why was he so calm? What is it with that guy?'+$CloseInnerThought+' Before shaking your head and walking away.'
+
 		act 'Leave':gt 'gschool_lessons', 'short_break'
-	end	
+	end
 end
 
 if $ARGS[0] = 'Lunch Chat':
@@ -95,12 +95,12 @@ if $ARGS[0] = 'Lunch Chat':
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	if NikoFightDay = daystart:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised2.jpg"></center>'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised2.jpg"></center>'
 	elseif NikoPayback > 0:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-	else	
+	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-	end	
+	end
 	'<<$npc_notes[''A189'']>>'
 	if npc_grupTipe['A189'] = 600:'Niko should not be available at this stage. If you are seeing this in game then please report this on the <font color=#FF00FF>Bug reports</font> thread or to <font color=#FF00FF>Violet Kitten</font> on <font color="blue">Discord</font>.'
 	if npc_grupTipe['A189'] = 4:'Niko is a Gopnik and spends a lot of time doing what Gopniks usually do: be loud and drink beer.'
@@ -108,20 +108,20 @@ if $ARGS[0] = 'Lunch Chat':
 	if npc_rel['A189'] >= 20 and npc_rel['A189'] < 40:'You and Niko don''t get along very well.'
 	if npc_rel['A189'] >= 40 and npc_rel['A189'] < 60:'You and Niko have a normal relationship.'
 	if npc_rel['A189'] >= 60 and npc_rel['A189'] < 80:'You and Niko have a good relationship.'
-	if npc_rel['A189'] >= 80:'You and Niko have a great relationship.'	
+	if npc_rel['A189'] >= 80:'You and Niko have a great relationship.'
 	*nl
 	if NikoPayback = 2 and NikoPayed ! daystart:
 		'You approach Niko and he turns to you with a puzzled look on his face. "Hmm, how did I not see you earlier? I thought that you might have been sick today, but here you are, so now to business. How will you be paying today?"'
-	elseif NikoPayback = 2:	
+	elseif NikoPayback = 2:
 		'You approach Niko, he looks at you with a blank stare, "You''re all payed up today, so what brings you here?"'
-	elseif NikoPayback = 3:	
+	elseif NikoPayback = 3:
 		'You approach Niko and he turns to you then says, "Leave me alone. You are nothing but trouble." You giggle as you walk away.'
 	else
 		'You approach Niko and his eyes light up. "Hello <<$pcs_firstname>>. I''m so glad to see you again. Please take a seat and chat with me."'
 	end
-	
+
 	if NikoLuv > -4 and NikoPayback = 0:
-		act 'Chat':	
+		act 'Chat':
 			*clr & cla
 			NikoLuv += 1
 			npc_rel['A189'] += rand(5,10)
@@ -134,29 +134,29 @@ if $ARGS[0] = 'Lunch Chat':
 			if npc_rel['A189'] >= 40 and npc_rel['A189'] < 60:'You and Niko have a normal relationship.'
 			if npc_rel['A189'] >= 60 and npc_rel['A189'] < 80:'You and Niko have a good relationship.'
 			if npc_rel['A189'] >= 80:'You and Niko have a great relationship.'
-			
-			
+
+
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
-		end	
-	end	
-	
+		end
+	end
+
 	if NikoIntro > -1:
 		if NikoLuv > -4 and NikoVolkovQW = 0 and NikoPayback = 0:
-			act 'Insult':	
-				*clr & cla	
+			act 'Insult':
+				*clr & cla
 				npc_rel['A189'] -= 5
 				NikoLuv -= 1
 				minut += 5
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/pc/reactions/fuckoff1.jpg"></center>'
 				'You extend your middle finger at Niko as you walk past him. "Get lost loser." Niko turns his head as he responds. "Am I not worthy?" You continue to walk past him until you reach the hallway.'
-				
+
 				act 'Go to class':gt 'gschool_lessons', 'short_break'
-			end	
-		end	
-		
+			end
+		end
+
 		if NikoPayback = 2 and NikoPayed ! daystart:
-			act 'Money (200 <b>₽</b>)':	
+			act 'Money (200 <b>₽</b>)':
 				*clr & cla
 				money -= 200
 				NikoPayed = daystart
@@ -164,39 +164,39 @@ if $ARGS[0] = 'Lunch Chat':
 				gs'stat'
 				'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-				'"I have your money right here." You extend your hand, giving Niko (200 <b>₽</b>). Niko quickly counts it then gives you an approving nod, "it''s all here. Good, you''re all payed up for today, you can get going now."'	
-				
+				'"I have your money right here." You extend your hand, giving Niko (200 <b>₽</b>). Niko quickly counts it then gives you an approving nod, "it''s all here. Good, you''re all payed up for today, you can get going now."'
+
 				act 'Walk away':gt 'gschool_lunch', 'break'
 			end
-			
-			act 'Sex':	
+
+			act 'Sex':
 				*clr & cla
 				NikoPayed = daystart
 				minut += 5
 				gs'stat'
 				'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-				'You cast your eyes down as you reply, "You can use my body as payment." Niko''s eyes light up, "I was hoping you''d say that. Let''s not waste time." Niko grabs your ass firmly while leading you to the less used restroom.'	
+				'You cast your eyes down as you reply, "You can use my body as payment." Niko''s eyes light up, "I was hoping you''d say that. Let''s not waste time." Niko grabs your ass firmly while leading you to the less used restroom.'
 
 				act 'Head to the restroom with Niko':gt 'NikoPayback', 'Payback 3'
-			end	
-			
-		elseif NikoPayback = 2 and NikoPayed = daystart and NikoPayback_Sex ! daystart:	
-			act 'Offer Niko sex':	
+			end
+
+		elseif NikoPayback = 2 and NikoPayed = daystart and NikoPayback_Sex ! daystart:
+			act 'Offer Niko sex':
 				*clr & cla
 				NikoPayback_Sex = daystart
 				minut += 5
 				gs'stat'
 				'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile'+rand(2,3)+'.jpg"></center>'
-				'You walk up to Niko and place your hand on his crotch, "I know that I already payed you in money, but I want to give you another special payment." Niko''s eyes light up, "Well, there''s no way, I''d say no to that. Let''s get going." Niko gives your ass a firm smack as you both head toward the less used restroom.'	
+				'You walk up to Niko and place your hand on his crotch, "I know that I already payed you in money, but I want to give you another special payment." Niko''s eyes light up, "Well, there''s no way, I''d say no to that. Let''s get going." Niko gives your ass a firm smack as you both head toward the less used restroom.'
 
 				act 'Head to the restroom with Niko':gt 'NikoPayback', 'Payback 3'
 			end
-		end	
-		
+		end
+
 		if (NikoPayback = 2 or NikoIntro = -1) and NikoPayed = daystart:
-			act 'Chat':	
+			act 'Chat':
 				*clr & cla
 				minut += 10
 				gs'stat'
@@ -205,32 +205,32 @@ if $ARGS[0] = 'Lunch Chat':
 				'You reply, "I just want to talk. Is that alright?" Niko shrugs as he replies, "Sounds fine with me, I have some spare time." You and Niko spend the next few minutes, chatting about various topics.'
 
 				act 'Go to class':gt 'gschool_lessons', 'short_break'
-			end	
-		end	
-		
+			end
+		end
+
 		if NikoVolkovQW = 5 and NikoEv = 9:
-			act '<font color=#FF00FF><b>Special Activity</b></font>':	
+			act '<font color=#FF00FF><b>Special Activity</b></font>':
 				*clr & cla
 				gs'stat'
 				'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 				'You sit down next to Niko, "Hello Niko, I remember you telling me something about a special activity that you have planned." Niko grins as he replies, "I have something special for us today. Are you ready to find out what it is?" You suddenly feel a cold chill down your spine as he says that. '+$OpenInnerThought+'Why do I feel so nervous? I can''t shake the feeling that something bad is going to happen.</font>'
-				
+
 				act '<font color=#FF00FF>Go with Niko</font>':
 					if soniaPS = 0:
 						gt 'NikoDates', 'Sonia Block'
 					else
 						gt 'NikoWhore', 'Locker Room'
-					end	
-				end	
+					end
+				end
 
 				act 'Maybe later':gt 'NikoEv', 'Lunch Chat'
 			end
 		end
 	end
-	
+
 	if NikoLuv <= -2 and NikoPayback = 0 and NikoIntro > -1:
-		act 'Walk away':	
+		act 'Walk away':
 			*clr & cla
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/hallway/wos4.jpg"></center>'
@@ -239,13 +239,13 @@ if $ARGS[0] = 'Lunch Chat':
 				'You walk away without saying a word. Thinking to yourself: '+$OpenInnerThought+'What kind of easy lay, does he think I am?</font>'
 			elseif VK = 2:
 				'You walk away without saying a word. Thinking to yourself: '+$OpenInnerThought+'What an annoying, little punk!</font>'
-			else	
+			else
 				'You walk away without saying a word. Thinking to yourself: '+$OpenInnerThought+'Something about that guy, really annoys me.</font>'
 			end
-				
+
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
-		
+
 	elseif NikoPayback = 2 and NikoPayed = daystart:
 		act 'Walk away':gt 'gschool_lessons', 'short_break'
 	elseif NikoPayback = 0 and NikoIntro > -1:
@@ -255,11 +255,11 @@ if $ARGS[0] = 'Lunch Chat':
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'You tell Niko. "I would love to stay but I need to head to class early today." He responds "I understand <<$pcs_firstname>>. I guess I will have to wait longer for an audience with this princess." You can feel your face getting flush as you get up and walk out toward the hallway.'
-					
+
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
 	elseif NikoPayback = 3 or NikoIntro = -1:
-		act 'Walk away':gt 'gschool_lessons', 'short_break'	
+		act 'Walk away':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -272,7 +272,7 @@ if $ARGS[0] = 'Date Intro':
 	*nl
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/jewelry/necklace1.jpg"></center>'
 
-	act 'Accept the gift':	
+	act 'Accept the gift':
 		*clr & cla
 		if npc_rel['A189'] < 80:npc_rel['A189'] = 80
 		NikoDateIntro = 1
@@ -284,11 +284,11 @@ if $ARGS[0] = 'Date Intro':
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'
-		'You give Niko a warm smile as you take the gift from him. "Thank you Niko, This necklace is so beautiful." Niko looks at you with such loving eyes. "I''m so glad you like it, how about I pick you up after school and we can both head out together?" You reply, "I might be a bit late so just wait for me at the courtyard, okay?" Niko bows before you. "As you wish m''lady." He then backs away while keeping his head bowed until he turns the corner.'		
+		'You give Niko a warm smile as you take the gift from him. "Thank you Niko, This necklace is so beautiful." Niko looks at you with such loving eyes. "I''m so glad you like it, how about I pick you up after school and we can both head out together?" You reply, "I might be a bit late so just wait for me at the courtyard, okay?" Niko bows before you. "As you wish m''lady." He then backs away while keeping his head bowed until he turns the corner.'
 
 		act 'Go to class':gt 'gschool_lessons', 'short_break'
-	end	
-	
+	end
+
 	gs 'willpower', 'misc', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Decline the gift (<<will_cost>> Willpower)':
@@ -324,8 +324,8 @@ if $ARGS[0] = 'Niko Dates':
 		gt 'NikoEv', 'Date 4'
 	elseif NikoEv = 11:
 		gt 'NikoEv', 'New Life'
-	end	
-end	
+	end
+end
 
 if $ARGS[0] =  'Date 1':
 	*clr & cla
@@ -334,19 +334,19 @@ if $ARGS[0] =  'Date 1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko1.jpg"></center>'
 	'You walk up to Niko and his eyes light up as he sees you. "Greetings <<$pcs_firstname>>, I hope that you are ready to have a good time."'
 
-	act 'I''m ready':	
+	act 'I''m ready':
 		*clr & cla
 		NikoEv = 2
 		minut += 5
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/walk1.jpg"></center>'
-		'"I sure am." Niko gives you a warm smile as he responds, "I figured that we could go to an amusement park, out of town. I will pay our way of course, so come on, let''s get going." Niko takes your hand and walks you to the train station where you both board the train and get seated.'	
-		
+		'"I sure am." Niko gives you a warm smile as he responds, "I figured that we could go to an amusement park, out of town. I will pay our way of course, so come on, let''s get going." Niko takes your hand and walks you to the train station where you both board the train and get seated.'
+
 		NikoNextDate_day = daystart + 7 - week + 1
 		act 'Go with Niko':gt 'NikoDates', 'Date 1_1'
 	end
-	
-	act 'Not yet':	
+
+	act 'Not yet':
 		*clr & cla
 		minut += 5
 		gs'stat'
@@ -365,7 +365,7 @@ if $ARGS[0] =  'Date 2':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko2.jpg"></center>'
 	'You walk up to Niko and he lowers his cigarette before saying, "Hello <<$pcs_firstname>> I wanted to tell you that I am sorry, for how I acted yesterday. I just wanted to you leave your shell a bit. You always seem so tense." You reply, "Tense? I guess I could try to lighten up a bit. Maybe." Niko smiles as he responds, "Good enough. So are you ready for a surprise I have for you? We could be out all afternoon."'
 
-	act 'I''m ready':	
+	act 'I''m ready':
 		*clr & cla
 		NikoEv = 3
 		minut += 5
@@ -376,8 +376,8 @@ if $ARGS[0] =  'Date 2':
 		NikoNextDate_day = daystart + 7 - week + 1
 		act 'Follow Niko''s lead':gt 'NikoDates', 'Date 2'
 	end
-	
-	act 'Not yet':	
+
+	act 'Not yet':
 		*clr & cla
 		minut += 5
 		gs'stat'
@@ -396,19 +396,19 @@ if $ARGS[0] =  'Date 3':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko3.jpg"></center>'
 	'You walk up to Niko and his eyes light up as he sees you. "Greetings <<$pcs_firstname>>, I have a surprise activity for today, we could be out all afternoon. Are you up for it?"'
 
-	act 'I''m ready':	
+	act 'I''m ready':
 		*clr & cla
 		NikoEv = 4
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/walk4.jpg"></center>'
-		'"I sure am." Niko''s smile widens as he replies, "Great let''s get going." Niko wraps his arm around your waist as he leads you toward the lake.'	
+		'"I sure am." Niko''s smile widens as he replies, "Great let''s get going." Niko wraps his arm around your waist as he leads you toward the lake.'
 		NikoNextDate_day = daystart + 7 - week + 1
 		act 'Follow Niko''s lead':gt 'NikoDates', 'Date 2'
 	end
-	
-	act 'Not yet':	
+
+	act 'Not yet':
 		*clr & cla
 		minut += 5
 		gs'stat'
@@ -427,26 +427,26 @@ if $ARGS[0] =  'Date 4':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'
 	'You walk up to Niko and his eyes light up as he sees you. "Ahhh <<$pcs_firstname>>, I''m so glad to see you. Are you up for a nice relaxing day at the beach?"'
 
-	act 'I''m ready':	
+	act 'I''m ready':
 		*clr & cla
 		NikoEv = 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-		'"I can never turn down a day at the beach." Niko chuckles as he responds, "Great I have everything we should need here." Niko then opens his bag which houses a beach towel, cigarettes and sunscreen.'	
+		'"I can never turn down a day at the beach." Niko chuckles as he responds, "Great I have everything we should need here." Niko then opens his bag which houses a beach towel, cigarettes and sunscreen.'
 		NikoNextDate_day = daystart + 7 - week + 1
-		act 'Let''s go!':	
+		act 'Let''s go!':
 			*clr & cla
 			minut += 5
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/walk4.jpg"></center>'
 			'You happily grab onto his hand then say, "What are we waiting for? Let''s go!" You then lead Niko toward the lake.'
-			
+
 			act 'Enter train station':gt 'NikoDates', 'Date 3'
 		end
-	end	
-	
-	act 'Not yet':	
+	end
+
+	act 'Not yet':
 		*clr & cla
 		minut += 5
 		gs'stat'
@@ -464,20 +464,20 @@ if $ARGS[0] =  'New Life':
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko1.jpg"></center>'
 	'As you approach Niko, he nods then motions you over, "Are you ready to head out?"'
-	
+
 	act 'Yes':
 		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 		'Niko smiles as he responds, "Great now let''s head out." Niko wraps his arm around your shoulder then walks you toward the park.'
-		
+
 		gt 'NikoEv2', 'Park'
-	end	
-	
+	end
+
 	act 'Not right now':gt 'gschool_grounds', 'main'
-end	
+end
 
 !!!!!!!!!!!
 !! Disco !!
@@ -489,7 +489,7 @@ if $ARGS[0] = 'Disco Intro':
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/brother/upset.jpg"></center>'
 	'You approach Niko and immediately notice that he is passed out. He must have have a lot to drink today.'
-	
+
 	act 'Walk away':gt 'pav_disco'
 end
 
@@ -499,35 +499,35 @@ if $ARGS[0] = 'Disco Chat':
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	if NikoFightDay = daystart:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised2.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised2.jpg"></center>'
 	elseif NikoPayback > 0:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-	else	
+	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-	end	
-	'<<$npc_notes[''189'']>>'
+	end
+	'<<$npc_notes[''A189'']>>'
 	if npc_grupTipe['A189'] = 600:'Niko should not be available at this stage. If you are seeing this in game then please report this on the <font color=#FF00FF>Bug reports</font> thread or to <font color=#E400FF>Violet Kitten</font> on <font color="blue">Discord</font>.'
 	if npc_grupTipe['A189'] = 4:'Niko is a Gopnik and spends a lot of time doing what Gopniks usually do: be loud and drink beer.'
 	if npc_rel['A189'] < 20:'You and Niko don''t get along at all.'
 	if npc_rel['A189'] >= 20 and npc_rel['A189'] < 40:'You and Niko don''t get along very well.'
 	if npc_rel['A189'] >= 40 and npc_rel['A189'] < 60:'You and Niko have a normal relationship.'
 	if npc_rel['A189'] >= 60 and npc_rel['A189'] < 80:'You and Niko have a good relationship.'
-	if npc_rel['A189'] >= 80:'You and Niko have a great relationship.'	
-	*nl	
+	if npc_rel['A189'] >= 80:'You and Niko have a great relationship.'
+	*nl
 	if NikoLuv > -4 and  NikoPayback = 0 and NikoAlko = 0:
 		'You approach Niko and he gives you a welcoming smile. "Good to see you again. Would you like a drink?"'
 	elseif NikoLuv > -4 and  NikoPayback = 0 and NikoAlko >= 2:
 		'You approach Niko and he gives you a welcoming smile. "You''re looking lovely today, Would you like to dance."'
 	elseif NikoPayback = 2 and NikoPayed ! daystart:
 		'You approach Niko and he turns to you with a puzzled look on his face. "Hmm, you didn''t show up to school today, were you sick? Bah, it doesn''t matter, you''re here now, so let''s get down to business. My dick is dry and my wallet lite, which one of those issues, will you be solving today?"'
-	elseif NikoPayback = 2:	
+	elseif NikoPayback = 2:
 		'You approach Niko and he looks at you with a blank stare, "You''re all payed up today, so why are you talking to me? Trying to mooch a free drink off me?"'
-	elseif NikoPayback = 3:	
-		'You approach Niko and he turns to you then says, "Leave me alone. You are nothing but trouble." You giggle as you walk away.'		
-	end	
-		
+	elseif NikoPayback = 3:
+		'You approach Niko and he turns to you then says, "Leave me alone. You are nothing but trouble." You giggle as you walk away.'
+	end
+
 	if NikoLuv > -4 and  NikoPayback = 0:
-		act 'Drink':	
+		act 'Drink':
 			*clr & cla
 			NikoAlko = 2
 			gs 'drugs', 'alcohol', 'vodka'
@@ -536,14 +536,14 @@ if $ARGS[0] = 'Disco Chat':
 			minut += 10
 			gs'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_2_2.mp4"></video></center>'
-			'"I would love to." Niko opens up a bottle of alcohol then hands you the bottle as he gives you a wink. You both spend the next few minutes drinking and sharing stories.'		
-			
+			'"I would love to." Niko opens up a bottle of alcohol then hands you the bottle as he gives you a wink. You both spend the next few minutes drinking and sharing stories.'
+
 			act 'Get up':gt 'pav_disco'
-		end	
-	end	
-	
+		end
+	end
+
 	if NikoLuv > -4 and  NikoPayback = 0:
-		act 'Dance':	
+		act 'Dance':
 			*clr & cla
 			gs 'exp_gain', 'danc', rand(1,3)
 			NikoLuv += 1
@@ -551,28 +551,28 @@ if $ARGS[0] = 'Disco Chat':
 			minut += 10
 			gs'stat'
 			'<center><video autoplay loop <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/disco/dance'+rand(1,2)+'.mp4"></video></center>'
-			'"I would love to." Niko takes your hand then leads you to the dance floor where you both spend the next few minutes, dancing together.'		
-			
+			'"I would love to." Niko takes your hand then leads you to the dance floor where you both spend the next few minutes, dancing together.'
+
 			act 'Finish dancing':gt 'pav_disco'
-		end	
-	end	
-	
+		end
+	end
+
 	if NikoLuv > -4 and NikoVolkovQW = 0 and  NikoPayback = 0:
-		act 'Insult':	
-			*clr & cla	
+		act 'Insult':
+			*clr & cla
 			npc_rel['A189'] -= 5
 			NikoLuv -= 1
 			minut += 5
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/pc/reactions/fuckoff2.jpg"></center>'
 			'You lift up your hands then extend your middle fingers on each hand, "I only drink with men, not boys." Niko shakes his head as he responds. "Aww, you''re no fun." You turn around then walk toward the dance floor.'
-			
+
 			act 'Walk away':gt 'pav_disco'
-		end	
-	end	
-	
+		end
+	end
+
 	if NikoPayback = 2 and NikoPayed ! daystart:
-		act 'Money (200 <b>₽</b>)':	
+		act 'Money (200 <b>₽</b>)':
 			*clr & cla
 			money -= 200
 			NikoPayed = daystart
@@ -580,12 +580,12 @@ if $ARGS[0] = 'Disco Chat':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-			'"I have your money right here." You extend your hand, giving Niko (200 <b>₽</b>). Niko quickly counts it then gives you an approving nod, "it''s all here. Good, you''re all payed up for today, you can get going now."'	
-			
+			'"I have your money right here." You extend your hand, giving Niko (200 <b>₽</b>). Niko quickly counts it then gives you an approving nod, "it''s all here. Good, you''re all payed up for today, you can get going now."'
+
 			act 'Walk away':gt 'pav_disco'
 		end
-		
-		act 'Sex':	
+
+		act 'Sex':
 			*clr & cla
 			NikoPayed = daystart
 			NikoPayback_Sex = daystart
@@ -594,13 +594,13 @@ if $ARGS[0] = 'Disco Chat':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/disco/niko.jpg"></center>'
-			'You downcast your eyes as you reply, "You can use my body as payment." Niko''s kneels down then begins rubbing your legs as he replies,, "I was hoping you''d say that. Let''s not waste time." Niko grabs your ass firmly while leading you to the mens restroom.'	
+			'You downcast your eyes as you reply, "You can use my body as payment." Niko''s kneels down then begins rubbing your legs as he replies,, "I was hoping you''d say that. Let''s not waste time." Niko grabs your ass firmly while leading you to the mens restroom.'
 
 			act 'Head to the restroom with Niko':gt 'NikoPayback', 'Payback 3'
-		end	
-		
-	elseif NikoPayback = 2 and NikoPayed = daystart and NikoPayback_Sex ! daystart:	
-		act 'Offer Niko sex':	
+		end
+
+	elseif NikoPayback = 2 and NikoPayed = daystart and NikoPayback_Sex ! daystart:
+		act 'Offer Niko sex':
 			*clr & cla
 			NikoDiscoPay = 1
 			NikoPayback_Sex = daystart
@@ -608,14 +608,14 @@ if $ARGS[0] = 'Disco Chat':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile'+rand(2,3)+'.jpg"></center>'
-			'You walk up to Niko then place your hand on his crotch, "I know that I already payed you in money, but I want to give you another special payment." Niko''s eyes light up, "Well, there''s no way, I''d say no to that. Let''s get going." Niko gives your ass a firm smack as you both head toward the mens restroom.'	
+			'You walk up to Niko then place your hand on his crotch, "I know that I already payed you in money, but I want to give you another special payment." Niko''s eyes light up, "Well, there''s no way, I''d say no to that. Let''s get going." Niko gives your ass a firm smack as you both head toward the mens restroom.'
 
 			act 'Head to the restroom with Niko':gt 'NikoPayback', 'Payback 3'
 		end
-	end	
-	
+	end
+
 	if NikoPayback = 2 and NikoPayed = daystart:
-		act 'Chat':	
+		act 'Chat':
 			*clr & cla
 			minut += 5
 			gs'stat'
@@ -624,11 +624,11 @@ if $ARGS[0] = 'Disco Chat':
 			'You reply, "I just want to talk. Is that alright?" Niko shrugs as he replies, "Sounds fine with me, I have some spare time, but don''t think that you''re getting any free beer off of me." You and Niko spend the next few minutes, chatting about various topics.'
 
 			act 'Finish chatting':gt 'Nikoev', 'Disco Chat'
-		end	
-	end	
-	
+		end
+	end
+
 	if NikoLuv <= -2 and NikoPayback = 0:
-		act 'Walk away':	
+		act 'Walk away':
 			*clr & cla
 			NikoAlko = 0
 			gs'stat'
@@ -636,15 +636,15 @@ if $ARGS[0] = 'Disco Chat':
 			VK = rand(1,3)
 			if VK = 1:
 				'You walk away without saying a word, thinking to yourself. "What kind of easy lay, does he think I am?"'
-			elseif VK = 2:	
+			elseif VK = 2:
 				'You walk away without saying a word, thinking to yourself. "What an annoying, little punk?"'
-			else	
+			else
 				'You walk away without saying a word, thinking to yourself. "Something about that guy, really annoys me."'
-			end	
-				
+			end
+
 			act 'Step away':gt 'pav_disco'
 		end
-		
+
 	elseif NikoPayback = 2 and NikoPayed = daystart:
 		act 'Walk away':gt 'pav_disco'
 	elseif NikoPayback = 0:
@@ -655,13 +655,13 @@ if $ARGS[0] = 'Disco Chat':
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'You tell Niko. "I would love to stay, but I need to head home early today, or my <<$npc_nickname[''A29'']>> will freak out." He responds "I know how parents can be, I will always be around, if you ever have a few minutes to spare." You give Niko a warm smile as you wave goodbye.'
-					
+
 			act 'Step away':gt 'pav_disco'
 		end
-		
+
 	elseif NikoPayback = 3:
-		act 'Walk away':gt 'pav_disco'		
-	end	
+		act 'Walk away':gt 'pav_disco'
+	end
 end
 
 !!!!!!!!!!!!!
@@ -679,28 +679,28 @@ if $ARGS[0] =  'Lunch Breakup':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'	
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 	'You approach Niko with a stern look on your face. Niko notices you then says. "Ah there you are, you disappeared on me yesterday." You quickly reply, "I DISAPPEARED!? YOU RAN OFF AND LEFT ME TIED UP!" Niko recoils before responding, "Did I? I''m sorry I just had to..." You cut Niko off. "I DON''T WANT TO HEAR IT! I never should have trusted you. How could I have been so stupid?" Niko responds, "Hey let''s not be hasty here." You quickly reply, "NO! I want nothing to do with you. Stay away from me." '
 
 	act 'Walk away':
 		*clr & cla
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'		
-		'Niko then gets noticeably angry as he responds, "After all the time and money I spent on you? You will not leave me! I will get what I deserve!"' 
-		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
+		'Niko then gets noticeably angry as he responds, "After all the time and money I spent on you? You will not leave me! I will get what I deserve!"'
+
 		act 'Give him what he deserves':
 			*clr & cla
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/ouch.jpg"></center>'
 			'You reply, "You got that right." You then wind up your leg before ramming it in between his legs, kicking him squarely, in the balls, causing him to drop to the ground squirming in pain. You spit on Niko before walking away.'
-		
+
 			act 'Walk away':gt 'gschool_lessons', 'short_break'
-		end	
-	end	
-end		
-	
+		end
+	end
+end
+
 if $ARGS[0] =  'Disco Breakup':
 	*clr & cla
 	NikoBreakupDay = daystart
@@ -712,38 +712,38 @@ if $ARGS[0] =  'Disco Breakup':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'	
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 	'You approach Niko with a stern look on your face. Niko notices you then says. "Ah there you are, you disappeared on me yesterday." You quickly reply, "I DISAPPEARED!? YOU RAN OFF AND LEFT ME TIED UP!" Niko recoils before responding, "Did I? I''m sorry I just had to..." You cut Niko off. "I DON''T WANT TO HEAR IT! I never should have trusted you. How could I have been so stupid?" Niko responds, "Hey let''s not be hasty here." You quickly reply, "NO! I want nothing to do with you. Stay away from me." '
 
 	act 'Walk away':
 		*clr & cla
 		gs'stat'
 		'<center><b><h4><font color="red"><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'		
-		'Niko then gets noticeably angry as he responds, "After all the time and money that I spent on you? You will not leave me! I will get what I deserve!"' 
-		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
+		'Niko then gets noticeably angry as he responds, "After all the time and money that I spent on you? You will not leave me! I will get what I deserve!"'
+
 		act 'Give him what he deserves':
 			*clr & cla
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/down.jpg"></center>'			
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/down.jpg"></center>'
 			'You reply, "You got that right." You then wind up your leg before ramming it in between his legs, kicking him squarely, in the balls, causing him to drop to the ground, squirming in pain. You spit on Niko before walking away.'
-	
+
 			act 'Step away':gt 'pav_disco'
-		end	
-	end	
-end	
+		end
+	end
+end
 
 if $ARGS[0] =  'Disco Breakup 2':
 	*clr & cla
 	minut += 1
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/brother/aftermath2.jpg"></center>'	
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/brother/aftermath2.jpg"></center>'
 	'You see Niko on the ground, squirming in pain and can''t help but feel very satisfied, seeing Niko get what he deserved.'
 
 	act 'Step away':gt 'pav_disco'
-end	
+end
 
 !!!!!!!!!!!!!!!
 !! Jealously !!
@@ -757,24 +757,24 @@ if $ARGS[0] =  'Fyodor':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko'+rand(1,3)+'.jpg"></center>'
 	'You walk up to Niko and his eyes light up as he sees you. "Greetings <<$pcs_firstname>>, I hope you are ready to have a good time." You suddenly feel a hand gently but firmly grab onto your arm.'
 
-	act 'Turn around':	
+	act 'Turn around':
 		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
-		'You turn to see Fedor with a concerned look on his face. "<<$pcs_firstname>> what are doing over here with him? You should be careful hanging around guys like him. He is no good for you." Niko just stares on in silence with an annoyed look on his face. You turn to Fedor and say, "Don''t worry Fedor it''s not what it looks like. Niko was just..." Niko quickly continues your sentence. "<<$pcs_firstname>>''s father is planing on buying one of my brothers old bikes, so she came to me to discuss the details. That''s all." Fedor gives Niko a blank stare. "I''ve seen your brother before and I don''t think that <<$pcs_firstname>> should be dealing with him or you." Niko shrugs as he replies, "Well that''s <<$pcs_firstname>>''s call, not yours." Fedor walks right up to Niko then clenches his fists. "Well no one asked for your input."' 
+		'You turn to see Fedor with a concerned look on his face. "<<$pcs_firstname>> what are doing over here with him? You should be careful hanging around guys like him. He is no good for you." Niko just stares on in silence with an annoyed look on his face. You turn to Fedor and say, "Don''t worry Fedor it''s not what it looks like. Niko was just..." Niko quickly continues your sentence. "<<$pcs_firstname>>''s father is planing on buying one of my brothers old bikes, so she came to me to discuss the details. That''s all." Fedor gives Niko a blank stare. "I''ve seen your brother before and I don''t think that <<$pcs_firstname>> should be dealing with him or you." Niko shrugs as he replies, "Well that''s <<$pcs_firstname>>''s call, not yours." Fedor walks right up to Niko then clenches his fists. "Well no one asked for your input."'
 
-		act 'See what happens':	
+		act 'See what happens':
 			*clr & cla
-			gs'stat'		
+			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko4.jpg"></center>'				
-			'Niko doesn''t seem worried as he casually leans against the wall. "No need to get violent. I''m sure <<$pcs_firstname>> doesn''t want us fighting in front of her for no reason. That would be really rude of us, wouldn''t it?" Fedor looks back to you with a embarrassed look on his face. "Sorry <<$pcs_nickname>> I hope I''m not making you uncomfortable. Just be careful with this one okay?" You give Fedor a nod and a smile as he turns around then walks away.'			
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko4.jpg"></center>'
+			'Niko doesn''t seem worried as he casually leans against the wall. "No need to get violent. I''m sure <<$pcs_firstname>> doesn''t want us fighting in front of her for no reason. That would be really rude of us, wouldn''t it?" Fedor looks back to you with a embarrassed look on his face. "Sorry <<$pcs_nickname>> I hope I''m not making you uncomfortable. Just be careful with this one okay?" You give Fedor a nod and a smile as he turns around then walks away.'
 
 			act 'Turn back toward Niko':gt 'NikoEv', 'Niko Dates'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] =  'Viktor':
@@ -783,18 +783,18 @@ if $ARGS[0] =  'Viktor':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'	
-	'You walk up to Niko and give him a smile then you suddenly see Vitek quickly walk up to Niko and say, "What are you doing with <<$pcs_firstname>>? She is mine."' 
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
+	'You walk up to Niko and give him a smile then you suddenly see Vitek quickly walk up to Niko and say, "What are you doing with <<$pcs_firstname>>? She is mine."'
 
-	act 'See what happens':	
+	act 'See what happens':
 		*clr & cla
-		gs'stat'	
+		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko'+rand(1,3)+'.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko'+rand(1,3)+'.jpg"></center>'
 		'Niko chuckles as he raises his hands, "I was just helping <<$pcs_firstname>> with finding the person spreading mean rumors about her." Vitek responds, "What rumors?" Niko replies, "Someone said that <<$pcs_firstname>> here is dating a fat, brain dead, gopnik. I wonder who that rumor was referring to." Vitek begins seething with anger as he ask, "Who the fuck said that shit?" Niko replies, "It took some digging, but I found out that it was him." Niko points to Lesco Tsarev, causing Vitek to turn to Lesco then shout, "You fucking little bitch! I will tear your arm off!" He then charges at Lesco, who begins running for his life. While they were distracted, Niko takes your hand then leads you out of the school grounds.'
-	
+
 		act 'Follow Niko''s lead':gt 'NikoEv', 'Niko Dates'
-	end	
+	end
 end
 
 if $ARGS[0] =  'Dimka':
@@ -805,20 +805,20 @@ if $ARGS[0] =  'Dimka':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
 	'You walk up to Niko and give him a smile then see Dimka approach you before giving Niko a puzzled look. "What are you with <<$pcs_firstname>>. She is my girl." Niko gives Dimka a blank stare as he responds, "Sure she is... why don''t you just piss off before you piss me off?" Dimka then says, "Why don''t we ask her who she''s dating?" Niko replies, "Because asking a girl to kiss and tell is rude." Dimka looks shocked as he responds, "You don''t care? But would you care if I told you that <<$pcs_nickname>> here is a cocksucker?" Niko raises an eyebrow. "Well do you have proof of that, or are you just blowing smoke?"'
 
-	act 'See what Dimka does':	
+	act 'See what Dimka does':
 		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-		'Dimka quickly pulls out his phone then starts up a video then shows it to Niko. You recognize the video of you sucking on Dimka''s dick, causing you to think to yourself: '+$OpenInnerThought+'Oh shit! How am I going to explain this to Niko. I''m really screwed now.'+$CloseInnerThought+' Niko watches the video then turns to you and says, "You have some talents, I see." He pulls out his phone then taps the screens of both phones for a few seconds then returns Dimka''s phone. Dimka grins as he says, "See I told you that she is a whore." Niko replies, "You are still being rude. Thanks for the vid, but you can get lost now." Dimka recoils in shock, "But this video sho... Hey what the hell? Did you delete it?" Niko smirks as he replies, "Well of course I have. I can''t just let you keep embarrassing videos of my girl, now can I?"'		
-		
-		act 'Continue':	
+		'Dimka quickly pulls out his phone then starts up a video then shows it to Niko. You recognize the video of you sucking on Dimka''s dick, causing you to think to yourself: '+$OpenInnerThought+'Oh shit! How am I going to explain this to Niko. I''m really screwed now.'+$CloseInnerThought+' Niko watches the video then turns to you and says, "You have some talents, I see." He pulls out his phone then taps the screens of both phones for a few seconds then returns Dimka''s phone. Dimka grins as he says, "See I told you that she is a whore." Niko replies, "You are still being rude. Thanks for the vid, but you can get lost now." Dimka recoils in shock, "But this video sho... Hey what the hell? Did you delete it?" Niko smirks as he replies, "Well of course I have. I can''t just let you keep embarrassing videos of my girl, now can I?"'
+
+		act 'Continue':
 			*clr & cla
 			gs'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/pissoff.mp4"></video></center>'
-			'Niko begins lighting his cigarette before Dimka suddenly shouts, "How dare you!? You fucking sack of shit! That was my video!" Niko gets off the wall then approaches Dimka, causing Dimka to immediately back up. Niko grabs Dimka''s face with one hand then brings it to his before blowing smoke in his face then saying, "I will give you one more chance to leave before I accept Lavrenti''s offer to make your life a living hell." Dimka quickly backs off as he says, "You''re insane! Whatever... keep her!" Dimka then quickly walks away.'		
-		
+			'Niko begins lighting his cigarette before Dimka suddenly shouts, "How dare you!? You fucking sack of shit! That was my video!" Niko gets off the wall then approaches Dimka, causing Dimka to immediately back up. Niko grabs Dimka''s face with one hand then brings it to his before blowing smoke in his face then saying, "I will give you one more chance to leave before I accept Lavrenti''s offer to make your life a living hell." Dimka quickly backs off as he says, "You''re insane! Whatever... keep her!" Dimka then quickly walks away.'
+
 			act 'Thank Niko':
 				*clr & cla
 				dimafilm = 0
@@ -832,10 +832,10 @@ if $ARGS[0] =  'Dimka':
 					act 'Sure thing':gt 'NikoEv2', 'Events'
 				else
 					act 'Sure thing':gt 'NikoEv', 'Niko Dates'
-				end	
+				end
 			end
-		end	
-	end	
+		end
+	end
 end
 
 --- NikoEv ---------------------------------

locations/beverage.qsrc

@@ -523,5 +523,98 @@ if $ARGS[0] = 'only_cost_esp':
 	gt 'food_menu'
 end
 
+if $ARGS[0] = 'only_cost_kva':
+	frost = 1
+	fat += 2
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 5
+	pcs_mood += 15
+	if pcs_hydra >= 100:
+		pcs_hydra += 30
+	else
+		pcs_hydra += 60
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_jui':
+	frost = 1
+	if alko > 0: alko -= 1
+	fat += 3
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 8
+	pcs_mood += 10
+	if pcs_hydra >= 100:
+		pcs_hydra += 40
+	else
+		pcs_hydra += 80
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_mil':
+	*clr & cla
+	frost = 1
+	fat += 6
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 5
+	pcs_mood += 20
+	pcs_energy += 5
+	if pcs_hydra >= 100:
+		pcs_hydra += 50
+	else
+		pcs_hydra += 100
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_wat':
+	frost = 1
+	if alko > 0: alko -= 1
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 10
+	if pcs_hydra >= 100:
+		pcs_hydra += 25
+	else
+		pcs_hydra += 50
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
 --- beverage ---------------------------------
 

locations/city_coffee_hole.qsrc

@@ -23,6 +23,7 @@ if $args[0]= 'inner':
 	$menu_arg = 'inner'
 	menu_off = 0
 	gs 'katja_meynold_schedule'
+	!!gs 'albina_uni_schedule'
 	gs 'stat'
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/inside.jpg"></center>'
@@ -33,8 +34,11 @@ if $args[0]= 'inner':
 	if locat['katja'] = 30 and (katjaQW['know_going_to_teaching_degree'] = 1 or mid($start_type,1,2) = 'sg'):
 		'You see your classmate <a href="exec:gt ''katja_chat'', ''coffee_hole''">Katja</a> sitting at a table with a pile of books, a cup of coffee and a plate of food.'
 	end
+	!!if locat['albina'] = 17 and AlbinaQW['know_albina_uni'] > 0 or mid($start_type,1,2) = 'sg'):
+		!!'You see <a href="exec:gt ''albina_uni'', ''coffee_hole''">Albina</a> sitting at a table with a woman who has her back turned to you.'
+	!!end
 	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and day = 2 and nerd_game['fixed_uni_day'] = 0 and hour >= 18:
-		'You see some familiar faces in the corner of the coffee shop. It is most of the <a href="exec:gt ''nerd_game_night'', ''crash_gamenight_uni''">nerds.</a> you went to school with back in Pavlovsk around a table. It looks like they are playing some sort of game.'
+		'You see some familiar faces sitting in one of the corners. Some of the <a href="exec:gt ''nerd_game_night'', ''crash_gamenight_uni''">nerds</a> you went to school with back in Pavlovsk are gathered around a table. It looks like they''re playing some sort of game.'
 	end
 
 	if nerd_game['game_day'] = daystart and hour = 18: act '<b>Join nerds</b>': gt 'nerd_game_night','game'
@@ -95,7 +99,7 @@ if $ARGS[0] = 'eat':
 		minut += 10
 		mood += 5
 		gs 'stat'
-		'You take your order and find an empty table. You quietly enjoy your order as you look around at the other people.	You feel your mood brighten as you enjoy the ambience of the place.'
+		'You take your order from the counter and find an empty table. You quietly enjoy the ambience of the place and feel your mood brightening as you look around.'
 	else
 		gs 'stat'
 		'You''re sitting at a table in the cafe. It''s nice here.'
@@ -115,7 +119,7 @@ if $ARGS[0] = 'post_komp':
 	mood += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/cafequiet.jpg"></center>'
-	'You''re sitting at a table in the coffee shop. You could use your laptop if you wanted, but should buy something more to eat or drink first.'
+	'You''re sitting at a table in the coffee shop. You could use your laptop if you wanted, but should buy something to eat or drink first.'
 	act 'Get up from table': gt 'city_coffee_hole', 'inner'
 end
 
@@ -312,7 +316,7 @@ if $ARGS[0] = 'photo_shoot':
 											minut +=5
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-											'You nod at her. "Sure thing, I should get going anyways. Thanks again. I''ll see you around campus, hopefully. If not, I''ll stop by sometime, and we can hang out." As she escorts you to the door, you ask; "Which room do you have over at the dorms?"'
+											'You nod at her. "Sure thing, I should get going anyway. Thanks again. I''ll see you around campus, hopefully. If not, I''ll stop by sometime, and we can hang out." As she escorts you to the door, you ask; "Which room do you have over at the dorms?"'
 											'She stops at the door without unlocking it. "I''m not. I was going to, but the boys wanted to get a place in the city, so we rented an apartment close to campus. Costs me less as I only have to pay a quarter of the bills than the dorm was going to cost. Living with three boys is a nightmare though, so I only regret it constantly," she says with a laugh.'
 											*nl
 											'"You should stop by sometime," she says and tells you where to find the place.'
@@ -473,7 +477,7 @@ if $args[0]= 'kendra':
 			npc_rel['A84'] = 45
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
-			  'You start talking with her. You tell her that you live in Pavlovsk and are in your final year of school. She replies by saying she''s a student from the Republic of Congo and attends the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
+			  'You start talking with her. You tell her that you live in Pavlovsk and are in your final year of school. She replies by saying she''s a student from the Republic of Congo who attends the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			else
 			  'You start talking with her. You tell her a bit about yourself, and she replies by saying that she''s a student from the Republic of Congo attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			end

locations/food.qsrc

@@ -1051,5 +1051,126 @@ if $ARGS[0] = 'only_stats_healthy_meal':
 	pcs_breath = 0
 end
 
+if $ARGS[0] = 'only_cost_pirosh':
+	*clr & cla
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += pcs_health/10
+	pcs_mood += 5
+	fat += 4
+	pcs_energy += 40
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_golub':
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 10
+	pcs_mood += 5
+	fat += 8
+	pcs_energy += 60
+	if pcs_hydra >= 100:
+		pcs_hydra += 10
+	else
+		pcs_hydra += 20
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_pozhar':
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 15
+	pcs_mood += 10
+	fat += 6
+	pcs_energy += 70
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_reuben':
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 20
+	pcs_mood += 25
+	fat += 12
+	pcs_energy += 110
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_bliny':
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 10
+	pcs_mood += 5
+	fat += 8
+	pcs_energy += 50
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
 --- food ---------------------------------
 

locations/food_menu.qsrc

@@ -441,38 +441,38 @@ elseif $loc = 'uni_cafe':
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
-	$_eat['0,type'] = 'pirosh'
+	$_eat['0,type'] = 'only_cost_pirosh'
 	$_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
-	$_eat['1,type'] = 'bliny'
+	$_eat['1,type'] = 'only_cost_bliny'
 	$_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
-	$_eat['2,type'] = 'golub'
+	$_eat['2,type'] = 'only_cost_golub'
 	$_eat['2,price'] = 210
 	$_eat['3,name'] = 'Pozharsky Cutlets'
-	$_eat['3,type'] = 'pozhar'
+	$_eat['3,type'] = 'only_cost_pozhar'
 	$_eat['3,price'] = 290
 	$_eat['4,name'] = 'Rueben Sandwich'
-	$_eat['4,type'] = 'reuben'
+	$_eat['4,type'] = 'only_cost_reuben'
 	$_eat['4,price'] = 340
 
 	$_drink['0,name'] = 'Water'
-	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,type'] = 'only_cost_wat'
 	$_drink['0,price'] = 'Free'
 	$_drink['1,name'] = 'Kvass'
-	$_drink['1,type'] = 'bev_kva'
+	$_drink['1,type'] = 'only_cost_kva'
 	$_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
-	$_drink['2,type'] = 'bev_jui'
+	$_drink['2,type'] = 'only_cost_jui'
 	$_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
-	$_drink['3,type'] = 'bev_tea'
+	$_drink['0,type'] = 'only_cost_tea'
 	$_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
-	$_drink['4,type'] = 'bev_cof'
+	$_drink['2,type'] = 'only_cost_bco'
 	$_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
-	$_drink['5,type'] = 'bev_mil'
+	$_drink['5,type'] = 'only_cost_mil'
 	$_drink['5,price'] = 200
 elseif $loc = 'city_coffee_hole':
 	$loc_arg = 'eat'

locations/katja_chat.qsrc

@@ -69,6 +69,7 @@ end
 
 if $ARGS[0] = 'uni_cafe':
 	menu_off = 1
+	minut += 15
 	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'chat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'Katja looks up from her lunch as you try to sit down opposite her.'

locations/kuhrPar.qsrc

@@ -133,7 +133,7 @@ if SchoolAtestat = 0:
 				if fame['pav_slut'] > 150 and motherKnowSpravka = 0:
 					'You''re about to respond when your mother interrupts you. "Of course not! She''s still too young to be thinking about boys!"'
 					'Kolka then chimes in. "Like any boy would date her when she sucks them all off anyways."'
-					'You mother turns towards Kolka. "That''s not funny! Apologize to your sister right now! Right now!"'
+					'Your mother turns towards Kolka. "That''s not funny! Apologize to your sister right now! Right now!"'
 					if locat['Anya'] = 12:
 						'Anya smirks as Kolka freezes in place and decides he doesn''t want to be the one to tell her about your reputation and just apologizes to you.'
 					else
@@ -143,7 +143,7 @@ if SchoolAtestat = 0:
 				elseif fame['pav_slut'] > 150:
 					'You''re about to respond when your mother interrupts you. "She''s too young to worry about that and... we talked about it." She gives you a meaningful glance and you shut your mouth.'
 					'Kolka then chimes in. "Like any boy would date her when she sucks them all off anyways."'
-					'You mother turns towards Kolka. "That''s not funny!" She then glances at you. "She might have made some mistakes, but she''s trying to be a better girl now. Now apologize to your sister right now!"'
+					'Your mother turns towards Kolka. "That''s not funny!" She then glances at you. "She might have made some mistakes, but she''s trying to be a better girl now. Now apologize to your sister right now!"'
 					if locat['Anya'] = 12:
 						'Anya just smirks as Kolka freezes in place and then apologizes to you.'
 					else
@@ -153,8 +153,8 @@ if SchoolAtestat = 0:
 				else
 					'You''re about to respond when your mother interrupts you. "Of course not! She''s still too young to be thinking about boys!"'
 					'Your stepfather sighs. "She''s old enough to start dating, dear."'
-					'You mother gives him a hard stare. "No, she isn''t. She needs to focus on school and then university before she can start thinking about boys."'
-					'You stepfather decides to drop it and start talking about some of the stuff that happened at his work. All and all, you have a fairly enjoyable dinner.'
+					'Your mother gives him a hard stare. "No, she isn''t. She needs to focus on school and then university before she can start thinking about boys."'
+					'Your stepfather decides to drop it and start talking about some of the stuff that happened at his work. All and all, you have a fairly enjoyable dinner.'
 				end
 				act 'Get up from the table': gt $loc, $loc_arg
 			end

locations/nerd_game_night.qsrc

@@ -276,7 +276,7 @@ if $ARGS[0] = 'keep_playing_on1':
 				'The time quickly flies by before Feofan interrupts and stops the game as it''s getting late and he has to get home.'
 				*nl
 				'You hear a disappointing sigh go through the room as everybody stops and closes their handbooks. The group is still buzzing and you chat for some time about the twists and turns during one of the encounters.'
-				'As you''re about to leave, Feofan speaks up. "Don''t worry, we''ll continue this story event next time." He then turns to you. "It was fun having you around, <<$pcs_nickname>>. I hope you had fun and will join us again next time." The group then gather up their books and walk out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+				'As you''re about to leave, Feofan speaks up. "Don''t worry, we''ll continue this story event next time." He then turns to you. "It was fun having you around, <<$pcs_nickname>>. I hope you had fun and will join us again next time." The group then gather up their books and head out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 				act 'Leave': gt 'pav_commcenter', 'lobby'
 				act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 			end
@@ -417,7 +417,7 @@ if $ARGS[0] = 'keep_playing_on2':
 				'The tension rises before easing up as the others tease Petka about his unfortunate choice of words. You tell him you''re fine and to return to camp before you finish bathing, get dressed and head back yourself. After you do, the rest of the group follow your lead and one by one, their characters all go and bathe as well, apparently enjoying the more immersive role-playing you''re doing.'
 				*nl
 				'As the party beds down for the night, you and the others keep teasing Petka throughout the rest of the game as it nears the end.'
-				'"We''re out of time," Feofan announces and you and the rest of the group let out a sigh. "Don''t worry, there are lots of adventures left to explore. We''ll pick it up next time. Hopefully Petka will get to see <<$pcs_nickname>> naked again..." he says with a wink, which gets everyone laughing again as Petka blushes once more. The group then gather up their books and walk out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+				'"We''re out of time," Feofan announces and you and the rest of the group let out a sigh. "Don''t worry, there are lots of adventures left to explore. We''ll pick it up next time. Hopefully Petka will get to see <<$pcs_nickname>> naked again..." he says with a wink, which gets everyone laughing again as Petka blushes once more. The group then gather up their books and head out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 				act 'Leave': gt 'pav_commcenter', 'lobby'
 				act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 			end
@@ -482,7 +482,7 @@ if $ARGS[0] = 'game_night3':
 								if $loc = 'city_coffee_hole':
 									'The whole group meets up and starts showing off what they got. "We didn''t manage to buy anything either. No one wanted to accept our gold!" Julia exhales.'
 									'"Yeah, we''ll have to save the gold for another time. We''ll surely come across someone that will accept it!" Artem exclaims while throwing an eye towards Feofan.'
-									'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can always go find another adventure," Gerasim adds.'
+									'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can always go find another adventure," Gerasim adds.'
 									*nl
 									'Petka jumps in excitedly. "I found the brothel, if that''s any consolation."'
 									'"Isn''t your character a girl?" Artem replies.'
@@ -500,7 +500,7 @@ if $ARGS[0] = 'game_night3':
 										act 'Back to the game':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the shop. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 											act 'Leave': gt 'city_coffee_hole', 'inner'
 											act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 										end
@@ -508,13 +508,13 @@ if $ARGS[0] = 'game_night3':
 								else
 									'The whole group meets up and starts showing off what they got. "We didn''t manage to buy anything either. No one wanted to accept our gold!" Julia exhales.'
 									'"Yeah, we''ll have to save the gold for another time. We''ll surely come across someone that will accept it!" Artem exclaims while throwing an eye towards Feofan.'
-									'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can always go find another adventure," Gerasim adds.'
+									'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can always go find another adventure," Gerasim adds.'
 									*nl
 									'Petka jumps in excitedly. "I found the brothel, if that''s any consolation."'
 									'"Isn''t your character a girl?" Artem replies.'
 									'Petka blushes. "Yeah? So?"'
 									'Artem laughs. "Why would she need a brothel?"'
-									'Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+									'Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and head out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 									act 'Leave': gt 'pav_commcenter', 'lobby'
 									act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 								end
@@ -536,7 +536,7 @@ if $ARGS[0] = 'game_night3':
 								if $loc = 'city_coffee_hole':
 									'You meet up with a cheerful Julia and Zinaida. "Who knew that our usually quiet Zinaida was quite the sweet talker. She managed to get us some potions."'
 									'"And we got new weapons!" Artem chimes in.'
-									'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can go on our next adventure," Gerasim adds.'
+									'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can go on our next adventure," Gerasim adds.'
 									*nl
 									'Petka jumps in excitedly. "To top it off, I found the brothel!"'
 									'"Isn''t your character a girl?" Artem replies.'
@@ -554,7 +554,7 @@ if $ARGS[0] = 'game_night3':
 										act 'Back to the game':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the shop. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 											act 'Leave': gt 'city_coffee_hole', 'inner'
 											act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 										end
@@ -562,13 +562,13 @@ if $ARGS[0] = 'game_night3':
 								else
 									'You meet up with a cheerful Julia and Zinaida. "Who knew that our usually quiet Zinaida was quite the sweet talker. She managed to get us some potions."'
 									'"And we got new weapons!" Artem chimes in.'
-									'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can go on our next adventure," Gerasim adds.'
+									'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can go on our next adventure," Gerasim adds.'
 									*nl
 									'Petka jumps in excitedly. "To top it off, I found the brothel!"'
 									'"Isn''t your character a girl?" Artem replies.'
 									'Petka blushes. "Yeah? So?"'
 									'Artem laughs. "Why would she need a brothel?"'
-									'Everyone starts laughing and you spend some time looking at the stuff you''ve managed to acquire before your party heads to the local tavern, where they drink and eat. "I can''t wait to see how all of this plays out!" someone comments before Feofan calls a stop for the day. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+									'Everyone starts laughing and you spend some time looking at the stuff you''ve managed to acquire before your party heads to the local tavern, where they drink and eat. "I can''t wait to see how all of this plays out!" someone comments before Feofan calls a stop for the day. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and head out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 									act 'Leave':gt 'pav_commcenter', 'lobby'
 									act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 								end
@@ -586,7 +586,7 @@ if $ARGS[0] = 'game_night3':
 								if $loc = 'city_coffee_hole':
 									'Julia and Zinaida are looking dejected. "We didn''t manage to get rid of the gold. The shopkeeper wasn''t having any of it..." They quickly turn ecstatic when they see all the goods you''ve brought with you.'
 									'"Maybe we should send <<$pcs_nickname>> to have a chat with the shopkeeper too." Several of them congratulate you as you all discuss the different armors and weapons you''ve managed to acquire.'
-									'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can go on our next adventure," Gerasim adds.'
+									'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can go on our next adventure," Gerasim adds.'
 									*nl
 									'Petka jumps in excitedly. "And I found the brothel!"'
 									'"Isn''t your character a girl?" Artem replies.'
@@ -606,7 +606,7 @@ if $ARGS[0] = 'game_night3':
 										act 'Back to the game':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the shop. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+											'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 											act 'Leave': gt 'city_coffee_hole', 'inner'
 											act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 										end
@@ -614,13 +614,13 @@ if $ARGS[0] = 'game_night3':
 								else									
 									'Julia and Zinaida are looking dejected. "We didn''t manage to get rid of the gold. The shopkeeper wasn''t having any of it..." They quickly turn ecstatic when they see all the goods you''ve brought with you.'
 									'"Maybe we should send <<$pcs_nickname>> to have a chat with the shopkeeper too?" Several of them congratulate you as you all discuss the different armors and weapons you''ve managed to acquire.'
-									'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can go on our next adventure," Gerasim adds.'
+									'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can go on our next adventure," Gerasim adds.'
 									*nl
 									'Petka jumps in excitedly. "And I found the brothel!"'
 									'"Isn''t your character a girl?" Artem replies.'
 									'Petka blushes. "Yeah? So?"'
 									'Artem laughs. "Why would she need a brothel?"'
-									'Everyone starts laughing and you spend some time looking at the stuff you''ve managed to acquire before your party heads to the local tavern, where they drink and eat. "Good job everyone! I can''t wait to see you use all these weapons at a later time," Feofan comments as it''s time to stop for the day. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+									'Everyone starts laughing and you spend some time looking at the stuff you''ve managed to acquire before your party heads to the local tavern, where they drink and eat. "Good job everyone! I can''t wait to see you use all these weapons at a later time," Feofan comments as it''s time to stop for the day. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 									act 'Leave':gt 'pav_commcenter', 'lobby'
 									act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 								end
@@ -666,7 +666,7 @@ if $ARGS[0] = 'game_night3':
 								'You meet the rest of the party and show off the goods to both some excitement and disappointment as you continue discussing what to do next.'
 								'Julia and Zinaida are looking cheerful. "Who knew that our usually quiet Zinaida was quite the sweet talker. She managed to get us some potions."'
 								'"We got a few new weapons," Artem chimes in.'
-								'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can go on our next adventure," Gerasim adds.'
+								'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can go on our next adventure," Gerasim adds.'
 								*nl
 								'Petka jumps in excitedly. "To top it off, I found the brothel!"'
 								'"Isn''t your character a girl?" Artem replies.'
@@ -686,7 +686,7 @@ if $ARGS[0] = 'game_night3':
 									act 'Back to the game':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-										'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the shop. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+										'Once Anushka is gone, you all get back into the game. Everyone starts laughing, disregarding that you haven''t really achieved any of your goals. As your party sits at the local tavern, drinking and eating, they all engage in some role-playing banter. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 										act 'Leave': gt 'city_coffee_hole', 'inner'
 										act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 									end
@@ -694,13 +694,13 @@ if $ARGS[0] = 'game_night3':
 							else									
 								'Julia and Zinaida are looking dejected. "We didn''t manage to get rid of the gold. The shopkeeper wasn''t having any of it..." They quickly turn ecstatic when they see all the goods you''ve brought with you.'
 								'"Maybe we should send <<$pcs_nickname>> to have a chat with the shopkeeper too?" Several of them congratulate you as you all discuss the different armors and weapons you''ve managed to acquire.'
-								'"We sold the trinkets to the local trader and managed to buy enough supplies for a couple of weeks, so we can go on our next adventure," Gerasim adds.'
+								'"We sold the trinkets to the local trader and managed to buy enough supplies to last us a few weeks, so we can go on our next adventure," Gerasim adds.'
 								*nl
 								'Petka jumps in excitedly. "And I found the brothel!"'
 								'"Isn''t your character a girl?" Artem replies.'
 								'Petka blushes. "Yeah? So?"'
 								'Artem laughs. "Why would she need a brothel?"'
-								'Everyone starts laughing and you spend some time looking at the stuff you''ve managed to acquire before your party heads to the local tavern, where they drink and eat. "Good job everyone! I can''t wait to see you use all these weapons at a later time," Feofan comments as it''s time to stop for the day. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+								'Everyone starts laughing and you spend some time looking at the stuff you''ve managed to acquire before your party heads to the local tavern, where they drink and eat. "Good job everyone! I can''t wait to see you use all these weapons at a later time," Feofan comments as it''s time to stop for the day. Shortly after that, the game night is over and you all help Feofan pack everything up before everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 								act 'Leave':gt 'pav_commcenter', 'lobby'
 								act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 							end
@@ -859,7 +859,7 @@ if $ARGS[0] = 'inform_them':
 			act 'Back to the game':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-				'Once Anushka is gone, you all get back into the game. "I''m not too fond of that, I''d rather do something else," Julia counters. The arguing then starts getting more intense as everyone tries to get their point across. The yelling gets louder and louder until Feofan gets fed up and slams the table. "Now that I have your attention! Since you can''t decide what you should do, I suggest you have a vote on it!"'
+				'Once Anushka is gone, you all get back into the game. "I''m not too fond of that, I''d rather do something else," Julia counters. The arguing starts getting more intense as everyone tries to get their point across, the yelling getting louder and louder until Feofan gets fed up and slams the table. "Now that I have your attention! Since you can''t decide what you should do, I suggest you have a vote on it!"'
 				'There''s a lot of loud moans. "I don''t care how you feel about it! Vote!" Feofan commands.'
 				act 'Vote for the mansion adventure': gt 'nerd_game_night', 'mansion_adventure'
 				act 'Vote to kill the Necromancer': gt 'nerd_game_night', 'necromancer_adventure'
@@ -869,7 +869,7 @@ if $ARGS[0] = 'inform_them':
 			end
 		else
 			'You return to the group and tell them about the different adventures you''ve discovered from the patrons of the tavern. They all listen attentively to what you have to say. "Well, I feel like we should go and bash that Necromancer''s head in!" Artem suggests with a smile.'
-			'"I''m not too fond of that, I''d rather do something else," Julia counters. The arguing then starts getting more intense as everyone tries to get their point across. The yelling gets louder and louder until Feofan gets fed up and slams the table. "Now that I have your attention! Since you can''t decide what you should do, I suggest you have a vote on it!"'
+			'"I''m not too fond of that, I''d rather do something else," Julia counters. The arguing starts getting more intense as everyone tries to get their point across, the yelling getting louder and louder until Feofan gets fed up and slams the table. "Now that I have your attention! Since you can''t decide what you should do, I suggest you have a vote on it!"'
 			'There''s a lot of loud moans. "I don''t care how you feel about it! Vote!" Feofan commands.'
 			act 'Vote for the mansion adventure': gt 'nerd_game_night', 'mansion_adventure'
 			act 'Vote to kill the Necromancer': gt 'nerd_game_night', 'necromancer_adventure'
@@ -887,7 +887,7 @@ if $ARGS[0] = 'mansion_adventure':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'
 	'Everyone takes turns voting while Feofan writes down the results. "Great! Now that the vote is decided, I suggest we call it for the day and pick up it next time."'
 	'"But we want to continue playing! We already know what adventure we''re going on!" Gerasim sighs.'
-	'"That''s it for today!" Feofan stands firm. "Everyone needs to calm down as this discussion got way out of line!" Everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+	'"That''s it for today!" Feofan stands firm. "Everyone needs to calm down as this discussion got way out of line!" Everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 	if $loc = 'city_coffee_hole':
 		act 'Leave': gt 'city_coffee_hole', 'inner'
 	else
@@ -902,7 +902,7 @@ if $ARGS[0] = 'necromancer_adventure':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'
 	'Everyone takes turns voting while Feofan writes down the results. "Great! Now that the vote is decided, I suggest we call it for the day and pick up it next time."'
 	'"But we want to continue playing! We already know what adventure we''re going on!" Gerasim sighs.'
-	'"That''s it for today!" Feofan stands firm. "Everyone needs to calm down as this discussion got way out of line!" Everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+	'"That''s it for today!" Feofan stands firm. "Everyone needs to calm down as this discussion got way out of line!" Everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 	if $loc = 'city_coffee_hole':
 		act 'Leave': gt 'city_coffee_hole', 'inner'
 	else
@@ -910,14 +910,14 @@ if $ARGS[0] = 'necromancer_adventure':
 	end
 	act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 end
-		
+
 if $ARGS[0] = 'treasure_map__adventure':
 	*clr & cla
 	nerd_game['treasure_map_adventure'] = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'
 	'Everyone takes turns voting while Feofan writes down the results. "Great! Now that the vote is decided, I suggest we call it for the day and pick up it next time."'
 	'"But we want to continue playing! We already know what adventure we''re going on!" Gerasim sighs.'
-	'"That''s it for today!" Feofan stands firm. "Everyone needs to calm down as this discussion got way out of line!" Everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+	'"That''s it for today!" Feofan stands firm. "Everyone needs to calm down as this discussion got way out of line!" Everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 	if $loc = 'city_coffee_hole':
 		act 'Leave': gt 'city_coffee_hole', 'inner'
 	else
@@ -934,8 +934,8 @@ if $ARGS[0] = 'game_night5':
 	grupvalue[3] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
-	'You quickly run up the stairs into the usual library room, not wanting to be late. Everyone else is already there, buzzing just like you. You''ve finally got an adventure to head out on and the tension from last week seems to have dissolved.'
-	'"Freaking finally, let''s head out of this god-forsaken village and on to a new adventure!" Zinaida exclaims.'
+	'As you arrive, you notice that the atmosphere is quite elated. The tension from last week seems to have dissolved and the group is ready for their next adventure.'
+	'"Freaking finally! Let''s head out of this god-forsaken village and on to a new adventure!" Zinaida exclaims.'
 	'"We just need to pack up and we''re good to go!" Gerasim replies.'
 	'The group quickly packs up everything from the rooms in the inn, pays for their stay and heads outside.'
 	act 'Leave the inn':
@@ -955,7 +955,7 @@ if $ARGS[0] = 'game_night5':
 				*nl
 				'Once Anushka is gone, you all get back into the game. You run into a few wandering encounters, but nothing too serious before your group stops to camp for the night. You expect to see Feofan pull out the map of your camp, but to everyone''s disappointment, he doesn''t. You look at each other in confusion, searching for some answers.'
 				'"That''s it for now," Feofan explains, but he''s quickly interrupted.'
-				'"What do you mean ''that''s it''? Where''s the next part? We voted for the adventure the last week!" Gerasim exclaims.'
+				'"What do you mean ''that''s it''? Where''s the next part? We voted for the adventure last week!" Gerasim exclaims.'
 				*nl
 				'Feofan chokes up a little. "I-I haven''t had time to finish the story. I didn''t know which one you would pick until last week and it takes me weeks to write the adventure and prepare the maps and stuff. It''ll take some time..."'
 				'The group immediately starts moaning and complaining about his lack of forward planning. "Great, just when it got good we need to stop... You are aware that we play this game mostly for the adventures, right?" Artem scoffs.'
@@ -966,7 +966,7 @@ if $ARGS[0] = 'game_night5':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
 					'You feel more disappointed than you expected, but now you wonder how long it will take him to set up the adventure and what you will do in the meantime. "What about next week? Are we not playing?" you ask, and the others nod in agreement.'
 					'Feofan holds up his hand. "I''ve got it covered! I recently acquired a few board games I think we''ll like. We can play those instead as I work on finishing the adventure."'
-					'There are a few grumbles, but the group seems curious. Zinaida even gets excited about one of the games he names, exclaiming it''s one she''s been wanting to try for a while. You all put your things away and spend the time chatting about the board games before moving onto the latest films, TV shows and books. Once time is up, everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+					'There are a few grumbles, but the group seems curious. Zinaida even gets excited about one of the games he names, exclaiming it''s one she''s been wanting to try for a while. You all put your things away and spend the time chatting about the board games before moving onto the latest films, TV shows and books. Once time is up, everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 					act 'Leave': gt 'city_coffee_hole', 'inner'
 					act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 				end
@@ -975,7 +975,7 @@ if $ARGS[0] = 'game_night5':
 			'As you''re heading out, you quickly throw one last gaze at the beautiful village map that Feofan painted. You gather just outside of town and everyone takes a second to double check the supplies to make sure you didn''t miss anything. Once everyone is sure, you head out in the direction of your next adventure. You run into a few wandering encounters, but nothing too serious before your group stops to camp for the night. You expect to see Feofan pull out the map of your camp, but to everyone''s disappointment, he doesn''t. You look at each other in confusion, searching for some answers.'
 			'"That''s it for now," Feofan explains, but he''s quickly interrupted.'
 			*nl
-			'"What do you mean ''that''s it''? Where''s the next part? We voted for the adventure the last week!" Gerasim exclaims.'
+			'"What do you mean ''that''s it''? Where''s the next part? We voted for the adventure ast week!" Gerasim exclaims.'
 			'Feofan chokes up a little. "I-I haven''t had time to finish the story. I didn''t know which one you would pick until last week and it takes me weeks to write the adventure and prepare the maps and stuff. It''ll take some time..."'
 			'The group immediately starts moaning and complaining about his lack of forward planning. "Great, just when it got good we need to stop... You are aware that we play this game mostly for the adventures, right?" Artem scoffs.'
 			'"I know," Feofan quickly replies. "That''s why I''m stopping it now. I need time to prepare as well as I did for the last adventure, so you''ll get the most out of it. You don''t want a half assed adventure, do you?"'
@@ -985,7 +985,7 @@ if $ARGS[0] = 'game_night5':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
 				'You feel more disappointed than you expected, but now you wonder how long it will take him to set up the adventure and what you will do in the meantime. "What about next week? Are we not playing?" you ask, and the others nod in agreement.'
 				'Feofan holds up his hand. "I''ve got it covered! I recently acquired a few board games I think we''ll like. We can play those instead as I work on finishing the adventure."'
-				'There are a few grumbles, but the group seems curious. Zinaida even gets excited about one of the games he names, exclaiming it''s one she''s been wanting to try for a while. You all put your things away and spend the time chatting about the board games before moving onto the latest films, TV shows and books. Once time is up, everyone gathers up their books and walks out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+				'There are a few grumbles, but the group seems curious. Zinaida even gets excited about one of the games he names, exclaiming it''s one she''s been wanting to try for a while. You all put your things away and spend the time chatting about the board games before moving onto the latest films, TV shows and books. Once time is up, everyone gathers up their books and heads out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 				act 'Leave':gt 'pav_commcenter', 'lobby'
 				act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 			end
@@ -1061,7 +1061,7 @@ if $ARGS[0] = 'board_games':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/board1.jpg"></center>'
 				'You continue playing with even more laughter and before you know it the game is over for the night. You all praise Feofan for picking a really good game.'
 				'Feofan responds as expected - haughty. "Ye, with little faith in me. Told you I would fix everything."'
-				'You all pile on him before clearing up. Once you pack everything up, you walk out of the library. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
+				'You all pile on him before clearing up. Once you pack everything up, you head out. Julia and Zinaida leave together, as do Artem and Petka. Gerasim and Feofan each leave on their own.'
 				act 'Leave':gt 'pav_commcenter', 'lobby'
 				act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 			end
@@ -1082,7 +1082,7 @@ if $ARGS[0] = 'summer_invite':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/activities/phone/text_indoor.jpg"></center>'
 
-	'You look at your phone and notice that Feofan has texted you. "Hey <<$pcs_nickname>>, we do a weekly game night. We mostly play Dungeons and Dragons and board games. I was talking to the others and we were wondering if you would like to join us? We have a few nights free this week and were wondering which night works best for you. We can do it either on <<$week[val(mid(temp,1,1))]>> or <<$week[val(mid(temp,2,1))]>>."'
+	'You look at your phone and notice that Feofan has texted you. "Hey <<$pcs_nickname>>, we do a weekly game night. We mostly play Dungeons and Dragons and board games. I was talking to the others and we were wondering if you would like to join us? We have a few nights free this week and were wondering which one works best for you. We can do it either on <<$week[val(mid(temp,1,1))]>> or <<$week[val(mid(temp,2,1))]>>."'
 	act 'Not interested <br><font color="red">This will block this story arc.</font>':
 		nerd_game['invite_day'] = 2147483647 & ! block the event
 		*clr & cla
@@ -1476,7 +1476,7 @@ if $ARGS[0] = 'summer_invite_sms':
 		nerd_game['invite_day'] = daystart
 	end
 
-	$VM['0'] = 'Hey <<$pcs_nickname>>, we do a weekly game night. We mostly play Dungeons and Dragons and board games. I was talking to the others and we were wondering if you would like to join us? We have a few nights free this week and were wondering which night works best for you. We can do it either on <<$week[val(mid(nerd_game[''lot''],1,1))]>> or <<$week[val(mid(nerd_game[''lot''],2,1))]>>.'
+	$VM['0'] = 'Hey <<$pcs_nickname>>, we do a weekly game night. We mostly play Dungeons and Dragons and board games. I was talking to the others and we were wondering if you would like to join us? We have a few nights free this week and were wondering which one works best for you. We can do it either on <<$week[val(mid(nerd_game[''lot''],1,1))]>> or <<$week[val(mid(nerd_game[''lot''],2,1))]>>.'
 
 		$VF['0a'] = 'Sorry, but I''m just not interested in stuff like that. Thanks for the invite though.'
 			$VM['1a'] = ':-( Oh... okay yeah I get it. Guess we''ll see you around.'
@@ -1625,7 +1625,7 @@ if $ARGS[0] = 'invite_uni':
 		nerd_game['invite_day'] = daystart
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big152.jpg"></center>'
-		'As you leave your last class of the day, Feofan walks over to you and smiles. "Hey <<$pcs_nickname>>, we do a weekly game night where we mostly play Dungeons and Dragons, but we sometimes play some board games. I was talking to the others and we were wondering if you would like to join us? We have a couple nights free this week and were wondering which night works best for you. We can do it either on Tuesday or Thursday evening."'
+		'As you leave your last class of the day, Feofan walks over to you and smiles. "Hey <<$pcs_nickname>>, we do a weekly game night where we mostly play Dungeons and Dragons, but we sometimes play some board games. I was talking to the others and we were wondering if you would like to join us? We have a few nights free this week and were wondering which one works best for you. We can do it either on Tuesday or Thursday evening."'
 		act 'Not interested <br><font color="red">This will block this story arc.</font>':
 			nerd_game['invite_day'] = 2147483647 & ! block the event
 			*clr & cla
@@ -1633,7 +1633,7 @@ if $ARGS[0] = 'invite_uni':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big152.jpg"></center>'
 			'You shake your head. "Sorry, but I''m not interested in stuff like that. Thanks for the invite though."'
-			'He looks disappointed "Oh... Okay, yeah I get it. Well, I guess we''ll see you around..." he mumbles before walk away.'
+			'He looks disappointed "Oh... Okay, yeah I get it. Well, I guess we''ll see you around..." he mumbles before walking away.'
 			gs 'nerd_game_night', 'invite_uni', 'exit'
 		end
 		act 'I have to study':
@@ -1642,7 +1642,7 @@ if $ARGS[0] = 'invite_uni':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big152.jpg"></center>'
 			'You shake your head. "Sorry, but I can''t this week. These classes are killing me and I''m going to have to put in extra studying this week."'
-			'He looks disappointed "Oh... Okay, yeah I understand. If you ever get a handle on your class let me know.... anyways I''ll go let the others know and maybe you can come next week? Talk to you later." He walks away before you can reply.'
+			'He looks disappointed "Oh... Okay, yeah I understand. If you ever get a handle on your class let me know.... Anyway, I''ll go let the others know and maybe you can come next week? Talk to you later." He walks away before you can reply.'
 			gs 'nerd_game_night', 'invite_uni', 'exit'
 		end
 		act 'I''m busy':
@@ -1686,7 +1686,7 @@ if $ARGS[0] = 'crash_gamenight_uni':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/gamenight.jpg"></center>'
 	if grupTipe = 3:
 		if nerd_game['game_day'] = daystart and (hour*60+minut < 22*60+30):
-			'As you walk over to their table everyone freezes and looks your way. When they see you, they relax and go back to playing their game.'
+			'As you walk over to their table, everyone freezes and looks your way. When they see you, they relax and go back to playing their game.'
 			'As you''re about to ask what they''re doing, Feofan speaks up. "Hey <<$pcs_nickname>>! We''re almost done, but it''s not too late to join."'
 			'You smile and shake your head. "I just wanted to talk to one of you is all."'
 			'They all exchange looks and then look back at you as Feofan nods. "Okay. Can it wait until we finish at 11pm?"'
@@ -1703,7 +1703,7 @@ if $ARGS[0] = 'crash_gamenight_uni':
 		end
 	else
 		if nerd_game['game_day'] = daystart and (hour*60+minut < 22*60+30):
-			'As you walk over to their table everyone freezes and looks your way. You can feel the anxious looks from the group sitting around a table that has all sorts of geeky stuff spread across it.'
+			'As you walk over to their table, everyone freezes and looks your way. You can feel the anxious looks from the group sitting around a table that has all sorts of geeky stuff spread across it.'
 			'As you''re about to ask what they''re doing, Feofan speaks up. "Can we help you?"'
 			'You smile to reassure them that you''re not here to mess with them. "I just wanted to talk to one of you is all."'
 			'They all exchange looks and then look back at you, Feofan being the one to speak up again. "Can it wait until we finish at 11pm?"'
@@ -1711,7 +1711,7 @@ if $ARGS[0] = 'crash_gamenight_uni':
 			act 'Leave': gt 'city_coffee_hole', 'inner'
 			act 'Wait for game to end': minut = 23*60 - (hour*60+minut) & gt 'nerd_game_night', 'nerd_chat'
 		else
-			'Upon entering the room, everyone freezes and looks your way. You can feel the anxious looks from the group standing around a table packing up all their geeky stuff.'
+			'As you walk over to their table, everyone freezes and looks your way. You can feel the anxious looks from the group standing around a table packing up all their geeky stuff.'
 			'As you''re about to ask what they''re doing, Feofan speaks up. "Can we help you?"'
 			'You smile to reassure them that you''re not here to mess with them. "I just wanted to talk to one of you is all."'
 			'They all exchange looks and then look back at you, Feofan being the one to speak up again. "Oh. Okay...." You can tell they''re all wondering who it is you came to speak with.'

locations/strela.qsrc

@@ -5,7 +5,7 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/Strela/strela1.jpg"></center>'
 'When you approach Fedor, he guides you to the group that just arrived at the school. You look around the group and recognize Vitek, Dan and Vasily. Most of the others have criminal tattoos and look quite intimidating; you recognize the fat older man to be Vadim Bely, a local crime lord. He motions for Fedor to come closer to him, "So... you''re Fedor Kozlov? My dear friend Viktor here tells me you were very disrespectful to him."'
 'He nods over at Vitek. "You can''t just go stealing other people''s girls, Fedor. That''s not how the world works." The guys circle in around the two of you, and even though no one pays you any heed, you feel very uncomfortable being here.'
-*nl	
+*nl
 'Vadim continues, "Nevertheless, that''s not why I''m here. I know how girls can be. They change their mind all the time... you can sort that out amongst yourselves. It gets personal when you are rude to Vitek. No one treats a friend of mine like that. Why didn''t you show him some respect, Fedor?" Fedor is thoroughly intimidated by the guys, and mutters, "But... they started it..."'
 
 act 'Listen':
@@ -36,9 +36,9 @@ act 'Listen':
 			'Vasily, in a fake voice as if he were trying to cheer Fedor up, says, "No one says you''re a faggot. You''re being offered a way out. Either you suck my dick, go home and tell your parents to sell their house before tomorrow, or start losing fingers. Those are your only options. Do you even realize how much trouble you''re in?"'
 			*nl
 			'As Fedor breaks down and cries, he drops to his knees and continues to beg, "Please guys, I don''t have that kind of money... Vitek, I''m sorry... please..."'
-			'Vadim looks at him indifferently and says, "This is taking way too long. I have other places to be today.'		
+			'Vadim looks at him indifferently and says, "This is taking way too long. I have other places to be today.'
 			'Wipe the snot from your face and make a decision. You have one minute." Vasily, still using his mocking supportive voice, encourages him as he unbuttons his pants, "Don''t be foolish. You can erase your debt within a few minutes."'
-			
+
 			if money >= 30000:
 				act 'Pay the money for Fedor (30,000 <b>₽</b>)':
 					*clr & cla
@@ -60,12 +60,12 @@ act 'Listen':
 					'As they leave, Fedor comes over to you and mumbles, "<<$pcs_firstname>>, thank you! Thank you so much... you saved me. I''ll pay you back, I promise! I can''t pay it all at once, but I will try to save up." You assure him that''s not necessary and get ready to leave the school grounds.'
 
 					act 'Leave the school courtyard':gt 'pav_residential'
-				end	
-			end		
-		
+				end
+			end
+
 			act 'Don''t interfere':
 				*clr & cla
-				$npc_notes[5] = 'Ever since Fedor gave Vasily a blowjob in the school courtyard, everyone calls him Masha.'
+				$npc_notes['A5'] = 'Ever since Fedor gave Vasily a blowjob in the school courtyard, everyone calls him Masha.'
 				npc_rel['A5'] = 50
 				hotcat_rating['A5'] = 6
 				npc_grupTipe['A5'] = 5

locations/uni_admin.qsrc

@@ -174,7 +174,7 @@ if $ARGS[0] = 'enrollment_semester':
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_3', 'assessment 201', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_3', 'learning theories 201', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'general education 201', ((class['uni_teaching_studies_semester_1_general education 101_grade'] + class['uni_teaching_studies_semester_2_general education 102_grade'])/6+10)
-					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'learning theories 201', (class['uni_teaching_studies_semester_1_teaching methods 101_grade']/3+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'learning theories 201', (class['uni_teaching_studies_semester_1_learning theories 101_grade']/3+10)
 					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'assessment 201', 35
 				elseif university['enrolled_in_semester'] = 4:
 					!!This creates the classes for the fourth semester of the teaching program to be used by the grade system, and gives the player a starting grade value (which is a failing grade, the player have to study if they want to pass)
@@ -182,7 +182,7 @@ if $ARGS[0] = 'enrollment_semester':
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_4', 'learning theories 202', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_4', 'psychology of a student 201', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_4', 'general education 202', ((class['uni_teaching_studies_semester_1_general education 101_grade'] + class['uni_teaching_studies_semester_2_general education 102_grade'] + class['uni_teaching_studies_semester_3_general education 201_grade'])/9+10)
-					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_4', 'learning theories 202', ((class['uni_teaching_studies_semester_1_teaching methods 101_grade'] + class['uni_teaching_studies_semester_3_teaching methods 201_grade'])/6+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_4', 'learning theories 202', ((class['uni_teaching_studies_semester_1_learning theories 101_grade'] + class['uni_teaching_studies_semester_3_learning theories 201_grade'])/6+10)
 					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_4', 'psychology of a student 201', (class['uni_teaching_studies_semester_2_psychology of a student 101_grade']/3+10)
 				end
 				cla

locations/uni_cafe.qsrc

@@ -10,18 +10,22 @@ if $ARGS[0] = '':
 	$location_type = 'public_indoors'
 	gs 'stat'
 	gs 'katja_meynold_schedule'
+	!!gs 'albina_uni_schedule'
 	gs 'themes', 'indoors'
-	'<center><b><font color="maroon">University cafe</font></b></center>'
+	'<center><b><font color="maroon">University Cafe</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_cafe.jpg"></center>'
 	*nl
-	'The University cafe, a well-known meeting point for the students attending the university. Students spend their days here, either preparing for their exams or just to unwind from their busy schedule.'
-	'The cafe offers a rich variation of reasonably priced food and beverages. There is also free wi-fi, even if it''s wonky at best, and you can often overhear students complain about it.'
+	'The university cafe is a popular spot for students preparing for their exams or just unwinding from their busy schedule.'
+	'It offers a rich variation of reasonably priced food and beverages. You can often overhear students complaining about the free, yet somewhat sub-par quality wi-fi.'
 	if locat['katja'] = 28:
-		'You see '+iif( katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'a redheaded girl', '<a href="exec:gt ''katja_chat'', ''uni_cafe''">Katja</a>')+' sitting  at a table eating her lunch.'
+		'You see '+iif(katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'a cute redheaded girl', '<a href="exec:gt ''katja_chat'', ''uni_cafe''">Katja</a>')+' sitting at a table eating her lunch.'
 	end
 	
-	gs 'uni_cafe', 'menu'
+	!!if locat['albina'] = 13:
+		!!'You see '+iif(AlbinaQW['know_albina_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'an attractive looking brunette', '<a href="exec:gt ''albina_uni'', ''lunch_chat''">Albina</a>')+' sitting at one of the tables, eating her lunch while texting on her phone.'
+	!!end
 	
+	gs 'uni_cafe', 'menu'
 	
 	act 'Leave': gt 'uni_grounds', 'main'
 	if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
@@ -53,14 +57,21 @@ if $ARGS[0] = 'sitting_choice':
 		$loc_arg = ''
 		act 'Eat your lunch with Katja': gt 'katja_chat', 'uni_cafe'
 	end
+	
+	!!if locat['albina'] = 13 and npc_rel['A23'] >= 70 or AlbinaQW['know_albina_uni'] = 2:
+		!!$loc = 'uni_cafe'
+		!!$loc_arg = ''
+		!!act 'Eat your lunch with Albina': gt 'albina_uni', 'lunch_chat'
+	!!end
 
-	act 'Eat you lunch alone':
+	act 'Eat your lunch alone':
 		!!this is a variable to use in npc''s chats to see if you have lunch to eat together with them. Should be set to zero after it is checked in their chat.
 		*clr & cla
+		minut += 15
 		uni_lunch_bought = 0
-		'<center><b><font color="maroon">University cafe</font></b></center>'
+		'<center><b><font color="maroon">University Cafe</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_cafe.jpg"></center>'
-		'You sit down and eat your lunch alone and<<$mtxt>>'
+		'You sit down and eat your lunch alone and <<$mtxt>>'
 		gs 'stat'
 		
 		act 'Leave': gt 'uni_grounds', 'main'

locations/uni_dorm.qsrc

@@ -84,12 +84,25 @@ if $ARGS[0] = 'start':
 			act 'I''m here to visit Katja':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
-				'You walk over to the counter and pull out your ID. "I''m here to visit katja Meynold."' 
-				'The woman smiles. "You are one of Katja''s friends" she says "She is such a sweet girl." she then let''s you in and you thank her and head for the elevator.'
+				'You walk over to the counter and pull out your ID. "I''m here to visit Katja Meynold."' 
+				'The woman smiles. "You''re one of Katja''s friends?" she asks. "She''s such a sweet girl. She''s on the second floor."'
+				'She lets you in and you thank her before heading for the elevator.'
 
 				act 'Take the elevator':gt 'uni_dorm', 'elevator'
 			end
-		end	
+		end
+
+		!!if AlbinaQW['dorm_invite'] = 1 and yearstart > 1 and hour >= 8 and hour < 22:
+			!!act 'I''m here to visit Albina':
+				!!*clr & cla
+				!!'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
+				!!'You walk over to the counter and pull out your ID. "I''m here to visit Albina Barlovskaya."' 
+				!!'"Oh. Her," the woman says with a frown. "That girl needs discipline. Strolling in here like she owns the place after spending the night in a place like <i>that</i>. Her mother should be ashamed of herself for raising such a slut!"'
+				!!'She gives you a judgmental stare. "Your ''friend'' is on the seventh floor, room 707." She points you at the elevator before going back to what she was doing.'
+				!!'You''ve better things to do than stand around and argue with her, so you head for the elevator.'
+				!!act 'Take the elevator': gt 'uni_dorm', 'elevator'
+			!!end
+		!!end
 	end
 end
 
@@ -115,15 +128,16 @@ if $ARGS[0] = 'elevator':
 	end
 	act 'Go to the second floor': gt 'uni_dorm', 'second_floor'
 	act 'Go to the sixth floor': gt 'uni_dorm', 'sixth_floor'
+	!!act 'Go to the seventh floor': gt 'uni_dorm', 'seventh_floor'
 	act 'Go to the eighth floor': gt 'uni_dorm', 'eighth_floor'
 	act 'Go to the tenth floor': gt 'uni_dorm', 'tenth_floor'
 end
 
 if $ARGS[0] = 'second_floor':
 	$loc = 'uni_dorm'
-	$loc_arg = 'sixth_floor'
+	$loc_arg = 'second_floor'
 	$menu_loc = 'uni_dorm'
-	$menu_arg = 'sixth_floor'
+	$menu_arg = 'second_floor'
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
@@ -137,17 +151,17 @@ if $ARGS[0] = 'second_floor':
 	act 'Elevator': gt 'uni_dorm', 'elevator'
 
 	if katjaQW['knows_dorm_room_number'] > 0 and yearstart > 1:
-		act 'katja''s room':
+		act 'Katja''s room':
 			*clr & cla 
 			if locat['katja']  = 31:
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'Katja opens the door. "Hi <<$pcs_nickname>>, come in?" she stands aside so you can walk in before closing the door behind you.'
+				'Katja opens the door. "Hey <<$pcs_nickname>>, come on in!" She stands aside to let you enter before closing the door behind you.'
 
 				act 'Enter': gt 'katja_dorm', 'start'
 			else
 				if locat['katja'] = 29 and sofiaQW['know'] = 1 and rand(0,3) = 0 and week < 5:
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big260.jpg"></center>'
-					'Sofia opens the door. "Hi <<$pcs_nickname>>, Katja is at the library right now and I have Maxim over so I don''t have time to talk. See you later." she says before closing the door again.'			
+					'Sofia opens the door. "Hey, <<$pcs_nickname>>! Katja is at the library right now and I have Maxim over so I don''t have time to talk. See you later!" she says before closing the door.'			
 				else
 					'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 					'You knock on the door, but no one answers. She must be asleep or not home.'
@@ -182,7 +196,7 @@ if $ARGS[0] = 'sixth_floor':
 			*clr & cla 
 			if (week <= 4 and hour >= 16 and hour < 23 and rand(1, 2) = 2) or (week = 6 and hour >= 9 and hour < 23 and rand(1, 2) = 2) or (week = 7 and hour >= 9 and hour < 23 and rand(1, 3) >= 2):
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big83.jpg"></center>'
-				'Gosha opens the door. "Hey <<$pcs_nickname>>, why don''t you come in?" He stands aside so you can walk in before closing the door behind you.'
+				'Gosha opens the door. "Hey <<$pcs_nickname>>, why don''t you come in?" He stands aside tp let you enter before closing the door behind you.'
 
 				act 'Enter':gt 'gosha', 'gosha_room'
 			else
@@ -197,6 +211,63 @@ if $ARGS[0] = 'sixth_floor':
 	end
 end
 
+if $ARGS[0] = 'seventh_floor':
+	$loc = 'uni_dorm'
+	$loc_arg = 'seventh_floor'
+	$menu_loc = 'uni_dorm'
+	$menu_arg = 'seventh_floor'
+	menu_off = 0
+	$location_type = 'public_indoors'
+	killvar '$locclass'
+	minut += 1
+	gs 'albina_uni_schedule'
+	gs 'stat'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
+	'Before you is the usual dorm hallway with the dilapidated walls of the seventh floor. You can hear music and loud talking from drunk students escaping from some rooms.'
+
+	act 'Elevator': gt 'uni_dorm', 'elevator'
+	
+	if AlbinaQW['dorm_invite'] = 1 and yearstart > 1:
+		act 'Albina''s room':
+			*clr & cla 
+			if locat['albina'] = 7 or locat['albina'] = 8 or locat['albina'] = 10:
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
+				'You knock on the door, and after a few seconds, Albina opens it. "<<$pcs_nickname>>! Come in, come in." She stands aside to let you enter before closing the door behind you.'
+				act 'Enter': gt 'albina_dorm', 'start'
+			elseif locat['albina'] = 15:
+				if AlbinaQW['stripper'] = 1:
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
+					'Just as you''re about to knock on the door, it flies open and Albina walks out with a large bag slung over her shoulder. She''s in such a hurry that she almost collides with you. "Oh. Sorry, <<$pcs_nickname>>. I didn''t see you there."'
+					'"Clearly," you reply as you look at her bag. "Off to work?" you whisper and she nods.'
+					'"Yes, and I''m going to be late if I don''t get a move on. Talk to you later, <<$pcs_nickname>>!" She hurries off without another word, leaving you alone in the hallway.'
+					act 'Leave': gt 'uni_dorm', 'seventh_floor' & minut += 2
+				else
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
+					'Just as you''re about to knock on the door, it flies open and Albina walks out with a large bag slung over her shoulder. She''s in such a hurry that she almost collides with you. "Oh. Sorry, <<$pcs_nickname>>. I didn''t see you there."'
+					'"Clearly," you reply as you look at her bag. "Why are you in such a rush?" you ask, but she brushes you aside.'
+					'"I just have somewhere I need to be and need to go now before I''m late. I''ll talk to you some other time, <<$pcs_nickname>>." She hurries off without another word, leaving you alone and confused in the hallway.'
+					act 'Leave': gt 'uni_dorm', 'seventh_floor' & minut += 2
+				end
+			elseif locat['albina'] = 16:
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
+				'You knock on the door, but there''s no answer.'
+				if AlbinaQW['stripper'] = 1:
+					'You then remember what day it is and realise that she''s at work and won''t be back until the early hours of the morning, so you head back to the elevator.'
+					act 'Leave':gt 'uni_dorm', 'elevator'
+				else
+					'You have no idea where she would be at this time of night, so you head back to the elevator.'
+					act 'Leave':gt 'uni_dorm', 'elevator'
+				end
+			else
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
+				'You knock on the door, but there''s no answer. She''s either still asleep or isn''t home.'
+				act 'Leave':gt 'uni_dorm', 'elevator'
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'eighth_floor':
 	$loc = 'uni_dorm'
 	$loc_arg = 'eighth_floor'
@@ -218,7 +289,7 @@ if $ARGS[0] = 'eighth_floor':
 			*clr & cla
 			if (week <= 4 and hour >= 16 and hour < 23 and rand(1, 2) = 2) or (week = 6 and hour >= 9 and hour < 23 and rand(1, 2) = 2) or (week = 7 and hour >= 9 and hour < 23 and rand(1, 3) >= 2):
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You knock on the door. After a few seconds, Djibril opens the door. He smiles as he notices it''s you. "I was hoping you would stop by <<$pcs_nickname>>. Come on in."'
+				'You knock on the door, and after a few seconds, Djibril opens it. He smiles as he notices it''s you. "I was hoping you would stop by <<$pcs_nickname>>. Come on in."'
 
 				act 'Enter': gt 'djibril', 'djibril_room'
 			else
@@ -239,7 +310,7 @@ if $ARGS[0] = 'eighth_floor':
 				if kendra_busy ! daystart:
 					if rand(1,5) = 1:
 						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
-						'You can hear Kendra''s voice as you get close to the door. It is fairly loud and sounds harsh in tone, but you can''t quite make out what she is saying. You hear a muffled reply that sounds male. It sounds like she''s already busy. You could knock or just leave her to her company.'
+						'You can hear Kendra''s voice as you get close to the door. It''s fairly loud and sounds harsh in tone, but you can''t quite make out what she''s saying. You hear a muffled reply that sounds male. It sounds like she''s already busy. You could knock or just leave her to her company.'
 
 						act 'Leave':gt 'uni_dorm', 'eighth_floor'
 						act 'Knock':
@@ -247,18 +318,16 @@ if $ARGS[0] = 'eighth_floor':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
 							if npc_rel['A84'] < 40:
-								'You knock on the door. After a few seconds, Kendra opens the door. She is completely naked and wearing a strapon harness around her hips. A large black dildo is attached to it and she plays with it as she frowns at you. "I told you last time, I don''t have time for games and I''m tired of yours! Now get lost, I''m busy!" She then slams the door in your face.'
+								'You knock on the door, and after a few seconds, Kendra opens it. She is completely naked and wearing a strapon harness around her hips. She plays with the large black dildo attached to it as she frowns at you. "I told you last time, I don''t have time for games and I''m tired of yours! Now get lost, I''m busy!" She then slams the door in your face.'
 
 								act 'Leave':gt 'uni_dorm', 'eighth_floor'
 							else
 								if kendra_male_slave = 0:
-									'You knock on the door. After a few seconds, Kendra opens the door. She is completely naked and wearing a strapon harness around her hips. A large black dildo is attached to it and she plays with it as she looks at you. "Well if it isn''t my new favorite white slave bitch. I''m kind of busy punishing one of my other slaves right now."'
-									*nl
-									'She starts to close the door before you can reply, then stops and smiles at you. "You could come in and watch." She holds the door open and stands aside to let you enter. You glance in the room and see a naked college boy kneeling next to the couch. When he notices you, he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she''s going to do to him, but is it something you want to watch? It could be interesting and you might learn something from her as well. On the other hand, do you want to humiliate him more than he already is?'
+									'You knock on the door, and after a few seconds, Kendra opens it. She is completely naked and wearing a strapon harness around her hips. She plays with the large black dildo attached to it as she looks at you.  "Well if it isn''t my new favorite white slave bitch. I''m kind of busy punishing one of my other slaves right now."'
+									'She starts to close the door before you can reply, then stops and smiles at you. "You could come in and watch." She holds the door open and stands aside to let you enter. You glance into the room and see a naked college boy kneeling next to the couch. When he notices you, he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she''s going to do to him, but is it something you want to watch? It could be interesting and you might learn something from her as well. On the other hand, do you want to humiliate him more than he already is?'
 								else
-									'You knock on the door. After a few seconds, Kendra opens the door. She is completely naked and wearing a strapon harness around her hips. A large black dildo is attached to it and she plays with it as she looks at you. "Well if it isn''t my new favorite white slave bitch. I''m punishing one of the boys again. Want to come in and watch again?"'
-									*nl
-									'She holds the door open and stands aside to let you enter. You glance in the room and see the same college boy kneeling naked next to the couch, just like last time. When he notices you, he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You know what she''s going to do to him after watching last time. Is it something you want to watch again? Is this something you might want to learn to do to others yourself? There are a few boys you know that it might be fun to do it with.'
+									'You knock on the door. After a few seconds, Kendra opens the door. She is completely naked and wearing a strapon harness around her hips. She plays with the large black dildo attached to it as she looks at you. "Well if it isn''t my new favorite white slave bitch. I''m punishing one of the boys again. Want to come in and watch again?"'
+									'She holds the door open and stands aside to let you enter. You glance into the room and see the same college boy kneeling naked next to the couch, just like last time. When he notices you, he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You know what she''s going to do to him after watching last time. Is it something you want to watch again? Is this something you might want to learn to do to others yourself? There are a few boys you know that it might be fun to do it with.'
 								end
 								gs 'arousal', 'erotic_nudity', 3
 								gs 'stat'
@@ -269,10 +338,10 @@ if $ARGS[0] = 'eighth_floor':
 									'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
 									if kendra_male_slave = 0:
 										'You shake your head. "No thanks. You look busy and I don''t want to disturb you..."'
-										'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you in time. Maybe next time then." She closes the door and you watch her stroking her strapon as she heads for the young man. Once the door is closed, you turn and leave.'
+										'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you in time. Maybe next time then." She closes the door and you turn to leave.'
 									else
 										'You shake your head. "No thanks. Last time was entertaining, but I didn''t come to see that again."'
-										'She laughs loudly and roughly grabs your chin in her hand. "Your loss. I might have let you take a turn with him, or maybe not." She closes the door and you watch her stroking her strapon as she heads for the young man. Once the door is closed, you turn and leave.'
+										'She laughs loudly and roughly grabs your chin in her hand. "Your loss. I might have let you take a turn with him, or maybe not." She closes the door and you turn to leave.'
 									end
 									gs 'arousal', 'end'
 									gs 'stat'
@@ -284,18 +353,18 @@ if $ARGS[0] = 'eighth_floor':
 					else
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 						if npc_rel['A84'] < 40:
-							'You knock on the door. After a few seconds, Kendra opens the door. "I told you last time, I don''t have time for games and I''m tired of yours. Now get lost." She slams the door in your face.'
+							'You knock on the door, and after a few seconds, Kendra opens it. "I told you last time, I don''t have time for games and I''m tired of yours. Now get lost." She slams the door in your face.'
 
 							act 'Leave':gt 'uni_dorm', 'eighth_floor'
 						else
-							'You knock on the door. After a few seconds, Kendra opens the door. "Well if it isn''t my new favorite white slave bitch. Come in." She stands aside to let you enter. She then closes the door behind you.'
+							'You knock on the door, and ater a few seconds, Kendra opens it. "Well if it isn''t my new favorite white slave bitch. Come in." She stands aside to let you enter before closing the door behind you.'
 
 							act 'Enter': gt 'kendra', 'kendra_room_start'
 						end
 					end
 				else
 					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
-					'You can hear Kendra''s voice as you get close to the door. It is fairly loud and sounds harsh in tone, but you can''t quite make out what she is saying. You do hear a muffled reply that sounds male. It sounds like she''s busy right now, so you shouldn''t bother her.'
+					'You can hear Kendra''s voice as you get close to the door. It''s fairly loud and sounds harsh in tone, but you can''t quite make out what she''s saying. You do hear a muffled reply that sounds male. It sounds like she''s busy right now, so you shouldn''t bother her.'
 
 					act 'Leave':gt 'uni_dorm', 'eighth_floor'
 				end
@@ -453,8 +522,7 @@ if $ARGS[0] = 'dorm_room':
 	end
 
 	if komp = 1:
-		!! It is possible to say that the University Wifi filters out porn and webcam sites, in which case will need to
-		!! allow the player to chose mobile net to watch porn or do webcam shows.
+		!! It is possible to say that the university Wifi filters out porn and webcam sites, in which case will need to allow the player to choose mobile net to watch porn or do webcam shows
 		gs 'internet_mobile', 'get_access', 'free'
 		!!TODO: This is for now until we decide how to handle these two with different scenarios
 		!! 1. Sveta knows Vika is a slut but still keeps the pristine facade

locations/uni_library.qsrc

@@ -11,6 +11,7 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	menu_off = 0
 	gs 'katja_meynold_schedule'
+	!!gs 'albina_uni_schedule'
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">The University Library</font></b></center>'
@@ -18,9 +19,13 @@ if $ARGS[0] = 'start':
 	'One of the medium sized buildings is the university''s library. It is three stories tall and filled with books, sections with tables scattered around to study or relax at and computer stations to help students with their studying.'
 	
 	if locat['katja'] = 29:
-		'At one of the disk you see '+iif(katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'A redheaded girl', '<a href="exec:gt ''katja_uni'', ''library''">Katja</a>')+' sitting with a laptop and a pile of books.'
+		'You see '+iif(katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'a cute redheaded girl', '<a href="exec:gt ''katja_uni'', ''library''">Katja</a>')+' sitting at one of the desks with a laptop and a pile of books.'
 	end
 	
+	!!if locat['albina'] = 6:
+		!!'You see '+iif(AlbinaQW['know_albina_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'an attractive looking brunette', '<a href="exec:gt ''albina_uni'', ''library''">Albina</a>')+' searching the shelves for books.'
+	!!end
+	
 	if mid($start_type,1,2) = 'sg' and yearstart > 1 and week > 5 and hour >= 12 and hour < 14:
 		if nataliaQW['library_day_check'] ! daystart:
 			nataliaQW['library_day_check'] = daystart
@@ -37,7 +42,7 @@ if $ARGS[0] = 'start':
 		end
 		act 'Wander around': gt 'uni_library', 'wander'
 	else
-		'The library is closing'
+		'The library is closing for the night.'
 	end
 	act 'Leave':
 		minut += 2

locations/unused/pornstudio.qsrc

@@ -267,9 +267,9 @@ if $ARGS[0] = 'delivery':
 			if saunasex = 1:
 				'You recall going to this sauna. You had some pretty energetic sex here.'
 			elseif sauna > 0:
-				'Oh, it''s the sauna near your home.'
+				'Oh, it''s the sauna in the city residential area.'
 			else
-				'This sauna is located near your home. You find it strange that you didn''t notice it before.'
+				'This sauna is located in the city residential area. You find it strange that you didn''t notice it before.'
 			end
 
 			'You go to the sauna, and are introduced to the local managers. It''s explained to you who you need to deliver to, and are reminded that it is necessary to return the envelope the same day you receive it.'