[fixed] Remove clauses from Fedor dance chat as they were just the worst and made all continue dancing options that loop conditional by time so they stop at or after midnight

locations/pav_disco_coolkids.qsrc

@@ -471,57 +471,59 @@ if $ARGS[0] = 'marcus_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_dance.jpg"></center>'
 	'You start dancing with him. He''s a pretty good dancer and you both enjoy dancing together for a while.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_coolkids', 'marcus_dance'
-	act 'Grind against him':
-		*clr & cla
-		gs 'fame', 'pav', 'sex', 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_grind1.jpg"></center>'
-		'You back up against him and start grinding your ass against his crotch.'
-		if hotcat >= 5:
-			'He grabs you by the hips and pulls you in closer before he starts grinding back against you and nuzzles your neck.'
-			gs 'arousal', 'foreplay', 10, 'inhibition'
-			gs 'arousal', 'end'
+	if hour < 20:
+		act 'Keep dancing': gt 'pav_disco_coolkids', 'marcus_dance'
+		act 'Grind against him':
+			*clr & cla
+			gs 'fame', 'pav', 'sex', 1
 			gs 'stat'
-			act 'Go back to just dancing': gt 'pav_disco_coolkids', 'marcus_dance'
-			act 'Keep grinding':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_grind2.jpg"></center>'
-				'He keeps his hands firmly on your hips, pulling you tightly against him as you keep grinding your ass against him. You can feel his well endowed dick starting to get hard.'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_grind1.jpg"></center>'
+			'You back up against him and start grinding your ass against his crotch.'
+			if hotcat >= 5:
+				'He grabs you by the hips and pulls you in closer before he starts grinding back against you and nuzzles your neck.'
 				gs 'arousal', 'foreplay', 10, 'inhibition'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Makeout':
+				act 'Go back to just dancing': gt 'pav_disco_coolkids', 'marcus_dance'
+				act 'Keep grinding':
 					*clr & cla
-					minut += 15
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_kiss.jpg"></center>'
-					'He suddenly turns you around and starts kissing you passionately on the lips as you feel his hard-on pressing against your stomach. After several minutes of making out, he breaks the kiss. "Let''s go somewhere more private..."'
-					gs 'arousal', 'kiss', 5, 'inhibition'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_grind2.jpg"></center>'
+					'He keeps his hands firmly on your hips, pulling you tightly against him as you keep grinding your ass against him. You can feel his well endowed dick starting to get hard.'
+					gs 'arousal', 'foreplay', 10, 'inhibition'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Go with him': gt 'pav_discoev1', 'marcus'
-					gs 'willpower', 'sex', 'resist', 'easy'
-					if will_cost <= pcs_willpwr:
-						act 'No (<<will_cost>> Willpower)':
-							*clr & cla
-							gs 'willpower', 'pay', 'resist'
-							minut += 5
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
-							'You step back to create some space between the two of you and look around before looking to him. "I would like to, but with what we just did, if we walk off together.... Well... you know what everyone will think and then they''ll start talking about me at school and I don''t want to get a reputation. I''m sorry."'
-							'He looks disappointed at first, but then smiles. "Yeah, I get it. If you''re not comfortable, it''s not a problem. I need to get something to drink." He walks away while trying to hide his erection.'
-							act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-						end
-					else
-						act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end	
+					act 'Makeout':
+						*clr & cla
+						minut += 15
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_kiss.jpg"></center>'
+						'He suddenly turns you around and starts kissing you passionately on the lips as you feel his hard-on pressing against your stomach. After several minutes of making out, he breaks the kiss. "Let''s go somewhere more private..."'
+						gs 'arousal', 'kiss', 5, 'inhibition'
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Go with him': gt 'pav_discoev1', 'marcus'
+						gs 'willpower', 'sex', 'resist', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'No (<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'willpower', 'pay', 'resist'
+								minut += 5
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
+								'You step back to create some space between the two of you and look around before looking to him. "I would like to, but with what we just did, if we walk off together.... Well... you know what everyone will think and then they''ll start talking about me at school and I don''t want to get a reputation. I''m sorry."'
+								'He looks disappointed at first, but then smiles. "Yeah, I get it. If you''re not comfortable, it''s not a problem. I need to get something to drink." He walks away while trying to hide his erection.'
+								act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+							end
+						else
+							act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						end	
+					end
 				end
+			else
+				'He lets you grind against him for a little bit before he steps back, grabs you by the hand and turns you around to face him. He goes back to dancing with you, but he keeps it friendly. After a few minutes he steps away and stops dancing. "I need a drink, but I had fun dancing. Maybe we can do it again later?" he asks with a smile before walking away.'
+				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			end
-		else
-			'He lets you grind against him for a little bit before he steps back, grabs you by the hand and turns you around to face him. He goes back to dancing with you, but he keeps it friendly. After a few minutes he steps away and stops dancing. "I need a drink, but I had fun dancing. Maybe we can do it again later?" he asks with a smile before walking away.'
-			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		end
 	end
 end
