Prechádzať zdrojové kódy

[Fixed] a bunch of time and nutluck coding issues

Alaratt 2 rokov pred
rodič
commit
3c39723fb5

+ 76 - 108
locations/pav_disco_coolkids.qsrc

@@ -285,7 +285,7 @@ end
 
 if $ARGS[0] = 'dimka':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A1', 'like'
 	gs 'stat'
 	if rand(1,4) = 1:
@@ -294,7 +294,6 @@ if $ARGS[0] = 'dimka':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/dimka_dance.jpg"></center>'
 			if grupTipe = 5:
 				'He ignores you and turns his back on you as you approach, shunning you.'
@@ -440,6 +439,7 @@ if $ARGS[0] = 'dimka_dance':
 				fat -= 1
 				danc_exp += 1
 				frost = 0
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance2.jpg"></center>'
 				'He pulls you in close and you are soon dancing with your face only a few inches from his. You feel his hand slide down your back to just above your ass as you keep dancing together before a girl comes over and asks him to dance. She is very pretty and he looks her over and grins before looking back to you. "Sorry, but I think it''s this lovely lady''s turn." He turns and starts dancing with her, leaving you to walk off the dance floor.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -549,7 +549,7 @@ end
 
 if $ARGS[0] = 'marcus':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A146', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
@@ -558,7 +558,6 @@ if $ARGS[0] = 'marcus':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/marcus_dance.jpg"></center>'
 			if npc_rel['A146'] >= 50 and fame['pav_slut'] < 250:		
 				'"Hey <<$pcs_nickname>>, want to dance?" he asks as you approach before moving in close and dancing next to you.'
@@ -592,11 +591,11 @@ if $ARGS[0] = 'marcus':
 			if npc_rel['A146'] >= 50 and fame['pav_slut'] < 250:		
 				'You enjoy hearing the stories Marcus tells you about his life in America. "It''s kind of funny, I don''t think I was nearly as popular as this back home. I''m not complaining though!"'
 				'You spend the some more time asking more questions about his home life and he''s happy to tell you all about it.'
+				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				if hotcat >= 5:
 					'Just when it seems like you''ve run out of small talks he says "Hey, want to dance?"'
 					act 'No':
 						*clr & cla
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
 						'You shake your head. "No thanks, I''m not in the mood to dance. Maybe some other time?"'
 						'He nods. "Sure, some other time..." You can tell he is disappointed.'
@@ -604,14 +603,12 @@ if $ARGS[0] = 'marcus':
 					end
 					act 'Yes':
 						*clr & cla
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
 						'You smile and nod your head. "Yes, I would love to dance."'
 						'"Great. Let''s go." He grabs your hand and leads you out onto the dance floor.'
 						act 'Go dancing': gt 'pav_disco_coolkids', 'marcus_dance'
 					end
 				end
-				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			elseif npc_rel['A146'] <= 20 and fame['pav_slut'] < 250:
 				if grupTipe = 1:
 					'"Do I know you?" Marcus asks when you try to strike up a conversation.'
@@ -631,8 +628,6 @@ if $ARGS[0] = 'marcus':
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				act 'Ask him to dance':
 					*clr & cla
-					minut += 15
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
 					if hotcat >= 5:
 						'"Would you like to dance?" you ask with a smile.'
@@ -673,25 +668,23 @@ if $ARGS[0] = 'marcus_dance':
 			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 'Go back to just dancing': gt 'pav_disco_coolkids', 'marcus_dance'
+				act 'Go back to just dancing':
+					gs 'arousal', 'end'
+					gs 'stat'
+					gt 'pav_disco_coolkids', 'marcus_dance'
+				end
 				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.'
 					gs 'arousal', 'foreplay', 10, 'inhibition'
-					gs 'arousal', 'end'
 					gs 'stat'
 					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 'arousal', 'kiss', 15, 'inhibition'
 						gs 'stat'
 						act 'Go with him': gt 'pav_discoev1', 'marcus'
 						gs 'willpower', 'sex', 'resist', 'easy'
@@ -704,7 +697,11 @@ if $ARGS[0] = 'marcus_dance':
 								'<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'
+								act 'Do something else':
+									gs 'arousal', 'end'
+									gs 'stat'
+									gt 'pav_disco_coolkids', 'classmates'
+								end
 							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>'
@@ -724,7 +721,7 @@ if $ARGS[0] = 'andrey' or $ARGS[0] = 'stasya': gt 'pav_disco_coolkids', 'andrey_
 
 if $ARGS[0] = 'andrey_stasya':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A147', 'like'
 	gs 'npc_relationship', 'modify', 'A139', 'like'
 	gs 'stat'
@@ -734,7 +731,6 @@ if $ARGS[0] = 'andrey_stasya':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya_dance2.jpg"></center>'
 			if npc_rel['A147'] >= 50 and npc_rel['A139'] >= 50 and fame['pav_slut'] < 250:		
 				'When you get close to them they smile and part a little, an obvious invite to dance with them. You start dancing with them, sometimes with Andrey, other times with Stasya and sometimes all three of you dance together. More often than not, you''re forced aside as they kiss while dancing.'
@@ -875,7 +871,7 @@ end
 
 if $ARGS[0] = 'mefodiy':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A148', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
@@ -913,8 +909,6 @@ if $ARGS[0] = 'mefodiy':
 			act 'Do something else': gt 'pav_disco', 'classmates'
 			act 'Ask him to dance':
 				*clr & cla
-				minut += 15
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 				if grupTipe = 1:
 					'You ask Mefodiy if he''ll join you for a dance and he greets you with a warm smile. "Of course <<$pcs_firstname>>."'
