Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'

locations/pav_disco_coolkids.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'classmates':
 		i += 1
 	if i <= aarraynumber:jump 'discogop_loop'
 	
-	if soniaPS > 0 and discoenable['A25'] = 1: *p '<a href="exec:gt ''pav_disco_coolkids'', ''sonia''"><img  height="100" src="images/characters/shared/headshots_main/25.jpg"></a><br>'
+	if soniaPS > 0 and discoenable['A25'] = 1: *p '<a href="exec:gt ''pav_disco_coolkids'', ''sonia_outcast''"><img  height="100" src="images/characters/shared/headshots_main/25.jpg"></a><br>'
 	'</table>'
 	*nl
 	
@@ -843,8 +843,13 @@ if $ARGS[0] = 'igor':
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 						'You keep whispering in his ear. "I want to fuck you right now." He gives you a shocked look before you open your purse and show him your strapon nestled inside, which makes him blush even more.'
 						'"What if we get caught?" He sounds scared and excited at the same time.'
+<<<<<<< HEAD
+						'You pat him on the cheek. "Trust me, I know a place and no one will ever find out." He thinks on it for a moment and then finally nods.'
+						act 'Take him somewhere private': gt 'pav_discoev1', 'igor_peg'
+=======
 						'You pat him on the cheek. "Trust me, I know a place and no one will ever find out." He thinks about it for a moment before nodding.'
 						!!act 'Take him somewhere private': gt 'pav_discoev1', 'igor_peg'
+>>>>>>> 7b6023fd6e2a54da152fd5f4b33e011dca972ea4
 						act 'Just teasing':
 							*clr & cla
 							gs 'stat'
@@ -1244,7 +1249,6 @@ if $ARGS[0] = 'sonia_outcast':
 	minut += 15
 	gs 'npc_relationship', 'modify', 'A25', 'like'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 	if rand(1,5) <= 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance1.jpg"></center>'
 		'You see Sonia out on the dance floor, wearing a near transparent dress that only covers her breasts and is so short that it barely covers anything. She''s a pretty decent dancer, but is dancing wildly with any and everyone near her, grinding on them and hanging off them. She seems to be having fun though and most of the people she dances with don''t seem to mind.'
@@ -1300,8 +1304,13 @@ if $ARGS[0] = 'sonia_outcast':
 					gs 'npc_relationship', 'modify', 'A25', 'like'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
+<<<<<<< HEAD
+					'You smile to her. "Ok, lets go."'
+					'She literally squeals with delight, causing several people to look over your direction. "That''s my girl, lets go rock this party." She says as she practically drags you out onto the dance floor.'
+=======
 					'You smile at her. "Okay, let''s go."'
 					'She squeals with delight, causing several people to look over your direction. "That''s my girl, let''s go rock this party." she says as she practically drags you out onto the dance floor.'
+>>>>>>> 7b6023fd6e2a54da152fd5f4b33e011dca972ea4
 					act 'Go dancing': gt 'pav_disco_coolkids', 'sonia_outcast_dance'
 				end
 			elseif npc_rel['A25'] <= 20 and fame['pav_slut'] < 250:
@@ -1328,8 +1337,13 @@ if $ARGS[0] = 'sonia_outcast':
 					gs 'npc_relationship', 'modify', 'A25', 'like'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
+<<<<<<< HEAD
+					'You smile to her. "Ok, lets go."'
+					'She literally squeals with delight, causing several people to look over your direction. "That''s my slut, lets go show those losers how to really have fun." She says as she practically drags you out onto the dance floor.'
+=======
 					'You smile at her. "Okay, let''s go."'
 					'She squeals with delight, causing several people to look over your direction. "That''s my slut! Let''s go show those losers how to really have fun!" she says as she practically drags you out onto the dance floor.'
+>>>>>>> 7b6023fd6e2a54da152fd5f4b33e011dca972ea4
 					act 'Go dancing': gt 'pav_disco_coolkids', 'sonia_outcast_dance'
 				end
 			else 
@@ -1361,7 +1375,12 @@ if $ARGS[0] = 'sonia_outcast_dance':
 	if npc_rel['A25'] >= 50 and hotcat >= 5:
 		'She dances with you very closely. She hoots and hollers and has a great time. She teases guys almost non-stop with how she dances, only to turn back to you again, shutting them down. She seems to really be enjoying herself dancing with you. The longer you dance, the closer she dances to you.'
 	else
