[fixed] Resolving conflict from my last commit.

locations/pav_disco_gopniks.qsrc

@@ -721,7 +721,7 @@ if $ARGS[0] = 'valentin':
 			'The two of you talk about a few things. He gets a little hands on with you at times, but you are used to it. As you start to leave, he adds "Stop by the garage some time, I can always use a break and a quick fuck."'
 			'You sigh a little. "Maybe." You tell him.'
 			'He grins. "Well how about now?"'
-			!!act 'Agree to have sex now': gt 'pav_discoev1', 'valentin'
+			act 'Agree to have sex now': gt 'pav_discoev1', 'valentin'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		elseif grupTipe = 5:
 			'When he sees you, he gives you a annoyed look. "Go bother someone else."'
@@ -992,7 +992,7 @@ if $ARGS[0] = 'lavrenti':
 					'You take the rolled up money and snort a line of cocaine off the table, you can feel the effects almost at once. It is top quality stuff, then you pass the rolled up money back to him and he does the other line. After that the two of you go back to chatting away.'
 					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				end
-			elseif npc_rel['A158'] <= 20 and fame['pav_slut'] < 300:
+			elseif npc_rel['A158'] <= 20 and pav_slut < 300:
 				'You approach Lavrenti. "So, what''s up with you Lavrenti?"'
 				'Lavrenti frowns at you. "Not a lot, just hanging out and admiring the view."'
 				'You look in the direction he is looking and see some cute girls in short skirts. "Nice view indeed." you comment with a bemused smile.'

locations/pav_disco_jocks.qsrc

@@ -192,8 +192,7 @@ if $ARGS[0] = 'fedor':
 		minut += 15
 		gs 'npc_relationship', 'modify', 'A5', 'like'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
-		if dance = 1
-		else
+		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 	end}
 end
 
@@ -302,11 +301,11 @@ if $ARGS[0] = 'svyatoslav_dance':
 end
 
 if $ARGS[0] = 'vanya':
-!! if at disco random 1-3, 1 = dancing, rest hanging out
-!!	*clr & cla
-!!	minut += 15
-!!	gs 'npc_relationship', 'modify', 'A165', 'like'
-!!	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big165.jpg"></center>'
+	*clr & cla
+	minut += 15
+	gs 'npc_relationship', 'modify', 'A165', 'like'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big165.jpg"></center>'
+	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 !!	if dance = 1
 !!	else
 end
@@ -395,7 +394,7 @@ if $ARGS[0] = 'albina':
 			end
 		end
 	else
-		'You look out onto the dance floor and see Albina dancing. She is expertly moving her body in an erotic manner to the beat of the music. You almost feel a little jealous watching her dance so well.'
+		'Albina is sitting on one of the couches the cool kids have claimed, her smooth shapely legs crossed over as she watches other people dancing.'
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Hang out with her':
 			*clr & cla
@@ -405,7 +404,7 @@ if $ARGS[0] = 'albina':
 			if grupTipe = 5:
 				'Albina just laughs loudly as you approach her. "Why are <i>you</i> here? Go hang out with the other losers somewhere else." she taunts before moving away and dancing with her friends.'
 			elseif (grupeTipe = 1 or grupeTipe = 2) and npc_rel['A23'] >= 70 or AlbQW['Friends'] = 2:	
-				'"What''s up Albina?" you ask as you approach.'
+				'"What''s up Albina?" you ask as you approach and take a seat next to her.'
 				'She smiles at you. "Oh you know, just letting my hair down and having some fun. What about you?"'
 				'"Same. Just enjoying the night." you reply and she smiles at you again.'
 			elseif npc_rel['A23'] <= 20 and fame['pav_slut'] < 250:
@@ -413,15 +412,15 @@ if $ARGS[0] = 'albina':
 					'"What''s up Albina?" you ask as you approach.'
 					'She scoffs in response. "Like you actually care. I don''t like you, I barely tolerate you being in the same social group as me, so why would I want to talk to you? Just piss off already." Not wanting to cause a scene, you back off.'
 				else
-					'Albina sees you approaching and rolls her eyes before walking away, not giving you a chance to speak to her.'
+					'Albina sees you approaching and rolls her eyes before getting up and walking away, not giving you a chance to speak to her.'
 				end
 			elseif fame['pav_slut'] >= 250:
 				'Albina seems a little surprised at your presence. "Why are <i>you</i> here? Do you enjoy all the boys wanting a piece of you like you''re just some fuck toy to them?"'