@@ -940,8 +934,8 @@ if $ARGS[0] = 'mefodiy':
 				'"Well aren''t you observant?" he says. "Truth is I''m just not in a hurry to find someone special. These things are controlled by fate. If it''s meant to happen, then it will and if not, well then I''ll have more time to meet people like you."'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				act'So I''m not girlfriend material?':
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 					'"<<$pcs_firstname>>, you are clearly the perfect girlfriend for someone, just not me. I wish it wasn''t so as you''ll make one man very happy, maybe more, one day." He laughs trying to say the next line. "Just not all at the same time."'
 					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				end
@@ -954,8 +948,8 @@ if $ARGS[0] = 'mefodiy':
 				'"They used to pick on me when I was younger for being a late developer. When you''re the smallest kid in the year, bullies single you out. I was good at avoiding them, but I ended up getting cornered by a group of them one day. Vitek was feeding off the rest of them and calling me names before he punched me really hard. I fell to the floor and he walked up about to kick me in the guts when Roman stepped between us. Vitek told him to get out of the way, but Roman just stares him down.' 
 				'It looked stupid, this little guy staring up at Vitek with Dan and Vasily flanking him but they backed down. Vitek made some excuse and walked away and I was going to thank Roman, but he just walked off with the rest of them. I still don''t know why he did it, but that''s why I don''t like the gopniks."'
 				act 'Ask him if they still give him trouble':
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 					'"They''ve never touched or said anything to me since. Maybe Roman being small thought we had something in common, maybe he was upset about something completely unrelated and with me hitting a growth spurt not long after I wasn''t so little and they lost interest. I don''t really know, but he might have saved me a trip to the nurse or worse. The rest of them can go fuck themselves, except Nush. She''s cool, but that''s a whole other story and not one she''d want overheard."'
 					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				end
@@ -1006,7 +1000,7 @@ end
 
 if $ARGS[0] = 'igor':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A4', 'like'
 	gs 'stat'
 	gs 'dinnpc'
@@ -1016,7 +1010,6 @@ if $ARGS[0] = 'igor':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/igor_dance.jpg"></center>'
 			if npc_rel['A4'] >= 50 and fame['pav_slut'] < 250:		
 				'When Igor sees you, his face lights up and he smiles warmly. He waves you over and when you get to him, he pulls you in for a hug. "I was hoping I''d see you." he says shyly before he starts dancing with you. You can''t help but giggle at him.'
@@ -1040,19 +1033,16 @@ if $ARGS[0] = 'igor':
 			if igorstrap = 1:
 				act 'Tease him about pegging':
 					*clr & cla
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 					'You decide to tease Igor a little. "I hope you''re not too sore after last time." you whisper with a smirk. Igor''s cheeks flush pink as he looks around nervously, hoping no one overheard.'
 					act 'Just chat':
 						*clr & cla
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 						'You don''t press it and start talking to him about a variety of topics while holding hands. You then smile and give him a quick kiss as you get up.'
 						act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 					end
 					act 'Tell him you have a surprise':
 						*clr & cla
-						gs 'stat'
 						'<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.'
@@ -1060,7 +1050,6 @@ if $ARGS[0] = 'igor':
 						act 'Take him somewhere private': gt 'pav_discoev1', 'igor_peg'
 						act 'Just teasing':
 							*clr & cla
-							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 							'You laugh a little. "You <i>are</i> eager! You must really love it..."'
 							'He blushes bright red. "I... I..."'
@@ -1068,7 +1057,6 @@ if $ARGS[0] = 'igor':
 							'He looks a little sheepish. "Oh..."'
 							act 'Just chat':
 								*clr & cla
-								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 								'You don''t press it and start talking to him about a variety of topics while holding hands. You then smile and give him a quick kiss as you get up.'
 								act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -1095,7 +1083,6 @@ if $ARGS[0] = 'igor':
 				'The two of you start discussing the outfits and styles of the various people at the disco, mostly giggling at those with awful fashion sense before he turns to you. "Would you like to dance?"'
 				act 'No':
 					*clr & cla
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 					'You shake your head. "Not right now. Maybe some other time."'
 					'He looks a bit crestfallen. "Oh okay... Uh yeah, it was silly. I don''t know why I asked. Anyway, I need to use the restroom." Before you can get another word in, he hurries off towards the restrooms.'
@@ -1103,7 +1090,6 @@ if $ARGS[0] = 'igor':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 					'You nod your head and smile warmly at him. "Yes, yes I would."'
 					'He lights up and has a huge grin on his face. "Great!... I mean it''s good that you want to." He blushes at his outburt before taking you by the hand and shyly leading you out onto the dance floor.'
@@ -1128,8 +1114,6 @@ if $ARGS[0] = 'igor':
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Ask him to dance':
 				*clr & cla
-				minut += 15
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 				'"Would you like to dance?" you ask with a smile.'
 				'He hesitates for a moment before nodding. "Yeah, sure."' 
@@ -1177,7 +1161,6 @@ if $ARGS[0] = 'igor_dance':
 				'Igor leans in close to your ear. "Dimka told me that you were a fantastic cocksucker. How about we go outside and you show me if he''s right?" he whispers.'
 				act 'Go outside with him':
 					cls
-					gs 'stat'
 					'You nod at him and walk out of the disco with him, slipping around a corner to have a little privacy. Once you feel you''ve found a spot that''s secluded enough, Igor gives you a hungry kiss and lets his hands roam all over you, groping anything he can reach. Suddenly, you hear the sound of a zipper and feel Igor push you down - you''re too confused to even think about resisting.'
 					dynamic $din_igor_disco_bj
 				end
