Merge remote-tracking branch 'Violet_Kitten/master'

# Conflicts:
#	locations/gschool_grounds.qsrc

locations/FedorEv2.qsrc

@@ -280,7 +280,7 @@ if $ARGS[0] = 'Movie 3':
 	pcs_mood += 20
 	minut += 30
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/seat2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/cinema/kino_1.jpg"></center>'
 	'You and Fedor continue to watch the movie until the credits eventually roll and then most people in the theater start to leave and you and Fedor wait for most of the people to leave while chatting about your favorite part on the movie then Fedor gets up and throws out the popcorn bags and cups.'
 	
 	act 'Finish date': gt 'FedorEv2', 'Movie 4'

locations/gschool_grounds.qsrc

@@ -33,6 +33,21 @@ if $ARGS[0] = 'main':
 	
 	if InvitationToDimkaNYparty = 1 and day = 31 and day = nyp_day: act 'Follow Dimka to the New Year''s party at his home': killvar 'InvitationToDimkaNYparty' & minut += 30 & gt 'sny', '3'
 
+	if hour = 14 and week < 6 and kanikuli = 0:
+
+		if NikoDate_Day ! daystart:
+			if week = 1 and NikoIntro = 0:
+				gt 'NikoEv', 'Intro'			
+			elseif NikoVolkovQW = 5 and NikoEv = 6 and NikoDate = 0:
+				gt 'NikoDates', 'After School'
+			elseif NikoVolkovQW = 5 and NikoEv = 8 and NikoDate = 0:
+				gt 'NikoDates', 'After School 2'
+			elseif NikoVolkovQW = 10 and NikoEv = 22:
+				gt 'NikoEv2', 'Recovery'
+			end
+		end
+	end	
+	
 	if week < 6 and hour = 14 and kanikuli = 0 and afterschool_day ! daystart:
 		afterschool_day = daystart
 		if rand(0,3) = 0:
@@ -218,16 +233,6 @@ if $ARGS[0] = 'main':
 
 	if hour = 14 and week < 6 and kanikuli = 0:
 
-		if NikoDate_Day ! daystart:
-			if NikoVolkovQW = 5 and NikoEv = 6 and NikoDate = 0:
-				gt 'NikoDates', 'After School'
-			elseif NikoVolkovQW = 5 and NikoEv = 8 and NikoDate = 0:
-				gt 'NikoDates', 'After School 2'
-			elseif NikoVolkovQW = 10 and NikoEv = 22:
-				gt 'NikoEv2', 'Recovery'
-			end
-		end
-
 		if ivan_afterschool = 1: act 'Meet Ivan after school': gt 'gschool_sex', 'afterschool'
 
 		if LinaSlut > 0 and rand(1,10) < 3: 'You see Lina, Dan and Vasily leaving the school together.'