Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/Snpc.qsrc

@@ -74,21 +74,21 @@ if numnpc = 9:gs 'kotovtalker'
 !!!Niko Volkov!!!!
 !!!!!!!!!!!!!!!!!!
 
-	if numnpc = 189 and $loc ! 'gdkin' and NikoBreakup = 1:
-		gt 'NikoEv', 'Lunch Breakup'
-	elseif numnpc = 189 and $loc = 'gdkin' and NikoBreakup = 1:
-		gt 'NikoEv', 'Disco Breakup'
-	elseif numnpc = 189 and $loc = 'gdkin' and NikoBreakupDay = daystart:
-		gt 'NikoEv', 'Disco Breakup 2'
-	elseif numnpc = 189 and $loc ! 'gdkin' and NikoIntro = 0:
-		gt 'NikoEv', 'Lunch Intro'
-	elseif numnpc = 189 and $loc ! 'gdkin' and NikoIntro = 1:
-		gt 'NikoEv', 'Lunch Chat'
-	elseif numnpc = 189 and $loc = 'gdkin' and NikoIntro = 0:
-		gt 'NikoEv', 'Disco Intro'
-	elseif numnpc = 189 and $loc = 'gdkin' and NikoIntro = 1:
-		gt 'NikoEv', 'Disco Chat'
-	end
+if numnpc = 189 and $loc ! 'gdkin' and NikoBreakup = 1:
+	gt 'NikoEv', 'Lunch Breakup'
+elseif numnpc = 189 and $loc = 'gdkin' and NikoBreakup = 1:
+	gt 'NikoEv', 'Disco Breakup'
+elseif numnpc = 189 and $loc = 'gdkin' and NikoBreakupDay = daystart:
+	gt 'NikoEv', 'Disco Breakup 2'
+elseif numnpc = 189 and $loc ! 'gdkin' and NikoIntro = 0:
+	gt 'NikoEv', 'Lunch Intro'
+elseif numnpc = 189 and $loc ! 'gdkin' and NikoIntro = 1:
+	gt 'NikoEv', 'Lunch Chat'
+elseif numnpc = 189 and $loc = 'gdkin' and NikoIntro = 0:
+	gt 'NikoEv', 'Disco Intro'
+elseif numnpc = 189 and $loc = 'gdkin' and NikoIntro = 1:
+	gt 'NikoEv', 'Disco Chat'
+end
 
 !!!!!!!!!!!!!
 !!!gopniks!!!

locations/dimaEv.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'after_school':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big1.jpg"></center>'
 	'Dimka seeing you, walks up and says quietly, "Come here slut, we''re going to go have some fun at my place." Your cheeks redden at the gross nickname'
 !!can me make the above have a 1 in 5 chance of trigging even if the player doesn''t click Dimka''s name after school?
-	if fedorKozlovQW >= 10 and dimaFilm = 1 and FedorvsDimka = 1 or fedorKozlovQW = -15 and dimaFilm = 1 and FedorvsDimka = 1:
+	if fedorKozlovQW >= 10 and dimaFilm = 1 and FedorvsDimka = 1 or fedorKozlovQW = -15:
 		gt 'FedorMisc', 'Fedor Vs Dimka'
 	elseif fedorKozlovQW >= 10 or fedorKozlovQW = -15:
 		'Fedor walks up to you. "Hey <<$pcs_nickname>>, shall we go?" Dimka turns to Fedor. "Fedor, what are you doing here? <<$pcs_firstname>> is my girl." Fedor raises his eyebrow. "What are you talking about? <<$pcs_firstname>> is with me." Dimka grins at Fedor. "So let''s ask her who she is dating?". You stand there fidgeting nervously'

locations/gschool_grounds.qsrc

@@ -258,6 +258,10 @@ if $ARGS[0] = 'main':
 				'You can see <a href="exec: gt ''FedorEv2'', ''Fedor Breakup''">Fedor</a> standing by himself with a troubled look on his face.'
 			elseif fedorKozlovQW >= 10:
 				'You can see <a href="exec: gt ''FedorEv'', ''Start''">Fedor</a> with his backpack around his arm, standing by himself.'
+			if NikoVolkovQW = 5 and NikoDate = 1 and NikoDate_Day ! daystart or NikoEv = 11 and NikoDate_Day ! daystart:
+				'You can see <a href="exec:gt ''NikoEv'', ''Niko Dates''">Nikolai Volkov</a> smoking outside of the school.'
+			elseif NikoVolkovQW = 10 and NikoEv >= 17 and NikoEv <= 20 and NikoDate_Day ! daystart:
+				'<a href="exec:gt ''NikoEv2'', ''Events''">Nikolai Volkov</a> is smoking outside of the school.'	
 			end
 		else
 			!display friends in table if switch is on.
@@ -281,6 +285,10 @@ if $ARGS[0] = 'main':
 				gs 'show_table', '<a href="exec: gt ''FedorEv2'', ''Fedor Breakup''">', '5'
 			elseif fedorKozlovQW >= 10:
 				gs 'show_table', '<a href="exec: gt ''FedorEv'', ''Start''">Fedor</a>', '5'