@@ -1221,7 +1204,7 @@ end
 
 if $ARGS[0] = 'bella':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A22', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big22.jpg"></center>'
@@ -1266,7 +1249,7 @@ end
 
 if $ARGS[0] = 'vicky':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A15', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big15.jpg"></center>'
@@ -1308,7 +1291,7 @@ end
 
 if $ARGS[0] = 'inna':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A17', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big17.jpg"></center>'
@@ -1346,7 +1329,7 @@ end
 
 if $ARGS[0] = 'katja':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A14', 'like'
 	gs 'stat'
 	if rand(1,4) <= 3 and meynoldQW = 2: 
@@ -1418,7 +1401,7 @@ if $ARGS[0] = 'katja_dance':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance2_2.jpg"></center>'
 				inhib_exp += rand(1,2)
 				'During the dance, you decide to fool around and embrace Katja, pulling her top aside a little to show off a nipple. This results in an approving roar from the crowd and an embarrassed squeak from Katja.'
-				gs 'arousal', 'foreplay', 5, 'lesbian'
+				gs 'arousal', 'foreplay', -5, 'lesbian'
 				gs 'stat'
 				act 'Dance on':
 					*clr & cla
@@ -1440,28 +1423,28 @@ if $ARGS[0] = 'katja_dance':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance3.jpg"></center>'
 				inhib_exp += rand(1,2)
 				'Dancing with Katja, you can''t control yourself. You pull her close to you, put your hands on her breasts and bury your face in her cleavage. Katja moans slightly at your actions while the boys gather around and shout encouragements.'
-				gs 'arousal', 'foreplay', 5, 'lesbian'
+				gs 'arousal', 'foreplay', -5, 'lesbian'
 				gs 'stat'
 			elseif dancerand = 3:
 				'<center><b><font color="maroon">Disco</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance4.jpg"></center>'
 				inhib_exp += rand(1,2)
 				'Dancing with Katya and moving quite actively, you don''t notice your breasts fall out, exposing your nipples. However, the guys do and happily point it out to each other.'
-				gs 'arousal', 'flashlite', 5
+				gs 'arousal', 'flashlite', -5
 				gs 'stat'
 			elseif dancerand = 4:
 				'<center><b><font color="maroon">Disco</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance5.jpg"></center>'
 				inhib_exp += rand(1,2)
 				'During the dance, you turn to face Katja and you both dance close together. You lean in and give her a passionate kiss, hearing the cheering of the guys. You barely pay attention to them as you lose yourself in the moment.'
-				gs 'arousal', 'kiss', 5, 'lesbian'
+				gs 'arousal', 'kiss', -5, 'lesbian'
 				gs 'stat'
 			elseif dancerand = 5:
 				'<center><b><font color="maroon">Disco</font></b></center>'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/katja/katja_dance6.mp4"></video></center>'
 				inhib_exp += rand(1,2)
 				'You dance with Katja, paying little attention to what''s happening around you when one of the guys around you reaches out and pulls down your top, exposing your breasts for everyone to see. Continuing to dance without interruption, you pull your top back up to the disgruntled cries of the guys around you.'
-				gs 'arousal', 'flashlite', 5
+				gs 'arousal', 'flashlite', -5
 				gs 'stat'
 			end
 			act 'Stick out your tongue':
@@ -1476,8 +1459,6 @@ if $ARGS[0] = 'katja_dance':
 		end
 	else
 		*clr & cla
-		minut += 15
-		gs 'stat'
 		'<center><b><font color="maroon">Disco</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance1_1.jpg"></center>'
 		'You dance with Katja, attracting views of guys from across the room. 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.'
@@ -1505,7 +1486,7 @@ end
 
 if $ARGS[0] = 'lizaveta':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A140', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big140.jpg"></center>'
@@ -1544,7 +1525,7 @@ end
 
 if $ARGS[0] = 'sonia':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A25', 'like'
 	gs 'stat'
 	if rand(1,4) <= 3:
@@ -1553,7 +1534,6 @@ if $ARGS[0] = 'sonia':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			if npc_rel['A25'] >= 50 and fame['pav_slut'] < 250:		
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_dance.jpg"></center>'
 				'She smiles at you as she sees you coming out onto the dance floor. She waves you over, obviously wanting to dance with you.'
@@ -1591,7 +1571,6 @@ if $ARGS[0] = 'sonia':
 				'She suddenly brighten up. "OH MY GOD! I love this song, let''s dance!" She grabs your hand and starts to pull you out towards the dance floor.'
 				act 'No':
 					*clr & cla
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You shake your head and pull away. "No thanks, maybe some other time."'
 					'She sighs and rolls her eyes. "What eves, you need to loosen up and have more fun! Anyway, I''m going to go dance." She heads out onto the dance floor and starts dancing to the song.'
@@ -1643,7 +1622,7 @@ end
 
 if $ARGS[0] = 'sonia_outcast':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A25', 'like'
 	gs 'stat'
 	if rand(1,5) <= 4:
@@ -1652,7 +1631,6 @@ if $ARGS[0] = 'sonia_outcast':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			if npc_rel['A25'] >= 50 and fame['pav_slut'] < 250:		
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance2.jpg"></center>'
 				'When she sees you heading out onto the dance floor, she starts dancing her way over to you with a big smile on her face. "Hey <<$pcs_nickname>>, I''m so glad you came. Dance with me?"'
