[fixed] Fedor chat at disco was exiting to the school lunch. Should be OK now

locations/FedorMisc.qsrc

@@ -22,6 +22,7 @@ if $ARGS[0] = 'Fedor Intro':
 end
 
 if $ARGS[0] = 'Fedor Chat':
+!! ARGS[1] = 1 means Sveta is at the disco
 	*clr & cla
 	menu_off = 1
 	$loc_arg = 'Fedor Chat'
@@ -66,10 +67,10 @@ if $ARGS[0] = 'Fedor Chat':
 	if npc_rel['A5'] >= 60 and npc_rel['A5'] < 80:'You and Fedor have a good relationship.'
 	if npc_rel['A5'] >= 80:'You and Fedor have a great relationship.'
 
-	if $loc ! 'pav_disco':
+	if ARGS[1] ! 1:
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
-		act 'Move away': gt $loc, $loc_arg
+		act 'Move away': gt 'pav_disco_coolkids', 'classmates'
 	end
 	
 	act 'Chat':
@@ -99,18 +100,20 @@ if $ARGS[0] = 'Fedor Chat':
 			'You chat with Fedor, sharing multiple stories as Fedor happily listens while sharing several new stories of his own.'
 		end
 
-		if $loc ! 'pav_disco':
+		if ARGS[1] ! 1:
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		else
-			act 'Move away': gt $loc, $loc_arg
+			act 'Move away': gt 'pav_disco_coolkids', 'classmates'
 		end
 	end
 
-	if numnpc = 5 and fedorKozlovQW >= 20:
-		act 'Let''s go somewhere private':gt 'FedorMisc', 'Fedor Chat 2'
-	end
+	if ARGS[1] ! 1:
+		if numnpc = 5 and fedorKozlovQW >= 20:
+			act 'Let''s go somewhere private':gt 'FedorMisc', 'Fedor Chat 2'
+		end
 
-	if (fedorKozlovQW > 1 or fedorKozlovQW < -10) and NikoPayback = 2 and FyodorVsNiko = 0 and FedorVsNiko = 0:act 'Ask for help with Niko':gt 'NikoPayback', 'Fedor Help'
+		if (fedorKozlovQW > 1 or fedorKozlovQW < -10) and NikoPayback = 2 and FyodorVsNiko = 0 and FedorVsNiko = 0:act 'Ask for help with Niko':gt 'NikoPayback', 'Fedor Help'
+	end
 end
 
 if $ARGS[0] = 'Fedor Chat 2':
@@ -129,6 +132,7 @@ if $ARGS[0] = 'Fedor Chat 2':
 end
 
 if $ARGS[0] = 'Fedor Hate':
+!! ARGS[1] = 1 means Sveta is at the disco
 	*clr & cla
 	menu_off = 1
 	minut += 5
@@ -137,10 +141,10 @@ if $ARGS[0] = 'Fedor Hate':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></center>'
 	'Fedor looks at you with hatred as he says, "I have nothing to say to you. Go away!"'
 
-	if $loc ! 'pav_disco':
+	if ARGS[1] ! 1:
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
-		act 'Move away': gt $loc, $loc_arg
+		act 'Move away': gt 'pav_disco_coolkids', 'classmates'
 	end
 end
 

locations/pav_disco_jocks.qsrc

@@ -195,9 +195,9 @@ if $ARGS[0] = 'fedor':
 	gs 'npc_relationship', 'modify', 'A5', 'like'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
 	if FedorLove < 0:
-		gt 'FedorMisc', 'Fedor Hate'
+		gt 'FedorMisc', 'Fedor Hate', 1
 	else
-		gt 'FedorMisc', 'Fedor Chat'
+		gt 'FedorMisc', 'Fedor Chat', 1
 	end
 end