+			if NikoVolkovQW = 5 and NikoDate = 1 and NikoDate_Day ! daystart or NikoEv = 11 and NikoDate_Day ! daystart:
+				gs 'show_table', '<a href="exec: gt ''NikoEv'', ''Niko Dates''">Nikolai</a>', '5'
+			elseif NikoVolkovQW = 10 and NikoEv >= 17 and NikoEv <= 20 and NikoDate_Day ! daystart:
+				gs 'show_table', '<a href="exec: gt ''NikoEv2'', ''Events''">Nikolai</a>', '5'
 			end
 			if npc_QW['A231'] = 1 or npc_QW['A231'] = 3 or npc_QW['A231'] >= 5: gs 'show_table', '<a href="exec:minut += 1 & gt ''AleksandraGo'', ''Start''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>', '5'
 			if st_count > 0 :

locations/gschool_lunch.qsrc

@@ -48,14 +48,24 @@ if $ARGS[0] = 'cafeteria':
 		if NikoVolkovQW = 5 and NikoEv = 5 and NikoDate = 0 and NikoDate_Day ! daystart:
 			school_lunch = 1
 			gt 'NikoDates', 'Hallway Strip'
+		elseif NikoVolkovQW = 10 and NikoEv = 12:
+			school_lunch = 1
+			gt 'NikoDreams', 'Classroom Dream'
 		elseif NikoVolkovQW = 10 and NikoEv = 13 and NikoDate_Day ! daystart:
 			school_lunch = 1
 			gt 'NikoEv2', 'Lunch Chat'
 		elseif NikoVolkovQW = 10 and NikoEv = 14 and NikoDate_Day ! daystart:
 			school_lunch = 1
 			gt 'NikoEv2', 'Lunch Chat 2'
+		elseif NikoVolkovQW = 10 and NikoEv = 21 and NikoDate_Day ! daystart:
+			school_lunch = 1
+			gt 'NikoEv2', 'Julia Talk 2'
+		elseif VKLenaBully = 1 and VKLena_Day ! daystart and VKWip = 100:
+			school_lunch = 1
+			gt 'NikoBully', 'Lena Bully'
 		end
 	end
+
 	if dimaRevenge = 5 and dimaRevChoice = 5:
 		'<center><b><font color="maroon">Cafeteria</font></b></center>'
 		'<center><img src="images/locations/pavlovsk/school/lunch/lunch.jpg"></center>'
@@ -85,7 +95,7 @@ if $ARGS[0] = 'cafeteria':
 			act 'Continue': gt 'gschool_lunch', 'break'
 		end
 	end
-	
+
 	if money >= 50:
 		act 'Buy food (50 <b>₽</b>)':
 			cla
@@ -113,9 +123,9 @@ if $ARGS[0] = 'break':
 	urand = rand(0,8)
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/cooljocks.jpg"></center>'
 	'During break many of the kids split up to hang out with those in their same social groups. The nerds and outcast hangout in the classrooms, while the cool kids and jocks hang out in the hallway near the lockers, and the gopniks hangout in the stairwell, near the classrooms that are not used.'
-	
+
 	$eventtype = 'long_break'
-	
+
 	if cheerleadingQW['skipped_ev'] + cheerleadingQW['skipped_g_ev'] > 0:
 		gs 'gschool_cheerleading', 'skipped_ev'
 		act 'Continue down the hall': gt 'gschool_events', 'leave_break_events2'
@@ -123,7 +133,7 @@ if $ARGS[0] = 'break':
 	elseif grupTipe = 3 and nerd_game['invite_day'] < daystart - week:
 		gt 'nerd_game_night', 'invite', 'lunch'
 	end
-	
+
 	if $breaktype ! 'long':
 		if dimaRevenge = 4 and dimaRevChoice = 2 and hour < 10: '<br>"Hi Nat did you happen to see Dimka?" "Hi <<$pcs_nickname>>, he was here before speaking with Lena and Lera.'
 
@@ -144,6 +154,12 @@ if $ARGS[0] = 'break':
 			gt 'NikoPayback', 'Payback'
 		elseif NikoPayback = 2 and NikoPayback_Day ! daystart:
 			gt 'NikoPayback', 'Payback 2'
+		elseif NikoVolkovQW = 10 and NikoEv = 14 and VKWip = 100:
+			lunch_event = daystart
+			gt 'NikoEv2', 'Vicky Talk'	
+		elseif NikoVolkovQW = 10 and NikoEv = 16 and VKWip = 100:
+			lunch_event = daystart
+			gt 'NikoEv2', 'Julia Talk'		
 		end
 
 		if school_period = 6:

locations/korrPar.qsrc

@@ -84,7 +84,7 @@ gs 'family'
 if indorf = 1:'With your parents being away to visit your grandparents, the apartment seems quiet and empty.'
 
 !to add a counter if you avoid Dimka
-if nodimkaK >= rand(7,10) and DimkaWarnedToday = 0:
+if nodimkaK >= rand(7,10) and DimkaWarnedToday = 0 and DimaRudeBlock = 0:
 	nodimkaK = 0
 	if hour >= 14 and hour < 24 and week <=5 and DimkaWarnedToday = 0: gt 'dimaEv', 'Dimka_warning'
 	if hour >= 9 and hour < 24 and week >=6 and DimkaWarnedToday = 0: gt 'dimaEv', 'Dimka_warning'