+<<<<<<< HEAD
+		'She dances with you, pretty closely. She hoots and woohoo''s at time, just having a great time. She teases guys almost non-stop with how she dances, only to turn back to you again, shutting them down. She seems to really be enjoying herself dancing with you.'
+	end
+=======
 		'She dances with you pretty closely. She hoots and hollers and has a great time. She teases guys almost non-stop with how she dances, only to turn back to you again, shutting them down. She seems to really be enjoying herself dancing with you.'
+>>>>>>> 7b6023fd6e2a54da152fd5f4b33e011dca972ea4
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 	act 'Just keep dancing': gt 'pav_disco_coolkids', 'sonia_outcast_dance'
 	if hotcat >= 5:
@@ -1374,7 +1393,7 @@ if $ARGS[0] = 'sonia_outcast_dance':
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Go back to just dancing': gt 'pav_disco_coolkids', 'sonia_outcast_dance'
-			!!act 'Grind against her':
+			act 'Grind against her':
 				*clr & cla
 				gs 'fame', 'pav', 'sex', 1
 				gs 'stat'
@@ -1413,9 +1432,15 @@ if $ARGS[0] = 'sonia_outcast_dance':
 							minut += 5
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
+<<<<<<< HEAD
+							'You pull back from her to create space as you stop kissing. "Sorry not tonight..."'
+							'You don''t get time to finish your thought, she looks hurt and angry at your words. "Fine!" Then turns and walks away from you.'
+							!!can we code this so if this happens she leave the disco for the night
+=======
 							'You pull back from her and stop kissing. "Sorry, but not tonight..."'
 							'You don''t get time to finish your thought as she looks hurt and angry at your words. "Fine!" she yells before turning and walking away from you.'
 !!can we code this so if this happens she leave the disco for the night
+>>>>>>> 7b6023fd6e2a54da152fd5f4b33e011dca972ea4
 							act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 						end
 					else

locations/pav_disco_gopniks.qsrc

@@ -1178,7 +1178,7 @@ if $ARGS[0] = 'lena_lera':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lena_lera.jpg"></center>'
 		'Lena and Lera are together hanging out in the dark corner of the disco hall with the other gopniks, it is dim enough it is a bit hard to make out details.'
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-		act 'Hangout with him':
+		act 'Hangout with them':
 			*clr & cla
 			minut += 15
 			gs 'stat'
@@ -1235,7 +1235,7 @@ if $ARGS[0] = 'lena_lera':
 							'"She went to the bathroom, was feeling a little sick, think she drank to much." You lie to him.'
 							'Vitek barks a loud laugh. "Light weight." Then he turns and walks back to where Vasily and Dan are. You look around and Lera is gone, you think she might have headed for the restrooms.'
 							act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-							!!act 'Go find Lera': gt 'pav_discoev1', 'lera'
+							act 'Go find Lera': gt 'pav_discoev1', 'lera'
 						end
 					else
 						'"So you girls want to go dancing?" You ask them.'
@@ -1295,7 +1295,7 @@ if $ARGS[0] = 'lena_lera':
 							'"She went to the bathroom, was feeling a little sick, think she drank to much." You lie to him.'
 							'Vitek barks a loud laugh. "Light weight." Then he turns and walks back to where Vasily and Dan are. You look around and Lera is gone, you think she might have headed for the restrooms.'
 							act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-							!!act 'Go find Lera': gt 'pav_discoev1', 'lera'
+							act 'Go find Lera': gt 'pav_discoev1', 'lera'
 						end
 					else
 						'"So you girls want to go dancing?" You ask them.'
@@ -1673,7 +1673,7 @@ if $ARGS[0] = 'alyona':
 					'She grins and takes another drink when you hand it back. "The only thing that makes this all tolerable."'
 					'You keep talking for a bit, then she gets up, a little unsteady on her feet. "I need to piss." Then she walks off in a slight drunk stagger towards the restrooms.'
 					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-					!!act 'Follow her': gt 'pav_discoev1', 'alyona'
+					act 'Follow her': gt 'pav_discoev1', 'alyona'
 				end
 			elseif grupTipe = 5:
 				'When she sees you coming she flips you off and then gives you a hard stare. You get the message and move away.'
@@ -1700,7 +1700,7 @@ if $ARGS[0] = 'alyona':
 					'"Hey Alyona, want to dance?" You ask her.'
 					'She shakes her head no. "No." Then she gets up, a little unsteady on her feet. "I need to piss." Then she walks off in a slight drunk stagger towards the restrooms.'
 					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
-					!!act 'Follow her': gt 'pav_discoev1', 'alyona'
+					act 'Follow her': gt 'pav_discoev1', 'alyona'
 				end
 			end
 		end