@@ -1690,7 +1668,6 @@ if $ARGS[0] = 'sonia_outcast':
 				'She suddenly brightens up. "OH MY GOD! I love this song! Let''s dance!" She looks at you with almost pleading eyes.'
 				act 'No':
 					*clr & cla
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You shake your head. "No thanks, maybe some other time."'
 					'She nods and looks a bit sad. "Yeah, I get it..." she says while looking over at some of the other kids from school watching you. "It was nice hanging out, but I need a drink." She walks away without another word.'
@@ -1718,7 +1695,6 @@ if $ARGS[0] = 'sonia_outcast':
 				'She suddenly brightens up. "OH MY GOD! I love this song! Let''s dance!" She looks at you with almost pleading eyes.'
 				act 'No':
 					*clr & cla
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You shake your head. "No thanks, maybe some other time."'
 					'She sighs and shakes her head. "Ass still sore from all the cocks that fucked it recently? I get it. Anyway, I''m going to go dance, have fun." She leaves you behind as she heads out onto the dance floor to shake her ass like there won''t be a tomorrow.'
@@ -1742,7 +1718,6 @@ if $ARGS[0] = 'sonia_outcast':
 				act 'Ask her to dance':
 					*clr & cla
 					gs 'npc_relationship', 'modify', 'A25', 'like'
-					minut += 15
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her reaction. "Would you like to dance then?"'
@@ -1772,64 +1747,62 @@ if $ARGS[0] = 'sonia_outcast_dance':
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 	if hour >= 20:
 		act 'Just keep dancing': gt 'pav_disco_coolkids', 'sonia_outcast_dance'
-	end
-	if hotcat >= 5:
-		act 'Dance closer to her':
-			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance4.jpg"></center>'
-			'You dance closer to her, and end up so close that your tits are almost constantly rubbing against each other. Her hands start to run up and down your sides, from your hips to your shoulders and back again. A few people start to notice and watch.'
-			gs 'arousal', 'foreplay', 10, 'inhibition'
-			gs 'arousal', 'end'
-			gs 'stat'
-			act 'Go back to just dancing': gt 'pav_disco_coolkids', 'sonia_outcast_dance'
-			act 'Grind against her':
+		if hotcat >= 5:
+			act 'Dance closer to her':
 				*clr & cla
-				gs 'fame', 'pav', 'sex', 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance5.jpg"></center>'
-				'She starts grinding her hips against you and soon the two of you are dancing as close as possible. You''re starting to attract a lot of attention now, mostly guys watching and enjoying the show. A few of them shout words of encouragement, as do some of the girls, while others are giving you looks of disgust. Sonia doesn''t seem to mind the attention or maybe hasn''t noticed - she seems to only have eyes for you. She then suddenly leans in and kisses you.'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance4.jpg"></center>'
+				'You dance closer to her, and end up so close that your tits are almost constantly rubbing against each other. Her hands start to run up and down your sides, from your hips to your shoulders and back again. A few people start to notice and watch.'
 				gs 'arousal', 'foreplay', 10, 'inhibition'
-				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Make out':
+				act 'Go back to just dancing':
+					gs 'arousal', 'end'
+					gs 'stat'
+					gt 'pav_disco_coolkids', 'sonia_outcast_dance'
+				end
+				act 'Grind against her':
 					*clr & cla
 					gs 'fame', 'pav', 'sex', 1
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance5.jpg"></center>'
+					'She starts grinding her hips against you and soon the two of you are dancing as close as possible. You''re starting to attract a lot of attention now, mostly guys watching and enjoying the show. A few of them shout words of encouragement, as do some of the girls, while others are giving you looks of disgust. Sonia doesn''t seem to mind the attention or maybe hasn''t noticed - she seems to only have eyes for you. She then suddenly leans in and kisses you.'
+					gs 'arousal', 'foreplay', 10, 'inhibition'
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance6.jpg"></center>'
-					'You can hear the roar of the guys over the music as you kiss Sonia. The noise all falls away and it''s just the two of you grinding away as you dance and make out. You kiss each other''s lips and necks as your hands roam over each other''s bodies, squeezing and fondling as they go. You don''t know how long this goes on, but she finally says something as you''re nuzzling her neck. "You want to go back to my place?"'
-					gs 'arousal', 'kiss', 10, 'inhibition'
-					gs 'arousal', 'end'
-					gs 'stat'
-					act 'Yes':
+					act 'Make out':
 						*clr & cla
 						gs 'fame', 'pav', 'sex', 1
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance6.jpg"></center>'
-						'You keep nuzzling her neck, up to her ear and whisper back to her. "Yes..."'
-						'She reaches up and takes your head in her hands, turning it so she can plant a long passionate kiss on your lips. Guys are now crowding around and pawing at both of you. Once she breaks the kiss, she takes you by the hands and pushes her way out of the circle of guys. The two of you walk off the dance floor and out of the disco, hand and hand, leaving little doubt to the observant what the two of you are off to do.'
-						gs 'arousal', 'foreplay', 5, 'inhibition'
+						'You can hear the roar of the guys over the music as you kiss Sonia. The noise all falls away and it''s just the two of you grinding away as you dance and make out. You kiss each other''s lips and necks as your hands roam over each other''s bodies, squeezing and fondling as they go. You don''t know how long this goes on, but she finally says something as you''re nuzzling her neck. "You want to go back to my place?"'
+						gs 'arousal', 'kiss', 10, 'inhibition'
 						gs 'stat'
-						act 'Leave together': gt 'pav_discoev1', 'sonia'
-					end
-					gs 'willpower', 'sex', 'resist', 'easy'
-					if will_cost <= pcs_willpwr:
-						act 'No (<<will_cost>> Willpower)':
+						act 'Yes':
 							*clr & cla