@@ -1006,7 +1008,9 @@ if $ARGS[0] = 'igor_dance':
 		end
 	end
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_coolkids', 'igor_dance'
+	if hour < 20:
+		act 'Keep dancing': gt 'pav_disco_coolkids', 'igor_dance'
+	end
 end
 
 if $ARGS[0] = 'bella':
@@ -1246,7 +1250,9 @@ if $ARGS[0] = 'sonia_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_sveta_dance.jpg"></center>'
 	'You and Sonia move out onto the dance floor and start dancing together. She seems to be really enjoying herself, laughing and dancing with lots of energy and doesn''t seem to care what anyone thinks. She just wants to have fun.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_coolkids', 'sonia_dance'
+	if hour < 20:
+		act 'Keep dancing': gt 'pav_disco_coolkids', 'sonia_dance'
+	end
 end
 
 if $ARGS[0] = 'sonia_outcast':

locations/pav_disco_gopniks.qsrc

@@ -582,34 +582,36 @@ if $ARGS[0] = 'radomir_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/radomir_dance1.jpg"></center>'
 	'Radomir takes you out onto the dance floor and starts dancing with you. He''s a pretty good dancer and seems very confident as he moves around the dance floor. He soon dances around behind you and you feel him moving in closer behind you.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_gopniks', 'radomir_dance'
-	act 'Grind against him':
-		*clr & cla
-		gs 'fame', 'pav', 'sex', 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/radomir_dance2.jpg"></center>'
-		'You back up against him and start grinding your ass against his crotch. He returns the favor and puts his hands on your hips as the two of you dance dirty in front of everyone. He then nuzzles your neck while whispering in your ear. "Why don''t we blow this place, so you can blow me?" He says it more like a statement than a question.'
-		gs 'arousal', 'foreplay', 10, 'inhibition'
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Go off together': gt 'pav_discoev1', 'radomir'
-		gs 'willpower', 'sex', 'resist', 'medium'
-		if will_cost <= pcs_willpwr:
-			act 'No (<<will_cost>> Willpower)':
-				*clr & cla
-				gs 'willpower', 'pay', 'resist'
-				minut += 5
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
-				'You pull away from him and turn around to face him. "No, I''m not that kind of girl."'
-				'He laughs. "Every girl is that kind of girl, some of them just don''t know it yet. Some come on baby."'
-				'You shake your head and start walking away. "I said no!"'
-				'You hear him laugh behind you. "You''ll be back sooner or later."'
-				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-			end
-		else
-			act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+	if hour < 20:
+		act 'Keep dancing': gt 'pav_disco_gopniks', 'radomir_dance'
+		act 'Grind against him':
+			*clr & cla
+			gs 'fame', 'pav', 'sex', 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/radomir_dance2.jpg"></center>'
+			'You back up against him and start grinding your ass against his crotch. He returns the favor and puts his hands on your hips as the two of you dance dirty in front of everyone. He then nuzzles your neck while whispering in your ear. "Why don''t we blow this place, so you can blow me?" He says it more like a statement than a question.'
+			gs 'arousal', 'foreplay', 10, 'inhibition'
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Go off together': gt 'pav_discoev1', 'radomir'
+			gs 'willpower', 'sex', 'resist', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'No (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'resist'
+					minut += 5
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
+					'You pull away from him and turn around to face him. "No, I''m not that kind of girl."'
+					'He laughs. "Every girl is that kind of girl, some of them just don''t know it yet. Some come on baby."'
+					'You shake your head and start walking away. "I said no!"'
+					'You hear him laugh behind you. "You''ll be back sooner or later."'
+					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+				end
+			else
+				act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end	
+		end
 	end
 end
 
@@ -1033,7 +1035,9 @@ if $ARGS[0] = 'lavrenti_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/school_kids/lavrenti_dance1.jpg"></center>'
 	'Lavrenti leads you out onto the dance floor and you start dancing together. He''s a very good dancer and you can''t help but wonder if he''s had dance lessons at some point in his life. The two of you enjoy your time dancing together.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_gopniks', 'lavrenti_dance'
+	if hour < 20:
+		act 'Keep dancing': gt 'pav_disco_gopniks', 'lavrenti_dance'
+	end
 end
 
 if $ARGS[0] = 'pauline':
@@ -1161,7 +1165,9 @@ if $ARGS[0] = 'lena_lera':
 			elseif npc_rel['A20'] >= 50 and npc_rel['A21'] >= 50 and fame['pav_slut'] < 300:		
 				'As you approach them, they smile at you and keep dancing, but make room for you to join them.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
+				if hour < 20:
+					act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
+				end
 			elseif npc_rel['A20'] <= 20 or npc_rel['A21'] <= 20 and fame['pav_slut'] < 300:
 				'As you approach them, they give you dirty looks before turning away from you and dancing closer together, making it clear you''re not welcome.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -1171,7 +1177,9 @@ if $ARGS[0] = 'lena_lera':
 			else 
 				'As you approach them, they exchange a look and keep dancing. They don''t seem to be inviting you to join them, but also don''t seem to be turning you away either.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
