Browse Source

Merge branch 'sources-changes' of StephanFuchs/glife into master

[fixed]Spelling Fix & Index Fix for $npc_notes
Kevin_Smarts 1 year ago
parent
commit
37e9592048
5 changed files with 215 additions and 207 deletions
  1. 8 0
      glife.code-workspace
  2. 7 7
      locations/FedorMisc.qsrc
  3. 189 189
      locations/NikoEv.qsrc
  4. 4 4
      locations/kuhrPar.qsrc
  5. 7 7
      locations/strela.qsrc

+ 8 - 0
glife.code-workspace

@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {}
+}

+ 7 - 7
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

+ 189 - 189
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 ---------------------------------

+ 4 - 4
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

+ 7 - 7
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