-							gs 'npc_relationship', 'modify', 'A25', 'hate'
-							gs 'willpower', 'pay', 'resist'
-							discoenable['A25'] = 0
-							minut += 5
+							gs 'fame', 'pav', 'sex', 1
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance6.jpg"></center>'
+							'You keep nuzzling her neck, up to her ear and whisper back to her. "Yes..."'
+							'She reaches up and takes your head in her hands, turning it so she can plant a long passionate kiss on your lips. Guys are now crowding around and pawing at both of you. Once she breaks the kiss, she takes you by the hands and pushes her way out of the circle of guys. The two of you walk off the dance floor and out of the disco, hand and hand, leaving little doubt to the observant what the two of you are off to do.'
+							gs 'arousal', 'foreplay', 5, 'inhibition'
 							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
-							'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
-							act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
+							act 'Leave together': gt 'pav_discoev1', 'sonia'
 						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	
+						gs 'willpower', 'sex', 'resist', 'easy'
+						if will_cost <= pcs_willpwr:
+							act 'No (<<will_cost>> Willpower)':
+								*clr & cla
+								gs 'npc_relationship', 'modify', 'A25', 'hate'
+								gs 'willpower', 'pay', 'resist'
+								discoenable['A25'] = 0
+								minut += 5
+								gs 'arousal', 'end'
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
+								'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
+								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
 		end
@@ -1847,7 +1820,7 @@ end
 
 if $ARGS[0] = 'natasha':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A16', 'like'
 	gs 'stat'
 	if rand(1,4) >= 3:
@@ -1856,7 +1829,6 @@ if $ARGS[0] = 'natasha':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/dimka_dance.jpg"></center>'
 			if grupTipe = 5:
 				'When you get near her, she gets a panicked look on her face and walks away.'
@@ -1893,8 +1865,6 @@ if $ARGS[0] = 'natasha':
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Ask her to dance':
 				*clr & cla
-				minut += 15
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big16.jpg"></center>'
 				'"Would you like to dance?" you ask with a smile.'
 				'She grins and nods her head. "Yeah, I would love to."' 
@@ -1916,8 +1886,6 @@ if $ARGS[0] = 'natasha':
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Ask her to dance':
 				*clr & cla
-				minut += 15
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big16.jpg"></center>'
 				'"Would you like to dance?" you ask with a smile.'
 				'She hesitates for a moment before nodding. "Yeah, I would love to."' 

+ 39 - 44
locations/pav_disco_gopniks.qsrc

@@ -6,10 +6,11 @@ if $ARGS[0] = 'vitek' or $ARGS[0] = 'dan' or $ARGS[0] = 'shulga': gt 'pav_disco_
 
 if $ARGS[0] = 'vitek_dan_vasily':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A9', 'like'
 	gs 'npc_relationship', 'modify', 'A10', 'like'
 	gs 'npc_relationship', 'modify', 'A11', 'like'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 	'Vitek, Dan and Vasily are hanging out in the dark corner of the hall with the other gopniks. It''s dimly lit and hard to make out details, but it looks like they''re sharing some beers they''ve smuggled in.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -366,7 +367,7 @@ end
 
 if $ARGS[0] = 'radomir':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A154', 'like'
 	gs 'stat'
 	if rand(1,3) = 1:
@@ -375,7 +376,6 @@ if $ARGS[0] = 'radomir':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/radomir_dance2.jpg"></center>'
 			if grupTipe = 4 and gopnik_slut = 1:
 				if hotcat >= 6:
@@ -543,7 +543,6 @@ if $ARGS[0] = 'radomir':
 					end
 					act 'Yes':
 						*clr & cla
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 						'You smile. "Yeah, that sounds wonderful."'
 						'"Allow me." he replies with a smile as he takes you by the hand and gently leads you towards the dance floor.'
@@ -594,7 +593,6 @@ if $ARGS[0] = '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'
@@ -624,7 +622,7 @@ end
 
 if $ARGS[0] = 'roman':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A157', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big157.jpg"></center>'
@@ -703,7 +701,6 @@ if $ARGS[0] = 'roman':
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Ask him to dance':
 				*clr & cla
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big157.jpg"></center>'
 				'"Hey Roman, want to dance?" you ask with a smile..'
 				'He looks at you blankly. "If I wanted to dance, I would drag your fucking ass out onto the dance floor. Now fuck off, you''re starting to get on my nerves bitch!"'
@@ -716,7 +713,7 @@ end
 
 if $ARGS[0] = 'valentin':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A158', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
@@ -829,7 +826,7 @@ end
 
 if $ARGS[0] = 'arkadi':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A156', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
@@ -913,7 +910,7 @@ end
 
 if $ARGS[0] = 'niko':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A189', 'like'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big189.jpg"></center>'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -923,7 +920,7 @@ end
 
 if $ARGS[0] = 'lavrenti':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A155', 'like'
 	gs 'stat'
 	if rand(1,4) = 1:
@@ -932,7 +929,6 @@ if $ARGS[0] = 'lavrenti':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lavrenti_dance1.jpg"></center>'
 			if npc_rel['A154'] >= 50 and fame['pav_slut'] < 300:		
 				'When he sees you, he smiles and moves between a few girls who are dancing near him. He''s a very good dancer and they don''t seem to mind at all as they all start dancing together.'
@@ -1077,7 +1073,7 @@ end
 
 if $ARGS[0] = 'pauline':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A24', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big24.jpg"></center>'
@@ -1165,8 +1161,6 @@ if $ARGS[0] = 'pauline':
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Ask her to dance':
 				*clr & cla