-				'Before you can react, Albina waves you aside and walks away. "You know what, I don''t fucking care. I''m sure you''ll find plenty of dicks to suck here, so why don''t you go find one or two?"'
+				'Before you can react, Albina stands up and waves you aside before walking away. "You know what, I don''t fucking care. I''m sure you''ll find plenty of dicks to suck here, so why don''t you go find one or two?"'
 				'You could clearly hear the disappointment in her voice, but you think she also felt pity towards you at the same time.'
 			else 
 				'"Hey Albina, what''s up?" you ask as you approach.'
-				'Albina just looks at you and shrugs before turning around and ignoring you. Seeing that she''s not interested in speaking with you, you walk away.'
+				'Albina just looks at you and shrugs before looking away and ignoring you. Seeing that she''s not interested in speaking with you, you walk away.'
 			end
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Ask her to dance':
@@ -429,10 +428,10 @@ if $ARGS[0] = 'albina':
 				minut += 15
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 				if (grupeTipe = 1 or grupeTipe = 2) and npc_rel['A23'] >= 70 or AlbQW['Friends'] = 2:
-				  'Albina smiles and accepts your offer to dance.'
+				  'Albina smiles and accepts your offer to dance. She gets and grabs your hand before leading you out to the dance floor.'
 					act 'Go dancing': gt 'pav_disco_jocks', 'albina_dance'
 				else
-					'Albina looks you over with a hint of contempt on her face before moving away from you and dancing with her friends.'
+					'Albina looks you over with a hint of contempt on her face before standing up and going to dance with her friends.'
 					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				end
 			end
@@ -447,14 +446,14 @@ if $ARGS[0] = 'albina':
 					!! party has happened
 					!! 'You stand against the wall with Albina and chat with her. She looks less than impressed. "Why did I come back to this shitty disco instead of just holding another party at my place? It''s so fucking boring here. Just look at that chaperone over there. I''m pretty sure he''s checking us all out, the creepy bastard."'
 					if lazar_threesome >= 1:
-						'You stand against the wall with Albina and chat with her. "This place is so fucking boring. I might find Lazar and see if he wants to go and have a little fun at his place." She then turns to you. "Tell me, wouldn''t you rather be bent over and pounded hard than stand around in this dump with these losers? You know how big Lazar is <<$pcs_nickname>>. Wouldn''t it be nice to have him inside you again?" Before you''re able to answer, she smiles and winks at you before walking away, seemingly in search of Lazar.'
+						'You sit and chat with Albina. "This place is so fucking boring. I might find Lazar and see if he wants to go and have a little fun at his place." She then turns to you. "Tell me, wouldn''t you rather be bent over and pounded hard than stand around in this dump with these losers? You know how big Lazar is <<$pcs_nickname>>. Wouldn''t it be nice to have him inside you again?" Before you''re able to answer, she smiles and winks at you before getting up and walking away, seemingly in search of Lazar.'
 					elseif npc_sex['A23'] >= 1:
-						'You stand against the wall with Albina and chat with her. "God, it''s so fucking boring here. Wouldn''t you rather sneak off to a quiet place with me and have a little fun? I''d love to taste your pussy right now." You''re not sure how to react, but Albina laughs. "I''m just kidding <<$pcs_nickname>>. About the sneaking off part anyway. You taste too good." she says before giving you a wink and walking away. You''re again unsure if she was joking or not.'
+						'You sit and chat with Albina. "God, it''s so fucking boring here. Wouldn''t you rather sneak off to a quiet place with me and have a little fun? I''d love to taste your pussy right now." You''re not sure how to react, but Albina laughs. "I''m just kidding <<$pcs_nickname>>. About the sneaking off part anyway. You taste too good..." she says before giving you a wink and walking away. You''re again unsure if she was joking or not.'
 					else
 						if rand(0, 1) = 1:
-							'You stand against the wall with Albina and chat with her. "Look at that chaperone over there. I''m pretty sure he''s checking us all out, the creepy bastard."'
+							'You sit and chat with Albina. "Look at that chaperone over there. I''m pretty sure he''s checking us all out, the creepy bastard."'
 						else
-							'You stand against the wall with Albina and chat with her. "You know, it''s pretty insulting having to come here and watch these beached whales flail around trying to dance. I much prefer going to nightclubs where I''m too drunk to care. You should come with me sometime."'
+							'You sit and chat with Albina. "You know, it''s pretty insulting having to come here and watch these beached whales flail around trying to dance. I much prefer going to nightclubs where I''m too drunk to care. You should come with me sometime."'
 						end
 					end
 					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'