+				if hour < 20:
+					act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
+				end
 			end
 		end
 	else
@@ -1315,7 +1323,9 @@ if $ARGS[0] = 'lena_lera_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lena_lera_dance2.jpg"></center>'
 	'The three of you dance together. Lena seems interested in getting the boys attention by any means possible, even if it means dancing close with you or Lera and even trading a few kisses with Lera when some boys start paying attention. Lera on the other hand seems mostly interested in dancing with Lena and happily trades kisses with her. They don''t exclude you from dancing with them, but you don''t feel like you belong either.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
+	if hour < 20:
+		act 'Keep dancing': gt 'pav_disco_gopniks', 'lena_lera_dance'
+	end
 end
 
 if $ARGS[0] = 'nush':
@@ -1338,7 +1348,9 @@ if $ARGS[0] = 'nush':
 				'You laugh. "Yeah, I''m here now slut."'
 				'She giggles. "Fuck you and shake that money maker!" The two of you dance together, surrounded by guys trying to get in on the action.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				act 'Keep dancing with her': gt 'pav_disco_gopniks', 'anushka_dance'
+				if hour < 20:
+					act 'Keep dancing with her': gt 'pav_disco_gopniks', 'anushka_dance'
+				end
 			elseif npc_rel['A144'] <= 20 and fame['pav_slut'] < 500:
 				'You think she''s seen you as you approach, but she turns away and starts dancing with one of the guys crowding her.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -1352,7 +1364,9 @@ if $ARGS[0] = 'nush':
 				'You smile at her. "Just came to dance and have fun."'
 				'She grins. "Then shake that money maker girl!" The two of you dance together, surrounded by guys trying to get in on the action.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				act 'Keep dancing with her': gt 'pav_disco_gopniks', 'anushka_dance'
+				if hour < 20:
+					act 'Keep dancing with her': gt 'pav_disco_gopniks', 'anushka_dance'
+				end
 			end
 		end
 	else
@@ -1714,7 +1728,9 @@ if $ARGS[0] = 'alyona_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/school_kids/alyona_dance2.jpg"></center>'
 	'The two of you dance together, but she doesn''t seem to be aware that you''re there most of the time and just dances like she''s the only one on the dance floor. She doesn''t seem to care though.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_gopniks', 'alyona_dance'
+	if hour < 20:
+		act 'Keep dancing': gt 'pav_disco_gopniks', 'alyona_dance'
+	end
 end
 
 

locations/pav_disco_jocks.qsrc

@@ -17,7 +17,9 @@ if $ARGS[0] = 'lazar':
 				'You move out onto the dance floor and he smiles as you approach. "Come to have a little fun, huh?"'
 				'You nod your head and join the group dancing.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-				act 'Keep dancing': gt 'pav_disco_coolkids', 'lazar_dance'
+				if hour < 20:
+					act 'Keep dancing': gt 'pav_disco_coolkids', 'lazar_dance'
+				end
 			elseif grupTipe = 5:
 				'He laughs as you get close. "Get lost loser." he scoffs before turning his back on you.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -123,7 +125,9 @@ if $ARGS[0] = 'lazar_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lazar_dance1.jpg"></center>'
 	'You and Lazar start dancing together. He''s a very good dancer for a boy, likely due to his natural athletic talents and well toned body. He seems to be enjoying dancing with you as much as you like dancing with him. Several songs go by as the two of you keep dancing - he seems to have endless endurance.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_jocks', 'lazar_dance'
+	if hour < 20:
+		act 'Keep dancing': gt 'pav_disco_jocks', 'lazar_dance'
+	end
 end
 
 if $ARGS[0] = 'ivan':
@@ -186,13 +190,11 @@ if $ARGS[0] = 'ivan':
 end
 
 if $ARGS[0] = 'fedor':
-	if $loc = 'pav_disco' and rand (1,6) = 1:
-		*clr & cla
-		minut += 15
-		gs 'npc_relationship', 'modify', 'A5', 'like'
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
-		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	end
+	*clr & cla
+	minut += 15
+	gs 'npc_relationship', 'modify', 'A5', 'like'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
+	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 end
 
 if $ARGS[0] = 'svyatoslav':
@@ -296,7 +298,9 @@ if $ARGS[0] = 'svyatoslav_dance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/svyatoslav_dance2.jpg"></center>'
 	'You and Svyatoslav start dancing. He''s a decent dancer who lacks the rhythm of some of the other boys, but makes up for in enthusiasm. The two of you dance away, not caring what the others think.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-	act 'Keep dancing': gt 'pav_disco_jocks', 'svyatoslav_dance'
+	if hour < 20:
+		act 'Keep dancing': gt 'pav_disco_jocks', 'svyatoslav_dance'
+	end
 end
 
 if $ARGS[0] = 'vanya':