-				minut += 15
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big24.jpg"></center>'
 				'"Hey Pauline, want to dance?" you ask with a smile.'
 				'She gives you a dirty look. "What are you, some kind of carpet muncher like Lera? I''m not into girls, so go find some other twat to try and like, dyke."'
@@ -1182,7 +1176,7 @@ if $ARGS[0] = 'lena' or $ARGS[0] = 'lera': gt  'pav_disco_gopniks', 'lena_lera'
 
 if $ARGS[0] = 'lena_lera':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A20', 'like'
 	gs 'npc_relationship', 'modify', 'A21', 'like'
 	gs 'stat'
@@ -1192,7 +1186,6 @@ if $ARGS[0] = 'lena_lera':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lena_lera_dance1.jpg"></center>'
 			if grupTipe = 4 and gopnik_slut = 1 or grupTipe = 5:
 				'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.'
@@ -1266,7 +1259,6 @@ if $ARGS[0] = 'lena_lera':
 						act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 						act 'Ask Lera about the boy':
 							*clr & cla
-							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big21.jpg"></center>'
 							'"Who was that?" you ask Lera as you watch Lena leave with the boy.'
 							'Lera sighs. "Just some boy from Pushkin Lena''s got the hots for." She sounds more than a little annoyed.'
@@ -1312,8 +1304,6 @@ if $ARGS[0] = 'lena_lera':
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				act 'Ask them to dance':
 					*clr & cla
-					minut += 15
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lena_lera.jpg"></center>'
 					if rand(1,4) = 1:
 						'"So you girls want to go dancing?" you ask with a smile.'
@@ -1321,12 +1311,11 @@ if $ARGS[0] = 'lena_lera':
 						'You notice Lera looks unhappy. "I thought we were all going to dance together?"'
 						*nl
 						'Lena frowns. "Don''t be like that. Are you going to cover for me or not?" she asks, sounding more than a little annoyed.'
-						'Lera looks exserbated. "Fine."'
+						'Lera looks exacerbated. "Fine."'
 						'Lena smiles, hugs Lera and disappears with the boy.'
 						act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 						act 'Ask Lera about the boy.':
 							*clr & cla
-							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big21.jpg"></center>'
 							'"Who was that?" you ask Lera as you watch Lena leave with the boy.'
 							'Lera sighs. "Just some boy from Pushkin Lena''s got the hots for." She sounds more than a little annoyed.'
@@ -1370,7 +1359,7 @@ end
 
 if $ARGS[0] = 'nush':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A144', 'like'
 	gs 'stat'
 	if rand(1,2) = 1:
@@ -1379,7 +1368,6 @@ if $ARGS[0] = 'nush':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance1.jpg"></center>'
 			if npc_rel['A144'] >= 50 and fame['pav_slut'] < 500:		
 				'You make your way over to her and start dancing next with her. "Hey bitch, What''s up?" she greets you while turning to dance with you.'
@@ -1427,7 +1415,6 @@ if $ARGS[0] = 'nush':
 					'"Want to dance?" Anushka asks as the conversation winds down.'
 					act 'No':
 						*clr & cla
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 						'You shake your head. "No thanks. Maybe later."'
 						'She shrugs. "Suit yourself." She then walks off towards the dance floor.'
@@ -1435,7 +1422,6 @@ if $ARGS[0] = 'nush':
 					end
 					act 'Yes':
 						*clr & cla
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 						'You smile. "Yeah, that sounds fun."'
 						'She grabs you by the hands and pulls you along to the dance floor. "Let''s go tease the fuck out of the boys and give them a memory to jerk off to later tonight!" she says while giggling.'
@@ -1464,9 +1450,9 @@ if $ARGS[0] = 'nush':
 				'The two of you start talking about a variety of topics and the boys from the band occasionally comment, usually to make a rude remark or a funny joke, causing Anushka to either laugh or flip them off.'
 				if hotcat >= 6:
 					'"Want to dance?" Anushka asks as the conversation winds down.'
+					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 					act 'No':
 						*clr & cla
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 						'You shake your head. "No thanks. Maybe later."'
 						'She shrugs. "Suit yourself." She then walks off towards the dance floor.'
@@ -1474,20 +1460,16 @@ if $ARGS[0] = 'nush':
 					end
 					act 'Yes':
 						*clr & cla
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 						'You smile. "Yeah, that sounds fun."'
 						'She grabs you by the hands and pulls you along to the dance floor. "Let''s go tease the fuck out of the boys and give them a memory to jerk off to later tonight!" she says while giggling.'
 						act 'Go dancing': gt 'pav_disco_gopniks', 'anushka_dance'
 					end
-				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				else
 					'As the current topic winds down, Anushka starts listening to the boys talking about the latest girl they banged and she starts making comments towards them.'
 					act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 					act 'Ask her to dance':
 						*clr & cla
-						minut += 15
-						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 						if hotcat >= 4:
 							'"Hey Nush, want to dance?" you ask with a smile.'
@@ -1516,29 +1498,37 @@ if $ARGS[0] = 'anushka_dance':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance2.jpg"></center>'
 	'The two of you dance together, ignoring the boys around you. Most of them eventually get the hint and leave you to dance in peace, but some other guys will come over and try their luck instead. You ignore them as well and enjoy dancing together.'
-	gs 'arousal', 'end'
-	gs 'stat'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 	act 'Keep dancing with her':
 		*clr & cla
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance3.jpg"></center>'
 		'Anushka looks at some of the boys, then at you with a mischievous looks on her face. She starts dancing closer to you until she''s dancing up against you, her body rubbing against yours. This gets the boys attention even more, though it does stop them from trying to get between you now.'
 		gs 'arousal', 'foreplay', 5, 'inhibition'
 		gs 'stat'
-		act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
+		act 'Go back to just dancing':
+			gs 'arousal', 'end'
+			gs 'stat'
+			gt 'pav_disco_gopniks', 'anushka_dance'
+		end
 		act 'Grind against her':
 			*clr & cla
-			gs 'stat'
 			if hotcat >= 6:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance3.jpg"></center>'
 				'You join in and start grinding back against her. The boys are loving the show as your movements go along with the beat of the music. Your hips are pressed together and your breasts mash into each others while your legs are tangled, causing you to grind your respective crotches on each other''s thighs. You can''t tell if she''s doing it because she''s into you, she just wants to tease the boys, or both. You could push things a bit further...'
 				gs 'arousal', 'foreplay', 5, 'inhibition'
 				gs 'stat'
+				act 'Do something else':
+					gs 'arousal', 'end'
+					gs 'stat'
+					gt 'pav_disco_coolkids', 'classmates'
+				end
 				if hour >= 20:
-					act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
+					act 'Go back to just dancing':
+						gs 'arousal', 'end'
+						gs 'stat'
+						gt 'pav_disco_gopniks', 'anushka_dance'
+					end
 				end
-				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				!!act 'Dry hump her':
 				!!	*clr & cla
 				!!	gs 'stat'
@@ -1638,10 +1628,18 @@ if $ARGS[0] = 'anushka_dance':
 	            'You join in and start grinding back against her. The boys are loving the show as your movements go along with the beat of the music. Your hips are pressed together and your breasts mash into each others while your legs are tangled, causing you to grind your respective crotches on each other''s thighs. After a few songs have played, she breaks away from you and starts dancing further apart again. She wiggles her ass to tease the boys that are clustered around you.'
 				gs 'arousal', 'foreplay', 5, 'inhibition'
 				gs 'stat'
+				act 'Do something else':
+					gs 'arousal', 'end'
+					gs 'stat'
+					gt 'pav_disco_coolkids', 'classmates'
+				end
 				if hour >= 20:
-					act 'Go back to just dancing': gt 'pav_disco_gopniks', 'anushka_dance'
+					act 'Go back to just dancing':
+						gs 'arousal', 'end'
+						gs 'stat'
+						gt 'pav_disco_gopniks', 'anushka_dance'
+					end
 				end
-				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			end
 		end
 	end
@@ -1658,7 +1656,7 @@ end
 
 if $ARGS[0] = 'alyona':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A143', 'like'
 	gs 'stat'
 	if rand(1,4) = 1:
@@ -1667,7 +1665,6 @@ if $ARGS[0] = 'alyona':
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/alyona_dance1.jpg"></center>'
 			if npc_rel['A146'] >= 50 and fame['pav_slut'] < 300:		
 				'As you head towards her, she breaks away from the guy and starts dancing with you instead. He looks very disappointed, but then tries to dance with both of you. The two of you move away from him and he takes the hint and leaves. "Thanks <<$pcs_nickname>>. I thought he was going to start dry humping me at any minute."'
@@ -1758,8 +1755,6 @@ if $ARGS[0] = 'alyona':
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				act 'Ask her to dance':
 					*clr & cla
-					minut += 15
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big143.jpg"></center>'
 					'"Want to dance?" you ask with a smile.'
 					'She shakes her head and gets up, a little unsteady on her feet. "No, I need to go and piss." She then stumbles off towards the restrooms.'

+ 26 - 25
locations/pav_disco_jocks.qsrc

@@ -3,15 +3,15 @@
 
 if $ARGS[0] = 'lazar':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A149', 'like'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
 	if rand(1,4) = 1:
 		'Lazar is out on the dance floor dancing with a small group of people. The girls in the group are all competing for his attention.'
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lazar_dance2.jpg"></center>'
 			if npc_rel['A149'] >= 50 and fame['pav_slut'] < 250:		
 				'You move out onto the dance floor and he smiles as you approach. "Come to have a little fun, huh?"'
@@ -49,8 +49,6 @@ if $ARGS[0] = 'lazar':
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				act 'Ask him to dance':
 					*clr & cla
-					minut += 15
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
 					if hotcat >= 6:
 						'"Would you like to dance?" you ask with a smile.'
@@ -98,8 +96,6 @@ if $ARGS[0] = 'lazar':
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				act 'Ask him to dance':
 					*clr & cla
-					minut += 15
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
 					if hotcat >= 6:
 						'"Would you like to dance?" you ask with a smile.'
@@ -137,8 +133,9 @@ end
 
 if $ARGS[0] = 'ivan':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A3', 'like'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></center>'
 	'To your surprise, you see Ivan hanging out with the other jocks, talking to a few of them and smiling. You almost never see him here.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -161,7 +158,6 @@ if $ARGS[0] = 'ivan':
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Ask him to dance':
 				*clr & cla
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></center>'
 				'"Hey Ivan, want to dance?" you ask with a smile.'
 				'He pauses and thinks about it before shaking his head. "Maybe another time."'
@@ -183,7 +179,6 @@ if $ARGS[0] = 'ivan':
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Ask him to dance':
 				*clr & cla
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></center>'
 				'"Hey Ivan, want to dance?" you ask with a smile.'
 				'He pauses and thinks about it before shaking his head. "Maybe another time."'
@@ -196,8 +191,9 @@ end
 
 if $ARGS[0] = 'fedor':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A5', 'like'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
 	if FedorLove < 0:
 		gt 'FedorMisc', 'Fedor Hate', 1
@@ -208,15 +204,15 @@ end
 
 if $ARGS[0] = 'svyatoslav':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A8', 'like'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big8.jpg"></center>'
 	if rand(1,4) = 1:
 		'You see Svyatoslav out on the dance floor flirting and trying to dance with the prettier girls. He has mixed results, but seems to be enjoying himself regardless.'
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 		act 'Go out on the dance floor':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/svyatoslav_dance1.jpg"></center>'
 			if npc_rel['A8'] >= 50 and fame['pav_slut'] < 250:		
 				'You move out onto the dance floor and he gives you a smile as you approach before you start dancing with each other.'
@@ -280,8 +276,6 @@ if $ARGS[0] = 'svyatoslav':
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 				act 'Ask him to dance':
 					*clr & cla
-					minut += 15
-					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big8.jpg"></center>'
 					if hotcat >= 5:
 						'"Would you like to dance?" you ask with a smile.'
@@ -320,8 +314,9 @@ end
 
 if $ARGS[0] = 'vanya':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A165', 'like'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big165.jpg"></center>'
 	'You see Vanya hanging out with the cool kids and jocks.'
 	if grupTipe = 5:
@@ -370,8 +365,9 @@ end
 
 if $ARGS[0] = 'erast':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A150', 'like'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big150.jpg"></center>'
 	'You''re a little surprised to see Erast hanging out with the cool kids and jocks, standing near one of the tables with his arms crossed. You rarely see him here and you don''t think he''s enjoying himself, but he gives polite smiles to people that talk to him.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -417,8 +413,6 @@ if $ARGS[0] = 'erast':
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Ask him to dance':
 				*clr & cla
-				minut += 15
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big150.jpg"></center>'
 				'"Would you like to dance with me?" you ask with a smile.'
 				'"What? No!" He seems surprised and flustered. "I mean... I don''t dance... I need a drink." He quickly walks away, but you notice him blushing heavily as he does.'
@@ -430,8 +424,9 @@ end
 
 if $ARGS[0] = 'albina':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A23', 'like'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 	if rand(1,4) <= 3:
 		'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.'
@@ -483,7 +478,6 @@ if $ARGS[0] = 'albina':
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			act 'Ask her to dance':
 				*clr & cla
-				minut += 15
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 				if (grupTipe = 1 or grupTipe = 2) and npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
 				  'Albina smiles and accepts your offer to dance. She gets up and grabs your hand before leading you out to the dance floor.'
@@ -497,6 +491,7 @@ if $ARGS[0] = 'albina':
 				act 'Chat':
 					*clr & cla
 					minut += 15
+					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 					!! This is for when I eventually add in Albina's house parties
 					!! party hasn't happened yet   
@@ -529,6 +524,7 @@ if $ARGS[0] = 'albina_dance':
 	fat -= 1
 	danc_exp += 2
 	frost = 0
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 	'You go out onto the dance floor and start dancing with Albina.'
 	act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -540,6 +536,7 @@ if $ARGS[0] = 'albina_dance':
 		fat -= 1
 		danc_exp += 2
 		frost = 0
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 		'You continue dancing with Albina, and you both seem to be enjoying yourselves. Albina is dancing in an ever increasingly erotic manner. She sways her hips and wiggles her ass for all to see, and seems to enjoy the attention that comes with being the best dancer present.'
 		act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -550,7 +547,8 @@ if $ARGS[0] = 'albina_dance':
 			gs 'sweat', 'add', 3
 			fat -= 1
 			danc_exp += 2
-			frost = 0	
+			frost = 0
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 			if npc_sex['A23'] >= 1:
 				'You continue to dance with Albina, who smiles at you and pulls you in closer into a seductive dance. Her tight fitting dress is accenting her curves rather well, and you find your hands roaming over her body as she erotically dances in front of you, her ass slowly grinding against you. She seemingly doesn''t care about you feeling her up and encourages you to continue.'
@@ -566,6 +564,7 @@ if $ARGS[0] = 'albina_dance':
 				fat -= 1
 				danc_exp += 2
 				frost = 0
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club.jpg"></center>'
 				if npc_sex['A23'] >= 1:
 					'When the song ends, Albina looks back at you and winks. "That was hot <<$pcs_nickname>>, but I need to go and sit down for a bit and have a drink." She excuses herself and walks away with a seductive sway in her hips directed at you, leaving you standing in the middle of the dance floor feeling a little flustered.'
@@ -580,8 +579,9 @@ end
 
 if $ARGS[0] = 'christina':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A18', 'like'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
 	if rand(1,4) = 1:
 		'You see Christina out on the dance floor, shaking her ass and having a good time.'
@@ -825,7 +825,6 @@ if $ARGS[0] = 'christina_dance':
 				'Christina eventually gets tired of dancing and wanders off, saying something about needing a drink.'
 				act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
 			end
-			
 		else
 			'You start dancing with Christina and you both have a good time, twisting in sync with the music and each other.'
 			act 'Do something else': gt 'pav_disco_coolkids', 'classmates'
@@ -843,8 +842,9 @@ end
 
 if $ARGS[0] = 'lariska':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A13', 'like'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
 	if rand(1,4) <= 3:
 		'You see blonde hair flashing across the dance floor. It''s Lariska in a low cut top and a short skirt, dancing by herself and having a good time.'
@@ -963,8 +963,9 @@ end
 
 if $ARGS[0] = 'lina':
 	*clr & cla
-	minut += 15
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A19', 'like'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big19.jpg"></center>'
 	if rand(1,4) <= 3:
 		'You spot Lina out on the dance floor, '